Merge branch 'master' of http://dev.vci-tech.com:1065/r/ubcs

 Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/coderule/ClassifyVO.java

ÎļþÒÑɾ³ý

 Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/coderule/CodeRuleVO.java

@@ -1,8 +1,39 @@
package com.vci.ubcs.code.vo.webserviceModel.coderule;

import com.vci.ubcs.code.dto.CodeRuleDTO;
import com.thoughtworks.xstream.annotations.XStreamAlias;
import com.thoughtworks.xstream.annotations.XStreamAsAttribute;
import com.thoughtworks.xstream.annotations.XStreamImplicit;

import java.util.List;

@XStreamAlias("codeRule")
public class CodeRuleVO {
//    private String

    /**
     * ç¼–码规则的编号
     */
    @XStreamAsAttribute
    private String id;

    /**
     * è§„则编号
     */
    @XStreamAsAttribute
    private String num;
    /**
     * ç¼–码规则的名称
     */
    @XStreamAsAttribute
    private String name;

    /**
     * è§„则的描述
     */
    @XStreamAsAttribute
    private String description;
    /**
     * ç¼–码的码段信息
     */
    @XStreamImplicit
    private List<CodeSectionVO> secVOList;
}

 Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/coderule/CodeSectionVO.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,163 @@
package com.vci.ubcs.code.vo.webserviceModel.coderule;

import com.thoughtworks.xstream.annotations.XStreamAlias;
import com.thoughtworks.xstream.annotations.XStreamAsAttribute;

import java.util.List;

@XStreamAlias("codeSection")
public class CodeSectionVO {
    /***
     * ä¸»é”®
     */
    @XStreamAsAttribute
    private String id;

    /***
     * ä¸»é”®
     */
    @XStreamAsAttribute
    private String num;
    /***
     * ç æ®µåç§°
     */
    @XStreamAsAttribute
    private String name;
    /**
     * æè¿°
     */
    @XStreamAsAttribute
    private String description;


    /**
     * ç æ®µç±»åž‹
     */
    @XStreamAsAttribute
    private String secType;

    /**
     * æ‰€å±žç¼–码规则
     */
    @XStreamAsAttribute
    private String pkCodeRule;


    /**
     * ç æ®µé•¿åº¦ç±»åž‹
     */
    @XStreamAsAttribute
    private String codeSecLengthType;



    /**
     * ç æ®µé•¿åº¦
     */
    @XStreamAsAttribute
    private String codeSecLength;


    /**
     * çˆ¶åˆ†ç±»ç æ®µä¸»é”®
     */
    @XStreamAsAttribute
    private String parentClassifySecOid;

    /***
     * ç æ®µç å€¼
     */
    private List<CodeSectionValueVO> sectionValues;
    /**
     * æ—¥æœŸæ ¼å¼
     */
    @XStreamAsAttribute
    private String codeDateFormatStr;

    public String getId() {
        return id;
    }

    public void setId(String id) {
        this.id = id;
    }

    public String getNum() {
        return num;
    }

    public void setNum(String num) {
        this.num = num;
    }

    public String getName() {
        return name;
    }

    public void setName(String name) {
        this.name = name;
    }

    public String getDescription() {
        return description;
    }

    public void setDescription(String description) {
        this.description = description;
    }

    public String getSecType() {
        return secType;
    }

    public void setSecType(String secType) {
        this.secType = secType;
    }

    public String getPkCodeRule() {
        return pkCodeRule;
    }

    public void setPkCodeRule(String pkCodeRule) {
        this.pkCodeRule = pkCodeRule;
    }

    public String getCodeSecLengthType() {
        return codeSecLengthType;
    }

    public void setCodeSecLengthType(String codeSecLengthType) {
        this.codeSecLengthType = codeSecLengthType;
    }

    public String getCodeSecLength() {
        return codeSecLength;
    }

    public void setCodeSecLength(String codeSecLength) {
        this.codeSecLength = codeSecLength;
    }

    public String getCodeDateFormatStr() {
        return codeDateFormatStr;
    }

    public void setCodeDateFormatStr(String codeDateFormatStr) {
        this.codeDateFormatStr = codeDateFormatStr;
    }

    @Override
    public String toString() {
        return "CodeSectionVO{" +
            "id='" + id + '\'' +
            ", num='" + num + '\'' +
            ", name='" + name + '\'' +
            ", description='" + description + '\'' +
            ", secType='" + secType + '\'' +
            ", pkCodeRule='" + pkCodeRule + '\'' +
            ", codeSecLengthType='" + codeSecLengthType + '\'' +
            ", codeSecLength='" + codeSecLength + '\'' +
            ", codeDateFormatStr='" + codeDateFormatStr + '\'' +
            '}';
    }
}

 Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/coderule/CodeSectionValueVO.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,24 @@
package com.vci.ubcs.code.vo.webserviceModel.coderule;

import com.thoughtworks.xstream.annotations.XStreamAsAttribute;

