1.电能质量代码调整

2.微服务-监测点数据完整性调用中心任务
3.分布式光伏部分接口移植

pqs-device/device-api/src/main/java/com/njcn/device/api/LineFeignClient.java

@@ -5,6 +5,7 @@ import com.njcn.common.pojo.response.HttpResult;
 import com.njcn.device.api.fallback.LineFeignClientFallbackFactory;
 import com.njcn.device.pojo.dto.*;
 import com.njcn.device.pojo.po.Line;
+import com.njcn.device.pojo.po.LineDetail;
 import com.njcn.device.pojo.po.Overlimit;
 import com.njcn.device.pojo.vo.*;
 import org.apache.commons.collections.map.MultiValueMap;
@@ -189,4 +190,15 @@ public interface LineFeignClient {
      */
     @PostMapping("getBaseLineList")
     HttpResult<List<Line>> getBaseLineList(@RequestBody List<String> list);
+
+    /**
+     * 功能描述: 获取指定条件的监测点信息
+     * @param  list 监测点id集合
+     * @author xy
+     * @date 2022/7/8 14:24
+     * @return 监测点详情集合
+     */
+    @PostMapping("getLineDetail")
+    HttpResult<List<LineDetail>> getLineDetail(@RequestParam(required = false,value = "list") List<String> list);
+
 }

pqs-device/device-api/src/main/java/com/njcn/device/api/fallback/LineFeignClientFallbackFactory.java

@@ -6,12 +6,14 @@ import com.njcn.common.pojo.response.HttpResult;
 import com.njcn.device.api.LineFeignClient;
 import com.njcn.device.pojo.dto.*;
 import com.njcn.device.pojo.po.Line;
+import com.njcn.device.pojo.po.LineDetail;
 import com.njcn.device.pojo.po.Overlimit;
 import com.njcn.device.pojo.vo.*;
 import com.njcn.device.utils.DeviceEnumUtil;
 import feign.hystrix.FallbackFactory;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
+import org.springframework.web.bind.annotation.RequestParam;
 
 import java.util.List;
 
@@ -147,7 +149,11 @@ public class LineFeignClientFallbackFactory implements FallbackFactory<LineFeign
                 throw new BusinessException(finalExceptionEnum);
             }
 
-
+            @Override
+            public HttpResult<List<LineDetail>> getLineDetail(List<String> list) {
+                log.error("{}异常，降级处理，异常为：{}", "获取监测点详情  ", throwable.toString());
+                throw new BusinessException(finalExceptionEnum);
+            }
 
 
         };