From 6c5658432934f182cfc5a7c5362c53080cbd27cf Mon Sep 17 00:00:00 2001
From: lizijie <lzjiiie@163.com>
Date: Fri, 10 Sep 2021 08:56:28 +0800
Subject: [PATCH] gov_monitor_point表相关文件，查询与新增接口
---
screen-job/src/main/java/com/moral/api/service/impl/HistoryDailyServiceImpl.java | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/screen-job/src/main/java/com/moral/api/service/impl/HistoryDailyServiceImpl.java b/screen-job/src/main/java/com/moral/api/service/impl/HistoryDailyServiceImpl.java
index 10fa56c..a3d4154 100644
--- a/screen-job/src/main/java/com/moral/api/service/impl/HistoryDailyServiceImpl.java
+++ b/screen-job/src/main/java/com/moral/api/service/impl/HistoryDailyServiceImpl.java
@@ -3,7 +3,6 @@
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.moral.api.entity.HistoryDaily;
-import com.moral.api.entity.HistoryHourly;
import com.moral.api.entity.Sensor;
import com.moral.api.mapper.HistoryDailyMapper;
import com.moral.api.service.HistoryDailyService;
@@ -63,9 +62,13 @@
List<Sensor> sensors = sensorService.list(sensorQueryWrapper);
//������������������������������
- QueryWrapper<HistoryHourly> historyHourlyQueryWrapper = new QueryWrapper<>();
- historyHourlyQueryWrapper.ge("time", DateUtils.dateToDateString(start)).le("time", DateUtils.dateToDateString(end));
- List<Map<String, Object>> dailyData = historyHourlyService.listMaps(historyHourlyQueryWrapper);
+ Map<String, Object> prop = new HashMap<>();
+ String timeUnits = DateUtils.dateToDateString(start, DateUtils.yyyyMM_EN);
+ prop.put("timeUnits", timeUnits);
+ prop.put("start", DateUtils.dateToDateString(start));
+ prop.put("end", DateUtils.dateToDateString(end));
+ List<Map<String, Object>> dailyData = historyHourlyService.selectDailyData(prop);
+
if (dailyData.size() == 0) {
return;
}
--
Gitblit v1.8.0