public class CodeSectionValueVO {
    /***
     * ç å€¼ä¸»é”®
     */
    private String id;
    /***
     * ç å€¼ç¼–号
     */
    private String num;
    /***
     * ç æ®µå€¼
     */
    private String value;

    /**
     * æè¿°
     */
    @XStreamAsAttribute
    private String description;
}

 Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/coderule/ResultClassifyRuleData.java

ÎļþÃû´Ó Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/coderule/ResultData.java ÐÞ¸Ä
@@ -3,18 +3,18 @@
import com.thoughtworks.xstream.annotations.XStreamAlias;

@XStreamAlias("data")
public class ResultData {
public class ResultClassifyRuleData {
    @XStreamAlias("errorid")
    private  String errorid;
    @XStreamAlias("msg")
    private String msg;
    private LibraryVO library ;
    private ResultLibraryVO library ;

    public LibraryVO getLibrary() {
    public ResultLibraryVO getLibrary() {
        return library;
    }

    public void setLibrary(LibraryVO library) {
    public void setLibrary(ResultLibraryVO library) {
        this.library = library;
    }


 Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/coderule/ResultClassifyRuleVO.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,21 @@
package com.vci.ubcs.code.vo.webserviceModel.coderule;

public class ResultClassifyRuleVO {

   private ResultClassifyRuleData resultData;

    public ResultClassifyRuleData getResultData() {
        return resultData;
    }

    public void setResultData(ResultClassifyRuleData resultData) {
        this.resultData = resultData;
    }

    @Override
    public String toString() {
        return "ResultClassifyVO{" +
                "resultData=" + resultData +
                '}';
    }
}

 Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/coderule/ResultClassifyVO.java

@@ -1,21 +1,146 @@
package com.vci.ubcs.code.vo.webserviceModel.coderule;

import com.thoughtworks.xstream.annotations.XStreamAlias;
import com.thoughtworks.xstream.annotations.XStreamAsAttribute;

@XStreamAlias("classify")
public class ResultClassifyVO {
    /**
     * åˆ†ç±»id
     */
    @XStreamAsAttribute
    private String id;
    /***
     * åˆ†ç±»åç§°
     */
    @XStreamAsAttribute
    private String name;
    /***
     * çˆ¶èŠ‚点id
     */
    @XStreamAsAttribute
    private String pid;
    /***
     * åˆ†ç±»ä»£å·
     */
    @XStreamAsAttribute
    private String classCode;
    /***
     * æè¿°
     */
    @XStreamAsAttribute
    private  String description;
    /***
     * åˆ†ç±»é“¾æŽ¥è·¯å¾„
     */
    @XStreamAsAttribute
    private  String fullPathName;
    /***
     * åˆ†ç±»çŠ¶æ€
     */
    @XStreamAsAttribute
    private String lcStatus;
    /***
     * è§„则id
     */
    @XStreamAsAttribute
    private String codeRuleId;

   private ResultData resultData;
    /***
     * è§„则id
     */
    @XStreamAsAttribute
    private CodeRuleVO codeRuleVO;
    /***
     * æ˜¯å¦ä¸ºå¶å­èŠ‚点
     */
    @XStreamAsAttribute
    private boolean isLeaf;

    public ResultData getResultData() {
        return resultData;
    public String getId() {
        return id;
    }

    public void setResultData(ResultData resultData) {
        this.resultData = resultData;
    public void setId(String id) {
        this.id = id;
    }

    @Override
    public String toString() {
        return "ResultClassifyVO{" +
                "resultData=" + resultData +
                '}';
    public String getName() {
        return name;
    }

    public void setName(String name) {
        this.name = name;
    }

    public String getPid() {
        return pid;
    }

    public void setPid(String pid) {
        this.pid = pid;
    }

    public String getClassCode() {
        return classCode;
    }

    public void setClassCode(String classCode) {
        this.classCode = classCode;
    }

    public String getDescription() {
        return description;
    }

    public void setDescription(String description) {
        this.description = description;
    }

    public String getFullPathName() {
        return fullPathName;
    }

    public void setFullPathName(String fullPathName) {
        this.fullPathName = fullPathName;
    }

    public String getLcStatus() {
        return lcStatus;
    }

    public void setLcStatus(String lcStatus) {
        this.lcStatus = lcStatus;
    }

    public String getCodeRuleId() {
        return codeRuleId;
    }

    public void setCodeRuleId(String codeRuleId) {
        this.codeRuleId = codeRuleId;
    }

    public boolean isLeaf() {
        return isLeaf;
    }

    public void setLeaf(boolean leaf) {
        isLeaf = leaf;
    }

    @Override
    public String toString() {
        return "ClassifyVO{" +
            "id='" + id + '\'' +
            ", name='" + name + '\'' +
            ", pid='" + pid + '\'' +
            ", classCode='" + classCode + '\'' +
            ", description='" + description + '\'' +
            ", fullPathName='" + fullPathName + '\'' +
            ", lcStatus='" + lcStatus + '\'' +
            ", codeRuleId='" + codeRuleId + '\'' +
            ", isLeaf=" + isLeaf +
            '}';
    }
}

 Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/coderule/ResultLibraryVO.java

ÎļþÃû´Ó Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/coderule/LibraryVO.java ÐÞ¸Ä
@@ -7,15 +7,13 @@
import java.util.List;

@XStreamAlias("library ")
public class LibraryVO {
public class ResultLibraryVO {
    @XStreamAsAttribute
    private String id;
    @XStreamAsAttribute
    private  String name;
    @XStreamImplicit
    private List<ClassifyVO>classify;

    private List<CodeRuleVO> coderule;
    private List<ResultClassifyVO>classify;

    public String getId() {
        return id;
@@ -33,11 +31,11 @@
        this.name = name;
    }

    public List<ClassifyVO> getClassify() {
    public List<ResultClassifyVO> getClassify() {
        return classify;
    }

    public void setClassify(List<ClassifyVO> classify) {
    public void setClassify(List<ResultClassifyVO> classify) {
        this.classify = classify;
    }


 Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/BtmType.java

@@ -174,8 +174,8 @@
    /**
     * ä¸šåŠ¡ç±»åž‹æ‰€å±žé¢†åŸŸ
     */
    @TableField("\"DOMAIN\"")
    private String domain;
//    @TableField("\"DOMAIN\"")
    private String bizDomain;

    /**
     * ä¸€è‡´æ€§æ ‡è¯†

 Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/LifeCycleEvent.java

@@ -41,6 +41,6 @@
    /**
     * æ‰€å±žé¢†åŸŸ
     */
    private String domain;
    private String bizDomain;

}

 Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/LifeCycleLineEvent.java

@@ -1,13 +1,10 @@
package com.vci.ubcs.omd.entity;


import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.vci.ubcs.starter.revision.model.BaseModel;
import io.swagger.annotations.ApiModel;
import lombok.Data;

import java.util.Date;

/**
 *
@@ -48,7 +45,7 @@
    /**
     * æ‰€å±žé¢†åŸŸ
     */
    private String domain;
    private String bizDomain;


}

 Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/LinkType.java

@@ -118,6 +118,6 @@
    /**
     * é¢†åŸŸå€¼
     */
    private String domain;
    private String bizDomain;

}

 Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/vo/BtmTypeVO.java

@@ -179,7 +179,7 @@
    /**
     * ä¸šåŠ¡ç±»åž‹æ‰€å±žé¢†åŸŸ
     */
    private String domain;
    private String bizDomain;

    /**
     * é¢†åŸŸæ˜¾ç¤ºå­—段

 Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/vo/LinkTypeVO.java

@@ -122,7 +122,7 @@
    /**
     * é¢†åŸŸå€¼
     */
    private String domain;
    private String bizDomain;

    /**
     * é¢†åŸŸæ˜¾ç¤ºå€¼

 Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/revision/model/BaseModel.java

@@ -24,7 +24,7 @@
    @TableId(value = "OID",type = IdType.ASSIGN_UUID)
    private String oid;

    @TableField(value = "ID")
    @TableField(value = "id")
    private String id;

    private String name;

 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/CodeClassifyMapper.java

@@ -113,7 +113,7 @@
     */
    List<CodeClassify> selectByFieldNamePath(@Param("fieldPath") String fieldPath,@Param("fieldName") String fieldName);

    public List<CodeClassifyVO> getIdPathToNamePathByParentId(@Param("parentId")String parentId);
    public List<CodeClassify> getIdPathToNamePathByParentId(@Param("parentId")String parentId);


    CodeClassify selectByIdRel(@Param("oid") String oid);

 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyServiceImpl.java

@@ -544,7 +544,9 @@
     */
    @Override
    public List<CodeClassifyVO> getIdPathToNamePathByParentId(String classifyId, boolean enable) {
        return codeClassifyMapper.getIdPathToNamePathByParentId(classifyId);
        List<CodeClassify>  doList=    codeClassifyMapper.getIdPathToNamePathByParentId(classifyId);
        List<CodeClassifyVO> voList = codeClassifyDO2VOs(doList);
        return voList;
    }



 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmIOServiceImpl.java

@@ -1016,7 +1016,7 @@
                    thisCbos.stream().forEach(clientBusinessObject -> {
                        BaseModel baseModel=new BaseModel();
                        BeanUtil.convert(clientBusinessObject,baseModel);
                        baseModel.setData(VciBaseUtil.objectToMapString(clientBusinessObject));
                        //baseModel.setData(VciBaseUtil.objectToMapString(clientBusinessObject));
                        dataCBOList.add(baseModel);
                        dataCBOIdList.add(baseModel);
                    });
@@ -1030,9 +1030,14 @@
                                String rowIndex = cbo.getAttributeValue(IMPORT_ROW_INDEX);
                                errorMap.put(rowIndex, errorMap.getOrDefault(rowIndex, "") + ";系统错误，存储数据的时候出错了");
                            });

                        }
                    }
                });
                if (errorMap.size() > 0) {
                    isExport = true;
                }
                createWriteExcelData(rowDataList, errorMap, new ArrayList<>(), titleRowData, shetNameMap, finalTemplateVO);
                engineService.batchSaveSelectChar(templateVO, dataCBOIdList);
            }
        }
