diff --git a/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/impl/MeetingReservationServiceImpl.java b/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/impl/MeetingReservationServiceImpl.java index 69f960d..3198caf 100644 --- a/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/impl/MeetingReservationServiceImpl.java +++ b/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/impl/MeetingReservationServiceImpl.java @@ -161,7 +161,7 @@ public class MeetingReservationServiceImpl implements IMeetingReservationService repairRemindMapper.insertRepairRemind(repairRemind); } //提醒--end - meetingServeService.saveOrUpdateMeetingServe(rid, list); + if (list.size() > 0) meetingServeService.saveOrUpdateMeetingServe(rid, list); return IMeetingReservationService.OK; } @@ -266,7 +266,7 @@ public class MeetingReservationServiceImpl implements IMeetingReservationService list.add(meetingServe); } } - meetingServeService.saveOrUpdateMeetingServe(meetingReservation.getId(), list); + if (list.size() > 0) meetingServeService.saveOrUpdateMeetingServe(meetingReservation.getId(), list); //提醒--start for (RepairRemind repairRemind : rList) { repairRemindMapper.insertRepairRemind(repairRemind); diff --git a/shoot-hand/ics-web/src/main/java/com/ics/service/impl/RepairRemindPushServiceImpl.java b/shoot-hand/ics-web/src/main/java/com/ics/service/impl/RepairRemindPushServiceImpl.java index ceb2745..4a86450 100644 --- a/shoot-hand/ics-web/src/main/java/com/ics/service/impl/RepairRemindPushServiceImpl.java +++ b/shoot-hand/ics-web/src/main/java/com/ics/service/impl/RepairRemindPushServiceImpl.java @@ -126,7 +126,9 @@ public class RepairRemindPushServiceImpl implements RepairRemindPushService { } param.put("data", data); JSONObject result = send(url, JSON.toJSONString(param)); - //System.out.println(result.toString()); +// System.out.println("==========ttt1=========="); +// System.out.println(result.toString()); +// System.out.println("==========ttt2=========="); if (result == null || result.getInteger("errcode") == null || result.getInteger("errcode") != 0) { failed.add(repairRemind.getId()); } else { diff --git a/shoot-hand/ics-web/src/main/resources/application-dev.yml b/shoot-hand/ics-web/src/main/resources/application-dev.yml index 353db41..20b854d 100644 --- a/shoot-hand/ics-web/src/main/resources/application-dev.yml +++ b/shoot-hand/ics-web/src/main/resources/application-dev.yml @@ -148,4 +148,4 @@ webchatGZH: #微信公众号用户绑定及模板消息推送相关配置 secret: 199fc64445882192ae798816d949be0d access: https://company.haxy.com.cn:4443/shoot-hand #pc后端访问地址 templateRP: 8zU-6KI4gz0NJeTeAjPbzu9eEBlWe18gGa3PW6h7MbM #工单模板消息模板id - templateMR: bxOb3RO8pFGUhYnTaJBoDvTeapmZnczlBOk5zTjiu0U #会议室预约模板消息id + templateMR: QxM3pMorFhL8Wljouzw3ckLXW8AXCTL3dbOnLumH90I #会议室预约模板消息id diff --git a/shoot-hand/ics-web/src/main/resources/application-prod.yml b/shoot-hand/ics-web/src/main/resources/application-prod.yml index fb75e64..7ba5b0a 100644 --- a/shoot-hand/ics-web/src/main/resources/application-prod.yml +++ b/shoot-hand/ics-web/src/main/resources/application-prod.yml @@ -138,4 +138,4 @@ webchatGZH: #微信公众号用户绑定及模板消息推送相关配置 secret: 199fc64445882192ae798816d949be0d access: https://company.haxy.com.cn:4443/shoot-hand #pc后端访问地址 templateRP: 8zU-6KI4gz0NJeTeAjPbzu9eEBlWe18gGa3PW6h7MbM #工单模板消息模板id - templateMR: bxOb3RO8pFGUhYnTaJBoDvTeapmZnczlBOk5zTjiu0U #会议室预约模板消息id \ No newline at end of file + templateMR: QxM3pMorFhL8Wljouzw3ckLXW8AXCTL3dbOnLumH90I #会议室预约模板消息id \ No newline at end of file