代码更新

pqs-device/device-api/src/main/java/com/njcn/device/pojo/param/DeviceInfoParam.java

@@ -136,6 +136,9 @@ public class DeviceInfoParam implements Serializable {
         @Pattern(regexp = PatternRegex.TIME_FORMAT, message = "时间格式错误")
         private String searchEndTime;
 
+        @ApiModelProperty("时间范围标志 0.查询展示天 1.查询展示月")
+        private Integer timeFlag;
+
     }
 
     @Data
@@ -152,20 +155,5 @@ public class DeviceInfoParam implements Serializable {
 
     }
 
-    @Data
-    @EqualsAndHashCode(callSuper = true)
-    public static class ConditionBusinessParam extends BusinessParam{
-
-        /**
-         * 0-年份
-         * 1-月份
-         * 2-天
-         */
-        @ApiModelProperty("时间间隔标识（0:按月查 1:按天查 2:查询当日）")
-        @Range(min = 0, max = 2, message = "时间间隔标识" + ValidMessage.PARAM_FORMAT_ERROR)
-        private int timeFlag;
-
-    }
-
 
 }

pqs-device/device-api/src/main/java/com/njcn/device/pojo/param/RunManageParam.java

@@ -26,7 +26,6 @@ import java.util.List;
 @Data
 @EqualsAndHashCode(callSuper = true)
 @ApiModel
-@NoArgsConstructor
 public class RunManageParam extends BaseParam implements Serializable {
 
     @ApiModelProperty(name = "statisticalType", value = "统计类型")
@@ -38,6 +37,7 @@ public class RunManageParam extends BaseParam implements Serializable {
     private String deptIndex;
 
     @ApiModelProperty(name = "serverName", value = "服务名称")
+    @NotBlank(message = "服务名称不可为空")
     private String serverName;
 
     @ApiModelProperty(name = "scale", value = "电压等级")
@@ -56,7 +56,7 @@ public class RunManageParam extends BaseParam implements Serializable {
      */
     @ApiModelProperty("网公司标识")
     @Range(min = 0, max = 2, message = "网公司标识" + ValidMessage.PARAM_FORMAT_ERROR)
-    private int monitorFlag;
+    private Integer monitorFlag;
 
     /**
      * 0-电网侧
@@ -64,14 +64,12 @@ public class RunManageParam extends BaseParam implements Serializable {
      */
     @ApiModelProperty("电网侧标识")
     @Range(min = 0, max = 2, message = "电网侧标识" + ValidMessage.PARAM_FORMAT_ERROR)
-    private int powerFlag;
+    private Integer powerFlag;
 
     @ApiModelProperty(name = "comFlag", value = "通讯状态")
-    @NotNull(message = "通讯状态不可为空")
     private List<Integer> comFlag;
 
     @ApiModelProperty(name = "runFlag", value = "终端状态")
-    @NotNull(message = "终端状态不可为空")
     private List<Integer> runFlag;
 
 }

pqs-device/device-api/src/main/java/com/njcn/device/pojo/vo/AreaLineInfoVO.java

@@ -26,6 +26,9 @@ public class AreaLineInfoVO implements Serializable {
     @ApiModelProperty(name = "subName",value = "变电站名称")
     private String subName;
 
+    @ApiModelProperty(name = "subScale",value = "变电站电压等级")
+    private String subScale;
+
     @ApiModelProperty(name = "gdId",value = "供电公司id")
     private String gdId;
 

pqs-device/device-api/src/main/java/com/njcn/device/pojo/vo/LineInfluxDbOnlineVO.java

@@ -17,7 +17,7 @@ public class LineInfluxDbOnlineVO implements Serializable {
     @Column(name = "dev_id")
     private String devIndex;
 
-    @Column(name = "onlinerate")
+    @Column(name = "online_rate")
     private Double onlineRate;
 
 

pqs-device/device-api/src/main/java/com/njcn/device/pojo/vo/RunTimeVO.java

@@ -59,5 +59,5 @@ public class RunTimeVO implements Serializable {
     private String updateTime;
 
     @ApiModelProperty(name = "onlineEvaluate",value = "在线率评价")
-    private Float onlineEvaluate;
+    private Double onlineEvaluate;
 }