增加首页卡片的布局设置字段layoutConfig；lincense去掉原版文字

yangys

2024-10-19 9c5cc5bbc7a882fd5bb466621ea10bd5f73b2fd1

增加首页卡片的布局设置字段layoutConfig；lincense去掉原版文字

 smart-man-boot/src/main/java/com/qianwen/smartman/modules/auth/utils/TokenUtil.java

@@ -72,7 +72,7 @@
        param.put("detail", userInfo.getDetail());
        try {
            TokenInfo accessToken = SecureUtil.createJWT(param, "audience", "issuser", "access_token");
            return authInfo.set("tenant_id", user.getTenantId()).set("user_id", Func.toStr(user.getId())).set("dept_id", user.getDeptId()).set("post_id", user.getPostId()).set("role_id", user.getRoleId()).set("oauth_id", userInfo.getOauthId()).set("account", user.getAccount()).set("user_name", user.getAccount()).set("nick_name", user.getRealName()).set("role_name", Func.join(userInfo.getRoles())).set("avatar", Func.toStr(user.getAvatar(), "")).set("access_token", accessToken.getToken()).set(RefreshTokenGranter.GRANT_TYPE, createRefreshToken(userInfo).getToken()).set("token_type", "bearer").set("expires_in", Integer.valueOf(accessToken.getExpire())).set("detail", userInfo.getDetail()).set("license", "powered by bladex");
            return authInfo.set("tenant_id", user.getTenantId()).set("user_id", Func.toStr(user.getId())).set("dept_id", user.getDeptId()).set("post_id", user.getPostId()).set("role_id", user.getRoleId()).set("oauth_id", userInfo.getOauthId()).set("account", user.getAccount()).set("user_name", user.getAccount()).set("nick_name", user.getRealName()).set("role_name", Func.join(userInfo.getRoles())).set("avatar", Func.toStr(user.getAvatar(), "")).set("access_token", accessToken.getToken()).set(RefreshTokenGranter.GRANT_TYPE, createRefreshToken(userInfo).getToken()).set("token_type", "bearer").set("expires_in", Integer.valueOf(accessToken.getExpire())).set("detail", userInfo.getDetail()).set("license", "powered by qianwen");
        } catch (Exception ex) {
            return authInfo.set("error_code", 401).set("error_description", ex.getMessage());
        }

 smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/WorkstationDpController.java

@@ -62,9 +62,6 @@
    @GetResource({"/listDatapointsByWorkstationId"})
    @ApiOperation("根据工位id获取数据点")
    public R<WorkstationDatapointsVO> listDatapointsByWorkstationId(@RequestParam Long workstationId) {
        WorkstationDatapointsVO v = new WorkstationDatapointsVO();
        v.setDpHead("myhead");
        //return R.data(v);
        return R.data(workstationDatapointsService.getDatapoints(workstationId));
    }
    
@@ -72,10 +69,12 @@
    @ApiOperation("保存工位数据点配置")
    public R<Boolean> saveDatapoints(@RequestBody WorkstationDatapointsSubmitVO datapoints) {
        //return R.data(true);
    	
        try {
            workstationDatapointsService.submit(datapoints);
        }catch(Exception e) {
            return R.data(false);
            //R.fail(null).
            return R.fail(e.getMessage());
        }
        return R.data(true);
    }

 smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/entity/WorkstationAppMapping.java

ÎļþÒÑɾ³ý

 smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/mapper/WorkstationAppMappingMapper.java

ÎļþÒÑɾ³ý

 smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/WorkstationDatapointsService.java

@@ -2,24 +2,26 @@

import java.io.IOException;
import java.nio.charset.Charset;
import java.util.List;

import org.apache.commons.io.IOUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.qianwen.core.log.exception.ServiceException;
import com.qianwen.core.mp.base.BaseServiceImpl;
import com.qianwen.smartman.common.mqtt.MqttMessageSender;
import com.qianwen.smartman.modules.cps.entity.CollectDeviceType;
import com.qianwen.smartman.modules.cps.entity.WorkstationAppMapping;
import com.qianwen.smartman.modules.cps.entity.Workstation;
import com.qianwen.smartman.modules.cps.entity.WorkstationDatapoints;
import com.qianwen.smartman.modules.cps.mapper.CollectDeviceTypeMapper;
import com.qianwen.smartman.modules.cps.mapper.WorkstationAppMappingMapper;
import com.qianwen.smartman.modules.cps.mapper.WorkstationDatapointsMapper;
import com.qianwen.smartman.modules.cps.mapper.WorkstationMapper;
import com.qianwen.smartman.modules.cps.vo.WorkstationDatapointsSubmitVO;
import com.qianwen.smartman.modules.cps.vo.WorkstationDatapointsVO;

