hz/java-servers
1
0
Fork 0
mirror of https://codeup.aliyun.com/67762337eccfc218f6110e0e/per-boe/java-servers.git synced 2025-12-11 20:06:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

三期修改

Browse Source
This commit is contained in:
86182
2022-11-29 18:58:27 +08:00
parent f0b9664530
commit 7eb6f8514d
15 changed files with 102 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
servers/boe-server-all/src/main/java/com/xboe/module/boecase/api/CasesApi.java
View File

@@ -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<Boolean> 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());
}
}
}

6
servers/boe-server-all/src/main/java/com/xboe/module/boecase/entity/Cases.java
View File

@@ -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<String> majorIds;

5
servers/boe-server-all/src/main/java/com/xboe/module/boecase/service/ICasesService.java
View File

@@ -80,6 +80,11 @@ public interface ICasesService{
* */
List<CasesVo> caseIndex(Integer type);
/**
* 设置或者取消优秀案例
* */
void excellent(String id,Boolean excellent);
}

5
servers/boe-server-all/src/main/java/com/xboe/module/boecase/service/impl/CasesServiceImpl.java
View File

@@ -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()));
}
}

2
servers/boe-server-all/src/main/java/com/xboe/module/course/dao/CourseDao.java
View File

@@ -43,6 +43,8 @@ public class CourseDao extends BaseDao<Course> {
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"));

4
servers/boe-server-all/src/main/java/com/xboe/module/course/service/ICourseService.java
View File

@@ -320,4 +320,8 @@ public interface ICourseService {
List<Course> mobiledelList(Integer num,CourseQueryDto courseQueryDto);
}

6
servers/boe-server-all/src/main/java/com/xboe/module/course/service/impl/CourseServiceImpl.java
View File

@@ -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) {
//查询待审核的课程

20
servers/boe-server-all/src/main/java/com/xboe/module/exam/api/ExamTestApi.java
View File

@@ -141,4 +141,24 @@ public class ExamTestApi extends ApiBaseController {
return error("发布考试失败",e.getMessage(),false);
}
}
/**
*下架上架
* */
@PostMapping("/enabled")
public JsonResponse<Boolean> 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());
}
}
}

6
servers/boe-server-all/src/main/java/com/xboe/module/exam/entity/ExamOption.java
View File

@@ -48,6 +48,12 @@ public class ExamOption extends BaseEntity {
@Column(name = "score")
private Float score;
/**
* 图片
* */
@Column(name = "images")
private String images;

6
servers/boe-server-all/src/main/java/com/xboe/module/exam/entity/ExamPaper.java
View File

@@ -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) {

6
servers/boe-server-all/src/main/java/com/xboe/module/exam/entity/ExamQuestion.java
View File

@@ -83,6 +83,12 @@ public class ExamQuestion extends BaseEntity {
@Column(name = "knowledge")
private String knowledge;
/**
* 图片
* */
@Column(name = "images")
private String images;
@Transient
private List<ExamOption> optionList;

10
servers/boe-server-all/src/main/java/com/xboe/module/exam/entity/ExamTest.java
View File

@@ -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;

5
servers/boe-server-all/src/main/java/com/xboe/module/exam/service/IExamTestService.java
View File

@@ -46,4 +46,9 @@ public interface IExamTestService {
* */
Boolean has(String paperId);
/**
* 上架下架
* */
void enabled(String id,Boolean enabled);
}

6
servers/boe-server-all/src/main/java/com/xboe/module/exam/service/impl/ExamTestServiceImpl.java
View File

@@ -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");

2
servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudyCourseServiceImpl.java
View File

@@ -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);