From 4e28bb7401dae28dde04268dcead3e587ee2279d Mon Sep 17 00:00:00 2001
From: xuyang <748613696@qq.com>
Date: Thu, 15 Jun 2023 20:46:43 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B2=BB=E7=90=86=E8=AE=BE=E5=A4=87=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pqs-gateway/src/main/resources/bootstrap.yml         |  5 -----
 .../java/com/njcn/system/api/EpdFeignClient.java     |  3 +++
 .../api/fallback/EpdFeignClientFallbackFactory.java  |  6 ++++++
 .../njcn/system/controller/EleEpdPqdController.java  | 12 ++++++++++++
 .../com/njcn/system/service/IEleEpdPqdService.java   |  9 +++++++++
 .../system/service/impl/EleEpdPqdServiceImpl.java    |  5 +++++
 6 files changed, 35 insertions(+), 5 deletions(-)

diff --git a/pqs-gateway/src/main/resources/bootstrap.yml b/pqs-gateway/src/main/resources/bootstrap.yml
index 5a314f85d..8ffa0f07d 100644
--- a/pqs-gateway/src/main/resources/bootstrap.yml
+++ b/pqs-gateway/src/main/resources/bootstrap.yml
@@ -190,11 +190,6 @@ whitelist:
     - /*/v2/api-docs
     - /favicon.ico
     - /system-boot/theme/getTheme
-    - /cs-harmonic-boot/**
-    - /cs-device-boot/**
-    - /cs-system-boot/**
-    - /cs-warn-boot/**
-
     #- /device-boot/**
     #- /system-boot/**
     #- /harmonic-boot/**
diff --git a/pqs-system/system-api/src/main/java/com/njcn/system/api/EpdFeignClient.java b/pqs-system/system-api/src/main/java/com/njcn/system/api/EpdFeignClient.java
index 41d43c43e..69e968698 100644
--- a/pqs-system/system-api/src/main/java/com/njcn/system/api/EpdFeignClient.java
+++ b/pqs-system/system-api/src/main/java/com/njcn/system/api/EpdFeignClient.java
@@ -34,4 +34,7 @@ public interface EpdFeignClient {
     @PostMapping("/selectById")
     HttpResult<EleEpdPqd> selectById(@RequestParam("id") String id);
 
+    @PostMapping("/selectByIds")
+    HttpResult<List<EleEpdPqd>> selectByIds(@RequestBody List<String> ids);
+
 }
diff --git a/pqs-system/system-api/src/main/java/com/njcn/system/api/fallback/EpdFeignClientFallbackFactory.java b/pqs-system/system-api/src/main/java/com/njcn/system/api/fallback/EpdFeignClientFallbackFactory.java
index 80df5d04f..7463f7c2c 100644
--- a/pqs-system/system-api/src/main/java/com/njcn/system/api/fallback/EpdFeignClientFallbackFactory.java
+++ b/pqs-system/system-api/src/main/java/com/njcn/system/api/fallback/EpdFeignClientFallbackFactory.java
@@ -57,6 +57,12 @@ public class EpdFeignClientFallbackFactory implements FallbackFactory<EpdFeignCl
                 log.error("{}异常，降级处理，异常为：{}","根据id查询字典数据",cause.toString());
                 throw new BusinessException(finalExceptionEnum);
             }
+
+            @Override
+            public HttpResult<List<EleEpdPqd>> selectByIds(List<String> ids) {
+                log.error("{}异常，降级处理，异常为：{}","根据ids查询字典数据",cause.toString());
+                throw new BusinessException(finalExceptionEnum);
+            }
         };
     }
 }
diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/controller/EleEpdPqdController.java b/pqs-system/system-boot/src/main/java/com/njcn/system/controller/EleEpdPqdController.java
index 2007d8fc6..6fd01a6a3 100644
--- a/pqs-system/system-boot/src/main/java/com/njcn/system/controller/EleEpdPqdController.java
+++ b/pqs-system/system-boot/src/main/java/com/njcn/system/controller/EleEpdPqdController.java
@@ -151,5 +151,17 @@ public class EleEpdPqdController extends BaseController {
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, eleEpdPqds, methodDescribe);
     }
 
+    @PostMapping("/selectByIds")
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @ApiOperation("根据集合查询字典数据")
+    @ApiImplicitParam(name = "ids", value = "id集合", required = true)
+    public HttpResult<List<EleEpdPqd>> selectByIds(@RequestBody @Validated List<String> ids){
+        String methodDescribe = getMethodDescribe("selectByIds");
+        LogUtil.njcnDebug(log, "{}，根据集合查询字典数据:", methodDescribe);
+        List<EleEpdPqd> eleEpdPqds = eleEpdPqdService.selectByIds(ids);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, eleEpdPqds, methodDescribe);
+    }
+
+
 }
 
diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/service/IEleEpdPqdService.java b/pqs-system/system-boot/src/main/java/com/njcn/system/service/IEleEpdPqdService.java
index 121d97244..6485532fa 100644
--- a/pqs-system/system-boot/src/main/java/com/njcn/system/service/IEleEpdPqdService.java
+++ b/pqs-system/system-boot/src/main/java/com/njcn/system/service/IEleEpdPqdService.java
@@ -6,6 +6,8 @@ import com.njcn.system.pojo.param.EleEpdPqdParam;
 import com.njcn.system.pojo.po.EleEpdPqd;
 import com.njcn.system.pojo.vo.EleEpdPqdListVO;
 import com.njcn.system.pojo.vo.EleEpdPqdVO;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.RequestBody;
 
 import java.util.List;
 import java.util.Map;
@@ -76,4 +78,11 @@ public interface IEleEpdPqdService extends IService<EleEpdPqd> {
     * @Date: 2023/6/12 
     */ 
     List<EleEpdPqdListVO> selectAll();
+
+    /**
+     * 根据集合查询字典数据
+     * @param ids
+     * @return
+     */
+    List<EleEpdPqd> selectByIds(List<String> ids);
 }
diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/EleEpdPqdServiceImpl.java b/pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/EleEpdPqdServiceImpl.java
index 9e43d0e72..7bc664d83 100644
--- a/pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/EleEpdPqdServiceImpl.java
+++ b/pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/EleEpdPqdServiceImpl.java
@@ -181,6 +181,11 @@ public class EleEpdPqdServiceImpl extends ServiceImpl<EleEpdPqdMapper, EleEpdPqd
         return vos;
     }
 
+    @Override
+    public List<EleEpdPqd> selectByIds(List<String> ids) {
+        return this.lambdaQuery().in(EleEpdPqd::getId,ids).orderByAsc(EleEpdPqd::getSort).list();
+    }
+
     /**
      * 校验参数，
      * 1.检查是否存在相同名称的菜单