From 4019b296742eb2a68fb6f9945e9be85932954c12 Mon Sep 17 00:00:00 2001 From: 86182 Date: Wed, 2 Nov 2022 10:45:57 +0800 Subject: [PATCH 01/25] =?UTF-8?q?=E6=94=B6=E8=97=8F=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E8=AF=84=E5=88=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/xboe/module/course/entity/Course.java | 17 +++++++++++++++++ .../module/interaction/dto/FavoriteDto.java | 5 +++++ .../interaction/dto/FavoriteTotalDto.java | 5 +++++ .../service/impl/FavoritesServiceImpl.java | 6 ++++-- 4 files changed, 31 insertions(+), 2 deletions(-) diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/course/entity/Course.java b/servers/boe-server-all/src/main/java/com/xboe/module/course/entity/Course.java index db82897b..5ef75fee 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/course/entity/Course.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/course/entity/Course.java @@ -350,5 +350,22 @@ public class Course extends BaseEntity { this.shares=shares; this.favorites=favorites; } + + public Course(String id,String name,String summary,String coverImg,String sysCreateAid,String sysCreateBy,Integer type,LocalDateTime publishTime,Integer views,Integer comments,Integer praises,Integer shares,Integer favorites,Float score){ + super.setId(id); + this.name=name; + this.summary=summary; + this.coverImg=coverImg; + super.setSysCreateAid(sysCreateAid); + super.setSysCreateBy(sysCreateBy); + this.type=type; + this.publishTime=publishTime; + this.views=views; + this.comments=comments; + this.praises=praises; + this.shares=shares; + this.favorites=favorites; + this.score=score; + } } diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/interaction/dto/FavoriteDto.java b/servers/boe-server-all/src/main/java/com/xboe/module/interaction/dto/FavoriteDto.java index b2a5742f..76a78442 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/interaction/dto/FavoriteDto.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/interaction/dto/FavoriteDto.java @@ -70,5 +70,10 @@ public class FavoriteDto { * */ private Float progress; + /** + * 课程评分 + * */ + private Float score; + } diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/interaction/dto/FavoriteTotalDto.java b/servers/boe-server-all/src/main/java/com/xboe/module/interaction/dto/FavoriteTotalDto.java index 5b11fff2..a25f5f93 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/interaction/dto/FavoriteTotalDto.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/interaction/dto/FavoriteTotalDto.java @@ -91,6 +91,11 @@ public class FavoriteTotalDto { * */ private String qid; + /** + * score + * */ + private Float score; + public FavoriteTotalDto() { } diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/interaction/service/impl/FavoritesServiceImpl.java b/servers/boe-server-all/src/main/java/com/xboe/module/interaction/service/impl/FavoritesServiceImpl.java index aeeece16..c329af1e 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/interaction/service/impl/FavoritesServiceImpl.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/interaction/service/impl/FavoritesServiceImpl.java @@ -189,7 +189,7 @@ public class FavoritesServiceImpl implements IFavoritesService{ if(!courseList.isEmpty()) { QueryBuilder from = QueryBuilder.from(Course.class); from.addFilter(FieldFilters.in("id",courseList)); - from.addFields("new Course(id,name,summary,coverImg,sysCreateAid,sysCreateBy,type,publishTime,views,comments,praises,shares,favorites)"); + from.addFields("new Course(id,name,summary,coverImg,sysCreateAid,sysCreateBy,type,publishTime,views,comments,praises,shares,favorites,score)"); List courses = courseDao.findList(from.builder()); if(!courses.isEmpty()){ for (Course c : courses) { @@ -208,6 +208,7 @@ public class FavoritesServiceImpl implements IFavoritesService{ favoriteTotalDto.setPraises(c.getPraises()); favoriteTotalDto.setShares(c.getShares()); favoriteTotalDto.setFavorites(c.getFavorites()); + favoriteTotalDto.setScore(c.getScore()); } } } @@ -438,7 +439,7 @@ public class FavoritesServiceImpl implements IFavoritesService{ String from=Favorites.class.getSimpleName()+" f,"+Course.class.getSimpleName()+" c"; QueryBuilder query=QueryBuilder.from(from); query.addFields("f.id","f.sysCreateTime","f.objId","c.name","c.summary","c.type","c.coverImg","c.sysCreateAid","c.sysCreateBy"); - query.addFields("c.deadTime","c.views","c.comments","c.praises","c.shares","c.favorites","f.objType"); + query.addFields("c.deadTime","c.views","c.comments","c.praises","c.shares","c.favorites","f.objType","c.score"); query.setPageIndex(pageIndex); query.setPageSize(pageSize); query.addOrder(OrderCondition.desc("f.id")); @@ -478,6 +479,7 @@ public class FavoritesServiceImpl implements IFavoritesService{ dto.setShares(ConvertUtil.toInt(objs[13])); dto.setFavorites(ConvertUtil.toInt(objs[14])); dto.setObjType((Integer) objs[15]); + dto.setScore((Float) objs[16]); result.getList().add(dto); } From fbf46ee5607cee5feed76551e9697b04d9f9c233 Mon Sep 17 00:00:00 2001 From: 86182 Date: Wed, 2 Nov 2022 16:02:07 +0800 Subject: [PATCH 02/25] =?UTF-8?q?=E5=8A=A0=E4=B8=8A=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xboe/module/qa/service/impl/AnswerServiceImpl.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/qa/service/impl/AnswerServiceImpl.java b/servers/boe-server-all/src/main/java/com/xboe/module/qa/service/impl/AnswerServiceImpl.java index 3f19454e..c81223c7 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/qa/service/impl/AnswerServiceImpl.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/qa/service/impl/AnswerServiceImpl.java @@ -150,11 +150,11 @@ public class AnswerServiceImpl implements IAnswerService { if(StringUtil.isNoneBlank(qid)){ builder.addFilter(FieldFilters.eq("qid",qid)); } -// if(StringUtil.isNoneBlank(orderType)){ -// builder.addOrder(OrderCondition.desc(orderType)); -// }else{ -// builder.addOrder(OrderCondition.desc("id")); -// } + if(StringUtil.isNoneBlank(orderType)){ + builder.addOrder(OrderCondition.desc(orderType)); + }else{ + builder.addOrder(OrderCondition.asc("sysCreateTime")); + } if(StringUtil.isNoneBlank(keyword)){ builder.addFilter(FieldFilters.like("content",keyword)); } From 87db7bd3b88105b92a1e835e20ba68e8e171afe0 Mon Sep 17 00:00:00 2001 From: 86182 Date: Wed, 2 Nov 2022 17:07:03 +0800 Subject: [PATCH 03/25] =?UTF-8?q?=E9=80=BB=E8=BE=91=E5=8F=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xboe/module/course/service/impl/CourseServiceImpl.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/course/service/impl/CourseServiceImpl.java b/servers/boe-server-all/src/main/java/com/xboe/module/course/service/impl/CourseServiceImpl.java index 277e16c0..459a3346 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/course/service/impl/CourseServiceImpl.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/course/service/impl/CourseServiceImpl.java @@ -370,7 +370,8 @@ public class CourseServiceImpl implements ICourseService { if(rs.isEmpty()) { log.error("未能查询出数据"); } - courses.addAll(rs); +// courses.addAll(rs); + rs.addAll(courses); return courses; } @@ -1040,6 +1041,7 @@ public class CourseServiceImpl implements ICourseService { QueryBuilder builder = QueryBuilder.from(Course.class); builder.addFilter(FieldFilters.eq("deleted",false)); builder.addFilter(FieldFilters.eq("enabled",true)); + builder.addFilter(FieldFilters.gt("score",4.0)); builder.setPageSize(3); List iFieldFilters = new ArrayList<>(); iFieldFilters.add(FieldFilters.in("sysType1",strings)); From 29a727f2b1898609101e8ce418615a47109a82c6 Mon Sep 17 00:00:00 2001 From: 86182 Date: Wed, 2 Nov 2022 17:10:59 +0800 Subject: [PATCH 04/25] =?UTF-8?q?=E9=80=BB=E8=BE=91=E5=8F=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/xboe/module/course/service/impl/CourseServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/course/service/impl/CourseServiceImpl.java b/servers/boe-server-all/src/main/java/com/xboe/module/course/service/impl/CourseServiceImpl.java index 459a3346..e3357b51 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/course/service/impl/CourseServiceImpl.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/course/service/impl/CourseServiceImpl.java @@ -1041,7 +1041,7 @@ public class CourseServiceImpl implements ICourseService { QueryBuilder builder = QueryBuilder.from(Course.class); builder.addFilter(FieldFilters.eq("deleted",false)); builder.addFilter(FieldFilters.eq("enabled",true)); - builder.addFilter(FieldFilters.gt("score",4.0)); + builder.addFilter(FieldFilters.gt("score",4)); builder.setPageSize(3); List iFieldFilters = new ArrayList<>(); iFieldFilters.add(FieldFilters.in("sysType1",strings)); From 5b2c65b1de35f85f03aa040f1fb8402f7fb24166 Mon Sep 17 00:00:00 2001 From: 86182 Date: Wed, 2 Nov 2022 17:13:09 +0800 Subject: [PATCH 05/25] =?UTF-8?q?=E9=80=BB=E8=BE=91=E5=8F=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/xboe/module/course/service/impl/CourseServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/course/service/impl/CourseServiceImpl.java b/servers/boe-server-all/src/main/java/com/xboe/module/course/service/impl/CourseServiceImpl.java index e3357b51..0f22e374 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/course/service/impl/CourseServiceImpl.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/course/service/impl/CourseServiceImpl.java @@ -1041,7 +1041,7 @@ public class CourseServiceImpl implements ICourseService { QueryBuilder builder = QueryBuilder.from(Course.class); builder.addFilter(FieldFilters.eq("deleted",false)); builder.addFilter(FieldFilters.eq("enabled",true)); - builder.addFilter(FieldFilters.gt("score",4)); + builder.addFilter(FieldFilters.gt("score",4.0f)); builder.setPageSize(3); List iFieldFilters = new ArrayList<>(); iFieldFilters.add(FieldFilters.in("sysType1",strings)); From 05019ef7ab3dc924b85f618289dbd4dc51b27751 Mon Sep 17 00:00:00 2001 From: 86182 Date: Wed, 2 Nov 2022 17:16:16 +0800 Subject: [PATCH 06/25] =?UTF-8?q?=E9=80=BB=E8=BE=91=E5=8F=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/xboe/module/course/service/impl/CourseServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/course/service/impl/CourseServiceImpl.java b/servers/boe-server-all/src/main/java/com/xboe/module/course/service/impl/CourseServiceImpl.java index 0f22e374..2fe9682a 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/course/service/impl/CourseServiceImpl.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/course/service/impl/CourseServiceImpl.java @@ -372,7 +372,7 @@ public class CourseServiceImpl implements ICourseService { } // courses.addAll(rs); rs.addAll(courses); - return courses; + return rs; } @Override From 0973a260e17f38a7a24a514d7f9f875edaf51242 Mon Sep 17 00:00:00 2001 From: daihh Date: Wed, 2 Nov 2022 17:25:54 +0800 Subject: [PATCH 07/25] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xboe/module/exam/api/AloneExamApi.java | 4 +--- .../xboe/module/exam/entity/AloneExam.java | 24 ++++++++++++++++++- .../service/impl/AloneExamServiceImpl.java | 17 +++++++------ .../main/resources/application-dev.properties | 2 +- 4 files changed, 35 insertions(+), 12 deletions(-) diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/exam/api/AloneExamApi.java b/servers/boe-server-all/src/main/java/com/xboe/module/exam/api/AloneExamApi.java index 53c680ef..d148624c 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/exam/api/AloneExamApi.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/exam/api/AloneExamApi.java @@ -72,8 +72,6 @@ public class AloneExamApi extends ApiBaseController { @Resource private IExamPaperService examPapeService; - - /** * 当前用户的考试任务,AloneExam * @param pager @@ -84,7 +82,7 @@ public class AloneExamApi extends ApiBaseController { public JsonResponse> findUserPage(Pagination pager, AloneExam dto) { try { dto.setAid(getCurrent().getAccountId()); - PageList rs = service.findPage(pager.getPageIndex(), pager.getPageSize(), dto, OrderCondition.desc("sysCreateTime")); + PageList rs = service.findPage(pager.getPageIndex(), pager.getPageSize(), dto, null); return success(rs); } catch (Exception e){ log.error("查询独立考试答卷列表错误", e); diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/exam/entity/AloneExam.java b/servers/boe-server-all/src/main/java/com/xboe/module/exam/entity/AloneExam.java index f513ec9e..0c5210b6 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/exam/entity/AloneExam.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/exam/entity/AloneExam.java @@ -5,6 +5,7 @@ import java.time.LocalDateTime; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; import com.fasterxml.jackson.annotation.JsonFormat; import com.xboe.core.SysConstant; @@ -115,7 +116,7 @@ public class AloneExam extends IdBaseEntity { /** * 开始时间 */ - @JsonFormat(pattern = "yyyy--MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @Column(name = "start_time") private LocalDateTime startTime; @@ -125,5 +126,26 @@ public class AloneExam extends IdBaseEntity { @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @Column(name = "end_time") private LocalDateTime endTime; + + @Transient + private Float total; + + public AloneExam() { + + } + + public AloneExam(String id,String aid,String testId,String testName,Integer testDuration,Integer times,Float score,Integer status,LocalDateTime taskTime,LocalDateTime startTime,LocalDateTime endTime) { + this.setId(id); + this.setAid(aid); + this.testId=testId; + this.testName=testName; + this.testDuration=testDuration; + this.times=times; + this.score=score; + this.status=status; + this.taskTime=taskTime; + this.startTime=startTime; + this.endTime=endTime; + } } diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/exam/service/impl/AloneExamServiceImpl.java b/servers/boe-server-all/src/main/java/com/xboe/module/exam/service/impl/AloneExamServiceImpl.java index 7188ba27..0b7bfe42 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/exam/service/impl/AloneExamServiceImpl.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/exam/service/impl/AloneExamServiceImpl.java @@ -18,6 +18,7 @@ import com.xboe.module.exam.dao.AloneExamAnswerDao; import com.xboe.module.exam.dao.AloneExamDao; import com.xboe.module.exam.entity.AloneExam; import com.xboe.module.exam.entity.AloneExamAnswer; +import com.xboe.module.exam.entity.ExamTest; import com.xboe.module.exam.service.IAloneExamService; @Service @@ -182,29 +183,31 @@ public class AloneExamServiceImpl implements IAloneExamService{ @Override public PageList findPage(int pageIndex, int pageSize, AloneExam aea, OrderCondition oc) { - QueryBuilder query=QueryBuilder.from(AloneExam.class); + QueryBuilder query=QueryBuilder.from(AloneExam.class.getSimpleName()+" a,"+ExamTest.class.getSimpleName()+" t"); + query.addField("new AloneExam(a.id,a.aid,a.testId,a.testName,a.testDuration,a.times,a.score,a.status,a.taskTime,t.entranceTime,t.deadlineTime)"); query.setPageIndex(pageIndex); query.setPageSize(pageSize); + query.addFilter(FieldFilters.eqField("a.testId","t.id")); if(oc!=null) { query.addOrder(oc); }else { - query.addOrder(OrderCondition.desc("sysCreateTime")); + query.addOrder(OrderCondition.desc("a.sysCreateTime")); } if(aea!=null) { if(aea.getStatus()!=null) { - query.addFilter(FieldFilters.eq("status",aea.getStatus())); + query.addFilter(FieldFilters.eq("a.status",aea.getStatus())); } if(StringUtils.isNotBlank(aea.getTestId())) { - query.addFilter(FieldFilters.eq("testId",aea.getTestId())); + query.addFilter(FieldFilters.eq("a.testId",aea.getTestId())); } if(StringUtils.isNotBlank(aea.getTestName())) { - query.addFilter(FieldFilters.like("testName",aea.getTestName())); + query.addFilter(FieldFilters.like("a.testName",aea.getTestName())); } if(StringUtils.isNotBlank(aea.getAid())) { - query.addFilter(FieldFilters.eq("aid",aea.getAid())); + query.addFilter(FieldFilters.eq("a.aid",aea.getAid())); } if(StringUtils.isNotBlank(aea.getName())) { - query.addFilter(FieldFilters.eq("name",aea.getName())); + query.addFilter(FieldFilters.eq("a.name",aea.getName())); } } return aeDao.findPage(query.builder()); diff --git a/servers/boe-server-all/src/main/resources/application-dev.properties b/servers/boe-server-all/src/main/resources/application-dev.properties index 54c20ab0..45945a8d 100644 --- a/servers/boe-server-all/src/main/resources/application-dev.properties +++ b/servers/boe-server-all/src/main/resources/application-dev.properties @@ -52,7 +52,7 @@ jasypt.encryptor.algorithm=PBEWithMD5AndDES jasypt.encryptor.iv-generator-classname=org.jasypt.iv.NoIvGenerator # elasticsearch config -xboe.elasticsearch.server.ip=127.0.0.1 +xboe.elasticsearch.server.ip=192.168.0.11 xboe.elasticsearch.server.port=9200 xboe.elasticsearch.server.user= xboe.elasticsearch.server.password= From 31742a4e2900d8bda3e109124d32e50effb56fd3 Mon Sep 17 00:00:00 2001 From: 86182 Date: Wed, 2 Nov 2022 20:52:56 +0800 Subject: [PATCH 08/25] =?UTF-8?q?=E7=AC=94=E8=AE=B0=E8=AF=84=E8=AE=BA?= =?UTF-8?q?=E9=80=BB=E8=BE=91=E5=8F=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/interaction/api/CommentsApi.java | 18 ++++++++++++++++++ .../interaction/service/ICommentsService.java | 8 ++++++++ .../service/impl/CommentsServiceImpl.java | 6 ++++++ 3 files changed, 32 insertions(+) diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/interaction/api/CommentsApi.java b/servers/boe-server-all/src/main/java/com/xboe/module/interaction/api/CommentsApi.java index 116ae8c9..9b340f43 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/interaction/api/CommentsApi.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/interaction/api/CommentsApi.java @@ -70,6 +70,24 @@ public class CommentsApi extends ApiBaseController{ return success(list); } + + /** + * 只显示某个内容下的一级评论，现在只有笔记 + * */ + @PostMapping("/list") + public JsonResponse> list(Integer objType,Integer objId){ + if(objId==null){ + return badRequest("参数异常"); + } + if(objType==null){ + return badRequest("参数异常"); + } + List list = service.list(objType, objId); + return success(list); + + } + + @RequestMapping(value="/user-reply-list",method= {RequestMethod.GET,RequestMethod.POST}) diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/interaction/service/ICommentsService.java b/servers/boe-server-all/src/main/java/com/xboe/module/interaction/service/ICommentsService.java index 53f3ec6f..a4cf8491 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/interaction/service/ICommentsService.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/interaction/service/ICommentsService.java @@ -137,5 +137,13 @@ public interface ICommentsService { PageList findAll(int pageIndex, int pageSize, String toaid, String uname); + /** + * + * 笔记的回复 + * */ + List list(Integer objType,Integer objId); + + + } diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/interaction/service/impl/CommentsServiceImpl.java b/servers/boe-server-all/src/main/java/com/xboe/module/interaction/service/impl/CommentsServiceImpl.java index 098233d8..f06beceb 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/interaction/service/impl/CommentsServiceImpl.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/interaction/service/impl/CommentsServiceImpl.java @@ -289,6 +289,12 @@ public class CommentsServiceImpl implements ICommentsService{ } + @Override + public List list(Integer objType, Integer objId) { + List list = dao.findList(FieldFilters.eq("objType", objType), FieldFilters.eq("objId", objId)); + return list; + } + @Override public PageList findCourseTome(int pageIndex, int pageSize, Integer objType, String toaid, String uname, Boolean isread) { From 8d68f83adf6d5716ff8efdab205c294c4678d6e5 Mon Sep 17 00:00:00 2001 From: 86182 Date: Wed, 2 Nov 2022 21:07:36 +0800 Subject: [PATCH 09/25] =?UTF-8?q?=E5=9B=9E=E5=A4=8D=E9=80=BB=E8=BE=91?= =?UTF-8?q?=E5=8F=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/xboe/module/qa/entity/Answer.java | 3 +++ .../com/xboe/module/qa/service/impl/AnswerServiceImpl.java | 3 +++ 2 files changed, 6 insertions(+) diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/qa/entity/Answer.java b/servers/boe-server-all/src/main/java/com/xboe/module/qa/entity/Answer.java index e8098d9d..8237cd08 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/qa/entity/Answer.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/qa/entity/Answer.java @@ -86,6 +86,9 @@ public class Answer extends IdBaseEntity { @Column(name = "replay_name",length = 50) private String replayName; + @Column(name = "replays") + private Integer replays; + @Transient private List answers; diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/qa/service/impl/AnswerServiceImpl.java b/servers/boe-server-all/src/main/java/com/xboe/module/qa/service/impl/AnswerServiceImpl.java index c81223c7..204cbf92 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/qa/service/impl/AnswerServiceImpl.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/qa/service/impl/AnswerServiceImpl.java @@ -185,6 +185,9 @@ public class AnswerServiceImpl implements IAnswerService { answer.setShares(0); answer.setDeleted(false); answerDao.save(answer); + if(StringUtil.isNotBlank(answer.getParentId())){ + answerDao.updateMultiFieldById(answer.getParentId(),UpdateBuilder.create("replays","replays+1",FieldUpdateType.EXPRESSION)); + } questionDao.updateMultiFieldById(answer.getQid(),UpdateBuilder.create("answers", "answers+1",FieldUpdateType.EXPRESSION)); } From 8b537c9218032b0763584b35f4bf1d4ce38915fd Mon Sep 17 00:00:00 2001 From: 86182 Date: Wed, 2 Nov 2022 21:22:25 +0800 Subject: [PATCH 10/25] =?UTF-8?q?=E5=9B=9E=E5=A4=8D=E9=80=BB=E8=BE=91?= =?UTF-8?q?=E5=8F=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/xboe/module/qa/service/impl/AnswerServiceImpl.java | 1 + 1 file changed, 1 insertion(+) diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/qa/service/impl/AnswerServiceImpl.java b/servers/boe-server-all/src/main/java/com/xboe/module/qa/service/impl/AnswerServiceImpl.java index 204cbf92..fa6b481b 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/qa/service/impl/AnswerServiceImpl.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/qa/service/impl/AnswerServiceImpl.java @@ -186,6 +186,7 @@ public class AnswerServiceImpl implements IAnswerService { answer.setDeleted(false); answerDao.save(answer); if(StringUtil.isNotBlank(answer.getParentId())){ + System.out.println("111"); answerDao.updateMultiFieldById(answer.getParentId(),UpdateBuilder.create("replays","replays+1",FieldUpdateType.EXPRESSION)); } questionDao.updateMultiFieldById(answer.getQid(),UpdateBuilder.create("answers", "answers+1",FieldUpdateType.EXPRESSION)); From 7155c748db838e799c42665f6a34ed30270f8513 Mon Sep 17 00:00:00 2001 From: 86182 Date: Wed, 2 Nov 2022 21:25:37 +0800 Subject: [PATCH 11/25] =?UTF-8?q?=E5=9B=9E=E5=A4=8D=E9=80=BB=E8=BE=91?= =?UTF-8?q?=E5=8F=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/xboe/module/qa/service/impl/AnswerServiceImpl.java | 1 + 1 file changed, 1 insertion(+) diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/qa/service/impl/AnswerServiceImpl.java b/servers/boe-server-all/src/main/java/com/xboe/module/qa/service/impl/AnswerServiceImpl.java index fa6b481b..15905bb7 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/qa/service/impl/AnswerServiceImpl.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/qa/service/impl/AnswerServiceImpl.java @@ -187,6 +187,7 @@ public class AnswerServiceImpl implements IAnswerService { answerDao.save(answer); if(StringUtil.isNotBlank(answer.getParentId())){ System.out.println("111"); + System.out.println(answer.getParentId()); answerDao.updateMultiFieldById(answer.getParentId(),UpdateBuilder.create("replays","replays+1",FieldUpdateType.EXPRESSION)); } questionDao.updateMultiFieldById(answer.getQid(),UpdateBuilder.create("answers", "answers+1",FieldUpdateType.EXPRESSION)); From f7db8a2de575b9b29da67eb19958e9d8f4e5bafb Mon Sep 17 00:00:00 2001 From: 86182 Date: Wed, 2 Nov 2022 21:30:00 +0800 Subject: [PATCH 12/25] =?UTF-8?q?=E5=9B=9E=E5=A4=8D=E9=80=BB=E8=BE=91?= =?UTF-8?q?=E5=8F=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/xboe/module/qa/service/impl/AnswerServiceImpl.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/qa/service/impl/AnswerServiceImpl.java b/servers/boe-server-all/src/main/java/com/xboe/module/qa/service/impl/AnswerServiceImpl.java index 15905bb7..64d56829 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/qa/service/impl/AnswerServiceImpl.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/qa/service/impl/AnswerServiceImpl.java @@ -186,8 +186,7 @@ public class AnswerServiceImpl implements IAnswerService { answer.setDeleted(false); answerDao.save(answer); if(StringUtil.isNotBlank(answer.getParentId())){ - System.out.println("111"); - System.out.println(answer.getParentId()); + answerDao.updateMultiFieldById(answer.getParentId(),UpdateBuilder.create("replays","replays+1",FieldUpdateType.EXPRESSION)); } questionDao.updateMultiFieldById(answer.getQid(),UpdateBuilder.create("answers", "answers+1",FieldUpdateType.EXPRESSION)); From 52555fba891693f32da85bcec410681a5f3f3229 Mon Sep 17 00:00:00 2001 From: daihh Date: Wed, 2 Nov 2022 23:51:03 +0800 Subject: [PATCH 13/25] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=89=93=E5=8D=B0?= =?UTF-8?q?=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/BasicDataSyncServiceImpl.java | 12 ++++++++++-- .../service/impl/MainDbSyncServiceImpl.java | 18 ++++++++++++++++-- 2 files changed, 26 insertions(+), 4 deletions(-) diff --git a/servers/boe-server-basic/src/main/java/com/xboe/basic/service/impl/BasicDataSyncServiceImpl.java b/servers/boe-server-basic/src/main/java/com/xboe/basic/service/impl/BasicDataSyncServiceImpl.java index 7f7c332f..4a7c18d0 100644 --- a/servers/boe-server-basic/src/main/java/com/xboe/basic/service/impl/BasicDataSyncServiceImpl.java +++ b/servers/boe-server-basic/src/main/java/com/xboe/basic/service/impl/BasicDataSyncServiceImpl.java @@ -160,7 +160,11 @@ public class BasicDataSyncServiceImpl implements IBasicDataSyncService{ Object idObj = orgDao.findField("id", FieldFilters.eq("kid", dto.getOldDepartId())); if(idObj!=null) { dto.setDepartId(idObj.toString()); + }else { + log.error("用户【"+dto.getKid()+"】"+dto.getName()+"对应的机构的kid【"+dto.getOldDepartId()+"】本地未查到"); } + }else { + log.error("用户【"+dto.getKid()+"】"+dto.getName()+"无关联的机构信息oldDepartId"); } //同一个用户工号对应 多个kid的情况,所以直接根据kid查询是不对的,所以这里按工号查询,不使用kid User user = userDao.findOne(FieldFilters.eq("userNo", dto.getUserNo())); @@ -208,7 +212,6 @@ public class BasicDataSyncServiceImpl implements IBasicDataSyncService{ user.setId(a.getId()); user.setPersonId(person.getId()); user.setEnterpriseId(dto.getEnterpriseId()); - user.setDepartId(dto.getDepartId()); user.setDescription(dto.getDescription()); user.setDomainId(dto.getDomainId()); user.setDuty(dto.getDuty()); @@ -260,7 +263,12 @@ public class BasicDataSyncServiceImpl implements IBasicDataSyncService{ user.setOrgNamePath(dto.getOrgNamePath()); user.setOrgTreeType(dto.getOrgTreeType()); user.setEnterpriseId(dto.getEnterpriseId()); - user.setDepartId(dto.getDepartId()); + + if(StringUtils.isNotBlank(dto.getDepartId())) { + user.setDepartId(dto.getDepartId()); + }else { + log.error("用户【"+user+"】无机构信息，不更新此字段"); + } user.setRank(dto.getRank()); user.setSassId(dto.getSassId()); user.setTelephoneNo(dto.getTelephoneNo()); diff --git a/servers/boe-server-basic/src/main/java/com/xboe/primary/service/impl/MainDbSyncServiceImpl.java b/servers/boe-server-basic/src/main/java/com/xboe/primary/service/impl/MainDbSyncServiceImpl.java index 7b5cab53..1a3fabc5 100644 --- a/servers/boe-server-basic/src/main/java/com/xboe/primary/service/impl/MainDbSyncServiceImpl.java +++ b/servers/boe-server-basic/src/main/java/com/xboe/primary/service/impl/MainDbSyncServiceImpl.java @@ -2,11 +2,13 @@ package com.xboe.primary.service.impl; import java.time.LocalDateTime; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import com.xboe.basic.entity.Account; +import com.xboe.basic.service.impl.BasicDataSyncServiceImpl; import com.xboe.dto.OrganizationDto; import com.xboe.dto.UserDto; import com.xboe.primary.dao.MainAccountDao; @@ -18,9 +20,12 @@ import com.xboe.primary.entity.MainOrganization; import com.xboe.primary.entity.MainUser; import com.xboe.primary.service.IMainDbSyncService; +import lombok.extern.slf4j.Slf4j; + /** * 主数据库同步的实现 */ +@Slf4j @Service("allService") public class MainDbSyncServiceImpl implements IMainDbSyncService { @@ -95,7 +100,12 @@ public class MainDbSyncServiceImpl implements IMainDbSyncService { //更新用户信息，更新账号信息 user.setSysId(dto.getKid()); user.setName(dto.getName()); - user.setDepartId(dto.getDepartId()); + if(StringUtils.isNotBlank(dto.getDepartId())) { + user.setDepartId(dto.getDepartId()); + }else { + log.error("主库用户【"+user+"】无机构信息，不更新此字段"); + } + user.setDescription(dto.getDescription()); user.setDomainId(dto.getDomainId()); user.setDuty(dto.getDuty()); @@ -142,7 +152,11 @@ public class MainDbSyncServiceImpl implements IMainDbSyncService { user=new MainUser(); //同步过程中一样，可以不一样。因为此系统当前是一致的，所以统一使用一个 user.setId(a.getId()); - user.setDepartId(dto.getDepartId()); + if(StringUtils.isNotBlank(dto.getDepartId())) { + user.setDepartId(dto.getDepartId()); + }else { + log.error("主库新增用户【"+user+"】无机构信息"); + } user.setDescription(dto.getDescription()); user.setDomainId(dto.getDomainId()); user.setDuty(dto.getDuty()); From cfb259cf4e2c26f89b3fea23d7dd594d7ce1c3ed Mon Sep 17 00:00:00 2001 From: 86182 Date: Thu, 3 Nov 2022 11:18:33 +0800 Subject: [PATCH 14/25] =?UTF-8?q?=E6=96=B0=E5=8A=A0=E5=9B=9E=E5=A4=8D?= =?UTF-8?q?=E7=9A=84=E5=9B=9E=E5=A4=8D=E6=95=B0=EF=BC=8C=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E9=BB=98=E8=AE=A4=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/xboe/module/qa/service/impl/AnswerServiceImpl.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/qa/service/impl/AnswerServiceImpl.java b/servers/boe-server-all/src/main/java/com/xboe/module/qa/service/impl/AnswerServiceImpl.java index 64d56829..af5b75db 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/qa/service/impl/AnswerServiceImpl.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/qa/service/impl/AnswerServiceImpl.java @@ -41,6 +41,7 @@ public class AnswerServiceImpl implements IAnswerService { answer.setShares(0); answer.setDeleted(false); answer.setClevel(1); + answer.setReplays(0); answerDao.save(answer); questionDao.updateMultiFieldById(answer.getQid(),UpdateBuilder.create("answers", "answers+1",FieldUpdateType.EXPRESSION)); } @@ -184,6 +185,7 @@ public class AnswerServiceImpl implements IAnswerService { answer.setPraises(0); answer.setShares(0); answer.setDeleted(false); + answer.setReplays(0); answerDao.save(answer); if(StringUtil.isNotBlank(answer.getParentId())){ From d10802b476446f67f97063553b9cf38c3f0f01cc Mon Sep 17 00:00:00 2001 From: daihh Date: Thu, 3 Nov 2022 11:45:01 +0800 Subject: [PATCH 15/25] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/xboe/module/interaction/api/CommentsApi.java | 2 +- .../com/xboe/module/interaction/service/ICommentsService.java | 2 +- .../module/interaction/service/impl/CommentsServiceImpl.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/interaction/api/CommentsApi.java b/servers/boe-server-all/src/main/java/com/xboe/module/interaction/api/CommentsApi.java index 9b340f43..13ba875e 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/interaction/api/CommentsApi.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/interaction/api/CommentsApi.java @@ -75,7 +75,7 @@ public class CommentsApi extends ApiBaseController{ * 只显示某个内容下的一级评论，现在只有笔记 * */ @PostMapping("/list") - public JsonResponse> list(Integer objType,Integer objId){ + public JsonResponse> list(Integer objType,String objId){ if(objId==null){ return badRequest("参数异常"); } diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/interaction/service/ICommentsService.java b/servers/boe-server-all/src/main/java/com/xboe/module/interaction/service/ICommentsService.java index a4cf8491..56358d54 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/interaction/service/ICommentsService.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/interaction/service/ICommentsService.java @@ -141,7 +141,7 @@ public interface ICommentsService { * * 笔记的回复 * */ - List list(Integer objType,Integer objId); + List list(Integer objType,String objId); diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/interaction/service/impl/CommentsServiceImpl.java b/servers/boe-server-all/src/main/java/com/xboe/module/interaction/service/impl/CommentsServiceImpl.java index f06beceb..9ad467ef 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/interaction/service/impl/CommentsServiceImpl.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/interaction/service/impl/CommentsServiceImpl.java @@ -290,7 +290,7 @@ public class CommentsServiceImpl implements ICommentsService{ } @Override - public List list(Integer objType, Integer objId) { + public List list(Integer objType, String objId) { List list = dao.findList(FieldFilters.eq("objType", objType), FieldFilters.eq("objId", objId)); return list; } From 0627105da74a9e097219d41c4d33372c30a665de Mon Sep 17 00:00:00 2001 From: 86182 Date: Thu, 3 Nov 2022 11:49:20 +0800 Subject: [PATCH 16/25] =?UTF-8?q?=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/xboe/module/interaction/api/CommentsApi.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/interaction/api/CommentsApi.java b/servers/boe-server-all/src/main/java/com/xboe/module/interaction/api/CommentsApi.java index 13ba875e..8745a5eb 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/interaction/api/CommentsApi.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/interaction/api/CommentsApi.java @@ -3,6 +3,7 @@ package com.xboe.module.interaction.api; import java.util.ArrayList; import java.util.List; +import com.xboe.common.utils.StringUtil; import com.xboe.module.interaction.dto.CommentsDto; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -76,7 +77,7 @@ public class CommentsApi extends ApiBaseController{ * */ @PostMapping("/list") public JsonResponse> list(Integer objType,String objId){ - if(objId==null){ + if(StringUtil.isBlank(objId)){ return badRequest("参数异常"); } if(objType==null){ From 1b67a6eb87532730565877028f501f2790012658 Mon Sep 17 00:00:00 2001 From: daihh Date: Thu, 3 Nov 2022 12:04:09 +0800 Subject: [PATCH 17/25] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E9=87=8D=E5=A4=8D=E4=BA=8B=E4=BB=B6=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/course/service/impl/CourseServiceImpl.java | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/course/service/impl/CourseServiceImpl.java b/servers/boe-server-all/src/main/java/com/xboe/module/course/service/impl/CourseServiceImpl.java index 2fe9682a..a44b6d69 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/course/service/impl/CourseServiceImpl.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/course/service/impl/CourseServiceImpl.java @@ -425,11 +425,12 @@ public class CourseServiceImpl implements ICourseService { courseDao.updateFieldById(id,"name","已删除"+name); //同时添加发布事件,这里的创建人需要修改为教师 Course c=courseDao.get(id); - if(eventSender!=null) { - eventSender.send("删除课程","PublishCourse", "删除课程【"+c.getName()+"】", c.getId(), "1", c.getName(), c.getSysCreateAid(), c.getSysCreateBy(),""); - }else { - log.error("未配置事件消息发送的实现"); - } + //删除分两种情况，一个是管理员删除，一个是自己删除 ，所以这里的处理移到前端了 +// if(eventSender!=null) { +// eventSender.send("删除课程","DeleteCourse", "删除课程【"+c.getName()+"】", c.getId(), "1", c.getName(), c.getSysCreateAid(), c.getSysCreateBy(),""); +// }else { +// log.error("未配置事件消息发送的实现"); +// } //删除 if(c.getFullTextId()!=null) { try { From 6376fa1fe182d22b09dfa1122cabd7da25909da5 Mon Sep 17 00:00:00 2001 From: 86182 Date: Thu, 3 Nov 2022 13:40:27 +0800 Subject: [PATCH 18/25] =?UTF-8?q?=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/interaction/api/CommentsApi.java | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/interaction/api/CommentsApi.java b/servers/boe-server-all/src/main/java/com/xboe/module/interaction/api/CommentsApi.java index 8745a5eb..7afd9bc2 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/interaction/api/CommentsApi.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/interaction/api/CommentsApi.java @@ -84,6 +84,23 @@ public class CommentsApi extends ApiBaseController{ return badRequest("参数异常"); } List list = service.list(objType, objId); + + List ids=new ArrayList(); + for(Comments c: list) { + if(c.getReplys()>0) { + ids.add(c.getId()); + } + } + List replyList = service.findReplysByCommentIds(20, objType, ids); + + for(Comments c: list) { + c.setReplyList(new ArrayList()); + for(Comments r: replyList) { + if(r.getCommentId().equals(c.getId())) { + c.getReplyList().add(r); + } + } + } return success(list); } From ec27fe1794e5cd0d08024b81205113f60ed3b4ab Mon Sep 17 00:00:00 2001 From: 86182 Date: Thu, 3 Nov 2022 14:00:59 +0800 Subject: [PATCH 19/25] =?UTF-8?q?=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/interaction/api/CommentsApi.java | 23 ++++++++----------- 1 file changed, 9 insertions(+), 14 deletions(-) diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/interaction/api/CommentsApi.java b/servers/boe-server-all/src/main/java/com/xboe/module/interaction/api/CommentsApi.java index 7afd9bc2..86bcce6b 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/interaction/api/CommentsApi.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/interaction/api/CommentsApi.java @@ -2,6 +2,7 @@ package com.xboe.module.interaction.api; import java.util.ArrayList; import java.util.List; +import java.util.stream.Collectors; import com.xboe.common.utils.StringUtil; import com.xboe.module.interaction.dto.CommentsDto; @@ -85,22 +86,16 @@ public class CommentsApi extends ApiBaseController{ } List list = service.list(objType, objId); - List ids=new ArrayList(); - for(Comments c: list) { - if(c.getReplys()>0) { - ids.add(c.getId()); - } - } +// List ids=new ArrayList(); +// for(Comments c: list) { +// if(c.getReplys()>0) { +// ids.add(c.getId()); +// } +// } + List ids = list.stream().map(Comments::getId).collect(Collectors.toList()); List replyList = service.findReplysByCommentIds(20, objType, ids); - for(Comments c: list) { - c.setReplyList(new ArrayList()); - for(Comments r: replyList) { - if(r.getCommentId().equals(c.getId())) { - c.getReplyList().add(r); - } - } - } + list.addAll(replyList); return success(list); } From da00eb49d6533a8e7ab4f5971bc2dc1773374bf8 Mon Sep 17 00:00:00 2001 From: 86182 Date: Thu, 3 Nov 2022 14:02:00 +0800 Subject: [PATCH 20/25] =?UTF-8?q?=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/xboe/module/interaction/api/CommentsApi.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/interaction/api/CommentsApi.java b/servers/boe-server-all/src/main/java/com/xboe/module/interaction/api/CommentsApi.java index 86bcce6b..dd09c004 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/interaction/api/CommentsApi.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/interaction/api/CommentsApi.java @@ -93,9 +93,11 @@ public class CommentsApi extends ApiBaseController{ // } // } List ids = list.stream().map(Comments::getId).collect(Collectors.toList()); - List replyList = service.findReplysByCommentIds(20, objType, ids); + if(!ids.isEmpty()) { + List replyList = service.findReplysByCommentIds(20, objType, ids); - list.addAll(replyList); + list.addAll(replyList); + } return success(list); } From 0bfb95f760b8165fb0dc9795da9a2eff190b1a28 Mon Sep 17 00:00:00 2001 From: daihh Date: Thu, 3 Nov 2022 16:06:19 +0800 Subject: [PATCH 21/25] =?UTF-8?q?=E6=A0=B9=E6=8D=AEids=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E5=8F=8A=E5=AD=A6=E4=B9=A0=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=EF=BC=8C=E5=A2=9E=E5=8A=A0=E5=B1=9E=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xboe/school/study/api/StudyCourseApi.java | 5 ++- .../school/study/dto/StudyCourseSimple.java | 38 +++++++++++++++++++ .../study/service/IStudyCourseService.java | 10 ++--- .../service/impl/StudyCourseServiceImpl.java | 17 +++++---- 4 files changed, 54 insertions(+), 16 deletions(-) create mode 100644 servers/boe-server-all/src/main/java/com/xboe/school/study/dto/StudyCourseSimple.java diff --git a/servers/boe-server-all/src/main/java/com/xboe/school/study/api/StudyCourseApi.java b/servers/boe-server-all/src/main/java/com/xboe/school/study/api/StudyCourseApi.java index 87d68211..ae63539a 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/school/study/api/StudyCourseApi.java +++ b/servers/boe-server-all/src/main/java/com/xboe/school/study/api/StudyCourseApi.java @@ -35,6 +35,7 @@ import com.xboe.module.teacher.service.ITeacherService; import com.xboe.school.study.dto.StudyContentDto; import com.xboe.school.study.dto.StudyCourseNameDto; import com.xboe.school.study.dto.StudyCourseQuery; +import com.xboe.school.study.dto.StudyCourseSimple; import com.xboe.school.study.entity.StudyCourse; import com.xboe.school.study.entity.StudyCourseItem; import com.xboe.school.study.entity.StudySignup; @@ -654,14 +655,14 @@ public class StudyCourseApi extends ApiBaseController{ * 我的关注 二次查询 * */ @PostMapping("/follow-ids") - public JsonResponse> followIds(@RequestBody StudyCourseQuery studyCourseQuery){ + public JsonResponse> followIds(@RequestBody StudyCourseQuery studyCourseQuery){ if(studyCourseQuery!=null && studyCourseQuery.getIds().isEmpty()){ return badRequest("参数异常"); } if(studyCourseQuery!=null && studyCourseQuery.getAids().isEmpty()){ return badRequest("无关注人"); } - List studyCouseDtos = service.followids(studyCourseQuery); + List studyCouseDtos = service.followids(studyCourseQuery); // List ids=new ArrayList(); // for(StudyCourse scourse:studyCouseDtos) { // ids.add(scourse.getCourseId()); diff --git a/servers/boe-server-all/src/main/java/com/xboe/school/study/dto/StudyCourseSimple.java b/servers/boe-server-all/src/main/java/com/xboe/school/study/dto/StudyCourseSimple.java new file mode 100644 index 00000000..b05d0c4e --- /dev/null +++ b/servers/boe-server-all/src/main/java/com/xboe/school/study/dto/StudyCourseSimple.java @@ -0,0 +1,38 @@ +package com.xboe.school.study.dto; + +import java.time.LocalDateTime; + +import com.fasterxml.jackson.annotation.JsonFormat; + +import lombok.Data; + +@Data +public class StudyCourseSimple { + + private String id; + + private String courseName; + + private String courseId; + + private String courseType; + + private Integer source; + + private String courseImage; + + private Float progress; + + private Float lastScore; + + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime addTime; + + private String sysType1; + + private String sysType2; + + private String sysType3; + + private String aid; +} diff --git a/servers/boe-server-all/src/main/java/com/xboe/school/study/service/IStudyCourseService.java b/servers/boe-server-all/src/main/java/com/xboe/school/study/service/IStudyCourseService.java index bcaf5dfd..9a80d241 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/school/study/service/IStudyCourseService.java +++ b/servers/boe-server-all/src/main/java/com/xboe/school/study/service/IStudyCourseService.java @@ -1,18 +1,16 @@ package com.xboe.school.study.service; +import java.util.List; + import com.xboe.common.OrderCondition; import com.xboe.common.PageList; import com.xboe.school.study.dto.StudyCourseNameDto; import com.xboe.school.study.dto.StudyCourseQuery; -import com.xboe.school.study.dto.StudyCouseDto; +import com.xboe.school.study.dto.StudyCourseSimple; import com.xboe.school.study.entity.StudyCourse; import com.xboe.school.study.entity.StudyCourseItem; import com.xboe.school.study.entity.StudySignup; -import org.springframework.web.bind.annotation.RequestBody; - -import java.util.List; - public interface IStudyCourseService { /** @@ -81,7 +79,7 @@ public interface IStudyCourseService { /** * 二次查询 我的关注 * */ - List followids(StudyCourseQuery studyCourseQuery); + List followids(StudyCourseQuery studyCourseQuery); /** * 查询课程最新学习记录的进度 diff --git a/servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudyCourseServiceImpl.java b/servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudyCourseServiceImpl.java index 87be6ff3..de89eddc 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudyCourseServiceImpl.java +++ b/servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudyCourseServiceImpl.java @@ -1,15 +1,11 @@ package com.xboe.school.study.service.impl; -import java.math.BigInteger; -import java.sql.Timestamp; import java.time.LocalDate; import java.time.LocalDateTime; import java.time.format.DateTimeFormatter; import java.util.ArrayList; -import java.util.HashSet; import java.util.List; -import java.util.Set; import javax.transaction.Transactional; @@ -37,6 +33,7 @@ import com.xboe.school.study.dao.StudySignupDao; import com.xboe.school.study.dao.StudyTimeDao; import com.xboe.school.study.dto.StudyCourseNameDto; import com.xboe.school.study.dto.StudyCourseQuery; +import com.xboe.school.study.dto.StudyCourseSimple; import com.xboe.school.study.entity.StudyCourse; import com.xboe.school.study.entity.StudyCourseItem; import com.xboe.school.study.entity.StudySignup; @@ -418,18 +415,18 @@ public class StudyCourseServiceImpl implements IStudyCourseService{ } @Override - public List followids(StudyCourseQuery studyCourseQuery) { + public List followids(StudyCourseQuery studyCourseQuery) { //分两次查询，查询课程，查询学习记录 - String courseHql="Select id,coverImg,score from "+Course.class.getSimpleName()+" where id in(?1)"; + String courseHql="Select id,coverImg,score,name,sysType1,sysType2,sysType3 from "+Course.class.getSimpleName()+" where id in(?1)"; String studyHql="Select courseId,addTime,progress,aid from "+StudyCourse.class.getSimpleName()+" where aid in(?1) and courseId in(?2)"; - List rs=new ArrayList<>(); + List rs=new ArrayList<>(); try { List clist= studyCourseDao.findListFields(courseHql,studyCourseQuery.getIds()); List slist= studyCourseDao.findListFields(studyHql,studyCourseQuery.getAids(),studyCourseQuery.getIds()); //数据数量一般不会太多，不超过20条，所以直接使用嵌套循环 for(Object[] sobjs : slist) { - StudyCourse sc=new StudyCourse(); + StudyCourseSimple sc=new StudyCourseSimple(); sc.setCourseId(ConvertUtil.toStr(sobjs[0])); sc.setAddTime((LocalDateTime)sobjs[1]); sc.setProgress(ConvertUtil.toFloat(sobjs[2])); @@ -440,6 +437,10 @@ public class StudyCourseServiceImpl implements IStudyCourseService{ if(cid!=null && cid.equals(sc.getCourseId())) { sc.setCourseImage(ConvertUtil.toStr(cobjs[1])); sc.setLastScore(ConvertUtil.toFloat(cobjs[2]));//课程分数，使用此值来承载 + sc.setCourseName(ConvertUtil.toStr(cobjs[3])); + sc.setSysType1(ConvertUtil.toStr(cobjs[4])); + sc.setSysType2(ConvertUtil.toStr(cobjs[5])); + sc.setSysType3(ConvertUtil.toStr(cobjs[6])); break; } } From 9d0072f848d967371434520095f21d14414e99a8 Mon Sep 17 00:00:00 2001 From: daihh Date: Thu, 3 Nov 2022 16:55:29 +0800 Subject: [PATCH 22/25] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E7=94=9F=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/idconfig/IdGeneratorAutoConfig.java | 14 +++++++++++++- .../com/xboe/module/idconfig/entity/IPMapping.java | 6 ++++++ .../module/idconfig/service/IIPMappingService.java | 4 ++-- .../service/impl/IPMappingServiceImpl.java | 9 +++++---- 4 files changed, 26 insertions(+), 7 deletions(-) diff --git a/modules/boe-module-idconfig/src/main/java/com/xboe/module/idconfig/IdGeneratorAutoConfig.java b/modules/boe-module-idconfig/src/main/java/com/xboe/module/idconfig/IdGeneratorAutoConfig.java index 152fc099..ac9607d2 100644 --- a/modules/boe-module-idconfig/src/main/java/com/xboe/module/idconfig/IdGeneratorAutoConfig.java +++ b/modules/boe-module-idconfig/src/main/java/com/xboe/module/idconfig/IdGeneratorAutoConfig.java @@ -8,9 +8,12 @@ import java.util.Enumeration; import javax.annotation.Resource; import org.apache.commons.lang3.RandomUtils; +import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Component; import com.xboe.common.utils.IDGenerator; +import com.xboe.common.utils.MD5Util; +import com.xboe.core.SysConstant; import com.xboe.module.idconfig.entity.IPMapping; import com.xboe.module.idconfig.service.IIPMappingService; @@ -31,8 +34,15 @@ public class IdGeneratorAutoConfig { public void init() throws Exception{ String ip=getLinuxLocalIp(); + String appName=SysConstant.getConfigValue("spring.application.name"); + if(StringUtils.isBlank(appName)) { + appName=IDGenerator.randomString(8);//随机生成8位字符串 + } + log.info("读取的应用名称:"+appName); + String md5=MD5Util.MD5Encode(ip+appName); + IPMapping ipm = ipMappingService.get(md5); + - IPMapping ipm = ipMappingService.findByIP(ip); Integer workServerId=null; Integer dataCenterId=null; if(ipm!=null) { @@ -43,9 +53,11 @@ public class IdGeneratorAutoConfig { workServerId=RandomUtils.nextInt(0,31); dataCenterId=RandomUtils.nextInt(0,31); ipm=new IPMapping(); + ipm.setId(md5); ipm.setIp(ip); ipm.setDcNum(dataCenterId); ipm.setWorkNum(workServerId); + ipm.setAppName(appName); ipMappingService.save(ipm); } IDGenerator.init(workServerId,dataCenterId); diff --git a/modules/boe-module-idconfig/src/main/java/com/xboe/module/idconfig/entity/IPMapping.java b/modules/boe-module-idconfig/src/main/java/com/xboe/module/idconfig/entity/IPMapping.java index ae101a84..9d1612ab 100644 --- a/modules/boe-module-idconfig/src/main/java/com/xboe/module/idconfig/entity/IPMapping.java +++ b/modules/boe-module-idconfig/src/main/java/com/xboe/module/idconfig/entity/IPMapping.java @@ -15,9 +15,15 @@ import lombok.Data; public class IPMapping { @Id + @Column(name = "id", length = 32) + private String id; + @Column(name = "ip", length = 40) private String ip; + @Column(name = "app_name", length = 50) + private String appName; + @Column(name = "work_num", length = 2) private Integer workNum; diff --git a/modules/boe-module-idconfig/src/main/java/com/xboe/module/idconfig/service/IIPMappingService.java b/modules/boe-module-idconfig/src/main/java/com/xboe/module/idconfig/service/IIPMappingService.java index 98065e6b..2a99b517 100644 --- a/modules/boe-module-idconfig/src/main/java/com/xboe/module/idconfig/service/IIPMappingService.java +++ b/modules/boe-module-idconfig/src/main/java/com/xboe/module/idconfig/service/IIPMappingService.java @@ -5,8 +5,8 @@ import java.util.List; import com.xboe.module.idconfig.entity.IPMapping; public interface IIPMappingService { - - IPMapping findByIP(String ip); + + IPMapping get(String id); void save(IPMapping ipm); diff --git a/modules/boe-module-idconfig/src/main/java/com/xboe/module/idconfig/service/impl/IPMappingServiceImpl.java b/modules/boe-module-idconfig/src/main/java/com/xboe/module/idconfig/service/impl/IPMappingServiceImpl.java index c10c86cd..6599722a 100644 --- a/modules/boe-module-idconfig/src/main/java/com/xboe/module/idconfig/service/impl/IPMappingServiceImpl.java +++ b/modules/boe-module-idconfig/src/main/java/com/xboe/module/idconfig/service/impl/IPMappingServiceImpl.java @@ -17,10 +17,6 @@ public class IPMappingServiceImpl implements IIPMappingService{ @Autowired IPMappingDao dao; - @Override - public IPMapping findByIP(String ip) { - return dao.get(ip); - } @Override @Transactional @@ -33,5 +29,10 @@ public class IPMappingServiceImpl implements IIPMappingService{ public List getAll() { return dao.getAll(); } + + @Override + public IPMapping get(String id) { + return dao.get(id); + } } From a4deec717af2d23288957760c2d68d3258f63958 Mon Sep 17 00:00:00 2001 From: daihh Date: Thu, 3 Nov 2022 16:57:40 +0800 Subject: [PATCH 23/25] =?UTF-8?q?=E7=9B=B4=E6=8E=A5=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/xboe/module/idconfig/entity/IPMapping.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/boe-module-idconfig/src/main/java/com/xboe/module/idconfig/entity/IPMapping.java b/modules/boe-module-idconfig/src/main/java/com/xboe/module/idconfig/entity/IPMapping.java index 9d1612ab..f672b5dd 100644 --- a/modules/boe-module-idconfig/src/main/java/com/xboe/module/idconfig/entity/IPMapping.java +++ b/modules/boe-module-idconfig/src/main/java/com/xboe/module/idconfig/entity/IPMapping.java @@ -11,7 +11,7 @@ import lombok.Data; @Data @Entity -@Table(name = SysConstant.TABLE_PRE + "idconfig") +@Table(name = SysConstant.TABLE_PRE + "ipapp") public class IPMapping { @Id From 128a3b85dd06fc8fb030397e4a14e15107dcb8b2 Mon Sep 17 00:00:00 2001 From: daihh Date: Thu, 3 Nov 2022 17:01:49 +0800 Subject: [PATCH 24/25] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=BF=90=E8=A1=8C?= =?UTF-8?q?=E6=9C=BA=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/xboe/ApplicationStartRunner.java | 73 +------------------ 1 file changed, 4 insertions(+), 69 deletions(-) diff --git a/servers/boe-server-all/src/main/java/com/xboe/ApplicationStartRunner.java b/servers/boe-server-all/src/main/java/com/xboe/ApplicationStartRunner.java index f0bd16b9..60d1ef51 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/ApplicationStartRunner.java +++ b/servers/boe-server-all/src/main/java/com/xboe/ApplicationStartRunner.java @@ -1,30 +1,17 @@ package com.xboe; -import java.net.InetAddress; -import java.net.NetworkInterface; -import java.net.SocketException; -import java.util.Enumeration; -import java.util.HashMap; -import java.util.Map; - import javax.annotation.Resource; -import org.apache.commons.lang3.RandomUtils; import org.springframework.boot.ApplicationArguments; import org.springframework.boot.ApplicationRunner; import org.springframework.core.env.Environment; import org.springframework.stereotype.Component; -import com.xboe.common.utils.IDGenerator; -import com.xboe.module.idconfig.entity.IPMapping; -import com.xboe.module.idconfig.service.IIPMappingService; - -import lombok.extern.slf4j.Slf4j; +import com.xboe.module.idconfig.IdGeneratorAutoConfig; /** * 启动就执行的一些处理 */ -@Slf4j @Component public class ApplicationStartRunner implements ApplicationRunner { @@ -32,64 +19,12 @@ public class ApplicationStartRunner implements ApplicationRunner { Environment env; @Resource - IIPMappingService ipMappingService; + IdGeneratorAutoConfig autoConfig; @Override public void run(ApplicationArguments args) throws Exception { - -// Map ipconfig=new HashMap<>(); -// ipconfig.put("10.251.186.27",0);//测试环境 -// ipconfig.put("10.251.132.41",1); -// ipconfig.put("10.251.132.42",2); -// ipconfig.put("10.251.132.47",3); - - String ip=getLinuxLocalIp(); - - IPMapping ipm = ipMappingService.findByIP(ip); - Integer workServerId=null; - Integer dataCenterId=null; - if(ipm!=null) { - workServerId=ipm.getWorkNum(); - dataCenterId=ipm.getDcNum(); - }else { - log.warn("无IP【"+ip+"】的配置的workNum和DataCenterNum,系统自动生成随机数"); - workServerId=RandomUtils.nextInt(0,31); - dataCenterId=RandomUtils.nextInt(0,31); - ipm=new IPMapping(); - ipm.setIp(ip); - ipm.setDcNum(dataCenterId); - ipm.setWorkNum(workServerId); - ipMappingService.save(ipm); - } - IDGenerator.init(workServerId,dataCenterId); + //多服务器配置时生成的id根据服务器ip地址不同参数不同，防止不同服务器生成的id重复问题 + autoConfig.init(); } - private static String getLinuxLocalIp() throws SocketException { - String ip = ""; - try { - for (Enumeration en = NetworkInterface.getNetworkInterfaces(); en.hasMoreElements(); ) { - NetworkInterface intf = en.nextElement(); - //String name = intf.getName(); - //if (!name.contains("docker") && !name.contains("lo")){ - for (Enumeration enumIpAddr = intf.getInetAddresses(); enumIpAddr.hasMoreElements(); ) { - InetAddress inetAddress = enumIpAddr.nextElement(); - if (!inetAddress.isLoopbackAddress()) { - String ipaddress = inetAddress.getHostAddress().toString(); - if (!ipaddress.contains(":") && !ipaddress.contains("::") && !ipaddress.contains("0:0:") && !ipaddress.contains("fe80")) { - ip = ipaddress; - //log.error("获取的ip:"+ipaddress); - } - } - } - //} - } - }catch (SocketException ex) { - ip = "127.0.0.1"; - //log.error("获取ip地址异常",ex); - } - //log.error("获取的实际的ip:"+ip); - return ip; - } - - } From 747a5cf1f3bfae2848a3036d91cf0a8954236fff Mon Sep 17 00:00:00 2001 From: daihh Date: Thu, 3 Nov 2022 18:54:06 +0800 Subject: [PATCH 25/25] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E4=B8=80=E4=B8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/course/service/impl/CourseHRBPAuditServiceImpl.java | 1 + 1 file changed, 1 insertion(+) diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/course/service/impl/CourseHRBPAuditServiceImpl.java b/servers/boe-server-all/src/main/java/com/xboe/module/course/service/impl/CourseHRBPAuditServiceImpl.java index e3824599..cd5d9889 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/course/service/impl/CourseHRBPAuditServiceImpl.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/course/service/impl/CourseHRBPAuditServiceImpl.java @@ -63,6 +63,7 @@ public class CourseHRBPAuditServiceImpl implements ICourseHRBPAuditService { query.setPageIndex(pageIndex); query.setPageSize(pageSize); query.addFields("a","c.name","c.type","c.sysType1","c.sysType2","c.sysType3","c.sysCreateBy"); + //query.addGroupBy("") query.addFilter(FieldFilters.eqField("a.courseId", "c.id")); query.addFilter(FieldFilters.eq("a.courseId",info.getCourseId()));