Browse Source

Merge branch 'v2.0.0' of http://39.106.8.246:3003/apm/energy-eq-run-diagnose into v2.0.0

shaohongbo 3 years ago
parent
commit
23e201025b

+ 3 - 3
src/main/java/com/persagy/apm/diagnose/indicatorrecord/service/impl/MonitorIndicatorRecordServiceImpl.java

@@ -355,7 +355,7 @@ public class MonitorIndicatorRecordServiceImpl implements IMonitorIndicatorRecor
 
             int indexOf = objIdAndAlarmItemCode.indexOf("_");
             String objId = objIdAndAlarmItemCode.substring(0, indexOf);
-
+            String alarmItemCode = objIdAndAlarmItemCode.substring(indexOf + 1);
 
             List<String> infCodeList = entry.getValue();
 
@@ -382,8 +382,8 @@ public class MonitorIndicatorRecordServiceImpl implements IMonitorIndicatorRecor
                 if (CollectionUtils.isEmpty(value) || value.size() != infCodeList.size()) {
                     continue;
                 }
-                String sentValue = CollectDataUtil.buildSendParam(value);
-                AlarmWebSocketServer.sendMsgToClients(projectDTO.getProjectId(), CollectDataUtil.buildSendParam(value));
+                String sentValue = CollectDataUtil.buildSendParam(value,alarmItemCode);
+                AlarmWebSocketServer.sendMsgToClients(projectDTO.getProjectId(), CollectDataUtil.buildSendParam(value,alarmItemCode));
                 log.info("指标发送报表服务数据:" + projectDTO.getProjectId()+";"+ sentValue);
                 endTime = DateUtils.str2Date(dateListEntry.getKey(), DateUtils.SDF_SECOND);
             }

+ 5 - 6
src/main/java/com/persagy/apm/diagnose/utils/AlarmResultUtil.java

@@ -3,11 +3,6 @@ package com.persagy.apm.diagnose.utils;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.persagy.apm.diagnose.feign.AlarmResult;
-import com.persagy.apm.diagnose.service.dto.CalculateMethodDTO;
-import com.persagy.apm.diagnose.service.dto.MonitorIndicatorConfigDTO;
-import com.persagy.apm.energyalarmstarter.alarmdata.feign.DmpResult;
-import com.persagy.common.utils.StringUtil;
-
 import java.util.ArrayList;
 import java.util.List;
 
@@ -25,7 +20,11 @@ public class AlarmResultUtil {
         if (content == null || content.isEmpty()) {
             return new ArrayList<T>();
         }
-        JSONArray records = (JSONArray) content.getOrDefault("records", new JSONArray());
+//        JSONArray records = (JSONArray) content.getOrDefault("records", new JSONArray());
+        JSONArray records = content.getJSONArray("records");
+        if (records == null || records.isEmpty()) {
+            return new ArrayList<T>();
+        }
         return records.toJavaList(clazz);
     }
 }

+ 2 - 1
src/main/java/com/persagy/apm/diagnose/utils/CollectDataUtil.java

@@ -15,7 +15,7 @@ import java.util.List;
  */
 public class CollectDataUtil {
 
-    public static String buildSendParam(List<MonitorIndicatorRecord> recordList) throws Exception {
+    public static String buildSendParam(List<MonitorIndicatorRecord> recordList,String alarmItemCode) throws Exception {
 
         if (CollectionUtils.isEmpty(recordList)) {
             return null;
@@ -24,6 +24,7 @@ public class CollectDataUtil {
         MonitorIndicatorRecord record1 = recordList.get(0);
         String date = DateUtils.date2Str(record1.getDataTime(), "yyyyMMddHHmmss");
         stringBuilder.append(date).append(";");
+        stringBuilder.append(alarmItemCode).append(";");
         stringBuilder.append(record1.getObjId()).append(";");
 
         for (int i = 0; i < recordList.size(); i++) {