报警批注按创建时间倒序排序

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

@@ -18,14 +18,12 @@ import java.util.Date;
 @EqualsAndHashCode(callSuper = true)
 @Data
 public class AddAlarmCommentDTO extends AlarmUrlParam {
-    private String id;
+    /**
+     * 报警记录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/AlarmCommentModel.java

@@ -1,22 +0,0 @@
-package com.persagy.apm.energyalarmstarter.alarmdata.model.dto.alarmcomment;
-
-import lombok.Getter;
-import lombok.Setter;
-
-import java.util.Date;
-
-@Setter
-@Getter
-public class AlarmCommentModel {
-
-	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

@@ -1,25 +1,28 @@
 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;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 /**
- * 报警批注
+ * 查询报警批注dto
  *
  * @author lixing
  * @version V1.0 2021/9/16 9:33 上午
  **/
+@EqualsAndHashCode(callSuper = true)
+@Data
 public class QueryAlarmCommentDTO extends AlarmUrlParam {
+    /**
+     * 批注id
+     */
     private String id;
+    /**
+     * 报警记录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/alarmconfig/QueryAlarmConfigDTO.java

@@ -1,6 +1,8 @@
 package com.persagy.apm.energyalarmstarter.alarmdata.model.dto.alarmconfig;
 
 import com.persagy.apm.energyalarmstarter.alarmdata.feign.AlarmUrlParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 import java.util.List;
 
@@ -10,6 +12,8 @@ import java.util.List;
  * @author lixing
  * @version V1.0 2021/9/16 9:33 上午
  **/
+@EqualsAndHashCode(callSuper = true)
+@Data
 public class QueryAlarmConfigDTO extends AlarmUrlParam {
     /**
      * 报警定义id

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

@@ -2,6 +2,8 @@ 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 lombok.Data;
+import lombok.EqualsAndHashCode;
 
 import java.util.Date;
 import java.util.List;
@@ -12,21 +14,27 @@ import java.util.List;
  * @author lixing
  * @version V1.0 2021/9/16 9:33 上午
  **/
+@EqualsAndHashCode(callSuper = true)
+@Data
 public class QueryAlarmItemDTO extends AlarmUrlParam {
+    /**
+     * 条目id
+     */
     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,12 +1,8 @@
 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;
 import lombok.EqualsAndHashCode;
-import lombok.Getter;
-import lombok.Setter;
 
 import java.util.Date;
 
@@ -19,19 +15,42 @@ import java.util.Date;
 @EqualsAndHashCode(callSuper = true)
 @Data
 public class AddAlarmRecordDTO extends AlarmUrlParam {
+    /**
+     * 报警记录id
+     */
     private String id;
+    /**
+     * 报警条目编码
+     */
     private String itemCode;
-    private String projectId;
+    /**
+     * 报警对象id
+     */
     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;
     /**
      * 报警性质
      */
@@ -44,21 +63,38 @@ public class AddAlarmRecordDTO extends AlarmUrlParam {
      * 处理状态
      */
     private Integer treatState;
-    private String createUser;
-    private ObjectNode condition;
-    private ObjectNode triggerInfo;
+    /**
+     * 报警发生时的报警条件
+     */
+    private String condition;
+    /**
+     * 报警发生时的采集值信息
+     */
+    private String triggerInfo;
+    /**
+     * 报警发生时间
+     */
     private Date triggerTime;
-    private ObjectNode endInfo;
+    /**
+     * 报警恢复时的采集值信息
+     */
+    private String endInfo;
+    /**
+     * 报警恢复时间
+     */
     private Date endTime;
-    private Date createTime;
-    private String updateUser;
-    private Date updateTime;
-    private Integer valid;
-    private String groupCode;
+    /**
+     * 补充说明
+     */
+    private String supplement;
+    /**
+     * 工单id
+     */
     private String orderId;
+    /**
+     * 工单状态
+     */
     private String orderState;
-    private ObjectNode supplement;
-
     /**
      * 忽略报警时间
      */
@@ -67,5 +103,4 @@ public class AddAlarmRecordDTO extends AlarmUrlParam {
      * 报警处理完成时间
      */
     private Date treatEndTime;
-    private String targetId;
 }

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

@@ -1,11 +1,14 @@
 package com.persagy.apm.energyalarmstarter.alarmdata.model.dto.common;
 
+import lombok.Data;
+
 /**
  * 排序通用类
  *
  * @author lixing
  * @version V1.0 2021/9/16 9:40 上午
  **/
+@Data
 public class OrderDTO {
     /** 排序字段 */
     private String column;

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

@@ -2,10 +2,12 @@ package com.persagy.apm.energyalarmstarter.alarmdata.service;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.google.common.collect.Lists;
 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.alarmcomment.QueryAlarmCommentDTO;
+import com.persagy.apm.energyalarmstarter.alarmdata.model.dto.common.OrderDTO;
 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;
@@ -36,6 +38,13 @@ public class AlarmCommentServiceImpl {
      */
     public DmpResult<List<AlarmCommentItem>> query(QueryAlarmCommentDTO queryAlarmCommentDTO) throws Exception {
         QueryDTO<QueryAlarmCommentDTO> queryDTO = new QueryDTO<>();
+        // 按创建时间倒序排列
+        OrderDTO orderDTO = new OrderDTO();
+        orderDTO.setColumn("create_time");
+        orderDTO.setAsc(false);
+        List<OrderDTO> orders = Lists.newArrayList(orderDTO);
+        queryDTO.setOrders(orders);
+
         queryDTO.setCriteria(queryAlarmCommentDTO);
         JSONObject jsonObject = Obj2JSONObject.convert(queryDTO);
         DmpResult<JSONArray> result = alarmClient.queryAlarmComment(queryAlarmCommentDTO.fetchParams(), jsonObject);