@@ -28,16 +30,16 @@
    private Logger log = LoggerFactory.getLogger(this.getClass());
    @Autowired
    private CollectDeviceTypeMapper typeMapper;
	
    //@Autowired
    //private JdbcTemplate jdbcTemplate;
	
    @Autowired
    private WorkstationAppMappingMapper mpmapper;

    @Autowired
    private MqttMessageSender mqttSender;
    
    private final String WORKSTATION_APP_MAPPING_CHANGED_TOPIC = "mdc/workstation_app_mapping_changed";
    @Autowired
    private WorkstationMapper workstationMapper;
    /**
     * mqtt topic，用于通知collect应用，数据点改变
     */
    private final String WORKSTATION_DATAPOINT_CHANGED_TOPIC = "mdc/workstation_datapoint_changed";
    /**
     * æ–°å¢žæˆ–者修改工位点位配置
     * @param tplVO
@@ -45,8 +47,15 @@
    @Transactional
    public void submit(WorkstationDatapointsSubmitVO dpVO) {
      
		
        Workstation usingWorkstation = appIdUsingWorkstation(dpVO.getAppId(),dpVO.getWorkstationId());
        if(usingWorkstation != null) {
            //appId被使用
            String err = "应用ID被占用，工位名称+编号:"+usingWorkstation.getName()+"-"+usingWorkstation.getCode();
            throw new ServiceException(err);
        }
		
        WorkstationDatapoints dp = this.baseMapper.selectOne(Wrappers.<WorkstationDatapoints>lambdaQuery().eq(WorkstationDatapoints::getWorkstationId, dpVO.getWorkstationId()));
       
        if (dp == null) {
            //新增
            dp = new WorkstationDatapoints();
@@ -65,6 +74,7 @@
        
        saveOrUpdate(dp);
        
        /*
        WorkstationAppMapping appMap = mpmapper.selectById(dpVO.getWorkstationId());
        if(appMap == null) {
            appMap = new WorkstationAppMapping();
@@ -74,11 +84,32 @@
        }else {
            appMap.setAppId(dpVO.getAppId());
            mpmapper.updateById(appMap);
        }
        }*/
        
        mqttSender.sendMessage(WORKSTATION_APP_MAPPING_CHANGED_TOPIC, dpVO.getWorkstationId()+"");
        //发送变更消息
        JSONObject payloadObj = new JSONObject();
        payloadObj.put("appId", dpVO.getAppId());
        payloadObj.put("workstationId", dpVO.getWorkstationId());
        mqttSender.sendMessage(WORKSTATION_DATAPOINT_CHANGED_TOPIC, payloadObj.toJSONString());
    }
	
    /**
     * appId是否被其他工位使用，如果使用返回使用的工位数据
     * @param appId
     * @param workstationId
     * @return ä½¿ç”¨è¯¥appId的工位
     */
    Workstation appIdUsingWorkstation(String appId,long workstationId) {
        //long cnt = baseMapper.selectCount(Wrappers.<WorkstationDatapoints>lambdaQuery().ne(WorkstationDatapoints::getWorkstationId, workstationId).eq(WorkstationDatapoints::getAppId, appId));
        //return cnt > 0;
        List<WorkstationDatapoints> dpList = baseMapper.selectList(Wrappers.<WorkstationDatapoints>lambdaQuery().ne(WorkstationDatapoints::getWorkstationId, workstationId).eq(WorkstationDatapoints::getAppId, appId));
		
        if(dpList.isEmpty()) {
            return null;
        }
		
        Workstation ws = workstationMapper.selectById(dpList.get(0).getWorkstationId());
        return ws;
    }
    /**
     * èŽ·å–工位数据点配置
     * @param workstationId

 smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/WorkstationServiceImpl.java

@@ -73,7 +73,6 @@
import com.qianwen.smartman.modules.cps.convert.WorkstationConvert;
import com.qianwen.smartman.modules.cps.convert.WorkstationWorkbenchConvert;
import com.qianwen.smartman.modules.cps.dto.CodeMapDTO;
import com.qianwen.smartman.modules.cps.dto.WorkstationCreateMessageDTO;
import com.qianwen.smartman.modules.cps.dto.WorkstationRealTimeStatusDTO;
import com.qianwen.smartman.modules.cps.dto.WorkstationWcsDmpDTO;
import com.qianwen.smartman.modules.cps.entity.CommonGroup;
@@ -181,26 +180,6 @@
    private final Integer FTP_CORRELATION_DIRECTORY = 1;
    private final Integer FTP_SAME_DIRECTORY = 2;
    
    /*
    public WorkstationServiceImpl(final IMachineService machineService, final IWorkstationOfMachineService workstationOfMachineService, final IWorkstationWcsService workstationWcsService, final ICommonGroupOfItemService commonGroupOfItemService, final ICommonGroupService commonGroupService, final ICalendarService calendarService, final WorkstationMapper workstationMapper, final OssBuilder ossBuilder, final IDmpVariablesService dmpVariablesService, final ITransferDirectoryService transferDirectoryService, final ITransferDirectoryGroupService transferDirectoryGroupService, final IWorkstationWorkbenchService workbenchService, final IDncWsRelationTdService wsRelationTdService, final IDncFixedSpaceService dncFixedSpaceService,final IWorkstationDynamicCollectService dynamicCollectService) {
        this.machineService = machineService;
        this.workstationOfMachineService = workstationOfMachineService;
        this.workstationWcsService = workstationWcsService;
        this.commonGroupOfItemService = commonGroupOfItemService;
        this.commonGroupService = commonGroupService;
        this.calendarService = calendarService;
        this.workstationMapper = workstationMapper;
        this.ossBuilder = ossBuilder;
        this.dmpVariablesService = dmpVariablesService;
        this.transferDirectoryService = transferDirectoryService;
        this.transferDirectoryGroupService = transferDirectoryGroupService;
        this.workbenchService = workbenchService;
        this.wsRelationTdService = wsRelationTdService;
        this.dncFixedSpaceService = dncFixedSpaceService;
        //this.workstationProducer = workstationProducer;
        this.dynamicCollectService = dynamicCollectService;
    }
    */

    public static Long getTimeDifference(LocalDateTime startTime, LocalDateTime endTime) {
        if (Func.isEmpty(startTime)) {

 smart-man-boot/src/main/java/com/qianwen/smartman/modules/system/entity/WorkbenchCard.java

@@ -7,7 +7,6 @@

@ApiModel(value = "WorkbenchCard", description = "工作台卡片")
@TableName("blade_workbench_card")

public class WorkbenchCard extends TenantEntity {
    private static final long serialVersionUID = 1;
    @ApiModelProperty("工作台ID")
@@ -26,7 +25,8 @@
    private String apiResource;
    @ApiModelProperty("文本内容")
    private String textContent;

    @ApiModelProperty("布局设置")
    private String layoutConfig;
    public void setWorkbenchId(final Long workbenchId) {
        this.workbenchId = workbenchId;
    }
@@ -62,7 +62,7 @@
    public String toString() {
        return "WorkbenchCard(workbenchId=" + getWorkbenchId() + ", cardLength=" + getCardLength() + ", cardWide=" + getCardWide() + ", xCoordinate=" + getXCoordinate() + ", yCoordinate=" + getYCoordinate() + ", cardKey=" + getCardKey() + ", apiResource=" + getApiResource() + ", textContent=" + getTextContent() + ")";
    }

    /*
    public boolean equals(final Object o) {
        if (o == this) {
            return true;
@@ -141,11 +141,11 @@
        }
        return false;
    }

    */
    protected boolean canEqual(final Object other) {
        return other instanceof WorkbenchCard;
    }

/*
    public int hashCode() {
        int result = super.hashCode();
        Object $workbenchId = getWorkbenchId();
@@ -165,7 +165,7 @@
        Object $textContent = getTextContent();
        return (result8 * 59) + ($textContent == null ? 43 : $textContent.hashCode());
    }

*/
    public Long getWorkbenchId() {
        return this.workbenchId;
    }
@@ -197,4 +197,30 @@
    public String getTextContent() {
        return this.textContent;
    }

    public String getLayoutConfig() {
        return layoutConfig;
    }

    public void setLayoutConfig(String layoutConfig) {
        this.layoutConfig = layoutConfig;
    }

    public String getxCoordinate() {
        return xCoordinate;
    }

    public void setxCoordinate(String xCoordinate) {
        this.xCoordinate = xCoordinate;
    }

    public String getyCoordinate() {
        return yCoordinate;
    }

    public void setyCoordinate(String yCoordinate) {
        this.yCoordinate = yCoordinate;
    }
    
    
}

 smart-man-boot/src/main/java/com/qianwen/smartman/modules/system/vo/WorkbenchCardAddVO.java

@@ -25,6 +25,9 @@
    @ApiModelProperty("文本内容")
    private String textContent;

    @ApiModelProperty("布局设置")
    private String layoutConfig;
    
    public void setWorkbenchId(final Long workbenchId) {
        this.workbenchId = workbenchId;
    }
@@ -56,7 +59,7 @@
    public void setTextContent(final String textContent) {
        this.textContent = textContent;
    }

    /*
    public boolean equals(final Object o) {
        if (o == this) {
            return true;
@@ -135,12 +138,13 @@
        }
        return false;
    }

    */
    protected boolean canEqual(final Object other) {
        return other instanceof WorkbenchCardAddVO;
    }

    /*
    public int hashCode() {
    	
        Object $workbenchId = getWorkbenchId();
        int result = (1 * 59) + ($workbenchId == null ? 43 : $workbenchId.hashCode());
        Object $cardLength = getCardLength();
@@ -158,6 +162,7 @@
        Object $textContent = getTextContent();
        return (result7 * 59) + ($textContent == null ? 43 : $textContent.hashCode());
    }
    */

    public String toString() {
        return "WorkbenchCardAddVO(workbenchId=" + getWorkbenchId() + ", cardLength=" + getCardLength() + ", cardWide=" + getCardWide() + ", xCoordinate=" + getXCoordinate() + ", yCoordinate=" + getYCoordinate() + ", cardKey=" + getCardKey() + ", apiResource=" + getApiResource() + ", textContent=" + getTextContent() + ")";
@@ -194,4 +199,29 @@
    public String getTextContent() {
        return this.textContent;
    }

    public String getxCoordinate() {
        return xCoordinate;
    }

    public void setxCoordinate(String xCoordinate) {
        this.xCoordinate = xCoordinate;
    }

    public String getyCoordinate() {
        return yCoordinate;
    }

    public void setyCoordinate(String yCoordinate) {
        this.yCoordinate = yCoordinate;
    }

    public String getLayoutConfig() {
        return layoutConfig;
    }

    public void setLayoutConfig(String layoutConfig) {
        this.layoutConfig = layoutConfig;
    }
    
}

 smart-man-boot/src/main/java/com/qianwen/smartman/modules/system/vo/WorkbenchCardVO.java

@@ -18,7 +18,8 @@
    private String apiResource;
    @ApiModelProperty("文本内容")
    private String textContent;

    @ApiModelProperty("布局设置")
    private String layoutConfig;
    public void setWorkbenchId(final Long workbenchId) {
        this.workbenchId = workbenchId;
    }
@@ -50,7 +51,7 @@
    public void setTextContent(final String textContent) {
        this.textContent = textContent;
    }

    /*
    public boolean equals(final Object o) {
        if (o == this) {
            return true;
@@ -129,11 +130,11 @@
        }
        return false;
    }

    */
    protected boolean canEqual(final Object other) {
        return other instanceof WorkbenchCardVO;
    }

    /*
    public int hashCode() {
        Object $workbenchId = getWorkbenchId();
        int result = (1 * 59) + ($workbenchId == null ? 43 : $workbenchId.hashCode());
@@ -152,6 +153,7 @@
        Object $textContent = getTextContent();
        return (result7 * 59) + ($textContent == null ? 43 : $textContent.hashCode());
    }
    */

    public String toString() {
        return "WorkbenchCardVO(workbenchId=" + getWorkbenchId() + ", cardLength=" + getCardLength() + ", cardWide=" + getCardWide() + ", xCoordinate=" + getXCoordinate() + ", yCoordinate=" + getYCoordinate() + ", cardKey=" + getCardKey() + ", apiResource=" + getApiResource() + ", textContent=" + getTextContent() + ")";
@@ -188,4 +190,29 @@
    public String getTextContent() {
        return this.textContent;
    }

    public String getxCoordinate() {
        return xCoordinate;
    }

    public void setxCoordinate(String xCoordinate) {
        this.xCoordinate = xCoordinate;
    }

    public String getyCoordinate() {
        return yCoordinate;
    }

    public void setyCoordinate(String yCoordinate) {
        this.yCoordinate = yCoordinate;
    }

    public String getLayoutConfig() {
        return layoutConfig;
    }

    public void setLayoutConfig(String layoutConfig) {
        this.layoutConfig = layoutConfig;
    }
    
}