Przeglądaj źródła

修改获取监测指标详情接口

lixing 3 lat temu
rodzic
commit
ee521fddba

+ 2 - 5
src/main/java/com/persagy/apm/alarmservice/dependency/eqdiagnose/model/MonitorIndicatorRecordListItemVO.java

@@ -15,9 +15,6 @@ import java.util.Date;
 @ApiModel(value = "监测指标历史记录列表返回结果参数")
 @JsonInclude(JsonInclude.Include.NON_NULL)
 public class MonitorIndicatorRecordListItemVO {
-    @ApiModelProperty("项目id")
-    private String project;
-    
     @ApiModelProperty("对象id")
     private String objId;
     
@@ -25,8 +22,8 @@ public class MonitorIndicatorRecordListItemVO {
     private String monitorIndicatorId;
     
     @ApiModelProperty("时间")
-    private Date dataTime;
+    private Date date;
     
     @ApiModelProperty("值")
-    private String dataValue;
+    private String value;
 }

+ 3 - 3
src/main/java/com/persagy/apm/alarmservice/dependency/eqdiagnose/service/EqDiagnoseServiceImpl.java

@@ -52,10 +52,10 @@ public class EqDiagnoseServiceImpl {
         if (CollectionUtils.isEmpty(records)) {
             return new HashMap<>(0);
         }
-        return records.stream().filter(record -> record.getDataTime() != null).collect(
+        return records.stream().filter(record -> record.getDate() != null).collect(
                 Collectors.toMap(
-                        MonitorIndicatorRecordListItemVO::getDataTime,
-                        MonitorIndicatorRecordListItemVO::getDataValue
+                        MonitorIndicatorRecordListItemVO::getDate,
+                        MonitorIndicatorRecordListItemVO::getValue
                 )
         );
 

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

@@ -257,6 +257,7 @@ public class MonitorIndicatorServiceImpl extends ServiceImpl<MonitorIndicatorMap
         // 获取监测指标的历史采集值 monitorId -> (time -> value)
         List<String> infoCodeList = infoCodeArray.toJavaList(String.class);
         Map<String, Map<Date, String>> monitorValuesMap = getIndicatorHistoryValues(
+                alarmRecord.getObjId(),
                 infoCodeList, queryMonitorIndicatorRecordInfoDTO.getStartTime(),
                 queryMonitorIndicatorRecordInfoDTO.getEndTime());
 
@@ -440,6 +441,7 @@ public class MonitorIndicatorServiceImpl extends ServiceImpl<MonitorIndicatorMap
     /**
      * 获取监测指标的历史采集值
      *
+     * @param objId        设备id
      * @param infoCodeList [equipId-monitorId]
      * @param startTime    开始时间
      * @param endTime      结束时间
@@ -448,22 +450,11 @@ public class MonitorIndicatorServiceImpl extends ServiceImpl<MonitorIndicatorMap
      * @version V1.0 2021/9/27 2:35 下午
      */
     private Map<String, Map<Date, String>> getIndicatorHistoryValues(
-            List<String> infoCodeList, Date startTime, Date endTime) {
+            String objId, List<String> infoCodeList, Date startTime, Date endTime) {
         // monitorId -> (time -> value)
         Map<String, Map<Date, String>> monitorValuesMap = new HashMap<>();
-        // infoCodeList:[equipId-monitorId]
-        for (String infoCode : infoCodeList) {
-            String objId;
-            String indicatorId;
-            try {
-                objId = infoCode.substring(0, infoCode.indexOf("_"));
-                indicatorId = infoCode.substring(infoCode.indexOf("_") + 1);
-            } catch (Exception e) {
-                throw new IllegalArgumentException("报警记录数据有误,无法正确获取到报警条件中的信息点");
-            }
-            if (StringUtils.isBlank(objId) || StringUtils.isBlank(indicatorId)) {
-                throw new IllegalArgumentException("报警记录数据有误,无法正确获取到报警条件中的信息点");
-            }
+        // infoCodeList:[indicatorId]
+        for (String indicatorId : infoCodeList) {
             // 查询设备监测指标取值
             QueryMonitorIndicatorRecordDTO queryMonitorIndicatorRecordDTO = new QueryMonitorIndicatorRecordDTO();
             queryMonitorIndicatorRecordDTO.setObjId(objId);