From 4d95fc81467cdaec916728feee94763491f74c18 Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期五, 06 三月 2026 10:01:00 +0800
Subject: [PATCH] 设备消息推送
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkCabinetGridServiceImpl.java | 97 ++++--------------------------------------------
1 files changed, 8 insertions(+), 89 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkCabinetGridServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkCabinetGridServiceImpl.java
index 38fdeae..bb5056d 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkCabinetGridServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkCabinetGridServiceImpl.java
@@ -67,9 +67,6 @@
private DeviceMapper deviceMapper;
@Autowired
- private InterfaceLogMapper interfaceLogMapper;
-
- @Autowired
private MemberMapper memberMapper;
@Autowired
@@ -718,31 +715,31 @@
warningEvent.setStatus(Constants.TWO);
warningEventMapper.updateById(warningEvent);
}
+
}
+
}
}
}
public void sendDeviceNotice(WarningRule warningRule){
- if(Constants.equalsInteger(warningRule.getDeviceNotice(),Constants.ONE)
- &&StringUtils.isNotBlank(warningRule.getDeviceIds())
- &&StringUtils.isNotBlank(warningRule.getDeviceNoticeContent())){
+ if(Constants.equalsInteger(warningRule.getDeviceNotice(),Constants.ONE)&&StringUtils.isNotBlank(warningRule.getDeviceIds())&&StringUtils.isNotBlank(warningRule.getDeviceNoticeContent())){
List<Device> deviceList = deviceMapper.selectList(new QueryWrapper<Device>()
.lambda()
.eq(Device::getStatus,Constants.ZERO)
- .in(Device::getId,Arrays.asList(warningRule.getDeviceIds().split(",")))
+ .eq(Device::getId,Arrays.asList(warningRule.getDeviceIds().split(",")))
);
if(CollectionUtils.isNotEmpty(deviceList)){
for (Device device:deviceList) {
device.setSendInfo(warningRule.getDeviceNoticeContent());
- DeviceServiceImpl.sendBroadcaseBobaoHttpBiz(device,interfaceLogMapper);
+ DeviceServiceImpl.sendBroadcaseBobaoHttpBiz(device);
}
}
}
}
- /* public List<Integer> processWarnFront(Constants.WarningConfig warningConfig){
+ public List<Integer> processWarnFront(Constants.WarningConfig warningConfig){
List<WarningRuleDetail> warningRuleDetailList = warningRuleDetailMapper.selectJoinList(WarningRuleDetail.class,new MPJLambdaWrapper<WarningRuleDetail>()
.selectAll(WarningRuleDetail.class)
.leftJoin(Warning.class,Warning::getId,WarningRuleDetail::getWarningId)
@@ -816,84 +813,6 @@
return new ArrayList<>();
- }*/
-
- public List<Integer> processWarnFront(Constants.WarningConfig warningConfig){
-
- List<WarningRuleDetail> warningRuleDetailList = warningRuleDetailMapper.selectJoinList(WarningRuleDetail.class,new MPJLambdaWrapper<WarningRuleDetail>()
- .selectAll(WarningRuleDetail.class)
- .leftJoin(Warning.class,Warning::getId,WarningRuleDetail::getWarningId)
- .eq(WarningRuleDetail::getIsdeleted,Constants.ZERO)
- .eq(Warning::getIsdeleted,Constants.ZERO)
- .eq(Warning::getStatus,Constants.ONE)
- .eq(Warning::getCode,warningConfig.getKey())
- );
- if(CollectionUtils.isEmpty(warningRuleDetailList)){
- return new ArrayList<>();
- }
- //鎵�鏈夋姤璀﹁鍒欓厤缃俊鎭�
- List<Integer> ruleIdList = warningRuleDetailList.stream().map(i->i.getRuleId()).collect(Collectors.toList());;
- Set<Integer> ruleIdSet = new HashSet<>(ruleIdList);
- if(CollectionUtils.isNotEmpty(ruleIdSet)){
- List<Integer> resultList = new ArrayList<>();
- for (Integer ruleId:ruleIdSet) {
- WarningRule warningRule = warningRuleMapper.selectById(ruleId);
- //鏌ヨ鍏朵粬瑙勫垯淇℃伅
- List<WarningRuleDetail> warningRuleDetails = warningRuleDetailMapper.selectJoinList(WarningRuleDetail.class,new MPJLambdaWrapper<WarningRuleDetail>()
- .selectAll(WarningRuleDetail.class)
- .selectAs(Warning::getCode,WarningRuleDetail::getCode)
- .leftJoin(Warning.class,Warning::getId,WarningRuleDetail::getWarningId)
- .eq(WarningRuleDetail::getIsdeleted,Constants.ZERO)
- .eq(Warning::getIsdeleted,Constants.ZERO)
- .eq(Warning::getStatus,Constants.ONE)
- .eq(WarningRuleDetail::getRuleId,ruleId)
-// .in(Warning::getCode,Constants.WarningConfig.ALARM_TEST.getKey(),
-// Constants.WarningConfig.GRID_TIME_OUT_INFO.getKey(),
-// Constants.WarningConfig.KEY_TIME_OUT_BACK.getKey()
-// )
- );
- //鏃犱换浣曡鍒� 鐩存帴璺宠繃
- if(CollectionUtils.isEmpty(warningRuleDetails)){
- return resultList;
- }else if(!Constants.equalsInteger(warningRuleDetails.stream().filter(i->!i.getCode().equals(warningConfig.getKey()+"")).collect(Collectors.toList()).size(),Constants.ZERO)){
- List<WarningRuleDetail> wList = warningRuleDetails.stream().filter(i->!i.getCode().equals(warningConfig.getKey()+"")).collect(Collectors.toList());
- //鑾峰彇鎵�鏈夊叾浠栨墍鏈変簨浠朵富閿俊鎭�
- List<Integer> warningIdList = wList.stream().map(i->i.getWarningId()).collect(Collectors.toList());
- Set<Integer> setWarningIdList = new HashSet<>(warningIdList);
- //鑾峰彇鏃堕棿鍐呮墍鏈変簨浠朵俊鎭�
- List<WarningEvent> warningEventList = warningEventMapper.selectList(new QueryWrapper<WarningEvent>().lambda()
- .eq(WarningEvent::getIsdeleted,Constants.ZERO)
- .in(WarningEvent::getWarningId,setWarningIdList)
- .apply(Objects.nonNull(warningRule.getIntervalSec())," DATE_ADD(CREATE_DATE , INTERVAL "+warningRule.getIntervalSec()+" SECOND) > now() ")
- );
- if(this.processWarnFlag(wList,warningEventList)){
- resultList.add(ruleId);
- };
- }else{
- List<WarningRuleDetail> wList = warningRuleDetails.stream().filter(i->i.getCode().equals(warningConfig.getKey()+"")).collect(Collectors.toList());
- //鑾峰彇鏈浜嬩欢涓婚敭淇℃伅
- List<Integer> warningIdList = wList.stream().map(i->i.getWarningId()).collect(Collectors.toList());
- Set<Integer> setWarningIdList = new HashSet<>(warningIdList);
- if(Objects.isNull(warningRule.getIntervalSec())){
- resultList.add(ruleId);
- }else{
- //鑾峰彇鏃堕棿鍐呮墍鏈変簨浠朵俊鎭�
- List<WarningEvent> warningEventList = warningEventMapper.selectList(new QueryWrapper<WarningEvent>().lambda()
- .eq(WarningEvent::getIsdeleted,Constants.ZERO)
- .in(WarningEvent::getWarningId,setWarningIdList)
- .apply(Objects.nonNull(warningRule.getIntervalSec())," DATE_ADD(CREATE_DATE , INTERVAL "+warningRule.getIntervalSec()+" SECOND) > now() ")
- );
- if(this.processWarnFlag(wList,warningEventList)){
- resultList.add(ruleId);
- }
- }
- }
- }
- return resultList;
- }
- return new ArrayList<>();
-
-
}
@@ -908,9 +827,9 @@
return false;
}
for (WarningRuleDetail warningRuleDetail:warningRuleDetails) {
- if(Objects.nonNull(warningRuleDetail.getDeviceId())){
+ if(Objects.nonNull(warningRuleDetail.getRegionId())){
if(warningEventList.stream().filter(i->Constants.equalsInteger(i.getWarningId(),warningRuleDetail.getWarningId())
- && StringUtils.isNotBlank(i.getDeviceId()) && i.getDeviceId().equals(warningRuleDetail.getDeviceId())
+ && StringUtils.isNotBlank(i.getRegionId()) && i.getRegionId().equals(warningRuleDetail.getRegionId())
).collect(Collectors.toList()).size()<=Constants.ZERO){
return false;
}
--
Gitblit v1.9.3