1.调整污染值监测点逻辑

2.解决devices模块Swagger页面无法展示问题

pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/pojo/dto/PollutionLineInfoDTO.java

@@ -104,4 +104,9 @@ public class PollutionLineInfoDTO {
      * 实际安装位置
      */
     private String actualArea;
+
+    /**
+     * 监测点运行状态
+     */
+    private String runFlag;
 }

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

@@ -97,9 +97,9 @@ public class TerminalAlarmController extends BaseController {
     @PostMapping("/terminalCheckPage")
     @OperateInfo(info = LogEnum.BUSINESS_COMMON)
     @ApiOperation("终端检测告警")
-    @ApiImplicitParam(name = "alarmParam", value = "告警类型")
+    @ApiImplicitParam(name = "terminalCheckParam", value = "告警类型")
     public HttpResult<Page<TerminalCheckVO>> terminalCheckPage(@RequestBody @Validated TerminalCheckParam terminalCheckParam){
-        String methodDescribe = getMethodDescribe("alarmInfoList");
+        String methodDescribe = getMethodDescribe("terminalCheckPage");
         Page<TerminalCheckVO> res = terminalAlarmService.terminalCheckPage(terminalCheckParam);
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, res, methodDescribe);
     }

pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/device/mapper/mapping/DeviceMapper.xml

@@ -19,7 +19,8 @@
 
     <select id="getRunManageCommList" resultType="com.njcn.device.pq.pojo.vo.RunManageVO">
         SELECT
-        linedetail.Num AS id,
+        linedetail.id AS id,
+        linedetail.Num AS runNo,
         line.NAME AS lineName,
         area.NAME AS areaName,
         gd.NAME AS gdName,
@@ -144,7 +145,8 @@
 
     <select id="getRunManageList" resultType="com.njcn.device.pq.pojo.vo.RunManageVO">
         SELECT
-        linedetail.Num AS id,
+        linedetail.id AS id,
+        linedetail.Num AS runNo,
         line.NAME AS lineName,
         area.NAME AS areaName,
         gd.NAME AS gdName,
@@ -514,7 +516,14 @@
         pv.scale lineVoltage,
         pqsub.scale subVoltage,
         lineDetail.monitor_id monitorId,
-        lineDetail.Actual_Area actualArea
+        lineDetail.Actual_Area actualArea,
+        CASE lineDetail.Run_Flag
+            WHEN 0 THEN'投运'
+            WHEN 1 THEN'检修'
+            WHEN 2 THEN'停运'
+            WHEN 3 THEN'调试'
+            WHEN 4 THEN'退运'
+        END  AS runFlag
         FROM
         pq_line line,
         pq_line_detail lineDetail,

pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/userledger/controller/UserLedgerController.java

@@ -152,9 +152,9 @@ public class UserLedgerController extends BaseController {
     @OperateInfo(info = LogEnum.BUSINESS_COMMON, operateType = OperateType.UPLOAD)
     @PostMapping("/userCheckUpload")
     @ApiOperation("周期检测")
-    @ApiImplicitParam(name = "userReportParam", value = "实体参数", required = true)
+    @ApiImplicitParam(name = "terminalCheckParam", value = "实体参数", required = true)
     public HttpResult<Boolean> userCheckUpload(@RequestBody @Validated TerminalCheckParam terminalCheckParam) {
-        String methodDescribe = getMethodDescribe("addUserReport");
+        String methodDescribe = getMethodDescribe("userCheckUpload");
         Boolean f = userReportPOService.userCheckUpload(terminalCheckParam);
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, f, methodDescribe);
     }

pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/excel/pollution/LinePollution.java

