业务类型bug修改，集成接口，远程部署等功能修改。

 Source/UBCS-WEB/src/views/modeling/BusinessAdd.vue

@@ -618,6 +618,8 @@
        this.attrRef.queryNotIn += (item.id + ",")
      });
      this.attrRef.data = [];
      this.$refs.attrRef.selectClear();
      this.attrRef.selectData = [];
      this.closeAttrDialog();
    },
    // 取消属性池勾选

 Source/UBCS-WEB/src/views/modeling/BusinessEdit.vue

@@ -660,6 +660,8 @@
        });
        this.attrRef.queryNotIn += (item.id + ",")
      });
      this.$refs.attrRef.selectClear();
      this.attrRef.selectData = [];
      this.attrRef.data = [];
      this.closeAttrDialog();
    },

 Source/UBCS/ubcs-service-api/ubcs-applyjtcodeservice-api/src/main/java/com/vci/ubcs/code/applyjtcodeservice/feign/IMdmInterJtClient.java

@@ -63,7 +63,7 @@
     * @return 返回存储是否成功信息
     */
    @PostMapping(RETURNGROUPCODE)
    public R getApplyGroupCode( @RequestBody DockingReturnStoreVO dockingResultVO);
    public R getApplyGroupCode(@RequestBody DockingReturnStoreVO dockingResultVO);

    /***
     * 主数据模型视图发布

 Source/UBCS/ubcs-service-api/ubcs-applyjtcodeservice-api/src/main/java/com/vci/ubcs/code/applyjtcodeservice/vo/DockingReturnStoreVO.java

@@ -8,10 +8,12 @@
 * @date 2023-5-26
 */
public class DockingReturnStoreVO {

    /**
     * 分类id
     */
    private String classId;

    /**
     * 源系统名称
     */
@@ -45,6 +47,5 @@
    public void setMainData(List<MainData> mainData) {
        this.mainData = mainData;
    }


}

 Source/UBCS/ubcs-service-api/ubcs-applyjtcodeservice-api/src/main/java/com/vci/ubcs/code/applyjtcodeservice/vo/MainData.java

@@ -4,43 +4,68 @@


public class MainData {

    /**
     * 申请单号
     */
    private String applyId;

    /**
     * 申请单状态（1 集团审核中,2集团审核中, 3 集团审核中,4 审核结束，赋码失败,5审核结束，赋码成功 6：待301赋码 7:已赋码 8：已赋码（沿用）9：审核中）
     */
    private String formState;

    /**
     * 主数据编码
     */
    private String customCoding;

    /**
     * 审查意见
     */
    private String examineOpinion;

    /**
     * 申请单中编码视图信息
     */
    private List<DockingViewVO> viewInfos;

    public String getApplyId() {
        return applyId;
    }

    public void setApplyId(String applyId) {
        this.applyId = applyId;
    }

    public String getFormState() {
        return formState;
    }

    public void setFormState(String formState) {
        this.formState = formState;
    }

    public String getCustomCoding() {
        return customCoding;
    }

    public void setCustomCoding(String customCoding) {
        this.customCoding = customCoding;
    }

    public String getExamineOpinion() {
        return examineOpinion;
    }

    public void setExamineOpinion(String examineOpinion) {
        this.examineOpinion = examineOpinion;
    }

    public List<DockingViewVO> getViewInfos() {
        return viewInfos;
    }

    public void setViewInfos(List<DockingViewVO> viewInfos) {
        this.viewInfos = viewInfos;
    }
@@ -54,4 +79,5 @@
            ", viewInfos=" + viewInfos +
            '}';
    }

}

 Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/feigh/MdmInterJtClient.java

@@ -1,6 +1,7 @@
package com.vci.ubcs.code.applyjtcodeservice.feigh;

