调整dto和vo

AlarmDataStarter/src/main/java/com/persagy/apm/energyalarmstarter/alarmdata/model/dto/alarmcomment/AddAlarmCommentDTO.java

@@ -18,40 +18,14 @@ import java.util.Date;
 @EqualsAndHashCode(callSuper = true)
 @Data
 public class AddAlarmCommentDTO extends AlarmUrlParam {
-    /**
-     * 报警对象id
-     */
-    private String objId;
-    /**
-     * 设备类编码
-     */
-    private String classCode;
-    /**
-     * 报警类型编码
-     */
-    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 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 groupCode;
 }

AlarmDataStarter/src/main/java/com/persagy/apm/energyalarmstarter/alarmdata/model/dto/alarmcomment/QueryAlarmCommentDTO.java

@@ -0,0 +1,25 @@
+package com.persagy.apm.energyalarmstarter.alarmdata.model.dto.alarmcomment;
+
+import com.persagy.apm.energyalarmstarter.alarmdata.feign.AlarmUrlParam;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 报警批注
+ *
+ * @author lixing
+ * @version V1.0 2021/9/16 9:33 上午
+ **/
+public class QueryAlarmCommentDTO extends AlarmUrlParam {
+    private String 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 groupCode;
+}

AlarmDataStarter/src/main/java/com/persagy/apm/energyalarmstarter/alarmdata/model/dto/common/QueryAlarmConfigDTO.java

@@ -1,4 +1,4 @@
-package com.persagy.apm.energyalarmstarter.alarmdata.model.dto.common;
+package com.persagy.apm.energyalarmstarter.alarmdata.model.dto.alarmconfig;
 
 import com.persagy.apm.energyalarmstarter.alarmdata.feign.AlarmUrlParam;
 

AlarmDataStarter/src/main/java/com/persagy/apm/energyalarmstarter/alarmdata/model/dto/alarmitem/QueryAlarmItemDTO.java

@@ -0,0 +1,32 @@
+package com.persagy.apm.energyalarmstarter.alarmdata.model.dto.alarmitem;
+
+import com.fasterxml.jackson.databind.node.ObjectNode;
+import com.persagy.apm.energyalarmstarter.alarmdata.feign.AlarmUrlParam;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 报警条目
+ *
+ * @author lixing
+ * @version V1.0 2021/9/16 9:33 上午
+ **/
+public class QueryAlarmItemDTO extends AlarmUrlParam {
+    private String id;
+    private String code;
+    private String name;
+    private String category;
+    private String level;
+    private String remark;
+    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;
+}

AlarmDataStarter/src/main/java/com/persagy/apm/energyalarmstarter/alarmdata/model/dto/alarmrecord/AddAlarmRecordDTO.java

@@ -1,5 +1,6 @@
-package com.persagy.apm.energyalarmstarter.alarmdata.model.dto.alarmconfig;
+package com.persagy.apm.energyalarmstarter.alarmdata.model.dto.alarmrecord;
 
+import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.persagy.apm.energyalarmstarter.alarmdata.feign.AlarmUrlParam;
 import com.persagy.apm.energyalarmstarter.alarmdata.model.dto.AlarmCondition;
 import lombok.Data;
@@ -18,40 +19,53 @@ import java.util.Date;
 @EqualsAndHashCode(callSuper = true)
 @Data
 public class AddAlarmRecordDTO extends AlarmUrlParam {
-    /**
-     * 报警对象id
-     */
+    private String id;
+    private String itemCode;
+    private String projectId;
     private String objId;
-    /**
-     * 设备类编码
-     */
     private String classCode;
-    /**
-     * 报警类型编码
-     */
-    private String itemCode;
-    /**
-     * 报警系统编码
-     */
+    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 level;
+    private Integer nature;
     /**
-     * 备注
+     * 处理方式
      */
-    private String remark;
+    private Integer treatMode;
     /**
-     * 报警条件
+     * 处理状态
      */
-    private AlarmCondition condition;
+    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-open、0- 屏蔽
+     * 忽略报警时间
      */
-    private Integer open;
+    private Date ignoreTime;
     /**
-     * 是否自定义 1-自定义、0-自动生成
+     * 报警处理完成时间
      */
-    private Integer userDefined;
+    private Date treatEndTime;
+    private String targetId;
 }

