From 4e134e61ede1f8574189af45c810ca365c7c7f9a Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期四, 12 五月 2022 18:33:14 +0800
Subject: [PATCH] 优化代码
---
service-job/src/main/java/com/java110/job/adapt/Repair/MachineDistributeLeaflets.java | 19 ++++++++++++-------
1 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/service-job/src/main/java/com/java110/job/adapt/Repair/MachineDistributeLeaflets.java b/service-job/src/main/java/com/java110/job/adapt/Repair/MachineDistributeLeaflets.java
index 8a26895..1366744 100755
--- a/service-job/src/main/java/com/java110/job/adapt/Repair/MachineDistributeLeaflets.java
+++ b/service-job/src/main/java/com/java110/job/adapt/Repair/MachineDistributeLeaflets.java
@@ -354,12 +354,12 @@
}
String content = staffName + " 鎮ㄦ湁鏂扮殑缁翠慨浠诲姟锛岀淮淇俊鎭涓嬶細\n";
- content += ("> 鏍囬锛�<front color=\"comment\">" + paramIn.getString("repairName") + "</font>");
- content += ("> 鐢佃瘽锛�<front color=\"comment\">" + paramIn.getString("tel") + "</font>");
- content += ("> 鏃堕棿锛�<front color=\"comment\">" + paramIn.getString("time") + "</font>");
- content += ("> 鍐呭锛�<front color=\"comment\">" + paramIn.getString("context") + "</font>");
- content += ("> 浣嶇疆锛�<front color=\"comment\">" + address + "</font>");
- content += ("> 鍗曞彿锛�<front color=\"comment\">" + paramIn.getString("repairId") + "</font>");
+ content += ("> 鏍囬锛�<font color=\"comment\">" + paramIn.getString("repairName") + "</font> \n");
+ content += ("> 鐢佃瘽锛�<font color=\"comment\">" + paramIn.getString("tel") + "</font> \n");
+ content += ("> 鏃堕棿锛�<font color=\"comment\">" + paramIn.getString("time") + "</font> \n");
+ content += ("> 鍐呭锛�<font color=\"comment\">" + paramIn.getString("context") + "</font> \n");
+ content += ("> 浣嶇疆锛�<font color=\"comment\">" + address + "</font> \n");
+ content += ("> 鍗曞彿锛�<font color=\"comment\">" + paramIn.getString("repairId") + "</font> \n");
rebootMarkdown.put("content", content);
logger.info("鍙戦�佹秷鎭唴瀹�:{}", content);
@@ -372,7 +372,6 @@
}
String imgUrl = MappingCache.getValue("IMG_PATH");
- imgUrl += (!StringUtil.isEmpty(imgUrl) && imgUrl.endsWith("/") ? "" : "/");
FileRelDto fileRelDto = new FileRelDto();
fileRelDto.setObjId(paramIn.getString("repairId"));
List<FileRelDto> fileRelDtos = fileRelInnerServiceSMOImpl.queryFileRels(fileRelDto);
@@ -473,6 +472,12 @@
templateMessage.setData(data);
//鑾峰彇涓氫富鍏紬鍙峰湴鍧�
String wechatUrl = MappingCache.getValue("OWNER_WECHAT_URL");
+ if(!StringUtil.isEmpty(wechatUrl) && wechatUrl.contains("?")){
+ wechatUrl += ("&wAppId=" + weChatDto.getAppId());
+ }else{
+ wechatUrl += ("?wAppId=" + weChatDto.getAppId());
+ }
+
templateMessage.setUrl(wechatUrl);
logger.info("鍙戦�佹ā鏉挎秷鎭唴瀹�:{}", JSON.toJSONString(templateMessage));
ResponseEntity<String> responseEntity = outRestTemplate.postForEntity(url, JSON.toJSONString(templateMessage), String.class);
--
Gitblit v1.8.0