Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/feigh/MdmInterJtClient.java
@@ -7,6 +7,7 @@ import com.vci.ubcs.code.applyjtcodeservice.feign.IMdmInterJtClient; import com.vci.ubcs.code.applyjtcodeservice.service.*; import com.vci.ubcs.code.applyjtcodeservice.vo.*; import com.vci.ubcs.code.feign.IMdmEngineClient; import com.vci.ubcs.starter.revision.model.BaseModel; import com.vci.ubcs.starter.util.DefaultAttrAssimtUtil; import com.vci.ubcs.starter.util.MdmBtmTypeConstant; @@ -14,6 +15,7 @@ import lombok.extern.slf4j.Slf4j; import org.springblade.core.tenant.annotation.NonDS; import org.springblade.core.tool.api.R; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; import org.springframework.web.bind.annotation.RestController; @@ -62,7 +64,8 @@ */ private final IGroupMdmInterService groupMdmInterService; @Autowired(required = false) private IMdmEngineClient mdmEngineClient; /*** * 申请集团编码 * @return @@ -81,7 +84,7 @@ @Override public R receiveEditApply(String oids, String btmName) { try { return groupMdmInterService.applyGroupCode(oids,btmName); return groupMdmInterService.receiveEditApply(oids,btmName); }catch (Throwable e){ return R.fail("集团码数据修改失败："+e.getMessage()); } @@ -159,18 +162,23 @@ //返回结果信息 dockingPreApplyForm.setContent(jcontent.toJSONString()); dockingPreApplyFormList.add(dockingPreApplyForm); String jdataid = dockingPreApplyForm.getDataOid(); String jdatabtmname = dockingPreApplyForm.getDataBtmName(); if (res) { String jdataid = dockingPreApplyForm.getDataOid(); String jdatabtmname = dockingPreApplyForm.getDataBtmName(); //此处需要查询业务数据，去更改 BaseModel baseModel = new BaseModel(); baseModel.setId(customCoding); log.info("申请单:"+applyId+",集团码："+customCoding+"编码："+baseModel.getId()); editObjectList.add(baseModel); } List<String> dataOidList=new ArrayList<>(); dataOidList.add(jdataid); //调用主数据服务批量保存接口 mdmEngineClient.updateBatchByType(jdatabtmname,editObjectList); } dockingPreApplyFormService.saveOrUpdateBatch(dockingPreApplyFormList); //调用主数据服务批量保存接口 }catch (Throwable e){ e.printStackTrace(); return R.fail("集团码集成赋值失败"+e); Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeApplySwingController.java
@@ -251,6 +251,6 @@ Map<String,String> codtionMap=new HashMap<>(); codtionMap.put("oid",oid); codtionMap.put("classifyGroupCode",classifyGroupCode); return R.data(mdmEngineService.checkGroupCode(codtionMap)); return mdmEngineService.checkGroupCode(codtionMap); } } Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/DockingManagementController.java
@@ -58,16 +58,20 @@ private final ICodeDuckingSyncService codeDuckingSyncService; /**系统集成的系统信息列表 * @param condtionMap 基础查询对象，包含查询条件，分页，排序等 * @param queryObject 基础查询对象，包含查询条件，分页，排序等 *@return 系统集成的系统信息显示对象列表 */ @GetMapping("/gridDockingSystem") @ApiOperationSupport(order = 3) @ApiOperation(value = "分页", notes = "condtionMap") public R<IPage<DockingSystemVO>> page(Map<String,String> condtionMap,Query query) { if(!CollectionUtils.isEmpty(condtionMap)){}{ public R<IPage<DockingSystemVO>> page(BaseQueryObject queryObject) { Map<String,String> condtionMap=queryObject.getConditionMap(); Query query=new Query(); if(CollectionUtils.isEmpty(condtionMap)){ condtionMap=new HashMap<>(); } query.setCurrent(queryObject.getPage()); query.setSize(queryObject.getLimit()); IPage<DockingSystem> pages = dockingSystemService.page(Condition.getPage(query),UBCSSqlKeyword.buildConditionByMapString(condtionMap)); return R.data(DockingSystemWrapper.build().pageVO(pages)); } @@ -112,16 +116,20 @@ } /** * 系统集成基础信息列表 * @param condtionMap 基础查询对象，包含查询条件，分页，排序等 * @param queryObject 基础查询对象，包含查询条件，分页，排序等 * @return 系统集成基础信息显示对象列表 */ @GetMapping("/gridSystemConfig") @ApiOperationSupport(order = 3) @ApiOperation(value = "分页", notes = "dockingSystemConfig") public R<IPage<DockingSystemConfigVO>> gridSystemConfig(Map<String,String> condtionMap, Query query){ if(!CollectionUtils.isEmpty(condtionMap)){ public R<IPage<DockingSystemConfigVO>> gridSystemConfig(BaseQueryObject queryObject){ Map<String,String> condtionMap=queryObject.getConditionMap(); Query query=new Query(); if(CollectionUtils.isEmpty(condtionMap)){ condtionMap=new HashMap<>(); } query.setCurrent(queryObject.getPage()); query.setSize(queryObject.getLimit()); IPage<DockingSystemConfigVO> pages=dockingSystemConfigService.page(condtionMap,query); return R.data(pages); } @@ -191,16 +199,20 @@ /** * 待集成数据 * @param condtionMap 基础查询对象，包含查询条件，分页，排序等 * @param queryObject 基础查询对象，包含查询条件，分页，排序等 * @return 系统集成基础信息显示对象列表 */ @GetMapping("/gridDockingData") @ApiOperationSupport(order = 3) @ApiOperation(value = "分页", notes = "DockingDataVO") public R<IPage<DockingDataVO>> gridDockingData(Map<String,String>condtionMap, Query query){ if(!CollectionUtils.isEmpty(condtionMap)){ public R<IPage<DockingDataVO>> gridDockingData(BaseQueryObject queryObject){ Map<String,String> condtionMap=queryObject.getConditionMap(); Query query=new Query(); if(CollectionUtils.isEmpty(condtionMap)){ condtionMap=new HashMap<>(); } query.setCurrent(queryObject.getPage()); query.setSize(queryObject.getLimit()); IPage<DockingDataVO> pages = dokingSysManaentService.gridDockingData(condtionMap,query); return R.data(pages); } @@ -208,32 +220,40 @@ /** * data列表 * @param condtionMap 基础查询对象，包含查询条件，分页，排序等 * @param queryObject 基础查询对象，包含查询条件，分页，排序等 * @return 系统集成的系统信息显示对象列表 */ @GetMapping("/gridDockingTask") @ApiOperationSupport(order = 3) @ApiOperation(value = "分页", notes = "condtionMap") public R<IPage<DockingTaskVO>> gridDockingTask(Map<String,String> condtionMap, Query query){ if(!CollectionUtils.isEmpty(condtionMap)){ public R<IPage<DockingTaskVO>> gridDockingTask(BaseQueryObject queryObject){ Map<String,String> condtionMap=queryObject.getConditionMap(); Query query=new Query(); if(CollectionUtils.isEmpty(condtionMap)){ condtionMap=new HashMap<>(); } query.setCurrent(queryObject.getPage()); query.setSize(queryObject.getLimit()); IPage<DockingTaskVO> pages = dokingSysManaentService.gridDockingTask(condtionMap,query); return R.data(pages); } /** * 推送数据集成日志列表 * @param condtionMap 基础查询对象，包含查询条件，分页，排序等 * @param queryObject 基础查询对象，包含查询条件，分页，排序等 * @return 集成日志显示对象列表 */ @GetMapping("/gridLoge") @ApiOperationSupport(order = 3) @ApiOperation(value = "分页", notes = "DockingLogeVO") public R<IPage<DockingLogeVO>> gridLoge(Map<String,String> condtionMap, Query query){ if(!CollectionUtils.isEmpty(condtionMap)){ public R<IPage<DockingLogeVO>> gridLoge(BaseQueryObject queryObject){ Map<String,String> condtionMap=queryObject.getConditionMap(); Query query=new Query(); if(CollectionUtils.isEmpty(condtionMap)){ condtionMap=new HashMap<>(); } query.setCurrent(queryObject.getPage()); query.setSize(queryObject.getLimit()); IPage<DockingLogeVO> pages = dokingSysManaentService.gridLoge(condtionMap,query); return R.data(pages); } Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeDuckingSyncServiceImpl.java
@@ -321,7 +321,6 @@ * 发送编码主数据 */ private void sendpushDataForService (List<DockingTask> dockingTaskS){ //每个task依次执行推送 for (DockingTask dockingTask:dockingTaskS){ //每个task一个事务，开启 @@ -368,6 +367,13 @@ } if(isGroupCodeFlage){ code=data.getOrDefault("groupcode",""); if(StringUtils.isBlank(code)) {//如果是集团码，没有领取到集团码则任务不结束等待集团码申请后再通过定时器调用集团码段 dockingTask.setDescription("等待集团申请集团码"); dockingTask.setSendFlag(MdmDuckingConstant.SEND_FLAG_FALSE); dockingTask.setLastModifyTime(new Date()); dockingTaskService.updateById(dockingTask); continue; } } String[] classCodeLeves = dockingTask.getClassifyId().split(","); NodeJosnDTO nodeJosnDTO = new NodeJosnDTO(); Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java
@@ -753,7 +753,7 @@ */ @Override public R checkGroupCode(Map<String, String> parameter) { List<CodeClassify> codeClassifyList = classifyService.selectAllLevelParents(parameter.get("oid")); List<CodeClassify> codeClassifyList = classifyService.selectAllLevelParentByOid(parameter.get("oid")); Set<String> configGroupCode = Arrays.stream(parameter.get("classifyGroupCode").split("#")).collect(Collectors.toSet()); // Boolean checkGroupFlag = false;//是否查询到配置的顶层分类中 for (int i = codeClassifyList.size()-1; i >= 0; i--) { Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/UniversalInterfaceImpl.java
@@ -2234,7 +2234,8 @@ if(StringUtils.isNotBlank(classOid)){ queryWrapper.in(DockingSystemConfig::getClassifyOid,classOid); } List<DockingSystemConfig> dockingSystemConfigList= dockingSystemConfigList=dockingSystemConfigService.list(queryWrapper); List<DockingSystemConfig> dockingSystemConfigList=new ArrayList<>(); dockingSystemConfigList= dockingSystemConfigList=dockingSystemConfigService.list(queryWrapper); if(!CollectionUtils.isEmpty(dockingSystemConfigList)){ return dockingSystemConfigList.get(0); }else{ @@ -2242,6 +2243,10 @@ return checkIspass(systemId, type, operationType, codeClassifyVO.getParentCodeClassifyOid()); } } return dockingSystemConfigList.get(0); if(dockingSystemConfigList.size()>0){ return dockingSystemConfigList.get(0); }else{ return new DockingSystemConfig(); } } }
