|
@@ -187,12 +187,13 @@ public class CareEventOrderServiceImpl extends ServiceImpl<CareEventOrderMapper,
|
|
if (StrUtil.isNotEmpty(careHouseContact.getOpenId())){
|
|
if (StrUtil.isNotEmpty(careHouseContact.getOpenId())){
|
|
Map<String, TemplateDataDTO> data = new HashMap<>();
|
|
Map<String, TemplateDataDTO> data = new HashMap<>();
|
|
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
|
|
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
|
|
- data.put("first", new TemplateDataDTO("安全事件处理完成", "#ff5200"));
|
|
|
|
- data.put("keyword1", new TemplateDataDTO(OrderTypeEnum.getCodeToName(order.getOrderType())+"报警已处理完成", "#000000"));
|
|
|
|
- data.put("keyword2", new TemplateDataDTO(simpleDateFormat.format(new Date()), "#000000"));
|
|
|
|
|
|
+ data.put("first", new TemplateDataDTO("新安全事件", "#ff5200"));
|
|
|
|
+ data.put("keyword1", new TemplateDataDTO(OrderTypeEnum.getCodeToName(order.getOrderType())+"报警", "#000000"));
|
|
|
|
+ data.put("keyword2", new TemplateDataDTO(simpleDateFormat.format(order.getCreateTime()), "#000000"));
|
|
data.put("keyword3", new TemplateDataDTO(order.getHouseName(), "#000000"));
|
|
data.put("keyword3", new TemplateDataDTO(order.getHouseName(), "#000000"));
|
|
|
|
+ data.put("remark", new TemplateDataDTO("请尽快联系您的被监护人, 确认现场情况", "#ff5200"));
|
|
boolean smsResult = this.wxNoticSendService.sendByWxGZHOpenId(careHouseContact.getOpenId(),data);
|
|
boolean smsResult = this.wxNoticSendService.sendByWxGZHOpenId(careHouseContact.getOpenId(),data);
|
|
- log.info("事件完成时给联系人发送WX消息模板: openId: " + careHouseContact.getOpenId() + ", ORDER: " + order.getId() + " 状态: " + smsResult);
|
|
|
|
|
|
+ log.info("新事件,给联系人发送WX消息模板: openId: " + careHouseContact.getOpenId() + ", ORDER: " + order.getId() + " 状态: " + smsResult);
|
|
if (smsResult) {
|
|
if (smsResult) {
|
|
CareEventOrderHandleHis log = new CareEventOrderHandleHis();
|
|
CareEventOrderHandleHis log = new CareEventOrderHandleHis();
|
|
log.setOrgId(order.getOrgId());
|
|
log.setOrgId(order.getOrgId());
|