From d7ee12cb208473741f79b64505adccd0653e4654 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Tue, 27 Oct 2020 13:44:28 +0800
Subject: [PATCH] vue页面增加误差率参数，沧州剔除非本公司设备显示，报表接口更新
---
src/main/java/com/moral/controller/ScreenController.java | 557 +++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 438 insertions(+), 119 deletions(-)
diff --git a/src/main/java/com/moral/controller/ScreenController.java b/src/main/java/com/moral/controller/ScreenController.java
index 11141a5..1b6ff2b 100644
--- a/src/main/java/com/moral/controller/ScreenController.java
+++ b/src/main/java/com/moral/controller/ScreenController.java
@@ -4,6 +4,7 @@
import java.lang.reflect.Array;
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;
@@ -34,26 +35,7 @@
import com.moral.entity.alarm.AlarmSensorLevel;
import com.moral.entity.charts.DataSortCondition;
import com.moral.entity.layout.RealTimeDeviceLayout;
-import com.moral.service.AccountService;
-import com.moral.service.AlarmConfigService;
-import com.moral.service.AlarmDailyService;
-import com.moral.service.AreaService;
-import com.moral.service.DeviceService;
-import com.moral.service.DeviceVersionService;
-import com.moral.service.DictionaryDataService;
-import com.moral.service.HangzhouAqiService;
-import com.moral.service.HistoryDailyService;
-import com.moral.service.HistoryHourlyService;
-import com.moral.service.HistoryMinutelyService;
-import com.moral.service.HistoryService;
-import com.moral.service.MachineActivateService;
-import com.moral.service.MonitorPointService;
-import com.moral.service.OrganizationLayoutService;
-import com.moral.service.OrganizationService;
-import com.moral.service.QualityDailyService;
-import com.moral.service.SensorService;
-import com.moral.service.SensorUnitService;
-import com.moral.service.WeatherService;
+import com.moral.service.*;
import com.moral.util.*;
import com.rabbitmq.client.*;
@@ -62,6 +44,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;
import org.apache.commons.collections.CollectionUtils;
@@ -115,6 +98,9 @@
MonitorPointService monitorPointService;
@Resource
DeviceVersionService deviceVersionService;
+
+ /* @Resource
+ HistorySpecialService historySpecialService;*/
/**
* The screen service.
@@ -175,6 +161,11 @@
@Resource
private QualityDailyService qualityDailyService;
+ @Resource
+ private DeviceRoadService deviceRoadService;
+
+ @Resource
+ private ScreenVersionService screenVersionService;
/**
* Screen login. ������������
@@ -691,31 +682,40 @@
return new ResultBean<List<MonitorPoint>>(monitorPoints);
}
+
+ /*
+ * ���������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);
- parameters.put("monitorPointId", parameters.remove("monitorPoint"));
- Object sensorKey = parameters.remove("sensorKey");
- parameters.put("sensors", Arrays.asList(sensorKey));
- // monitorPointService.isCompensateCalculation(parameters);
- List<Map<String, Object>> list = historyMinutelyService.getMonitorPointOrDeviceAvgData(parameters);
-
- 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")){
- map.put("time", Integer.valueOf(time)+1);
+ 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));
+ // monitorPointService.isCompensateCalculation(parameters);
+ list = historyMinutelyService.getMonitorPointOrDeviceAvgData(parameters);
+ 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")) {
+ map.put("time", Integer.valueOf(time) + 1);
+ }
+ map.put("value", map.remove(sensorKey));
}
- map.put("value", map.remove(sensorKey));
}
return new ResultBean<List<Map<String, Object>>>(list);
}
-
-
@GetMapping("report_alarm_datas")
@@ -864,7 +864,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()) {
@@ -1061,7 +1060,41 @@
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();
+ deviceList.sort((Device o1, Device o2) -> {
+ return o1.getName().compareTo(o2.getName());
+ });
+ }
return new ResultBean<List<MonitorPoint>>(monitorPoints);
}
@@ -1504,13 +1537,15 @@
String startHour = st.substring(st.lastIndexOf("-") + 1);
String startTime = startYearAndDay + " " + startHour + ":00:00";
String et = parameters.get("endTime").toString();
+ String endYearAndDay = et.substring(0, st.lastIndexOf("-"));
String endHour = et.substring(et.lastIndexOf("-") + 1);
- int endHourValue = Integer.valueOf(endHour);
+ String endTime = endYearAndDay + " " + endHour + ":00:00";
+ /* int endHourValue = Integer.valueOf(endHour);
int startHourValue = Integer.valueOf(startHour);
if (endHourValue <= startHourValue) {
endHourValue = startHourValue + 1;
}
- String endTime = startYearAndDay + " " + endHourValue + ":00:00";
+ String endTime = startYearAndDay + " " + endHourValue + ":00:00";*/
parameters.put("startTime", startTime);
parameters.put("endTime", endTime);
String mac = parameters.get("mac").toString();
@@ -1525,6 +1560,7 @@
params.put("sensorInfo", sensorList);
params.put("sensorsMap", sensorsMap);
String paramsJson = params.toJSONString();
+ //System.out.println(paramsJson);
model.addObject("carTrajectoryParams", paramsJson);
model.setViewName("cartrajectory");
return model;
@@ -1616,6 +1652,7 @@
@RequestMapping(value = "/newMap-page", method = RequestMethod.GET)
public ModelAndView newMap(ModelAndView model, @RequestParam("areaCode") long code,
@RequestParam("accountId") int accountId) {
+
Account account = accountService.getAccountById(accountId);
List<MonitorPoint> monitorPointList = monitorPointService.getMonitorPointListByAccountId(accountId);
String regionName = areaService.queryFullNameByCode(code);
@@ -1914,8 +1951,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")));
@@ -1953,32 +1990,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")
@@ -1987,17 +2023,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;
}
@@ -2008,17 +2044,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;
}
@@ -2069,7 +2105,7 @@
}
@PostMapping("updateForecastWeather")
- public void updateForecastWeather(HttpServletRequest request){
+ public void updateForecastWeather(HttpServletRequest request) {
Map<String, Object> parameters = getParametersStartingWith(request, null);
weatherService.updateForecastWeather(parameters);
}
@@ -2094,10 +2130,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();
//���������
@@ -2106,7 +2142,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;
@@ -2122,86 +2158,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) {
@@ -2211,12 +2247,11 @@
}*/
list.add(oneSensorMap);
}
- }else {
+ } else {
return null;
}
return new ResultBean<List<Map<String, Object>>>(list);
}
-
@GetMapping("/contrastFactor")
@@ -2227,8 +2262,292 @@
@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) {
+ List<DeviceRoad> alarmData = deviceRoadService.getAlarmData(windData, code, mac, speedLevel);
+ return alarmData;
+ }
+
+ @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);
+ }
+
+
+ @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);
+ String version = parameters.get("version").toString();
+ return screenVersionService.getScreenVersion(version);
+ }
+
+ @GetMapping("allDeviceExcel")
+ @ApiOperation(value = "���������������������������������", notes = "���������������������������������")
+ @ApiImplicitParams(value = {
+ @ApiImplicitParam(name = "monitorPoint", value = "������������id", required = true, paramType = "query", dataType = "String"),
+ @ApiImplicitParam(name = "sensorKey", value = "���������key,������������������", required = true, paramType = "query", dataType = "String"),
+ @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);
+ List<Map<String, Object>> list = historyMinutelyService.getAllDeviceDataToExcel(parameters);
+ return new ResultBean<List<Map<String, Object>>>(list);
+ }
+}
\ No newline at end of file
--
Gitblit v1.8.0