微调

cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/vo/CsEventSendMsgVO.java

@@ -0,0 +1,58 @@
+package com.njcn.csdevice.pojo.vo;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 事件推送日志表
+ * </p>
+ *
+ * @author xuyang
+ * @since 2023-09-18
+ */
+@Data
+public class CsEventSendMsgVO {
+
+
+    /**
+     * 用户id
+     */
+    private String userId;
+
+    /**
+     * 事件id
+     */
+    private String eventId;
+
+    /**
+     * 推送事件时用户的devCode
+     */
+    private String devCode;
+
+    private String devName;
+
+    /**
+     * 推送时间
+     */
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    private LocalDateTime sendTime;
+
+    /**
+     * 推送状态
+     */
+    private Integer status;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+
+}

cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/vo/DevCountVO.java

@@ -29,9 +29,13 @@ public class  DevCountVO {
     private Integer alarmCount;
     @ApiModelProperty(value = "事件数")
     private Integer eventCount;
-    @ApiModelProperty(value = "项目数")
-    private Integer projectCount;
+    @ApiModelProperty(value = "工程个数")
+    private Integer eningerCount;
 
+    @ApiModelProperty(value = "运行事件数")
+    private Integer runCount;
+    @ApiModelProperty(value = "稳态件数")
+    private Integer harmonicCount;
 
     @ApiModelProperty(value = "当前工程id")
     private String currentId;
@@ -39,17 +43,27 @@ public class  DevCountVO {
     private Integer currentOnLineDevCount;
     private List<CsEquipmentDeliveryPO> currentOnLineDevs;
 
-    @ApiModelProperty(value = "当前工程设备在线总数")
+    @ApiModelProperty(value = "当前工程设备离线总数")
     private Integer currentOffLineDevCount;
     private List<CsEquipmentDeliveryPO> currentOffLineDevs;
 
-    @ApiModelProperty(value = "警告数")
+    @ApiModelProperty(value = "设备警告数")
     private Integer currentAlarmCount;
-    @ApiModelProperty(value = "事件数")
+    @ApiModelProperty(value = "暂态事件数")
     private Integer currentEventCount;
+    @ApiModelProperty(value = "运行事件数")
+    private Integer currentRunCount;
+    @ApiModelProperty(value = "稳态件数")
+    private Integer currentHarmonicCount;
+
     @ApiModelProperty(value = "项目数")
     private Integer currentProjectCount;
 
+    @ApiModelProperty(value = "项目数")
+    private Long feedBackCount;
+
+
+
 
 
 }