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

 Source/UBCS-WEB/src/components/refer/vciWebReferDefalut.vue

@@ -62,7 +62,7 @@
      selectionList: [],
      option: {
        addBtn: false,
        height: this.referConfig.options.height ? this.referConfig.options.height : 475,
        //height: this.referConfig.options.height ? this.referConfig.options.height : 475,
        calcHeight: 30,
        tip: false,
        menu:false,
@@ -242,7 +242,7 @@
    searchChange(params, done) {
      this.query = params;
      this.page.currentPage = 1;
      this.onLoad(this.page, params);
      this.onLoad(this.page);
      done();
    },
    currentChange(currentPage){
@@ -254,24 +254,30 @@
    selectionChange(list) {
      if (!this.isMuti && list.length > 1) {
        const nowVal = list.shift();
        this.$refs.referCrud.toggleRowSelection(nowVal, false);
        this.$refs.referDefalutCrud.toggleRowSelection(nowVal, false);
      }
      this.selectionList = list
    },
    selectionClear() {
      this.selectionList = [];
      this.$refs.referCrud.clearSelection();
      this.$refs.referDefalutCrud.toggleSelection();
    },
    refreshChange() {
      this.onLoad(this.page, this.query);
    },
    onLoad(page, params = this.params) {
    onLoad(page, params={}) {
      if(this.url){
        this.loading = true;
        getList(Object.assign(params, this.query),page.currentPage, page.pageSize, this.url).then(res => {
          const data = res.data.data;
        var query={}
        if (this.query) {
          for (var key in this.query) {
            query['conditionMap["' + key + '"]'] = this.query[key];
          }
        }
        getList(Object.assign(params,this.params, query,this.query),page.currentPage, page.pageSize, this.url).then(res => {
          const data = res.data;
          this.page.total = data.total;
          this.data = data.records;
          this.data = data.data;
          this.loading = false;
          this.selectionClear();
        });

 Source/UBCS-WEB/src/components/refer/vciWebReferTable.vue

@@ -301,7 +301,7 @@
    searchChange(params, done) {
      this.query = params;
      this.page.currentPage = 1;
      this.onLoad(this.page, params);
      this.onLoad(this.page);
      done();
    },
    currentChange(currentPage){
@@ -319,18 +319,24 @@
    },
    selectionClear() {
      this.selectionList = [];
      this.$refs.referCrud.clearSelection();
      this.$refs.referCrud.toggleSelection();
    },
    refreshChange() {
      this.onLoad(this.page, this.query);
    },
    onLoad(page, params = this.params) {
    onLoad(page, params={}) {
      if(this.url){
        this.loading = true;
        getList(Object.assign(params, this.query),page.currentPage, page.pageSize, this.url).then(res => {
          debugger;
          this.page.total = res.total;
          this.data = res.data;
        var query={}
        if (this.query) {
          for (var key in this.query) {
            query['conditionMap["' + key + '"]'] = this.query[key];
          }
        }
        getList(Object.assign(params,this.params, query,this.query),page.currentPage, page.pageSize, this.url).then(res => {
          const data = res.data;
          this.page.total = data.total;
          this.data = data.data;
          this.loading = false;
          this.selectionClear();
        });

 Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/DockingTask.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,118 @@
package com.vci.ubcs.code.entity;

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

/***
 * å®šæ—¶åˆ†å‘任务对象
 */
@Data
@TableName("PL_CODE_DOCKINGTASK")
@ApiModel(value = "DockingTask", description = "定时分发任务对象")
@EqualsAndHashCode
public class DockingTask extends BaseModel {

    /**
     * åºåˆ—化
     */
    private static final long serialVersionUID = 5020487634341415429L;

    /**
     * ç³»ç»ŸæŽ¥å£oid
     */
    @ApiModelProperty(value = "系统接口oid")
    private String sysInfoOid;

    /**
     * ç³»ç»Ÿid
     */
    @ApiModelProperty(value = "系统id")
    private String systemOid;

    /**
     * ç³»ç»Ÿç¼–号
     */
    @ApiModelProperty(value = "系统编号")
    private String systemCode;

    /**
     * ç³»ç»Ÿåç§°
     */
    @ApiModelProperty(value = "系统名称")
    private String systemName;

    /**
     * åˆ†ç±»oid
     */
    @ApiModelProperty(value = "分类oid")
    private String classifyOid;

    /**
     * åˆ†ç±»id
     */
    @ApiModelProperty(value = "分类id")
    private String classifyId;

    /**
     * åˆ†ç±»åç§°
     */
    @ApiModelProperty(value = "分类名称")
    private String classifyName;

    /**
     * ä¸šåŠ¡ç±»åž‹æ•°æ®oid
     */
    @ApiModelProperty(value = "业务类型数据oid")
    private String btmOid;

    /**
     * ä¸šåŠ¡ç±»åž‹æ•°æ®id
     */
    @ApiModelProperty(value = "业务类型数据id")
    private String btmId;

    /**
     * å”¯ä¸€æ ‡è¯†
     */
    @ApiModelProperty(value = "唯一标识")
    private String uniqueCode;

    /**
     * å‘送类型
     */
    @ApiModelProperty(value = "发送类型")
    private String sendType;

    /**
     * å‘送类型显示文本
     */
    @ApiModelProperty(value = "发送类型显示文本")
    @TableField(exist = true)
    private String sendTypeText;

    /**
     * æ˜¯å¦å‘送成功
     */
    @ApiModelProperty(value = "是否发送成功")
    private String sendFlag;


    /**
     * æ˜¯å¦å‘送成功显示文本
     */
    @ApiModelProperty(value = "是否发送成功显示文本")
    @TableField(exist = true)
    private String sendFlagText;


    /**
     * dockingdata的oid
     */
    @ApiModelProperty(value = "业务数据主键")
    private String dataOid;
}

 Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/DockingTaskVO.java

@@ -10,191 +10,107 @@
 */
public class DockingTaskVO extends BaseModel {


    /**
     * ç¦æ­¢ä¿®æ”¹è¿™ä¸ªå€¼
     * åºåˆ—化
     */
    private static final long serialVersionUID = 4615707119707777641L;
    private static final long serialVersionUID = 5020487634341415429L;

    /**
     * ç³»ç»ŸæŽ¥å£oid
     */
    private String sysinfooid;
    private String sysInfoOid;

    /**
     * ç³»ç»Ÿid
     */
    private String systemoid;
    private String systemOid;

    /**
     * ç³»ç»Ÿç¼–号
     */
    private String systemcode;
    private String systemCode;

    /**
     * ç³»ç»Ÿåç§°
     */
    private String systemname;
    private String systemName;

    /**
     * åˆ†ç±»oid
     */
    private String classifyoid;
    private String classifyOid;

    /**
     * åˆ†ç±»id
     */
    private String classifyid;
    private String classifyId;

    /**
     * åˆ†ç±»åç§°
     */
    private String classifyname;
    private String classifyName;

    /**
     * ä¸šåŠ¡ç±»åž‹æ•°æ®oid
     */
    private String btmoid;
    private String btmOid;

    /**
     * ä¸šåŠ¡ç±»åž‹æ•°æ®id
     */
    private String btmid;
    private String btmId;

    /**
     * uniquecode
     * å”¯ä¸€æ ‡è¯†
     */
    private String uniquecode;
    private String uniqueCode;

    /**
     * å‘送类型
     */
    private String sendType;

    /**
     * å‘送类型显示文本
     */
    private String sendTypeText;

    /**
     * æ˜¯å¦å‘送成功
     */
    private String sendFlag;


    /**
     * æ˜¯å¦å‘送成功
     */
    private String sendflag;
    private String sendFlagText;


    /**
     * å‘送类型,lcstatus
     * dockingdata的oid
     */
    private String sendtype;
    /**
     * æ˜¯å¦å‘送成功
     */
    private String dataoid;

    public String getDataoid() {
        return dataoid;
    }

    public void setDataoid(String dataoid) {
        this.dataoid = dataoid;
    }
    public String getSendtype() {
        return sendtype;
    }

    public void setSendtype(String sendtype) {
        this.sendtype = sendtype;
    }

    public String getSysinfooid() {
        return sysinfooid;
    }

    public void setSysinfooid(String sysinfooid) {
        this.sysinfooid = sysinfooid;
    }

    public String getSystemoid() {
        return systemoid;
    }

    public void setSystemoid(String systemoid) {
        this.systemoid = systemoid;
    }

    public String getSystemcode() {
        return systemcode;
    }

    public void setSystemcode(String systemcode) {
        this.systemcode = systemcode;
    }

    public String getSystemname() {
        return systemname;
    }

    public void setSystemname(String systemname) {
        this.systemname = systemname;
    }

    public String getClassifyoid() {
        return classifyoid;
    }

    public void setClassifyoid(String classifyoid) {
        this.classifyoid = classifyoid;
    }
    public String getClassifyid() {
        return classifyid;
    }

    public void setClassifyid(String classifyid) {
        this.classifyid = classifyid;
    }
    public String getClassifyname() {
        return classifyname;
    }

    public void setClassifyname(String classifyname) {
        this.classifyname = classifyname;
    }

    public String getBtmoid() {
        return btmoid;
    }

    public void setBtmoid(String btmoid) {
        this.btmoid = btmoid;
    }
    public String getBtmid() {
        return btmid;
    }

    public void setBtmid(String btmid) {
        this.btmoid = btmid;
    }

    public String getSendflag() {
        return sendflag;
    }

    public void setSendflag(String sendflag) {
        this.sendflag = sendflag;
    }

    public String getUniquecode() {
        return uniquecode;
    }

    public void setUniquecode(String uniquecode) {
        this.uniquecode = uniquecode;
    }
    private String dataOid;

    @Override
    public String toString() {
        return "DockingTaskVO{" +
                "sysinfooid='" + sysinfooid + '\'' +
                ", systemoid='" + systemoid + '\'' +
                ", systemcode='" + systemcode + '\'' +
                ", systemname='" + systemname + '\'' +
                ", classifyoid='" + classifyoid + '\'' +
                ", classifyid='" + classifyid + '\'' +
                ", classifyname='" + classifyname + '\'' +
                ", btmoid='" + btmoid + '\'' +
                ", btmid='" + btmid + '\'' +
                ", uniquecode='" + uniquecode + '\'' +
                ", sendflag='" + sendflag + '\'' +
                ", sendtype='" + sendtype + '\'' +
                ", dataoid='" + dataoid + '\'' +
                '}';
            "sysInfoOid='" + sysInfoOid + '\'' +
            ", systemOid='" + systemOid + '\'' +
            ", systemCode='" + systemCode + '\'' +
            ", systemName='" + systemName + '\'' +
            ", classifyOid='" + classifyOid + '\'' +
            ", classifyId='" + classifyId + '\'' +
            ", classifyName='" + classifyName + '\'' +
            ", btmOid='" + btmOid + '\'' +
            ", btmId='" + btmId + '\'' +
            ", uniqueCode='" + uniqueCode + '\'' +
            ", sendType='" + sendType + '\'' +
            ", sendTypeText='" + sendTypeText + '\'' +
            ", sendFlag='" + sendFlag + '\'' +
            ", sendFlagText='" + sendFlagText + '\'' +
            ", dataOid='" + dataOid + '\'' +
            '}';
    }
}

 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/Scheduling/DockingClassSyncScheduling.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,54 @@
package com.vci.ubcs.code.Scheduling;

import com.vci.ubcs.code.service.ICodeDuckingSyncService;
import com.vci.ubcs.starter.web.enumpck.BooleanEnum;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;

import javax.annotation.PostConstruct;
import javax.annotation.Resource;
import java.text.SimpleDateFormat;
import java.util.Date;

/**
 * é›†æˆä»»åŠ¡å®šæ—¶å™¨
 * æ’å…¥dockingtask中
 * ä»Ždockingtask中取出来数据，推送出去的操作
 */
@Component
@Slf4j
public class DockingClassSyncScheduling {

    @Resource
    private ICodeDuckingSyncService codeDuckingSyncServiceI;

    @Value("${clsfSyncPush.isStart:false}")
    public boolean CLSF_SYNC_PUSH_ISSTARE;

    /**
     * æ˜¯å¦åˆå§‹åŒ–完成了
     */
    public static volatile String FINISH_INIT = "false";

    /**
     * åœ¨åˆå§‹åŒ–完成后执行
     */
    @PostConstruct()
    public void onInit(){
        FINISH_INIT = "true";
    }

    //默认每分钟执行方法
    @Scheduled(cron = "${clsfSyncPush.cronTime:0 0/10 * * * ?}")
    public void scheduled() {
        if(CLSF_SYNC_PUSH_ISSTARE && BooleanEnum.TRUE.getValue().equalsIgnoreCase(FINISH_INIT)) {
            codeDuckingSyncServiceI.DockingClassSyncScheduing();
            SimpleDateFormat formatter= new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.");
            String time = formatter.format(new Date());
            String outinfo = "============在 "+time+" æ‰§è¡Œäº†åˆ†ç±»é›†æˆæŽ¨é€";
            log.info(outinfo);
        }
    }
}

 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/Scheduling/DockingDataSyncScheduling.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,56 @@
package  com.vci.ubcs.code.Scheduling;

import com.vci.ubcs.code.service.ICodeDuckingSyncService;
import com.vci.ubcs.starter.web.enumpck.BooleanEnum;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;

import javax.annotation.PostConstruct;
import javax.annotation.Resource;
import java.text.SimpleDateFormat;
import java.util.Date;

/**
 * é›†æˆä»»åŠ¡å®šæ—¶å™¨
 * æ’å…¥dockingtask中
 * ä»Ždockingtask中取出来数据，推送出去的操作
 */
@Component
public class DockingDataSyncScheduling {

    private Logger logger = LoggerFactory.getLogger(getClass());

    @Resource
    private ICodeDuckingSyncService codeDuckingSyncServiceI;

    @Value("${dataSyncPush.isStart:false}")
    public boolean DATA_SYNC_PUSH_ISSTARE;

    /**
     * æ˜¯å¦åˆå§‹åŒ–完成了
     */
    public static volatile String FINISH_INIT = "false";

    /**
     * åœ¨åˆå§‹åŒ–完成后执行
     */
    @PostConstruct()
    public void onInit(){
        FINISH_INIT = "true";
    }

    //默认每分钟执行方法
    @Scheduled(cron = "${dataSyncPush.cronTime:0 0/10 * * * ?}")
    public void scheduled() {
        if(DATA_SYNC_PUSH_ISSTARE && BooleanEnum.TRUE.getValue().equalsIgnoreCase(FINISH_INIT)) {
            codeDuckingSyncServiceI.DockingDataSyncScheduing();
            SimpleDateFormat formatter= new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.");
            String time = formatter.format(new Date());
            String outinfo = "============在 "+time+" æ‰§è¡Œäº†ä¸»æ•°æ®é›†æˆæ•°æ®æŽ¨é€";
            logger.info(outinfo);
        }
    }
}

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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,7 @@
package com.vci.ubcs.code.mapper;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.vci.ubcs.code.entity.DockingTask;

public interface DockingTaskMapper extends BaseMapper<DockingTask> {
}

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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,51 @@
package com.vci.ubcs.code.service;


import org.springblade.core.tool.api.R;

import java.util.List;
import java.util.Map;

/**
 * ä¸€ã€é…ç½®åˆ†ç±»ã€ç³»ç»Ÿã€æŽ¥å£æ•°æ®
 * 1、配置系统SysIntBaseDO
 * 2、配置系统、接口、分类SysIntInfoDO
 *
 * äºŒã€å¤„理预申请数据
 * 1、接收xmlData
 * 2、工艺系统特殊处理，根据unique查询编码，有已经发布的数据，直接返回编码。没有查询到已经发布的编码（编辑中、提交中、审核中、停用等）和一般系统一样按照第3步处理
 * 3、解析xmlData里每一个data节点，存储入DockingPreApplyDataDO，data节点下pros节点存储入DockingPreApplyDataInfoDO
 * 4、返回xmlData，里边标识了每一个data的处理结果
 *
 * ä¸‰ã€æ ¹æ®é¢„申请数据，插入主数据
 * 1、关联分类
 * 2、查询出DockingPreApplyDataInfoDO存储的数据，按照数据映射xml，转换为我们的key，返给前端自动填充到新增数据的页面
 * 3、调用通用的数据新增接口保存数据，这一步和主数据管理模块功能一样
 *
 * å››ã€æŽ¨é€æ•°æ®
 * 1、分类数据和主数据有变化的时候，数据库触发器(TIG_CODEALLCODE_FORDOCKINGDATA,TIG_codeclsify_FORDOCKINGDATA)自动插入dockingdata
 * 2、DockingScheduling执行时，查询dockingdatasendflag=false的数据，结合查询sysintinfo数据，查询dockingtask
 * 3、dockingtask中取出来数据，根据btmname和数据oid查询出来要推送的数据，查询SysIntInfoDO，根据一、2、中配置的信息，执行推送
 *
 * @author xieun
 * @date 2022-06-19
 */
public interface ICodeDuckingSyncService {

    /**
     * æ•°æ®å®šæ—¶ä»»åŠ¡è°ƒç”¨
     */
    void DockingDataSyncScheduing();

    /**
     * æ•°æ®å®šæ—¶ä»»åŠ¡è°ƒç”¨
     */
    void DockingClassSyncScheduing();

    /**
     * æŽ¨é€æœªå®Œæˆçš„集成数据
     * @return
     */
    R sendData(String oids);
}


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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,7 @@
package com.vci.ubcs.code.service;

import com.baomidou.mybatisplus.extension.service.IService;
import com.vci.ubcs.code.entity.DockingTask;

public interface IDockingTaskService extends IService<DockingTask> {
}

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

@@ -413,20 +413,20 @@
     */
    List<Tree> referTree(UIFormReferVO referConfigVO, TreeQueryObject queryObject);


    /**
     * æ˜¯å¦ä¸ºä¿®æ”¹å¿½ç•¥çš„属性
     * @param attrName å±žæ€§çš„名字
     * @return true è¡¨ç¤ºåº”该忽略
     */
    boolean checkUnAttrUnEdit(String attrName);
//    {
//        return  (VciQueryWrapperForDO.OID_FIELD.equalsIgnoreCase(attrName)
//            ||"ts".equalsIgnoreCase(attrName)
//            || "lastmodifier".equalsIgnoreCase(attrName)
//            || "lastmodifytime".equalsIgnoreCase(attrName)
//            || "createtime".equalsIgnoreCase(attrName)
//            || "checkintime".equalsIgnoreCase(attrName)
//            ||"checkouttime".equalsIgnoreCase(attrName));
//    }
    default boolean checkUnAttrUnEdit(String attrName){
        return  (VciQueryWrapperForDO.OID_FIELD.equalsIgnoreCase(attrName)
            ||"ts".equalsIgnoreCase(attrName)
            || "lastmodifier".equalsIgnoreCase(attrName)
            || "lastmodifytime".equalsIgnoreCase(attrName)
            || "createtime".equalsIgnoreCase(attrName)
            || "checkintime".equalsIgnoreCase(attrName)
            ||"checkouttime".equalsIgnoreCase(attrName));
    }

}

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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,36 @@
package com.vci.ubcs.code.service.impl;


import com.vci.ubcs.code.service.ICodeDuckingSyncService;
import lombok.extern.slf4j.Slf4j;
import org.springblade.core.tool.api.R;
import org.springframework.stereotype.Service;


/*
 * ä¸»é¢˜åº“集成服务
 * @author xiejun
 * @date 2023-06-19
**/

@Service
@Slf4j
public class CodeDuckingSyncServiceImpl implements ICodeDuckingSyncService {


    @Override
    public void DockingDataSyncScheduing() {

    }

    @Override
    public void DockingClassSyncScheduing() {

    }

    @Override
    public R sendData(String oids) {
        return null;
    }
}


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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,11 @@
package com.vci.ubcs.code.service.impl;

import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.vci.ubcs.code.entity.CodeClassifyValue;
import com.vci.ubcs.code.entity.DockingTask;
import com.vci.ubcs.code.mapper.CodeClassifyValueMapper;
import com.vci.ubcs.code.mapper.DockingTaskMapper;
import com.vci.ubcs.code.service.IDockingTaskService;

public class DockingTaskServiceImpl  extends ServiceImpl<DockingTaskMapper, DockingTask>  implements IDockingTaskService {
}

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

@@ -5,8 +5,6 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.baomidou.mybatisplus.extension.toolkit.SqlHelper;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.sun.corba.se.impl.orbutil.ObjectUtility;
import com.vci.ubcs.code.bo.CodeClassifyFullInfoBO;
import com.vci.ubcs.code.bo.CodeTemplateAttrSqlBO;
import com.vci.ubcs.code.constant.FrameWorkDefaultValueConstant;
@@ -19,13 +17,11 @@
import com.vci.ubcs.code.mapper.CodeWupinMapper;
import com.vci.ubcs.code.mapper.CommonsMapper;
import com.vci.ubcs.code.service.*;
import com.vci.ubcs.code.util.ClientBusinessObject;
import com.vci.ubcs.code.vo.CodeKeyAttrRepeatVO;
import com.vci.ubcs.code.vo.pagemodel.UITableFieldVO;
import com.vci.ubcs.code.vo.pagemodel.UITablePageVO;
import com.vci.ubcs.code.vo.pagemodel.*;
import com.vci.ubcs.omd.constant.BtmTypeLcStatusConstant;
import com.vci.ubcs.omd.entity.BtmTypeAttribute;
import com.vci.ubcs.omd.cache.EnumCache;
import com.vci.ubcs.omd.feign.*;
import com.vci.ubcs.omd.utils.VciOmdUtil;
@@ -38,7 +34,6 @@
import com.vci.ubcs.starter.revision.model.TreeQueryObject;
import com.vci.ubcs.starter.revision.model.TreeWrapperOptions;
import com.vci.ubcs.starter.revision.service.RevisionModelUtil;
import com.vci.ubcs.starter.util.UBCSSqlKeyword;
import com.vci.ubcs.starter.web.constant.QueryOptionConstant;
import com.vci.ubcs.starter.web.constant.RegExpConstant;
import com.vci.ubcs.starter.web.enumpck.BooleanEnum;
@@ -55,15 +50,12 @@
import com.vci.ubcs.system.user.feign.IUserClient;
import net.logstash.logback.encoder.org.apache.commons.lang3.StringUtils;
import oracle.sql.TIMESTAMP;
import org.apache.commons.collections4.MapUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springblade.core.cache.utils.CacheUtil;
import org.springblade.core.launch.constant.AppConstant;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.DateUtil;
import org.springblade.core.tool.utils.Func;
import org.springblade.core.tool.utils.StringPool;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.cache.Cache;
@@ -73,15 +65,10 @@

import javax.annotation.Resource;
import java.beans.BeanInfo;
import java.beans.IntrospectionException;
import java.beans.Introspector;
import java.beans.PropertyDescriptor;
import java.lang.reflect.Field;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.math.BigDecimal;
import java.sql.SQLException;
import java.sql.Timestamp;
import java.time.LocalDateTime;
import java.time.ZoneId;
import java.time.ZonedDateTime;
@@ -881,21 +868,7 @@
        }
    }

    /**
     * æ˜¯å¦ä¸ºä¿®æ”¹å¿½ç•¥çš„属性
     * @param attrName å±žæ€§çš„名字
     * @return true è¡¨ç¤ºåº”该忽略
     */
    @Override
    public boolean checkUnAttrUnEdit(String attrName){
        return  (VciQueryWrapperForDO.OID_FIELD.equalsIgnoreCase(attrName)
            ||"ts".equalsIgnoreCase(attrName)
            || "lastmodifier".equalsIgnoreCase(attrName)
            || "lastmodifytime".equalsIgnoreCase(attrName)
            || "createtime".equalsIgnoreCase(attrName)
            || "checkintime".equalsIgnoreCase(attrName)
            ||"checkouttime".equalsIgnoreCase(attrName));
    }


    /**
     * ä¿å­˜å¯è¾“可选的信息
@@ -3480,6 +3453,7 @@
        return revisionModelUtil.doList2Trees(codeClassifies, treeWrapperOptions, null);
    }


    private String getTableName(String refertype){
        if ("codeclassify".equals(refertype)){
            return "pl_code_classify";

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

@@ -21,6 +21,7 @@
import com.vci.ubcs.code.vo.webserviceModel.attrmap.RowDatas;
import com.vci.ubcs.code.vo.webserviceModel.result.xml.XMLResultDataObjectDetailDO;
import com.vci.ubcs.omd.feign.IBtmTypeClient;
import com.vci.ubcs.omd.feign.IWebSecretClient;
import com.vci.ubcs.omd.vo.BtmTypeVO;
import com.vci.ubcs.starter.bo.WriteExcelData;
import com.vci.ubcs.starter.exception.VciBaseException;
@@ -59,6 +60,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
import javax.annotation.Resource;
import java.io.File;
@@ -154,6 +156,11 @@
     */
    @Autowired
    private IBtmTypeClient btmTypeClient;
    /***
     * å¯†çº§æœåŠ¡
     */
    @Resource
    private IWebSecretClient secretService;
    /**
     * æ‰¹é‡ç”³è¯·ï¼šé€‰å–选中分类下的所有模板关键属性，相似属性，必填属性，写入execl中
     *
@@ -1859,6 +1866,7 @@
     * @param dataObjectVO æ•°æ®ä¿¡æ¯
     * @param resultDataObjectDetailDOs é”™è¯¯ä¿¡æ¯
     */
    @Transactional(rollbackFor = VciBaseException.class)
    @Override
    public void batchSyncEditDatas(CodeClassifyVO codeClassifyVO, DataObjectVO dataObjectVO, LinkedList<XMLResultDataObjectDetailDO> resultDataObjectDetailDOs) {
        String errorid="";
@@ -2283,10 +2291,10 @@

            }
            int secret = VciBaseUtil.getInt(cbo.getAttributeValue(SECRET_FIELD));
            /*if (secret == 0 || !secretService.checkDataSecret(secret)) {
            if (secret == 0 || !secretService.checkDataSecret(secret).getData()) {
                Integer userSecret = VciBaseUtil.getCurrentUserSecret();
                cbo.setAttributeValue(SECRET_FIELD, String.valueOf((userSecret == null || userSecret == 0) ? UserSecretEnum.NONE.getValue() : userSecret));
            }*/
            }
        } catch (Throwable e) {
            log.error("设置默认的属性的值错误", e);
        }
@@ -2535,11 +2543,11 @@
                    cbo.setAttributeValue(CODE_CLASSIFY_OID_FIELD,classifyFullInfo.getCurrentClassifyVO().getOid());
                    cbo.setAttributeValue(CODE_FULL_PATH_FILED,fullPath);
                    int secret = VciBaseUtil.getInt(cbo.getAttributeValue(SECRET_FIELD));
                    /*if(secret == 0 || !secretService.checkDataSecret(secret) ){
                    if(secret == 0 || !secretService.checkDataSecret(secret).getData() ){
                        Integer userSecret = VciBaseUtil.getCurrentUserSecret();
                        String secretValue= String.valueOf((userSecret==null || userSecret ==0)? UserSecretEnum.NONE.getValue():userSecret);
                        cbo.setAttributeValue(SECRET_FIELD,secretValue);
                    }*/
                    }
                    if(rowData.getStatus().equals(CodeDefaultLC.DISABLE.getValue())){//停用
                        cbo.setLcStatus(CodeDefaultLC.DISABLE.getValue());
                    }else if(rowData.getStatus().equals(CodeDefaultLC.EDITING.getValue())){//编辑
@@ -2633,11 +2641,11 @@
                    cbo.setAttributeValue(CODE_CLASSIFY_OID_FIELD,classifyFullInfo.getCurrentClassifyVO().getOid());
                    cbo.setAttributeValue(CODE_FULL_PATH_FILED,fullPath);
                    //cbo.setLcStatus(CodeDefaultLC.EDITING.getValue());
                    /*int secret = VciBaseUtil.getInt(cbo.getAttributeValue(SECRET_FIELD));
                    if(secret == 0 || !secretService.checkDataSecret(secret) ){
                    int secret = VciBaseUtil.getInt(cbo.getAttributeValue(SECRET_FIELD));
                    if(secret == 0 || !secretService.checkDataSecret(secret).getData() ){
                        Integer userSecret = VciBaseUtil.getCurrentUserSecret();
                        cbo.setAttributeValue(SECRET_FIELD,String.valueOf((userSecret==null || userSecret ==0)? UserSecretEnum.NONE.getValue():userSecret));
                    }*/
                    }
                }else{
                    //此时还没有转换路径
                    //cbo.setAttributeValue(CODE_FULL_PATH_FILED, childOidPathMap.getOrDefault(rowData.getData().getOrDefault(CODE_CLASSIFY_OID_FIELD,""),fullPath));
@@ -2690,10 +2698,10 @@
                    cbo.setAttributeValue(CODE_FULL_PATH_FILED,fullPath);
                    //cbo.setLcStatus(CodeDefaultLC.EDITING.getValue());
                    int secret = VciBaseUtil.getInt(cbo.getAttributeValue(SECRET_FIELD));
                    /*if(secret == 0 || !secretService.checkDataSecret(secret) ){
                    if(secret == 0 || !secretService.checkDataSecret(secret).getData() ){
                        Integer userSecret = VciBaseUtil.getCurrentUserSecret();
                        cbo.setAttributeValue(SECRET_FIELD,String.valueOf((userSecret==null || userSecret ==0)? UserSecretEnum.NONE.getValue():userSecret));
                    }*/
                    }
                }else{
                    //此时还没有转换路径
                    //cbo.setAttributeValue(CODE_FULL_PATH_FILED, childOidPathMap.getOrDefault(rowData.getData().getOrDefault(CODE_CLASSIFY_OID_FIELD,""),fullPath));

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

@@ -9,32 +9,46 @@
import com.vci.ubcs.code.dto.CodeOrderDTO;
import com.vci.ubcs.code.dto.CodeOrderSecDTO;
import com.vci.ubcs.code.entity.*;
import com.vci.ubcs.code.enumpack.CodeDefaultLC;
import com.vci.ubcs.code.enumpack.CodeSecTypeEnum;
import com.vci.ubcs.code.mapper.CommonsMapper;
import com.vci.ubcs.code.service.*;
import com.vci.ubcs.code.util.ClientBusinessObject;
import com.vci.ubcs.code.util.gennerAttrMapUtil;
import com.vci.ubcs.code.vo.pagemodel.*;
import com.vci.ubcs.code.vo.webserviceModel.apply.*;
import com.vci.ubcs.code.vo.webserviceModel.attrmap.*;
import com.vci.ubcs.code.vo.webserviceModel.attrmap.DataObjectVO;
import com.vci.ubcs.code.vo.webserviceModel.classify.*;
import com.vci.ubcs.code.vo.webserviceModel.data.*;
import com.vci.ubcs.code.vo.webserviceModel.result.json.*;
import com.vci.ubcs.code.vo.webserviceModel.result.xml.XMLResultClassfyVO;
import com.vci.ubcs.code.vo.webserviceModel.result.xml.XMLResultDataObjectDetailDO;
import com.vci.ubcs.code.vo.webserviceModel.result.xml.XMLResultSystemVO;
import com.vci.ubcs.code.webService.annotation.VciWebservice;
import com.vci.ubcs.code.webService.config.AttributeMapConfig;
import com.vci.ubcs.code.wrapper.CodeClassifyWrapper;
import com.vci.ubcs.omd.feign.IBtmTypeClient;
import com.vci.ubcs.omd.vo.BtmTypeVO;
import com.vci.ubcs.starter.revision.model.BaseModel;
import com.vci.ubcs.starter.revision.model.TreeQueryObject;
import com.vci.ubcs.starter.util.DefaultAttrAssimtUtil;
import com.vci.ubcs.starter.web.constant.QueryOptionConstant;
import com.vci.ubcs.starter.web.pagemodel.SessionInfo;
import com.vci.ubcs.starter.web.util.BeanUtilForVCI;
import com.vci.ubcs.starter.web.util.VciBaseUtil;
import lombok.extern.slf4j.Slf4j;
import org.springblade.core.tool.api.R;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
import javax.annotation.Resource;
import java.util.*;
import java.util.concurrent.CopyOnWriteArrayList;
import java.util.stream.Collectors;

import static com.vci.ubcs.code.constant.MdmEngineConstant.DEFAULT_SYNC_ATTR_LIST;
import static com.vci.ubcs.code.enumpack.CodeSecTypeEnum.CODE_CLASSIFY_SEC;

/***
 * ç»Ÿä¸€æŽ¥å£
@@ -56,6 +70,19 @@
     */
    @Autowired(required = false)
    private ICodeClassifyService classifyService;

    /**
     * ä¸šåŠ¡ç±»åž‹çš„服务
     */
    @Autowired
    private IBtmTypeClient btmTypeClient;

    /**
     * é€šç”¨æŸ¥è¯¢
     */
    @Resource
    private CommonsMapper commonsMapper;

    /**
     * ä¸»æ•°æ®å¼•æ“Žçš„服务
     */
@@ -68,6 +95,9 @@

    @Resource
    private MdmIOService mdmIOService;

    @Autowired
    private ICodeClassifyValueService codeClassifyValueService;
    /***
     * é›†æˆæŽ¥å£æ—¥å¿—服务的配置
     */
@@ -88,154 +118,160 @@
     */
    @Override
    public String applyCode(String data, String dataType) throws Throwable {
        {
            String resultStr = "";
            String errorid="0";
            msg="成功";
            objerrorCode="0";
            objerrorMsg="成功";
            log.info("申请编码的数据参数:->"+data);
            log.info("申请编码的数据类型:->"+dataType);
            String systemId="";
            List<XMLResultClassfyVO> resultClassfyVOList = new ArrayList<>();
            try {
                if(StringUtils.isBlank(data)) {
                    errorid="101";
                    throw new Throwable("接口参数：传递为空");
                }
                InterParameterVO interParameterVO  =new InterParameterVO();
                //如果dataType是xml则，通过xml序列化成对象形式，如果是json则通过json转换成对象格式
                try {
                    if ("xml".equals(dataType)) {
                        XStream xStream = new XStream(new DomDriver());
                        xStream.processAnnotations(RootDataVO.class);
                        xStream.autodetectAnnotations(true);
                        RootDataVO rootDataVO = (RootDataVO) xStream.fromXML(data);
                        interParameterVO.setData(rootDataVO);
                    } else {
                        interParameterVO = JSONObject.toJavaObject(JSONObject.parseObject(data), InterParameterVO.class);
                    }
                }catch (Throwable e){
                    errorid="101";
                    throw new Throwable("接口参数：传入数据参数解析失败");
                }
                ClassfysVO classfysVO = interParameterVO.getData().getClassifys();
                systemId = interParameterVO.getData().getSystemId();
                UserVO userVo = interParameterVO.getData().getUser();
                List<ClassfyVO> classVOList = classfysVO.getClassify();
                InterParameterVO finalInterParameterVO = interParameterVO;

                //这是账号信息
                SessionInfo sessionInfo = new SessionInfo();
                sessionInfo.setUserId(userVo.getUserName());
                sessionInfo.setUserName(userVo.getTrueName());
                sessionInfo.setIp(userVo.getIp());
                VciBaseUtil.setCurrentUserSessionInfo(sessionInfo);

                String finalSystemId = systemId;
                classVOList.stream().forEach(classVO -> {
                    log.info("参数：分类COde:" + classVO.getClassCode());
                    LinkedList<XMLResultDataObjectDetailDO> resultDataObjectDetailDOs = new LinkedList<>();
                    //获取分类信息
                    try {
                        String libray = classVO.getLibrary();
                        CodeClassifyVO codeClassifyVO = getClassfy(classVO);
                        log.info("end：分类查询完毕");
                        //获取分类模板信息
                        if(codeClassifyVO==null || StringUtils.isBlank(codeClassifyVO.getOid())){
                            objerrorCode="100";
                            throw  new  Throwable ("根据传输的分类，未获取到分类信息");
                        }
                        CodeClassifyTemplateVO templateVO = engineService.getUsedTemplateByClassifyOid(codeClassifyVO.getOid());
                        if(templateVO==null||StringUtils.isBlank(templateVO.getOid())){
                            objerrorCode="1";
                            throw  new  Throwable ("根据传输的分类，未获取MDM系统中对应模板");
                        }
                        log.info("end：模板查询完毕");
                        ApplyDatasVO applyDatasVO = classVO.getObjects();
                        DataObjectVO dataObjectVO = new DataObjectVO();
                        List<CodeClassifyTemplateAttrVO> attrVOS = templateVO.getAttributes().stream().filter(s -> !DEFAULT_SYNC_ATTR_LIST.contains(s.getId()) && VciBaseUtil.getBoolean(s.getFormDisplayFlag())
                        ).collect(Collectors.toList());
                        this.getConfigDatas(finalSystemId, libray, applyDatasVO, attrVOS, dataObjectVO);
                        log.info("end：数据组织完毕");
                        //规则的主键需要去获取
                        CodeClassifyFullInfoBO classifyFullInfo = classifyService.getClassifyFullInfo(codeClassifyVO.getOid());
                        if(classifyFullInfo==null ||classifyFullInfo.getCurrentClassifyVO()==null || StringUtils.isBlank(classifyFullInfo.getCurrentClassifyVO().getOid())){
                            objerrorCode="1";
                            log.info("classifyFullInfo:"+"根据传输的分类，未获取分类相关信息");
                            throw  new  Throwable ("根据传输的分类，未获取分类相关信息");
                        }
                        CodeRuleVO ruleVO = engineService.getCodeRuleByClassifyFullInfo(classifyFullInfo);
                        if(ruleVO==null|| StringUtils.isBlank(ruleVO.getOid())){
                            objerrorCode="102";
                            throw  new  Throwable ("根据传输的分类，未获取MDM系统中对应规则");
                        }
                        log.info("end：规则获取完毕");
                        List<CodeOrderSecDTO> codeOrderSecDTOList = getRuleCodeOrderSecDTOs(classVO.getSections().getSection(), ruleVO);
                        log.info("end：码段获取完毕");
                        CodeOrderDTO orderDTO = new CodeOrderDTO();
                        orderDTO.setCodeClassifyOid(codeClassifyVO.getOid());//分类主键
                        orderDTO.setSecDTOList(codeOrderSecDTOList);//分类码段
                        mdmIOService.batchSyncApplyCode(orderDTO, dataObjectVO, resultDataObjectDetailDOs);
                        log.info("end：申请获取完毕");
                    } catch (Throwable e) {
                        XMLResultDataObjectDetailDO xmlResultDataObjectDetailDO=new XMLResultDataObjectDetailDO();
                        xmlResultDataObjectDetailDO.setCode("");
                        xmlResultDataObjectDetailDO.setId("");
                        xmlResultDataObjectDetailDO.setErrorid(objerrorCode);
                        xmlResultDataObjectDetailDO.setMsg("编码申请失败:"+e.getMessage());
                        resultDataObjectDetailDOs.add(xmlResultDataObjectDetailDO);
                        e.printStackTrace();
                    }finally {
                        XMLResultClassfyVO resultClassfyVO = new XMLResultClassfyVO();
                        resultClassfyVO.setClassCode(classVO.getClassCode());
                        resultClassfyVO.setLibrary(classVO.getLibrary());
                        resultClassfyVO.setFullclsfNamePath(classVO.getFullclsfNamePath());
                        resultClassfyVO.setObjects(resultDataObjectDetailDOs);
                        resultClassfyVOList.add(resultClassfyVO);
                    }
                });
                XMLResultSystemVO xmlResultSystemVO=new XMLResultSystemVO();
                xmlResultSystemVO.setClassifys(resultClassfyVOList);
                xmlResultSystemVO.setMsg(msg);
                xmlResultSystemVO.setErrorid(errorid);
                resultStr= transferResultXMl(xmlResultSystemVO,dataType);
            }catch (Throwable e){
                e.printStackTrace();;
                msg="申请编码失败:"+e.getMessage();
            }finally {
                XMLResultSystemVO xmlResultSystemVO=new XMLResultSystemVO();
                xmlResultSystemVO.setClassifys(resultClassfyVOList);
                xmlResultSystemVO.setMsg(msg);
                xmlResultSystemVO.setErrorid(errorid);
                resultStr= transferResultXMl(xmlResultSystemVO,dataType);
                final boolean[] issucess = {true};
                if(!errorid.equals("0")) {
                    issucess[0] = false;
                }else {
                    if(!CollectionUtils.isEmpty(resultClassfyVOList)) {
                        resultClassfyVOList.stream().forEach(xMLResultClassfyVO -> {
                            xMLResultClassfyVO.getObjects().stream().forEach(objec -> {
                                if (!(objec.getErrorid().equals("0") || objec.getErrorid().equals("204"))) {
                                    issucess[0] = false;
                                    msg=objec.getMsg();
                                }
                            });
                        });
                    }

                }
                try {
                    //记录日志
                    this.saveLogs(systemId, systemId, data, resultStr, issucess[0], msg, "applyCode");
                }catch (Throwable e){
                    e.printStackTrace();
                }
        String resultStr = "";
        String errorid="0";
        msg="成功";
        objerrorCode="0";
        objerrorMsg="成功";
        log.info("申请编码的数据参数:->"+data);
        log.info("申请编码的数据类型:->"+dataType);
        String systemId="";
        List<XMLResultClassfyVO> resultClassfyVOList = new ArrayList<>();
        try {
            if(StringUtils.isBlank(data)) {
                errorid="101";
                throw new Throwable("接口参数：传递为空");
            }
            log.info("返回参数:"+resultStr);
            InterParameterVO interParameterVO  =new InterParameterVO();
            //如果dataType是xml则，通过xml序列化成对象形式，如果是json则通过json转换成对象格式
            try {
                if ("xml".equals(dataType)) {
                    XStream xStream = new XStream(new DomDriver());
                    xStream.processAnnotations(RootDataVO.class);
                    xStream.autodetectAnnotations(true);
                    RootDataVO rootDataVO = (RootDataVO) xStream.fromXML(data);
                    interParameterVO.setData(rootDataVO);
                } else {
                    interParameterVO = JSONObject.toJavaObject(JSONObject.parseObject(data), InterParameterVO.class);
                }
            }catch (Throwable e){
                errorid="101";
                throw new Throwable("接口参数：传入数据参数解析失败");
            }
            ClassfysVO classfysVO = interParameterVO.getData().getClassifys();
            systemId = interParameterVO.getData().getSystemId();
            UserVO userVo = interParameterVO.getData().getUser();
            List<ClassfyVO> classVOList = classfysVO.getClassify();
            InterParameterVO finalInterParameterVO = interParameterVO;

            return resultStr;
            //这是账号信息
            SessionInfo sessionInfo = new SessionInfo();
            sessionInfo.setUserId(userVo.getUserName());
            sessionInfo.setUserName(userVo.getTrueName());
            sessionInfo.setIp(userVo.getIp());
            VciBaseUtil.setCurrentUserSessionInfo(sessionInfo);

            String finalSystemId = systemId;
            classVOList.stream().forEach(classVO -> {
                log.info("参数：分类COde:" + classVO.getClassCode());
                LinkedList<XMLResultDataObjectDetailDO> resultDataObjectDetailDOs = new LinkedList<>();
                //获取分类信息
                try {
                    String libray = classVO.getLibrary();
                    CodeClassifyVO codeClassifyVO = getClassfy(classVO);
                    log.info("end：分类查询完毕");
                    //获取分类模板信息
                    if(codeClassifyVO==null || StringUtils.isBlank(codeClassifyVO.getOid())){
                        objerrorCode="100";
                        throw  new  Throwable ("根据传输的分类，未获取到分类信息");
                    }
                    CodeClassifyTemplateVO templateVO = engineService.getUsedTemplateByClassifyOid(codeClassifyVO.getOid());
                    if(templateVO==null||StringUtils.isBlank(templateVO.getOid())){
                        objerrorCode="1";
                        throw  new  Throwable ("根据传输的分类，未获取MDM系统中对应模板");
                    }
                    log.info("end：模板查询完毕");
                    ApplyDatasVO applyDatasVO = classVO.getObjects();
                    DataObjectVO dataObjectVO = new DataObjectVO();
                    List<CodeClassifyTemplateAttrVO> attrVOS = templateVO.getAttributes().stream().filter(s -> !DEFAULT_SYNC_ATTR_LIST.contains(s.getId()) && VciBaseUtil.getBoolean(s.getFormDisplayFlag())
                    ).collect(Collectors.toList());
                    this.getConfigDatas(finalSystemId, libray, applyDatasVO, attrVOS, dataObjectVO);
                    log.info("end：数据组织完毕");
                    //规则的主键需要去获取
                    CodeClassifyFullInfoBO classifyFullInfo = classifyService.getClassifyFullInfo(codeClassifyVO.getOid());
                    if(classifyFullInfo==null ||classifyFullInfo.getCurrentClassifyVO()==null || StringUtils.isBlank(classifyFullInfo.getCurrentClassifyVO().getOid())){
                        objerrorCode="1";
                        log.info("classifyFullInfo:"+"根据传输的分类，未获取分类相关信息");
                        throw  new  Throwable ("根据传输的分类，未获取分类相关信息");
                    }
                    CodeRuleVO ruleVO = engineService.getCodeRuleByClassifyFullInfo(classifyFullInfo);
                    if(ruleVO==null||StringUtils.isBlank(ruleVO.getOid())){
                        objerrorCode="102";
                        throw  new  Throwable ("根据传输的分类，未获取MDM系统中对应规则");
                    }
                    log.info("end：规则获取完毕");
                    List<CodeOrderSecDTO> codeOrderSecDTOList = getRuleCodeOrderSecDTOs(classVO.getSections().getSection(), ruleVO,classifyFullInfo);
                    log.info("end：码段获取完毕");
                    CodeOrderDTO orderDTO = new CodeOrderDTO();
                    orderDTO.setCodeClassifyOid(codeClassifyVO.getOid());//分类主键
                    orderDTO.setSecDTOList(codeOrderSecDTOList);//分类码段
                    mdmIOService.batchSyncApplyCode(orderDTO, dataObjectVO, resultDataObjectDetailDOs);
                    log.info("end：申请获取完毕");
                } catch (Throwable e) {
                    XMLResultDataObjectDetailDO xmlResultDataObjectDetailDO=new XMLResultDataObjectDetailDO();
                    xmlResultDataObjectDetailDO.setCode("");
                    xmlResultDataObjectDetailDO.setId("");
                    xmlResultDataObjectDetailDO.setErrorid(objerrorCode);
                    xmlResultDataObjectDetailDO.setMsg("编码申请失败:"+e.getMessage());
                    resultDataObjectDetailDOs.add(xmlResultDataObjectDetailDO);
                    e.printStackTrace();
                }finally {
                    XMLResultClassfyVO resultClassfyVO = new XMLResultClassfyVO();
                    resultClassfyVO.setClassCode(classVO.getClassCode());
                    resultClassfyVO.setLibrary(classVO.getLibrary());
                    resultClassfyVO.setFullclsfNamePath(classVO.getFullclsfNamePath());
                    resultClassfyVO.setObjects(resultDataObjectDetailDOs);
                    resultClassfyVOList.add(resultClassfyVO);
                }
            });
            XMLResultSystemVO xmlResultSystemVO=new XMLResultSystemVO();
            xmlResultSystemVO.setClassifys(resultClassfyVOList);
            xmlResultSystemVO.setMsg(msg);
            xmlResultSystemVO.setErrorid(errorid);
            resultStr= transferResultXMl(xmlResultSystemVO,dataType);
        }catch (Throwable e){
            e.printStackTrace();;
            msg="申请编码失败:"+e.getMessage();
          /*  XMLResultSystemVO XMLResultSystemVO=new XMLResultSystemVO();
            XMLResultSystemVO.setErrorid(errorid);
            XMLResultSystemVO.setMsg("申请编码失败：->"+e.getMessage());
            XMLResultSystemVO.setClassifys(resultClassfyVOList);
            resultStr=transferResultXMl(XMLResultSystemVO,dataType);

            log.error("申请编码失败：->"+e);
            return resultStr;*/
        }finally {
            XMLResultSystemVO xmlResultSystemVO=new XMLResultSystemVO();
            xmlResultSystemVO.setClassifys(resultClassfyVOList);
            xmlResultSystemVO.setMsg(msg);
            xmlResultSystemVO.setErrorid(errorid);
            resultStr= transferResultXMl(xmlResultSystemVO,dataType);
            final boolean[] issucess = {true};
            if(!errorid.equals("0")) {
                issucess[0] = false;
            }else {
                if(!CollectionUtils.isEmpty(resultClassfyVOList)) {
                    resultClassfyVOList.stream().forEach(xMLResultClassfyVO -> {
                        xMLResultClassfyVO.getObjects().stream().forEach(objec -> {
                            if (!(objec.getErrorid().equals("0") || objec.getErrorid().equals("204"))) {
                                issucess[0] = false;
                                msg=objec.getMsg();
                            }
                        });
                    });
                }

            }
            try {
                //记录日志
                this.saveLogs(systemId, systemId, data, resultStr, issucess[0], msg, "applyCode");
            }catch (Throwable e){
                e.printStackTrace();
            }
        }
        log.info("返回参数:"+resultStr);

        return resultStr;
    }

    /***
@@ -248,7 +284,139 @@
    @Override
    public String syncEditData(String data, String dataType) throws Throwable {

        return null;
        String resultStr = "";
        String errorid="0";
        msg="成功";
        String systemId="";
        objerrorCode="0";
        objerrorMsg="成功";
        log.info("更改编码的数据参数:->"+data);
        log.info("更改编码的数据类型:->"+dataType);
        List<XMLResultClassfyVO> resultClassfyVOList = new ArrayList<>();
        try {
            if (StringUtils.isBlank(data)) {
                errorid = "101";
                throw new Throwable("接口参数：传递为空");
            }
            InterParameterVO interParameterVO = new InterParameterVO();
            //如果dataType是xml则，通过xml序列化成对象形式，如果是json则通过json转换成对象格式
            try {
                if ("xml".equals(dataType)) {
                    XStream xStream = new XStream(new DomDriver());
                    xStream.processAnnotations(RootDataVO.class);
                    xStream.autodetectAnnotations(true);
                    RootDataVO rootDataVO = (RootDataVO) xStream.fromXML(data);
                    interParameterVO.setData(rootDataVO);
                } else {
                    interParameterVO = JSONObject.toJavaObject(JSONObject.parseObject(data), InterParameterVO.class);
                }
            } catch (Throwable e) {
                errorid = "101";
                throw new Throwable("接口参数：传入数据参数解析失败");

            }
            ClassfysVO classfysVO = interParameterVO.getData().getClassifys();
            systemId = interParameterVO.getData().getSystemId();
            UserVO userVo = interParameterVO.getData().getUser();
            List<ClassfyVO> classVOList = classfysVO.getClassify();
            InterParameterVO finalInterParameterVO = interParameterVO;
            //这是账号信息
            SessionInfo sessionInfo = new SessionInfo();
            sessionInfo.setUserId(userVo.getUserName());
            sessionInfo.setUserName(userVo.getTrueName());
            sessionInfo.setIp(userVo.getIp());
            VciBaseUtil.setCurrentUserSessionInfo(sessionInfo);
            String finalSystemId = systemId;
            classVOList.stream().forEach(classVO->{
                log.info("参数：分类COde:" + classVO.getClassCode());
                LinkedList<XMLResultDataObjectDetailDO> resultDataObjectDetailDOs = new LinkedList<>();
                //获取分类信息
                try {
                    String libray = classVO.getLibrary();
                    CodeClassifyVO codeClassifyVO = getClassfy(classVO);
                    if(codeClassifyVO==null || StringUtils.isBlank(codeClassifyVO.getOid())){
                        objerrorCode="100";
                        throw  new  Throwable ("根据传输的分类，未获取到分类信息");
                    }
                    log.info("end：分类查询完毕");
                    //获取分类模板信息
                    CodeClassifyTemplateVO templateVO = engineService.getUsedTemplateByClassifyOid(codeClassifyVO.getOid());
                    if(templateVO==null||StringUtils.isBlank(templateVO.getOid())){
                        objerrorCode="102";
                        throw  new  Throwable ("根据传输的分类，未获取MDM系统中对应模板");
                    }
                    log.info("end：模板查询完毕");
                    ApplyDatasVO applyDatasVO = classVO.getObjects();
                    DataObjectVO dataObjectVO = new DataObjectVO();
                    //将默认的属性全部替换掉
                    List<CodeClassifyTemplateAttrVO> attrVOS = templateVO.getAttributes().stream().filter(s -> !DEFAULT_SYNC_ATTR_LIST.contains(s.getId()) && VciBaseUtil.getBoolean(s.getFormDisplayFlag())
                    ).collect(Collectors.toList());
                    this.getConfigDatas(finalSystemId, libray, applyDatasVO, attrVOS, dataObjectVO);
                    log.info("end：数据构建完毕");
                    log.info("start：修改数据执行完毕");
                    mdmIOService.batchSyncEditDatas(codeClassifyVO,dataObjectVO, resultDataObjectDetailDOs);
                    log.info("end：修改数据执行完毕");
                } catch (Throwable e) {
                    XMLResultDataObjectDetailDO xmlResultDataObjectDetailDO=new XMLResultDataObjectDetailDO();
                    xmlResultDataObjectDetailDO.setCode("");
                    xmlResultDataObjectDetailDO.setId("");
                    xmlResultDataObjectDetailDO.setErrorid(objerrorCode);
                    xmlResultDataObjectDetailDO.setMsg("编码更改/状态更改/删除:"+e.getMessage());
                    resultDataObjectDetailDOs.add(xmlResultDataObjectDetailDO);
                    e.printStackTrace();
                }finally {
                    XMLResultClassfyVO resultClassfyVO = new XMLResultClassfyVO();
                    resultClassfyVO.setClassCode(classVO.getClassCode());
                    resultClassfyVO.setLibrary(classVO.getLibrary());
                    resultClassfyVO.setFullclsfNamePath(classVO.getFullclsfNamePath());
                    resultClassfyVO.setObjects(resultDataObjectDetailDOs);
                    resultClassfyVOList.add(resultClassfyVO);
                }

            });
        }catch (Throwable e){
            e.printStackTrace();;
            msg="编码更改/状态更改/删除:"+e.getMessage();
          /*  XMLResultSystemVO XMLResultSystemVO=new XMLResultSystemVO();
            XMLResultSystemVO.setErrorid(errorid);
            XMLResultSystemVO.setMsg("申请编码失败：->"+e.getMessage());
            XMLResultSystemVO.setClassifys(resultClassfyVOList);
            resultStr=transferResultXMl(XMLResultSystemVO,dataType);

            log.error("申请编码失败：->"+e);
            return resultStr;*/
        }finally {
            XMLResultSystemVO xmlResultSystemVO=new XMLResultSystemVO();
            xmlResultSystemVO.setClassifys(resultClassfyVOList);
            xmlResultSystemVO.setMsg(msg);
            xmlResultSystemVO.setErrorid(errorid);
            resultStr= transferResultXMl(xmlResultSystemVO,dataType);
            final boolean[] issucess = {true};
            if(!errorid.equals("0")) {
                issucess[0] = false;
            }else {
                if(!CollectionUtils.isEmpty(resultClassfyVOList)) {
                    resultClassfyVOList.stream().forEach(xMLResultClassfyVO -> {
                        xMLResultClassfyVO.getObjects().stream().forEach(objec -> {
                            if (!(objec.getErrorid().equals("0") || objec.getErrorid().equals("204"))) {
                                issucess[0] = false;
                                msg=objec.getMsg();
                            }
                        });
                    });
                }

            }
            try {
                //记录日志
                this.saveLogs(systemId, systemId, data, resultStr, issucess[0], msg, "syncEditData");
            }catch (Throwable e){
                e.printStackTrace();
            }
        }
        log.info("返回参数:"+resultStr);
        //存储日志
        return resultStr;
    }

    /***
@@ -386,8 +554,191 @@
     */
    @Override
    public String queryData(String data, String dataType) throws Throwable {
        return null;
        boolean issucess=false;
        String resultStr = "";
        String errorid="0";
        msg="成功";
        String systemId="";
        log.info("查询分类的数据参数:->"+data);
        log.info("查询分类的数据类型:->"+dataType);
        DataCondtionsVO dataCondtionsVO=new DataCondtionsVO();
        ResultDataVO resultDataVO=new ResultDataVO();
        try {
            try {
                if ("xml".equals(dataType)) {
                    XStream xStream = new XStream(new DomDriver());
                    xStream.processAnnotations(CondtionsVO.class);
                    xStream.autodetectAnnotations(true);
                    CondtionsVO condtionsVO = (CondtionsVO) xStream.fromXML(data);
                    dataCondtionsVO.setCondtions(condtionsVO);
                } else {
                    dataCondtionsVO = JSONObject.toJavaObject(JSONObject.parseObject(data), DataCondtionsVO.class);
                }
            } catch (Throwable e) {
                errorid = "101";
                msg = "接口参数：传入数据参数解析失败";
                e.printStackTrace();
                throw new Throwable("接口参数：传入数据参数解析失败");
            }
            CondtionsVO condtionsVO=dataCondtionsVO.getCondtions();
            systemId=condtionsVO.getSystemId();
            UserVO userVo=condtionsVO.getUser();
            CondtionVO condtionVO= condtionsVO.getCondtion();
            SessionInfo sessionInfo = new SessionInfo();
            sessionInfo.setUserId(userVo.getUserName());
            sessionInfo.setUserName(userVo.getTrueName());
            sessionInfo.setIp(userVo.getIp());
            VciBaseUtil.setCurrentUserSessionInfo(sessionInfo);

            String classCode=condtionVO.getClassCode();
            String library= condtionVO.getLibrary();
            String queryFileds= condtionVO.getQueryFileds();
            if(StringUtils.isBlank(library)){
                errorid = "101";
                msg = "接口参数：library ä¸ºnull";
                throw new Throwable(msg);
            }

            //先简称是否有关联模板，有模板要先删除

            List<CodeClassify> libIdDos =classifyService.selectByWrapper(Wrappers.<CodeClassify>query().lambda().eq(CodeClassify::getId,library));
            if(!CollectionUtils.isEmpty(libIdDos)){
                CodeClassify libCodeClassify=libIdDos.get(0);
                List<CodeClassify> codeClassifyList=classifyService.selectByWrapper(Wrappers.<CodeClassify>query().lambda().eq(CodeClassify::getId,classCode));
                if(!CollectionUtils.isEmpty(codeClassifyList)){
                    final CodeClassify[] currentCodeClassify = {null};
                    codeClassifyList.stream().forEach(codeClassify -> {
                        CodeClassifyVO codeClassifyVO=  classifyService.getTopClassifyVO(codeClassify.getOid());
                        if(codeClassifyVO.getOid().equals(libCodeClassify.getOid())){
                            currentCodeClassify[0] =codeClassify;
                        }
                    });
                    if(currentCodeClassify[0]==null){
                        errorid = "101";
                        msg = "接口参数：classCode æœªæŸ¥è¯¢åˆ°å¯¹åº”的分类信息";
                        throw new Throwable(msg);
                    }
                    List<CodeClassifyVO> dataCodeClassifyVOList =new ArrayList<>();
                    String oid= currentCodeClassify[0].getOid();
                    TreeQueryObject treeQueryObject=new TreeQueryObject();
                    treeQueryObject.setParentOid(oid);
                    treeQueryObject.setQueryAllLevel(true);
                    dataCodeClassifyVOList=classifyService.selectCodeClassifyDOByTree(treeQueryObject);
                    dataCodeClassifyVOList.add(CodeClassifyWrapper.build().entityVO(currentCodeClassify[0]));
                    Map<String, CodeClassifyVO> oidCodeclassifyDOMap = dataCodeClassifyVOList.stream().filter(systeDataObject -> systeDataObject != null && StringUtils.isNotBlank(systeDataObject.getOid())).collect(Collectors.toList()).stream().collect(Collectors.toMap(s -> s.getOid(), t -> t));

                    List<PropertyVO>  propertyVOS=condtionVO.getPro();
                    /*Map<String,String> condtionMap=new HashMap<>();
                    propertyVOS.stream().forEach(propertyVO -> {
                        condtionMap.put(propertyVO.getFiledName(),propertyVO.getFiledValue());
                    });
                    condtionMap.put("codeclsfid", QueryOptionConstant.IN + "(" + VciBaseUtil.toInSql(oidCodeclassifyDOMap.keySet().toArray(new String[0])) + ")");
                    List<String>statusList=new ArrayList<>();
                    statusList.add(CodeDefaultLC.RELEASED.getValue());
                    statusList.add(CodeDefaultLC.DISABLE.getValue());
                    statusList.add(CodeDefaultLC.TASK_BACK.getValue());
                    condtionMap.put("Lcstatus",  QueryOptionConstant.IN + "(" + VciBaseUtil.toInSql(statusList.toArray(new String[]{})) + ")" );
                    condtionMap.put("islastr", "1");
                    condtionMap.put("islastv", "1");*/
                    List<String>statusList=new ArrayList<>();
                    statusList.add(CodeDefaultLC.RELEASED.getValue());
                    statusList.add(CodeDefaultLC.DISABLE.getValue());
                    statusList.add(CodeDefaultLC.TASK_BACK.getValue());
                    R<BtmTypeVO>  r= btmTypeClient.getDetail(libCodeClassify.getBtmTypeId());
                    BtmTypeVO btmTypeVO =r.getData();
                    String tableName=btmTypeVO.getTableName();

                    StringBuffer sb=new StringBuffer();
                    sb.append(" select * from  ");
                    sb.append(tableName);
                    sb.append(" where 1=1");
                    propertyVOS.stream().forEach(propertyVO -> {
                        sb.append( " and  "+propertyVO.getFiledName()+"='"+propertyVO.getFiledValue()+"'");
                    });
                    sb.append(" and islastr=1 and islastv=1" );
                    sb.append(" and codeclsfid in (" + VciBaseUtil.toInSql(oidCodeclassifyDOMap.keySet().toArray(new String[0])) +")");
                    sb.append(" and Lcstatus in (" + VciBaseUtil.toInSql(statusList.toArray(new String[]{})) +")");
                    List<Map<String,String>>  newDataList= commonsMapper.queryByOnlySqlForMap(sb.toString());
                    List<ClientBusinessObject>clientBusinessObjects=new ArrayList<>();
                    newDataList.stream().forEach(stringStringMap -> {
                        ClientBusinessObject clientBusinessObject=new ClientBusinessObject();
                        DefaultAttrAssimtUtil.copplyDefaultAttrAssimt(stringStringMap,clientBusinessObject);
                        clientBusinessObjects.add(clientBusinessObject);
                    });

                    List<com.vci.ubcs.code.vo.webserviceModel.data.DataObjectVO> dataObjectVOS=new ArrayList<>();
                    if(!CollectionUtils.isEmpty(clientBusinessObjects)){
                        CodeClassifyTemplateVO templateVO = engineService.getUsedTemplateByClassifyOid(currentCodeClassify[0].getOid());
                        Map<String, CodeClassifyTemplateAttrVO> filedAttributeMap = templateVO.getAttributes().stream().filter(attribute -> attribute != null && StringUtils.isNotBlank(attribute.getId())).collect(Collectors.toList()).stream().collect(Collectors.toMap(s -> s.getId(), t -> t));

                        clientBusinessObjects.stream().forEach(cbo -> {
                            com.vci.ubcs.code.vo.webserviceModel.data.DataObjectVO dataObjectVO=new com.vci.ubcs.code.vo.webserviceModel.data.DataObjectVO();
                            dataObjectVO.setCode(cbo.getId());
                            dataObjectVO.setStatus(cbo.getLcStatus());
                            String codeclsfid=cbo.getAttributeValue("codeclsfid");
                            if(oidCodeclassifyDOMap.containsKey(codeclsfid)){
                                CodeClassifyVO codeClassifyVO=  oidCodeclassifyDOMap.get(codeclsfid);
                                dataObjectVO.setClassCode(codeClassifyVO.getId());
                            }
                            dataObjectVO.setLibrary(library);
                            String [] newQueryFileds=queryFileds.split(",");
                            List<PropertyVO> propertyVOList=new ArrayList<>();
                            for(String filed:newQueryFileds){
                                String value=cbo.getAttributeValue(filed);
                                if(filedAttributeMap.containsKey(filed)){
                                    CodeClassifyTemplateAttrVO attrVO=  filedAttributeMap.get(filed);
                                    PropertyVO propertyVO=new PropertyVO();
                                    propertyVO.setFiledName(filed);
                                    propertyVO.setFiledValue(value);
                                    propertyVO.setOutname(attrVO.getName());
                                    propertyVOList.add(propertyVO);
                                }
                            }
                            dataObjectVO.setPro(propertyVOList);
                            dataObjectVOS.add(dataObjectVO);
                        });
                        resultDataVO.setObject(dataObjectVOS);
                    }
                }else{
                    errorid = "101";
                    msg = "接口参数：classCode æœªæŸ¥è¯¢åˆ°å¯¹åº”的分类信息";
                    throw new Throwable(msg);
                }
            }else{
                errorid = "101";
                msg = "接口参数：library æœªæŸ¥è¯¢åˆ°å¯¹åº”的库节点信息";
            }
            errorid = "0";
            msg = "数据查询成功";
        }catch (Throwable e){
            e.printStackTrace();;
            msg="查询数据失败:"+e.getMessage();
        }finally {
            resultDataVO.setErrorid(errorid);
            resultDataVO.setMsg(msg);
        }
        ResultVO resultVO=new ResultVO();
        resultVO.setData(resultDataVO);
        if(dataType.equals("xml")){
            //组织返回接口信息
            XStream xStream = new XStream(new DomDriver());
            xStream.processAnnotations(XMLResultSystemVO.class);
            xStream.autodetectAnnotations(true);
            resultStr = "<?xml version=\"1.0\" encoding=\"UTF-8\" ?>\n" + xStream.toXML(resultDataVO);
        }else{
            Object object = JSONObject.toJSON(resultVO);
            resultStr = object.toString();
        }
        try {    //记录日志
            this.saveLogs(systemId, systemId, data, resultStr, issucess, msg, "queryClassify");
        }catch (Throwable e){
            e.printStackTrace();
        }
        log.info("返回参数:"+resultStr);
        return resultStr;
    }



    @Override
    public String queryClassifyRule(String data, String dataType) throws Throwable {
@@ -521,18 +872,32 @@
        }
        return classifyVO;
    }

    private List<ClientBusinessObject> ChangeMapTOClientBusinessObjects(List<Map<String,String>> oldDataMap){
        List<ClientBusinessObject> clientBusinessObjectList=new CopyOnWriteArrayList<>();
        oldDataMap.parallelStream().forEach(dataMap->{
            ClientBusinessObject clientBusinessObject=new ClientBusinessObject();
            DefaultAttrAssimtUtil.copplyDefaultAttrAssimt(dataMap,clientBusinessObject);
            dataMap.forEach((key,value)->{
                clientBusinessObject.setAttributeValue(key,value);
            });
        });
        return clientBusinessObjectList;
    }
    /***
     * æ ¹æ®ç©¿å…¥çš„参数信息校验码段规则
     */
    private List<CodeOrderSecDTO> getRuleCodeOrderSecDTOs(List<SectionVO> SectionVOList,CodeRuleVO ruleVO) throws Throwable{
    private List<CodeOrderSecDTO> getRuleCodeOrderSecDTOs(List<SectionVO> SectionVOList,CodeRuleVO ruleVO,CodeClassifyFullInfoBO classifyFullInfo) throws Throwable{
        List<CodeBasicSecVO>  codeBasicSecVOS= ruleVO.getSecVOList();
        Map<String,String> sectionVOMap=new HashMap<>();
        SectionVOList.stream().forEach(SectionVO->{
            sectionVOMap.put(SectionVO.getName(),SectionVO.getValue());
        });
        Map<String,CodeClassifyVO> codeClassifyVOMap= classifyFullInfo.getParentClassifyVOs().stream().collect(Collectors.toMap(s -> s.getId(), t -> t,(o1, o2)->o2));
        List<CodeOrderSecDTO> codeOrderSecDTOList=new ArrayList<>();
        for(CodeBasicSecVO codeBasicSecVO: codeBasicSecVOS) {
            String sectype = codeBasicSecVO.getSecType();
            String classifySecOid= codeBasicSecVO.getOid();
            if (!sectype.equals(CodeSecTypeEnum.CODE_SERIAL_SEC.getValue())) {
                String name = codeBasicSecVO.getName();
                String sectypeText = codeBasicSecVO.getSecTypeText();
@@ -543,6 +908,22 @@
                    CodeOrderSecDTO.setSecOid(codeBasicSecVO.getOid());
                    String sectypeValue = sectionVOMap.get(name);
                    log.info("码段值:"+sectypeValue);
                    CodeSecTypeEnum secType = CodeSecTypeEnum.forValue(sectype);
                    if(CODE_CLASSIFY_SEC.equals(secType)) {//如果是分类的话，则需要匹配传过来的分类代号与
                        //先简称是否有关联模板，有模板要先删除
                        List<CodeClassifyValue> codeClassifyValueDOList = codeClassifyValueService.list(Wrappers.<CodeClassifyValue>query().lambda().eq(CodeClassifyValue::getCodeClassifySecOid,classifySecOid));

                        if (!CollectionUtils.isEmpty(codeClassifyValueDOList)) {
                            Map<String, CodeClassifyValue> codeClassifyValueDOMap = codeClassifyValueDOList.stream().collect(Collectors.toMap(s -> s.getId(), t -> t, (o1, o2) -> o2));
                            if(codeClassifyValueDOMap.containsKey(sectypeValue)){
                                CodeClassifyValue codeClassifyValue=   codeClassifyValueDOMap.get(sectypeValue);
                                sectypeValue=codeClassifyValue.getOid();
                            }else {
                                objerrorCode = "101";
                                throw new Throwable("传入的分类码段：【" + name + " å€¼ï¼š" + sectypeValue + "】，不符合当前分类层级代号");
                            }
                        }
                    }
                    CodeOrderSecDTO.setSecValue(sectypeValue);
                    codeOrderSecDTOList.add(CodeOrderSecDTO);
                } else {
@@ -563,17 +944,24 @@
        Map<String, String> attrMapConfigMap=new HashMap<>();
        Map<String, String> propMaps=new HashMap<>();
        try {
            log.info("开始读取系统配置文件 start");
            Map<String, String> stringStringMap=attributeMapConfig.getSystem_attrmap();
            log.info("集成系统属性映射配置文件条目数-》"+stringStringMap.size());
            //stringStringMap.put("RLM","D:\\RLM.xml");
            LibraryDO libraryDO= gennerAttrMapUtil.getNewInstance().gennerAttrMapBySystem(systemId,stringStringMap);
            LibraryDO libraryDO=gennerAttrMapUtil.getNewInstance().gennerAttrMapBySystem(systemId,stringStringMap);
            List<LibraryClsfDO> libraryClsfDOList=libraryDO.getClsf();
            Map<String, List<ClsfAttrMappingDO>> libPropMaps = libraryClsfDOList.stream().collect(Collectors.toMap(LibraryClsfDO::getLibrary, LibraryClsfDO::getProp, (key1, key2) -> key2));
            log.info("根据参数：libray：-》"+libray+"从配置文件中找对应属性映射配置");
            if(libPropMaps.containsKey(libray)){
                log.info("根据参数：libray：-》"+libray+"匹配到相应的属性映射信息");
                List<ClsfAttrMappingDO> clsfAttrMappingDOList=libPropMaps.get(libray);
                propMaps = clsfAttrMappingDOList.stream().collect(Collectors.toMap(ClsfAttrMappingDO::getSourceKey, ClsfAttrMappingDO::getTargetKey, (key1, key2) -> key2));
                log.info("根据参数：libray：-》"+libray+"匹配到相应的属性映射信息,属性映射条目数+"+clsfAttrMappingDOList.size());
            }
            log.info("根据参数：libray：-》"+libray+"从配置文件中找对应属性映射配置 end ");
        }catch (Throwable e){
            objerrorCode="1";
            e.printStackTrace();
            throw new Throwable("MDM集成属性配置文件读取失败");
        }
        LinkedList<String> rowNameList=new LinkedList<>();

 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/DockingTaskWrapper.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,66 @@
package com.vci.ubcs.code.wrapper;

import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
import com.vci.ubcs.code.entity.DockingTask;
import com.vci.ubcs.code.vo.pagemodel.DockingTaskVO;
import org.springblade.core.mp.support.BaseEntityWrapper;
import org.springblade.core.tool.utils.BeanUtil;

import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import java.util.Objects;

public class DockingTaskWrapper extends BaseEntityWrapper<DockingTask, DockingTaskVO> {
    public static DockingSystemWrapper build() {
        return new DockingSystemWrapper();
    }
    @Override
    public DockingTaskVO entityVO(DockingTask entity) {
        DockingTaskVO vo = Objects.requireNonNull(BeanUtil.copy(entity, DockingTaskVO.class));
        return vo;
    }


    /***
     * æ•°ç»„对象转换
     * @param entitys
     * @return
     */
    public List<DockingTaskVO> entityVOs(Collection<DockingTask> entitys) {
        if(CollectionUtils.isEmpty(entitys)) {return new ArrayList<>();}
        List<DockingTaskVO> vos=new ArrayList<>();
        if(!CollectionUtils.isEmpty(entitys)) {
            entitys.stream().forEach(vo -> {
                vos.add(entityVO(vo));
            });
        }
        return vos;
    }

    /***
     * æ•°ç»„对象转换
     * @param vos
     * @return
     */
    public List<DockingTask> voentitys(Collection<DockingTaskVO> vos) {
        if(CollectionUtils.isEmpty(vos)) {return new ArrayList<>();}
        List<DockingTask>entitys =new ArrayList<>();
        if(!CollectionUtils.isEmpty(vos)) {
            vos.stream().forEach(entity -> {
                entitys.add(voentity(entity));
            });
        }
        return entitys;
    }

    /***
     * æ•°ç»„对象转换
     * @param vo
     * @return
     */
    public DockingTask voentity( DockingTaskVO vo) {
        DockingTask entity = Objects.requireNonNull(BeanUtil.copy(vo, DockingTask.class));
        return entity;
    }
}

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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,48 @@
<?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.DockingTaskMapper">
    <!-- é€šç”¨æŸ¥è¯¢æ˜ å°„结果 -->
    <resultMap id="plDockingLogResultMap" type="com.vci.ubcs.code.entity.DockingTask">
        <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="SYSINFOOID" property="sysInfoOid"/>
        <result column="SYSTEMOID" property="systemOid"/>
        <result column="SYSINFOOID" property="sysInfoOid"/>
        <result column="SYSTEMCODE" property="systemCode"/>
        <result column="SYSTEMNAME" property="systemName"/>
        <result column="CLASSIFYOID" property="classifyOid"/>
        <result column="CLASSIFYID" property="classifyId"/>
        <result column="CLASSIFYNAME" property="classifyName"/>
        <result column="BTMOID" property="btmOid"/>
        <result column="BTMID" property="btmId"/>
        <result column="UNIQUECODE" property="uniqueCode"/>
        <result column="SENDTYPE" property="sendType"/>
        <result column="SENDFLAG" property="sendFlag"/>
        <result column="DATAOID" property="dataOid"/>

    </resultMap>
</mapper>