From 51a036ff495cec0a10a372450598356da6698cba Mon Sep 17 00:00:00 2001
From: xufenglei <xufenglei>
Date: Wed, 18 Jul 2018 08:50:39 +0800
Subject: [PATCH] 污染管控
---
src/main/java/com/moral/controller/DemoConreoller.java | 29 ++++++++++++++++++++++++++++-
1 files changed, 28 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/moral/controller/DemoConreoller.java b/src/main/java/com/moral/controller/DemoConreoller.java
index bb68cb2..dfd14a8 100644
--- a/src/main/java/com/moral/controller/DemoConreoller.java
+++ b/src/main/java/com/moral/controller/DemoConreoller.java
@@ -1,5 +1,9 @@
package com.moral.controller;
+import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.time.temporal.TemporalAdjusters;
+import java.util.Arrays;
import java.util.Collections;
import java.util.Comparator;
import java.util.Date;
@@ -7,11 +11,14 @@
import java.util.Map;
import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
+import com.moral.common.util.WebUtils;
+import com.moral.mapper.AlarmDailyMapper;
import com.moral.mapper.DemoMapper;
@RestController
@@ -20,7 +27,10 @@
@Resource
private DemoMapper demoMapper;
-
+
+ @Resource
+ private AlarmDailyMapper alarmDailyMapper;
+
@GetMapping("list")
public List<Map<String, Object>> getDatas(){
List<Map<String, Object>> list = demoMapper.getDatas();
@@ -32,4 +42,21 @@
});
return list;
}
+
+ @GetMapping("pollution")
+ public List<Map<String, Object>> getPollutionDatas(HttpServletRequest request){
+ Map<String, Object> parameters = WebUtils.getParametersStartingWith(request, null);
+ Object sensorKey = parameters.get("sensorKey");
+ parameters.put("sensorKeys", Arrays.asList(sensorKey));
+ parameters.put("start", LocalDate.now().with(TemporalAdjusters.firstDayOfMonth()));
+ parameters.put("end", LocalDate.now().with(TemporalAdjusters.firstDayOfNextMonth()));
+ List<Map<String, Object>> alarmData = alarmDailyMapper.getAlarmData(parameters);
+ Collections.sort(alarmData, new Comparator<Map<String, Object>>() {
+ @Override
+ public int compare(Map<String, Object> o1, Map<String, Object> o2) {
+ return ((BigDecimal) o2.get(sensorKey)).compareTo((BigDecimal) o1.get(sensorKey));
+ }
+ });
+ return alarmData;
+ }
}
--
Gitblit v1.8.0