From 4f6565cb9cca05981abdeb85dfc023a28c892e42 Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期三, 05 十一月 2025 16:42:45 +0800
Subject: [PATCH] 钥匙柜信息处理
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkCabinetLogServiceImpl.java | 116 ++++++++++++++++++++++++++++-----------------------------
1 files changed, 57 insertions(+), 59 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkCabinetLogServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkCabinetLogServiceImpl.java
index 56eae5b..2f683d5 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkCabinetLogServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkCabinetLogServiceImpl.java
@@ -216,70 +216,68 @@
.orderByDesc(JkCabinetLog::getCreateDate);
List<JkCabinetLog> jkCabinetLogs = jkCabinetLogMapper.selectJoinList(JkCabinetLog.class,wrapper);
if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(jkCabinetLogs)){
+
List<Integer> ruleIdList = impl.processWarnFront(warningConfig);
- if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isEmpty(ruleIdList)){
- return;
- }
- if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isEmpty(ruleIdList)){
- return;
- }
- for (Integer ruleId:ruleIdList) {
- WarningRule warningRule = warningRuleMapper.selectById(ruleId);
- if (Objects.isNull(warningRule)) {
- continue;
- }
- List<Member> memberList = impl.getWarningRuleMemberList(warningRule);
- if (com.github.xiaoymin.knife4j.core.util.CollectionUtils.isEmpty(memberList)) {
- return;
- }
- for (JkCabinetLog jkCabinetLog:jkCabinetLogs) {
- String content = "銆愯溅杈�-"+jkCabinetLog.getCarCode()+"閽ュ寵銆戠敱+"+(StringUtils.isNotBlank(jkCabinetLog.getMemberName())?jkCabinetLog.getMemberName():"鏈煡浜哄憳")+"鍊熷嚭锛岃秴鏃舵湭褰掕繕";
+ for (JkCabinetLog jkCabinetLog:jkCabinetLogs) {
+ String content = "銆愯溅杈�-"+jkCabinetLog.getCarCode()+"閽ュ寵銆戠敱+"+(StringUtils.isNotBlank(jkCabinetLog.getMemberName())?jkCabinetLog.getMemberName():"鏈煡浜哄憳")+"鍊熷嚭锛岃秴鏃舵湭褰掕繕";
+ //瀛樺偍鎶ヨ寮傚父璁板綍
+ WarningEvent warningEvent = new WarningEvent();
+ warningEvent.setCreateDate(new Date());
+ warningEvent.setWarningId(warning.getId());
+ warningEvent.setTitle(warningConfig.getInfo());
+ warningEvent.setContent(content );
+ warningEvent.setStatus(Constants.ZERO);
+ warningEvent.setRegion( StringUtils.isNotBlank(jkCabinetLog.getLocation())?jkCabinetLog.getLocation():"鏈煡浣嶇疆");
+ warningEventMapper.insert(warningEvent);
+ Boolean falg = false;
+ if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(ruleIdList)){
+ for (Integer ruleId:ruleIdList) {
+ WarningRule warningRule = warningRuleMapper.selectById(ruleId);
+ if (Objects.isNull(warningRule)) {
+ continue;
+ }
+ List<Member> memberList = impl.getWarningRuleMemberList(warningRule);
+ if (com.github.xiaoymin.knife4j.core.util.CollectionUtils.isEmpty(memberList)) {
+ continue;
+ }
+ try {
+ WarningPush warningPush = new WarningPush();
+ warningPush.setCreateDate(new Date());
+ warningPush.setIsdeleted(Constants.ZERO);
+ warningPush.setWarningId(warning.getId());
+ warningPush.setTitle(warningConfig.getInfo());
- //瀛樺偍鎶ヨ寮傚父璁板綍
- WarningEvent warningEvent = new WarningEvent();
- warningEvent.setCreateDate(new Date());
- warningEvent.setWarningId(warning.getId());
- warningEvent.setTitle(warningConfig.getInfo());
- warningEvent.setContent(content );
- warningEvent.setStatus(Constants.ZERO);
- warningEvent.setRegion( StringUtils.isNotBlank(jkCabinetLog.getLocation())?jkCabinetLog.getLocation():"鏈煡浣嶇疆");
- warningEventMapper.insert(warningEvent);
-
-
- try {
- WarningPush warningPush = new WarningPush();
- warningPush.setCreateDate(new Date());
- warningPush.setIsdeleted(Constants.ZERO);
- warningPush.setWarningId(warning.getId());
- warningPush.setTitle(warningConfig.getInfo());
-
- warningPush.setContent(content);
- warningPush.setStatus(Constants.ZERO);
- warningPush.setPushType(Constants.ZERO);
- warningPush.setRegion(StringUtils.isNotBlank(jkCabinetLog.getLocation()) ? jkCabinetLog.getLocation() : "鏈煡浣嶇疆");
- warningPush.setMemberIds(
- StringUtils.join(memberList.stream().map(i -> i.getId()).collect(Collectors.toList()), ",")
- );
- warningPush.setMemberIds(
- StringUtils.join(memberList.stream().map(i -> i.getId()).collect(Collectors.toList()), ",")
- );
- warningPush.setMemberNames(StringUtils.join(memberList.stream().map(i -> i.getName()).collect(Collectors.toList()), ",")
- );
- //todo 鏆傛椂鍏抽棴 閽夐拤閫氱煡
-
- // Boolean noticeFlag = dingTalk.workInfoOANotice(Long.valueOf(systemDictDataBiz.queryByCode(Constants.DD_TALK,Constants.AGENT_ID).getCode()),
- // StringUtils.join(memberList.stream().filter(i->StringUtils.isNotBlank(i.getDdId())).map(i->i.getDdId()).collect(Collectors.toList()),","),
- // dingTalk.getAlarmNoticeMsg(warningPush.getRegion(),DateUtil.getCurrDateTime(),content));
- // warningPush.setStatus(noticeFlag?Constants.ONE:Constants.TWO);
- warningPushMapper.insert(warningPush);
- warningEvent.setStatus(Constants.ONE);
- warningEventMapper.updateById(warningEvent);
- }catch (Exception e){
- warningEvent.setStatus(Constants.TWO);
- warningEventMapper.updateById(warningEvent);
+ warningPush.setContent(content);
+ warningPush.setStatus(Constants.ZERO);
+ warningPush.setPushType(Constants.ZERO);
+ warningPush.setRegion(StringUtils.isNotBlank(jkCabinetLog.getLocation()) ? jkCabinetLog.getLocation() : "鏈煡浣嶇疆");
+ warningPush.setMemberIds(
+ StringUtils.join(memberList.stream().map(i -> i.getId()).collect(Collectors.toList()), ",")
+ );
+ warningPush.setMemberIds(
+ StringUtils.join(memberList.stream().map(i -> i.getId()).collect(Collectors.toList()), ",")
+ );
+ warningPush.setMemberNames(StringUtils.join(memberList.stream().map(i -> i.getName()).collect(Collectors.toList()), ",")
+ );
+ // todo 鏆傛椂鍏抽棴 閽夐拤閫氱煡
+ // Boolean noticeFlag = dingTalk.workInfoOANotice(Long.valueOf(systemDictDataBiz.queryByCode(Constants.DD_TALK,Constants.AGENT_ID).getCode()),
+ // StringUtils.join(memberList.stream().filter(i->StringUtils.isNotBlank(i.getDdId())).map(i->i.getDdId()).collect(Collectors.toList()),","),
+ // dingTalk.getAlarmNoticeMsg(warningPush.getRegion(),DateUtil.getCurrDateTime(),content));
+ // warningPush.setStatus(noticeFlag?Constants.ONE:Constants.TWO);
+ warningPushMapper.insert(warningPush);
+ falg = true;
+ }catch (Exception e){
+ warningEvent.setStatus(Constants.TWO);
+ warningEventMapper.updateById(warningEvent);
+ }
}
}
+ if(falg){
+ warningEvent.setStatus(Constants.ONE);
+ warningEventMapper.updateById(warningEvent);
+ }
+
--
Gitblit v1.9.3