AlarmDataStarter/src/main/java/com/persagy/apm/energyalarmstarter/alarmdata/model/dto/alarmrecord/BatchUpdateAlarmRecordDTO.java

@@ -1,4 +1,4 @@
-package com.persagy.apm.energyalarmstarter.alarmdata.model.dto.alarmconfig;
+package com.persagy.apm.energyalarmstarter.alarmdata.model.dto.alarmrecord;
 
 import com.persagy.apm.energyalarmstarter.alarmdata.feign.AlarmUrlParam;
 import lombok.Data;

AlarmDataStarter/src/main/java/com/persagy/apm/energyalarmstarter/alarmdata/model/dto/alarmrecord/QueryAlarmRecordDTO.java

@@ -0,0 +1,69 @@
+package com.persagy.apm.energyalarmstarter.alarmdata.model.dto.alarmrecord;
+
+import com.fasterxml.jackson.databind.node.ObjectNode;
+import com.persagy.apm.energyalarmstarter.alarmdata.feign.AlarmUrlParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 报警记录
+ *
+ * @author lixing
+ * @version V1.0 2021/9/16 9:33 上午
+ **/
+@EqualsAndHashCode(callSuper = true)
+@Data
+public class QueryAlarmRecordDTO extends AlarmUrlParam {
+    private String id;
+    private String itemCode;
+    private String projectId;
+    private String objId;
+    private String classCode;
+    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 Integer nature;
+    /**
+     * 处理方式
+     */
+    private Integer treatMode;
+    /**
+     * 处理状态
+     */
+    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;
+
+    /**
+     * 忽略报警时间
+     */
+    private Date ignoreTime;
+    /**
+     * 报警处理完成时间
+     */
+    private Date treatEndTime;
+    private String targetId;
+}

AlarmDataStarter/src/main/java/com/persagy/apm/energyalarmstarter/alarmdata/model/dto/alarmrecord/UpdateAlarmRecordDTO.java

@@ -1,5 +1,6 @@
-package com.persagy.apm.energyalarmstarter.alarmdata.model.dto.alarmconfig;
+package com.persagy.apm.energyalarmstarter.alarmdata.model.dto.alarmrecord;
 
+import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.persagy.apm.energyalarmstarter.alarmdata.feign.AlarmUrlParam;
 import com.persagy.apm.energyalarmstarter.alarmdata.model.dto.AlarmCondition;
 import lombok.Data;
@@ -18,40 +19,53 @@ import java.util.Date;
 @EqualsAndHashCode(callSuper = true)
 @Data
 public class UpdateAlarmRecordDTO extends AlarmUrlParam {
-    /**
-     * 报警对象id
-     */
+    private String id;
+    private String itemCode;
+    private String projectId;
     private String objId;
-    /**
-     * 设备类编码
-     */
     private String classCode;
-    /**
-     * 报警类型编码
-     */
-    private String itemCode;
-    /**
-     * 报警系统编码
-     */
+    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 level;
+    private Integer nature;
     /**
-     * 备注
+     * 处理方式
      */
-    private String remark;
+    private Integer treatMode;
     /**
-     * 报警条件
+     * 处理状态
      */
-    private AlarmCondition condition;
+    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-open、0- 屏蔽
+     * 忽略报警时间
      */
-    private Integer open;
+    private Date ignoreTime;
     /**
-     * 是否自定义 1-自定义、0-自动生成
+     * 报警处理完成时间
      */
-    private Integer userDefined;
+    private Date treatEndTime;
+    private String targetId;
 }

AlarmDataStarter/src/main/java/com/persagy/apm/energyalarmstarter/alarmdata/model/dto/common/QueryAlarmCommentDTO.java

