From 7eb6f8514d169c70829da2881546dbae0b6e33a4 Mon Sep 17 00:00:00 2001 From: 86182 Date: Tue, 29 Nov 2022 18:58:27 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=89=E6=9C=9F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/xboe/module/boecase/api/CasesApi.java | 26 ++++++++++++++++++- .../com/xboe/module/boecase/entity/Cases.java | 6 +++++ .../module/boecase/service/ICasesService.java | 5 ++++ .../service/impl/CasesServiceImpl.java | 5 ++++ .../com/xboe/module/course/dao/CourseDao.java | 2 ++ .../module/course/service/ICourseService.java | 4 +++ .../service/impl/CourseServiceImpl.java | 6 ++++- .../com/xboe/module/exam/api/ExamTestApi.java | 20 ++++++++++++++ .../xboe/module/exam/entity/ExamOption.java | 6 +++++ .../xboe/module/exam/entity/ExamPaper.java | 6 +---- .../xboe/module/exam/entity/ExamQuestion.java | 6 +++++ .../com/xboe/module/exam/entity/ExamTest.java | 10 +++---- .../module/exam/service/IExamTestService.java | 5 ++++ .../service/impl/ExamTestServiceImpl.java | 6 +++++ .../service/impl/StudyCourseServiceImpl.java | 2 ++ 15 files changed, 102 insertions(+), 13 deletions(-) diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/boecase/api/CasesApi.java b/servers/boe-server-all/src/main/java/com/xboe/module/boecase/api/CasesApi.java index 55f50723..b0d0a6a6 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/boecase/api/CasesApi.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/boecase/api/CasesApi.java @@ -247,7 +247,9 @@ public class CasesApi extends ApiBaseController { if(StringUtil.isBlank(cases.getAuthorId())){ return badRequest("请选择作者"); } - + if(cases.getExcellent()==null){ + cases.setExcellent(false); + } try { casesService.save(cases); return success(true); @@ -273,6 +275,9 @@ public class CasesApi extends ApiBaseController { if(StringUtil.isBlank(cases.getAuthorId())){ return badRequest("请选择作者"); } + if(cases.getExcellent()==null){ + cases.setExcellent(false); + } try { casesService.update(cases); return success(true); @@ -353,5 +358,24 @@ public class CasesApi extends ApiBaseController { return success(cases); } + /** + *设置/取消优秀案例 + * */ + @PostMapping("/excellent") + public JsonResponse excellent(String id,Boolean excellent){ + if(StringUtil.isBlank(id)){ + return badRequest("参数异常"); + } + if(excellent==null){ + excellent=false;//默认设置取消 + } + try { + casesService.excellent(id,excellent); + return success(true); + } catch (Exception e) { + return error("设置或者取消失败",e.getMessage()); + } + } + } diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/boecase/entity/Cases.java b/servers/boe-server-all/src/main/java/com/xboe/module/boecase/entity/Cases.java index d69a4877..94d21eef 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/boecase/entity/Cases.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/boecase/entity/Cases.java @@ -229,6 +229,12 @@ public class Cases extends BaseEntity { @Column(name = "excellent") private Boolean excellent; + /** + * 设置时间 + * */ + @Column(name = "excellent_time") + private LocalDateTime excellentTime; + @Transient private List majorIds; diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/boecase/service/ICasesService.java b/servers/boe-server-all/src/main/java/com/xboe/module/boecase/service/ICasesService.java index be0818d1..91bb0e9a 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/boecase/service/ICasesService.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/boecase/service/ICasesService.java @@ -80,6 +80,11 @@ public interface ICasesService{ * */ List caseIndex(Integer type); + /** + * 设置或者取消优秀案例 + * */ + void excellent(String id,Boolean excellent); + } diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/boecase/service/impl/CasesServiceImpl.java b/servers/boe-server-all/src/main/java/com/xboe/module/boecase/service/impl/CasesServiceImpl.java index 256d4e9f..2e4baccc 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/boecase/service/impl/CasesServiceImpl.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/boecase/service/impl/CasesServiceImpl.java @@ -516,5 +516,10 @@ public class CasesServiceImpl implements ICasesService { return casesVos; } + @Override + public void excellent(String id, Boolean excellent) { + casesDao.updateMultiFieldById(id,UpdateBuilder.create("excellent",excellent),UpdateBuilder.create("excellentTime",LocalDateTime.now())); + } + } diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/course/dao/CourseDao.java b/servers/boe-server-all/src/main/java/com/xboe/module/course/dao/CourseDao.java index 959bd976..534bf424 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/course/dao/CourseDao.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/course/dao/CourseDao.java @@ -43,6 +43,8 @@ public class CourseDao extends BaseDao { query.addFilter(FieldFilters.eq("status",Course.STATUS_AUDIT_FINISH)); query.addFilter(FieldFilters.eq("published", true)); query.addFilter(FieldFilters.eq("enabled",true)); + query.addFilter(FieldFilters.gt("studys",100)); + query.addFilter(FieldFilters.isNull("kid")); LocalDateTime parse = LocalDate.parse("2022-01-01", DateTimeFormatter.ofPattern("yyyy-MM-dd")).atStartOfDay(); query.addFilter(FieldFilters.gt("publishTime",parse)); query.addOrder(OrderCondition.desc("studys")); diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/course/service/ICourseService.java b/servers/boe-server-all/src/main/java/com/xboe/module/course/service/ICourseService.java index 53c7bf54..de95701f 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/course/service/ICourseService.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/course/service/ICourseService.java @@ -320,4 +320,8 @@ public interface ICourseService { List mobiledelList(Integer num,CourseQueryDto courseQueryDto); + + + + } 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 cec68683..4625d74a 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 @@ -1004,10 +1004,12 @@ public class CourseServiceImpl implements ICourseService { builder.addFilter(FieldFilters.eq("status",Course.STATUS_AUDIT_FINISH)); builder.addFilter(FieldFilters.eq("published", true)); builder.addFilter(FieldFilters.eq("enabled",true)); + builder.addFilter(FieldFilters.isNull("kid")); + builder.addFilter(FieldFilters.gt("studys",100)); LocalDateTime parse = LocalDate.parse("2022-01-01", DateTimeFormatter.ofPattern("yyyy-MM-dd")).atStartOfDay(); builder.addFilter(FieldFilters.gt("publishTime",parse)); if(index==1){ - builder.addOrder(OrderCondition.desc("views")); + builder.addOrder(OrderCondition.desc("studys")); }else { builder.addOrder(OrderCondition.desc("score")); } @@ -1146,6 +1148,8 @@ public class CourseServiceImpl implements ICourseService { return list; } + + @Override public int countWaitAudit(String aid) { //查询待审核的课程 diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/exam/api/ExamTestApi.java b/servers/boe-server-all/src/main/java/com/xboe/module/exam/api/ExamTestApi.java index 66f787dc..9b083070 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/exam/api/ExamTestApi.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/exam/api/ExamTestApi.java @@ -141,4 +141,24 @@ public class ExamTestApi extends ApiBaseController { return error("发布考试失败",e.getMessage(),false); } } + + /** + *下架上架 + * */ + @PostMapping("/enabled") + public JsonResponse enabled(String id,Boolean enabled){ + if(StringUtil.isBlank(id)){ + return badRequest("参数异常"); + } + if(enabled==null){ + enabled=true;//默认上架 + } + try { + examTestService.enabled(id, enabled); + return success(true); + } catch (Exception e) { + log.error("上下架异常",e); + return error("上下级失败",e.getMessage()); + } + } } diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/exam/entity/ExamOption.java b/servers/boe-server-all/src/main/java/com/xboe/module/exam/entity/ExamOption.java index bb524971..ece720e4 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/exam/entity/ExamOption.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/exam/entity/ExamOption.java @@ -48,6 +48,12 @@ public class ExamOption extends BaseEntity { @Column(name = "score") private Float score; + /** + * 图片 + * */ + @Column(name = "images") + private String images; + diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/exam/entity/ExamPaper.java b/servers/boe-server-all/src/main/java/com/xboe/module/exam/entity/ExamPaper.java index fdb3cbcd..592e3dba 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/exam/entity/ExamPaper.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/exam/entity/ExamPaper.java @@ -78,11 +78,7 @@ public class ExamPaper extends BaseEntity { @Column(name = "counts") private Integer counts; - /** - * 图片 - * */ - @Column(name = "images") - private String images; + public ExamPaper(String testName, String paperType, Integer paperMode, String resOwner1, String resOwner2, String resOwner3,String sysCreateBy,LocalDateTime sysUpdateTime,String id,Integer counts) { diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/exam/entity/ExamQuestion.java b/servers/boe-server-all/src/main/java/com/xboe/module/exam/entity/ExamQuestion.java index 459a076a..97f6be16 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/exam/entity/ExamQuestion.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/exam/entity/ExamQuestion.java @@ -83,6 +83,12 @@ public class ExamQuestion extends BaseEntity { @Column(name = "knowledge") private String knowledge; + /** + * 图片 + * */ + @Column(name = "images") + private String images; + @Transient private List optionList; diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/exam/entity/ExamTest.java b/servers/boe-server-all/src/main/java/com/xboe/module/exam/entity/ExamTest.java index 1d3e9803..571f71d6 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/exam/entity/ExamTest.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/exam/entity/ExamTest.java @@ -50,7 +50,7 @@ public class ExamTest extends BaseEntity { @Column(name = "times") private Integer times; /** - * 试题排列 1试题乱序，2选项乱序，3全部乱序 + * 试题排列 1试题乱序，2选项乱序，3全部乱序 4,不乱序 * */ @Column(name = "arrange") private Integer arrange; @@ -158,11 +158,9 @@ public class ExamTest extends BaseEntity { private LocalDateTime deadlineTime; - /** - * 图片 - * */ - @Column(name = "images") - private String images; + /**启用的，上架*/ + @Column(name = "enabled", nullable = false, length = 1) + private Boolean enabled; @Transient private String paperName; diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/exam/service/IExamTestService.java b/servers/boe-server-all/src/main/java/com/xboe/module/exam/service/IExamTestService.java index 34541da2..c4fe9114 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/exam/service/IExamTestService.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/exam/service/IExamTestService.java @@ -46,4 +46,9 @@ public interface IExamTestService { * */ Boolean has(String paperId); + /** + * 上架下架 + * */ + void enabled(String id,Boolean enabled); + } diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/exam/service/impl/ExamTestServiceImpl.java b/servers/boe-server-all/src/main/java/com/xboe/module/exam/service/impl/ExamTestServiceImpl.java index f777471d..150f79d6 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/exam/service/impl/ExamTestServiceImpl.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/exam/service/impl/ExamTestServiceImpl.java @@ -65,6 +65,7 @@ public class ExamTestServiceImpl implements IExamTestService { @Override public void publish(String id,boolean flag) { examTestDao.updateMultiFieldById(id, + UpdateBuilder.create("enabled",false), UpdateBuilder.create("published", flag), UpdateBuilder.create("publishTime", LocalDateTime.now())); } @@ -80,6 +81,11 @@ public class ExamTestServiceImpl implements IExamTestService { } } + @Override + public void enabled(String id, Boolean enabled) { + examTestDao.updateFieldById(id,"enabled",enabled); + } + @Override public String getPaperContent(String id) throws Exception { QueryBuilder query=QueryBuilder.from(ExamTest.class.getSimpleName()+" et,"+ExamPaper.class.getSimpleName()+" ep"); 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 57210572..0547c8ed 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 @@ -147,6 +147,8 @@ public class StudyCourseServiceImpl implements IStudyCourseService{ builder.addFilter(FieldFilters.eqField("s.courseId","c.id")); LocalDateTime parse = LocalDate.parse("2022-01-01", DateTimeFormatter.ofPattern("yyyy-MM-dd")).atStartOfDay(); builder.addFilter(FieldFilters.gt("c.publishTime",parse)); + builder.addFilter(FieldFilters.isNull("c.kid")); + builder.addFilter(FieldFilters.gt("s.score",4.0)); builder.addGroupBy("s.courseId"); LocalDateTime now=LocalDateTime.now(); LocalDateTime localDateTime = now.plusDays(-30);