From 73c9bf4f63aaa04c60bde8174d590169b3ae8aa7 Mon Sep 17 00:00:00 2001
From: lizijie <lzjiiie@163.com>
Date: Fri, 12 Nov 2021 15:47:41 +0800
Subject: [PATCH] 判断时间，修改臭氧8小时滑动平均值
---
screen-api/src/main/java/com/moral/api/service/impl/AlarmInfoServiceImpl.java | 145 ++++++++++++++++++++++++++++-------
screen-api/src/main/java/com/moral/api/mapper/AlarmInfoMapper.java | 2
screen-api/src/main/resources/mapper/AlarmInfoMapper.xml | 14 +++
screen-api/src/main/java/com/moral/api/controller/AlarmInfoController.java | 21 ++++
screen-api/src/main/java/com/moral/api/service/AlarmInfoService.java | 11 ++
5 files changed, 158 insertions(+), 35 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 9ad9d25..2813e87 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
@@ -53,8 +53,25 @@
if (ObjectUtils.isEmpty(organization)){
return ResultMessage.fail(ResponseCodeEnum.ORGANIZATION_NOT_EXIST.getCode(), ResponseCodeEnum.ORGANIZATION_NOT_EXIST.getMsg());
}
- List<Map<String, Object>> resultList = alarmInfoService.getDataByCondition(parameters);
- return ResultMessage.ok(resultList);
+ Map<String, Object> resultMap = alarmInfoService.getDataByCondition(parameters);
+ return ResultMessage.ok(resultMap);
+ }
+
+ @RequestMapping(value = "alarmReminder", method = RequestMethod.GET)
+ @ResponseBody
+ public ResultMessage alarmReminder(HttpServletRequest request){
+ Map<String, Object> parameters = WebUtils.getParametersStartingWith(request,null);
+ Object orgid = parameters.get("organization_id");
+ Object size = parameters.get("size");
+ if (ObjectUtils.isEmpty(orgid) || ObjectUtils.isEmpty(size)){
+ return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(), ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
+ }
+ Organization organization = organizationMapper.selectById(Integer.parseInt(orgid.toString()));
+ if (ObjectUtils.isEmpty(organization)){
+ return ResultMessage.fail(ResponseCodeEnum.ORGANIZATION_NOT_EXIST.getCode(), ResponseCodeEnum.ORGANIZATION_NOT_EXIST.getMsg());
+ }
+ Map<String, Object> resultMap = alarmInfoService.alarmReminder(parameters);
+ return ResultMessage.ok(resultMap);
}
}
diff --git a/screen-api/src/main/java/com/moral/api/mapper/AlarmInfoMapper.java b/screen-api/src/main/java/com/moral/api/mapper/AlarmInfoMapper.java
index 308ad08..43131d0 100644
--- a/screen-api/src/main/java/com/moral/api/mapper/AlarmInfoMapper.java
+++ b/screen-api/src/main/java/com/moral/api/mapper/AlarmInfoMapper.java
@@ -19,4 +19,6 @@
List<Map<String,Object>> selectDataByCondition(Map<String, Object> map);
+ List<Map<String,Object>> selectNewestData(Map<String, Object> map);
+
}
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 437b71e..5519cf2 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
@@ -23,6 +23,15 @@
*@Author: lizijie
*@Date: 2021/11/10 16:18
**/
- List<Map<String,Object>> getDataByCondition(Map<String, Object> parameters);
+ Map<String,Object> getDataByCondition(Map<String, Object> parameters);
+
+ /**
+ *@Description: ������������������
+ *@Param: [parameters]
+ *@return: java.util.List<java.util.Map<java.lang.String,java.lang.Object>>
+ *@Author: lizijie
+ *@Date: 2021/11/12 9:47
+ **/
+ Map<String, Object> alarmReminder(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 49e5647..01941d0 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
@@ -15,6 +15,7 @@
import org.springframework.stereotype.Service;
import org.springframework.util.ObjectUtils;
+import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
@@ -42,7 +43,108 @@
private AlarmInfoMapper alarmInfoMapper;
@Override
- public List<Map<String, Object>> getDataByCondition(Map<String, Object> parameters) {
+ public Map<String, Object> getDataByCondition(Map<String, Object> parameters) {
+ Map<String, Object> resultMap = new HashMap<>();
+ int orgId = Integer.parseInt(parameters.get("organization_id").toString());
+ //���������������������������������id
+ List<Integer> allOrgId = new ArrayList<>();
+ allOrgId.add(orgId);
+ //������������
+ //���������������
+ List<Organization> allChildrenOrganization = organizationService.getChildrenOrganizationsById(orgId);
+ if (!ObjectUtils.isEmpty(allChildrenOrganization) || allChildrenOrganization.size() < 1){
+ for (Organization organization:allChildrenOrganization) {
+ allOrgId.add(organization.getId());
+ }
+ }
+ //������������
+ List<Integer> allOrgIdWithoutDuplicates = allOrgId.stream().distinct().collect(Collectors.toList());
+ //������������list���������������id
+ List<Integer> deviceIdList = new ArrayList<>();
+ for (Integer orgIdWithoutDuplicates:allOrgIdWithoutDuplicates) {
+ //������id������������������
+ QueryWrapper<Device> wrapper_device = new QueryWrapper<>();
+ wrapper_device.eq("is_delete",Constants.NOT_DELETE).eq("organization_id",orgIdWithoutDuplicates);
+ 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);
+ }
+ }else {
+ continue;
+ }
+ }
+ if (deviceIdList.size()>0){
+ Map<String, Object> map = new HashMap<>();
+ QueryWrapper<AlarmInfo> alarmInfoQueryWrapper = new QueryWrapper<>();
+ map.put("deviceIds",deviceIdList);
+ alarmInfoQueryWrapper.in("device_id",deviceIdList);
+ int size = Integer.parseInt(parameters.get("size").toString());
+ int current = Integer.parseInt(parameters.get("current").toString());
+ int start = (current-1)*size;
+ map.put("size",size);
+ map.put("start",start);
+ String startTime = parameters.get("startTime")+" 00:00:00";
+ String endTime = parameters.get("endTime")+" 23:59:59";
+ map.put("startTime",startTime);
+ map.put("endTime",endTime);
+ alarmInfoQueryWrapper.between("alarm_time", startTime, endTime);
+ String index = parameters.get("index").toString();
+ if (!index.equals("all")){
+ map.put("index",index);
+ alarmInfoQueryWrapper.eq("index", index);
+ }
+ String alarmType = parameters.get("alarmType").toString();
+ switch (alarmType){
+ case "������" : map.put("alarmType","������");
+ alarmInfoQueryWrapper.eq("alarmType","������");
+ break;
+ case "���������" : map.put("alarmType","���������");
+ alarmInfoQueryWrapper.eq("alarmType","���������");
+ break;
+ case "���������100" : map.put("alarmType","������������������100%");
+ alarmInfoQueryWrapper.eq("alarmType","������������������100%");
+ break;
+ case "���������150" : map.put("alarmType","������������������150%");
+ alarmInfoQueryWrapper.eq("alarmType","������������������150%");
+ break;
+ case "���������250" : map.put("alarmType","������������������250%");
+ alarmInfoQueryWrapper.eq("alarmType","������������������250%");
+ break;
+ case "������������150" : map.put("alarmType","������������������150%");
+ alarmInfoQueryWrapper.eq("alarmType","������������������150%");
+ break;
+ case "������������250" : map.put("alarmType","������������������250%");
+ alarmInfoQueryWrapper.eq("alarmType","������������������250%");
+ break;
+ default:break;
+ }
+ List<Map<String, Object>> resultList = alarmInfoMapper.selectDataByCondition(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);
+ }
+ Integer totalNumber = alarmInfoMapper.selectCount(alarmInfoQueryWrapper);
+ resultMap.put("totalNumber", totalNumber);
+ resultMap.put("alarmInfos", resultList);
+ resultMap.put("current",current);
+ resultMap.put("size",size);
+ int totalPageNumber = totalNumber/size;
+ if(totalNumber%size != 0){
+ totalPageNumber += 1;
+ }
+ resultMap.put("totalPageNumber",totalPageNumber);
+ return resultMap;
+ }
+ return null;
+ }
+
+ @Override
+ public Map<String, Object> alarmReminder(Map<String, Object> parameters) {
+ Map<String,Object> resultMap = new HashMap<>();
int orgId = Integer.parseInt(parameters.get("organization_id").toString());
//���������������������������������id
List<Integer> allOrgId = new ArrayList<>();
@@ -78,38 +180,19 @@
Map<String, Object> map = new HashMap<>();
map.put("deviceIds",deviceIdList);
int size = Integer.parseInt(parameters.get("size").toString());
- int current = Integer.parseInt(parameters.get("current").toString());
- int start = (current-1)*size;
map.put("size",size);
- map.put("start",start);
- String startTime = parameters.get("startTime")+" 00:00:00";
- String endTime = parameters.get("endTime")+" 23:59:59";
- map.put("startTime",startTime);
- map.put("endTime",endTime);
- String index = parameters.get("index").toString();
- if (!index.equals("all")){
- map.put("index",index);
+ 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);
}
- String alarmType = parameters.get("alarmType").toString();
- switch (alarmType){
- case "������":map.put("alarmType","������");
- break;
- case "���������":map.put("alarmType","���������");
- break;
- case "���������100":map.put("alarmType","������������������100%");
- break;
- case "���������150":map.put("alarmType","������������������150%");
- break;
- case "���������250":map.put("alarmType","������������������250%");
- break;
- case "������������150":map.put("alarmType","������������������150%");
- break;
- case "������������250":map.put("alarmType","������������������250%");
- break;
- default:break;
- }
- List<Map<String, Object>> resultList = alarmInfoMapper.selectDataByCondition(map);
- return resultList;
+ 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;
}
diff --git a/screen-api/src/main/resources/mapper/AlarmInfoMapper.xml b/screen-api/src/main/resources/mapper/AlarmInfoMapper.xml
index c2ed097..187b2e5 100644
--- a/screen-api/src/main/resources/mapper/AlarmInfoMapper.xml
+++ b/screen-api/src/main/resources/mapper/AlarmInfoMapper.xml
@@ -14,7 +14,7 @@
</resultMap>
<select id="selectDataByCondition" resultType="java.util.Map">
- select ai.id alarmInfoId,ai.index,ai.alarm_type,ai.alarm_information,d.id deviceId,d.name deviceName,d.longitude,d.latitude
+ select ai.id alarmInfoId,ai.alarm_time,ai.index,ai.alarm_type,ai.alarm_information,d.id deviceId,d.name deviceName,d.longitude,d.latitude
from alarm_info ai, device d
where ai.device_id in
<foreach collection="deviceIds" item="deviceId" index="index" open="(" close=")" separator=",">
@@ -31,4 +31,16 @@
ORDER by ai.create_time DESC
limit #{start},#{size}
</select>
+
+ <select id="selectNewestData" resultType="java.util.Map">
+ select ai.id alarmInfoId,ai.alarm_time,ai.index,ai.alarm_type,ai.alarm_information,d.id deviceId,d.name deviceName,d.longitude,d.latitude
+ from alarm_info ai, device d
+ where ai.device_id in
+ <foreach collection="deviceIds" item="deviceId" index="index" open="(" close=")" separator=",">
+ #{deviceId}
+ </foreach>
+ and d.id = ai.device_id
+ ORDER by ai.create_time DESC
+ limit 0,#{size}
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0