From 1c4de3dad5e7c505f08cd6020d29b84a60668b02 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 23 四月 2025 09:43:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/visits/dmvisit_service/src/main/java/com/doumee/core/wx/wxPlat/WxPlatNotice.java | 81 ++++++++++++++++++++++++++++++++++++----
1 files changed, 72 insertions(+), 9 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/wx/wxPlat/WxPlatNotice.java b/server/visits/dmvisit_service/src/main/java/com/doumee/core/wx/wxPlat/WxPlatNotice.java
index fdf6301..ae2a8a3 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/core/wx/wxPlat/WxPlatNotice.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/core/wx/wxPlat/WxPlatNotice.java
@@ -3,11 +3,16 @@
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.doumee.biz.system.SystemDictDataBiz;
+import com.doumee.core.haikang.model.HKConstants;
+import com.doumee.core.haikang.model.param.BaseResponse;
+import com.doumee.core.haikang.service.HKService;
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.DateUtil;
import com.doumee.core.utils.HttpsUtil;
import com.doumee.dao.business.WxNoticeConfigMapper;
import com.doumee.dao.business.model.*;
+import com.doumee.dao.system.model.SystemDictData;
+import com.doumee.service.business.third.model.ApiResponse;
import com.github.xiaoymin.knife4j.core.util.CollectionUtils;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
@@ -65,6 +70,20 @@
}
}
+
+
+ public String getToken (SystemDictDataBiz systemDictDataBiz){
+ String token = null;
+ BaseResponse<String> result = HKService.wxAccessToken(systemDictDataBiz.queryByCode(Constants.HK_PARAM,Constants.HK_WXTOKEN_CONFIGID).getCode(),
+ systemDictDataBiz.queryByCode(Constants.HK_PARAM,Constants.HK_WXTOKEN_TAGID).getCode());
+ log.warn("鑾峰彇娴峰悍寰俊token淇℃伅", JSONObject.toJSONString(result));
+ if(StringUtils.equals(result.getCode(), HKConstants.RESPONSE_SUCCEE) ){
+ token= result.getData();
+ }
+ return token;
+ }
+
+
/**
* 璁垮鐢宠/鎶ュ涓氬姟閫氱煡
* @param wxNoticeConfigMapper
@@ -72,7 +91,11 @@
* @param objCode visitUpload,visitAuditSuccess,visitWaitAudit锛寁isitWaitAudit,visitReportUpload锛寁isitReportAuditSuccess锛寁isitReportAuditFail, visitReportAuditSuccess
* @param openIds
*/
- public void sendVisitTemplateNotice(SystemDictDataBiz systemDictDataBiz,WxNoticeConfigMapper wxNoticeConfigMapper, Visits visits, String objCode, String token, List<String> openIds){
+ public void sendVisitTemplateNotice(SystemDictDataBiz systemDictDataBiz,WxNoticeConfigMapper wxNoticeConfigMapper, Visits visits, String objCode, List<String> openIds){
+ String token = this.getToken(systemDictDataBiz);
+ if(StringUtils.isBlank(token)){
+ return;
+ }
try{
if(CollectionUtils.isNotEmpty(openIds)){
WxNoticeConfig wxNoticeConfig = wxNoticeConfigMapper.selectOne(new QueryWrapper<WxNoticeConfig>().lambda()
@@ -148,6 +171,10 @@
* @param openIds
*/
public void sendHiddenDangerUploadTemplateNotice(SystemDictDataBiz systemDictDataBiz,WxNoticeConfigMapper wxNoticeConfigMapper, HiddenDanger hiddenDanger, String objCode,String token, List<String> openIds){
+ token = this.getToken(systemDictDataBiz);
+ if(StringUtils.isBlank(token)){
+ return;
+ }
try{
if(CollectionUtils.isNotEmpty(openIds)){
WxNoticeConfig wxNoticeConfig = wxNoticeConfigMapper.selectOne(new QueryWrapper<WxNoticeConfig>().lambda().eq(WxNoticeConfig::getObjType,WxPlatConstants.hiddenDanger)
@@ -215,6 +242,10 @@
* @param openIds
*/
public void sendHiddenDangerDealTemplateNotice(SystemDictDataBiz systemDictDataBiz,WxNoticeConfigMapper wxNoticeConfigMapper, HiddenDanger hiddenDanger, String objCode,String token, List<String> openIds){
+ token = this.getToken(systemDictDataBiz);
+ if(StringUtils.isBlank(token)){
+ return;
+ }
try{
if(CollectionUtils.isNotEmpty(openIds)){
WxNoticeConfig wxNoticeConfig = wxNoticeConfigMapper.selectOne(new QueryWrapper<WxNoticeConfig>().lambda().eq(WxNoticeConfig::getObjType,WxPlatConstants.hiddenDanger)
@@ -284,8 +315,12 @@
* @param openIds
* @param sendType 0=鐢宠浜猴紱1=瀹℃壒浜�
*/
- public void sendCarUseBookTemplateNotice(SystemDictDataBiz systemDictDataBiz,WxNoticeConfigMapper wxNoticeConfigMapper, CarUseBook carUseBook, String objCode,String token,
+ public void sendCarUseBookTemplateNotice(SystemDictDataBiz systemDictDataBiz,WxNoticeConfigMapper wxNoticeConfigMapper, CarUseBook carUseBook, String objCode,
List<String> openIds,Integer sendType){
+ String token = this.getToken(systemDictDataBiz);
+ if(StringUtils.isBlank(token)){
+ return;
+ }
try {
if(CollectionUtils.isNotEmpty(openIds)){
WxNoticeConfig wxNoticeConfig = wxNoticeConfigMapper.selectOne(new QueryWrapper<WxNoticeConfig>().lambda().eq(WxNoticeConfig::getObjType,WxPlatConstants.carUse)
@@ -368,8 +403,12 @@
* @param openIds
* @param sendType 0=鐢宠浜猴紱1=瀹℃壒浜�
*/
- public void sendPlatformBookTemplateNotice(SystemDictDataBiz systemDictDataBiz, WxNoticeConfigMapper wxNoticeConfigMapper, PlatformBooks platformBooks, String objCode, String token,
+ public void sendPlatformBookTemplateNotice(SystemDictDataBiz systemDictDataBiz, WxNoticeConfigMapper wxNoticeConfigMapper, PlatformBooks platformBooks, String objCode,
List<String> openIds, Integer sendType){
+ String token = this.getToken(systemDictDataBiz);
+ if(StringUtils.isBlank(token)){
+ return;
+ }
try{
if(CollectionUtils.isNotEmpty(openIds)){
WxNoticeConfig wxNoticeConfig = wxNoticeConfigMapper.selectOne(new QueryWrapper<WxNoticeConfig>().lambda().eq(WxNoticeConfig::getObjType,WxPlatConstants.platformBook)
@@ -451,8 +490,12 @@
* @param objCode platformJobNewJob
* @param openIds
*/
- public void sendWmsTemplateNotice(SystemDictDataBiz systemDictDataBiz, WxNoticeConfigMapper wxNoticeConfigMapper, PlatformJob platformJob, String objCode,String token,
+ public void sendWmsTemplateNotice(SystemDictDataBiz systemDictDataBiz, WxNoticeConfigMapper wxNoticeConfigMapper, PlatformJob platformJob, String objCode,
List<String> openIds){
+ String token = this.getToken(systemDictDataBiz);
+ if(StringUtils.isBlank(token)){
+ return;
+ }
try{
if(CollectionUtils.isNotEmpty(openIds)){
WxNoticeConfig wxNoticeConfig = wxNoticeConfigMapper.selectOne(new QueryWrapper<WxNoticeConfig>().lambda().eq(WxNoticeConfig::getObjType,WxPlatConstants.visit)
@@ -513,8 +556,12 @@
* @param objCode platformJobNewJob
* @param openIds
*/
- public void sendWmsCancelTemplateNotice(SystemDictDataBiz systemDictDataBiz,WxNoticeConfigMapper wxNoticeConfigMapper, PlatformJob platformJob, String objCode,String token,
+ public void sendWmsCancelTemplateNotice(SystemDictDataBiz systemDictDataBiz,WxNoticeConfigMapper wxNoticeConfigMapper, PlatformJob platformJob, String objCode,
List<String> openIds){
+ String token = this.getToken(systemDictDataBiz);
+ if(StringUtils.isBlank(token)){
+ return;
+ }
try{
if(CollectionUtils.isNotEmpty(openIds)){
WxNoticeConfig wxNoticeConfig = wxNoticeConfigMapper.selectOne(new QueryWrapper<WxNoticeConfig>().lambda().eq(WxNoticeConfig::getObjType,WxPlatConstants.platformJob)
@@ -573,8 +620,12 @@
* @param token
* @param openIds
*/
- public void sendPlatformJobTemplateNotice(SystemDictDataBiz systemDictDataBiz,WxNoticeConfigMapper wxNoticeConfigMapper, PlatformJob platformJob, String objCode,String token,
+ public void sendPlatformJobTemplateNotice(SystemDictDataBiz systemDictDataBiz,WxNoticeConfigMapper wxNoticeConfigMapper, PlatformJob platformJob, String objCode,
List<String> openIds){
+ String token = this.getToken(systemDictDataBiz);
+ if(StringUtils.isBlank(token)){
+ return;
+ }
try{
if(CollectionUtils.isNotEmpty(openIds)){
WxNoticeConfig wxNoticeConfig = wxNoticeConfigMapper.selectOne(new QueryWrapper<WxNoticeConfig>().lambda().eq(WxNoticeConfig::getObjType,WxPlatConstants.platformJob)
@@ -640,8 +691,12 @@
* @param token
* @param openIds
*/
- public void sendPlatformJobSignNotice(WxNoticeConfigMapper wxNoticeConfigMapper, PlatformJob platformJob, String objCode,String token,
+ public void sendPlatformJobSignNotice(SystemDictDataBiz systemDictDataBiz,WxNoticeConfigMapper wxNoticeConfigMapper, PlatformJob platformJob, String objCode,
List<String> openIds){
+ String token = this.getToken(systemDictDataBiz);
+ if(StringUtils.isBlank(token)){
+ return;
+ }
try{
if(CollectionUtils.isNotEmpty(openIds)){
WxNoticeConfig wxNoticeConfig = wxNoticeConfigMapper.selectOne(new QueryWrapper<WxNoticeConfig>().lambda().eq(WxNoticeConfig::getObjType,WxPlatConstants.platformJob)
@@ -724,8 +779,12 @@
}
}
- public void sendUnFinishNotice(WxNoticeConfigMapper wxNoticeConfigMapper,Integer unFinishNum,String objCode,String token,
+ public void sendUnFinishNotice(SystemDictDataBiz systemDictDataBiz,WxNoticeConfigMapper wxNoticeConfigMapper,Integer unFinishNum,String objCode,
List<String> openIds){
+ String token = this.getToken(systemDictDataBiz);
+ if(StringUtils.isBlank(token)){
+ return;
+ }
try{
if(CollectionUtils.isNotEmpty(openIds)){
WxNoticeConfig wxNoticeConfig = wxNoticeConfigMapper.selectOne(new QueryWrapper<WxNoticeConfig>().lambda().eq(WxNoticeConfig::getObjType,WxPlatConstants.platformJob)
@@ -775,7 +834,11 @@
}
- public void sendMeetTemplateNotice(SystemDictDataBiz systemDictDataBiz,SmsEmail smsEmail,String token){
+ public void sendMeetTemplateNotice(SystemDictDataBiz systemDictDataBiz,SmsEmail smsEmail){
+ String token = this.getToken(systemDictDataBiz);
+ if(StringUtils.isBlank(token)){
+ return;
+ }
try{
String jumpUrl = Constants.getWxUrl(systemDictDataBiz.queryByCode(Constants.PLATFORM,Constants.WX_REDIRECT_URL).getCode(),
Constants.WxUrlParams.MEETING,smsEmail.getObjId().toString());
--
Gitblit v1.9.3