From e97c393e23f4c015a44b5fef5fd26ae288bc6c0f Mon Sep 17 00:00:00 2001
From: lizijie <lzjiiie@163.com>
Date: Wed, 10 Jul 2019 11:31:35 +0800
Subject: [PATCH] 天气预报
---
src/main/java/com/moral/service/impl/HistoryServiceImpl.java | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/moral/service/impl/HistoryServiceImpl.java b/src/main/java/com/moral/service/impl/HistoryServiceImpl.java
index 37b4d81..72410be 100644
--- a/src/main/java/com/moral/service/impl/HistoryServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/HistoryServiceImpl.java
@@ -30,10 +30,10 @@
import com.moral.entity.Sensor;
import com.moral.mapper.DeviceMapper;
import com.moral.mapper.HistoryMapper;
-import com.moral.mapper.ProfessionMapper;
import com.moral.mapper.SensorMapper;
import com.moral.service.AccountService;
import com.moral.service.HistoryService;
+import com.moral.service.ProfessionService;
@Service
public class HistoryServiceImpl implements HistoryService {
@@ -51,7 +51,7 @@
private SensorMapper sensorMapper;
@Resource
- private ProfessionMapper professionMapper;
+ private ProfessionService professionService;
@Override
public Map<String, Object> getAllSensorAverageByDevice(Map<String, Object> parameters) throws Exception {
@@ -111,6 +111,7 @@
ValidateUtil.notNull(parameters.get("accountId"), "param.is.null");
String regionCode = parameters.get("regionCode").toString();
+ parameters.put("provinceCode", regionCode.substring(0,2).concat("0000"));
String regionType = "village";
String nextLevel = "";
if (regionCode.length() == 6) {
@@ -139,7 +140,7 @@
String column = "value";
if ("month".equals(timeType)) {
if (1 != localDate.getDayOfMonth()) {
- table = "history_minutely";
+ table = "history_daily";
column = "json";
}
parameters.put("start", localDate.with(TemporalAdjusters.firstDayOfMonth()));
@@ -168,7 +169,7 @@
}
}
if ("profession".equals(parameters.get("dimension"))) {
- List<Profession> professions = professionMapper.selectAll();
+ List<Profession> professions = professionService.getProfessiontList(parameters);
for (Map<String, Object> map : result) {
for (Profession profession : professions) {
if (map.get("name").equals(profession.getName())) {
--
Gitblit v1.8.0