From 7e2f3abca2f5bb83459f809b8e7195b361e0a372 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Sat, 07 Oct 2023 12:00:30 +0800
Subject: [PATCH] ci:补充提交
---
screen-api/src/main/java/com/moral/api/service/impl/AlarmInfoServiceImpl.java | 23 +++++++++++++----------
1 files changed, 13 insertions(+), 10 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 1c2620a..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
@@ -143,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);
//������������
@@ -172,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<>();
@@ -230,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);
//������������
@@ -259,12 +260,13 @@
}else {
continue;
}
- }
- if (deviceIdList.size()>0){
+ }*/
+ // if (deviceIdList.size()>0){
Map<String, Object> map = new HashMap<>();
- map.put("deviceIds",deviceIdList);
+ //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) {
@@ -272,13 +274,14 @@
alarmInfo.put("alarm_time",alarm_time);
}
resultMap.put("alarmInfors",resultList);
- QueryWrapper<AlarmInfo> alarmInfoQueryWrapper = new QueryWrapper<>();
+ Integer totalNumber = alarmInfoMapper.numNews(orgId);
+ /*QueryWrapper<AlarmInfo> alarmInfoQueryWrapper = new QueryWrapper<>();
alarmInfoQueryWrapper.in("device_id",deviceIdList);
- Integer totalNumber = alarmInfoMapper.selectCount(alarmInfoQueryWrapper);
+ Integer totalNumber = alarmInfoMapper.selectCount(alarmInfoQueryWrapper);*/
resultMap.put("totalNumber",totalNumber);
return resultMap;
- }
- return null;
+ // }
+ // return null;
}
@Override
--
Gitblit v1.8.0