关于集成配置需求更改

 Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/CodeApplyPanelFor410ActionListener.java

@@ -110,6 +110,7 @@
            codeOrderSecDTO.setSecValue(keyValue.getValue());
            secDTOList.add(codeOrderSecDTO);
        });
        codeOrderDTO.setLcStatus("Released");
        codeOrderDTO.setSecDTOList(secDTOList);
        codeOrderDTO.setData(dataMap);
        Object object = JSONObject.toJSON(codeOrderDTO);

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

@@ -19,13 +19,30 @@
    value = "ubcs-code"
)
public interface IMdmInterJtClient {

    String API_PREFIX = "/mdmInterService";
    String APPLYGROUPCODE = API_PREFIX + "/applyGroupCode";
    String RETURNGROUPCODE = API_PREFIX + "/getApplyGroupCode";

    String PUBMDMMODEL = API_PREFIX + "/pubMdmModel";
    String RECEIVE_EDITAPPLY =API_PREFIX + "/receiveEditApply";

    /***
     * å°†é›†å›¢ç”³è¯·æˆåŠŸçš„编码存入相关数据之中
     * @param oids
     * @param btmName
     * @return è¿”回存储是否成功信息
     */
    @GetMapping(APPLYGROUPCODE)
    public R applyGroupCode(String oids,String btmName);


    /***
     * é›†å›¢ç¼–码数据修改
     * @param oids
     * @param btmName
     * @return è¿”回存储是否成功信息
     */
    @PostMapping(RECEIVE_EDITAPPLY)
    public R receiveEditApply(String oids,String btmName);

    /***
     * å°†é›†å›¢ç”³è¯·æˆåŠŸçš„编码存入相关数据之中

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

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

public class DockingApplyGroupCode {

}

 Source/UBCS/ubcs-service-api/ubcs-applyjtcodeservice-api/src/main/java/data/data.json

@@ -1,10 +1,16 @@
{
  "parentOid":"XJ-FC9B6-FE27-241F-5FCA-ED4DC17CF95B",
  "parentBtmName":"jclass",
  "valueField":"oid",
  "textField":"name",
  "parentFieldName":"id",
  "conditionMap":[{
    "codeclsfid": "XJ-FC9B6-FE27-241F-5FCA-ED4DC17CF95B"
  }]
  "data": {
    "systemId": "MPM",
    "user": {
      "userName": "weidy",
      "trueName": "魏大勇",
      "ip": "127.0.0.1"
    },
    "library": {
      "id": "wupin",
      "classifyid":[
        "020202"
      ]
    }
  }
}

 Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/DockingLogeDO.java

 Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/DockingSystemConfigDTO.java

@@ -252,11 +252,14 @@
     * header信息对象
     */
    private List<DockingSysIntHeaderDTO> sysIntHeaderDTOS;

    /***
     * é›†å›¢ç æ˜¯å¦å‚与申请/更新/发送
     */
    private String isGroupCodeFlag;

    @Override
    public String toString() {
        return "SysIntInfoDTO{" +
        return "DockingSystemConfigDTO{" +
            "authorityOid='" + authorityOid + '\'' +
            ", authorityOidName='" + authorityOidName + '\'' +
            ", authorityType='" + authorityType + '\'' +
@@ -303,6 +306,7 @@
            ", classifyName='" + classifyName + '\'' +
            ", sysIntParamDTOS=" + sysIntParamDTOS +
            ", sysIntHeaderDTOS=" + sysIntHeaderDTOS +
            ", isGroupCodeFlag=" + isGroupCodeFlag +
            '}';
    }
}

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

