From 3c9e375697f758e43beeaba61c78d4c303d1f2d3 Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期五, 30 一月 2026 13:56:37 +0800
Subject: [PATCH] 功能优化
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPushServiceImpl.java | 17 +++++++++++------
1 files changed, 11 insertions(+), 6 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 f60b08a..3b7589b 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
@@ -6,6 +6,7 @@
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.doumee.biz.system.SystemDictDataBiz;
import com.doumee.config.DataSyncConfig;
+import com.doumee.core.dingTalk.DingTalk;
import com.doumee.core.haikang.model.HKConstants;
import com.doumee.core.haikang.model.param.BaseResponse;
import com.doumee.core.haikang.model.param.request.*;
@@ -115,6 +116,8 @@
private WarningRuleMapper warningRuleMapper;
@Autowired
private WarningPushMapper warningPushMapper;
+ @Autowired
+ private DingTalk dingTalk;
/**
* 娴峰悍闂ㄧ浜嬩欢鎺ㄩ��
@@ -530,7 +533,7 @@
warningPush.setStatus(Constants.ZERO);
warningPush.setPushType(Constants.ZERO);
warningPush.setRegion( warningEvent.getRegion());
- if (com.github.xiaoymin.knife4j.core.util.CollectionUtils.isEmpty(memberList)) {
+ if (com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(memberList)) {
warningPush.setMemberIds(
StringUtils.join(memberList.stream().map(i -> i.getId()).collect(Collectors.toList()), ",")
);
@@ -538,16 +541,18 @@
);
}
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()),","),
-// dingTalk.getAlarmNoticeMsg(warningPush.getRegion(),DateUtil.getCurrDateTime(),warningConfig.getInfo()));
-// warningPush.setStatus(noticeFlag?Constants.ONE:Constants.TWO);
+ Boolean noticeFlag = false;
+// if (com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(memberList)) {
+// 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(),warningConfig.getInfo()));
+// }
+ warningPush.setStatus(noticeFlag?Constants.ONE:Constants.TWO);
List<String> ddUserIdList = memberList.stream().filter(i->StringUtils.isNotBlank(i.getDdId())).map(i->i.getDdId()).collect(Collectors.toList());
if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(ddUserIdList)){
for (String ddUserId:ddUserIdList) {
impl.getJDYData(warningEvent,ddUserId,
systemDictDataBiz.queryByCode(Constants.JDY_CONFIG,Constants.JDY_ENTRY_ID).getCode()
-
);
}
}
--
Gitblit v1.9.3