From da1f5f7343539fca6148dd0c4f797f5cf01694a4 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Thu, 15 Oct 2020 14:46:32 +0800
Subject: [PATCH] 根据大屏客户端版本获取版本更新内容
---
src/main/java/com/moral/service/HistoryMinutelyService.java | 5
src/main/java/com/moral/mapper/HistoryMinutelyMapper.java | 3
src/main/resources/mapper/ScreenVersionMapper.xml | 8 +
src/main/resources/mapper/HistoryMinutelyMapper.xml | 64 +++++++-
src/main/java/com/moral/controller/ScreenController.java | 231 +++++++++++++++-----------------
src/main/java/com/moral/service/impl/ScreenVersionImpl.java | 35 +++++
src/main/java/com/moral/mapper/ScreenVersionMapper.java | 12 +
src/main/java/com/moral/service/ScreenVersionService.java | 11 +
src/main/java/com/moral/service/impl/WeatherServiceImpl.java | 24 ++-
9 files changed, 251 insertions(+), 142 deletions(-)
diff --git a/src/main/java/com/moral/controller/ScreenController.java b/src/main/java/com/moral/controller/ScreenController.java
index f7bd691..b86fa8d 100644
--- a/src/main/java/com/moral/controller/ScreenController.java
+++ b/src/main/java/com/moral/controller/ScreenController.java
@@ -162,7 +162,8 @@
@Resource
private DeviceRoadService deviceRoadService;
-
+ @Resource
+ private ScreenVersionService screenVersionService;
/**
* Screen login. ������������
*
@@ -680,21 +681,21 @@
/*
- * ���������monitorPoint=368&mac=p5dnd7a0392018&sensorKey=e92&time=2020-08-11
- * ���������������������������
- * */
+ * ���������monitorPoint=368&mac=p5dnd7a0392018&sensorKey=e92&time=2020-08-11
+ * ���������������������������
+ * */
@GetMapping("report_avg_datas")
public ResultBean<List<Map<String, Object>>> getMonitorPointOrDeviceAvgData(HttpServletRequest request)
throws Exception {
Map<String, Object> parameters = getParametersStartingWith(request, null);
//������������������������������������������������
ParameterUtils.getTimeType4Time(parameters);
- String time1= (String) parameters.get("time");
- String mac1= (String) parameters.get("mac");
- List<Map<String, Object>> list=null;
- if (mac1!=null && mac1.equals("p5dnd7a0392018") && time1.substring(0,4).equals("2019") ){
- list=null;
- }else {
+ String time1 = (String) parameters.get("time");
+ String mac1 = (String) parameters.get("mac");
+ List<Map<String, Object>> list = null;
+ if (mac1 != null && mac1.equals("p5dnd7a0392018") && time1.substring(0, 4).equals("2019")) {
+ list = null;
+ } else {
parameters.put("monitorPointId", parameters.remove("monitorPoint"));
Object sensorKey = parameters.remove("sensorKey");
parameters.put("sensors", Arrays.asList(sensorKey));
@@ -712,8 +713,6 @@
}
return new ResultBean<List<Map<String, Object>>>(list);
}
-
-
@GetMapping("report_alarm_datas")
@@ -862,7 +861,6 @@
List<Map<String, Object>> monitorList = historyMinutelyService.getMonitorPointOrDeviceAvgData(parameters);
List<Map<String, Object>> areaList = hangzhouAqiService.getAreaAvgDataByAreaCode(parameters);
-
if (areaList.isEmpty() && monitorList.isEmpty()) {
return new ResultBean<List<Map<String, Object>>>(resultList);
} else if (areaList.isEmpty()) {
@@ -1062,9 +1060,9 @@
List<MonitorPoint> monitorPoints = monitorPointService.getMonitorPointsAndDevicesByRegion(parameters);
//������������monitorPoint������������������device.getName()������������
for (MonitorPoint monitorPoint : monitorPoints) {
- List<Device> deviceList=monitorPoint.getDevices();
+ List<Device> deviceList = monitorPoint.getDevices();
deviceList.sort((Device o1, Device o2) -> {
- return o1.getName().compareTo(o2.getName());
+ return o1.getName().compareTo(o2.getName());
});
}
return new ResultBean<List<MonitorPoint>>(monitorPoints);
@@ -1511,7 +1509,7 @@
String et = parameters.get("endTime").toString();
String endYearAndDay = et.substring(0, st.lastIndexOf("-"));
String endHour = et.substring(et.lastIndexOf("-") + 1);
- String endTime=endYearAndDay + " " + endHour + ":00:00";
+ String endTime = endYearAndDay + " " + endHour + ":00:00";
/* int endHourValue = Integer.valueOf(endHour);
int startHourValue = Integer.valueOf(startHour);
if (endHourValue <= startHourValue) {
@@ -1923,8 +1921,8 @@
if (minAngle > (Double) longAndLatiList.get(j).get("angle")) {
minAngle = (Double) longAndLatiList.get(j).get("angle");
indexAngle = j;
- }else {
- indexAngle=indexAngle;
+ } else {
+ indexAngle = indexAngle;
}
}
preAngleDeviceList.add(deviceList.get((Integer) longAndLatiList.get(indexAngle).get("h")));
@@ -1962,32 +1960,31 @@
@GetMapping("/allDevice")
@ResponseBody
- public Map<String,List> getAllDevice() {
- List<String> macList=deviceService.getAllMac();
- Map<String,List> latlngMap=new HashMap<String,List>();
- Map devMap=null;
- List list=new ArrayList();
+ public Map<String, List> getAllDevice() {
+ List<String> macList = deviceService.getAllMac();
+ Map<String, List> latlngMap = new HashMap<String, List>();
+ Map devMap = null;
+ List list = new ArrayList();
for (String mac : macList) {
- devMap=new HashMap();
- if (mac!=null){
- Device device=deviceService.byMacGetDevice(mac);
- List list1= LatLngTransformation.Convert_BD09_To_GCJ02(device.getLatitude(),device.getLongitude());
- if (device.getState()!=4+""){
- devMap.put("state",device.getState());
+ devMap = new HashMap();
+ if (mac != null) {
+ Device device = deviceService.byMacGetDevice(mac);
+ List list1 = LatLngTransformation.Convert_BD09_To_GCJ02(device.getLatitude(), device.getLongitude());
+ if (device.getState() != 4 + "") {
+ devMap.put("state", device.getState());
}
- devMap.put("lat",list1.get(1));
- devMap.put("lng",list1.get(0));
- devMap.put("monitorPointId",device.getMonitorPointId());
+ devMap.put("lat", list1.get(1));
+ devMap.put("lng", list1.get(0));
+ devMap.put("monitorPointId", device.getMonitorPointId());
//System.out.println(device);
list.add(devMap);
- }else {
+ } else {
continue;
}
}
- latlngMap.put("latlng",list);
+ latlngMap.put("latlng", list);
return latlngMap;
}
-
@GetMapping("/windAndDeviceData")
@@ -1996,17 +1993,17 @@
Calendar calendar = Calendar.getInstance();
calendar.set(Calendar.MINUTE, (calendar.get(Calendar.MINUTE) - 2));
SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm");
- String time = df.format(calendar.getTime())+":00";
+ String time = df.format(calendar.getTime()) + ":00";
int year = calendar.get(Calendar.YEAR);
int month = calendar.get(Calendar.MONTH) + 1;
String mon;
- if (month<10){
- mon="0"+month;
- }else {
- mon=""+month;
+ if (month < 10) {
+ mon = "0" + month;
+ } else {
+ mon = "" + month;
}
- String table="history_minutely_"+year+mon;
- List list=deviceService.byMonitorIdGetDeviceAndWind(monitorPointId,time,table);
+ String table = "history_minutely_" + year + mon;
+ List list = deviceService.byMonitorIdGetDeviceAndWind(monitorPointId, time, table);
return list;
}
@@ -2017,17 +2014,17 @@
Calendar calendar = Calendar.getInstance();
calendar.set(Calendar.MINUTE, (calendar.get(Calendar.MINUTE) - 2));
SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm");
- String time = df.format(calendar.getTime())+":00";
+ String time = df.format(calendar.getTime()) + ":00";
int year = calendar.get(Calendar.YEAR);
int month = calendar.get(Calendar.MONTH) + 1;
String mon;
- if (month<10){
- mon="0"+month;
- }else {
- mon=""+month;
+ if (month < 10) {
+ mon = "0" + month;
+ } else {
+ mon = "" + month;
}
- String table="history_minutely_"+year+mon;
- List list=deviceService.byMonitorIdGetDeviceAndWindSpecial(monitorPointId,time,table);
+ String table = "history_minutely_" + year + mon;
+ List list = deviceService.byMonitorIdGetDeviceAndWindSpecial(monitorPointId, time, table);
return list;
}
@@ -2078,7 +2075,7 @@
}
@PostMapping("updateForecastWeather")
- public void updateForecastWeather(HttpServletRequest request){
+ public void updateForecastWeather(HttpServletRequest request) {
Map<String, Object> parameters = getParametersStartingWith(request, null);
weatherService.updateForecastWeather(parameters);
}
@@ -2103,10 +2100,10 @@
List<Map<String, Object>> device_sensorList = sensorService.getSensorByDeviceId(device.get("id").toString());
Map<String, Object> device_sensorUnit_map = new HashMap<>();
for (Map<String, Object> device_sensorMap : device_sensorList) {
- device_sensorUnit_map.put(device_sensorMap.get("sensor_key").toString(),device_sensorMap.get("unit"));
+ device_sensorUnit_map.put(device_sensorMap.get("sensor_key").toString(), device_sensorMap.get("unit"));
}
Map<String, String> sensorMap = sensorService.getSensorsMap(parameters);
- if (startTime.length()==10&&endTime.length()==10){
+ if (startTime.length() == 10 && endTime.length() == 10) {
//������������������
Date dd = new Date();
//���������
@@ -2115,7 +2112,7 @@
String nowTime = sim.format(dd);
int days = endTime.compareTo(nowTime);
//System.out.println(days);
- List<String> dayList = DatesUtil.findDaysStr(startTime,endTime);
+ List<String> dayList = DatesUtil.findDaysStr(startTime, endTime);
//System.out.println("dayList:"+dayList);
/*if (days<0){
Date date=null;
@@ -2131,86 +2128,86 @@
endTime=new SimpleDateFormat("yyyy-MM-dd").format(calendar.getTime());
}*/
List<Map<String, Object>> sameDayHourlyList = null;
- if (days>=0){
+ if (days >= 0) {
SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
//������������������������
String currentTime = df.format(dd);
- sameDayHourlyList = historyHourlyService.getDataByTimeSlot(mac,nowTime,currentTime);
+ sameDayHourlyList = historyHourlyService.getDataByTimeSlot(mac, nowTime, currentTime);
}
- List<Map<String, Object>> dataList = historyDailyService.getDataByTimeSlot(mac,startTime,endTime);
- if (dataList.isEmpty()){
+ List<Map<String, Object>> dataList = historyDailyService.getDataByTimeSlot(mac, startTime, endTime);
+ if (dataList.isEmpty()) {
return null;
}
Set<String> keys = sensorMap.keySet();
- for (String key:keys) {
- Map<String,Object> oneSensorMap = new LinkedHashMap<>();
- oneSensorMap.put("monitorPointName",monitorPointMap.get("name"));
- oneSensorMap.put("deviceName",device.get("name"));
- oneSensorMap.put("sersorKey",sensorMap.get(key)+"���"+device_sensorUnit_map.get(key)+"���");
- for (String day:dayList) {
- for (Map<String, Object> dataMap: dataList) {
+ for (String key : keys) {
+ Map<String, Object> oneSensorMap = new LinkedHashMap<>();
+ oneSensorMap.put("monitorPointName", monitorPointMap.get("name"));
+ oneSensorMap.put("deviceName", device.get("name"));
+ oneSensorMap.put("sersorKey", sensorMap.get(key) + "���" + device_sensorUnit_map.get(key) + "���");
+ for (String day : dayList) {
+ for (Map<String, Object> dataMap : dataList) {
JSONObject dataJson = JSONObject.parseObject(dataMap.get("json").toString());
- if (dataMap.get("time").toString().equals(day+" 00:00:00.0")){
- oneSensorMap.put(dataMap.get("time").toString().substring(0,10),dataJson.getJSONArray(key).get(2));
+ if (dataMap.get("time").toString().equals(day + " 00:00:00.0")) {
+ oneSensorMap.put(dataMap.get("time").toString().substring(0, 10), dataJson.getJSONArray(key).get(2));
break;
- }else {
+ } else {
continue;
}
}
- if(!oneSensorMap.containsKey(day)){
- oneSensorMap.put(day,"");
+ if (!oneSensorMap.containsKey(day)) {
+ oneSensorMap.put(day, "");
}
}
Double avg = 0.0;
- if (sameDayHourlyList != null){
- for (Map sameDayHourlyMap:sameDayHourlyList){
+ if (sameDayHourlyList != null) {
+ for (Map sameDayHourlyMap : sameDayHourlyList) {
List<Double> arr = new ArrayList<>();
JSONObject hourlyJson = JSONObject.parseObject(sameDayHourlyMap.get("json").toString());
arr.add(Double.parseDouble(hourlyJson.getJSONArray(key).get(2).toString()));
Double sum = 0.0;
- for (int i=0;i<arr.size();i++){
+ for (int i = 0; i < arr.size(); i++) {
sum += arr.get(i);
}
avg = sum / arr.size();
}
- oneSensorMap.put(nowTime,avg);
+ oneSensorMap.put(nowTime, avg);
}
list.add(oneSensorMap);
}
- }else if (startTime.length()==13&&endTime.length()==13){
+ } else if (startTime.length() == 13 && endTime.length() == 13) {
StringBuilder startTime_sb = new StringBuilder(startTime);
- startTime_sb.replace(10,11," ");
- startTime = startTime_sb.toString()+":00:00";
+ startTime_sb.replace(10, 11, " ");
+ startTime = startTime_sb.toString() + ":00:00";
StringBuilder endTime_sb = new StringBuilder(endTime);
- endTime_sb.replace(10,11," ");
- endTime = endTime_sb.toString()+":00:00";
+ endTime_sb.replace(10, 11, " ");
+ endTime = endTime_sb.toString() + ":00:00";
- List<String> hoursList = DatesUtil.findHoursStr(startTime,endTime);
+ List<String> hoursList = DatesUtil.findHoursStr(startTime, endTime);
//System.out.println("hoursList:"+hoursList);
- List<Map<String, Object>> hourlyList = historyHourlyService.getDataByTimeSlot(mac,startTime,endTime);
- if (hourlyList.isEmpty()){
+ List<Map<String, Object>> hourlyList = historyHourlyService.getDataByTimeSlot(mac, startTime, endTime);
+ if (hourlyList.isEmpty()) {
return null;
}
Set<String> keys = sensorMap.keySet();
- for (String key:keys) {
- Map<String,Object> oneSensorMap = new LinkedHashMap<>();
- oneSensorMap.put("monitorPointName",monitorPointMap.get("name"));
- oneSensorMap.put("deviceName",device.get("name"));
- oneSensorMap.put("sersorKey",sensorMap.get(key)+"���"+device_sensorUnit_map.get(key)+"���");
- for (String hour:hoursList) {
- for (Map<String, Object> hourlyMap: hourlyList) {
+ for (String key : keys) {
+ Map<String, Object> oneSensorMap = new LinkedHashMap<>();
+ oneSensorMap.put("monitorPointName", monitorPointMap.get("name"));
+ oneSensorMap.put("deviceName", device.get("name"));
+ oneSensorMap.put("sersorKey", sensorMap.get(key) + "���" + device_sensorUnit_map.get(key) + "���");
+ for (String hour : hoursList) {
+ for (Map<String, Object> hourlyMap : hourlyList) {
JSONObject dataJson = JSONObject.parseObject(hourlyMap.get("json").toString());
- if (hourlyMap.get("time").toString().equals(hour+".0")){
- oneSensorMap.put(hourlyMap.get("time").toString().substring(0,19),dataJson.getJSONArray(key).get(2));
+ if (hourlyMap.get("time").toString().equals(hour + ".0")) {
+ oneSensorMap.put(hourlyMap.get("time").toString().substring(0, 19), dataJson.getJSONArray(key).get(2));
break;
- }else {
+ } else {
continue;
}
}
- if(!oneSensorMap.containsKey(hour)){
- oneSensorMap.put(hour,"");
+ if (!oneSensorMap.containsKey(hour)) {
+ oneSensorMap.put(hour, "");
}
}
/*for (Map<String, Object> hourlyMap: hourlyList) {
@@ -2220,12 +2217,11 @@
}*/
list.add(oneSensorMap);
}
- }else {
+ } else {
return null;
}
return new ResultBean<List<Map<String, Object>>>(list);
}
-
@GetMapping("/contrastFactor")
@@ -2236,41 +2232,36 @@
@ApiImplicitParam(name = "time", value = "������(���������2020-03-19���20���21)", required = true, paramType = "query", dataType = "String")})
public ResultBean<List<Map<String, Object>>> contrastFactor(HttpServletRequest request) throws Exception {
Map<String, Object> parameters = getParametersStartingWith(request, null);
- List list=historyHourlyService.getDataByMacAndTime(parameters);
+ List list = historyHourlyService.getDataByMacAndTime(parameters);
//System.out.println(list);
return new ResultBean<List<Map<String, Object>>>(list);
}
@GetMapping("/getAlarm")
@ResponseBody
- public List<DeviceRoad> getAlarm(@Param("windData") String windData,@Param("code") String code,@Param("mac") String mac,@Param("speedLevel")String speedLevel){
+ public List<DeviceRoad> getAlarm(@Param("windData") String windData, @Param("code") String code, @Param("mac") String mac, @Param("speedLevel") String speedLevel) {
List<DeviceRoad> alarmData = deviceRoadService.getAlarmData(windData, code, mac, speedLevel);
return alarmData;
-}
+ }
- /* @GetMapping("/lianxian")
- @ApiOperation(value = "������", notes = "������" )
+ @GetMapping("multiDeviceSensor")
+ @ApiOperation(value = "���������������������", notes = "���������������������")
@ApiImplicitParams(value = {
- @ApiImplicitParam(name = "lonAndLat", value = "���������", required = true, paramType = "query", dataType = "String")})
- public ModelAndView lianxian(HttpServletRequest request,ModelAndView model) throws Exception {
+ @ApiImplicitParam(name = "monitorPoint", value = "���������id", required = true, paramType = "query", dataType = "String"),
+ @ApiImplicitParam(name = "macs", value = "������mac,���������������������������", required = true, paramType = "query", dataType = "String"),
+ @ApiImplicitParam(name = "sensorKey", value = "���������key", required = true, paramType = "query", dataType = "String"),
+ @ApiImplicitParam(name = "time", value = "������,������(���������2018-03-12)", required = true, paramType = "query", dataType = "String"),})
+ public ResultBean<List<Map<String, Object>>> multiDeviceSensor(HttpServletRequest request) throws Exception {
Map<String, Object> parameters = getParametersStartingWith(request, null);
- String mac= (String) parameters.get("lonAndLat");
- String[] ll= mac.split(",");
+ ParameterUtils.getTimeType4Time(parameters);
+ List<Map<String, Object>> multiDeviceSensorData = historyMinutelyService.getMultiDeviceSensorData(parameters);
+ return new ResultBean<List<Map<String, Object>>>(multiDeviceSensorData);
+ }
- JSONObject params = new JSONObject();
- params.put("ll",ll);
- Double[] array= {116.885217,38.299148};
- Double[] array1= {116.87061,38.322828};
- Double[] array2= {116.855206,38.325162};
- Double distance1=mapUtils.getDistance(Double.parseDouble(ll[0]),Double.parseDouble(ll[1]),116.885217,38.299148);
- Double distance2=mapUtils.getDistance(Double.parseDouble(ll[0]),Double.parseDouble(ll[1]),116.87061,38.322828);
- Double distance3=mapUtils.getDistance(Double.parseDouble(ll[0]),Double.parseDouble(ll[1]),116.855206,38.325162);
-
- params.put("mt",distance1);
- params.put("mt1",distance2);
- params.put("mt2",distance3);
- model.addObject("params", params);
- model.setViewName("lianxian");
- return model;
- }*/
+ @GetMapping("screenVersion")
+ public Map<String, Object> getScreenVersion(HttpServletRequest request) {
+ Map<String, Object> parameters = getParametersStartingWith(request, null);
+ String version = parameters.get("version").toString();
+ return screenVersionService.getScreenVersion(version);
+ }
}
diff --git a/src/main/java/com/moral/mapper/HistoryMinutelyMapper.java b/src/main/java/com/moral/mapper/HistoryMinutelyMapper.java
index 516b9ec..ca65349 100644
--- a/src/main/java/com/moral/mapper/HistoryMinutelyMapper.java
+++ b/src/main/java/com/moral/mapper/HistoryMinutelyMapper.java
@@ -32,6 +32,7 @@
List<Map<String, Object>> getDevicesSensorsAvgDataToExcel(Map<String, Object> parameters);
- Map<String,Object> get5MiutesOrHalfHourByDay(Map<String, Object> parameters);
+ Map<String, Object> get5MiutesOrHalfHourByDay(Map<String, Object> parameters);
+ List<Map<String, Object>> getMultiDeviceSensorData(Map<String, Object> parameters);
}
diff --git a/src/main/java/com/moral/mapper/ScreenVersionMapper.java b/src/main/java/com/moral/mapper/ScreenVersionMapper.java
new file mode 100644
index 0000000..561a621
--- /dev/null
+++ b/src/main/java/com/moral/mapper/ScreenVersionMapper.java
@@ -0,0 +1,12 @@
+package com.moral.mapper;
+
+import java.util.Map;
+
+import com.moral.common.mapper.BaseMapper;
+import com.moral.entity.Area;
+
+public interface ScreenVersionMapper extends BaseMapper<Area> {
+
+ Map<String,Object> getScreenVersion(String version);
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/moral/service/HistoryMinutelyService.java b/src/main/java/com/moral/service/HistoryMinutelyService.java
index 9c60e09..b4ccde5 100644
--- a/src/main/java/com/moral/service/HistoryMinutelyService.java
+++ b/src/main/java/com/moral/service/HistoryMinutelyService.java
@@ -17,6 +17,9 @@
List<Map<String, Object>> getMonitorPointOrDeviceAvgData(Map<String, Object> parameters) throws Exception;
+ List<Map<String, Object>> get(Map<String, Object> parameters) throws Exception;
+
+
Map<String, Object> getMonthAverageBySensor(Map<String, Object> parameters);
Map<String, Object> getAverageBySensor(Map<String, Object> parameters);
@@ -33,4 +36,6 @@
List<Map<String,Object>> get5MinutesOrHalfHour(Map<String, Object> parameters) throws ParseException;
+ List<Map<String, Object>> getMultiDeviceSensorData(Map<String, Object> parameters) throws Exception;
+
}
diff --git a/src/main/java/com/moral/service/ScreenVersionService.java b/src/main/java/com/moral/service/ScreenVersionService.java
new file mode 100644
index 0000000..f2adaf0
--- /dev/null
+++ b/src/main/java/com/moral/service/ScreenVersionService.java
@@ -0,0 +1,11 @@
+package com.moral.service;
+
+import java.util.List;
+import java.util.Map;
+
+
+public interface ScreenVersionService {
+
+ Map<String, Object> getScreenVersion(String version);
+
+}
diff --git a/src/main/java/com/moral/service/impl/ScreenVersionImpl.java b/src/main/java/com/moral/service/impl/ScreenVersionImpl.java
new file mode 100644
index 0000000..0f3abfe
--- /dev/null
+++ b/src/main/java/com/moral/service/impl/ScreenVersionImpl.java
@@ -0,0 +1,35 @@
+package com.moral.service.impl;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.annotation.Resource;
+
+import org.springframework.stereotype.Service;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.moral.mapper.ScreenVersionMapper;
+import com.moral.service.ScreenVersionService;
+
+@Service
+public class ScreenVersionImpl implements ScreenVersionService {
+
+ @Resource
+ private ScreenVersionMapper screenVersionMapper;
+
+ @Override
+ public Map<String, Object> getScreenVersion(String version) {
+ Map<String, Object> data = screenVersionMapper.getScreenVersion(version);
+ Map<String, Object> map = (Map<String, Object>) JSON.parse(data.get("content").toString());
+ Map<String, Object> resultMap = new HashMap<>();
+ List<String> values = new ArrayList<>();
+ for (String key : map.keySet()) {
+ values.add(map.get(key).toString());
+ }
+ resultMap.put("data", values);
+ return resultMap;
+ }
+}
diff --git a/src/main/java/com/moral/service/impl/WeatherServiceImpl.java b/src/main/java/com/moral/service/impl/WeatherServiceImpl.java
index a370f6e..8c83b3b 100644
--- a/src/main/java/com/moral/service/impl/WeatherServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/WeatherServiceImpl.java
@@ -797,20 +797,28 @@
if (rhour == nowHour) {
Map<String, Object> sumO3Map = hangzhouAqiMapper.getSumO3(hashMap);
- double v = value - Double.valueOf(sumO3Map.get("O3Sum").toString());
- resultMap.put("goodValue", v);
+ if (sumO3Map != null) {
+ double v = value - Double.valueOf(sumO3Map.get("O3Sum").toString());
+ resultMap.put("goodValue", v);
+ }
} else if (rhour == nowHour + 1) {
Map<String, Object> sumO3Map = hangzhouAqiMapper.getSumO3(hashMap);
- double v = (value - Double.valueOf(sumO3Map.get("O3Sum").toString())) / 2;
- resultMap.put("goodValue", String.valueOf(Math.round(v)));
+ if (sumO3Map != null) {
+ double v = (value - Double.valueOf(sumO3Map.get("O3Sum").toString())) / 2;
+ resultMap.put("goodValue", String.valueOf(Math.round(v)));
+ }
} else if (rhour == nowHour + 2) {
Map<String, Object> sumO3Map = hangzhouAqiMapper.getSumO3(hashMap);
- double v = (value - Double.valueOf(sumO3Map.get("O3Sum").toString())) / 3;
- resultMap.put("goodValue", String.valueOf(Math.round(v)));
+ if (sumO3Map != null) {
+ double v = (value - Double.valueOf(sumO3Map.get("O3Sum").toString())) / 3;
+ resultMap.put("goodValue", String.valueOf(Math.round(v)));
+ }
} else if (rhour == nowHour + 3) {
Map<String, Object> sumO3Map = hangzhouAqiMapper.getSumO3(hashMap);
- double v = (value - Double.valueOf(sumO3Map.get("O3Sum").toString())) / 4;
- resultMap.put("goodValue", String.valueOf(Math.round(v)));
+ if (sumO3Map != null) {
+ double v = (value - Double.valueOf(sumO3Map.get("O3Sum").toString())) / 4;
+ resultMap.put("goodValue", String.valueOf(Math.round(v)));
+ }
}
}
}
diff --git a/src/main/resources/mapper/HistoryMinutelyMapper.xml b/src/main/resources/mapper/HistoryMinutelyMapper.xml
index 07749a1..252008c 100644
--- a/src/main/resources/mapper/HistoryMinutelyMapper.xml
+++ b/src/main/resources/mapper/HistoryMinutelyMapper.xml
@@ -276,21 +276,21 @@
FROM
history_${timeUnits} h inner join
(select mac from device where monitor_point_id in
- (
- select id from monitor_point
- where
- <if test="areaCode != null">
- area_code = #{areaCode}
- </if>
+ (
+ select id from monitor_point
+ where
+ <if test="areaCode != null">
+ area_code = #{areaCode}
+ </if>
- <if test="cityCode != null">
- city_code = #{cityCode}
- </if>
+ <if test="cityCode != null">
+ city_code = #{cityCode}
+ </if>
- <if test="provinceCode != null">
- province_code = #{provinceCode}
- </if>
- )
+ <if test="provinceCode != null">
+ province_code = #{provinceCode}
+ </if>
+ )
and is_delete=0) m
on h.mac=m.mac
and h.time>=#{start}
@@ -298,4 +298,42 @@
ORDER BY
h.time
</select>
+
+ <select id="getMultiDeviceSensorData" resultType="java.util.Map">
+ SELECT
+ DATE_FORMAT(time, #{typeFormat}) time,
+ <foreach collection="macs" separator="," item="mac" index="index">
+ AVG(json->'$.${sensorKey}[0]') AS '${index}${sensorKey}'
+ </foreach>
+ FROM
+ history_${timeUnits}
+ WHERE
+ <foreach collection="macs" separator="," item="mac" index="index">
+ mac = #{mac}
+ </foreach>
+ AND time >= #{start}
+ AND h.time <![CDATA[<]]> #{end}
+ GROUP BY
+ DATE_FORMAT(time, #{typeFormat})
+ ORDER BY
+ time
+ </select>
+
+ <select id="getMultiDeviceSensorData1" resultType="java.util.Map">
+ SELECT *
+ from
+ <foreach collection="macs" separator="," item="mac" index="index">
+ (SELECT
+ AVG(json->'$.${sensorKey}[0]') AS '${index}${sensorKey}',
+ DATE_FORMAT(time,'%Y-%m') as time
+ FROM history_${timeUnits}
+ WHERE mac=#{mac}
+ AND time >= #{start}
+ AND time <![CDATA[<]]> #{end}
+ GROUP BY DATE_FORMAT(time,#{typeFormat})
+ ORDER BY
+ time) as t${index}
+ </foreach>
+ WHERE t1.time=t2.time
+ </select>
</mapper>
diff --git a/src/main/resources/mapper/ScreenVersionMapper.xml b/src/main/resources/mapper/ScreenVersionMapper.xml
new file mode 100644
index 0000000..531337e
--- /dev/null
+++ b/src/main/resources/mapper/ScreenVersionMapper.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.moral.mapper.ScreenVersionMapper" >
+ <select id="getScreenVersion" resultType="java.util.Map">
+ select content from screen_version
+ where version = #{version}
+ </select>
+</mapper>
\ No newline at end of file
--
Gitblit v1.8.0