集成统一接口管理模块控制接口完善

 Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/attrmap/TT.json

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,17 @@
{
  "data": {
    "systemId": "MPM",
    "user": {
      "userName": "weidy",
      "trueName": "魏大勇",
      "ip": "127.0.0.1"
    },
    "library": {
      "id": "wupin",
      "classifyid":[
        "020201",
        "020202"
      ]
    }
  }
}

 Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/attrmap/xxx.json

@@ -3,18 +3,14 @@
    "classifys": {
      "classify": [
        {
          "classCode": "050101",
          "classCode": "1025",
          "fullclsfNamePath": "",
          "library": "wupin",
          "library": "10",
          "sections": {
            "section": [
              {
                "name": "固定码段",
                "value": "A"
              },
              {
                "name": "引用码段",
                "value": "001"
                "name": "分类",
                "value": "1025"
              }
            ]
          },
@@ -30,6 +26,10 @@
                  "key": "name",
                  "text": "名称",
                  "value": "半圆头螺钉"
                },{
                  "key": "drawingno",
                  "text": "图号",
                  "value": "test2023-11-20-24"
                }]
              }
            ]

 Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/attrmap/±ê×¼..JSON

@@ -16,7 +16,10 @@
                        "value": "Q/3B",
                        "name": "固定码段"
                    },
                    { "name": "系列号" },
                    {
                        "name": "系列号",
                        "value":""
                    },
                    {
                        "value": "-",
                        "name": "分割符"
@@ -33,9 +36,9 @@
                    "editSeriesFlag": "false",
                    "releaseTime": "2023-11-14",
                    "seriesFlag": "false",
                    "oldCode": "",
                    "oldCode": "Q/3B12-2023",
                    "seriesFlow": "",
                    "operationType": "1",
                    "operationType": "2",
                    "creator": "weidy",
                    "operate": "create",
                    "status": "Released",

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

@@ -14,6 +14,7 @@
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.extern.slf4j.Slf4j;
import org.jetbrains.annotations.NotNull;
import org.springblade.core.tenant.annotation.NonDS;
import org.springblade.core.tool.api.R;
import org.springframework.beans.factory.annotation.Autowired;
@@ -289,7 +290,7 @@
     * @param jclassObject
     * @throws Throwable
     */
    private void getVilewMode(DockingClassifyVO jclassObject, List<DockingClassifyViewVO> list)
    private void getVilewMode(@NotNull DockingClassifyVO jclassObject, List<DockingClassifyViewVO> list)
        throws Throwable {
        String nodeLinkName = jclassObject.getNodeLinkName();
        try {

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

@@ -670,7 +670,7 @@
     * @return
     */
    public List<CodeClassifyVO> selectAllClassifyByOid(String oid, String fieldInPath){
        List<CodeClassify>  codeClassifyList=codeClassifyMapper.selectAllClassifyByOid(oid,AuthUtil.getTenantId(),fieldInPath);
        List<CodeClassify>  codeClassifyList=codeClassifyMapper.selectAllClassifyByOid(oid,fieldInPath,AuthUtil.getTenantId());
        List<CodeClassifyVO> voList = codeClassifyDO2VOs(codeClassifyList);
        return voList;


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

@@ -315,7 +315,7 @@
                        //校验是否配置
                        DockingSystemConfig dockingSystemConfig=null;
                        dockingSystemConfig=checkIspass(finalSystemId, SysIntegrationDataFlowTypeEnum.ACCEPT.getValue(), sysIntegrationPushTypeEnum.ACCPET_APPCODE.getValue(),codeClassifyVO.getOid());
                        if(dockingSystemConfig==null){
                        if(dockingSystemConfig==null||StringUtils.isBlank(dockingSystemConfig.getOid())){
                            errorid[0] ="101";
                            throw new Throwable("系统标识为【"+ finalSystemId +"】，集成分类为【"+codeClassifyVO.getName()+"】以上分类，"+sysIntegrationPushTypeEnum.ACCPET_APPCODE.getText()+"接口配置已停用或者未配置，请联系编码管理员！");
                        }
@@ -1064,7 +1064,7 @@
                    if(CODE_CHECKCONFIG) {
                        //校验是否配置
                        DockingSystemConfig dockingSystemConfig= checkIspass(finalSystemId, SysIntegrationDataFlowTypeEnum.ACCEPT.getValue(), sysIntegrationPushTypeEnum.ACCPET_EDITCODE.getValue(),codeClassifyVO.getOid());
                        if(dockingSystemConfig==null){
                        if(dockingSystemConfig==null||StringUtils.isBlank(dockingSystemConfig.getOid())){
                            objerrorCode ="101";
                            throw new Throwable("系统标识为【"+ finalSystemId +"】，集成分类为【"+codeClassifyVO.getName()+"】以上分类，"+sysIntegrationPushTypeEnum.ACCPET_EDITCODE.getText()+"接口配置已停用或者未配置，请联系编码管理员！");
                        }
@@ -1421,7 +1421,7 @@
                    if(CODE_CHECKCONFIG) {
                        //校验是否配置
                        DockingSystemConfig dockingSystemConfig= checkIspass(systemId, SysIntegrationDataFlowTypeEnum.ACCEPT.getValue(), sysIntegrationPushTypeEnum.ACCPET_QUERYDATA.getValue(),currentCodeClassify[0].getOid());
                        if(dockingSystemConfig==null){
                        if(dockingSystemConfig==null||StringUtils.isBlank(dockingSystemConfig.getOid())){
                            errorid ="101";
                            throw new Throwable("系统标识为【"+ systemId +"】，集成分类为【"+currentCodeClassify[0].getName()+"】以上分类，"+sysIntegrationPushTypeEnum.ACCPET_QUERYDATA.getText()+"接口配置已停用或者未配置，请联系编码管理员！");
                        }
@@ -2072,7 +2072,7 @@
                //校验是否配置
                DockingSystemConfig dockingSystemConfig=null;
                dockingSystemConfig=checkIspass(finalSystemId, SysIntegrationDataFlowTypeEnum.ACCEPT.getValue(), sysIntegrationPushTypeEnum.ACCPET_APPCODE.getValue(),codeClassifyVO.getOid());
                if(dockingSystemConfig==null){
                if(dockingSystemConfig==null||StringUtils.isBlank(dockingSystemConfig.getOid())){
                    errorid[0] ="101";
                    throw new Throwable("系统标识为【"+ finalSystemId +"】，集成分类为【"+codeClassifyVO.getName()+"】以上分类，"+sysIntegrationPushTypeEnum.ACCPET_APPCODE.getText()+"接口配置已停用或者未配置，请联系编码管理员！");
                }
@@ -2426,7 +2426,7 @@
        }catch (Throwable e){
            objerrorCode="1";
            e.printStackTrace();
            throw new Throwable("MDM集成属性配置文件读取失败");
            throw new Throwable("集成系统标识为：【"+systemId+"】，分类库为:【"+libray+"】的集成属性配置文件读取失败");
        }
        LinkedList<String> rowNameList=new LinkedList<>();
        LinkedHashMap<String,Integer> filedIndexMap=new LinkedHashMap<>();
@@ -2537,7 +2537,7 @@
        }catch (Throwable e){
            objerrorCode="1";
            e.printStackTrace();
            throw new Throwable("MDM集成属性配置文件读取失败");
            throw new Throwable("集成系统标识为：【"+systemId+"】，分类库为:【"+libray+"】的集成属性配置文件读取失败");
        }
        LinkedList<String> rowNameList=new LinkedList<>();
        LinkedHashMap<String,Integer> filedIndexMap=new LinkedHashMap<>();
@@ -2729,8 +2729,15 @@
     */
    private DockingSystemConfig  checkIspass(String systemId,String type,String operationType,String classOid){
        log.info("systemId："+systemId+",type:"+SysIntegrationDataFlowTypeEnum.getTextByValue(type)+",operationType:"+sysIntegrationPushTypeEnum.getTextByValue(operationType)+",classOid:"+classOid);
        CodeClassifyVO codeClassifyVO= classifyService.getObjectByOid(classOid);
        classOid=codeClassifyVO.getOid();
        //CodeClassifyVO codeClassifyVO= classifyService.getObjectByOid(classOid);
        List<CodeClassify> codeClassifyList=  classifyService.selectAllLevelParentByOid(classOid);
        List<String> classifyOids=new ArrayList<>();
        if(!CollectionUtils.isEmpty(codeClassifyList)) {
            classifyOids = codeClassifyList.stream().map(CodeClassify::getOid).collect(Collectors.toList());
        }else{
            return null;
        }
        //classOid=codeClassifyVO.getOid();
        //根据类型去查询需要集成的分类或者数据
        LambdaQueryWrapper<DockingSystemConfig> queryWrapper = Wrappers.<DockingSystemConfig>lambdaQuery();
        queryWrapper.eq(DockingSystemConfig::getUsedFlag, MdmDuckingConstant.SEND_FLAG_TRUE);
@@ -2738,11 +2745,16 @@
        queryWrapper.eq(DockingSystemConfig::getDataFlowType,type);
        queryWrapper.eq(DockingSystemConfig::getPushType,operationType);
        if(StringUtils.isNotBlank(classOid)){
            queryWrapper.in(DockingSystemConfig::getClassifyOid,classOid);
            queryWrapper.in(DockingSystemConfig::getClassifyOid,classifyOids);
        }
        List<DockingSystemConfig> dockingSystemConfigList=new ArrayList<>();
        dockingSystemConfigList=    dockingSystemConfigList=dockingSystemConfigService.list(queryWrapper);
        if(!CollectionUtils.isEmpty(dockingSystemConfigList)){
            return    dockingSystemConfigList.get(0);
        }else{
            return null;
        }
        /*if(!CollectionUtils.isEmpty(dockingSystemConfigList)){
         return    dockingSystemConfigList.get(0);
        }else{
            if(StringUtils.isNotBlank(codeClassifyVO.getParentCodeClassifyOid())) {
@@ -2753,6 +2765,6 @@
            return dockingSystemConfigList.get(0);
        }else{
            return    new DockingSystemConfig();
        }
        }*/
    }
}