@@ -70,8 +70,8 @@ public class LinePollution implements Serializable {
     /**
      * 位置，电网侧&非电网侧
      */
-    @Excel(name = "监测位置", width = 30)
+    @Excel(name = "用户性质", width = 30)
-    @ApiModelProperty("监测位置")
+    @ApiModelProperty("用户性质")
     private String powerFlag;
 
     /**
@@ -84,7 +84,7 @@ public class LinePollution implements Serializable {
 
     /**
      * 新增
-     * 监测点电压等级
+     * 变电站电压等级
      */
     @Excel(name = "变电站电压等级", width = 30)
     @ApiModelProperty("变电站电压等级")
@@ -112,7 +112,7 @@ public class LinePollution implements Serializable {
     private Integer interval;
 
     /**
-     * 新增
+     *
      * 在线率
      */
     @Excel(name = "在线率(%)",type = 10, width = 30)
@@ -120,7 +120,7 @@ public class LinePollution implements Serializable {
     private Float onlineRate;
 
     /**
-     * 新增
+     *
      * 完整性
      */
     @Excel(name = "完整率(%)",type = 10, width = 30)
@@ -134,42 +134,47 @@ public class LinePollution implements Serializable {
     @ApiModelProperty("谐波污染值")
     private Double HarmonicValue;
 
-    /**
+//    /**
-     * 暂升次数 1.1~1.8
+//     * 暂升次数 1.1~1.8
-     * 10ms ~ 1min
+//     * 10ms ~ 1min
-     */
+//     */
-    @Excel(name = "暂升次数（次）",type = 10, width = 20)
+//    @Excel(name = "暂升次数（次）",type = 10, width = 20)
-    @ApiModelProperty("暂升次数（次）")
+//    @ApiModelProperty("暂升次数（次）")
-    private Integer upCounts;
+//    private Integer upCounts;
+//
+//    /**
+//     * 暂降次数 0.1~0.9
+//     * 10ms ~ 1min
+//     */
+//    @Excel(name = "电压暂降（次）",type = 10, width = 20)
+//    @ApiModelProperty("电压暂降（次）")
+//    private Integer downCounts;
+//
+//    /**
+//     * 短时中断 0~0.1
+//     * 10ms ~ 1min
+//     */
+//    @Excel(name = "短时中断（次）",type = 10, width = 20)
+//    @ApiModelProperty("短时中断（次")
+//    private Integer breakCounts;
 
-    /**
+//    @Excel(name = "是否关联敏感用户", width = 30, replace = "/_null")
-     * 暂降次数 0.1~0.9
+//    @ApiModelProperty("是否关联敏感用户")
-     * 10ms ~ 1min
+//    private String isMg;
-     */
+//
-    @Excel(name = "电压暂降（次）",type = 10, width = 20)
+//    @Excel(name = "敏感及重要用户", width = 30,replace = "/_null")
-    @ApiModelProperty("电压暂降（次）")
+//    @ApiModelProperty("敏感及重要用户")
-    private Integer downCounts;
+//    private String importUser;
-
-    /**
-     * 短时中断 0~0.1
-     * 10ms ~ 1min
-     */
-    @Excel(name = "短时中断（次）",type = 10, width = 20)
-    @ApiModelProperty("短时中断（次")
-    private Integer breakCounts;
-
-    @Excel(name = "是否关联敏感用户", width = 30, replace = "/_null")
-    @ApiModelProperty("是否关联敏感用户")
-    private String isMg;
-
-    @Excel(name = "敏感及重要用户", width = 30,replace = "/_null")
-    @ApiModelProperty("敏感及重要用户")
-    private String importUser;
 
     @Excel(name = "一类监测点", width = 30,replace = "/_null")
     @ApiModelProperty("一类监测点")
     private String monitorId;
 
+
+    @Excel(name = "监测点运行状态", width = 30,replace = "/_null")
+    @ApiModelProperty("监测点运行状态")
+    private String runFlag;
+
 //    /**
 //     * 备注
 //     */

pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/PollutionSubstationServiceImpl.java

@@ -1011,7 +1011,6 @@ public class PollutionSubstationServiceImpl extends ServiceImpl<RStatPollutionSu
     @Override
     public List<LinePollution> downPollutionLineCalc(StatSubstationBizBaseParam param) {
         DeviceInfoParam deviceInfoParam=new DeviceInfoParam();
-        deviceInfoParam.setLineRunFlag(0);
         deviceInfoParam.setDeptIndex(param.getId());
         deviceInfoParam.setStatisticalType(new SimpleDTO());
         List<GeneralDeviceDTO> data1 = generalDeviceInfoClient.getPracticalRunDeviceInfo(deviceInfoParam).getData();