From 4cb6a229ec12a1a66133530745550d57e1eb97fa Mon Sep 17 00:00:00 2001
From: lizijie <lzjiiie@163.com>
Date: Wed, 12 Jan 2022 13:23:57 +0800
Subject: [PATCH] 污染报警接口修改
---
screen-api/src/main/java/com/moral/api/service/impl/AlarmInfoServiceImpl.java | 48 ++++++++++++++-
screen-api/src/main/java/com/moral/api/controller/ChartController.java | 84 ++++++++++++++++++++++-----
screen-api/src/main/java/com/moral/api/controller/AlarmInfoController.java | 13 ++++
screen-api/src/main/java/com/moral/api/service/AlarmInfoService.java | 9 +++
4 files changed, 133 insertions(+), 21 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/controller/AlarmInfoController.java b/screen-api/src/main/java/com/moral/api/controller/AlarmInfoController.java
index 4e06784..acfa362 100644
--- a/screen-api/src/main/java/com/moral/api/controller/AlarmInfoController.java
+++ b/screen-api/src/main/java/com/moral/api/controller/AlarmInfoController.java
@@ -74,6 +74,19 @@
return ResultMessage.ok(resultMap);
}
+ @RequestMapping(value = "alarmReminder2", method = RequestMethod.GET)
+ @ResponseBody
+ public ResultMessage alarmReminder2(HttpServletRequest request){
+ Map<String, Object> parameters = WebUtils.getParametersStartingWith(request,null);
+ Object monitorPointIds = parameters.get("monitorPointIds");
+ Object size = parameters.get("size");
+ if (ObjectUtils.isEmpty(monitorPointIds) || ObjectUtils.isEmpty(size)){
+ return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(), ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
+ }
+ Map<String, Object> resultMap = alarmInfoService.alarmReminderByMonitorPointIds(parameters);
+ return ResultMessage.ok(resultMap);
+ }
+
@RequestMapping(value = "getDataByConditionWithoutPage", method = RequestMethod.GET)
@ResponseBody
public ResultMessage getDataByConditionWithoutPage(HttpServletRequest request){
diff --git a/screen-api/src/main/java/com/moral/api/controller/ChartController.java b/screen-api/src/main/java/com/moral/api/controller/ChartController.java
index b0a3b75..2820c0a 100644
--- a/screen-api/src/main/java/com/moral/api/controller/ChartController.java
+++ b/screen-api/src/main/java/com/moral/api/controller/ChartController.java
@@ -140,34 +140,84 @@
public ResultMessage returnDataTest(HttpServletRequest request) throws ParseException {
List bigList = new ArrayList();
Map<String,Object> resultMap = new HashMap<>();
- List<Double> boundList = new ArrayList<>();
- boundList.add(120.70980239181193);
+ List<List> boundList = new ArrayList<>();
+ /*boundList.add(120.70980239181193);
boundList.add(31.329143000000002);
boundList.add(120.74077860818807);
- boundList.add(31.356963);
- resultMap.put("bound",boundList);
+ boundList.add(31.356963);*/
+ /*List<Double> boundList1 = new ArrayList<>();
+ List<Double> boundList2 = new ArrayList<>();
+ List<Double> boundList3 = new ArrayList<>();
+ List<Double> boundList4 = new ArrayList<>();
+ List<Double> boundList5 = new ArrayList<>();
+ List<Double> boundList6 = new ArrayList<>();
+ List<Double> boundList7 = new ArrayList<>();
+ List<Double> boundList8 = new ArrayList<>();
+ List<Double> boundList9 = new ArrayList<>();
+ boundList1.add(120.975221);
+ boundList1.add(31.413145);
+ boundList2.add(120.977021);
+ boundList2.add(31.411345);
+ boundList3.add(120.979174);
+ boundList3.add(31.333362);
+ boundList4.add(120.977374);
+ boundList4.add(31.331562);
+ boundList5.add(120.913768);
+ boundList5.add(31.347918);
+ boundList6.add(120.870665);
+ boundList6.add(31.341063);
+ boundList7.add(120.868865);
+ boundList7.add(31.342863);
+ boundList8.add(120.896371);
+ boundList8.add(31.409264);
+ boundList9.add(120.898171);
+ boundList9.add(31.411064);
+ List<List> boundList_middle = new ArrayList<>();
+ boundList_middle.add(boundList1);
+ boundList_middle.add(boundList2);
+ boundList_middle.add(boundList3);
+ boundList_middle.add(boundList4);
+ boundList_middle.add(boundList5);
+ boundList_middle.add(boundList6);
+ boundList_middle.add(boundList7);
+ boundList_middle.add(boundList8);
+ boundList_middle.add(boundList9);*/
+ String boundList_middle = "[[[120.975221,31.413145],[120.977021,31.411345],[120.979174,31.333362],[120.977374,31.331562],[120.913768,31.347918],[120.870665,31.341063],[120.868865,31.342863],[120.896371,31.409264],[120.898171,31.411064]]]";
+ List<String> boundList_middle2 = new ArrayList<>();
+ boundList_middle2.add(boundList_middle);
+ resultMap.put("bound",boundList_middle);
resultMap.put("time","2021-12-10 08:00:00");
List<Double> centerPointList = new ArrayList<>();
- centerPointList.add(120.72529050000001);
- centerPointList.add(31.343053);
+ centerPointList.add(120.934824838);
+ centerPointList.add(31.37834580);
resultMap.put("centerPoint",centerPointList);
List<Double> list1 = new ArrayList<>();
- list1.add(120.711611);
- list1.add(31.355163);
+ list1.add(120.975221);
+ list1.add(31.411345);
list1.add(1.0);
List<Double> list2 = new ArrayList<>();
- list2.add(120.726821);
- list2.add(31.342079);
+ list2.add(120.870665);
+ list2.add(31.342863);
list2.add(4.0);
List<Double> list3 = new ArrayList<>();
- list3.add(120.735515);
- list3.add(31.353261);
+ list3.add(120.898171);
+ list3.add(31.409264);
list3.add(2.0);
- List list123 = new ArrayList();
- list123.add(list1);
- list123.add(list3);
- list123.add(list2);
- resultMap.put("list",list123);
+ List<Double> list4 = new ArrayList<>();
+ list4.add(120.913768);
+ list4.add(31.349718);
+ list4.add(3.0);
+ List<Double> list5 = new ArrayList<>();
+ list5.add(120.977374);
+ list5.add(31.333362);
+ list5.add(2.0);
+ List list12345 = new ArrayList();
+ list12345.add(list1);
+ list12345.add(list2);
+ list12345.add(list3);
+ list12345.add(list4);
+ list12345.add(list5);
+ resultMap.put("list",list12345);
for (int i=0;i<10;i++){
resultMap.put("time","2021-12-10 0"+i+":00:00");
bigList.add(resultMap);
diff --git a/screen-api/src/main/java/com/moral/api/service/AlarmInfoService.java b/screen-api/src/main/java/com/moral/api/service/AlarmInfoService.java
index 1956563..3f3e335 100644
--- a/screen-api/src/main/java/com/moral/api/service/AlarmInfoService.java
+++ b/screen-api/src/main/java/com/moral/api/service/AlarmInfoService.java
@@ -42,5 +42,14 @@
*@Date: 2021/11/12 9:47
**/
Map<String, Object> alarmReminder(Map<String,Object> parameters);
+
+ /**
+ *@Description: ������������������������������������
+ *@Param: [parameters]
+ *@return: java.util.Map<java.lang.String,java.lang.Object>
+ *@Author: lizijie
+ *@Date: 2022/1/4 14:49
+ **/
+ Map<String, Object> alarmReminderByMonitorPointIds(Map<String, Object> parameters);
}
diff --git a/screen-api/src/main/java/com/moral/api/service/impl/AlarmInfoServiceImpl.java b/screen-api/src/main/java/com/moral/api/service/impl/AlarmInfoServiceImpl.java
index 722d332..1c2620a 100644
--- a/screen-api/src/main/java/com/moral/api/service/impl/AlarmInfoServiceImpl.java
+++ b/screen-api/src/main/java/com/moral/api/service/impl/AlarmInfoServiceImpl.java
@@ -16,10 +16,7 @@
import org.springframework.util.ObjectUtils;
import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
import java.util.stream.Collectors;
/**
@@ -283,4 +280,47 @@
}
return null;
}
+
+ @Override
+ public Map<String, Object> alarmReminderByMonitorPointIds(Map<String, Object> parameters) {
+ Map<String, Object> resultMap = new HashMap<>();
+ String monitorPointIds = parameters.get("monitorPointIds").toString();
+ monitorPointIds.replace("[","");
+ monitorPointIds.replace("]","");
+ String[] monitorPointIdArray = monitorPointIds.split(",");
+ List<String> monitorPointIdList = new ArrayList<>(Arrays.asList(monitorPointIdArray));
+ //������������list���������������id
+ List<Integer> deviceIdList = new ArrayList<>();
+ //������id������������������
+ QueryWrapper<Device> wrapper_device = new QueryWrapper<>();
+ wrapper_device.eq("is_delete",Constants.NOT_DELETE);
+ wrapper_device.in("monitor_point_id",monitorPointIdList);
+ List<Device> devices = new ArrayList<>();
+ devices = deviceMapper.selectList(wrapper_device);
+ if (devices.size()>0){
+ for (Device device:devices) {
+ int deviceId = device.getId();
+ deviceIdList.add(deviceId);
+ }
+ }
+ if (deviceIdList.size()>0){
+ Map<String, Object> map = new HashMap<>();
+ map.put("deviceIds",deviceIdList);
+ int size = Integer.parseInt(parameters.get("size").toString());
+ map.put("size",size);
+ List<Map<String, Object>> resultList = alarmInfoMapper.selectNewestData(map);
+ SimpleDateFormat SDF = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ for (Map<String, Object> alarmInfo:resultList) {
+ String alarm_time = SDF.format(alarmInfo.get("alarm_time"));
+ alarmInfo.put("alarm_time",alarm_time);
+ }
+ resultMap.put("alarmInfors",resultList);
+ QueryWrapper<AlarmInfo> alarmInfoQueryWrapper = new QueryWrapper<>();
+ alarmInfoQueryWrapper.in("device_id",deviceIdList);
+ Integer totalNumber = alarmInfoMapper.selectCount(alarmInfoQueryWrapper);
+ resultMap.put("totalNumber",totalNumber);
+ return resultMap;
+ }
+ return null;
+ }
}
--
Gitblit v1.8.0