From 75abcb2a6046bb332646e71b550edb767cd3ea77 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 26 五月 2025 18:20:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncNoticeServiceImpl.java | 60 ++++++++++++++++++++++++++++--------------------------------
1 files changed, 28 insertions(+), 32 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 34f2c0d..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;
@@ -58,6 +44,26 @@
}
Constants.DEALING_HK_NOTICE_LIST =true;
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)
+ .eq(Member::getType,Constants.TWO)
+ .eq(Member::getIsdeleted,Constants.ZERO));
+ Member tu= getFromUserList(username,userList);
+ if(tu!=null){
+ userIds.add(tu.getId());
+ }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;
@@ -66,7 +72,7 @@
while (hasNext){
//鍒嗛〉閬嶅巻寰幆鏌ヨ鎵�鏈夐棬绂佽澶囨暟鎹�
GetTodoListRequest param = new GetTodoListRequest();
- param.setComId("dfe");
+// param.setComId("dfe");//鎺ュ叏閮ㄧ殑浠ｅ姙
param.setUserId(username);
param.setStatus(1);//鍙煡寰呭鐞嗙殑鏁版嵁
param.setPageNo(curPage);
@@ -88,16 +94,10 @@
}
curPage++;
}
- if(allHkList!=null && allHkList.size()>0){
- List<Notices> list = new ArrayList<>();
- List<String> users = new ArrayList<>();
- for(GetTodoListResponse data :allHkList){
- users.add(data.getUserId());
- }
- List<Integer> userIds = new ArrayList<>();
- List<Member > userList = memberMapper.selectList(new QueryWrapper<Member>().lambda()
- .in(Member::getPhone,users)
- .eq(Member::getIsdeleted,Constants.ZERO));
+
+
+ if(allHkList!=null && allHkList.size()>0){
+ List<Notices> list = new ArrayList<>();
for(GetTodoListResponse data :allHkList){
Member u = getFromUserList(data.getUserId(),userList);
if(u==null){
@@ -111,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()));
@@ -132,11 +132,7 @@
notices.setType(Constants.noticesObjectType.hknotice);
list.add(notices);
}
- if(list.size()>0){
- //娓呯┖娴峰悍鍏ㄩ儴鐨勪唬鍔炴暟鎹�
- noticesJoinMapper.delete(new UpdateWrapper<Notices>().lambda()
- .eq(Notices::getType, Constants.noticesObjectType.hknotice)
- .in(Notices::getUserId, userIds));
+ if(list.size()>0){
noticesJoinMapper.insert(list);//鎵归噺鎻掑叆璁板綍
}
}
--
Gitblit v1.9.3