数据中台查询方式修改

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

@@ -1,6 +1,7 @@
 package com.persagy.apm.energyalarmstarter.alarmdata.model.dto.common;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
+import com.persagy.apm.energyalarmstarter.alarmdata.feign.AlarmUrlParam;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 

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

@@ -50,4 +50,20 @@ public class UrlParamDTO implements Serializable {
         return new AlarmUrlParam(this.userId, this.groupCode, this.projectId, this.appId);
     }
 
+    /**
+     * 初始化应该放到url中的参数
+     *
+     * @param fetchParams 应该放到url中的参数
+     * @author lixing
+     * @version V1.0 2021/9/23 9:57 上午
+     */
+    public void initUrlParams(AlarmUrlParam fetchParams) {
+        if (fetchParams == null) {
+            return;
+        }
+        this.userId = fetchParams.getUserId();
+        this.groupCode = fetchParams.getGroupCode();
+        this.projectId = fetchParams.getProjectId();
+        this.appId = fetchParams.getAppId();
+    }
 }

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

@@ -5,8 +5,8 @@ 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.alarmconfig.AddAlarmCommentDTO;
 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;
@@ -32,12 +32,26 @@ public class AlarmCommentServiceImpl {
 
     /**
      * 查询报警批注
+     *
      * @param queryAlarmCommentDTO 入参
      * @return 报警批注列表
      * @throws Exception
      */
     public DmpResult<List<AlarmCommentItem>> query(QueryAlarmCommentDTO queryAlarmCommentDTO) throws Exception {
         QueryDTO<QueryAlarmCommentDTO> queryDTO = new QueryDTO<>();
+        queryDTO.initUrlParams(queryAlarmCommentDTO.fetchParams());
+        queryDTO.setCriteria(queryAlarmCommentDTO);
+        return pageQuery(queryDTO);
+    }
+
+    /**
+     * 分页查询报警批注
+     *
+     * @param queryDTO 入参
+     * @return 报警批注列表
+     * @throws Exception
+     */
+    public DmpResult<List<AlarmCommentItem>> pageQuery(QueryDTO<QueryAlarmCommentDTO> queryDTO) throws Exception {
         // 按创建时间倒序排列
         OrderDTO orderDTO = new OrderDTO();
         orderDTO.setColumn("create_time");
@@ -45,19 +59,19 @@ public class AlarmCommentServiceImpl {
         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);
+        DmpResult<JSONArray> result = alarmClient.queryAlarmComment(queryDTO.fetchParams(), jsonObject);
         return DmpResultUtil.multiConvert(result, AlarmCommentItem.class);
     }
 
     /**
      * 创建报警批注
+     *
      * @param addAlarmCommentDTO 入参
      * @return 报警批注id
      * @throws Exception
      */
-    public DmpResult<DmpUpsertVO> create(AddAlarmCommentDTO addAlarmCommentDTO) throws Exception{
+    public DmpResult<DmpUpsertVO> create(AddAlarmCommentDTO addAlarmCommentDTO) throws Exception {
         JSONObject jsonObject = Obj2JSONObject.convert(addAlarmCommentDTO);
         DmpResult<JSONObject> alarmComment = alarmClient.createAlarmComment(addAlarmCommentDTO.fetchParams(), jsonObject);
         return DmpResultUtil.singleConvert(alarmComment, DmpUpsertVO.class);

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

@@ -58,6 +58,7 @@ public class AlarmRecordServiceImpl {
      */
     public DmpResult<List<AlarmRecordItem>> query(QueryAlarmRecordDTO queryAlarmRecordDTO) throws Exception {
         QueryDTO<QueryAlarmRecordDTO> queryDTO = new QueryDTO<>();
+        queryDTO.initUrlParams(queryAlarmRecordDTO.fetchParams());
         queryDTO.setCriteria(queryAlarmRecordDTO);
         return query(queryDTO);
     }