From c3e1f9b9af29647bd157f2ea268bc56b2d3b9df1 Mon Sep 17 00:00:00 2001
From: 于紫祥_1901 <email@yuzixiang_1910>
Date: Mon, 31 Aug 2020 14:47:46 +0800
Subject: [PATCH] 风场图update
---
src/main/java/com/moral/controller/DemoConreoller.java | 38 ++++++++++++++++++++++++++++++++++++++
1 files changed, 38 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/moral/controller/DemoConreoller.java b/src/main/java/com/moral/controller/DemoConreoller.java
index b4e04d9..1e069ce 100644
--- a/src/main/java/com/moral/controller/DemoConreoller.java
+++ b/src/main/java/com/moral/controller/DemoConreoller.java
@@ -3,6 +3,8 @@
import java.math.BigDecimal;
import java.text.SimpleDateFormat;
import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.temporal.ChronoUnit;
import java.time.temporal.TemporalAdjusters;
import java.util.ArrayList;
import java.util.Arrays;
@@ -17,6 +19,7 @@
import javax.servlet.http.HttpServletRequest;
import org.apache.commons.lang3.time.DateUtils;
+import org.springframework.util.ObjectUtils;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
@@ -26,6 +29,8 @@
import com.moral.common.util.WebUtils;
import com.moral.mapper.AlarmDailyMapper;
import com.moral.mapper.DemoMapper;
+import com.moral.mapper.HistoryMapper;
+
@RestController
@RequestMapping("demo")
@@ -36,6 +41,9 @@
@Resource
private AlarmDailyMapper alarmDailyMapper;
+
+ @Resource
+ private HistoryMapper historyMapper;
@GetMapping("list")
public List<Map<String, Object>> getDatas(HttpServletRequest request){
@@ -98,4 +106,34 @@
return thisMonth;
}
+ /**
+ *
+ * ������������:
+ *
+ * @param: startTime ������������
+ * @param: endTime ������������
+ * @return:
+ * @author: fengxiang
+ * @date: 2018/7/30 11:27
+ */
+ @GetMapping("get-dayaqis")
+ public List<Map<String, Object>> getDayAqis(Date startTime,Date endTime) {
+ return demoMapper.selectByTimeZones(startTime,endTime);
+ }
+
+ @GetMapping("avg")
+ public Map<String, Object> getAvgDatas(HttpServletRequest request){
+ Map<String, Object> parameters = WebUtils.getParametersStartingWith(request, null);
+ parameters.put("sensorKeys", Arrays.asList("e1", "e2", "e3", "e13"));
+ LocalDateTime now = LocalDateTime.now();
+ parameters.put("start", now.minusHours(1).truncatedTo(ChronoUnit.HOURS));
+ parameters.put("end", now.truncatedTo(ChronoUnit.HOURS));
+ List<Map<String, Object>> avgs = historyMapper.getAreaAllDataByAccount(parameters);
+ if (ObjectUtils.isEmpty(avgs)) {
+ return new HashMap<String, Object>();
+ } else {
+ return avgs.get(0);
+ }
+ }
+
}
--
Gitblit v1.8.0