@@ -1,50 +0,0 @@
-package com.persagy.apm.energyalarmstarter.alarmdata.model.dto.common;
-
-import com.persagy.apm.energyalarmstarter.alarmdata.feign.AlarmUrlParam;
-
-import java.util.List;
-
-/**
- * 报警批注
- *
- * @author lixing
- * @version V1.0 2021/9/16 9:33 上午
- **/
-public class QueryAlarmCommentDTO extends AlarmUrlParam {
-    /**
-     * 报警批注id
-     */
-    private List<String> id;
-    /**
-     * 报警对象id
-     */
-    private List<String> objId;
-    /**
-     * 设备类编码
-     */
-    private List<String> classCode;
-    /**
-     * 报警类型编码
-     */
-    private List<String> itemCode;
-    /**
-     * 报警系统编码
-     */
-    private List<String> category;
-    /**
-     * 报警等级
-     */
-    private List<String> level;
-    /**
-     * 备注
-     */
-    private String remark;
-    /**
-     * 屏蔽状态 1-open、0- 屏蔽
-     */
-    private Integer open;
-    /**
-     * 是否自定义 1-自定义、0-自动生成
-     */
-    private Integer userDefined;
-}

AlarmDataStarter/src/main/java/com/persagy/apm/energyalarmstarter/alarmdata/model/dto/common/QueryAlarmItemDTO.java

@@ -1,50 +0,0 @@
-package com.persagy.apm.energyalarmstarter.alarmdata.model.dto.common;
-
-import com.persagy.apm.energyalarmstarter.alarmdata.feign.AlarmUrlParam;
-
-import java.util.List;
-
-/**
- * 报警条目
- *
- * @author lixing
- * @version V1.0 2021/9/16 9:33 上午
- **/
-public class QueryAlarmItemDTO extends AlarmUrlParam {
-    /**
-     * 报警条目id
-     */
-    private List<String> id;
-    /**
-     * 报警对象id
-     */
-    private List<String> objId;
-    /**
-     * 设备类编码
-     */
-    private List<String> classCode;
-    /**
-     * 报警类型编码
-     */
-    private List<String> itemCode;
-    /**
-     * 报警系统编码
-     */
-    private List<String> category;
-    /**
-     * 报警等级
-     */
-    private List<String> level;
-    /**
-     * 备注
-     */
-    private String remark;
-    /**
-     * 屏蔽状态 1-open、0- 屏蔽
-     */
-    private Integer open;
-    /**
-     * 是否自定义 1-自定义、0-自动生成
-     */
-    private Integer userDefined;
-}

AlarmDataStarter/src/main/java/com/persagy/apm/energyalarmstarter/alarmdata/model/dto/common/QueryAlarmRecordDTO.java

@@ -1,50 +0,0 @@
-package com.persagy.apm.energyalarmstarter.alarmdata.model.dto.common;
-
-import com.persagy.apm.energyalarmstarter.alarmdata.feign.AlarmUrlParam;
-
-import java.util.List;
-
-/**
- * 报警记录
- *
- * @author lixing
- * @version V1.0 2021/9/16 9:33 上午
- **/
-public class QueryAlarmRecordDTO extends AlarmUrlParam {
-    /**
-     * 报警记录id
-     */
-    private List<String> id;
-    /**
-     * 报警对象id
-     */
-    private List<String> objId;
-    /**
-     * 设备类编码
-     */
-    private List<String> classCode;
-    /**
-     * 报警类型编码
-     */
-    private List<String> itemCode;
-    /**
-     * 报警系统编码
-     */
-    private List<String> category;
-    /**
-     * 报警等级
-     */
-    private List<String> level;
-    /**
-     * 备注
-     */
-    private String remark;
-    /**
-     * 屏蔽状态 1-open、0- 屏蔽
-     */
-    private Integer open;
-    /**
-     * 是否自定义 1-自定义、0-自动生成
-     */
-    private Integer userDefined;
-}

AlarmDataStarter/src/main/java/com/persagy/apm/energyalarmstarter/alarmdata/service/AlarmCommentServiceImpl.java

