From 8beab91730f3e3cd6b53e4d498f763ff9dc65ef5 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Wed, 18 Nov 2020 14:16:55 +0800
Subject: [PATCH] 修改污染溯源接口，从history表中获取改为从history天表获取
---
src/main/java/com/moral/controller/ScreenController.java | 489 ++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 456 insertions(+), 33 deletions(-)
diff --git a/src/main/java/com/moral/controller/ScreenController.java b/src/main/java/com/moral/controller/ScreenController.java
index 40c2ba1..3fa1e6e 100644
--- a/src/main/java/com/moral/controller/ScreenController.java
+++ b/src/main/java/com/moral/controller/ScreenController.java
@@ -2,8 +2,10 @@
import java.io.*;
import java.lang.reflect.Array;
+import java.net.URLEncoder;
import java.text.DateFormat;
import java.text.DecimalFormat;
+import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
@@ -44,6 +46,7 @@
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
+import io.swagger.models.auth.In;
import jdk.nashorn.internal.runtime.regexp.joni.Regex;
import net.sf.json.JSONString;
@@ -167,6 +170,9 @@
@Resource
private ScreenVersionService screenVersionService;
+
+ @Resource
+ private DeviceAdjustValueTimingService deviceAdjustValueTimingService;
/**
* Screen login. ������������
@@ -695,6 +701,9 @@
//������������������������������������������������
ParameterUtils.getTimeType4Time(parameters);
String time1 = (String) parameters.get("time");
+ time1 = time1.replaceAll(" ", "");
+ parameters.put("time",time1);
+
String mac1 = (String) parameters.get("mac");
List<Map<String, Object>> list = null;
if (mac1 != null && mac1.equals("p5dnd7a0392018") && time1.substring(0, 4).equals("2019")) {
@@ -705,13 +714,42 @@
parameters.put("sensors", Arrays.asList(sensorKey));
// monitorPointService.isCompensateCalculation(parameters);
list = historyMinutelyService.getMonitorPointOrDeviceAvgData(parameters);
+
+
+ /* 0���������������������11������������0���������������������1-24������������������������0������������������������������������24������������
+ ������������������24���������������23-24���������24������������������������0���������������
+ */
+ /*������������start-------------------------------------------------------------------------*/
+ list.remove(0);
+ if (list.size() == 23) {
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ SimpleDateFormat sdf2 = new SimpleDateFormat("yyyy-MM-dd");
+ //���������������������yyyy-MM-dd HH:mm:ss
+ time1 = time1 + " 00:00:00";
+ Date date = sdf.parse(time1);
+ date = DateUtil.rollDay(date, 1);
+ //������������������������
+ String time2 = sdf2.format(date);
+ parameters.put("time", time2);
+ /*���������������0������������������24���������������������������*/
+ List<Map<String, Object>> nextDayList = historyMinutelyService.getMonitorPointOrDeviceAvgData(parameters);
+ if(!ObjectUtils.isEmpty(nextDayList)){
+ time1=time1.replaceAll(" 00:00:00"," 24");
+ Map<String, Object> datas = nextDayList.get(0);
+ datas.put("time",time1);
+ list.add(datas);
+ }
+ }
+ /*������������end-------------------------------------------------------------------------*/
+
+
for (Map<String, Object> map : list) {
String time = map.get("time").toString();
time = time.substring(time.length() - 2);
map.put("time", Integer.valueOf(time));
- if (parameters.get("type").equals("day")) {
+ /* if (parameters.get("type").equals("day")) {
map.put("time", Integer.valueOf(time) + 1);
- }
+ }*/
map.put("value", map.remove(sensorKey));
}
}
@@ -1061,7 +1099,34 @@
public ResultBean<List<MonitorPoint>> getMonitorPointsAndDevicesByRegion(HttpServletRequest request)
throws Exception {
Map<String, Object> parameters = WebUtils.getParametersStartingWith(request, null);
+ String regionCode = parameters.get("regionCode").toString();
List<MonitorPoint> monitorPoints = monitorPointService.getMonitorPointsAndDevicesByRegion(parameters);
+
+ //������������������������������
+ if (regionCode.startsWith("1309")) {
+ List<Integer> orgIds = new ArrayList<>();
+ Collections.addAll(orgIds, 60, 65, 159, 165, 166);
+ Iterator<MonitorPoint> iter = monitorPoints.iterator();
+ while (iter.hasNext()) {
+ MonitorPoint next = iter.next();
+ Integer mpId = next.getId();
+ Integer orgId = next.getOrganizationId();
+ if (!orgIds.contains(orgId)) {
+ iter.remove();
+ } else {
+ if (orgId == 60) {
+ if (mpId != 56) {
+ iter.remove();
+ }
+ } else if (orgId == 65) {
+ if (mpId != 83 && mpId != 84) {
+ iter.remove();
+ }
+ }
+ }
+ }
+ }
+
//������������monitorPoint������������������device.getName()������������
for (MonitorPoint monitorPoint : monitorPoints) {
List<Device> deviceList = monitorPoint.getDevices();
@@ -1422,12 +1487,13 @@
public ModelAndView pollutionSource(ModelAndView model, HttpServletRequest request) throws Exception {
Map<String, Object> parameters = WebUtils.getParametersStartingWith(request, null);
String timeStr = parameters.get("time").toString();
- String YearAndDay = timeStr.substring(0, timeStr.lastIndexOf("-"));
+ String yearAndDay = timeStr.substring(0, timeStr.lastIndexOf("-"));
String Hour = timeStr.substring(timeStr.lastIndexOf("-") + 1);
- String time = YearAndDay + " " + Hour + ":00:00";
+ String time = yearAndDay + " " + Hour + ":00:00";
DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
LocalDateTime timeLocalDateTime = LocalDateTime.parse(time, dateTimeFormatter);
int month = timeLocalDateTime.getMonth().getValue();
+ parameters.put("yearAndDay",yearAndDay);
Point dirPoint = historyHourlyService.getDirPoint(parameters);
Map<String, Object> getPollutionSourceData = historyHourlyService.getPollutionSourceDataByHour(parameters);
if (MapUtils.isEmpty(getPollutionSourceData)) {
@@ -1997,7 +2063,7 @@
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;
@@ -2007,7 +2073,7 @@
mon = "" + month;
}
String table = "history_minutely_" + year + mon;
- List list = deviceService.byMonitorIdGetDeviceAndWind(monitorPointId, time, table);
+ List list = deviceService.byMonitorIdGetDeviceAndWind(monitorPointId, table);
return list;
}
@@ -2028,7 +2094,7 @@
mon = "" + month;
}
String table = "history_minutely_" + year + mon;
- List list = deviceService.byMonitorIdGetDeviceAndWindSpecial(monitorPointId, time, table);
+ List list = deviceService.byMonitorIdGetDeviceAndWindSpecial(monitorPointId, table);
return list;
}
@@ -2152,7 +2218,7 @@
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));
+ oneSensorMap.put(dataMap.get("time").toString().substring(0, 10), dataJson.getJSONArray(key).get(0));
break;
} else {
continue;
@@ -2168,7 +2234,7 @@
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()));
+ arr.add(Double.parseDouble(hourlyJson.getJSONArray(key).get(0).toString()));
Double sum = 0.0;
for (int i = 0; i < arr.size(); i++) {
sum += arr.get(i);
@@ -2204,8 +2270,10 @@
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));
- break;
+ if (dataJson.getJSONArray(key) != null) {
+ oneSensorMap.put(hourlyMap.get("time").toString().substring(0, 19), dataJson.getJSONArray(key).get(0));
+ break;
+ }
} else {
continue;
}
@@ -2261,9 +2329,250 @@
return new ResultBean<List<Map<String, Object>>>(list);
}
- /*
- * ���������������������������������������������
- */
+
+ @PostMapping("/tellAlarm")
+ @ResponseBody
+ public List<List> tellAlarm(String states, String orgId, String accountId, String states1, String regionCode) {
+ JSONArray stateList = JSONArray.parseArray(states);//���������������������
+ JSONArray stateList1 = JSONArray.parseArray(states1);//���10������������������
+ List<List> lookList = new ArrayList<>();
+ Map params = new HashMap();
+ String lookString = "";
+ //������������������������������������������������������������������������������
+ //���������������������������������������null
+ if (stateList1 != null && !states.equals(states1)) {
+ List<Map> listDevice = JSONObject.parseArray(stateList.toJSONString(), Map.class);
+ List<Map> listDevice1 = JSONObject.parseArray(stateList1.toJSONString(), Map.class);
+ //���������������������������������������
+ List<Map> deviceList = new ArrayList<Map>();
+ List<Map> deviceList1 = new ArrayList<Map>();
+ //���������������������id
+ List orgList = new ArrayList();
+ for (Map devices : listDevice) {
+ int monitorId = Integer.parseInt((String) devices.get("id"));
+ MonitorPoint monitorPoint = monitorPointService.byIdGetMonitorPoint(monitorId);
+ int org_id = monitorPoint.getOrganizationId();
+ orgList.add(org_id);
+ List<Map> devicesList = (List<Map>) devices.get("devices");
+ if (!devicesList.isEmpty()) {
+ if (devicesList.size() > 1) {
+ for (Map map : devicesList) {
+ deviceList.add(map);
+ }
+ } else {
+ deviceList.add((Map) ((List) devices.get("devices")).get(0));
+ }
+ }
+ }
+ for (Map devices1 : listDevice1) {
+ int monitorId = Integer.parseInt((String) devices1.get("id"));
+ MonitorPoint monitorPoint = monitorPointService.byIdGetMonitorPoint(monitorId);
+ int org_id = monitorPoint.getOrganizationId();
+ List<Map> devicesList = (List<Map>) devices1.get("devices");
+ if (!devicesList.isEmpty()) {
+ if (devicesList.size() > 1) {
+ for (Map map : devicesList) {
+ deviceList1.add(map);
+ }
+ } else {
+ deviceList1.add((Map) ((List) devices1.get("devices")).get(0));
+ }
+ }
+ }
+ List<String> macList = new ArrayList<String>();
+ //������������������������������������������mac���
+ for (Map map : deviceList) {
+ String state = (String) map.get("state");
+ String mac = (String) map.get("mac");
+ for (Map map1 : deviceList1) {
+ String state1 = (String) map1.get("state");
+ String mac1 = (String) map1.get("mac");
+ if (mac.equals(mac1)) {
+ if (Integer.parseInt(state) > Integer.parseInt(state1) && Integer.parseInt(state) != 4 /*&& Integer.parseInt(state1) == 0*/) {
+ macList.add(mac + "-" + state + "-" + state1);
+ }
+ }
+ }
+ }
+ //������������������������
+ LinkedHashSet<Integer> orgS = new LinkedHashSet<Integer>(orgList);
+ SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ Date date = new Date(System.currentTimeMillis());
+ Date date1 = new Date(System.currentTimeMillis() - 1000);
+ //������������������
+ String time = formatter.format(date);
+ //������������������������������
+ String time1 = formatter.format(date1);
+ List<Map> alarmList = new ArrayList<Map>();
+ for (Integer org : orgS) {
+ int orgNum = alarmConfigService.containOrgId(org);
+ Map<String, Object> eMap = new HashMap<String, Object>();
+ if (orgNum == 1) {
+ String alarmConfig = alarmConfigService.getValueByOrganizationId(Integer.parseInt(String.valueOf(org)));
+ Map hashMap = JSON.parseObject(alarmConfig, HashMap.class);
+ Map alarmLevels = (Map) hashMap.get("alarmLevels");
+ //������������������������106���������
+ for (int i = 1; i < 106; i++) {
+ if (alarmLevels.containsKey("e" + i)) {
+ Map map = (Map) alarmLevels.get("e" + i);
+ if (!map.isEmpty()) {
+ Integer enable = (Integer) map.get("enable");
+ List increment = (List) map.get("increment");
+ if (enable == 1) {
+ if (!(increment.get(0).toString().equals("0") && increment.get(1).toString().equals("0"))) {
+ eMap.put("e" + i, increment);
+ } else {
+ continue;
+ }
+ } else {
+ continue;
+ }
+ }
+ }
+ }
+ } else {
+ String defultAlarm = dictionaryDataService.getDefultAlarm();
+ Map hashMap = JSON.parseObject(defultAlarm, HashMap.class);
+ Map alarmLevels = (Map) hashMap.get("alarmLevels");
+ //������������������������106���������
+ for (int i = 1; i < 106; i++) {
+ if (alarmLevels.containsKey("e" + i)) {
+ Map map = (Map) alarmLevels.get("e" + i);
+ if (!map.isEmpty()) {
+ Integer enable = (Integer) map.get("enable");
+ List increment = (List) map.get("increment");
+ if (enable == 1) {
+ if (!(increment.get(0).toString().equals("0") && increment.get(1).toString().equals("0"))) {
+ eMap.put("e" + i, increment);
+ } else {
+ continue;
+ }
+ } else {
+ continue;
+ }
+ }
+ }
+ }
+ }
+ Map map = new HashMap();
+ map.put("eMap", eMap);
+ map.put("org", org);
+ alarmList.add(map);
+ }
+ for (Map aEMap : alarmList) {
+ List<Map> values = new ArrayList<Map>();
+ if (macList.size() > 0) {
+ for (String sMac : macList) {
+ String[] aMac = sMac.split("-");
+ String mac = aMac[0];
+ //������������������������������������������������������������������������������������������������������������������������������������������������
+ String value = historyService.getValueByMacAndTime(mac, time, time1);
+ Map<String, String> map = new HashMap<String, String>();
+ if (value == null) {
+ Date date2 = new Date(System.currentTimeMillis() - 2000);
+ //������������������������������
+ String time2 = formatter.format(date1);
+ value = historyService.getValueByMacAndTime(mac, time, time2);
+ if (value == null) {
+ Date date3 = new Date(System.currentTimeMillis() - 3000);
+ //������������������������������
+ String time3 = formatter.format(date1);
+ value = historyService.getValueByMacAndTime(mac, time, time3);
+ }
+ }
+ if (value != null) {
+ map.put("mac", mac);
+ map.put("value", value);
+ map.put("state", aMac[1]);
+ map.put("state1", aMac[2]);
+ values.add(map);
+ } else {
+ continue;
+ }
+ }
+ }
+
+ if (values.size() > 0 && values.size() == macList.size()) {
+ for (Map dataMap : values) {
+ String oId = deviceService.byMacGetOrgId((String) dataMap.get("mac"));
+ if (!(aEMap.get("org").toString()).equals(oId)) {
+ continue;
+ }
+ List<String> list = new ArrayList<String>();
+ Map sensorMap = JSONObject.parseObject((String) dataMap.get("value"));
+ Iterator<String> iter = sensorMap.keySet().iterator();
+ while (iter.hasNext()) {
+ String key = iter.next();
+ list.add(key);
+ }
+ String state = (String) dataMap.get("state");
+ String state1 = (String) dataMap.get("state1");
+ List<Map> mapList = new ArrayList();
+ for (String key : list) {
+ if (((Map) aEMap.get("eMap")).containsKey(key)) {
+ Double val = Double.valueOf(sensorMap.get(key).toString());
+ List valueList = (List) ((Map) aEMap.get("eMap")).get(key);
+ Device device = deviceService.byMacGetDevice((String) dataMap.get("mac"));
+ Map<String, Object> sensors = sensorService.getSensorBySensorKey(key);
+ if (key.equals("e1") || key.equals("e2") || key.equals("e10") || key.equals("e11") || key.equals("e15") || key.equals("e16")) {
+ //������������������������
+ if ((state1.equals("0") || state1.equals("1")) && Integer.parseInt(state) > 1) {
+ if (val > Double.valueOf(String.valueOf(valueList.get(1)))) {
+ Map lookMap = new HashMap();
+ lookMap.put("time", time);
+ lookMap.put("name", device.getName());
+ lookMap.put("sensor", sensors.get("description"));
+ lookMap.put("value", val + "" + sensors.get("unit"));
+ mapList.add(lookMap);
+ //lookString = time+" "+device.getName()+sensors.get("description")+"="+val + sensors.get("unit")+"������";
+ //System.out.println(time + "====" + device.getName() + "=====" + sensors.get("description") + "======" + val + sensors.get("unit"));
+ }
+ }
+ } else {//���������������������������
+ if (state1.equals("0")) {
+ if (val > Double.valueOf(String.valueOf(valueList.get(0)))) {
+ Map lookMap = new HashMap();
+ lookMap.put("time", time);
+ lookMap.put("name", device.getName());
+ lookMap.put("sensor", sensors.get("description"));
+ lookMap.put("value", val + "" + sensors.get("unit"));
+ mapList.add(lookMap);
+ }
+ }
+ }
+
+ }
+ }
+ if (mapList.size() > 0) {
+ lookList.add(mapList);
+ } else {
+ continue;
+ }
+ }
+ }
+ }
+ }
+ return lookList;
+ }
+
+ /* @GetMapping("/lianxian")
+ @ApiOperation(value = "������", notes = "������" )
+ @GetMapping("multiDeviceContrast")
+ @ApiOperation(value = "���������������������", notes = "���������������������")
+ @ApiImplicitParams(value = {
+ @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);
+ ParameterUtils.getTimeType4Time(parameters);
+ List<Map<String, Object>> list = historyMinutelyService.getMultiDeviceSensorData(parameters);
+ return new ResultBean<List<Map<String, Object>>>(list);
+ }
+
+ /*
+ * ���������������������������������������������
+ */
@GetMapping("screenVersion")
public Map<String, Object> getScreenVersion(HttpServletRequest request) {
Map<String, Object> parameters = getParametersStartingWith(request, null);
@@ -2271,30 +2580,144 @@
return screenVersionService.getScreenVersion(version);
}
- @GetMapping("devices-sensors-excel")
+ @GetMapping("allDeviceExcel")
@ApiOperation(value = "���������������������������������", notes = "���������������������������������")
@ApiImplicitParams(value = {
- @ApiImplicitParam(name = "monitor_point_id", defaultValue = "5", value = "������������id", required = true, paramType = "query", dataType = "String"),
+ @ApiImplicitParam(name = "monitorPoint", value = "������������id", required = true, paramType = "query", dataType = "String"),
@ApiImplicitParam(name = "sensorKey", value = "���������key,������������������", required = true, paramType = "query", dataType = "String"),
- @ApiImplicitParam(name = "time", value = "������(���������2020-04-09)", required = true, paramType = "query", dataType = "String")})
- public ResultBean<List<Map<String, Object>>> getDevicesToExcel(HttpServletRequest request) throws Exception {
+ @ApiImplicitParam(name = "startTime", value = "������������(���������2020-08-03)", required = true, paramType = "query", dataType = "String"),
+ @ApiImplicitParam(name = "endTime", value = "������������(���������2020-08-04)", required = false, paramType = "query", dataType = "String")})
+ public ResultBean<List<Map<String, Object>>> getAllDeviceDataToExcel(HttpServletRequest request) throws Exception {
Map<String, Object> parameters = WebUtils.getParametersStartingWith(request, null);
- ParameterUtils.getTimeType4Time(parameters);
- /*String[] sensorKeys = parameters.get("sensorKey").toString().split(",");
- parameters.put("sensorKeys", Arrays.asList(sensorKeys));
- List<String> macList = new ArrayList<>();
- List<MonitorPoint> monitorPoints = monitorPointService.getMonitorPointsAndDevicesByRegion(parameters);
- for (MonitorPoint m : monitorPoints) {
- for (Device d : m.getDevices()) {
- macList.add(d.getMac());
+ List<Map<String, Object>> list = historyMinutelyService.getAllDeviceDataToExcel(parameters);
+ return new ResultBean<List<Map<String, Object>>>(list);
+ }
+
+ /*@PostMapping("insertAdjustValue")
+ @ApiOperation(value = "���������������������������������", notes = "���������������������������������")
+ @ApiImplicitParams(value = {
+ @ApiImplicitParam(name = "id", value = "������id", required = true, paramType = "query", dataType = "String"),
+ @ApiImplicitParam(name = "time", value = "���������������08:30:00���", required = true, paramType = "query", dataType = "String"),
+ @ApiImplicitParam(name = "dataArray", value = "������", required = false, paramType = "query", dataType = "String")})
+ public void insertAdjustValue(HttpServletRequest request) throws Exception {
+ Map<String, Object> parameters = WebUtils.getParametersStartingWith(request, null);
+ int device_id = Integer.parseInt(parameters.get("id").toString());
+ String hour_minute_second = parameters.get("time").toString();
+ String[] arr = hour_minute_second.split(":");
+ int seconds = Integer.parseInt(arr[0])*3600+Integer.parseInt(arr[1])*60+Integer.parseInt(arr[2]);
+ String value = parameters.get("dataArray").toString();
+ deviceAdjustValueTimingService.insertData(device_id,seconds,value);;
+ }*/
+
+ @PostMapping("insertAdjustValue")
+ public int insertAdjustValue(@RequestBody HashMap map){
+ try{
+ int device_id = Integer.parseInt(map.get("id").toString());
+ String time = map.get("time").toString();
+ String[] arr = time.split(":");
+ int seconds = Integer.parseInt(arr[0])*3600+Integer.parseInt(arr[1])*60+Integer.parseInt(arr[2]);
+ //String t = URLEncoder.encode(������,"UTF-8")
+ List list = (List) map.get("dataArray");
+ String val="";
+ for (int i = 0; i <list.size() ; i++) {
+ if (i==0){
+ val=val+list.get(i);
+ }else {
+ val=val+","+list.get(i);
+ }
+ }
+ String value = "{"+val+"}";
+ deviceAdjustValueTimingService.insertData(device_id,seconds,value);
+ return 1;
+ }catch (Exception e){
+ log.warn(e);
+ }
+ return 0;
+ }
+
+ @RequestMapping("/biaozhun")
+ @ResponseBody
+ public List<Device> queryDevice(String macOrName){
+ List<Device> deviceList = new ArrayList<>();
+ if (!macOrName.equals("")){
+ deviceList= deviceService.getDevice(macOrName);
+ }
+ return deviceList;
+ }
+
+ @RequestMapping("/getBiaoZhun")
+ @ResponseBody
+ public List<DeviceAdjustValueTiming> getBiaoZhun(String id){
+ List<DeviceAdjustValueTiming> dataByDeviceid = deviceAdjustValueTimingService.getDataByDeviceid(Integer.parseInt(id));
+ for (DeviceAdjustValueTiming deviceAdjustValueTiming : dataByDeviceid) {
+ int seconds = Integer.parseInt(deviceAdjustValueTiming.getSeconds());
+ String hour = String.valueOf(seconds/3600);
+ int millAndSeconds = seconds%3600;
+ String mill = String.valueOf(millAndSeconds/60);
+ String second = String.valueOf(millAndSeconds%60);
+ if (hour.length()<2){
+ hour="0"+hour;
+ }
+ if (mill.length()<2){
+ mill="0"+mill;
+ }
+ if (second.length()<2){
+ second="0"+second;
+ }
+ String time = hour+":"+mill+":"+second;
+ Map<String, String> value = deviceAdjustValueTiming.getValue();
+ Collection<String> values = value.values();
+ deviceAdjustValueTiming.setSeconds(time);
+ }
+ return dataByDeviceid;
+ }
+
+
+ @RequestMapping("/getSensor")
+ @ResponseBody
+ public List<Map<String, Object>> getSensor(String id){
+ List<Map<String, Object>> allSensors = sensorService.getSensorByDeviceId(id);
+ return allSensors;
+ }
+
+ @RequestMapping("/deleteBiaoZhun")
+ @ResponseBody
+ public int deleteBiaoZhun(String id){
+ int i= deviceAdjustValueTimingService.delete(id);
+ return i;
+ }
+
+
+ @GetMapping("/monitorAVGData")
+ @ApiOperation(value = "monitor������������������", notes = "monitor������������������")
+ @ApiImplicitParams(value = {
+ @ApiImplicitParam(name = "monitorPointIds", value = "������monitorid", required = true, paramType = "query", dataType = "String"),
+ @ApiImplicitParam(name = "time", value = "������(���������2020-03-19)", required = true, paramType = "query", dataType = "String")})
+ public List<List<Map>> monitorAVGData(HttpServletRequest request) throws Exception {
+ Map<String, Object> parameters = getParametersStartingWith(request, null);
+ String monitorPointIds = (String) parameters.get("monitorPointIds");
+ String time = (String) parameters.get("time");
+ time = time+" 00:00:00";
+ SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd mm:HH:ss");//���������������MM
+ Date date = simpleDateFormat.parse(time);
+ Calendar calendar = new GregorianCalendar();
+ calendar.setTime(date);
+ calendar.add(calendar.DATE,+1);
+ String date1= simpleDateFormat.format(date);
+ String date2= simpleDateFormat.format(calendar.getTime());
+ String[] mIds = monitorPointIds.split(",");
+ List<List<Map>> lists = new ArrayList<>();
+ if (mIds.length==1 && mIds.length!=0){
+ String mId = mIds[0];
+ List<Map> dataAvbByMIdAndTime = historyHourlyService.getDataAvbByMIdAndTime(mId, date1, date2);
+ lists.add(dataAvbByMIdAndTime);
+ //List<Device> devicesByMonitorPointId = deviceService.getDevicesByMonitorPointId(Integer.valueOf(mId));
+ }else {
+ for (int i = 0; i <mIds.length ; i++) {
+ List<Map> dataAvbByMIdAndTime = historyHourlyService.getDataAvbByMIdAndTime(mIds[i], date1, date2);
+ lists.add(dataAvbByMIdAndTime);
}
}
- parameters.put("macs", macList);
- List<Map<String, Object>> list = new ArrayList<>();
- if (!CollectionUtils.isEmpty(macList)) {
- list = historyMinutelyService.getDevicesAvgDataToExcel(parameters);
- }*/
- List<Map<String, Object>> list = historyMinutelyService.getDevicesSensorsToExcel(parameters);
- return new ResultBean<List<Map<String, Object>>>(list);
+ return lists;
}
}
--
Gitblit v1.8.0