From 2e7f3d5b537e196b7dc9073095cfb124d4219041 Mon Sep 17 00:00:00 2001
From: huangzj <826100833@qq.com>
Date: Mon, 11 Sep 2023 09:05:55 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AD=97=E5=85=B8=E6=A0=91=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/njcn/system/api/DictTreeFeignClient.java    | 10 ++++++++++
 .../DictTreeFeignClientFallbackFactory.java         | 13 +++++++++++++
 .../java/com/njcn/system/enums/DicDataTypeEnum.java |  4 +++-
 3 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/pqs-system/system-api/src/main/java/com/njcn/system/api/DictTreeFeignClient.java b/pqs-system/system-api/src/main/java/com/njcn/system/api/DictTreeFeignClient.java
index 3cbfe81f3..9fbd1c6ef 100644
--- a/pqs-system/system-api/src/main/java/com/njcn/system/api/DictTreeFeignClient.java
+++ b/pqs-system/system-api/src/main/java/com/njcn/system/api/DictTreeFeignClient.java
@@ -4,10 +4,14 @@ import com.njcn.common.pojo.constant.ServerInfo;
 import com.njcn.common.pojo.response.HttpResult;
 import com.njcn.system.api.fallback.DictTreeFeignClientFallbackFactory;
 import com.njcn.system.pojo.po.SysDicTreePO;
+import com.njcn.system.pojo.vo.DictTreeVO;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 
+import java.util.List;
+
 /**
  * @author xuyang
  */
@@ -16,4 +20,10 @@ public interface DictTreeFeignClient {
 
     @PostMapping("/queryById")
     HttpResult<SysDicTreePO> queryById(@RequestParam("id") String id);
+
+    @PostMapping("/queryByCode")
+     HttpResult<DictTreeVO> queryByCode(@RequestParam("code") String code) ;
+
+    @PostMapping("/query")
+    HttpResult<List<DictTreeVO>> query(@RequestParam("pid") String pid) ;
 }
diff --git a/pqs-system/system-api/src/main/java/com/njcn/system/api/fallback/DictTreeFeignClientFallbackFactory.java b/pqs-system/system-api/src/main/java/com/njcn/system/api/fallback/DictTreeFeignClientFallbackFactory.java
index 80911adec..c9b66e459 100644
--- a/pqs-system/system-api/src/main/java/com/njcn/system/api/fallback/DictTreeFeignClientFallbackFactory.java
+++ b/pqs-system/system-api/src/main/java/com/njcn/system/api/fallback/DictTreeFeignClientFallbackFactory.java
@@ -8,6 +8,7 @@ import com.njcn.system.api.DicDataFeignClient;
 import com.njcn.system.api.DictTreeFeignClient;
 import com.njcn.system.pojo.po.DictData;
 import com.njcn.system.pojo.po.SysDicTreePO;
+import com.njcn.system.pojo.vo.DictTreeVO;
 import com.njcn.system.utils.SystemEnumUtil;
 import feign.hystrix.FallbackFactory;
 import lombok.extern.slf4j.Slf4j;
@@ -38,6 +39,18 @@ public class DictTreeFeignClientFallbackFactory implements FallbackFactory<DictT
                 log.error("{}异常，降级处理，异常为：{}","根据字典id获取字典数据",cause.toString());
                 throw new BusinessException(finalExceptionEnum);
             }
+
+            @Override
+            public HttpResult<DictTreeVO> queryByCode(String code) {
+                log.error("{}异常，降级处理，异常为：{}","根据字典code获取字典树数据",cause.toString());
+                throw new BusinessException(finalExceptionEnum);
+            }
+
+            @Override
+            public HttpResult<List<DictTreeVO>> query(String pid) {
+                log.error("{}异常，降级处理，异常为：{}","根据字典pid获取字典树数据",cause.toString());
+                throw new BusinessException(finalExceptionEnum);
+            }
         };
     }
 }
diff --git a/pqs-system/system-api/src/main/java/com/njcn/system/enums/DicDataTypeEnum.java b/pqs-system/system-api/src/main/java/com/njcn/system/enums/DicDataTypeEnum.java
index 604ff1aa2..b8242eb36 100644
--- a/pqs-system/system-api/src/main/java/com/njcn/system/enums/DicDataTypeEnum.java
+++ b/pqs-system/system-api/src/main/java/com/njcn/system/enums/DicDataTypeEnum.java
@@ -108,7 +108,9 @@ public enum DicDataTypeEnum {
     DEVICE_UNIT("数据单位类型","Device_Unit"),
     //国网上送
     PLAN_STATUS("计划状态","plan_status"),
-    APP_EVENT("APP暂态事件类型","app_event")
+    APP_EVENT("APP暂态事件类型","app_event"),
+    DEVICE_TYPE("设备类型","Device_Type")
+
 
 
             ;