From 4248fbfb4f6a43cbb4884523f599d7719d1ba1c6 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 09 五月 2025 13:56:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncNoticeServiceImpl.java | 34 ++++++++++------------------------
1 files changed, 10 insertions(+), 24 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncNoticeServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncNoticeServiceImpl.java
index a026c36..9b0200c 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncNoticeServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncNoticeServiceImpl.java
@@ -3,7 +3,6 @@
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.doumee.biz.system.SystemDictDataBiz;
import com.doumee.core.constants.ResponseStatus;
import com.doumee.core.exception.BusinessException;
import com.doumee.core.haikang.model.HKConstants;
@@ -13,24 +12,11 @@
import com.doumee.core.haikang.model.param.respose.*;
import com.doumee.core.haikang.service.HKService;
import com.doumee.core.utils.Constants;
-import com.doumee.core.utils.DESUtil;
import com.doumee.core.utils.DateUtil;
-import com.doumee.core.utils.ImageBase64Util;
-import com.doumee.core.wx.wxPlat.WxPlatNotice;
-import com.doumee.dao.business.DeviceRoleMapper;
-import com.doumee.dao.business.MemberMapper;
-import com.doumee.dao.business.RetentionMapper;
-import com.doumee.dao.business.join.VisitsJoinMapper;
-import com.doumee.dao.business.model.DeviceRole;
+import com.doumee.dao.business.dao.MemberMapper;
import com.doumee.dao.business.model.Member;
-import com.doumee.dao.business.model.Retention;
-import com.doumee.dao.business.model.Visits;
-import com.doumee.dao.system.SystemUserMapper;
import com.doumee.dao.system.join.NoticesJoinMapper;
import com.doumee.dao.system.model.Notices;
-import com.doumee.dao.system.model.SystemUser;
-import com.doumee.service.system.NoticesService;
-import com.github.yulichang.wrapper.MPJLambdaWrapper;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -60,6 +46,7 @@
try {
List<String> users = new ArrayList<>();
users.add(username);
+
List<Integer> userIds = new ArrayList<>();
List<Member > userList = memberMapper.selectList(new QueryWrapper<Member>().lambda()
.in(Member::getPhone,users)
@@ -71,6 +58,12 @@
}else{
throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(), "瀵逛笉璧凤紝鏃犳晥璐﹀彿~");
}
+ if(userIds.size()>0){
+ //娓呯┖娴峰悍鍏ㄩ儴鐨勪唬鍔炴暟鎹�
+ noticesJoinMapper.delete(new UpdateWrapper<Notices>().lambda()
+ .eq(Notices::getType, Constants.noticesObjectType.hknotice)
+ .in(Notices::getUserId, userIds));
+ }
Date date = new Date();
List<GetTodoListResponse> allHkList = new ArrayList<>();
boolean hasNext = true;
@@ -79,7 +72,7 @@
while (hasNext){
//鍒嗛〉閬嶅巻寰幆鏌ヨ鎵�鏈夐棬绂佽澶囨暟鎹�
GetTodoListRequest param = new GetTodoListRequest();
- param.setComId("dfe");
+// param.setComId("dfe");//鎺ュ叏閮ㄧ殑浠ｅ姙
param.setUserId(username);
param.setStatus(1);//鍙煡寰呭鐞嗙殑鏁版嵁
param.setPageNo(curPage);
@@ -118,7 +111,7 @@
param.put("componentMenuId", data.getMenuCode());
JSONObject c = new JSONObject();
c.put("method","dealTlncMsg");
- c.put("argument",JSONObject.toJSONString(data));
+ c.put("argument", data);
param.put("callback",c);
Notices notices = new Notices();
notices.setCreateDate(DateUtil.getISO8601DateByStr(data.getMsgCreateTimeIso()));
@@ -143,13 +136,6 @@
noticesJoinMapper.insert(list);//鎵归噺鎻掑叆璁板綍
}
}
- if(userIds.size()>0){
- //娓呯┖娴峰悍鍏ㄩ儴鐨勪唬鍔炴暟鎹�
- noticesJoinMapper.delete(new UpdateWrapper<Notices>().lambda()
- .eq(Notices::getType, Constants.noticesObjectType.hknotice)
- .in(Notices::getUserId, userIds));
- }
-
}catch (Exception e){
e.printStackTrace();
}finally {
--
Gitblit v1.9.3