云前置改造-台账相关功能

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

@@ -11,9 +11,15 @@ import java.io.Serializable;
 @Data
 public class CldEventParam implements Serializable {
 
+    @ApiModelProperty("设备id")
+    private String devId;
+
     @ApiModelProperty("监测点id")
     private String monitorId;
 
+    @ApiModelProperty("监测点序号")
+    private Integer cpuNo;
+
     @ApiModelProperty("暂降触发时间")
     private String startTime;
 
@@ -29,10 +35,7 @@ public class CldEventParam implements Serializable {
     @ApiModelProperty("相别")
     private String phase;
 
-    @ApiModelProperty("Cfg文件路径")
-    private String wavePathCfg;
-
-    @ApiModelProperty("Dat文件路径")
-    private String wavePathDat;
+    @ApiModelProperty("文件路径")
+    private String wavePath;
 
 }

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

@@ -15,8 +15,8 @@ import java.util.List;
 @Data
 public class ZuTaiDTO {
 
-    @SerializedName("done_json")
-    private List<Detail> doneJson;
+    @SerializedName("json")
+    private List<Detail> json;
 
     @Data
     public static class Detail{
@@ -37,12 +37,12 @@ public class ZuTaiDTO {
         private Boolean display;
 
         @SerializedName("lineId")
-        private List<String> lineId;
+        private String lineId;
 
         @SerializedName("UID")
         private List<String> uId;
 
-        @SerializedName("UName")
+        @SerializedName("UIDName")
         private String target;
 
     }

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

@@ -1,6 +1,8 @@
 package com.njcn.csharmonic.pojo.vo;
 
+import com.alibaba.nacos.shaded.com.google.gson.annotations.SerializedName;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -31,6 +33,7 @@ public class CsPageVO {
     private String pid;
 
     @ApiModelProperty(value="前端使用")
+    @JsonProperty("kId")
     private String kId;
 
     @ApiModelProperty(value="组态项目名称")

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

@@ -0,0 +1,32 @@
+package com.njcn.csharmonic.pojo.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @author xy
+ */
+@Data
+public class FrontWarnVO implements Serializable {
+
+    @ApiModelProperty("前置id")
+    private String frontId;
+
+    @ApiModelProperty("前置ip")
+    private String frontIp;
+
+    @ApiModelProperty("前置进程号")
+    private Integer processNo;
+
+    @ApiModelProperty("事件发生时间")
+    private String startTime;
+
+    @ApiModelProperty("告警描述")
+    private String tag;
+
+    @ApiModelProperty("告警码")
+    private Integer code;
+
+}