From 85dba01ea5021d83487c3ed2d60706f516a0774b Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Wed, 05 Jan 2022 14:40:28 +0800
Subject: [PATCH] 贡献率数据格式修改
---
screen-job/src/main/java/com/moral/api/service/impl/ForecastServiceImpl.java | 2 +-
screen-api/src/main/java/com/moral/api/service/impl/ProfessionServiceImpl.java | 20 ++++++++++----------
screen-api/src/main/java/com/moral/api/service/impl/CityAqiServiceImpl.java | 2 --
screen-api/src/main/java/com/moral/api/service/impl/RegionServiceImpl.java | 20 ++++++++++----------
4 files changed, 21 insertions(+), 23 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/service/impl/CityAqiServiceImpl.java b/screen-api/src/main/java/com/moral/api/service/impl/CityAqiServiceImpl.java
index 9343fb1..536f9f5 100644
--- a/screen-api/src/main/java/com/moral/api/service/impl/CityAqiServiceImpl.java
+++ b/screen-api/src/main/java/com/moral/api/service/impl/CityAqiServiceImpl.java
@@ -938,8 +938,6 @@
//������������������������������
sortByField(ranks, "compositeIndexYear");
- //���������������
- sortByField(ranks, "compositeIndexYear");
Map<String, Object> yearMap = rankByField(ranks, cityCode, "compositeIndexYear", cityCodes.size());
if (ObjectUtils.isEmpty(yearMap)) {
yearMap.put("rank", null);
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..2608c7b 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
@@ -86,7 +86,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");
@@ -237,7 +237,7 @@
}
Map<String, Object> cityDataMap = new HashMap<>();
//������������
- cityDataMap.put("name", cityValue);
+ cityDataMap.put("value", cityValue);
cityDataList.add(cityDataMap);
}
@@ -299,9 +299,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 +374,7 @@
}
Map<String, Object> cityDataMap = new HashMap<>();
//������������
- cityDataMap.put("name", cityValue);
+ cityDataMap.put("value", cityValue);
cityDataList.add(cityDataMap);
}
@@ -436,9 +436,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 +521,7 @@
}
Map<String, Object> cityDataMap = new HashMap<>();
//������������
- cityDataMap.put("name", cityValue);
+ cityDataMap.put("value", cityValue);
cityDataList.add(cityDataMap);
}
@@ -583,9 +583,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);
diff --git a/screen-api/src/main/java/com/moral/api/service/impl/RegionServiceImpl.java b/screen-api/src/main/java/com/moral/api/service/impl/RegionServiceImpl.java
index ae49a2e..b8d65b6 100644
--- a/screen-api/src/main/java/com/moral/api/service/impl/RegionServiceImpl.java
+++ b/screen-api/src/main/java/com/moral/api/service/impl/RegionServiceImpl.java
@@ -79,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");
@@ -226,7 +226,7 @@
}
Map<String, Object> cityDataMap = new HashMap<>();
//������������
- cityDataMap.put("name", cityValue);
+ cityDataMap.put("value", cityValue);
cityDataList.add(cityDataMap);
}
@@ -282,9 +282,9 @@
}
//������������������
- timeDataMap.put("name", regionAvg == null ? null : AmendUtils.sciCal(regionAvg, 0));
+ timeDataMap.put("value", regionAvg == null ? null : AmendUtils.sciCal(regionAvg, 0));
//���������������������
- timeDataMap.put("value", contributionRate);
+ timeDataMap.put("name", contributionRate);
dataList.add(timeDataMap);
}
regionMap.put("data", dataList);
@@ -357,7 +357,7 @@
}
Map<String, Object> cityDataMap = new HashMap<>();
//������������
- cityDataMap.put("name", cityValue);
+ cityDataMap.put("value", cityValue);
cityDataList.add(cityDataMap);
}
@@ -413,9 +413,9 @@
}
//������������������
- timeDataMap.put("name", regionAvg == null ? null : AmendUtils.sciCal(regionAvg, 0));
+ timeDataMap.put("value", regionAvg == null ? null : AmendUtils.sciCal(regionAvg, 0));
//���������������������
- timeDataMap.put("value", contributionRate);
+ timeDataMap.put("name", contributionRate);
dataList.add(timeDataMap);
}
regionMap.put("data", dataList);
@@ -497,7 +497,7 @@
}
Map<String, Object> cityDataMap = new HashMap<>();
//������������
- cityDataMap.put("name", cityValue);
+ cityDataMap.put("value", cityValue);
cityDataList.add(cityDataMap);
}
@@ -553,9 +553,9 @@
}
//������������������
- timeDataMap.put("name", regionAvg == null ? null : AmendUtils.sciCal(regionAvg, 0));
+ timeDataMap.put("value", regionAvg == null ? null : AmendUtils.sciCal(regionAvg, 0));
//���������������������
- timeDataMap.put("value", contributionRate);
+ timeDataMap.put("name", contributionRate);
dataList.add(timeDataMap);
}
regionMap.put("data", dataList);
diff --git a/screen-job/src/main/java/com/moral/api/service/impl/ForecastServiceImpl.java b/screen-job/src/main/java/com/moral/api/service/impl/ForecastServiceImpl.java
index 944dd08..4ffd928 100644
--- a/screen-job/src/main/java/com/moral/api/service/impl/ForecastServiceImpl.java
+++ b/screen-job/src/main/java/com/moral/api/service/impl/ForecastServiceImpl.java
@@ -59,7 +59,7 @@
@Autowired
private ForecastService forecastService;
- private static Map<String, Integer> weatherScore = new HashMap<>();
+ private static final Map<String, Integer> weatherScore = new HashMap<>();
static {
weatherScore.put("���", 100);
--
Gitblit v1.8.0