From ac326c1db9de13a81d8b807276689df88486307d Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Tue, 05 Dec 2023 14:42:50 +0800
Subject: [PATCH] chore:测试提交
---
screen-api/src/main/java/com/moral/api/service/impl/ProfessionServiceImpl.java | 35 +++++++++++++++--------------------
1 files changed, 15 insertions(+), 20 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/service/impl/ProfessionServiceImpl.java b/screen-api/src/main/java/com/moral/api/service/impl/ProfessionServiceImpl.java
index a4adcb6..18ae1e2 100644
--- a/screen-api/src/main/java/com/moral/api/service/impl/ProfessionServiceImpl.java
+++ b/screen-api/src/main/java/com/moral/api/service/impl/ProfessionServiceImpl.java
@@ -6,14 +6,7 @@
import org.springframework.util.ObjectUtils;
import java.text.NumberFormat;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
import java.util.stream.Collectors;
import com.alibaba.fastjson.JSONObject;
@@ -86,7 +79,7 @@
@Autowired
private SensorService sensorService;
- private static Map<String, String> senorMap = new HashMap<>();
+ private static final Map<String, String> senorMap = new HashMap<>();
static {
senorMap.put(Constants.SENSOR_CODE_PM25, "PM2_5");
@@ -103,8 +96,10 @@
List<Map<String, Object>> devices = deviceService.getDevicesByOrganizationId(organizationId);
Set<Map<String, Object>> result = new HashSet<>();
for (Map<String, Object> device : devices) {
- List<Map<String, Object>> professions = (List<Map<String, Object>>) device.get("professions");
- result.addAll(professions);
+ if(Objects.nonNull(device)&&Objects.nonNull(device.get("professions"))&&device.containsKey("professions")){
+ List<Map<String, Object>> professions = (List<Map<String, Object>>) device.get("professions");
+ result.addAll(professions);
+ }
}
return result;
}
@@ -237,7 +232,7 @@
}
Map<String, Object> cityDataMap = new HashMap<>();
//������������
- cityDataMap.put("name", cityValue);
+ cityDataMap.put("value", cityValue);
cityDataList.add(cityDataMap);
}
@@ -299,9 +294,9 @@
}
//������������
- timeDataMap.put("name", professionAvg == null ? null : AmendUtils.sciCal(professionAvg, 0));
+ timeDataMap.put("value", professionAvg == null ? null : AmendUtils.sciCal(professionAvg, 0));
//���������
- timeDataMap.put("value", contributionRate);
+ timeDataMap.put("name", contributionRate);
dataList.add(timeDataMap);
}
professionMap.put("data", dataList);
@@ -374,7 +369,7 @@
}
Map<String, Object> cityDataMap = new HashMap<>();
//������������
- cityDataMap.put("name", cityValue);
+ cityDataMap.put("value", cityValue);
cityDataList.add(cityDataMap);
}
@@ -436,9 +431,9 @@
}
//������������
- timeDataMap.put("name", professionAvg == null ? null : AmendUtils.sciCal(professionAvg, 0));
+ timeDataMap.put("value", professionAvg == null ? null : AmendUtils.sciCal(professionAvg, 0));
//���������
- timeDataMap.put("value", contributionRate);
+ timeDataMap.put("name", contributionRate);
dataList.add(timeDataMap);
}
professionMap.put("data", dataList);
@@ -521,7 +516,7 @@
}
Map<String, Object> cityDataMap = new HashMap<>();
//������������
- cityDataMap.put("name", cityValue);
+ cityDataMap.put("value", cityValue);
cityDataList.add(cityDataMap);
}
@@ -583,9 +578,9 @@
}
//������������
- timeDataMap.put("name", professionAvg == null ? null : AmendUtils.sciCal(professionAvg, 0));
+ timeDataMap.put("value", professionAvg == null ? null : AmendUtils.sciCal(professionAvg, 0));
//���������
- timeDataMap.put("value", contributionRate);
+ timeDataMap.put("name", contributionRate);
dataList.add(timeDataMap);
}
professionMap.put("data", dataList);
--
Gitblit v1.8.0