瀏覽代碼

调整dto和vo

lixing 3 年之前
父節點
當前提交
1b7b460b4a

+ 9 - 45
AlarmDataStarter/src/main/java/com/persagy/apm/energyalarmstarter/alarmdata/model/vo/AlarmCommentItem.java

@@ -2,6 +2,8 @@ package com.persagy.apm.energyalarmstarter.alarmdata.model.vo;
 
 import com.persagy.apm.energyalarmstarter.alarmdata.model.dto.AlarmCondition;
 
+import java.util.Date;
+
 /**
  * 报警批注
  *
@@ -9,52 +11,14 @@ import com.persagy.apm.energyalarmstarter.alarmdata.model.dto.AlarmCondition;
  * @version V1.0 2021/9/16 9:33 上午
  **/
 public class AlarmCommentItem {
-    /**
-     * 报警批注id
-     */
     private String id;
-    /**
-     * 报警对象id
-     */
-    private String objId;
-    /**
-     * 设备类编码
-     */
-    private String classCode;
-    /**
-     * 项目id
-     */
+    private String recordId;
+    private String content;
+    private String createUser;
+    private Date createTime;
+    //	private Date updateTime;
+    //	private String updateUser;
+    //	private Integer valid;
     private String projectId;
-    /**
-     * 报警类型编码
-     */
-    private String itemCode;
-    /**
-     * 报警系统编码
-     */
-    private String category;
-    /**
-     * 报警等级
-     */
-    private String level;
-    /**
-     * 备注
-     */
-    private String remark;
-    /**
-     * 报警条件
-     */
-    private AlarmCondition condition;
-    /**
-     * 屏蔽状态 1-open、0- 屏蔽
-     */
-    private Integer open;
-    /**
-     * 是否自定义 1-自定义、0-自动生成
-     */
-    private Integer userDefined;
-    /**
-     * 集团编码
-     */
     private String groupCode;
 }

+ 14 - 43
AlarmDataStarter/src/main/java/com/persagy/apm/energyalarmstarter/alarmdata/model/vo/AlarmItem.java

@@ -1,7 +1,10 @@
 package com.persagy.apm.energyalarmstarter.alarmdata.model.vo;
 
+import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.persagy.apm.energyalarmstarter.alarmdata.model.dto.AlarmCondition;
 
+import java.util.Date;
+
 /**
  * 报警条目
  *
@@ -9,52 +12,20 @@ import com.persagy.apm.energyalarmstarter.alarmdata.model.dto.AlarmCondition;
  * @version V1.0 2021/9/16 9:33 上午
  **/
 public class AlarmItem {
-    /**
-     * 报警条目id
-     */
     private String id;
-    /**
-     * 报警对象id
-     */
-    private String objId;
-    /**
-     * 设备类编码
-     */
-    private String classCode;
-    /**
-     * 项目id
-     */
-    private String projectId;
-    /**
-     * 报警类型编码
-     */
-    private String itemCode;
-    /**
-     * 报警系统编码
-     */
+    private String code;
+    private String name;
     private String category;
-    /**
-     * 报警等级
-     */
     private String level;
-    /**
-     * 备注
-     */
     private String remark;
-    /**
-     * 报警条件
-     */
-    private AlarmCondition condition;
-    /**
-     * 屏蔽状态 1-open、0- 屏蔽
-     */
-    private Integer open;
-    /**
-     * 是否自定义 1-自定义、0-自动生成
-     */
-    private Integer userDefined;
-    /**
-     * 集团编码
-     */
+    private ObjectNode condition;
+    private String dealFun;
+    private String createUser;
+    private Date createTime;
+    private String updateUser;
+    private Date updateTime;
+    private Integer valid;
+    private String projectId;
     private String groupCode;
+    private String appId;
 }

+ 38 - 34
AlarmDataStarter/src/main/java/com/persagy/apm/energyalarmstarter/alarmdata/model/vo/AlarmRecordItem.java

@@ -1,7 +1,10 @@
 package com.persagy.apm.energyalarmstarter.alarmdata.model.vo;
 
+import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.persagy.apm.energyalarmstarter.alarmdata.model.dto.AlarmCondition;
 
+import java.util.Date;
+
 /**
  * 报警记录
  *
@@ -9,52 +12,53 @@ import com.persagy.apm.energyalarmstarter.alarmdata.model.dto.AlarmCondition;
  * @version V1.0 2021/9/16 9:33 上午
  **/
 public class AlarmRecordItem {
-    /**
-     * 报警记录id
-     */
     private String id;
-    /**
-     * 报警对象id
-     */
+    private String itemCode;
+    private String projectId;
     private String objId;
-    /**
-     * 设备类编码
-     */
     private String classCode;
-    /**
-     * 项目id
-     */
-    private String projectId;
-    /**
-     * 报警类型编码
-     */
-    private String itemCode;
-    /**
-     * 报警系统编码
-     */
-    private String category;
-    /**
-     * 报警等级
-     */
     private String level;
+    private String remark;
+    private String name;
+    private String category;
+    private Integer concern;
+    private Integer state;
+    private Date effectStartTime;
+    private Date effectEndTime;
     /**
-     * 备注
+     * 报警性质
      */
-    private String remark;
+    private Integer nature;
     /**
-     * 报警条件
+     * 处理方式
      */
-    private AlarmCondition condition;
+    private Integer treatMode;
     /**
-     * 屏蔽状态 1-open、0- 屏蔽
+     * 处理状态
      */
-    private Integer open;
+    private Integer treatState;
+    private String createUser;
+    private ObjectNode condition;
+    private ObjectNode triggerInfo;
+    private Date triggerTime;
+    private ObjectNode endInfo;
+    private Date endTime;
+    private Date createTime;
+    private String updateUser;
+    private Date updateTime;
+    private Integer valid;
+    private String groupCode;
+    private String orderId;
+    private String orderState;
+    private ObjectNode supplement;
+
     /**
-     * 是否自定义 1-自定义、0-自动生成
+     * 忽略报警时间
      */
-    private Integer userDefined;
+    private Date ignoreTime;
     /**
-     * 集团编码
+     * 报警处理完成时间
      */
-    private String groupCode;
+    private Date treatEndTime;
+    private String targetId;
 }