diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/ReviewDao.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/ReviewDao.java index 9383e15..984db57 100644 --- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/ReviewDao.java +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/ReviewDao.java @@ -9,4 +9,6 @@ public interface ReviewDao { List queryMsgList(MongoQuery created); void reviewAdd(ReviewModel reviewModel); + + List reviewQuery1List(MongoQuery created); } diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/ReviewDaoImpl.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/ReviewDaoImpl.java index 05bd3b3..37b4b25 100644 --- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/ReviewDaoImpl.java +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/ReviewDaoImpl.java @@ -19,4 +19,9 @@ public class ReviewDaoImpl extends BaseMongoDAOImpl implements Revi public void reviewAdd(ReviewModel reviewModel) { save(reviewModel); } + + @Override + public List reviewQuery1List(MongoQuery created) { + return find(created.convertToMongoQuery()); + } } 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 0d38cc0..a046930 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 @@ -105,4 +105,13 @@ public class CourseEvalService { public void reviewAdd(ReviewModel reviewModel) { reviewDao.reviewAdd(reviewModel); } + + public List reviewQuery1List(ReviewQuery reviewQuery1) { + MongoQuery query = reviewQuery1.convertToQuery(); + if (StringUtils.isNotEmpty(reviewQuery1.getNeed())) { + reviewQuery1.mysqlBuild(msgDao.queryMsgListCount(reviewQuery1.convertToQuery())); + query.start(reviewQuery1.getOffset()).end(reviewQuery1.getLimit()); + } + return reviewDao.reviewQuery1List(query.addOrder(Sort.Direction.DESC, "created")); + } } 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 c7b62ac..fd53188 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 @@ -410,9 +410,32 @@ public class CourseController extends BaseController { * */ @RequestMapping(method = RequestMethod.POST, value = "/reviewAdd") @ResponseBody + @TokenRequired public BaseResponse reviewAdd(@RequestBody ReviewModel reviewModel, HttpServletRequest request) { return courseFacade.reviewAdd(reviewModel,getUserId(request)); } + /* + * 进行回复 + * */ + @RequestMapping(method = RequestMethod.POST, value = "/reviewAddContent") + @ResponseBody + @TokenRequired + public BaseResponse reviewAddContent(@RequestBody ReviewModel reviewModel, HttpServletRequest request) { + return courseFacade.reviewAddContent(reviewModel,getUserId(request)); + } + + /* + * 查询当前用户评价和回复 + * */ + @RequestMapping(method = RequestMethod.GET, value = "/reviewUserList") + @ResponseBody + @TokenRequired + public BaseResponse reviewUserList( + @RequestParam(required = false) String couresId, + @RequestParam(required = false) String id, + HttpServletRequest request) { + return courseFacade.reviewUserList(couresId,id,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 90a0c80..de9b963 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 @@ -1323,4 +1323,56 @@ public class CourseFacade { objectResponse.setErrormsg("成功"); return objectResponse; } + + public BaseResponse reviewAddContent(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()); + reviewModel.setParentId(reviewModel.getParentId()); + + + courseEvalService.reviewAdd(reviewModel); + objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS); + objectResponse.setErrormsg("成功"); + return objectResponse; + } + + public BaseResponse reviewUserList(String couresId, String id, Integer userId) { + ReviewQuery reviewQuery = new ReviewQuery(); + reviewQuery.setYn(YnEnums.YES.getId()); + reviewQuery.setNeed("true"); + reviewQuery.setCouresId(couresId); + reviewQuery.setReviewId(userId.toString()); + BaseListResponse objectResponse = new BaseListResponse(); + List models = courseEvalService.reviewList(reviewQuery); + + ReviewQuery reviewQuery1 = new ReviewQuery(); + List models1 = courseEvalService.reviewQuery1List(reviewQuery1); + + + List matchingModels = new ArrayList<>(); // 创建用于存放匹配数据的新集合 + + if (!models.isEmpty()) { + matchingModels.add(models.get(0)); // 将models集合中的第一条数据添加到匹配集合中 + } + + if (!models1.isEmpty()) { + int index = models1.size() > 1 ? 1 : 0; // 如果models1集合中有多个数据,则获取第二条数据,否则获取第一条数据 + matchingModels.add(models1.get(index)); // 将models1集合中的数据添加到匹配集合中 + } + + + objectResponse.setData(matchingModels); + objectResponse.setPageInfo(reviewQuery.getPageInfo()); + objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS); + objectResponse.setErrormsg("成功"); + return objectResponse; + + + } } \ No newline at end of file