治理设备新增模块状态查询功能

cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/param/DataParam.java

@@ -20,6 +20,9 @@ public class DataParam implements Serializable {
     @ApiModelProperty("监测点id")
     private String lineId;
 
+    @ApiModelProperty("模块编号")
+    private Integer clDid;
+
     @ApiModelProperty("指标统计类型")
     private String targetType;
 
@@ -29,4 +32,7 @@ public class DataParam implements Serializable {
     @ApiModelProperty("数据来源 0:补召 1:在线监测 ")
     private Integer dataSource;
 
+    @ApiModelProperty("运行状态 1:离线 2:在线")
+    private Integer comFlag;
+
 }

cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/pojo/dto/DataOnlineRateDto.java

@@ -0,0 +1,38 @@
+package com.njcn.csharmonic.pojo.dto;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+
+/**
+ * @Description: 在线率日表
+ */
+@Data
+public class DataOnlineRateDto {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 在线条数
+     */
+    private Integer onlineMin;
+
+    /**
+     * 离线条数
+     */
+    private Integer offlineMin;
+
+    @EqualsAndHashCode(callSuper = true)
+    @Data
+    public static class Detail extends DataOnlineRateDto{
+        /**
+         * 日期
+         */
+        private String timeId;
+
+        /**
+         * 装置id
+         */
+        private String devIndex;
+    }
+}

cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/pojo/param/StatisticsDataParam.java

@@ -1,9 +1,11 @@
 package com.njcn.csharmonic.pojo.param;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.util.List;
 
 /**
  * @author xy
@@ -11,9 +13,16 @@ import java.io.Serializable;
 @Data
 public class StatisticsDataParam implements Serializable {
 
+    private static final long serialVersionUID = 1L;
+
     @ApiModelProperty("起始时间")
+    @JsonFormat(pattern = "yyyy-MM-dd")
     private String startTime;
 
     @ApiModelProperty("结束时间")
+    @JsonFormat(pattern = "yyyy-MM-dd")
     private String endTime;
+
+    private List<String> idList;
+
 }

cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/pojo/po/CsEventPO.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.njcn.db.bo.BaseEntity;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -43,6 +44,7 @@ public class CsEventPO extends BaseEntity {
     /**
      * 事件时间
      */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @TableField(value = "start_time")
     private LocalDateTime startTime;
 

cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/pojo/vo/DataVo.java

@@ -11,7 +11,7 @@ import java.io.Serializable;
  */
 
 @Data
-public class LineIntegrityVo implements Serializable {
+public class DataVo implements Serializable {
 
     @ApiModelProperty("装置id")
     private String devId;

cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/pojo/vo/HalfMonthReportVO.java

@@ -0,0 +1,53 @@
+package com.njcn.csharmonic.pojo.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * @author xy
+ */
+@Data
+public class HalfMonthReportVO implements Serializable {
+
+    @ApiModelProperty("工程名称")
+    private String engineeringName;
+
+    @ApiModelProperty("项目名称")
+    private String projectName;
+
+    @ApiModelProperty("设备名称")
+    private String devName;
+
+    @ApiModelProperty("设备型号")
+    private String devType;
+
+    @ApiModelProperty("MAC地址")
+    private String mac;
+
+    @ApiModelProperty("监测点名称")
+    private String lineName;
+
+    @ApiModelProperty("运行状态")
+    private String operationalStatus;
+
+    @ApiModelProperty("监测点通讯状态")
+    private String communicationStatus;
+
+    @ApiModelProperty("投运时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime operationalTime;
+
+    @ApiModelProperty("最新数据时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime latestTime;
+
+    @ApiModelProperty("数据完整性")
+    private Double integrity;
+
+    @ApiModelProperty("终端在线率")
+    private Double onlineRate;
+}