Bläddra i källkod

优化代码5555

wangfeng 4 år sedan
förälder
incheckning
e747cb1d82

+ 1 - 1
cdssman-service/src/main/java/com/diagbot/client/CdssCoreClient.java

@@ -156,7 +156,7 @@ public interface CdssCoreClient {
 
    //"分页获取规则维护列表
     @PostMapping("/klRule/getKlRuleInfoPage")
-    RespDTO<IPage<KlRuleInfoDTO>> getKlRuleInfoPages(@RequestBody KlRuleInfoVO klRuleInfoVO);
+    RespDTO<Page<KlRuleInfoDTO>> getKlRuleInfoPages(@RequestBody KlRuleInfoVO klRuleInfoVO);
 
 
     //根据规则Id获取规则详情

+ 1 - 1
cdssman-service/src/main/java/com/diagbot/client/hystrix/CdssCoreHystrix.java

@@ -182,7 +182,7 @@ public class CdssCoreHystrix implements CdssCoreClient {
     }
 
     @Override
-    public RespDTO<IPage<KlRuleInfoDTO>> getKlRuleInfoPages(@RequestBody KlRuleInfoVO klRuleInfoVO) {
+    public RespDTO<Page<KlRuleInfoDTO>> getKlRuleInfoPages(@RequestBody KlRuleInfoVO klRuleInfoVO) {
         log.error("【hystrix】调用{}异常", "getKlRuleInfoPages");
         return null;
     }

+ 5 - 6
cdssman-service/src/main/java/com/diagbot/facade/KlRuleFacade.java

@@ -1,6 +1,7 @@
 package com.diagbot.facade;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.diagbot.client.CdssCoreClient;
 import com.diagbot.dto.KlRuleByIdParDTO;
 import com.diagbot.dto.KlRuleInfoDTO;
@@ -8,6 +9,7 @@ import com.diagbot.dto.RespDTO;
 import com.diagbot.exception.CommonErrorCode;
 import com.diagbot.exception.CommonException;
 import com.diagbot.service.impl.KlRuleServiceImpl;
+import com.diagbot.util.RespDTOUtil;
 import com.diagbot.vo.KlRuleByIdVO;
 import com.diagbot.vo.KlRuleInfoClearVO;
 import com.diagbot.vo.KlRuleInfoSaveVO;
@@ -26,12 +28,9 @@ public class KlRuleFacade extends KlRuleServiceImpl {
     @Autowired
     CdssCoreClient cdssCoreClient;
 
-    public IPage<KlRuleInfoDTO> getKlRuleInfoPage(KlRuleInfoVO klRuleInfoVO) {
-        RespDTO<IPage<KlRuleInfoDTO>> klRuleInfoPages = cdssCoreClient.getKlRuleInfoPages(klRuleInfoVO);
-        if (klRuleInfoPages == null || !CommonErrorCode.OK.getCode().equals(klRuleInfoPages.code)) {
-            throw new CommonException(CommonErrorCode.SERVER_IS_ERROR,
-                    "分页获取规则维护列表数据失败");
-        }
+    public Page<KlRuleInfoDTO> getKlRuleInfoPage(KlRuleInfoVO klRuleInfoVO) {
+        RespDTO<Page<KlRuleInfoDTO>> klRuleInfoPages = cdssCoreClient.getKlRuleInfoPages(klRuleInfoVO);
+        RespDTOUtil.respNGDeal(klRuleInfoPages, "获取分页获取规则维护列表数据失败");
         return klRuleInfoPages.data;
     }
 

+ 2 - 1
cdssman-service/src/main/java/com/diagbot/web/KlRuleController.java

@@ -2,6 +2,7 @@ package com.diagbot.web;
 
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.diagbot.annotation.SysLogger;
 import com.diagbot.dto.KlRuleByIdParDTO;
 import com.diagbot.dto.KlRuleInfoDTO;
@@ -44,7 +45,7 @@ public class KlRuleController {
     @ApiOperation(value = "分页获取规则维护列表[by:wangfeng]")
     @PostMapping("/getKlRuleInfoPage")
     @SysLogger("getKlRuleInfoPage")
-    public RespDTO<IPage<KlRuleInfoDTO>> getKlRuleInfoPages(@RequestBody KlRuleInfoVO klRuleInfoVO) {
+    public RespDTO<Page<KlRuleInfoDTO>> getKlRuleInfoPages(@RequestBody KlRuleInfoVO klRuleInfoVO) {
         return RespDTO.onSuc(klRuleFacade.getKlRuleInfoPage(klRuleInfoVO));
     }