Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/controller/GroupAttrPoolMappingController.java
@@ -87,7 +87,7 @@ */ @PostMapping("/getEnumAttrByClsOIdAndAttrId") public R<List<EnumVO>> getEnumAttrByClsOIdAndAttrId(@RequestBody GroupAttrPoolMappingVO groupAttrPoolMappingVO) throws ServiceException { return R.data(groupAttrPoolMappingService.getEnumAttrByClsOIdAndAttrId(groupAttrPoolMappingVO)); return groupAttrPoolMappingService.getEnumAttrByClsOIdAndAttrId(groupAttrPoolMappingVO); } } Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/service/IGroupAttrPoolMappingService.java
@@ -65,6 +65,6 @@ * @param groupAttrPoolMappingVOS * @return */ List<EnumVO> getEnumAttrByClsOIdAndAttrId(GroupAttrPoolMappingVO groupAttrPoolMappingVOS); R getEnumAttrByClsOIdAndAttrId(GroupAttrPoolMappingVO groupAttrPoolMappingVOS); } Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/service/impl/DockingPreAttrMappingServiceImpl.java
@@ -95,7 +95,7 @@ VciBaseUtil.alertNotNull(sourceClassifyId,"集团分类主键"); //首先获取分类模板属性，然后与属性配置坐比较，以防被有增删属性的可能 DockingPreClassify dockingPreClassify=dockingPreClassifyService.getById(sourceClassifyId); List<DockingPreMetaAttr> dockingPreMetaAttrList= dockingPreMetaAttrService.selectByWrapper(Wrappers.<DockingPreMetaAttr>query().lambda().eq(DockingPreMetaAttr::getSourceClassifyId,sourceClassifyId)); List<DockingPreMetaAttr> dockingPreMetaAttrList = dockingPreMetaAttrService.selectByWrapper(Wrappers.<DockingPreMetaAttr>query().lambda().eq(DockingPreMetaAttr::getSourceClassifyId,sourceClassifyId)); List<DockingPreAttrMapping> dockingPreAttrMappings=this.selectByWrapper(Wrappers.<DockingPreAttrMapping>query().lambda().eq(DockingPreAttrMapping::getSourceClassifyId, sourceClassifyId).eq(DockingPreAttrMapping::getTargetClassifyId, codeClassifyId)); Map<String/**属性主键**/, DockingPreAttrMapping> dockingPreAttrMappingMap = dockingPreAttrMappings.stream().filter(cbo -> cbo != null).collect(Collectors.toList()).stream().collect(Collectors.toMap(s -> s.getMetaListId(), t -> t)); List<DockingPreViewModel> dockingPreViewModelList= dockingPreViewModelService.list(Wrappers.<DockingPreViewModel>query().lambda().eq(DockingPreViewModel::getSourceClassifyId,sourceClassifyId)); @@ -106,7 +106,7 @@ String attrOid=dockingPreMetaAttr.getOid(); DockingPreAttrMapping dockingPreAttrMapping=new DockingPreAttrMapping(); if(dockingPreAttrMappingMap.containsKey(attrOid)){ dockingPreAttrMapping= dockingPreAttrMappingMap.get(attrOid); dockingPreAttrMapping = dockingPreAttrMappingMap.get(attrOid); DefaultAttrAssimtUtil.updateDefaultAttrAssimt(dockingPreAttrMapping); }else{ DefaultAttrAssimtUtil.addDefaultAttrAssimt(dockingPreAttrMapping, MdmBtmTypeConstant.DOCKING_PRE_JAPPLYFORM); Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/service/impl/GroupAttrPoolMappingServiceImpl.java
@@ -206,7 +206,7 @@ * @return */ @Override public List<EnumVO> getEnumAttrByClsOIdAndAttrId(GroupAttrPoolMappingVO groupAttrPoolMappingVOS) { public R getEnumAttrByClsOIdAndAttrId(GroupAttrPoolMappingVO groupAttrPoolMappingVOS) { if(Func.isEmpty(groupAttrPoolMappingVOS.getClassifyId())){ throw new ServiceException("必传参数分类oid不能为空！"); } @@ -217,16 +217,16 @@ List<CodeClassifyTemplateAttrVO> attrVOS = codeClassifyClient.listCodeAttributeByClassId(groupAttrPoolMappingVOS.getClassifyId()); // 筛选出模板属性中id等于codeMetaAttrKey的，并取出enumId if(attrVOS.isEmpty()){ return new ArrayList<>(); return R.fail("当前分类所使用模板的模板属性中未查询到相关的属性配置，请排查模板配置是否正确。"); } List<CodeClassifyTemplateAttrVO> codeClassifyTemplateAttrVOS = attrVOS.stream().filter(item -> item.getId().equalsIgnoreCase(groupAttrPoolMappingVOS.getCodeMetaAttrKey())).collect(Collectors.toList()); // 根据上一步取出的enumId调用枚举服务查询出枚举并返回 String enumId = codeClassifyTemplateAttrVOS.get(0).getEnumId(); if(Func.isBlank(enumId)){ return new ArrayList<>(); return R.fail("在系统中根据当前配置的模板属性未查询到关于枚举的配置，请排查元数据上是否存在枚举属性！"); } R<List<EnumVO>> list = enumClient.getList(enumId); return list.getData(); return R.data(list.getData()); } } Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/Scheduling/DockingDataSyncScheduling.java
@@ -49,12 +49,12 @@ */ @Scheduled(cron = "${dataSyncPush.cronTime:0 0/10 * * * ?}") public void scheduled() { log.info("执行主数据集成数据推送 start:"); 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 = "============ 执行了主数据集成数据推送"; String outinfo = time+"============ 执行了主数据集成数据推送"; log.info(outinfo); } log.info("执行主数据集成数据推送 end: "+ "开关是否开启:" +DATA_SYNC_PUSH_ISSTARE); Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeDuckingSyncServiceImpl.java
@@ -189,11 +189,9 @@ @Override public void DockingDataSyncScheduing() { // insertCache2(); initPushDataTaks(1); sendpushDataForService(); } /*** @@ -1085,7 +1083,7 @@ try { boolean usedFlag= dockingSystemConfig.getUsedFlag().equals("true")?true:false; if(!usedFlag){ throw new Throwable("接口已经停用！"); throw new Throwable("接口已经停用！"); } String type = dockingSystemConfig.getInterfaceType().toLowerCase(Locale.ROOT);//get/post/webserver/corba String paramType = dockingSystemConfig.getParamType();//xml/json
