From 1d7ba66e45e2f27b8a0a925d0a937017c6a5544b Mon Sep 17 00:00:00 2001 From: liquanyu Date: Mon, 26 Apr 2021 11:39:57 +0800 Subject: [PATCH] update --- .../platform/common/enums/CourseStatusEnums.java | 2 +- .../java/com/lyms/platform/pojo/CourseModel.java | 2 +- .../operate/web/controller/CourseController.java | 17 ++++++- .../platform/operate/web/facade/CourseFacade.java | 56 ++++++++++++++++++++-- 4 files changed, 71 insertions(+), 6 deletions(-) diff --git a/platform-common/src/main/java/com/lyms/platform/common/enums/CourseStatusEnums.java b/platform-common/src/main/java/com/lyms/platform/common/enums/CourseStatusEnums.java index 8058da3..337c6db 100644 --- a/platform-common/src/main/java/com/lyms/platform/common/enums/CourseStatusEnums.java +++ b/platform-common/src/main/java/com/lyms/platform/common/enums/CourseStatusEnums.java @@ -7,7 +7,7 @@ package com.lyms.platform.common.enums; */ public enum CourseStatusEnums { - DFB(1,"待发布"),YFB(2,"已发布"),YJS(3,"已结束"); + DFB(1,"待发布"),YFB(2,"已发布"),YJS(3,"已结束"),YQX(4,"已取消"); CourseStatusEnums(int id, String name) { this.id = id; diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/CourseModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/CourseModel.java index c00eeff..6d7e802 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/CourseModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/CourseModel.java @@ -44,7 +44,7 @@ public class CourseModel extends BaseModel { //签到人数 private Integer signNum; - //状态 1待发布，2 已发布，3已结束 + //状态 1待发布，2 已发布，3已结束 4 已取消 private Integer status; //课程描述 diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CourseController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CourseController.java index e12bee9..c653757 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CourseController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CourseController.java @@ -4,6 +4,7 @@ package com.lyms.platform.operate.web.controller; import com.lyms.platform.common.annotation.TokenRequired; import com.lyms.platform.common.base.BaseController; import com.lyms.platform.common.base.LoginContext; +import com.lyms.platform.common.enums.CourseStatusEnums; import com.lyms.platform.common.result.BaseResponse; import com.lyms.platform.operate.web.facade.CourseFacade; import com.lyms.platform.operate.web.request.CourseRequest; @@ -67,7 +68,7 @@ public class CourseController extends BaseController { public BaseResponse getCoureseList( HttpServletRequest request) { - return courseFacade.getCoureseList(null, 2, null, null, + return courseFacade.getCoureseList(null, CourseStatusEnums.YFB.getId(), null, null, null, null, null, null, getUserId(request), null); } @@ -164,6 +165,20 @@ public class CourseController extends BaseController { /** + * 取消课程 + * @param request + * @param id + * @return + */ + @RequestMapping(method = RequestMethod.GET, value = "/cancelCourese/{id}") + @ResponseBody + @TokenRequired + public BaseResponse cancelCourese(HttpServletRequest request, @PathVariable(value = "id") String id) { + return courseFacade.cancelCourese(id); + } + + + /** * 验证课程名称是否重复 * @param request * @param courseName diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/CourseFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/CourseFacade.java index 327c520..fbb2301 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/CourseFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/CourseFacade.java @@ -11,6 +11,7 @@ import com.lyms.platform.common.result.BaseResponse; import com.lyms.platform.common.utils.*; import com.lyms.platform.operate.web.request.CourseRequest; import com.lyms.platform.operate.web.result.CourseResult; +import com.lyms.platform.operate.web.result.PatientCourseResult; import com.lyms.platform.operate.web.utils.MessageCenterService; import com.lyms.platform.operate.web.worker.CourseCountWorker; import com.lyms.platform.permission.model.*; @@ -289,6 +290,53 @@ public class CourseFacade { return objectResponse; } + + /** + * 取消课程 + * @param id + * @return + */ + public BaseResponse cancelCourese(final String id) { + BaseResponse objectResponse = new BaseResponse(); + + if (StringUtils.isNotEmpty(id)) + { + CourseModel model = new CourseModel(); + model.setStatus(CourseStatusEnums.YQX.getId()); + model.setId(id); + model.setModified(new Date()); + model.setPublishTime(new Date()); + courseService.updateCourse(model); + + final CourseModel courseModel = courseService.getCourseById(id); + + new Thread(new Runnable(){ + @Override + public void run() { + + PatientCourseQuery patientCourseQuery = new PatientCourseQuery(); + patientCourseQuery.setYn(YnEnums.YES.getId()); + patientCourseQuery.setCourseId(id); + + List patientCourseModels = patientCourseService.queryPatientCourseList(patientCourseQuery); + if (CollectionUtils.isNotEmpty(patientCourseModels)) + { + for (PatientCourseModel model : patientCourseModels) + { + saveMsg(model.getHospitalId(),model.getPhone(),model.getPatientId(), + courseModel.getCourseName(),courseModel.getCourseSpeaker(),model.getId(),model.getCourseId(), + "您本次参加的孕妇学校课程已经取消，请注意安排时间。"); + } + } + } + }).start(); + } + + objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS); + objectResponse.setErrormsg("成功"); + return objectResponse; + } + public BaseResponse getCoureseById(String id) { CourseResult result = new CourseResult(); CourseQuery query = new CourseQuery(); @@ -427,14 +475,16 @@ public class CourseFacade { String courseName = CollectionUtils.isNotEmpty(courseModels1) ? courseModels1.get(0).getCourseName() : ""; saveMsg(patientCourseModel.getHospitalId(),patientCourseModel.getPhone(),patientCourseModel.getPatientId(), - courseName,speaker,patientCourseModel.getId(),patientCourseModel.getCourseId()); + courseName,speaker,patientCourseModel.getId(),patientCourseModel.getCourseId(), + "您本次参加的孕妇学校课程已经结束，请点击详情回顾课程内容并对本次课程评分。我们会根据您的评价结果相应做相应的评估的课程调整等。"); } } } } } - private void saveMsg(String hospitalId,String phone,String patientId,String courseName,String doctorName,String patientCourseId,String courseId) + private void saveMsg(String hospitalId,String phone,String patientId,String courseName,String doctorName,String patientCourseId,String courseId, + String msg) { OrganizationQuery orgQuery = new OrganizationQuery(); @@ -454,7 +504,7 @@ public class CourseFacade { List messages = new ArrayList<>(); MsgRequest mr = new MsgRequest(); - String content = "【" + messagePrefix + "】您本次参加的孕妇学校课程已经结束，请点击详情回顾课程内容并对本次课程评分。我们会根据您的评价结果相应做相应的评估的课程调整等。"; + String content = "【" + messagePrefix + "】"+msg; mr.setFirst(content); mr.setObjType(ServiceObjEnums.YUNOBJ.getId()); mr.setPhone(phone); -- 1.8.3.1