From d2b250df8194ebfa6ba648771874b114e04b17f3 Mon Sep 17 00:00:00 2001 From: xiejun <xj@2023> Date: 星期四, 15 六月 2023 18:42:16 +0800 Subject: [PATCH] 集统一集成接口添加 --- Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/DockingManagementController.java | 41 +++++++++++++++++++++++++++++++++++++---- 1 files changed, 37 insertions(+), 4 deletions(-) diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/DockingManagementController.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/DockingManagementController.java index 014e1b4..e3e0864 100644 --- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/DockingManagementController.java +++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/DockingManagementController.java @@ -5,11 +5,17 @@ import com.vci.ubcs.code.dto.DockingSystemDTO; import com.vci.ubcs.code.entity.CodeRule; import com.vci.ubcs.code.entity.DockingSystem; +import com.vci.ubcs.code.entity.DockingSystemConfig; +import com.vci.ubcs.code.service.IDockingSystemConfigService; import com.vci.ubcs.code.service.IDockingSystemService; import com.vci.ubcs.code.vo.pagemodel.CodeRuleVO; +import com.vci.ubcs.code.vo.pagemodel.DockingSystemConfigVO; import com.vci.ubcs.code.vo.pagemodel.DockingSystemVO; import com.vci.ubcs.code.wrapper.CodeRuleWrapper; +import com.vci.ubcs.code.wrapper.DockingSystemConfigWrapper; import com.vci.ubcs.code.wrapper.DockingSystemWrapper; +import com.vci.ubcs.starter.exception.VciBaseException; +import com.vci.ubcs.starter.web.pagemodel.BaseQueryObject; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.AllArgsConstructor; @@ -29,7 +35,17 @@ @RequestMapping("/dockingManagement") @Api(value = "鎺ュ彛绠$悊", tags = "缂栫爜鐩稿叧鎺ュ彛绠$悊淇℃伅") public class DockingManagementController { + /*** + * 闆嗘垚绯荤粺绠$悊鏈嶅姟 + */ private final IDockingSystemService dockingSystemService; + /*** + * 闆嗘垚鎺ュ彛閰嶇疆鏈嶅姟 + */ + private final IDockingSystemConfigService dockingSystemConfigService; + + + /**绯荤粺闆嗘垚鐨勭郴缁熶俊鎭垪琛� * @param dockingSystem 鍩虹鏌ヨ瀵硅薄锛屽寘鍚煡璇㈡潯浠讹紝鍒嗛〉锛屾帓搴忕瓑 @@ -69,12 +85,29 @@ /** * 鍒犻櫎绯荤粺闆嗘垚鐨勭郴缁熶俊鎭� - * @param sysIntBaseDTO 绯荤粺闆嗘垚鐨勭郴缁熶俊鎭暟鎹紶杈撳璞★紝oid鍜宼s闇�瑕佷紶杈� + * @param oids 绯荤粺闆嗘垚鐨勭郴缁熶俊鎭暟鎹紶杈撳璞★紝oid鍜宼s闇�瑕佷紶杈� * @return 鍒犻櫎缁撴灉鍙嶉锛氾細success锛氭垚鍔燂紝fail锛氬け璐� */ - @DeleteMapping( "/deleteData") - public R delSystemData( DockingSystemDTO dockingSystemDTO) { - return R.status(dockingSystemService.delSystemData(dockingSystemDTO)); + @DeleteMapping( "/deleteDataById") + public R deleteDataById( String oids) { + try { + return R.status(dockingSystemService.deleteDataById(oids)); + }catch (VciBaseException e){ + R.fail(e.getMessage()); + } + return R.success("鎿嶄綔鎴愬姛"); + } + /** + * 绯荤粺闆嗘垚鍩虹淇℃伅鍒楄〃 + * @param DockingSystemConfig 鍩虹鏌ヨ瀵硅薄锛屽寘鍚煡璇㈡潯浠讹紝鍒嗛〉锛屾帓搴忕瓑 + * @return 绯荤粺闆嗘垚鍩虹淇℃伅鏄剧ず瀵硅薄鍒楄〃 + */ + @GetMapping("/gridSysIntInfo") + @ApiOperationSupport(order = 3) + @ApiOperation(value = "鍒嗛〉", notes = "DockingSystemConfig") + public R<IPage<DockingSystemConfigVO>> gridSysIntInfo(DockingSystemConfig DockingSystemConfig, Query query){ + IPage<DockingSystemConfig> pages = dockingSystemConfigService.page(Condition.getPage(query), Condition.getQueryWrapper(DockingSystemConfig)); + return R.data(DockingSystemConfigWrapper.build().pageVO(pages)); } } -- Gitblit v1.9.3