@@ -1061,7 +1066,19 @@

        return codeImProtRusultVO;
    }
    /*private void converBaseModels(List<ClientBusinessObject> clientBusinessObjects,List<BaseModel>dataCBOList){
        clientBusinessObjects.stream().forEach(clientBusinessObject -> {
            BaseModel baseModel=new BaseModel();
            BeanUtil.convert(clientBusinessObject,baseModel);
            Map<String,String> dataMap=new HashMap<>();
            clientBusinessObject.getHisAttrValList()
            baseModel.setData(VciBaseUtil.objectToMapString(baseModel));

            AttributeValue[] newAttributeValue=     clientBusinessObject.getNewAttrValList();
            dataCBOList.add(baseModel);
        });

    }*/
    /***
     * ä»Žexecl里构建对象
     * @param rowDataList
@@ -1338,7 +1355,7 @@
                cboList.stream().forEach(clientBusinessObject -> {
                    BaseModel baseModel=new BaseModel();
                    BeanUtil.convert(clientBusinessObject,baseModel);
                    baseModel.setData(VciBaseUtil.objectToMapString(clientBusinessObject));
                    //baseModel.setData(VciBaseUtil.objectToMapString(clientBusinessObject));
                    dataCBOList.add(baseModel);
                    dataCBOIdList.add(baseModel.getOid());
                });
@@ -1528,7 +1545,7 @@
                needSaveCboList.stream().forEach(clientBusinessObject -> {
                    BaseModel baseModel=new BaseModel();
                    BeanUtil.convert(clientBusinessObject,baseModel);
                    baseModel.setData(VciBaseUtil.objectToMapString(clientBusinessObject));
                    //baseModel.setData(VciBaseUtil.objectToMapString(clientBusinessObject));
                    dataCBOList.add(baseModel);
//                    allNeedSaveCboList.add(baseModel);
                });
@@ -1802,7 +1819,7 @@
            needSaveCboList.stream().forEach(clientBusinessObject -> {
                BaseModel baseModel=new BaseModel();
                BeanUtil.convert(clientBusinessObject,baseModel);
                baseModel.setData(VciBaseUtil.objectToMapString(clientBusinessObject));
            //(VciBaseUtil.objectToMapString(clientBusinessObject));
                dataCBOList.add(baseModel);
                allNeedSaveCboList.add(baseModel.getOid());
            });
@@ -2004,7 +2021,7 @@

                BaseModel baseModel=new BaseModel();
                BeanUtil.convert(cbo,baseModel);
                baseModel.setData(VciBaseUtil.objectToMapString(cbo));
                //baseModel.setData(VciBaseUtil.objectToMapString(cbo));
                updateList.add(baseModel);
            }else if(operation.equals("delete")){//如果在流程中不允许删除，不在流程中状态为发布或者停用的数据不允许删除，将其更改为停用，其他的情况直接删除
                //  if(finalIsProcess){
@@ -2045,7 +2062,7 @@

                    BaseModel baseModel=new BaseModel();
                    BeanUtil.convert(cbo,baseModel);
                    baseModel.setData(VciBaseUtil.objectToMapString(cbo));
                    //baseModel.setData(VciBaseUtil.objectToMapString(cbo));
                    updateList.add(baseModel);
                }catch (VciBaseException e) {
                    e.printStackTrace();

 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmProductCodeServiceImpl.java

@@ -23,6 +23,7 @@
import com.vci.ubcs.starter.exception.VciBaseException;
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.web.constant.QueryOptionConstant;
import com.vci.ubcs.starter.web.constant.RegExpConstant;
import com.vci.ubcs.starter.web.enumpck.OsCodeFillTypeEnum;
@@ -31,6 +32,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;

import javax.annotation.Resource;
@@ -73,6 +75,7 @@
    private FormulaServiceImpl formulaService;

    @Override
    @Transactional(rollbackFor = VciBaseException.class)
    public List<String> productCodeAndSaveData(CodeClassifyFullInfoBO classifyFullInfoBO, CodeClassifyTemplateVO templateVO, CodeRuleVO ruleVO, List<CodeOrderSecDTO> secDTOList, List<BaseModel> dataCBOList) throws Exception {
//        BatchCBO batchCBO = new BatchCBO();
//        WebUtil.setPersistence(false);
@@ -99,6 +102,8 @@
                String code = cbo.getId();
                List<String> serialUnitList = new ArrayList<>();
                String[] secLengths = cbo.getData().get(CODE_SEC_LENGTH_FIELD).split("#");
                cbo.getData().remove(CODE_SEC_LENGTH_FIELD);//将此key除去
                cbo.getData().remove(IMPORT_ROW_INDEX);//将此key除去
                List<CodeBasicSecVO> secVOList = ruleVO.getSecVOList().stream().sorted(((o1, o2) -> o1.getOrderNum().compareTo(o2.getOrderNum()))).collect(Collectors.toList());
                Map<String/**码段的主键**/,String/**码段的值**/> serialValueMap = new HashMap<>();
                Map<String, CodeBasicSecVO> secVOMap = secVOList.stream().collect(Collectors.toMap(s -> s.getOid(), t -> t));