@@ -312,4 +312,63 @@
     */
    @ApiModelProperty(value = "分类名称")
    private String classifyName;

    /***
     * é›†å›¢ç æ˜¯å¦å‚与申请/更新/发送
     */
    /**
     * åˆ†ç±»åç§°
     */
    @ApiModelProperty(value = "集团码是否参与申请/更新/发送")
    private String isGroupCodeFlag;

    @Override
    public String toString() {
        return "DockingSystemConfig{" +
            "authorityOid='" + authorityOid + '\'' +
            ", authorityOidName='" + authorityOidName + '\'' +
            ", authorityType='" + authorityType + '\'' +
            ", authorityTypeText='" + authorityTypeText + '\'' +
            ", userAccount='" + userAccount + '\'' +
            ", userCode='" + userCode + '\'' +
            ", token='" + token + '\'' +
            ", interfaceFunction='" + interfaceFunction + '\'' +
            ", interfaceType='" + interfaceType + '\'' +
            ", interfaceTypeText='" + interfaceTypeText + '\'' +
            ", paramType='" + paramType + '\'' +
            ", paramTypeText='" + paramTypeText + '\'' +
            ", requestMethod='" + requestMethod + '\'' +
            ", requestMethodText='" + requestMethodText + '\'' +
            ", classifyOid='" + classifyOid + '\'' +
            ", usedFlag='" + usedFlag + '\'' +
            ", sysBaseOid='" + sysBaseOid + '\'' +
            ", sysBaseId='" + sysBaseId + '\'' +
            ", sysBaseName='" + sysBaseName + '\'' +
            ", requestUrl='" + requestUrl + '\'' +
            ", returnType='" + returnType + '\'' +
            ", returnTypeText='" + returnTypeText + '\'' +
            ", sourceSystemOid='" + sourceSystemOid + '\'' +
            ", sourceSysName='" + sourceSysName + '\'' +
            ", sourceSysId='" + sourceSysId + '\'' +
            ", sourceSystemOidName='" + sourceSystemOidName + '\'' +
            ", targetSystemOid='" + targetSystemOid + '\'' +
            ", targetSysName='" + targetSysName + '\'' +
            ", targetSysId='" + targetSysId + '\'' +
            ", targetSystemOidName='" + targetSystemOidName + '\'' +
            ", classPath='" + classPath + '\'' +
            ", dataFlowType='" + dataFlowType + '\'' +
            ", dataFlowTypeText='" + dataFlowTypeText + '\'' +
            ", btmTypeId='" + btmTypeId + '\'' +
            ", btmTypeName='" + btmTypeName + '\'' +
            ", namespace='" + namespace + '\'' +
            ", soapAction='" + soapAction + '\'' +
            ", cxfAxis='" + cxfAxis + '\'' +
            ", targetName='" + targetName + '\'' +
            ", pushType='" + pushType + '\'' +
            ", pushTypeText='" + pushTypeText + '\'' +
            ", classifyId='" + classifyId + '\'' +
            ", classifyName='" + classifyName + '\'' +
            ", isGroupCodeFlag=" + isGroupCodeFlag +
            '}';
    }
}

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

@@ -237,7 +237,10 @@
     * åˆ†ç±»åç§°
     */
    private String classifyName;

    /***
     * é›†å›¢ç æ˜¯å¦å‚与申请/更新/发送
     */
    private String isGroupCodeFlag;
    /***
     * å‚数信息对象
     */
