更新代码

amos-boot-module/amos-boot-module-biz/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/service/impl/DispatchTaskServiceImpl.java

@@ -449,21 +449,30 @@ public class DispatchTaskServiceImpl extends BaseService<DispatchTaskDto,Dispatc
         // 根据警情分类 封装MessageDto
         AlertCalled alertCalled = alertCalledServiceImpl.getById(dispatchTaskDto.getAlertId());
         Map<String,String> data = new HashMap<>();
-        data.put("address",alertCalled.getAddress());
-        data.put("dispatchTime", DateUtils.date2LongStr(dispatchTaskDto.getDispatchTime()));
-        
+
         if(AlertStageEnums.KRJY.getId().equals(dispatchTaskDto.getAlertCode())) {
             temp.setTemplateId(KRJY_TEMPID);
-            temp.setUrl(KRJY_URL);
-            
+            temp.setUrl(KRJY_URL+ "?id=" + dispatchTaskDto.getSequenceNbr());
+            data.put("first","电梯困人任务已派遣，请尽快前往救援!");
+            data.put("keyword1",alertCalled.getAddress());
+            data.put("keyword2", DateUtils.date2LongStr(dispatchTaskDto.getDispatchTime()));
+            data.put("keyword3", alertCalled.getEmergencyCall());
+            data.put("remark", "请在收到任务后30分钟内到达人员被困位置进行救援！");
             temp.setData(data);
         } else if(AlertStageEnums.GZWX.getId().equals(dispatchTaskDto.getAlertCode())) {
             temp.setTemplateId(WX_TEMPID);
-            temp.setUrl(WX_URL);
+            temp.setUrl(WX_URL + "?id=" + dispatchTaskDto.getSequenceNbr());
+            data.put("first","故障维修任务已派遣，请尽快前往救援!");
+            data.put("keyword1","故障维修");
+            data.put("keyword2", "电梯故障");
+            data.put("keyword3", alertCalled.getEmergencyPerson());
+            data.put("keyword4", alertCalled.getEmergencyCall());
+            data.put("keyword5", DateUtils.date2LongStr(dispatchTaskDto.getDispatchTime()));
+            data.put("remark", "任务已派遣，请尽快前往处置！");
             temp.setData(data);
         } else if(AlertStageEnums.TSZX.getId().equals(dispatchTaskDto.getAlertCode())) {
             temp.setTemplateId(TS_TEMPID);
-            temp.setUrl(TS_URL);
+            temp.setUrl(TS_URL+ "?id=" + dispatchTaskDto.getSequenceNbr());
             temp.setData(data);
         }
         return temp;
@@ -587,6 +596,7 @@ public class DispatchTaskServiceImpl extends BaseService<DispatchTaskDto,Dispatc
             // 发送任务单
             WechatRelation temp = wechatRelationServiceImpl.getOne(new LambdaQueryWrapper<WechatRelation>().eq(WechatRelation::getPhone,dispatchTaskDto.getResponseUserTel()));
             if(temp != null && temp.getOpenId() != null) {
+                dispatchTaskDto.setSequenceNbr(dispatchTask.getSequenceNbr());
                 WechatMessageDto dto = this.getWechatMessageDtoByDispatchTaskDto(dispatchTaskDto);
                 wechatService.sendWechatModelMessage(temp.getOpenId() ,  dto);
             }

amos-boot-system-tzs/src/main/resources/application-dev.properties

@@ -42,9 +42,9 @@ tzs.cti.secretkey=7bd29115-99ee-4f7d-1fb1-7c4719d5f43a
 tzs.cti.url=http://36.46.151.113:8000
 
 tzs.wechat.url=https://api.weixin.qq.com
-##wechatAPPID
+##wechatAPPID wx79aca5bb1cb4af92  wx8918c1aaad956617
 tzs.wechat.appid=wx8918c1aaad956617
-##wechatSECRET
+##wechatSECRET f3a12323ba731d282c3d4698c27c3e97  f3a12323ba731d282c3d4698c27c3e97
 tzs.wechat.secret=337c3d8f3e749140d4f9aedc8311033b
 
 ##wechatToken
@@ -52,9 +52,9 @@ tzs.wechat.token=yeejoin_2021
 ##wechatTicketUrl
 tzs.wechat.ticketurl=https://api.weixin.qq.com/cgi-bin/ticket/getticket?access_token=
 
-tzs.wechat.tempId.kr=SLjmNJoCNLC3FBcYzWzR-u3el0kqXf8WMTmzw8dAQm4
-tzs.wechat.url.kr=www.baidu.com
-tzs.wechat.tempId.wx=SLjmNJoCNLC3FBcYzWzR-u3el0kqXf8WMTmzw8dAQm4
-tzs.wechat.url.wx=www.baidu.com
+tzs.wechat.tempId.kr=Hlu43OOCVTESzOtkP4we1AUZJoPfquZl2_DEn6U66Z4
+tzs.wechat.url.kr=tzs.yeeamos.com/persondetail.html
+tzs.wechat.tempId.wx=rags-expfNSBB-h2WenuBI2c6pCEndH4uwTtOqlHqDM
+tzs.wechat.url.wx=tzs.yeeamos.com/persondetail.html
 tzs.wechat.tempId.ts=SLjmNJoCNLC3FBcYzWzR-u3el0kqXf8WMTmzw8dAQm4
-tzs.wechat.url.ts=www.baidu.com
+tzs.wechat.url.ts=tzs.yeeamos.com/persondetail.html