From 2fd6e6eda3be29e5d77519fd0ca75ae172a11c46 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期二, 16 十二月 2025 18:25:17 +0800
Subject: [PATCH] 最新版本541200007
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPushServiceImpl.java | 27 +++++++++++++--------------
1 files changed, 13 insertions(+), 14 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPushServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPushServiceImpl.java
index 43142cd..eb48099 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPushServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPushServiceImpl.java
@@ -156,8 +156,9 @@
}
if(delRetentionLis.size()>0){
//鍏堝垹闄ゅ師鏈夌殑鍦ㄥ満浜哄憳(鍐呴儴浜哄憳锛�
+ //@ApiModelProperty(value = "绫诲瀷 0鍔冲姟璁垮 1鏅�氳瀹� 2鍐呴儴鍛樺伐 3杞﹁締淇℃伅 4鐩稿叧鏂逛汉鍛� 5璐ц繍鍙告満 ")
retentionMapper.delete(new UpdateWrapper<Retention>().lambda()
-// .eq(Retention::getType,Constants.memberType.internal)
+ .ne(Retention::getType,Constants.THREE)
.in(Retention::getMemberId,delRetentionLis));
}
if(retentionList.size()>0){
@@ -502,22 +503,22 @@
warningEvent.setSrcType(request.getSrcType());
warningEvent.setSrcName(request.getSrcName());
warningEvent.setWarningId(warning.getId());
+ warningEvent.setDeviceId(request.getSrcIndex());
warningEventMapper.insert(warningEvent);
if(Objects.nonNull(warningConfig)){
List<Integer> ruleIdList = impl.processWarnFront(warningConfig);
+
Boolean falg = true;
if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(ruleIdList)){
- for (Integer ruleId:ruleIdList) {
+ Set<Integer> ruleIdSet = new HashSet<>(ruleIdList);
+ for (Integer ruleId:ruleIdSet) {
WarningRule warningRule = warningRuleMapper.selectById(ruleId);
if (Objects.isNull(warningRule)) {
break;
}
List<Member> memberList = impl.getWarningRuleMemberList(warningRule);
- if (com.github.xiaoymin.knife4j.core.util.CollectionUtils.isEmpty(memberList)) {
- break;
- }
try {
WarningPush warningPush = new WarningPush();
warningPush.setCreateDate(new Date());
@@ -530,15 +531,13 @@
warningPush.setPushType(Constants.ZERO);
//TODO 鏍规嵁鍏蜂綋鏁版嵁瀵规瘮鑾峰彇
warningPush.setRegion( "鏈煡浣嶇疆");
- 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()), ",")
- );
-
+ if (com.github.xiaoymin.knife4j.core.util.CollectionUtils.isEmpty(memberList)) {
+ 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()), ",")
+ );
+ }
if(Constants.equalsInteger(warningRule.getMemberNotice(),Constants.ONE)){
// 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()),","),
--
Gitblit v1.9.3