@@ -618,9 +621,17 @@
        this.sysIntHeaderVOs = sysIntHeaderVOs;
    }

    public String getIsGroupCodeFlag() {
        return isGroupCodeFlag;
    }

    public void setIsGroupCodeFlag(String isGroupCodeFlag) {
        this.isGroupCodeFlag = isGroupCodeFlag;
    }

    @Override
    public String toString() {
        return "SysIntInfoVO{" +
        return "DockingSystemConfigVO{" +
            "authorityOid='" + authorityOid + '\'' +
            ", authorityOidName='" + authorityOidName + '\'' +
            ", authorityType='" + authorityType + '\'' +
@@ -665,6 +676,7 @@
            ", pushTypeText='" + pushTypeText + '\'' +
            ", classifyId='" + classifyId + '\'' +
            ", classifyName='" + classifyName + '\'' +
            ", isGroupCodeFlag=" + isGroupCodeFlag +
            ", sysIntParamVOs=" + sysIntParamVOs +
            ", sysIntHeaderVOs=" + sysIntHeaderVOs +
            '}';

 Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/result/xml/XMLResultDataObjectDetailDO.java

@@ -26,7 +26,7 @@
        this.id = id;
    }

    public String getErrorid() {
    public String getErrorid() {
        return errorid;
    }


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

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

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 DockingApplyGroupCodeSyncScheduling {

    @Resource
    private IGroupCodeDuckingSyncService groupCodeDuckingSyncService;

    @Value("${apply.groupCode.isStart:false}")
    public boolean APPLY_GRUPCODE_SYNC_ISSTARE;

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

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

    //默认每分钟执行方法
    @Scheduled(cron = "${groupcode.cronTime:0 0/10 * * * ?}")
    public void scheduled() {
        log.info("执行调用集团编码申请接口申请集团编码 start:");
        if(APPLY_GRUPCODE_SYNC_ISSTARE && BooleanEnum.TRUE.getValue().equalsIgnoreCase(FINISH_INIT)) {
        //a    codeDuckingSyncServiceI.DockingClassSyncScheduing();
            SimpleDateFormat formatter= new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.");
            String time = formatter.format(new Date());
            String outinfo = "============在 "+time+" æ‰§è¡Œäº†åˆ†ç±»é›†æˆæŽ¨é€";
            log.info(outinfo);
        }
        log.info("执行调用集团编码申请接口申请集团编码 end: "+ "开关是否开启:" +APPLY_GRUPCODE_SYNC_ISSTARE);
    }
}

 Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/controller/DockingPreApplyCodeController.java

@@ -3,9 +3,9 @@

import com.baomidou.mybatisplus.core.metadata.IPage;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import com.vci.ubcs.code.applyjtcodeservice.service.*;
import com.vci.ubcs.code.applyjtcodeservice.entity.DockingPreApplyForm;
import com.vci.ubcs.code.feign.ICodeClassifyClient;
import com.vci.ubcs.code.applyjtcodeservice.service.*;
import com.vci.ubcs.code.applyjtcodeservice.vo.*;
import com.vci.ubcs.code.applyjtcodeservice.vo.collection.DockingPreAttrMappingVOList;
import com.vci.ubcs.code.applyjtcodeservice.wrapper.DockingPreApplyFormWrapper;

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

@@ -10,7 +10,6 @@
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.MdmEnumIdConstant;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springblade.core.tenant.annotation.NonDS;
@@ -48,16 +47,47 @@
    private final IDockingPreMetaAttrService dockingPreMetaAttrService;

    /**
     * é›†å›¢ç”³è¯·å•æœåŠ¡
     * é›†å›¢åˆ†ç±»ç”³è¯·å•æœåŠ¡
     */
    private final IDockingPreClassifyService dockingPreClassifyService;


    /**
     * é›†å›¢ç”³è¯·å•æœåŠ¡
     * é›†å›¢å–值范围申请单服务
     */
    private final IDockingPreAttrRangeService dockingPreAttrRangeService;

    /**
     * é›†å›¢å±žæ€§æ˜ å°„配置属性
     */
    private final IGroupMdmInterService groupMdmInterService;


    /***
     * ç”³è¯·é›†å›¢ç¼–码
     * @return
     */
    public R applyGroupCode(String oids,String btmName){
        try {
            return groupMdmInterService.applyGroupCode(oids,btmName);
        }catch (Throwable e){
            return R.fail("集团码申请失败："+e.getMessage());
        }
    }
    /***
     * ç”³è¯·é›†å›¢ç¼–码数据维护
     * @return
     */
    @Override
    public R receiveEditApply(String oids, String btmName) {
        try {
            return groupMdmInterService.applyGroupCode(oids,btmName);
        }catch (Throwable e){
            return R.fail("集团码数据修改失败："+e.getMessage());
        }
    }



    /*
     * ä¸»æ•°æ®ä¸šåŠ¡æœåŠ¡

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

@@ -43,6 +43,7 @@
    //默认每分钟执行方法
    @Scheduled(cron = "${clsfSyncPush.cronTime:0 0/10 * * * ?}")
    public void scheduled() {
        log.info("执行分类集成推送 start:");
        if(CLSF_SYNC_PUSH_ISSTARE && BooleanEnum.TRUE.getValue().equalsIgnoreCase(FINISH_INIT)) {
            codeDuckingSyncServiceI.DockingClassSyncScheduing();
            SimpleDateFormat formatter= new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.");
@@ -50,5 +51,6 @@
            String outinfo = "============在 "+time+" æ‰§è¡Œäº†åˆ†ç±»é›†æˆæŽ¨é€";
            log.info(outinfo);
        }
        log.info("执行分类集成推送 end: "+ "开关是否开启:" +CLSF_SYNC_PUSH_ISSTARE);
    }
}

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

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

import com.vci.ubcs.code.service.ICodeDuckingSyncService;
import com.vci.ubcs.starter.web.enumpck.BooleanEnum;
import lombok.extern.slf4j.Slf4j;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Value;
@@ -19,9 +20,10 @@
 * ä»Ždockingtask中取出来数据，推送出去的操作
 */
@Component
@Slf4j
public class DockingDataSyncScheduling {

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

    @Resource
    private ICodeDuckingSyncService codeDuckingSyncServiceI;
@@ -45,12 +47,14 @@
    //默认每分钟执行方法
    @Scheduled(cron = "${dataSyncPush.cronTime:0 0/10 * * * ?}")
    public void scheduled() {
        log.info("执行主数据集成数据推送 start:");
        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);
            String outinfo = "============ æ‰§è¡Œäº†ä¸»æ•°æ®é›†æˆæ•°æ®æŽ¨é€";
            log.info(outinfo);
        }
        log.info("执行主数据集成数据推送 end: "+ "开关是否开启:" +DATA_SYNC_PUSH_ISSTARE);
    }
}

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

@@ -110,5 +110,5 @@
     * @param resultDataObjectDetailDOs é”™è¯¯ä¿¡æ¯
     * @return æœ‰é”™è¯¯ä¿¡æ¯çš„excel
     */
    void batchSyncApplyCode(CodeOrderDTO orderDTO, DataObjectVO dataObjectVO, LinkedList<XMLResultDataObjectDetailDO> resultDataObjectDetailDOs);
    void batchSyncApplyCode(CodeOrderDTO orderDTO, DataObjectVO dataObjectVO, LinkedList<XMLResultDataObjectDetailDO> resultDataObjectDetailDOs,boolean isCodeOrGroupCode);
}

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

@@ -58,6 +58,7 @@
        <result column="NAMESPACE" property="namespace"/>
        <result column="SOAPACTION" property="soapAction"/>
        <result column="CXFAXIS" property="cxfAxis"/>
        <result column="ISGROUPCODEFLAG" property="isGroupCodeFlag"/>

    </resultMap>