From 53b6400ec10c8ca61ccec91c82c358d2488eead8 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 20 十二月 2024 09:50:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/visits/dmvisit_service/src/main/java/com/doumee/core/wx/wxPlat/WxPlatNotice.java | 48 +++++++++++++++++++++++-------------------------
1 files changed, 23 insertions(+), 25 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 ddccf93..d045111 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
@@ -95,16 +95,16 @@
}
Constants.WxUrlParams wxUrlParams = Constants.WxUrlParams.VISIT_REPORT_RECORD_USER;
if(!Constants.equalsInteger(visits.getType(),Constants.TWO)){
- if(objCode.equals(WxPlatConstants.visitContent.visitUpload)){
+ if(!objCode.equals(WxPlatConstants.visitContent.visitWaitAudit)){
wxUrlParams = Constants.WxUrlParams.VISIT_RECORD_VISIT;
}else{
wxUrlParams = Constants.WxUrlParams.VISIT_RECORD_USER;
}
}
- String url = Constants.getWxUrl(systemDictDataBiz.queryByCode(Constants.PLATFORM,Constants.WX_REDIRECT_URL).getCode(),
+ String jumpUrl = Constants.getWxUrl(systemDictDataBiz.queryByCode(Constants.PLATFORM,Constants.WX_REDIRECT_URL).getCode(),
wxUrlParams
,visits.getId().toString());
- String jumpUrl = systemDictDataBiz.queryByCode(Constants.PLATFORM,Constants.SIGN_IN_QRCODE_PREFIX).getCode().replace( "${param}", url);
+
String postUrL = "https://api.weixin.qq.com/cgi-bin/message/template/send?access_token="+token;
//鏁翠綋鍙傛暟map
@@ -134,6 +134,7 @@
paramMap.put("touser", openId);
paramMap.put("data", dataMap);
String response = HttpsUtil.postJson(postUrL, JSONObject.toJSONString(paramMap));
+ log.warn("路==++--路鎺ㄩ�佸井淇℃ā鏉夸俊鎭烦杞湴鍧�锛歿}路--++==路", jumpUrl);
if(StringUtils.isBlank(response)){
log.warn("路==++--路鎺ㄩ�佸井淇℃ā鏉夸俊鎭細{}路--++==路", "澶辫触");
}else{
@@ -166,9 +167,9 @@
if(Objects.isNull(wxNoticeConfig)){
return;
}
- String url = Constants.getWxUrl(systemDictDataBiz.queryByCode(Constants.PLATFORM,Constants.WX_REDIRECT_URL).getCode(),
+ String jumpUrl = Constants.getWxUrl(systemDictDataBiz.queryByCode(Constants.PLATFORM,Constants.WX_REDIRECT_URL).getCode(),
Constants.WxUrlParams.HIDDEN_DANGER,hiddenDanger.getId().toString());
- String jumpUrl = systemDictDataBiz.queryByCode(Constants.PLATFORM,Constants.SIGN_IN_QRCODE_PREFIX).getCode().replace( "${param}", url);
+
String postUrL = "https://api.weixin.qq.com/cgi-bin/message/template/send?access_token="+token;
//鏁翠綋鍙傛暟map
@@ -233,9 +234,9 @@
if(Objects.isNull(wxNoticeConfig)){
return;
}
- String url = Constants.getWxUrl(systemDictDataBiz.queryByCode(Constants.PLATFORM,Constants.WX_REDIRECT_URL).getCode(),
+ String jumpUrl = Constants.getWxUrl(systemDictDataBiz.queryByCode(Constants.PLATFORM,Constants.WX_REDIRECT_URL).getCode(),
Constants.WxUrlParams.HIDDEN_DANGER,hiddenDanger.getId().toString());
- String jumpUrl = systemDictDataBiz.queryByCode(Constants.PLATFORM,Constants.SIGN_IN_QRCODE_PREFIX).getCode().replace( "${param}", url);
+
String postUrL = "https://api.weixin.qq.com/cgi-bin/message/template/send?access_token="+token;
//鏁翠綋鍙傛暟map
@@ -253,7 +254,7 @@
thing13.put("value",Constants.equalsInteger(hiddenDanger.getStatus(),Constants.ONE)?"闅愭偅宸叉暣鏀�":"闅愭偅宸查��鍥�");
//鎻愪氦浜�
Map<String, Object> thing10 = new HashMap<String,Object>();
- thing10.put("value",hiddenDanger.getCheckorName());
+ thing10.put("value",hiddenDanger.getMemberName());
//閫氱煡鏃堕棿
Map<String, Object> time16 = new HashMap<String,Object>();
time16.put("value", DateUtil.getFomartDate(hiddenDanger.getDealTime(),"yyyy骞碝M鏈坉d鏃� HH:mm:ss") );
@@ -304,9 +305,8 @@
if(Objects.isNull(wxNoticeConfig)){
return;
}
- String url = Constants.getWxUrl(systemDictDataBiz.queryByCode(Constants.PLATFORM,Constants.WX_REDIRECT_URL).getCode(),
+ String jumpUrl = Constants.getWxUrl(systemDictDataBiz.queryByCode(Constants.PLATFORM,Constants.WX_REDIRECT_URL).getCode(),
Constants.WxUrlParams.CAR_USE,carUseBook.getId().toString());
- String jumpUrl = systemDictDataBiz.queryByCode(Constants.PLATFORM,Constants.SIGN_IN_QRCODE_PREFIX).getCode().replace( "${param}", url);
String postUrL = "https://api.weixin.qq.com/cgi-bin/message/template/send?access_token="+token;
//鏁翠綋鍙傛暟map
@@ -392,9 +392,8 @@
if(!objCode.equals(WxPlatConstants.platformBookContent.platformBookUpload)){
wxUrlParams = Constants.WxUrlParams.PLATFORM_BOOK;
}
- String url = Constants.getWxUrl(systemDictDataBiz.queryByCode(Constants.PLATFORM,Constants.WX_REDIRECT_URL).getCode(),
+ String jumpUrl = Constants.getWxUrl(systemDictDataBiz.queryByCode(Constants.PLATFORM,Constants.WX_REDIRECT_URL).getCode(),
wxUrlParams,platformBooks.getId().toString());
- String jumpUrl = systemDictDataBiz.queryByCode(Constants.PLATFORM,Constants.SIGN_IN_QRCODE_PREFIX).getCode().replace( "${param}", url);
String postUrL = "https://api.weixin.qq.com/cgi-bin/message/template/send?access_token="+token;
//鏁翠綋鍙傛暟map
@@ -411,7 +410,7 @@
}else if(Constants.equalsInteger(platformBooks.getStatus(),Constants.TWO)){
const9.put("value","鐢宠宸插鏍搁�氳繃");
}else{
- const9.put("value","鐢宠鏈�氳繃");
+ const9.put("value","鐢宠宸插鏍搁┏鍥�");
}
}
//杞︾墝鍙�
@@ -438,6 +437,7 @@
paramMap.put("touser", openId);
paramMap.put("data", dataMap);
String response = HttpsUtil.postJson(postUrL, JSONObject.toJSONString(paramMap));
+ log.warn("路==++--路鎺ㄩ�佸井淇℃ā鏉夸俊鎭細{}", JSONObject.toJSONString(paramMap));
if(StringUtils.isBlank(response)){
log.warn("路==++--路鎺ㄩ�佸井淇℃ā鏉夸俊鎭細{}路--++==路", "澶辫触");
}else{
@@ -473,9 +473,8 @@
return;
}
- String url = Constants.getWxUrl(systemDictDataBiz.queryByCode(Constants.PLATFORM,Constants.WX_REDIRECT_URL).getCode(),
+ String jumpUrl = Constants.getWxUrl(systemDictDataBiz.queryByCode(Constants.PLATFORM,Constants.WX_REDIRECT_URL).getCode(),
Constants.WxUrlParams.PLATFORM_JOB_DRIVER,platformJob.getId().toString());
- String jumpUrl = systemDictDataBiz.queryByCode(Constants.PLATFORM,Constants.SIGN_IN_QRCODE_PREFIX).getCode().replace( "${param}", url);
String postUrL = "https://api.weixin.qq.com/cgi-bin/message/template/send?access_token="+token;
//鏁翠綋鍙傛暟map
@@ -536,9 +535,8 @@
return;
}
- String url = Constants.getWxUrl(systemDictDataBiz.queryByCode(Constants.PLATFORM,Constants.WX_REDIRECT_URL).getCode(),
+ String jumpUrl = Constants.getWxUrl(systemDictDataBiz.queryByCode(Constants.PLATFORM,Constants.WX_REDIRECT_URL).getCode(),
Constants.WxUrlParams.PLATFORM_JOB_DRIVER,platformJob.getId().toString());
- String jumpUrl = systemDictDataBiz.queryByCode(Constants.PLATFORM,Constants.SIGN_IN_QRCODE_PREFIX).getCode().replace( "${param}", url);
String postUrL = "https://api.weixin.qq.com/cgi-bin/message/template/send?access_token="+token;
//鏁翠綋鍙傛暟map
@@ -597,9 +595,8 @@
return;
}
- String url = Constants.getWxUrl(systemDictDataBiz.queryByCode(Constants.PLATFORM,Constants.WX_REDIRECT_URL).getCode(),
+ String jumpUrl = Constants.getWxUrl(systemDictDataBiz.queryByCode(Constants.PLATFORM,Constants.WX_REDIRECT_URL).getCode(),
Constants.WxUrlParams.PLATFORM_JOB_DRIVER,platformJob.getId().toString());
- String jumpUrl = systemDictDataBiz.queryByCode(Constants.PLATFORM,Constants.SIGN_IN_QRCODE_PREFIX).getCode().replace( "${param}", url);
String postUrL = "https://api.weixin.qq.com/cgi-bin/message/template/send?access_token="+token;
//鏁翠綋鍙傛暟map
@@ -610,17 +607,17 @@
Map<String, Object> const6 = new HashMap<String,Object>();
const6.put("value",wxNoticeConfig.getTitile());
//杞︾墝鍙�
- Map<String, Object> character_string1 = new HashMap<String,Object>();
- character_string1.put("value",platformJob.getCarCodeFront());
+ Map<String, Object> car_number3 = new HashMap<String,Object>();
+ car_number3.put("value",platformJob.getCarCodeFront());
//鏈堝彴鍙�
- Map<String, Object> thing3 = new HashMap<String,Object>();
- thing3.put("value", platformJob.getPlatformName());
+ Map<String, Object> thing9 = new HashMap<String,Object>();
+ thing9.put("value", platformJob.getPlatformName());
//鏃堕棿
Map<String, Object> time4 = new HashMap<String,Object>();
time4.put("value", DateUtil.getFomartDate(new Date(),"yyyy骞碝M鏈坉d鏃� HH:mm:ss") );
dataMap.put("const6",const6);
- dataMap.put("character_string1",character_string1);
- dataMap.put("thing3",thing3);
+ dataMap.put("car_number3",car_number3);
+ dataMap.put("thing9",thing9);
dataMap.put("time4",time4);
for (String openId:openIds) {
paramMap.clear();
@@ -629,6 +626,7 @@
paramMap.put("touser", openId);
paramMap.put("data", dataMap);
String response = HttpsUtil.postJson(postUrL, JSONObject.toJSONString(paramMap));
+ log.warn("路==++--路鎺ㄩ�佸井淇℃ā鏉夸俊鎭唴瀹癸細{}", JSONObject.toJSONString(paramMap));
if(StringUtils.isBlank(response)){
log.warn("路==++--路鎺ㄩ�佸井淇℃ā鏉夸俊鎭細{}路--++==路", "澶辫触");
}else{
--
Gitblit v1.9.3