From 3c3250c96a13c796aa88f1366b6d278cb95739e5 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Fri, 06 Jul 2018 13:53:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/moral/service/impl/HistoryServiceImpl.java | 98 ++++++++++++++++++++++++++++++++++++++----------
1 files changed, 77 insertions(+), 21 deletions(-)
diff --git a/src/main/java/com/moral/service/impl/HistoryServiceImpl.java b/src/main/java/com/moral/service/impl/HistoryServiceImpl.java
index 9eabd4d..fa11e80 100644
--- a/src/main/java/com/moral/service/impl/HistoryServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/HistoryServiceImpl.java
@@ -1,11 +1,22 @@
package com.moral.service.impl;
+import java.time.LocalDate;
import java.time.LocalDateTime;
-import java.util.*;
+import java.time.temporal.ChronoUnit;
+import java.time.temporal.TemporalAdjusters;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
import javax.annotation.Resource;
import org.springframework.stereotype.Service;
+import org.springframework.util.ObjectUtils;
import com.moral.common.util.ValidateUtil;
import com.moral.entity.Profession;
@@ -93,37 +104,67 @@
ValidateUtil.notNull(parameters.get("accountId"), "param.is.null");
String regionCode = parameters.get("regionCode").toString();
- String regionType = "village_code";
+ String regionType = "village";
String nextLevel = "";
if (regionCode.length() == 6) {
if (regionCode.endsWith("0000")) {
- regionType = "province_code";
+ regionType = "province";
nextLevel = "city";
} else if (regionCode.endsWith("00")) {
- regionType = "city_code";
+ regionType = "city";
nextLevel = "area";
} else {
- regionType = "area_code";
+ regionType = "area";
nextLevel = "town";
}
} else {
if (regionCode.endsWith("000")) {
- regionType = "town_code";
+ regionType = "town";
nextLevel = "village";
}
}
parameters.put("regionType", regionType);
parameters.put("nextLevel", nextLevel);
- parameters.put("start", LocalDateTime.now().minusMinutes(5));
+
+ LocalDate localDate = LocalDate.now();
+ Object timeType = parameters.get("timeType");
+ String table = "history";
+ String column = "value";
+ if ("month".equals(timeType)) {
+ if (1 != localDate.getDayOfMonth()) {
+ table = "history_minutely";
+ column = "json";
+ }
+ parameters.put("start", localDate.with(TemporalAdjusters.firstDayOfMonth()));
+ } else if ("day".equals(timeType)) {
+ parameters.put("start", localDate);
+ } else if ("hour".equals(timeType)) {
+ parameters.put("start", LocalDateTime.now().truncatedTo(ChronoUnit.HOURS));
+ } else {
+ parameters.put("start", LocalDateTime.now().minusMinutes(5));
+ }
+ parameters.put("table", table);
+ parameters.put("column", column);
+
+ String dimension = "";
+ if ("discharge".equals(parameters.get("dimension"))) {
+ dimension = "discharge";
+ parameters.put("dimension","monitorPoint");
+ }
accountService.setOrgIdsByAccount(parameters);
+
List<Map<String, Object>> result = historyMapper.getRegionRankingData(parameters);
+
if ("profession".equals(parameters.get("dimension"))) {
List<Profession> professions = professionMapper.selectAll();
for (Map<String, Object> map : result) {
for (Profession profession : professions) {
if (map.get("name").equals(profession.getName())) {
professions.remove(profession);
+ if (ObjectUtils.isEmpty(map.get("avg"))) {
+ map.put("avg", 0);
+ }
break;
}
}
@@ -135,28 +176,43 @@
result.add(map);
}
} else if ("region".equals(parameters.get("dimension"))) {
- List<Map<String, Object>> regions = historyMapper.selectNextLevelRegion(parameters);
- for (int i = result.size() - 1; i >= 0; i--) {
- Map<String, Object> map = result.get(i);
- for (Map<String, Object> region : regions) {
- if ((map.get("code") == null)) {
- result.remove(map);
- break;
- }
- if (map.get("code").equals(region.get("code"))) {
- map.put("name", region.get("name"));
- regions.remove(region);
- break;
+ List<String> regions = historyMapper.selectNextLevelRegion(parameters);
+ for (Map<String, Object> map : result) {
+ if (regions.contains(map.get("name"))) {
+ regions.remove(map.get("name"));
+ if (ObjectUtils.isEmpty(map.get("avg"))) {
+ map.put("avg", 0);
}
}
+
}
- for (Map<String, Object> region : regions) {
+ for (String region : regions) {
Map<String, Object> map = new HashMap<String, Object>();
- map.put("name", region.get("name"));
+ map.put("name", region);
map.put("avg", 0);
result.add(map);
}
}
+ if ("discharge".equals(dimension)) {
+ parameters.put("year", LocalDate.now().getYear());
+ List<Map<String, Object>> discharges = historyMapper.getDischargeByRegion(parameters);
+ for (Map<String, Object> map : result) {
+ for (Map<String, Object> discharge : discharges) {
+ if (map.get("name").equals(discharge.get("name"))) {
+ map.put("value", discharge.get("value"));
+ discharges.remove(discharge);
+ break;
+ }
+ }
+ }
+ Collections.sort(result, new Comparator<Map<String, Object>>() {
+ @Override
+ public int compare(Map<String, Object> o1, Map<String, Object> o2) {
+ return Double.compare(((Double) o2.get("avg"))- Double.valueOf((String) o2.get("value")),
+ ((Double) o1.get("avg")) - Double.valueOf((String) o1.get("value")));
+ }
+ });
+ }
return result;
}
}
--
Gitblit v1.8.0