Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/DockingManagementController.java
@@ -1,7 +1,9 @@ package com.vci.ubcs.code.controller; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; import com.github.yulichang.wrapper.MPJLambdaWrapper; import com.vci.ubcs.code.dto.DockingSystemConfigDTO; import com.vci.ubcs.code.dto.DockingSystemDTO; import com.vci.ubcs.code.dto.DockingTaskDTO; @@ -11,6 +13,7 @@ import com.vci.ubcs.code.vo.pagemodel.*; import com.vci.ubcs.code.wrapper.*; import com.vci.ubcs.starter.exception.VciBaseException; import com.vci.ubcs.starter.util.UBCSSqlKeyword; import com.vci.ubcs.starter.web.pagemodel.BaseQueryObject; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -18,8 +21,10 @@ import org.springblade.core.mp.support.Condition; import org.springblade.core.mp.support.Query; import org.springblade.core.tool.api.R; import org.springframework.util.CollectionUtils; import org.springframework.web.bind.annotation.*; import java.util.HashMap; import java.util.Map; /** @@ -53,14 +58,17 @@ private final ICodeDuckingSyncService codeDuckingSyncService; /**系统集成的系统信息列表 * @param dockingSystem 基础查询对象，包含查询条件，分页，排序等 * @param condtionMap 基础查询对象，包含查询条件，分页，排序等 *@return 系统集成的系统信息显示对象列表 */ @GetMapping("/gridDockingSystem") @ApiOperationSupport(order = 3) @ApiOperation(value = "分页", notes = "dockingSystem") public R<IPage<DockingSystemVO>> page(DockingSystem dockingSystem, Query query) { IPage<DockingSystem> pages = dockingSystemService.page(Condition.getPage(query), Condition.getQueryWrapper(dockingSystem)); @ApiOperation(value = "分页", notes = "condtionMap") public R<IPage<DockingSystemVO>> page(Map<String,String> condtionMap,Query query) { if(!CollectionUtils.isEmpty(condtionMap)){}{ condtionMap=new HashMap<>(); } IPage<DockingSystem> pages = dockingSystemService.page(Condition.getPage(query),UBCSSqlKeyword.buildConditionByMapString(condtionMap)); return R.data(DockingSystemWrapper.build().pageVO(pages)); } @@ -104,14 +112,17 @@ } /** * 系统集成基础信息列表 * @param dockingSystemConfig 基础查询对象，包含查询条件，分页，排序等 * @param condtionMap 基础查询对象，包含查询条件，分页，排序等 * @return 系统集成基础信息显示对象列表 */ @GetMapping("/gridSystemConfig") @ApiOperationSupport(order = 3) @ApiOperation(value = "分页", notes = "dockingSystemConfig") public R<IPage<DockingSystemConfigVO>> gridSystemConfig(DockingSystemConfig dockingSystemConfig, Query query){ IPage<DockingSystemConfigVO> pages=dockingSystemConfigService.page(dockingSystemConfig,query); public R<IPage<DockingSystemConfigVO>> gridSystemConfig(Map<String,String> condtionMap, Query query){ if(!CollectionUtils.isEmpty(condtionMap)){ condtionMap=new HashMap<>(); } IPage<DockingSystemConfigVO> pages=dockingSystemConfigService.page(condtionMap,query); return R.data(pages); } @@ -180,41 +191,50 @@ /** * 待集成数据 * @param dockingData 基础查询对象，包含查询条件，分页，排序等 * @param condtionMap 基础查询对象，包含查询条件，分页，排序等 * @return 系统集成基础信息显示对象列表 */ @GetMapping("/gridDockingData") @ApiOperationSupport(order = 3) @ApiOperation(value = "分页", notes = "DockingDataVO") public R<IPage<DockingDataVO>> gridDockingData(DockingData dockingData, Query query){ IPage<DockingDataVO> pages = dokingSysManaentService.gridDockingData(dockingData,query); public R<IPage<DockingDataVO>> gridDockingData(Map<String,String>condtionMap, Query query){ if(!CollectionUtils.isEmpty(condtionMap)){ condtionMap=new HashMap<>(); } IPage<DockingDataVO> pages = dokingSysManaentService.gridDockingData(condtionMap,query); return R.data(pages); } /** * data列表 * @param dockingTask 基础查询对象，包含查询条件，分页，排序等 * @param condtionMap 基础查询对象，包含查询条件，分页，排序等 * @return 系统集成的系统信息显示对象列表 */ @GetMapping("/gridDockingTask") @ApiOperationSupport(order = 3) @ApiOperation(value = "分页", notes = "DockingTaskVO") public R<IPage<DockingTaskVO>> gridDockingTask(DockingTask dockingTask, Query query){ IPage<DockingTaskVO> pages = dokingSysManaentService.gridDockingTask(dockingTask,query); @ApiOperation(value = "分页", notes = "condtionMap") public R<IPage<DockingTaskVO>> gridDockingTask(Map<String,String> condtionMap, Query query){ if(!CollectionUtils.isEmpty(condtionMap)){ condtionMap=new HashMap<>(); } IPage<DockingTaskVO> pages = dokingSysManaentService.gridDockingTask(condtionMap,query); return R.data(pages); } /** * 推送数据集成日志列表 * @param dockingLog 基础查询对象，包含查询条件，分页，排序等 * @param condtionMap 基础查询对象，包含查询条件，分页，排序等 * @return 集成日志显示对象列表 */ @GetMapping("/gridLoge") @ApiOperationSupport(order = 3) @ApiOperation(value = "分页", notes = "DockingLogeVO") public R<IPage<DockingLogeVO>> gridLoge(DockingLog dockingLog, Query query){ IPage<DockingLogeVO> pages = dokingSysManaentService.gridLoge(dockingLog,query); public R<IPage<DockingLogeVO>> gridLoge(Map<String,String> condtionMap, Query query){ if(!CollectionUtils.isEmpty(condtionMap)){ condtionMap=new HashMap<>(); } IPage<DockingLogeVO> pages = dokingSysManaentService.gridLoge(condtionMap,query); return R.data(pages); }
@@ -11,6 +11,8 @@ import org.springblade.core.mp.support.Query; import org.springblade.core.tool.api.R; import java.util.Map; /*** * 系统接口管理-接口配置服务 * @author xiejun @@ -21,10 +23,10 @@ /** * 系统集成基础信息列表 * @param dockingSystemConfig 基础查询对象，包含查询条件，分页，排序等 * @param condtionMap 基础查询对象，包含查询条件，分页，排序等 * @return 系统集成基础信息显示对象列表 */ IPage<DockingSystemConfigVO> page(DockingSystemConfig dockingSystemConfig, Query query); IPage<DockingSystemConfigVO> page(Map<String,String> condtionMap, Query query); /** * 增加 系统集成的接口管理信息 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/IDokingSysManaentService.java
@@ -5,31 +5,33 @@ import com.vci.ubcs.code.vo.pagemodel.*; import org.springblade.core.mp.support.Query; import java.util.Map; /*** * 系統管理相关服务 */ public interface IDokingSysManaentService { /** * data列表 * @param dockingTask 基础查询对象，包含查询条件，分页，排序等 * @param condtionMap 基础查询对象，包含查询条件，分页，排序等 * @return 系统集成的系统信息显示对象列表 */ IPage<DockingTaskVO>gridDockingTask(DockingTask dockingTask, Query query); IPage<DockingTaskVO>gridDockingTask(Map<String,String> condtionMap, Query query); /** * 待集成数据 * @param dockingData 基础查询对象，包含查询条件，分页，排序等 * @param condtionMap 基础查询对象，包含查询条件，分页，排序等 * @return 系统集成基础信息显示对象列表 */ IPage<DockingDataVO>gridDockingData(DockingData dockingData, Query query); IPage<DockingDataVO>gridDockingData(Map<String,String> condtionMap, Query query); /** * 推送数据集成日志列表 * @param dockingLog 基础查询对象，包含查询条件，分页，排序等 * @param condtionMap 基础查询对象，包含查询条件，分页，排序等 * @return 集成日志显示对象列表 */ IPage<DockingLogeVO>gridLoge(DockingLog dockingLog, Query query); IPage<DockingLogeVO>gridLoge(Map<String,String> condtionMap, Query query); /** * 接口param列表 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeDuckingSyncServiceImpl.java
@@ -156,7 +156,6 @@ */ private void initPushDataTaks(int type){ initSysadmin(); List<DockingSystemConfig> dockingSystemConfigList = dockingSystemConfigService.list( Wrappers.<DockingSystemConfig>query().lambda().eq(DockingSystemConfig::getUsedFlag,"true") .eq(DockingSystemConfig::getPushType,type==2?"2":"1").eq(DockingSystemConfig::getDataFlowType, SysIntegrationDataFlowTypeEnum.PUSH.getValue()));//2是代表分类推送，1是代表数据推送 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/DockingSystemConfigServiceImpl.java
@@ -35,6 +35,7 @@ import com.vci.ubcs.starter.revision.service.RevisionModelUtil; import com.vci.ubcs.starter.util.DefaultAttrAssimtUtil; import com.vci.ubcs.starter.util.MdmBtmTypeConstant; import com.vci.ubcs.starter.util.UBCSSqlKeyword; import com.vci.ubcs.starter.web.constant.QueryOptionConstant; import com.vci.ubcs.starter.web.pagemodel.PageHelper; import com.vci.ubcs.starter.web.util.BeanUtilForVCI; @@ -135,9 +136,9 @@ private IDockingLogeService dockingLogeService; @Override public IPage<DockingSystemConfigVO> page(DockingSystemConfig DockingSystemConfig, Query query) { public IPage<DockingSystemConfigVO> page(Map<String,String>codtionMap, Query query) { IPage<DockingSystemConfig> pages = page(Condition.getPage(query), Condition.getQueryWrapper(DockingSystemConfig)); IPage<DockingSystemConfig> pages = page(Condition.getPage(query), UBCSSqlKeyword.buildConditionByMapString(codtionMap)); List<DockingSystemConfig> dockingSystemConfigList= pages.getRecords(); dockingSystemConfigList.stream().forEach(dockingSystemConfig -> { dockingSystemConfig.setDataFlowTypeText(SysIntegrationDataFlowTypeEnum.getTextByValue(dockingSystemConfig.getDataFlowType())); Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/DokingSysManaentServiceImpl.java
@@ -7,12 +7,15 @@ import com.vci.ubcs.code.service.*; import com.vci.ubcs.code.vo.pagemodel.*; import com.vci.ubcs.code.wrapper.*; import com.vci.ubcs.starter.util.UBCSCondition; import com.vci.ubcs.starter.util.UBCSSqlKeyword; import org.springblade.core.mp.support.Condition; import org.springblade.core.mp.support.Query; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.util.Map; @Service public class DokingSysManaentServiceImpl extends ServiceImpl<DockingSystemConfigMapper, DockingSystemConfig> implements IDokingSysManaentService { @@ -55,29 +58,30 @@ private IDockingDataService dockingDataService; /** * data列表 * @param dockingTask 基础查询对象，包含查询条件，分页，排序等 * @param condtionMap 基础查询对象，包含查询条件，分页，排序等 * @return 系统集成的系统信息显示对象列表 */ @Override public IPage<DockingTaskVO> gridDockingTask(DockingTask dockingTask, Query query) { IPage<DockingTask> pages=dockingTaskService.page(Condition.getPage(query), Condition.getQueryWrapper(dockingTask)); public IPage<DockingTaskVO> gridDockingTask(Map<String,String> condtionMap, Query query) { IPage<DockingTask> pages=dockingTaskService.page(Condition.getPage(query),UBCSSqlKeyword.buildConditionByMapString(condtionMap)); return DockingTaskWrapper.build().pageVO(pages); } @Override public IPage<DockingDataVO> gridDockingData(DockingData dockingData, Query query) { IPage<DockingData> pages=dockingDataService.page(Condition.getPage(query), Condition.getQueryWrapper(dockingData)); public IPage<DockingDataVO> gridDockingData(Map<String,String> condtionMap, Query query) { IPage<DockingData> pages=dockingDataService.page(Condition.getPage(query), UBCSSqlKeyword.buildConditionByMapString(condtionMap)); return DockingDataWrapper.build().pageVO(pages); } /** * 推送数据集成日志列表 * @param dockingLog 基础查询对象，包含查询条件，分页，排序等 * @param condtionMap 基础查询对象，包含查询条件，分页，排序等 * @return 集成日志显示对象列表 */ @Override public IPage<DockingLogeVO> gridLoge(DockingLog dockingLog, Query query) { IPage<DockingLog> pages=dockingLogeService.page(Condition.getPage(query), Condition.getQueryWrapper(dockingLog)); public IPage<DockingLogeVO> gridLoge(Map<String,String> condtionMap, Query query) { //IPage<DockingLog> pages=dockingLogeService.page(Condition.getPage(query), Condition.getQueryWrapper(dockingLog)); IPage<DockingLog> pages=dockingLogeService.page(Condition.getPage(query), UBCSSqlKeyword.buildConditionByMapString(condtionMap)); return DockingLogeWrapper.build().pageVO(pages); }
@@ -1781,10 +1781,10 @@ } log.info(libId); }else if(secType.equals("codelevelsec")) {//层级码段 int level = codeBasicSecVO.getCodeLevelValue(); CodeClassifyVO levelCodeClassifyVO = new CodeClassifyVO(); CodeClassifyFullInfoBO classifyFullInfoBO = this.classifyService.getClassifyFullInfo(codeClassifyDO.getOid()); if(codeBasicSecVO.getCodeLevelType().equals("code_level_special")){//指定层级 int level = codeBasicSecVO.getCodeLevelValue(); List<CodeClassifyVO> classifyVOS = classifyFullInfoBO.getParentClassifyVOs().stream().sorted(((o1, o2) -> o2.getDataLevel().compareTo(o1.getDataLevel()))).collect(Collectors.toList()); if (classifyVOS.size() >= level && level > 0) { levelCodeClassifyVO = classifyVOS.get(level - 1);