@@ -147,6 +152,7 @@
                    });
                }
                CodeAllCode allCodeDO = new CodeAllCode();
                DefaultAttrAssimtUtil.addDefaultAttrAssimt(allCodeDO, MdmBtmTypeConstant.CODE_ALL_CODE);
                allCodeDO.setCodeClassifyOid(classifyFullInfoBO.getCurrentClassifyVO().getOid());
                allCodeDO.setCodeRuleOid(ruleVO.getOid());
                allCodeDO.setId(cbo.getId());
@@ -209,7 +215,7 @@
            }
            //处理allCode
            if(!CollectionUtils.isEmpty(allCodeDOList)){
                Map<String, List<CodeAllCode>> ruleGroup = allCodeDOList.stream().collect(Collectors.groupingBy(s -> s.getCodeRuleOid()));
                Map<String,List<CodeAllCode>> ruleGroup = allCodeDOList.stream().collect(Collectors.groupingBy(s -> s.getCodeRuleOid()));
                Map<String, CodeAllCode> codeDOMap = allCodeDOList.stream().collect(Collectors.toMap(s -> s.getCodeRuleOid() + "${SEP}" + s.getId(), t -> t));
                List<CodeAllCode> addCodeDOs = new ArrayList<>();
                List<CodeAllCode> editCodeDOs = new ArrayList<>();
@@ -252,13 +258,14 @@
                    codeAllCodeService.updateBatchById(editCodeDOs);
                }
                if(!CollectionUtils.isEmpty(addCodeDOs)){
//                    batchCBO.copyFromOther(allCodeMapper.batchInsert(addCodeDOs));
                    //batchCBO.copyFromOther(allCodeMapper.batchInsert(addCodeDOs));
                    Map<String, String> statusMap = addCodeDOs.stream().collect(Collectors.toMap(s -> s.getOid(), s -> s.getLcStatus()));
                    addCodeDOs.stream().filter(s -> StringUtils.equalsIgnoreCase("codeallcode",s.getBtmname())).forEach(s -> {
                        s.setLcStatus(statusMap.get(s.getOid()));
                    });
                    codeAllCodeService.saveBatch(addCodeDOs);
                }
                mdmEngineService.insertBatchByType(dataCBOList.get(0).getBtmname(),dataCBOList);
            }
