|
|
@@ -106,13 +106,13 @@ public class AttenDanceWarnNoticeTask {
|
|
|
return;
|
|
|
}
|
|
|
String wechatTemplate = weChatUtil.getAttenDanceWarnTemplate();
|
|
|
- WechatMessageLog log = wechatMessageLogService.getOne(
|
|
|
+ List<WechatMessageLog> list = wechatMessageLogService.list(
|
|
|
new QueryWrapper<WechatMessageLog>().lambda()
|
|
|
.select(WechatMessageLog.class, x -> VoToColumnUtil.fieldsToColumns(WechatMessageLog.class).contains(x.getProperty()))
|
|
|
.eq(WechatMessageLog::getSendTime, recentlyTime)
|
|
|
.eq(WechatMessageLog::getTemplateId, wechatTemplate)
|
|
|
);
|
|
|
- if(log != null){//已经推送过,不再进行推送
|
|
|
+ if(!list.isEmpty()){//已经推送过,不再进行推送
|
|
|
return;
|
|
|
}
|
|
|
|
|
|
@@ -137,6 +137,11 @@ public class AttenDanceWarnNoticeTask {
|
|
|
weChatSendMessageDto.setMsgId(IdUtil.getSnowflakeNextId() + "");
|
|
|
JSONObject paramJson = new JSONObject();
|
|
|
|
|
|
+
|
|
|
+ JSONObject time5 = new JSONObject();
|
|
|
+ time5.put("value", recentlyTime.format(formatter));
|
|
|
+ paramJson.put("time5", time5);
|
|
|
+
|
|
|
JSONObject thing8 = new JSONObject();
|
|
|
thing8.put("value", xjrUser.getName());
|
|
|
paramJson.put("thing8", thing8);
|