diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/CourseEvalService.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/CourseEvalService.java index f0a5a38..0d38cc0 100644 --- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/CourseEvalService.java +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/CourseEvalService.java @@ -3,14 +3,17 @@ package com.lyms.platform.biz.service; import com.lyms.platform.biz.dal.ICourseEvalDao; import com.lyms.platform.biz.dal.MsgDao; +import com.lyms.platform.biz.dal.ReviewDao; import com.lyms.platform.common.dao.operator.MongoCondition; import com.lyms.platform.common.dao.operator.MongoOper; import com.lyms.platform.common.dao.operator.MongoQuery; import com.lyms.platform.common.enums.YnEnums; import com.lyms.platform.pojo.CourseEvaluateModel; import com.lyms.platform.pojo.MsgModel; +import com.lyms.platform.pojo.ReviewModel; import com.lyms.platform.query.CourseEvalQuery; import com.lyms.platform.query.MsgQuery; +import com.lyms.platform.query.ReviewQuery; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang.StringUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -28,6 +31,10 @@ public class CourseEvalService { @Autowired private MsgDao msgDao; + + + @Autowired + private ReviewDao reviewDao; public List queryCourseEvalList(CourseEvalQuery courseEvalQuery) { MongoQuery query = courseEvalQuery.convertToQuery(); @@ -86,4 +93,16 @@ public class CourseEvalService { msgDao.updateReadCount(new MongoQuery(new MongoCondition("id", model.getId(), MongoOper.IS)), model); } + public List reviewList(ReviewQuery reviewQuery) { + MongoQuery query = reviewQuery.convertToQuery(); + if (StringUtils.isNotEmpty(reviewQuery.getNeed())) { + reviewQuery.mysqlBuild(msgDao.queryMsgListCount(reviewQuery.convertToQuery())); + query.start(reviewQuery.getOffset()).end(reviewQuery.getLimit()); + } + return reviewDao.queryMsgList(query.addOrder(Sort.Direction.DESC, "created")); + } + + public void reviewAdd(ReviewModel reviewModel) { + reviewDao.reviewAdd(reviewModel); + } } diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/CourseEvaluateModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/CourseEvaluateModel.java index a940d0a..0c39c71 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/CourseEvaluateModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/CourseEvaluateModel.java @@ -57,6 +57,16 @@ public class CourseEvaluateModel extends BaseModel { //医平均分数 private Integer avg; + private String content; + + public String getContent() { + return content; + } + + public void setContent(String content) { + this.content = content; + } + public String getCourseSpeaker() { return courseSpeaker; } 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 fb6f887..396c151 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 @@ -28,7 +28,6 @@ public class CourseModel extends BaseModel { //课程时间 private Date courseTime; - //课程结束时间 private Date courseEndTime; @@ -84,6 +83,8 @@ public class CourseModel extends BaseModel { private byte[][] chunks; + + public byte[][] getChunks() { return chunks; } 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 d62eb6c..c15c08c 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 @@ -10,6 +10,7 @@ import com.lyms.platform.operate.web.facade.CourseFacade; import com.lyms.platform.operate.web.request.CourseRequest; import com.lyms.platform.pojo.CourseEvaluateModel; import com.lyms.platform.pojo.MsgModel; +import com.lyms.platform.pojo.ReviewModel; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; @@ -391,5 +392,30 @@ public class CourseController extends BaseController { return courseFacade.getMsgCountById(parentId); } + /* + * 查询评价列表 + * */ + @RequestMapping(method = RequestMethod.GET, value = "/reviewList") + @ResponseBody + @TokenRequired + public BaseResponse reviewList( + @RequestParam(required = false) String couresId, + @RequestParam Integer page, + @RequestParam Integer limit, + HttpServletRequest request) { + LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); + return courseFacade.reviewList(page,limit,couresId,loginState.getId().toString()); + } + + /* + * 添加评价 + * */ + @RequestMapping(method = RequestMethod.POST, value = "/reviewAdd") + @ResponseBody + @TokenRequired + public BaseResponse reviewAdd(@RequestBody ReviewModel reviewModel, HttpServletRequest request) { + return courseFacade.reviewAdd(reviewModel,getUserId(request)); + } + } 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 d61942c..8e783ff 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 @@ -1290,4 +1290,37 @@ public class CourseFacade { return baseResponse; } + public BaseResponse reviewList(Integer page, Integer limit, String couresId,String userId) { + ReviewQuery reviewQuery = new ReviewQuery(); + reviewQuery.setYn(YnEnums.YES.getId()); + reviewQuery.setNeed("true"); + reviewQuery.setPage(page); + reviewQuery.setLimit(limit); + reviewQuery.setCouresId(couresId); + BaseListResponse objectResponse = new BaseListResponse(); + List models = courseEvalService.reviewList(reviewQuery); + + objectResponse.setData(models); + objectResponse.setPageInfo(reviewQuery.getPageInfo()); + objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS); + objectResponse.setErrormsg("成功"); + return objectResponse; + } + + public BaseResponse reviewAdd(ReviewModel reviewModel, Integer userId) { + BaseResponse objectResponse = new BaseResponse(); + Date day=new Date(); + SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + String format = df.format(day); + reviewModel.setCreateDate(format); + reviewModel.setYn(YnEnums.YES.getId()); + //操作人为当前用户id + reviewModel.setReviewId(userId.toString()); + + + courseEvalService.reviewAdd(reviewModel); + objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS); + objectResponse.setErrormsg("成功"); + return objectResponse; + } } \ No newline at end of file