//            WebUtil.setPersistence(true);
//            boService.persistenceBatch(batchCBO);

 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/util/ClientBusinessObject.java

@@ -69,8 +69,9 @@
                attrVal.attrName = attributeName.toUpperCase();
                attrVal.attrVal = attributeValue;
                attrValList.add(attrVal);
            }

            }
            this.getData().put(attributeName,attributeValue);
            this.newAttrValList = (AttributeValue[])attrValList.toArray(new AttributeValue[attrValList.size()]);
    //    }
    }

 Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeCLassifyMapper.xml

@@ -126,6 +126,9 @@
                    <when test='fieldInPath=="name"'>
                        SYS_CONNECT_BY_PATH(codeclassify0.name, '#')   as path
                    </when>
                    <when test='fieldInPath=="oid"'>
                        SYS_CONNECT_BY_PATH(codeclassify0.oid, '#')   as path
                    </when>
                    <otherwise>
                        SYS_CONNECT_BY_PATH(codeclassify0.id, '#')   as path
                    </otherwise>
@@ -194,9 +197,8 @@
                SYS_CONNECT_BY_PATH(name, '#')   as namePath,
                SYS_CONNECT_BY_PATH(id, '#')   as idPath
        from pl_code_classify  plcodeclassify
        START WITH parentCodeClassifyOid is null
        START WITH oid = #{parentId}
        CONNECT BY PRIOR OID = parentCodeClassifyOid) codeclassify0
        where codeclassify0.paths =#{fieldPath}
    </select>



 Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/DockingSysIntHeaderMapper.xml

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,39 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.vci.ubcs.code.mapper.DockingSysIntHeaderMapper">
    <!-- é€šç”¨æŸ¥è¯¢æ˜ å°„结果 -->
    <resultMap id="plDockingSysIntParamResultMap" type="com.vci.ubcs.code.entity.DockingSysIntHeader">
        <result column="OID" property="oid"/>
        <result column="REVISIONOID" property="revisionOid"/>
        <result column="NAMEOID" property="nameOid"/>
        <result column="BTMNAME" property="btmname"/>
        <result column="LASTR" property="lastR"/>
        <result column="FIRSTR" property="firstR"/>
        <result column="LASTV" property="lastV"/>
        <result column="FIRSTV" property="firstV"/>
        <result column="CREATOR" property="creator"/>
        <result column="CREATETIME" property="createTime"/>
        <result column="LASTMODIFIER" property="lastModifier"/>
        <result column="LASTMODIFYTIME" property="lastModifyTime"/>
        <result column="REVISIONRULE" property="revisionRule"/>
        <result column="VERSIONRULE" property="versionRule"/>
        <result column="REVISIONSEQ" property="revisionSeq"/>
        <result column="REVISIONVALUE" property="revisionValue"/>
        <result column="VERSIONSEQ" property="versionSeq"/>
        <result column="VERSIONVALUE" property="versionValue"/>
        <result column="LCTID" property="lctid"/>
        <result column="LCSTATUS" property="lcStatus"/>
        <result column="TS" property="ts"/>
        <result column="ID" property="id"/>
        <result column="NAME" property="name"/>
        <result column="DESCRIPTION" property="description"/>
        <result column="OWNER" property="owner"/>
        <result column="COPYFROMVERSION" property="copyFromVersion"/>

        <result column="INFOOID" property="infoOid"/>
        <result column="HEADERKEY" property="headerKey"/>
        <result column="HEADERALUE" property="headerValue"/>
        <result column="USEDFLAG" property="usedFlag"/>
        <result column="tenant_id" property="tenantId"/>
    </resultMap>
