1.限制算法，污区图监测点修改

pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/commApi/CommTerminalGeneralClient.java

@@ -1,29 +1,23 @@
 package com.njcn.device.biz.commApi;
 
-import cn.hutool.core.date.TimeInterval;
 import com.njcn.common.pojo.constant.ServerInfo;
-import com.njcn.common.pojo.enums.response.CommonResponseEnum;
 import com.njcn.common.pojo.response.HttpResult;
-import com.njcn.common.utils.HttpResultUtil;
 import com.njcn.device.biz.commApi.fallback.CommTerminalGeneralClientFallbackFactory;
 import com.njcn.device.biz.pojo.dto.*;
 import com.njcn.device.biz.pojo.param.DeptGetLineParam;
 import com.njcn.device.biz.pojo.po.Overlimit;
 import com.njcn.device.biz.pojo.po.PqsDeviceUnit;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestParam;
-import springfox.documentation.annotations.ApiIgnore;
 
 import java.util.List;
+import java.util.Map;
 
 /**
- *
  * @author cdf
  * @date 2023/4/24
  */
@@ -37,6 +31,7 @@ public interface CommTerminalGeneralClient {
 
     /**
      * 通过部门获取所有子级部门详情
+     *
      * @author cdf
      * @date 2023/5/15
      */
@@ -46,6 +41,7 @@ public interface CommTerminalGeneralClient {
 
     /**
      * 根据单位获取监测点信息
+     *
      * @author cdf
      * @date 2023/5/10
      */
@@ -53,10 +49,9 @@ public interface CommTerminalGeneralClient {
     HttpResult<List<DeptGetChildrenMoreDTO>> deptGetLine(@RequestBody @Validated DeptGetLineParam deptGetLineParam);
 
 
-
-
     /**
      * 根据单位获取所有变电站
+     *
      * @author cdf
      * @date 2023/5/10
      */
@@ -65,6 +60,7 @@ public interface CommTerminalGeneralClient {
 
     /**
      * 根据单位获取所有变电站
+     *
      * @author cdf
      * @date 2023/5/10
      */
@@ -74,6 +70,7 @@ public interface CommTerminalGeneralClient {
 
     /**
      * 根据单位获取所有装置
+     *
      * @author cdf
      * @date 2023/5/10
      */
@@ -83,20 +80,22 @@ public interface CommTerminalGeneralClient {
 
     /**
      * 根据单站id获取监测点信息
+     *
      * @author cdf
      * @date 2023/5/10
      */
     @PostMapping("substationGetLine")
-    HttpResult<LineDevGetBandDTO> substationGetLine(@RequestParam("substationId")String substationId);
+    HttpResult<LineDevGetBandDTO> substationGetLine(@RequestParam("substationId") String substationId);
 
 
     /**
      * 根据母线id获取监测点信息
+     *
      * @author cdf
      * @date 2023/5/10
      */
     @PostMapping("busBarGetLine")
-    public HttpResult<List<LineDevGetDTO>> busBarGetLine(@RequestParam("busBarId")String busBarId);
+    HttpResult<List<LineDevGetDTO>> busBarGetLine(@RequestParam("busBarId") String busBarId);
 
 
     /**
@@ -109,10 +108,31 @@ public interface CommTerminalGeneralClient {
     HttpResult<List<DeptGetChildrenDTO>> deptGetLineList(@RequestBody DeptGetLineParam deptGetLineParam);
 
 
-
+    /**
+     * @param id
+     * @Description: 获取监测点限值
+     * @Author: wr
+     * @Date: 2023/9/21 10:56
+     */
     @PostMapping("/getOverLimitData")
     HttpResult<Overlimit> getOverLimitData(@RequestParam("id") String id);
 
+    /**
+     * @Description: 获取所有监测点限值
+     * @Author: wr
+     * @Date: 2023/9/21 10:56
+     */
+    @PostMapping("/getAllLineOverLimit")
+    HttpResult<List<Overlimit>> getAllLineOverLimit();
+
+    /**
+     * @Description: 获取变电站下监测点信息
+     * @param devDataType
+     * @Author: wr
+     * @Date: 2023/9/21 13:27
+     */
+    @PostMapping("/getLineBySubstationRelation")
+    HttpResult<Map<String, List<String>>> getLineBySubstationRelation(@RequestParam("devDataType") Integer devDataType);
 
     @GetMapping("/getRunMonitorIds")
     HttpResult<List<String>> getRunMonitorIds();
@@ -122,6 +142,7 @@ public interface CommTerminalGeneralClient {
     HttpResult<List<LineDevGetDTO>> getMonitorDetailList(@RequestBody List<String> list);
 
 
+
     @GetMapping("/lineUnitDetail")
     HttpResult<PqsDeviceUnit> lineUnitDetail(@RequestParam("lineId") String lineId);
 
@@ -130,6 +151,7 @@ public interface CommTerminalGeneralClient {
     HttpResult<LineDevGetDTO> getMonitorDetail(@RequestParam("lineId") String lineId);
     /**
      * 用于返回pq 还是pms系统
+     *
      * @author cdf
      * @date 2023/8/3
      */

pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/commApi/fallback/CommTerminalGeneralClientFallbackFactory.java

@@ -14,6 +14,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 公共台账
@@ -87,6 +88,18 @@ public class CommTerminalGeneralClientFallbackFactory implements FallbackFactory
                 throw new BusinessException(finalExceptionEnum);
             }
 
+            @Override
+            public HttpResult<List<Overlimit>> getAllLineOverLimit() {
+                log.error("{}异常，降级处理，异常为：{}", "获取所有监测点限值", throwable.toString());
+                throw new BusinessException(finalExceptionEnum);
+            }
+
+            @Override
+            public HttpResult<Map<String, List<String>>> getLineBySubstationRelation(Integer devDataType) {
+                log.error("{}异常，降级处理，异常为：{}", "获取变电站下监测点信息", throwable.toString());
+                throw new BusinessException(finalExceptionEnum);
+            }
+
             @Override
             public HttpResult<List<String>> getRunMonitorIds() {
                 log.error("{}异常，降级处理，异常为：{}", "获取投运监测点索引", throwable.toString());