1.解决device模块Swagger无法显示bug

2.修改监测点评价，数据异常，指标数据质量算法兼容修改
2023-09-22 16:13:16 +08:00
parent 66322e6c39
commit c686694c74
32 changed files with 502 additions and 268 deletions
--- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/ledgerManger/CommLineController.java
+++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/ledgerManger/CommLineController.java
@@ -0,0 +1,46 @@
+package com.njcn.device.pms.controller.ledgerManger;
+
+import com.njcn.common.pojo.annotation.OperateInfo;
+import com.njcn.common.pojo.constant.ServerInfo;
+import com.njcn.common.pojo.enums.common.LogEnum;
+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.LineDTO;
+import com.njcn.device.pms.service.majornetwork.IMonitorService;
+import com.njcn.web.controller.BaseController;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * pqs
+ *
+ * @author cdf
+ * @date 2023/9/14
+ */
+@RestController
+@RequestMapping("/commLine")
+@RequiredArgsConstructor
+@Slf4j
+@Api(tags = "通用台账查询")
+public class CommLineController extends BaseController {
+
+    private final IMonitorService monitorService;
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @GetMapping("/getLineDetail")
+    @ApiOperation("获取监测点id取监测点信息")
+    public HttpResult<LineDTO> getLineDetail(@RequestParam("id") String id) {
+        String methodDescribe = getMethodDescribe("getLineDetail");
+        LineDTO result = monitorService.getLineDetail(id);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
+    }
+}
--- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/ledgerManger/CommTerminalController.java
+++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/ledgerManger/CommTerminalController.java
@@ -300,7 +300,7 @@ public class CommTerminalController extends BaseController {
    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
    @GetMapping("/lineUnitDetail")
    @ApiOperation("根据监测点id获取数据单位")
-    @ApiImplicitParam(name = "lineID", value = "实体", required = true)
+    @ApiImplicitParam(name = "lineId", value = "实体", required = true)
    public HttpResult<PqsDeviceUnit> lineUnitDetail(@RequestParam("lineId") String lineId) {
        String methodDescribe = getMethodDescribe("lineUnitDetail");
        PqsDeviceUnit pqsDeviceUnit = new PqsDeviceUnit();
@@ -316,7 +316,7 @@ public class CommTerminalController extends BaseController {
    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
    @GetMapping("/getMonitorDetail")
    @ApiOperation("根据监测点id获取数据单位")
-    @ApiImplicitParam(name = "lineID", value = "实体", required = true)
+    @ApiImplicitParam(name = "lineId", value = "实体", required = true)
    public HttpResult<LineDevGetDTO> getMonitorDetail(@RequestParam("lineId") String lineId) {
        String methodDescribe = getMethodDescribe("getMonitorDetail");
        Monitor monitor = monitorService.getById(lineId);
--- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/MonitorMapper.java
+++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/MonitorMapper.java
@@ -2,6 +2,7 @@ package com.njcn.device.pms.mapper.majornetwork;

 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.njcn.common.pojo.dto.SimpleDTO;
+import com.njcn.device.biz.pojo.dto.LineDTO;
 import com.njcn.device.pms.pojo.dto.PmsMonitorBaseDTO;
 import com.njcn.device.pms.pojo.dto.PmsMonitorInfoDTO;
 import com.njcn.device.pms.pojo.dto.PwPmsMonitorDTO;
@@ -76,10 +77,12 @@ public interface MonitorMapper extends BaseMapper<Monitor> {
     */
    MonitorVO getPwMonitorTerminal(@Param("id")String id);

-
    /**
-     * 获取主网监测点装置信息
-     * @author cdf
-     * @date 2023/7/10
+     * @Description: 根据监测点id获取监测点信息
+     * @param id
+     * @return: com.njcn.device.biz.pojo.dto.LineDTO
+     * @Author: wr
+     * @Date: 2023/9/22 10:20
     */
+    LineDTO  selectLineDetail(@Param("id")String id);
 }
--- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/mapping/MonitorMapper.xml
+++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/mapping/MonitorMapper.xml
@@ -162,5 +162,19 @@
 	   INNER JOIN pms_terminal pt ON pt.Id = pm.Terminal_Id
       where pm.Monitor_Id = #{id}
    </select>
+    <select id="selectLineDetail" resultType="com.njcn.device.biz.pojo.dto.LineDTO">
+        SELECT
+            pm.Id as lineId,
+            pm.Terminal_Id as devId,
+            pm.Statistical_Interval as timeInterval,
+            pm.Voltage_Level as voltageLevel,
+            pm.Monitor_State as runFlag,
+            pm.Terminal_Wiring_Method as ptType,
+            pm.PT_Phase_Type as ptPhaseType
+        FROM
+            pms_monitor pm
+        WHERE
+            pm.id = #{id}
+    </select>

 </mapper>
--- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/IMonitorService.java
+++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/IMonitorService.java
@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.njcn.common.pojo.dto.SimpleDTO;
 import com.njcn.device.biz.pojo.dto.DeptGetChildrenDTO;
+import com.njcn.device.biz.pojo.dto.LineDTO;
 import com.njcn.device.biz.pojo.param.DeptGetLineParam;
 import com.njcn.device.pms.pojo.dto.PmsMonitorBaseDTO;
 import com.njcn.device.pms.pojo.dto.PmsMonitorDTO;
@@ -172,4 +173,11 @@ public interface IMonitorService extends IService<Monitor> {
     * @Date: 2023/9/21 13:19
     */
    Map<String, List<String>> getLineBySubstationRelation(Integer devDataType);
+
+    /**
+     * 根据监测点id获取监测点信息
+     * @param id
+     * @return
+     */
+    LineDTO getLineDetail(String id);
 }
--- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/MonitorServiceImpl.java
+++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/MonitorServiceImpl.java
@@ -19,6 +19,7 @@ import com.njcn.common.pojo.exception.BusinessException;
 import com.njcn.device.biz.enums.DeviceResponseEnum;

 import com.njcn.device.biz.pojo.dto.DeptGetChildrenDTO;
+import com.njcn.device.biz.pojo.dto.LineDTO;
 import com.njcn.device.biz.pojo.param.DeptGetLineParam;
 import com.njcn.device.biz.pojo.po.DeviceBak;
 import com.njcn.device.biz.utils.COverlimit;
@@ -436,6 +437,21 @@ public class MonitorServiceImpl extends ServiceImpl<MonitorMapper, Monitor> impl
        return null;
    }

+    @Override
+    public LineDTO getLineDetail(String id) {
+        List<DictData> voltage = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.DEV_VOLTAGE.getCode()).getData();
+        Map<String, String> voltageMap = voltage.stream().collect(Collectors.toMap(DictData::getId, DictData::getValue));
+        List<DictData> connect = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.DEV_CONNECT.getCode()).getData();
+        Map<String, String> connectMap = connect.stream().collect(Collectors.toMap(DictData::getId, DictData::getValue));
+        LineDTO lineDTO = this.baseMapper.selectLineDetail(id);
+        if(voltageMap.containsKey(lineDTO.getVoltageLevel())&&connectMap.containsKey(lineDTO.getPtType())){
+            lineDTO.setVoltageLevel(voltageMap.get(lineDTO.getVoltageLevel()));
+            lineDTO.setPtType(connectMap.get(lineDTO.getPtType()));
+            return lineDTO;
+        }
+        return null;
+    }
+

    /**
     * 获取主配网监测点id集合