From 92d9a112e492720ee610fbb46e1ed1d6f0a86fee Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期四, 11 十二月 2025 14:57:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wuhuyancao' into wuhuyancao
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPushServiceImpl.java | 7 +++++--
1 files changed, 5 insertions(+), 2 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 50a1a94..c9f4e40 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){
@@ -482,7 +483,7 @@
for(EventBaseInfoRequest request : events){
Warning warning = warningMapper.selectOne(new QueryWrapper<Warning>().lambda()
.eq(Warning::getIsdeleted,Constants.ZERO)
- .eq(Warning::getCode, request.getSrcType()).last("limit 1"));
+ .eq(Warning::getCode, request.getEventType()).last("limit 1"));
Constants.WarningConfig warningConfig = Constants.WarningConfig.getConfig(request.getEventType());
@@ -501,6 +502,8 @@
warningEvent.setSrcIndex(request.getSrcIndex());
warningEvent.setSrcType(request.getSrcType());
warningEvent.setSrcName(request.getSrcName());
+ warningEvent.setWarningId(warning.getId());
+ warningEvent.setDeviceId(request.getSrcIndex());
warningEventMapper.insert(warningEvent);
if(Objects.nonNull(warningConfig)){
--
Gitblit v1.9.3