From f4c56093f42f37e6fd59e5bb846fe01e8b4875f2 Mon Sep 17 00:00:00 2001 From: gaohan <1910974473@qq.com> Date: Thu, 16 May 2024 18:49:14 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BC=80=E5=8F=91=E5=9B=9E=E5=A4=8D=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E5=92=8C=E5=B0=8F=E7=A8=8B=E5=BA=8F=E8=A7=86=E9=A2=91?= =?UTF-8?q?=E6=9C=AA=E8=BF=94=E5=9B=9Ebug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/lyms/platform/biz/dal/ReviewDao.java | 2 ++ .../lyms/platform/biz/dal/impl/ReviewDaoImpl.java | 5 +++++ .../platform/biz/service/CourseEvalService.java | 2 +- .../com/lyms/platform/pojo/CourseTypeModel.java | 10 +++++++++ .../java/com/lyms/platform/pojo/ReviewModel.java | 9 ++++++++ .../com/lyms/platform/query/CourseTypeQuery.java | 14 ++++++++++++- .../java/com/lyms/platform/query/ReviewQuery.java | 10 +++++++++ .../operate/web/controller/CourseController.java | 3 +-- .../platform/operate/web/facade/CourseFacade.java | 24 ++++++++++++---------- 9 files changed, 64 insertions(+), 15 deletions(-) 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 984db57..104c94e 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 @@ -11,4 +11,6 @@ public interface ReviewDao { void reviewAdd(ReviewModel reviewModel); List reviewQuery1List(MongoQuery created); + + List reviewList(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 37b4b25..1b0d783 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 @@ -24,4 +24,9 @@ public class ReviewDaoImpl extends BaseMongoDAOImpl implements Revi public List reviewQuery1List(MongoQuery created) { return find(created.convertToMongoQuery()); } + + @Override + public List reviewList(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 a046930..37a8a2e 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 @@ -99,7 +99,7 @@ public class CourseEvalService { reviewQuery.mysqlBuild(msgDao.queryMsgListCount(reviewQuery.convertToQuery())); query.start(reviewQuery.getOffset()).end(reviewQuery.getLimit()); } - return reviewDao.queryMsgList(query.addOrder(Sort.Direction.DESC, "created")); + return reviewDao.reviewList(query.addOrder(Sort.Direction.DESC, "created")); } public void reviewAdd(ReviewModel reviewModel) { diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/CourseTypeModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/CourseTypeModel.java index edf0c74..1907139 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/CourseTypeModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/CourseTypeModel.java @@ -42,6 +42,16 @@ public class CourseTypeModel extends BaseModel { //平均分数 private Integer avg; + private String courseVideo; + + public String getCourseVideo() { + return courseVideo; + } + + public void setCourseVideo(String courseVideo) { + this.courseVideo = courseVideo; + } + public Integer getScore() { return score; } diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/ReviewModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/ReviewModel.java index 69afb86..16cfd6b 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/ReviewModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/ReviewModel.java @@ -26,6 +26,15 @@ public class ReviewModel extends BaseModel { //是 private Integer yn; + private Integer state; + + public Integer getState() { + return state; + } + + public void setState(Integer state) { + this.state = state; + } public Integer getYn() { return yn; diff --git a/platform-dal/src/main/java/com/lyms/platform/query/CourseTypeQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/CourseTypeQuery.java index 7e5973d..a1d7db1 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/CourseTypeQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/CourseTypeQuery.java @@ -34,6 +34,16 @@ public class CourseTypeQuery extends BaseQuery implements IConvertToNativeQuery private Integer yn; + private String courseVideo; + + public String getCourseVideo() { + return courseVideo; + } + + public void setCourseVideo(String courseVideo) { + this.courseVideo = courseVideo; + } + @Override public MongoQuery convertToQuery() { MongoCondition condition = MongoCondition.newInstance(); @@ -64,7 +74,9 @@ public class CourseTypeQuery extends BaseQuery implements IConvertToNativeQuery if (null != yn) { condition = condition.and("yn", yn, MongoOper.IS); } - + if (null != courseVideo) { + condition = condition.and("courseVideo", courseVideo, MongoOper.IS); + } return condition.toMongoQuery(); } diff --git a/platform-dal/src/main/java/com/lyms/platform/query/ReviewQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/ReviewQuery.java index a8a8632..fdf5cde 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/ReviewQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/ReviewQuery.java @@ -25,6 +25,16 @@ public class ReviewQuery extends BaseQuery implements IConvertToNativeQuery { //课程id private String couresId; + private Integer state; + + public Integer getState() { + return state; + } + + public void setState(Integer state) { + this.state = state; + } + //yn private Integer yn; 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 5448881..9b0fe35 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 @@ -431,9 +431,8 @@ public class CourseController extends BaseController { @TokenRequired public BaseResponse reviewUserList( @RequestParam(required = false) String couresId, - @RequestParam(required = false) String id, HttpServletRequest request) { - return courseFacade.reviewUserList(couresId,id,getUserId(request)); + return courseFacade.reviewUserList(couresId,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 fe4be45..f37cfb2 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 @@ -1297,6 +1297,7 @@ public class CourseFacade { reviewQuery.setPage(page); reviewQuery.setLimit(limit); reviewQuery.setCouresId(couresId); + reviewQuery.setState(1); BaseListResponse objectResponse = new BaseListResponse(); List models = courseEvalService.reviewList(reviewQuery); @@ -1314,6 +1315,7 @@ public class CourseFacade { String format = df.format(day); reviewModel.setCreateDate(format); reviewModel.setYn(YnEnums.YES.getId()); + reviewModel.setState(0); courseEvalService.reviewAdd(reviewModel); objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS); @@ -1328,6 +1330,7 @@ public class CourseFacade { String format = df.format(day); reviewModel.setCreateDate(format); reviewModel.setYn(YnEnums.YES.getId()); + reviewModel.setState(1); //操作人为当前用户id reviewModel.setParentId(reviewModel.getParentId()); @@ -1338,34 +1341,33 @@ public class CourseFacade { return objectResponse; } - public BaseResponse reviewUserList(String couresId, String id, Integer userId) { + public BaseResponse reviewUserList(String couresId,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<>(); // 创建用于存放匹配数据的新集合 - + ArrayList reviewModels = new ArrayList<>(); for (ReviewModel model : models) { - String ids = model.getId(); // 获取models中的ID - for (ReviewModel model1 : models1) { - if (model1.getParentId() == ids) { // 在models1中查找匹配的parentId - matchingModels.add(model); // 将对应的models数据添加到匹配集合中 - matchingModels.add(model1); // 将对应的models1数据添加到匹配集合中 - break; // 找到匹配数据后跳出内层循环 + String id = model.getId(); + reviewModels.add(model); + for (ReviewModel reviewModel : models1) { + if (id.equals(reviewModel.getParentId())){ + reviewModels.add(reviewModel); } } } - objectResponse.setData(matchingModels); + // 将第一条数据也添加到列表中 + objectResponse.setData(reviewModels); objectResponse.setPageInfo(reviewQuery.getPageInfo()); objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS); objectResponse.setErrormsg("成功"); -- 1.8.3.1