Compare commits

...

8 Commits

6 changed files with 23 additions and 5 deletions

View File

@@ -57,4 +57,8 @@ public class CourseTeacher extends IdBaseEntity {
@Transient @Transient
private Integer teacherType; private Integer teacherType;
/**讲师头像*/
@Transient
private String photo;
} }

View File

@@ -165,7 +165,7 @@ public class AloneExamServiceImpl implements IAloneExamService{
query.addFilter(FieldFilters.eq("aid",aea.getAid())); query.addFilter(FieldFilters.eq("aid",aea.getAid()));
} }
if(StringUtils.isNotBlank(aea.getName())) { if(StringUtils.isNotBlank(aea.getName())) {
query.addFilter(FieldFilters.eq("name",aea.getName())); query.addFilter(FieldFilters.like("name", aea.getName()));
} }
} }
return dao.findPage(query.builder()); return dao.findPage(query.builder());
@@ -247,7 +247,7 @@ public class AloneExamServiceImpl implements IAloneExamService{
query.addFilter(FieldFilters.eq("a.aid",aea.getAid())); query.addFilter(FieldFilters.eq("a.aid",aea.getAid()));
} }
if(StringUtils.isNotBlank(aea.getName())) { if(StringUtils.isNotBlank(aea.getName())) {
query.addFilter(FieldFilters.eq("a.name",aea.getName())); query.addFilter(FieldFilters.like("a.name", "%" + aea.getName() + "%"));
} }
} }
return aeDao.findPage(query.builder()); return aeDao.findPage(query.builder());

View File

@@ -75,6 +75,7 @@ public class CommentsServiceImpl implements ICommentsService{
c.setPraises(0); c.setPraises(0);
c.setFavorites(0); c.setFavorites(0);
dao.save(c); dao.save(c);
callback.increase(BoedxResourceType.toEnum(c.getObjType()),c.getObjId(), BoedxHitsField.Comments);
if(c.getParentRead()!=null && c.getParentRead()) { if(c.getParentRead()!=null && c.getParentRead()) {
dao.updateMultiFieldById(c.getParentId(), dao.updateMultiFieldById(c.getParentId(),
UpdateBuilder.create("replys","replys+1",FieldUpdateType.EXPRESSION), UpdateBuilder.create("replys","replys+1",FieldUpdateType.EXPRESSION),
@@ -87,9 +88,11 @@ public class CommentsServiceImpl implements ICommentsService{
@Override @Override
public void deleteReply(String id,String parentId) { public void deleteReply(String id,String parentId) {
Comments comment=dao.get(id);
dao.deleteById(id); dao.deleteById(id);
dao.updateMultiFieldById(parentId, UpdateBuilder.create("replys","replys-1",FieldUpdateType.EXPRESSION)); dao.updateMultiFieldById(parentId, UpdateBuilder.create("replys","replys-1",FieldUpdateType.EXPRESSION));
//需要同时回调处理,修改对应的内容的评论数量
callback.reduce(BoedxResourceType.toEnum(comment.getObjType()),comment.getObjId(),BoedxHitsField.Comments);
} }
@Override @Override
@@ -198,7 +201,7 @@ public class CommentsServiceImpl implements ICommentsService{
PageList<CommentsDto> list = new PageList<>(); PageList<CommentsDto> list = new PageList<>();
list.setList(new ArrayList<CommentsDto>()); list.setList(new ArrayList<CommentsDto>());
QueryBuilder builder = QueryBuilder.from(CommentQa.class); QueryBuilder builder = QueryBuilder.from(CommentQa.class);
// builder.addFilter(FieldFilters.eq("deleted",false)); builder.addFilter(FieldFilters.eq("deleted",false));
// builder.addFilter(FieldFilters.ne("objType",4)); // builder.addFilter(FieldFilters.ne("objType",4));
if(StringUtil.isNotBlank(toaid)){ if(StringUtil.isNotBlank(toaid)){
builder.addFilter(FieldFilters.eq("toAid",toaid)); builder.addFilter(FieldFilters.eq("toAid",toaid));

View File

@@ -86,7 +86,7 @@ public class QuestionServiceImpl implements IQuestionService {
// filters.add(FieldFilters.or(FieldFilters.like("title", questionDto.getKeyword()), FieldFilters.like("content", questionDto.getKeyword()))); // filters.add(FieldFilters.or(FieldFilters.like("title", questionDto.getKeyword()), FieldFilters.like("content", questionDto.getKeyword())));
List<IFieldFilter> iFieldFilters = new ArrayList<>(); List<IFieldFilter> iFieldFilters = new ArrayList<>();
iFieldFilters.add(FieldFilters.like("title", questionDto.getKeyword())); iFieldFilters.add(FieldFilters.like("title", questionDto.getKeyword()));
iFieldFilters.add(FieldFilters.like("content", questionDto.getKeyword())); // iFieldFilters.add(FieldFilters.like("content", questionDto.getKeyword()));
iFieldFilters.add(FieldFilters.like("sysCreateBy", questionDto.getKeyword())); iFieldFilters.add(FieldFilters.like("sysCreateBy", questionDto.getKeyword()));
filters.add(FieldFilters.or(iFieldFilters)); filters.add(FieldFilters.or(iFieldFilters));
} }
@@ -213,6 +213,14 @@ public class QuestionServiceImpl implements IQuestionService {
@Override @Override
public void deleteQuestions(String id) { public void deleteQuestions(String id) {
questionDao.setDeleted(id); questionDao.setDeleted(id);
// 首先根据问题id查询出所有答案id
QueryBuilder builder = QueryBuilder.from(Answer.class);
builder.addFilter(FieldFilters.eq("qid",id));
List<Answer> answerList = answerDao.findList(builder.builder());
// 删除答案(逻辑删除)
for (Answer answer : answerList) {
answerDao.setDeleted(answer.getId());
}
} }
/** /**
* 设置精华问题*/ * 设置精华问题*/

View File

@@ -212,6 +212,7 @@ public class StudyCourseApi extends ApiBaseController{
ct.setRemark(t.getDescription()); ct.setRemark(t.getDescription());
ct.setSupplier(t.getSupplier()); ct.setSupplier(t.getSupplier());
ct.setTeacherType(t.getTeacherType()); ct.setTeacherType(t.getTeacherType());
ct.setPhoto(t.getPhoto());
} }
if(redisTemplate.opsForValue().get(ct.getTeacherId())==null){ if(redisTemplate.opsForValue().get(ct.getTeacherId())==null){
List<String>list=new ArrayList<>(); List<String>list=new ArrayList<>();

View File

@@ -60,6 +60,8 @@ public class SysUploaderApi extends ApiBaseController{
fileTypeSet.add("pptx"); fileTypeSet.add("pptx");
fileTypeSet.add("pdf"); fileTypeSet.add("pdf");
fileTypeSet.add("zip"); fileTypeSet.add("zip");
fileTypeSet.add("txt");
fileTypeSet.add("jpeg");
} }
@RequestMapping(value = "/file/upload", method = RequestMethod.POST, produces = "application/json") @RequestMapping(value = "/file/upload", method = RequestMethod.POST, produces = "application/json")