import com.alibaba.cloud.commons.lang.StringUtils;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.alibaba.nacos.shaded.com.google.protobuf.ServiceException;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -12,12 +13,14 @@
import com.vci.ubcs.starter.revision.model.BaseModel;
import com.vci.ubcs.starter.util.DefaultAttrAssimtUtil;
import com.vci.ubcs.starter.util.MdmBtmTypeConstant;
import com.vci.ubcs.starter.util.SaveLogUtil;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.extern.slf4j.Slf4j;
import org.jetbrains.annotations.NotNull;
import org.springblade.core.tenant.annotation.NonDS;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.Func;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.transaction.annotation.Transactional;
@@ -79,6 +82,8 @@
    @Autowired(required = false)
    private IMdmEngineClient mdmEngineClient;

    private final SaveLogUtil saveLogUtil;

    /***
     * 申请集团编码
     * @return
@@ -119,9 +124,6 @@
        }
    }

    /*
     * 主数据业务服务
     */
    /**
     * 获取集团集团码，赋值到主数据
     * @param dockingReturnStoreVO
@@ -170,6 +172,7 @@
                } else if ("9".equals(formState)) {
                    msg = "审核中";
                }
                msg = Func.isNotBlank(mainData.getExamineOpinion()) ? mainData.getExamineOpinion():msg;
                jcontent.put("applyId", applyId);
                jcontent.put("formState", formState);
                jcontent.put("customCoding", customCoding);
@@ -220,9 +223,11 @@
            if(!CollectionUtils.isEmpty(dockingPreApplyFormList)){
                dockingPreApplyFormService.saveOrUpdateBatch(dockingPreApplyFormList);
            }
            saveLogUtil.operateLog("申请单结果返回",false,JSON.toJSONString(dockingReturnStoreVO.getMainData()));
        }catch (Throwable e){
            e.printStackTrace();
             return R.fail("集团码集成赋值失败，原因："+e.getMessage());
            saveLogUtil.operateLog("申请单结果返回",true,"错误信息："+e.getMessage()+"\n"+ JSON.toJSONString(dockingReturnStoreVO.getMainData()));
            return R.fail("集团码集成赋值失败，原因："+e.getMessage());
        }
        log.info("获取集团集团码，赋值到主数据 end");
        return R.success("集团码赋值成功");
@@ -307,8 +312,7 @@
     * @param jclassObject
     * @throws Throwable
     */
    private void getVilewMode(@NotNull DockingClassifyVO jclassObject, List<DockingClassifyViewVO> list)
        throws Throwable {
    private void getVilewMode(@NotNull DockingClassifyVO jclassObject, List<DockingClassifyViewVO> list) throws Throwable {
        String nodeLinkName = jclassObject.getNodeLinkName();
        try {
            String jclassId =StringUtils.isBlank(jclassObject.getId())?"":jclassObject.getId();

 Source/UBCS/ubcs-service/ubcs-deploy/src/main/java/com/vci/ubcs/deploy/controller/DeployAppsController.java

@@ -70,7 +70,7 @@
     */
    @PostMapping("/saveOrUpdateServiceInfo")
    public R saveOrUpdateDefault(@RequestBody DeployAppsVO deployAppsVO) throws ServiceException {
        return R.status(deployAppsService.saveOrUpdateServiceInfo(deployAppsVO));
        return deployAppsService.saveOrUpdateServiceInfo(deployAppsVO);
    }

    /**

 Source/UBCS/ubcs-service/ubcs-deploy/src/main/java/com/vci/ubcs/deploy/service/IDeployAppsService.java

@@ -40,7 +40,7 @@
     * @return
     * @throws ServiceException
     */
    boolean saveOrUpdateServiceInfo(DeployAppsVO deployAppsVO) throws ServiceException;
    R saveOrUpdateServiceInfo(DeployAppsVO deployAppsVO) throws ServiceException;

    /**
     * 新增服务信息

 Source/UBCS/ubcs-service/ubcs-deploy/src/main/java/com/vci/ubcs/deploy/service/impl/DeployAppsServiceImpl.java

@@ -202,8 +202,12 @@
     * @throws ServiceException
     */
    @Override
    public boolean saveOrUpdateServiceInfo(DeployAppsVO deployAppsVO) throws ServiceException {
        return this.saveOrUpdate(deployAppsVO);
    public R saveOrUpdateServiceInfo(DeployAppsVO deployAppsVO) throws ServiceException {
        boolean checkBoolean = checkCmdVer(deployAppsVO.getStartCmd()) && checkCmdVer(deployAppsVO.getStopCmd()) && checkCmdVer(deployAppsVO.getRestartCmd());
        if(checkBoolean){
            return R.fail("配置的命令中包含危险命令，如：rm、mv、rm -rf、chmod等命令和关键词！ ");
        }
        return R.status(this.saveOrUpdate(deployAppsVO));
    }

    /**
@@ -349,6 +353,9 @@
            if(Func.isEmpty(cmd)){
                return "The executed command is empty";
            }
            if(checkCmdVer(cmd)){
                return "配置的命令中包含危险命令，如：rm、mv、rm -rf、chmod等命令和关键词！ ";
            }
            // 执行Linux命令
            log.info("开始执行命令："+cmd);
            // Process process = Runtime.getRuntime().exec(cmd);
@@ -429,4 +436,22 @@
        return "8080";
    }

    /**
     * 启动、停止、重启命令校验
     * @param cmd
     * @return true: 包含高风险命令， false：不包含
     */
    private boolean checkCmdVer(String cmd){
        if(Func.isEmpty(cmd)){
            return false;
        }
        String[] highRiskCommands = {"rm", "rmdir", "mv", "unlink", "rm -rf", "mv -rf", "dd", "chmod", "chown", "mkfs", "shutdown", "reboot", "kill"};
        for(String highRiskCmd : highRiskCommands){
            if(cmd.contains(highRiskCmd)){
                return true;
            }
        }
        return false;
    }

}

 Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/impl/RoleServiceImpl.java

@@ -204,7 +204,7 @@

    @Override
    public String getRoleIds(String tenantId, String roleNames) {
        List<Role> roleList = baseMapper.selectList(Wrappers.<Role>query().lambda().eq(Role::getTenantId, tenantId).in(Role::getRoleName, Func.toStrList(roleNames)));
        List<Role> roleList = baseMapper.selectList(Wrappers.<Role>query().lambda().eq(Role::getTenantId, tenantId).in(Role::getRoleAlias, Func.toStrList(roleNames)));
        if (roleList != null && roleList.size() > 0) {
            return roleList.stream().map(role -> Func.toStr(role.getId())).distinct().collect(Collectors.joining(","));
        }