</mapper>

 Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/feign/BtmTypeClient.java

@@ -84,7 +84,7 @@
        Query query = new Query();
        query.setSize(pageHelper.getLimit());
        query.setCurrent(pageHelper.getPage());
        IPage<BtmType> page = btmTypeService.page(Condition.getPage(query), Condition.getQueryWrapper(condition,BtmType.class).lambda().eq(BtmType::getDomain, domainValue).orderByAsc(BtmType::getId));
        IPage<BtmType> page = btmTypeService.page(Condition.getPage(query), Condition.getQueryWrapper(condition,BtmType.class).lambda().eq(BtmType::getBizDomain, domainValue).orderByAsc(BtmType::getId));
        if (CollectionUtils.isEmpty(page.getRecords())){
            return R.data(null);
        }
@@ -116,7 +116,7 @@
        conditionMap.remove(DOMAIN);
        BtmType queryObj = new BtmType();
        BeanMap.create(queryObj).putAll(conditionMap);
        List<BtmType> list = btmTypeService.list(Condition.getQueryWrapper(queryObj).lambda().eq(BtmType::getDomain, domainValue).orderByAsc(BtmType::getId));
        List<BtmType> list = btmTypeService.list(Condition.getQueryWrapper(queryObj).lambda().eq(BtmType::getBizDomain, domainValue).orderByAsc(BtmType::getId));
        if (CollectionUtils.isEmpty(list)){
            return R.data(null);
        }

 Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/feign/LinkTypeClient.java

@@ -75,7 +75,7 @@
        Query query = new Query();
        query.setSize(pageHelper.getLimit());
        query.setCurrent(pageHelper.getPage());
        IPage<LinkType> page = linkTypeService.page(Condition.getPage(query), Condition.getQueryWrapper(queryObj).lambda().eq(LinkType::getDomain, domainValue).orderByAsc(LinkType::getId));
        IPage<LinkType> page = linkTypeService.page(Condition.getPage(query), Condition.getQueryWrapper(queryObj).lambda().eq(LinkType::getBizDomain, domainValue).orderByAsc(LinkType::getId));
        Page<LinkTypeVO> pageVO = new Page<>();
        BeanUtil.copy(page,pageVO);
        pageVO.setRecords(LinkTypeWrapper.build().listEntityVO(page.getRecords(),null));
@@ -108,7 +108,7 @@
        conditionMap.remove(DOMAIN);
        LinkType queryObj = new LinkType();
        BeanMap.create(queryObj).putAll(conditionMap);
        List<LinkType> doList = linkTypeService.list(Condition.getQueryWrapper(queryObj).lambda().eq(LinkType::getDomain, domainValue).orderByAsc(LinkType::getId));
        List<LinkType> doList = linkTypeService.list(Condition.getQueryWrapper(queryObj).lambda().eq(LinkType::getBizDomain, domainValue).orderByAsc(LinkType::getId));
        return R.data(LinkTypeWrapper.build().listEntityVO(doList,null));
    }


 Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/impl/BtmTypeServiceImpl.java

