From 0e0643aed8857e9b845ee5dcc56cdec652bc89f2 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Mon, 28 Aug 2023 15:59:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wb' into qa
---
screen-api/src/main/java/com/moral/api/service/impl/AlarmInfoServiceImpl.java | 57 ++++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 50 insertions(+), 7 deletions(-)
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..7950927 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;
/**
@@ -146,7 +143,7 @@
public Map<String, Object> getDataByConditionWithoutPage(Map<String, Object> parameters) {
Map<String, Object> resultMap = new HashMap<>();
int orgId = Integer.parseInt(parameters.get("organization_id").toString());
- //���������������������������������id
+ /* //���������������������������������id
List<Integer> allOrgId = new ArrayList<>();
allOrgId.add(orgId);
//������������
@@ -175,7 +172,8 @@
}else {
continue;
}
- }
+ }*/
+ List<Integer> deviceIdList = deviceMapper.deviceIdList(orgId);
if (deviceIdList.size()>0){
Map<String, Object> map = new HashMap<>();
QueryWrapper<AlarmInfo> alarmInfoQueryWrapper = new QueryWrapper<>();
@@ -233,7 +231,7 @@
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
+ /*//���������������������������������id
List<Integer> allOrgId = new ArrayList<>();
allOrgId.add(orgId);
//������������
@@ -262,6 +260,51 @@
}else {
continue;
}
+ }*/
+ // 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);
+ map.put("orgId",orgId);
+ 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);
+ Integer totalNumber = alarmInfoMapper.numNews(orgId);
+ /*QueryWrapper<AlarmInfo> alarmInfoQueryWrapper = new QueryWrapper<>();
+ alarmInfoQueryWrapper.in("device_id",deviceIdList);
+ Integer totalNumber = alarmInfoMapper.selectCount(alarmInfoQueryWrapper);*/
+ resultMap.put("totalNumber",totalNumber);
+ return resultMap;
+ // }
+ // 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<>();
--
Gitblit v1.8.0