Browse Source

开发报警记录详情接口

lixing 3 years ago
parent
commit
87c9a77aad

+ 8 - 5
src/main/java/com/persagy/apm/alarmservice/group/alarmrecord/controller/AlarmRecordController.java

@@ -78,11 +78,14 @@ public class AlarmRecordController {
     @PostMapping("/current_list")
     public CommonResult<PageList<AlarmRecordListItem>> queryCurrentAlarmRecord(
             @Valid @RequestBody PageQueryAlarmRecordDTO pageQueryAlarmRecordDTO) throws Exception {
-        // 当前报警的默认查询条件为:报警处理状态为未处理和处理中
-        pageQueryAlarmRecordDTO.setAlarmTreatState(Lists.newArrayList(
-                EnumAlarmTreatState.UN_HANDLE.getType(),
-                EnumAlarmTreatState.HANDLING.getType()
-        ));
+        if (pageQueryAlarmRecordDTO.getAlarmTreatState() == null) {
+            // 当前报警的默认查询条件为:报警处理状态为未处理和处理中
+            pageQueryAlarmRecordDTO.setAlarmTreatState(Lists.newArrayList(
+                    EnumAlarmTreatState.UN_HANDLE.getType(),
+                    EnumAlarmTreatState.HANDLING.getType()
+            ));
+        }
+
         return queryAlarmRecord(pageQueryAlarmRecordDTO);
     }
 

+ 2 - 2
src/main/java/com/persagy/apm/alarmservice/group/monitorindicator/controller/MonitorIndicatorController.java

@@ -84,8 +84,8 @@ public class MonitorIndicatorController {
     @ApiOperation(value = "监测指标数据信息")
     @PostMapping("/record_info")
     public CommonResult<PageList<MonitorIndicatorRecordInfoItem>> monitorIndicatorRecordInfo(
-            @Valid @RequestBody QueryMonitorIndicatorRecordInfoDTO queryMonitorIndicatorRecordInfoDTO) {
-        List<MonitorIndicatorRecordInfoItem> list = new ArrayList<>();
+            @Valid @RequestBody QueryMonitorIndicatorRecordInfoDTO queryMonitorIndicatorRecordInfoDTO) throws Exception{
+        List<MonitorIndicatorRecordInfoItem> list = monitorIndicatorService.monitorIndicatorRecordInfo(queryMonitorIndicatorRecordInfoDTO);
         return ResultHelper.multi(list);
     }
 }

+ 63 - 53
src/main/java/com/persagy/apm/alarmservice/group/monitorindicator/service/IMonitorIndicatorService.java

@@ -1,13 +1,12 @@
 package com.persagy.apm.alarmservice.group.monitorindicator.service;
 
-import com.persagy.apm.alarmservice.group.monitorindicator.model.MonitorIndicator;
-import com.persagy.apm.alarmservice.group.monitorindicator.model.dto.AddMonitorIndicatorDTO;
-import com.persagy.apm.alarmservice.group.monitorindicator.model.dto.PageQueryMonitorIndicatorDTO;
-import com.persagy.apm.alarmservice.group.monitorindicator.model.dto.QueryMonitorIndicatorDTO;
-import com.persagy.apm.alarmservice.group.monitorindicator.model.dto.UpdateMonitorIndicatorDTO;
-import java.util.List;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.persagy.apm.alarmservice.group.monitorindicator.model.MonitorIndicator;
+import com.persagy.apm.alarmservice.group.monitorindicator.model.dto.*;
 import com.persagy.apm.alarmservice.group.monitorindicator.model.vo.MonitorIndicatorListItemVO;
+import com.persagy.apm.alarmservice.group.monitorindicator.model.vo.MonitorIndicatorRecordInfoItem;
+
+import java.util.List;
 
 /**
  * 监测指标(MonitorIndicator) service接口
@@ -15,64 +14,64 @@ import com.persagy.apm.alarmservice.group.monitorindicator.model.vo.MonitorIndic
  * @author lixing
  * @version V1.0 2021-09-08 22:44:37
  */
-public interface IMonitorIndicatorService  {
-    
+public interface IMonitorIndicatorService {
+
     /**
-    * 创建监测指标
-    *
-    * @param addMonitorIndicatorDTO addDTO
-    * @return 监测指标主键
-    * @author lixing
-    * @version V1.0 2021-09-08 22:44:37
-    */
+     * 创建监测指标
+     *
+     * @param addMonitorIndicatorDTO addDTO
+     * @return 监测指标主键
+     * @author lixing
+     * @version V1.0 2021-09-08 22:44:37
+     */
     public String createMonitorIndicator(AddMonitorIndicatorDTO addMonitorIndicatorDTO);
-    
+
     /**
-    * 监测指标详情
-    *
-    * @param id 主键
-    * @return 监测指标do对象
-    * @author lixing
-    * @version V1.0 2021-09-08 22:44:37
-    */
+     * 监测指标详情
+     *
+     * @param id 主键
+     * @return 监测指标do对象
+     * @author lixing
+     * @version V1.0 2021-09-08 22:44:37
+     */
     public MonitorIndicator queryMonitorIndicatorDetail(String id);
-    
+
     /**
-    * 更新监测指标
-    *
-    * @param updateMonitorIndicatorDTO updateDTO
-    * @author lixing
-    * @version V1.0 2021-09-08 22:44:37
-    */
+     * 更新监测指标
+     *
+     * @param updateMonitorIndicatorDTO updateDTO
+     * @author lixing
+     * @version V1.0 2021-09-08 22:44:37
+     */
     public void updateMonitorIndicator(UpdateMonitorIndicatorDTO updateMonitorIndicatorDTO);
-    
+
     /**
-    * 删除监测指标
-    *
-    * @param id 主键
-    * @author lixing
-    * @version V1.0 2021-09-08 22:44:37
-    */
+     * 删除监测指标
+     *
+     * @param id 主键
+     * @author lixing
+     * @version V1.0 2021-09-08 22:44:37
+     */
     public void deleteMonitorIndicator(String id);
-    
+
     /**
-    * 查询监测指标
-    *
-    * @param queryMonitorIndicatorDTO queryDTO
-    * @return List<MonitorIndicator>
-    * @author lixing
-    * @version V1.0 2021-09-08 22:44:37
-    */
+     * 查询监测指标
+     *
+     * @param queryMonitorIndicatorDTO queryDTO
+     * @return List<MonitorIndicator>
+     * @author lixing
+     * @version V1.0 2021-09-08 22:44:37
+     */
     public List<MonitorIndicator> queryMonitorIndicatorList(QueryMonitorIndicatorDTO queryMonitorIndicatorDTO);
-    
+
     /**
-    * 分页查询监测指标
-    * 
-    * @param pageQueryMonitorIndicatorDTO pageQueryDTO
-    * @return IPage<MonitorIndicator>
-    * @author lixing
-    * @version V1.0 2021-09-08 22:44:37
-    */
+     * 分页查询监测指标
+     *
+     * @param pageQueryMonitorIndicatorDTO pageQueryDTO
+     * @return IPage<MonitorIndicator>
+     * @author lixing
+     * @version V1.0 2021-09-08 22:44:37
+     */
     public IPage<MonitorIndicator> pageQueryMonitorIndicator(PageQueryMonitorIndicatorDTO pageQueryMonitorIndicatorDTO);
 
     /**
@@ -84,4 +83,15 @@ public interface IMonitorIndicatorService  {
      * @version V1.0 2021-09-08 22:44:37
      */
     public void setIndicatorMethodCount(List<MonitorIndicatorListItemVO> indicators);
+
+    /**
+     * 查询报警记录相关的监测指标取值
+     *
+     * @param queryMonitorIndicatorRecordInfoDTO 查询条件
+     * @return 报警记录相关的监测指标取值
+     * @author lixing
+     * @version V1.0 2021/9/27 10:47 上午
+     */
+    List<MonitorIndicatorRecordInfoItem> monitorIndicatorRecordInfo(
+            QueryMonitorIndicatorRecordInfoDTO queryMonitorIndicatorRecordInfoDTO) throws Exception;
 }

+ 16 - 6
src/main/java/com/persagy/apm/alarmservice/group/monitorindicator/service/impl/MonitorIndicatorServiceImpl.java

@@ -5,21 +5,21 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.google.common.base.CaseFormat;
+import com.persagy.apm.alarmservice.group.alarmrecord.service.AlarmRecordWrapper;
 import com.persagy.apm.alarmservice.group.calculatemethod.model.CalculateMethod;
 import com.persagy.apm.alarmservice.group.calculatemethod.model.dto.QueryCalculateMethodDTO;
 import com.persagy.apm.alarmservice.group.calculatemethod.service.ICalculateMethodService;
-import com.persagy.apm.alarmservice.group.monitorindicator.model.MonitorIndicator;
-import com.persagy.apm.alarmservice.group.monitorindicator.model.dto.AddMonitorIndicatorDTO;
-import com.persagy.apm.alarmservice.group.monitorindicator.model.dto.PageQueryMonitorIndicatorDTO;
-import com.persagy.apm.alarmservice.group.monitorindicator.model.dto.QueryMonitorIndicatorDTO;
-import com.persagy.apm.alarmservice.group.monitorindicator.model.dto.UpdateMonitorIndicatorDTO;
 import com.persagy.apm.alarmservice.group.monitorindicator.dao.MonitorIndicatorMapper;
 import com.persagy.apm.alarmservice.group.monitorindicator.model.ConvertMonitorIndicatorTool;
+import com.persagy.apm.alarmservice.group.monitorindicator.model.MonitorIndicator;
+import com.persagy.apm.alarmservice.group.monitorindicator.model.dto.*;
 import com.persagy.apm.alarmservice.group.monitorindicator.model.vo.MonitorIndicatorListItemVO;
+import com.persagy.apm.alarmservice.group.monitorindicator.model.vo.MonitorIndicatorRecordInfoItem;
 import com.persagy.apm.alarmservice.group.monitorindicator.service.IMonitorIndicatorService;
 import com.persagy.apm.common.constant.enums.ValidEnum;
 import com.persagy.apm.common.context.AppContext;
 import com.persagy.apm.common.model.dto.Sort;
+import com.persagy.apm.energyalarmstarter.alarmdata.model.vo.AlarmRecordItem;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -39,6 +39,8 @@ public class MonitorIndicatorServiceImpl extends ServiceImpl<MonitorIndicatorMap
         implements IMonitorIndicatorService {
     @Autowired
     ICalculateMethodService calculateMethodService;
+    @Autowired
+    AlarmRecordWrapper alarmRecordWrapper;
 
     /**
      * 创建监测指标
@@ -162,7 +164,6 @@ public class MonitorIndicatorServiceImpl extends ServiceImpl<MonitorIndicatorMap
             }
 
 
-
             if (StringUtils.isNotEmpty(queryMonitorIndicatorDTO.getName())) {
                 queryWrapper.like(MonitorIndicator.PROP_NAME, queryMonitorIndicatorDTO.getName());
             }
@@ -226,4 +227,13 @@ public class MonitorIndicatorServiceImpl extends ServiceImpl<MonitorIndicatorMap
             indicator.setMethodCount(methodCount);
         });
     }
+
+    @Override
+    public List<MonitorIndicatorRecordInfoItem> monitorIndicatorRecordInfo(
+            QueryMonitorIndicatorRecordInfoDTO queryMonitorIndicatorRecordInfoDTO) throws Exception {
+        // 获取报警记录关联的指标
+        String alarmRecordId = queryMonitorIndicatorRecordInfoDTO.getAlarmRecordId();
+        AlarmRecordItem alarmRecord = alarmRecordWrapper.getAlarmRecord(alarmRecordId);
+        return null;
+    }
 }