1.电能质量代码调整

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

pqs-device/device-boot/src/main/java/com/njcn/device/controller/LineController.java

@@ -7,10 +7,12 @@ import com.njcn.common.pojo.response.HttpResult;
 import com.njcn.common.utils.HttpResultUtil;
 import com.njcn.common.utils.LogUtil;
 import com.njcn.device.mapper.DeviceMapper;
+import com.njcn.device.mapper.LineDetailMapper;
 import com.njcn.device.mapper.LineMapper;
 import com.njcn.device.pojo.dto.*;
 import com.njcn.device.pojo.po.Device;
 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.service.LineService;
@@ -42,6 +44,9 @@ public class LineController extends BaseController {
 
     private final LineMapper lineMapper;
 
+    private final LineDetailMapper lineDetailMapper;
+
+
     @OperateInfo(info = LogEnum.BUSINESS_COMMON)
     @PostMapping("/getLineDetailData")
     @ApiOperation("根据监测点id获取监测点详情")
@@ -256,4 +261,21 @@ public class LineController extends BaseController {
         String methodDescribe = getMethodDescribe("getBaseLineList");
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, lineService.getBaseLineList(lineIndex), methodDescribe);
     }
+
+    /**
+     * 功能描述: 获取指定条件的监测点信息
+     * @author xy
+     * @date 2022/7/8 14:24
+     * @return 监测点详情集合
+     */
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/getLineDetail")
+    @ApiOperation("根据监测点集合获取监测点详情")
+    @ApiImplicitParam(name = "list", value = "监测点集合")
+    public HttpResult<List<LineDetail>> getLineDetail(@RequestParam(required = false) List<String> list) {
+        String methodDescribe = getMethodDescribe("getLineDetail");
+        LogUtil.njcnDebug(log, "{}，监测点集合：{}", methodDescribe, list);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, lineDetailMapper.getSpecifyLineDetail(list), methodDescribe);
+    }
+
 }

pqs-device/device-boot/src/main/java/com/njcn/device/mapper/LineDetailMapper.java

@@ -25,4 +25,12 @@ public interface LineDetailMapper extends BaseMapper<LineDetail> {
      */
     List<LineDetail> getLineDetail(@Param("devIndex") String devIndex, @Param("num") List<Integer> num);
 
+    /**
+     * 实际设备下的监测点&&稳态系统和两个系统的监测点&&投运终端下的监测点
+     * 获取指定条件的监测点信息
+     * @param list 监测点集合
+     * @return 结果
+     */
+    List<LineDetail> getSpecifyLineDetail(@Param("list") List<String> list);
+
 }

pqs-device/device-boot/src/main/java/com/njcn/device/mapper/mapping/LineDetailMapper.xml

@@ -14,4 +14,26 @@
         </foreach>
     </select>
 
+    <select id="getSpecifyLineDetail" resultType="LineDetail">
+        SELECT
+            D.*
+        FROM
+            pq_line A1,
+            pq_line A2,
+            pq_line A3,
+            pq_line_detail B,
+            pq_device C,
+            pq_line_detail D
+        WHERE
+          <if test="list != null and list.size() > 0">
+            A1.Id in
+            <foreach collection="list" item="item" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+              AND
+          </if>
+          A1.`Level` = 6 AND A1.Id = B.Id AND
+          A1.Pid = A2.Id AND A2.Pid = A3.Id AND A3.Id = C.Id AND
+          C.Dev_Model = 1 AND C.Dev_Data_Type IN (1,2) AND C.Run_Flag = 0 AND A1.Id = D.Id
+    </select>
 </mapper>