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

@@ -559,7 +559,7 @@
                  object.setOperate("create");
                  applyDataVOList.add(object);
               }
               codeList.add(personMasterData.getLm_code());
               codeList.add(object.getCode());
            });

            R<BtmTypeVO> r = btmTypeClient.getAllAttributeByBtmId(templateVO.getBtmTypeId());
@@ -614,8 +614,8 @@
               DataObjectVO dataObjectVO = new DataObjectVO();
               this.getConfigDatas(systemCode, personLibrary, editDatasVO, attrVOS, dataObjectVO);
               log.info("start：修改数据执行完毕");
               boolean  personApplyGroupCode =personAndDeptConfig.isPersonApplyGroupCode();
               mdmIOService.batchSyncEditDatas(codeClassifyVO,dataObjectVO, resultDataObjectDetailDOs,personApplyGroupCode);
            //   boolean  personApplyGroupCode =personAndDeptConfig.isPersonApplyGroupCode();
               mdmIOService.batchSyncEditDatas(codeClassifyVO,dataObjectVO, resultDataObjectDetailDOs,isPersonApplyGroupCode);
               log.info("end：修改数据执行完毕");
            }
            if(applyDatasVO.getObject()!=null&&applyDatasVO.getObject().size()>0) {
@@ -680,7 +680,7 @@
                     log.error("数据保存失败:",e);
                     mesg=e.getMessage();
                     e.printStackTrace();
                     throw new ServiceException(e.getMessage());
                  //   throw new ServiceException(e.getMessage());
                  }finally {
                     XMLResultDataObjectDetailDO x=new XMLResultDataObjectDetailDO();
                     x.setId(rowData.getOid());
@@ -806,10 +806,10 @@
            List<ApplyDataVO> deleteDataVOList=new ArrayList<>();
            orgMasterDataList.stream().forEach(orgMasterData -> {
               ApplyDataVO object=new ApplyDataVO();
               object.setCode(orgMasterData.getMdm_code());//编码
               object.setCode(orgMasterData.getDepartment_code());//编码
               object.setCreator(orgMasterData.getCreator());//创建者
               object.setEditor(orgMasterData.getModifier());//修改者
               object.setId(orgMasterData.getDepartment_code());//主键
               object.setId(orgMasterData.getId());//主键
               object.setStatus(CodeDefaultLC.RELEASED.getValue());//状态则需要判断
               Map<String,String> dataMap= VciBaseUtil.objectToMapString(orgMasterData);
               List<ProppertyVO> proppertyVOList = new ArrayList<>();
@@ -844,7 +844,7 @@
                  object.setOperate("create");
                  applyDataVOList.add(object);
               }
               codeList.add(orgMasterData.getMdm_code());
               codeList.add(object.getCode());
            });

            R<BtmTypeVO> r = btmTypeClient.getAllAttributeByBtmId(templateVO.getBtmTypeId());
@@ -899,7 +899,7 @@
               DataObjectVO dataObjectVO = new DataObjectVO();
               this.getConfigDatas(systemCode, deptLibrary, editDatasVO, attrVOS, dataObjectVO);
               log.info("start：修改数据执行完毕");
               boolean personApplyGroupCode = personAndDeptConfig.isPersonApplyGroupCode();
               boolean personApplyGroupCode = false;//personAndDeptConfig.isPersonApplyGroupCode();
               mdmIOService.batchSyncEditDatas(codeClassifyVO,dataObjectVO, resultDataObjectDetailDOs,personApplyGroupCode);
               log.info("end：修改数据执行完毕");
            }
@@ -914,8 +914,9 @@
               }
               List<XMLResultDataObjectDetailDO> xDOs=new CopyOnWriteArrayList<>();
               //限制线程并行数量
               customForkJoinPool.submit(()->{
                  dataObjectVO.getRowData().parallelStream().forEach(rowData->{
               //customForkJoinPool.submit(()->{
               //   dataObjectVO.getRowData().parallelStream().forEach(rowData->{
               dataObjectVO.getRowData().forEach(rowData->{
                     String mesg="";
                     try {
                        CodeOrderDTO orderDTO = new CodeOrderDTO();
@@ -931,7 +932,7 @@
                                 //规则之定义为可变码段存储主数据传递过来的数据
                                 CodeOrderSecDTO CodeOrderSecDTO = new CodeOrderSecDTO();
                                 CodeOrderSecDTO.setSecOid(codeBasicSecVO.getOid());
                                 CodeOrderSecDTO.setSecValue(rowData.getOid());
                                 CodeOrderSecDTO.setSecValue(rowData.getCode());
                                 codeOrderSecDTOList.add(CodeOrderSecDTO);
                              }
                           });
@@ -964,9 +965,10 @@
                        }
                     }*/
                     } catch (Exception e) {
                        log.error( "部门数据接收失败:",e);
                        mesg=e.getMessage();
                        e.printStackTrace();
                        throw new ServiceException(e.getMessage());
                     //   throw new ServiceException(e.getMessage());
                     }finally {
                        XMLResultDataObjectDetailDO x=new XMLResultDataObjectDetailDO();
                        x.setId(rowData.getOid());
@@ -976,7 +978,7 @@
                        xDOs.add(x);
                     }
                  });
               }).join();
               //}).join();
               resultDataObjectDetailDOs.addAll(xDOs);
               boolean finalSuccess1 = success.get();
               String finalMessage1 = message;
