From 157989de1caa59f98c9d41e28d358ccbbe916261 Mon Sep 17 00:00:00 2001
From: yanghb <yanghb>
Date: 星期五, 12 四月 2024 09:03:38 +0800
Subject: [PATCH] 4.9
---
rest/src/main/java/cn/stylefeng/rest/modular/work/MentalAppointmentWork.java | 46 +++++++++++++++++++++++++++++++++++++---------
1 files changed, 37 insertions(+), 9 deletions(-)
diff --git a/rest/src/main/java/cn/stylefeng/rest/modular/work/MentalAppointmentWork.java b/rest/src/main/java/cn/stylefeng/rest/modular/work/MentalAppointmentWork.java
index e166013..bcae22e 100644
--- a/rest/src/main/java/cn/stylefeng/rest/modular/work/MentalAppointmentWork.java
+++ b/rest/src/main/java/cn/stylefeng/rest/modular/work/MentalAppointmentWork.java
@@ -47,11 +47,11 @@
* Corn表达式 @Scheduled(cron = Corn表达式)
* @Scheduled(cron = "0 0/30 * * * *")
*/
+
@Scheduled(fixedRate = 1000 * 30)
public void autoStartMentalAppointment() {
// 当前时间
DateTime dateTime = DateUtil.date();
-
// 待开始预约单
List<MentalAppointment> mentalAppointmentList = mentalAppointmentService.list(
Wrappers.<MentalAppointment>lambdaUpdate()
@@ -68,10 +68,11 @@
}
for (MentalAppointment o : mentalAppointmentList) {
- MentalTestMyTestTopicDTO mentalTestMyTestTopicDTO = myTestRecordTopicList.stream().filter(rt -> rt.getMentalAppointmentId().equals(o.getId())).findFirst().orElse(new MentalTestMyTestTopicDTO());
+ if (o.getType()==null) {
+ MentalTestMyTestTopicDTO mentalTestMyTestTopicDTO = myTestRecordTopicList.stream().filter(rt -> rt.getMentalAppointmentId().equals(o.getId())).findFirst().orElse(new MentalTestMyTestTopicDTO());
- // 发送IM消息
- ImPushDataDTO pushData = ImPushDataDTO.builder()
+ // 发送IM消息
+ ImPushDataDTO pushData = ImPushDataDTO.builder()
.type(ImPushTypeEnum.C_TO_W_IM_1V1_START_CONSULT.getCode())
.title(ImPushTypeEnum.C_TO_W_IM_1V1_START_CONSULT.getName())
.content("做了"
@@ -82,11 +83,12 @@
.data2(ObjUtil.toString(o.getWorkerId()))
.data3(ObjUtil.toString(mentalTestMyTestTopicDTO.getId()))
.build();
- imBizService.messageSendPrivate(
- ObjUtil.toString(o.getUserId()),
- new String[]{ObjUtil.toString(o.getWorkerId())},
- pushData
- );
+ imBizService.messageSendPrivate(
+ ObjUtil.toString(o.getUserId()),
+ new String[]{ObjUtil.toString(o.getWorkerId())},
+ pushData
+ );
+ }
// 开始预约咨询
mentalAppointmentService.update(
@@ -99,6 +101,32 @@
}
}
+// @Scheduled(fixedRate = 1000 * 30)
+// public void autoStartMentalAppointment1() {
+// // 当前时间
+// DateTime dateTime = DateUtil.date();
+// // 待开始预约单
+// List<MentalAppointment> mentalAppointmentList = mentalAppointmentService.list(
+// Wrappers.<MentalAppointment>lambdaUpdate()
+// .eq(MentalAppointment::getStatusFlag, MentalAppointmentStatusEnum.WAIT_SERVICE.getCode())
+// .eq(MentalAppointment::getType,"1")
+// .apply("DATE_ADD(appointment_day, INTERVAL TIME_TO_SEC(begin_time_point) SECOND) < NOW()")
+//// .le(MentalAppointment::getAppointmentDay, dateTime.toDateStr())
+//// .le(MentalAppointment::getBeginTimePoint, DateUtil.format(dateTime, "HH:mm"))
+// );
+//
+// for (MentalAppointment o : mentalAppointmentList) {
+// // 开始预约咨询
+// mentalAppointmentService.update(
+// Wrappers.<MentalAppointment>lambdaUpdate()
+// .eq(MentalAppointment::getId, o.getId())
+// .set(MentalAppointment::getStatusFlag, MentalAppointmentStatusEnum.IN_SERVICE.getCode())
+// .set(MentalAppointment::getConsultStatus, MentalAppointmentConsultStatusEnum.IN_CONSULT.getCode())
+// );
+// log.info("开始预约咨询: {}", JSONUtil.toJsonStr(o));
+// }
+// }
+
@Scheduled(fixedRate = 1000 * 60)
public void autoEndMentalAppointment() {
// 当前时间
--
Gitblit v1.7.1