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 308eec5..14ff5bc 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 @@ -25,8 +25,12 @@ public class CourseModel extends BaseModel { //课程时间 private Date courseTime; + + //课程结束时间 + private Date courseEndTime; + //时长 - private String timeLong; + private Integer timeLong; //上线人数 private Integer limitNum; @@ -62,6 +66,14 @@ public class CourseModel extends BaseModel { private String hospitalId; + public Date getCourseEndTime() { + return courseEndTime; + } + + public void setCourseEndTime(Date courseEndTime) { + this.courseEndTime = courseEndTime; + } + public Integer getYn() { return yn; } @@ -158,11 +170,11 @@ public class CourseModel extends BaseModel { this.courseTime = courseTime; } - public String getTimeLong() { + public Integer getTimeLong() { return timeLong; } - public void setTimeLong(String timeLong) { + public void setTimeLong(Integer timeLong) { this.timeLong = timeLong; } diff --git a/platform-dal/src/main/java/com/lyms/platform/query/CourseQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/CourseQuery.java index b38a3d1..a901651 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/CourseQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/CourseQuery.java @@ -71,6 +71,8 @@ public class CourseQuery extends BaseQuery implements IConvertToNativeQuery { private String hospitalId; + private Date courseEndTime; + @Override public MongoQuery convertToQuery() { MongoCondition condition = MongoCondition.newInstance(); @@ -128,6 +130,12 @@ public class CourseQuery extends BaseQuery implements IConvertToNativeQuery { } } + if (null != courseEndTime) { + if (null != c1) { + c1 = Criteria.where("courseEndTime").lte(courseEndTime); + } + } + if (null != createdStart) { if (null != c1) { @@ -151,6 +159,13 @@ public class CourseQuery extends BaseQuery implements IConvertToNativeQuery { return condition.toMongoQuery(); } + public Date getCourseEndTime() { + return courseEndTime; + } + + public void setCourseEndTime(Date courseEndTime) { + this.courseEndTime = courseEndTime; + } public String getId() { return id; 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 dff3f91..2225259 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 @@ -39,6 +39,22 @@ public class CourseController extends BaseController { /** + * 更新课程 + * @param model + * @param request + * @return + */ + @RequestMapping(method = RequestMethod.POST, value = "/updateCourese") + @ResponseBody + @TokenRequired + public BaseResponse updateCourese(@RequestBody CourseRequest model, + HttpServletRequest request) { + + return courseFacade.updateCourese(model,getUserId(request)); + } + + + /** * 课程列表 * @param request * @return 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 8211a56..eab0508 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 @@ -13,7 +13,6 @@ import com.lyms.platform.common.result.BaseResponse; import com.lyms.platform.common.utils.DateUtil; 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.permission.model.Users; import com.lyms.platform.permission.service.UsersService; import com.lyms.platform.pojo.CourseModel; @@ -68,7 +67,7 @@ public class CourseFacade { courseService.addCourse(model); objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS); objectResponse.setErrormsg("成功"); - return null; + return objectResponse; } private CourseModel getCoureseModel(CourseRequest request) @@ -81,6 +80,10 @@ public class CourseFacade { model.setCourseDesc(request.getCourseDesc()); model.setCourseTypeId(request.getCourseTypeId()); model.setCourseTime(DateUtil.parseYMDHM(request.getCourseTime())); + + Integer longTime = model.getTimeLong() == null ? 0 : model.getTimeLong()*60*1000; + + model.setCourseEndTime(new Date(DateUtil.parseYMDHM(request.getCourseTime()).getTime() + longTime)); model.setTimeLong(request.getTimeLong()); model.setLimitNum(request.getLimitNum()); model.setCourseSpeaker(request.getCourseSpeaker()); @@ -248,4 +251,35 @@ public class CourseFacade { objectResponse.setErrormsg("成功"); return objectResponse; } + + public BaseResponse updateCourese(CourseRequest request, Integer userId) { + BaseResponse objectResponse = new BaseResponse(); + CourseModel model = getCoureseModel(request); + model.setModified(new Date()); + courseService.updateCourse(model); + objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS); + objectResponse.setErrormsg("成功"); + return objectResponse; + } + + + /** + * 处理结束的课程 + */ + public void handCoureseEnd() + { + CourseQuery query = new CourseQuery(); + query.setYn(YnEnums.YES.getId()); + query.setStatus(CourseStatusEnums.YFB.getId()); + query.setCourseEndTime(new Date()); + List courseModels = courseService.queryCourseList(query); + if (CollectionUtils.isNotEmpty(courseModels)) + { + for (CourseModel model : courseModels) + { + model.setStatus(CourseStatusEnums.YJS.getId()); + courseService.updateCourse(model); + } + } + } } \ No newline at end of file diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/CourseRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/CourseRequest.java index caf863f..b7d6b04 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/CourseRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/CourseRequest.java @@ -20,7 +20,7 @@ public class CourseRequest { private String courseTime; //时长 - private String timeLong; + private Integer timeLong; //上线人数 private Integer limitNum; @@ -75,11 +75,11 @@ public class CourseRequest { this.courseTime = courseTime; } - public String getTimeLong() { + public Integer getTimeLong() { return timeLong; } - public void setTimeLong(String timeLong) { + public void setTimeLong(Integer timeLong) { this.timeLong = timeLong; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/CourseResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/CourseResult.java index a12bc71..e097a17 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/CourseResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/CourseResult.java @@ -20,7 +20,7 @@ public class CourseResult { private String courseTime; //时长 - private String timeLong; + private Integer timeLong; //上线人数 private Integer limitNum; @@ -88,11 +88,11 @@ public class CourseResult { this.courseTime = courseTime; } - public String getTimeLong() { + public Integer getTimeLong() { return timeLong; } - public void setTimeLong(String timeLong) { + public void setTimeLong(Integer timeLong) { this.timeLong = timeLong; }