@@ -2474,17 +2476,21 @@
                  String buildSqlwhere="";
                  List<CodeSectionValueVO> codeSectionValueVOList=new ArrayList<>();
                  if(coderefersecSearchVO!=null) {
                     Map<String, Object> condtionMap = new HashMap<>();
                     String valueField= coderefersecSearchVO.getValueField();
                     if(StringUtils.isNotBlank(valueField)){
                        condtionMap.put(valueField,sectypeValue);
                     }
                     if (coderefersecSearchVO.getType().equals(CodeReferConfigTypeEnum.DEFAULT.getValue()) || coderefersecSearchVO.getType().equals(CodeReferConfigTypeEnum.GRID.getValue())) {//默认样式/列表
                        Map<String, Object> condtionMap = new HashMap<>();
                        List<CodeSrchCondConfigVO> codeSrchCondConfigVOList = coderefersecSearchVO.getCodeSrchCondConfigVOS();

                        if (!CollectionUtils.isEmpty(codeSrchCondConfigVOList)) {
                           codeSrchCondConfigVOList.stream().forEach(codeSrchCondConfigVO -> {
                              condtionMap.put(codeSrchCondConfigVO.getFilterField() + codeSrchCondConfigVO.getFilterType(), codeSrchCondConfigVO.getFilterValue());
                           });
                        }
                        if(!CollectionUtils.isEmpty(condtionMap)) {
                           buildSqlwhere = UBCSSqlKeyword.buildSqlwhere(condtionMap);
                        }

                        //使用传入的业务类型查询表
                        R<List<BtmTypeVO>> listR = btmTypeClient.selectByIdCollection(Collections.singletonList(referBtmId));
                        if (!listR.isSuccess() || listR.getData().size() == 0) {
@@ -2499,7 +2505,7 @@
                           sb.append(buildSqlwhere);
                        }
                        List<Map> ListMap = commonsMapper.selectBySql(sb.toString());
                        String valueField = coderefersecSearchVO.getValueField();
                        //String valueField = coderefersecSearchVO.getValueField();
                        String textField = coderefersecSearchVO.getTextField();
                        final int[] num = {0};
                        if (!CollectionUtils.isEmpty(ListMap)) {
@@ -2514,8 +2520,6 @@
                           });
                        }
                     }else if (coderefersecSearchVO.getType().equals(CodeReferConfigTypeEnum.TREE.getValue())) {//树形
                        Map<String, Object> condtionMap = new HashMap<>();

                        //使用传入的业务类型查询表
                        R<List<BtmTypeVO>> listR = btmTypeClient.selectByIdCollection(Collections.singletonList(referBtmId));
                        if (!listR.isSuccess() || listR.getData().size() == 0) {
@@ -2532,9 +2536,10 @@
                           codeSrchCondConfigVOList.stream().forEach(codeSrchCondConfigVO -> {
                              condtionMap.put(codeSrchCondConfigVO.getFilterField() + codeSrchCondConfigVO.getFilterType(), codeSrchCondConfigVO.getFilterValue());
                           });
                        }
                        if(!CollectionUtils.isEmpty(condtionMap)) {
                           buildSqlwhere = UBCSSqlKeyword.buildSqlwhere(condtionMap);
                        }

                        //if("all".equals(coderefersecSearchVO.getLoadType())) {
                        String parentOidSql = "";
                        if(StringUtils.isNotBlank(parentValue)){
@@ -2581,7 +2586,6 @@
                           sb.append(buildSqlwhere);
                        }
                        List<Map> ListMap = commonsMapper.selectBySql(sb.toString());
                        String valueField = coderefersecSearchVO.getValueField();
                        String textField = coderefersecSearchVO.getTextField();
                        final int[] num = {0};
                        if (!CollectionUtils.isEmpty(ListMap)) {
@@ -2601,11 +2605,11 @@
                  if(!CollectionUtils.isEmpty(codeSectionValueVOList)){
                     Map<String, CodeSectionValueVO> codeSectionValueVOMap = codeSectionValueVOList.stream().collect(Collectors.toMap(s -> s.getValue(), t -> t, (o1, o2) -> o2));
                     if(!codeSectionValueVOMap.containsKey(sectypeValue)){
                        message="传入的编码规则码段:【"+name+"】为"+CODE_REFER_SEC.getText()+",其对应的值，在编码系统不存在";
                        message="传入的编码规则码段:【"+name+"】为"+CODE_REFER_SEC.getText()+",其对应的值【"+sectypeValue+"】，在编码系统不存在";
                        errorMap.put("error",errorMap.getOrDefault("error","")+";"+message);
                     }
                  }else{
                     message="传入的编码规则码段:【"+name+"】为"+CODE_REFER_SEC.getText()+",其对应的值，在编码系统不存在";
                     message="传入的编码规则码段:【"+name+"】为"+CODE_REFER_SEC.getText()+",其对应的值【"+sectypeValue+"】，在编码系统不存在";
                     errorMap.put("error",errorMap.getOrDefault("error","")+";"+message);
                  }
               }
@@ -2728,6 +2732,7 @@
                     String dataValue = sourceKeyValueMap.get(sourceKey);
                     if (attrMapConfigMap.containsKey(sourceKey)) {
                        String targetKey = attrMapConfigMap.get(sourceKey);
                        log.info("xxxxx属性映射值:sourceKey【"+sourceKey+"】——》+targetKey---》"+targetKey+":"+dataValue);
                        keyValueMap.put(targetKey, StringUtils.isBlank(dataValue)?"":dataValue);
                     }
                  });
@@ -2861,6 +2866,7 @@
                     String dataValue = sourceKeyValueMap.get(sourceKey);
                     if (attrMapConfigMap.containsKey(sourceKey)) {
                        String targetKey = attrMapConfigMap.get(sourceKey);
                        log.info("xxxxx属性映射值:sourceKey【"+sourceKey+"】——》+targetKey---》"+targetKey+":"+dataValue);
                        keyValueMap.put(targetKey, StringUtils.isBlank(dataValue)?"":dataValue);
                     }
                  });