From 6e7b6dbd76c9c6356e5846c5bb82a132a3f731db Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期一, 29 九月 2025 17:07:20 +0800
Subject: [PATCH] 最新版本541200007
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncNoticeServiceImpl.java | 67 +++++++++++++++++----------------
1 files changed, 35 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..6891560 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
@@ -13,29 +13,17 @@
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;
import org.springframework.stereotype.Service;
+import java.net.URLEncoder;
import java.util.*;
/**
@@ -49,6 +37,8 @@
@Autowired
private NoticesJoinMapper noticesJoinMapper;
@Autowired
+ private SystemDictDataBiz systemDictDataBiz;
+ @Autowired
private MemberMapper memberMapper;
@Override
@@ -58,6 +48,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 +76,7 @@
while (hasNext){
//鍒嗛〉閬嶅巻寰幆鏌ヨ鎵�鏈夐棬绂佽澶囨暟鎹�
GetTodoListRequest param = new GetTodoListRequest();
- param.setComId("dfe");
+// param.setComId("dfe");//鎺ュ叏閮ㄧ殑浠ｅ姙
param.setUserId(username);
param.setStatus(1);//鍙煡寰呭鐞嗙殑鏁版嵁
param.setPageNo(curPage);
@@ -88,16 +98,9 @@
}
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){
+ String gotoUrl = systemDictDataBiz.queryByCode(Constants.HK_PARAM,Constants.HK_WEBSITE_DOMAIN_URL).getCode();
+ List<Notices> list = new ArrayList<>();
for(GetTodoListResponse data :allHkList){
Member u = getFromUserList(data.getUserId(),userList);
if(u==null){
@@ -105,13 +108,12 @@
}
userIds.add(u.getId());
JSONObject param = new JSONObject();
-
param.put("componentId","dfe");
param.put("msgType","tlnc");
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()));
@@ -130,13 +132,14 @@
notices.setParam3(data.getMsgCreateTime());
notices.setParam5(JSONObject.toJSONString(param));
notices.setType(Constants.noticesObjectType.hknotice);
+// notices.setRemark(gotoUrl+"dps/web/wxAuth/loginV2?oaId=atwl&redirectId=index");
+ //https://atwl.ahzyssl.com/dps/web/wxAuth/loginV2?oaId=atwl&redirectUrl=encode(url)
+ String domainUrl = gotoUrl + HKConstants.InterfacePath.wxAuthUrl[0];
+ notices.setRemark(domainUrl+ URLEncoder.encode("/"+StringUtils.defaultString(data.getSegmentId(),"")
+ +StringUtils.defaultString(data.getH5Url(),""),"utf-8"));
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