@@ -387,7 +387,7 @@
        ddlDTO.setBtmTypeList(btmTypeVOList);
        try {
            // å°†ä»¥å‰çš„checkDifferent和reflexDifferent结合了
            R result = DomainRepeater.checkDifferent(ddlDTO,btmTypeVO.getDomain());
            R result = DomainRepeater.checkDifferent(ddlDTO,btmTypeVO.getBizDomain());
            if (result.isSuccess()){
                List<ModifyAttributeInfo> infoList = new ArrayList<>();
                Object data = result.getData();
@@ -494,12 +494,13 @@
        }
        checkBtmTypeBeforeSave(btmTypeDTO);
        BtmType btmTypeDO = Optional.ofNullable(BeanUtil.copy(btmTypeDTO, BtmType.class)).orElseGet(BtmType::new);
        btmTypeDO.setBizDomain(btmTypeDTO.getDomain());
        List<BtmTypeLinkAttributesDTO> attributes = btmTypeDTO.getAttributes();
        List<BtmTypeAttributeVO> afterAttributes;
        if (StringUtils.isBlank(btmTypeDO.getOid())){
            btmTypeDO = BtmTypeWrapper.build().entityBeforeInsert(btmTypeDO);
            if (StringUtils.isBlank(btmTypeDO.getTableName())) {
                btmTypeDO.setTableName(getTableName(btmTypeDO.getId(),btmTypeDO.getDomain()));
                btmTypeDO.setTableName(getTableName(btmTypeDO.getId(),btmTypeDO.getBizDomain()));
            }
            // æ·»åŠ å±žæ€§
            btmTypeDTO.setOid(btmTypeDO.getOid());
@@ -650,7 +651,7 @@
        try {
            Map<String, String> domain = Optional.ofNullable(DomainRepeater.getDomain()).orElseGet(ArrayList::new).stream().collect(Collectors.toMap(DomainVO::getValue, DomainVO::getLabel));
            List<BtmTypeVO> vos = BtmTypeWrapper.build().listEntityVO(baseMapper.selectAll());
            Map<String, List<BtmTypeVO>> domainMap = vos.stream().sorted(Comparator.comparing(BtmTypeVO::getId)).collect(Collectors.groupingBy(BtmTypeVO::getDomain));
            Map<String, List<BtmTypeVO>> domainMap = vos.stream().sorted(Comparator.comparing(BtmTypeVO::getId)).collect(Collectors.groupingBy(BtmTypeVO::getBizDomain));
            List<BtmTreeVO> treeList = new ArrayList<>();
            domainMap.forEach((k,v)-> {
                if (domain.containsKey(k)){
@@ -733,7 +734,7 @@
            btmType.setCreator(user);
            btmType.setBtmName(BtmTypeConstant.BTMTYPE);
            btmType.setCreateTime(now);
            btmType.setDomain(domain);
            btmType.setBizDomain(domain);
            btmType.setLastModifyTime(now);
            btmType.setLastModifier(user);
            btmType.setName(dto.getDescription());

 Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/impl/LinkTypeServiceImpl.java

@@ -395,7 +395,7 @@
            LinkType linkTypeDO = new LinkType();
            BeanUtil.copy(linkTypeVO, linkTypeDO);
            if (StringUtils.isBlank(linkTypeDO.getTableName())){
                linkTypeDO.setTableName(getTableName(linkTypeDO.getId(),linkTypeDO.getDomain()));
                linkTypeDO.setTableName(getTableName(linkTypeDO.getId(),linkTypeDO.getBizDomain()));
            }
            String creator = AuthUtil.getUserAccount();
            Date now = new Date();
@@ -411,7 +411,7 @@
                List<LinkTypeAttributeVO> attributes = typeVO.getAttributes();
                attributes.addAll(linkTypeAttributeService.getDefaultAttributes(typeVO));
                typeVO.setAttributes(attributes);
                R r = DomainRepeater.submitLinkType(typeVO.getDomain(), typeVO);
                R r = DomainRepeater.submitLinkType(typeVO.getBizDomain(), typeVO);
                if (!r.isSuccess()){
                    dataSourceTransactionManager.rollback(transaction);
                }else {
@@ -571,7 +571,7 @@
                attributes.addAll(defaultAttributes);
                linkTypeVO.setAttributes(attributes);
                BtmAndLinkTypeDdlDTO ddlDTO = new BtmAndLinkTypeDdlDTO();
                DomainRepeater.checkDifferent(ddlDTO,linkTypeVO.getDomain());
                DomainRepeater.checkDifferent(ddlDTO,linkTypeVO.getBizDomain());
                dataSourceTransactionManager.commit(transaction);
            }
        } catch (Throwable e){
@@ -625,10 +625,10 @@
            List<TableCheckDTO> checkList = linkTypeDOList.stream().map(linkType -> {
                TableCheckDTO tableCheckDTO = new TableCheckDTO();
                tableCheckDTO.setBtmName(linkType.getId());
                tableCheckDTO.setTableName(getTableName(linkType.getId(),linkType.getDomain()));
                tableCheckDTO.setTableName(getTableName(linkType.getId(),linkType.getBizDomain()));
                tableCheckDTO.setCheckTableHasData(true);
                tableCheckDTO.setNeedDelete(true);
                tableCheckDTO.setDomain(linkType.getDomain());
                tableCheckDTO.setDomain(linkType.getBizDomain());
                return tableCheckDTO;
            }).collect(Collectors.toList());
            R result = DomainRepeater.checkTableHasDataByTableNameThenDrop(checkList);
@@ -877,7 +877,7 @@
        try {
            Map<String, String> domain = Optional.ofNullable(DomainRepeater.getDomain()).orElseGet(ArrayList::new).stream().collect(Collectors.toMap(DomainVO::getValue, DomainVO::getLabel));
            List<LinkTypeVO> vos = LinkTypeWrapper.build().listEntityVO(baseMapper.selectAll(), null);
            Map<String, List<LinkTypeVO>> domainMap = vos.stream().collect(Collectors.groupingBy(LinkTypeVO::getDomain));
            Map<String, List<LinkTypeVO>> domainMap = vos.stream().collect(Collectors.groupingBy(LinkTypeVO::getBizDomain));
            List<BtmTreeVO> treeList = new ArrayList<>();
            domainMap.forEach((k,v)-> {
                if (domain.containsKey(k)){

 Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/wrapper/BtmTypeWrapper.java

@@ -36,7 +36,7 @@
    @Override
    public BtmTypeVO entityVO(BtmType entity) {
        BtmTypeVO vo = Objects.requireNonNull(BeanUtil.copy(entity, BtmTypeVO.class));
        vo.setDomainText(NewAppConstantEnum.getTextByName(vo.getDomain()));
        vo.setDomainText(NewAppConstantEnum.getTextByName(vo.getBizDomain()));
        vo.setTableName(vo.getTableName() == null? "" : vo.getTableName().toUpperCase(Locale.ROOT));
        // åœ¨è¿™é‡Œè®¾ç½®æžšä¸¾æ˜¾ç¤ºå€¼
        vo.setRevisionFlag(BooleanEnum.TRUE.getValue().equals(entity.getRevisionFlag()));

 Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/wrapper/LinkTypeWrapper.java

@@ -51,7 +51,7 @@
        vo.setToBtmTypes(toBtm);
        vo.setTableName(vo.getTableName().toUpperCase(Locale.ROOT));
        // æžšä¸¾å¤„理
        vo.setDomainText(NewAppConstantEnum.getTextByName(vo.getDomain()));
        vo.setDomainText(NewAppConstantEnum.getTextByName(vo.getBizDomain()));
        return vo;
    }


 Source/UBCS/ubcs-service/ubcs-omd/src/main/resources/mapper/BtmTypeMapper.xml

@@ -33,7 +33,7 @@
        <result column="last_modifier" jdbcType="VARCHAR" property="lastModifier" />
        <result column="last_modify_time" jdbcType="TIMESTAMP" property="lastModifyTime" />
        <result column="ts" jdbcType="TIMESTAMP" property="ts" />
        <result column="domain" jdbcType="VARCHAR" property="domain" />
        <result column="biz_domain" jdbcType="VARCHAR" property="bizDomain" />
        <result column="consistence" jdbcType="VARCHAR" property="consistence" />
    </resultMap>

@@ -41,7 +41,7 @@
        oid, id, name, description, table_name, revision_rule_id, revision_rule_name,revision_flag,
    revision_sep, input_revision_flag, secret_flag, abstract_flag, impl_class, shape,life_cycle_flag, life_cycle_id,life_cycle_name,
    version_rule,sub_life_cycle_id,sub_life_cycle_name, view_flag, view_create_sql,btm_name, owner, creator, create_time, last_modifier,
    last_modify_time, ts,domain,consistence
    last_modify_time, ts,biz_domain,consistence
    </sql>
    <sql id="tableName">
        pl_omd_btm_type
@@ -81,7 +81,7 @@
            #{item.lastModifier,jdbcType=VARCHAR},
            #{item.lastModifyTime,jdbcType=TIMESTAMP},
            #{item.ts,jdbcType=TIMESTAMP},
            #{item.domain,jdbcType=VARCHAR},
            #{item.bizDomain,jdbcType=VARCHAR},
            #{item.consistence,jdbcType=VARCHAR}
            from dual
            )
@@ -166,7 +166,7 @@
            last_modifier = #{lastModifier,jdbcType=VARCHAR},
            last_modify_time = #{lastModifyTime,jdbcType=TIMESTAMP},
            ts = #{ts,jdbcType=TIMESTAMP},
            domain = #{domain,jdbcType=VARCHAR},
            biz-domain = #{bizDomain,jdbcType=VARCHAR},
            consistence = #{consistence,jdbcType=VARCHAR}
        where OID = #{oid,jdbcType=VARCHAR}
    </update>

 Source/UBCS/ubcs-service/ubcs-omd/src/main/resources/mapper/LinkTypeMapper.xml

@@ -19,13 +19,13 @@
        <result column="last_modifier" jdbcType="VARCHAR" property="lastModifier" />
        <result column="last_modify_time" jdbcType="TIMESTAMP" property="lastModifyTime" />
        <result column="ts" jdbcType="TIMESTAMP" property="ts" />
        <result column="domain" jdbcType="VARCHAR" property="domain" />
        <result column="biz-domain" jdbcType="VARCHAR" property="bizDomain" />
    </resultMap>

    <sql id="base_query_column">
        oid, id, name, description, shape, impl_class, from_btm_type, from_btm_type_name,
            to_btm_type, to_btm_type_name, btm_name, owner, creator, create_time, last_modifier, last_modify_time,
            ts, domain
            ts, biz-domain
    </sql>

    <sql id="tableName">