@@ -5,7 +5,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.persagy.apm.energyalarmstarter.alarmdata.feign.DmpResult;
 import com.persagy.apm.energyalarmstarter.alarmdata.feign.client.AlarmClient;
 import com.persagy.apm.energyalarmstarter.alarmdata.model.dto.alarmconfig.AddAlarmCommentDTO;
-import com.persagy.apm.energyalarmstarter.alarmdata.model.dto.common.QueryAlarmCommentDTO;
+import com.persagy.apm.energyalarmstarter.alarmdata.model.dto.alarmcomment.QueryAlarmCommentDTO;
 import com.persagy.apm.energyalarmstarter.alarmdata.model.dto.common.QueryDTO;
 import com.persagy.apm.energyalarmstarter.alarmdata.model.vo.AlarmCommentItem;
 import com.persagy.apm.energyalarmstarter.alarmdata.model.vo.DmpUpsertVO;

AlarmDataStarter/src/main/java/com/persagy/apm/energyalarmstarter/alarmdata/service/AlarmConfigServiceImpl.java

@@ -6,7 +6,7 @@ import com.persagy.apm.energyalarmstarter.alarmdata.feign.DmpResult;
 import com.persagy.apm.energyalarmstarter.alarmdata.feign.client.AlarmClient;
 import com.persagy.apm.energyalarmstarter.alarmdata.model.dto.AlarmCondition;
 import com.persagy.apm.energyalarmstarter.alarmdata.model.dto.alarmconfig.*;
-import com.persagy.apm.energyalarmstarter.alarmdata.model.dto.common.QueryAlarmConfigDTO;
+import com.persagy.apm.energyalarmstarter.alarmdata.model.dto.alarmconfig.QueryAlarmConfigDTO;
 import com.persagy.apm.energyalarmstarter.alarmdata.model.dto.common.QueryDTO;
 import com.persagy.apm.energyalarmstarter.alarmdata.model.vo.AlarmConfigItem;
 import com.persagy.apm.energyalarmstarter.alarmdata.model.vo.DmpBatchUpsertVO;

AlarmDataStarter/src/main/java/com/persagy/apm/energyalarmstarter/alarmdata/service/AlarmItemServiceImpl.java

@@ -4,7 +4,7 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.persagy.apm.energyalarmstarter.alarmdata.feign.DmpResult;
 import com.persagy.apm.energyalarmstarter.alarmdata.feign.client.AlarmClient;
-import com.persagy.apm.energyalarmstarter.alarmdata.model.dto.common.QueryAlarmItemDTO;
+import com.persagy.apm.energyalarmstarter.alarmdata.model.dto.alarmitem.QueryAlarmItemDTO;
 import com.persagy.apm.energyalarmstarter.alarmdata.model.dto.common.QueryDTO;
 import com.persagy.apm.energyalarmstarter.alarmdata.model.vo.AlarmItem;
 import com.persagy.apm.energyalarmstarter.alarmdata.utils.DmpResultUtil;

AlarmDataStarter/src/main/java/com/persagy/apm/energyalarmstarter/alarmdata/service/AlarmRecordServiceImpl.java

@@ -7,7 +7,7 @@ import com.persagy.apm.energyalarmstarter.alarmdata.feign.client.AlarmClient;
 import com.persagy.apm.energyalarmstarter.alarmdata.model.dto.alarmconfig.AddAlarmRecordDTO;
 import com.persagy.apm.energyalarmstarter.alarmdata.model.dto.alarmconfig.BatchUpdateAlarmRecordDTO;
 import com.persagy.apm.energyalarmstarter.alarmdata.model.dto.alarmconfig.UpdateAlarmRecordDTO;
-import com.persagy.apm.energyalarmstarter.alarmdata.model.dto.common.QueryAlarmRecordDTO;
+import com.persagy.apm.energyalarmstarter.alarmdata.model.dto.alarmrecord.QueryAlarmRecordDTO;
 import com.persagy.apm.energyalarmstarter.alarmdata.model.dto.common.QueryDTO;
 import com.persagy.apm.energyalarmstarter.alarmdata.model.vo.AlarmRecordItem;
 import com.persagy.apm.energyalarmstarter.alarmdata.model.vo.DmpBatchUpsertVO;