修复问答管理的标题查询与实际不符

servers/boe-server-all/src/main/java/com/xboe/api/ThirdApi.java

@@ -98,7 +98,8 @@ public class ThirdApi {
     private String syncOnLineScore;
     @Value("${coursesuilt.updateOnLineStatua}")
     private String updateOnLineStatua;
-
+    @Value("${coursesuilt.delOnLineById}")
+    private String delOnLineById;
 
     //获取例外人员的id
     public List<String> getUserId() {
@@ -398,4 +399,12 @@ public class ThirdApi {
     public void syncExamStudyRecord(ExamStudyRecordParam param) {
         externalRemoteClient.syncExamStudyRecord(param);
     }
+
+    public void delOnLineById(CourseParam param, String token) {
+        log.info("---------------同步在线课删除 ------- param " + param);
+        String resp = Optional.ofNullable(
+                HttpRequest.post(delOnLineById).body(JSONUtil.toJsonStr(param)).header("token", token).execute()
+                        .body()).orElseThrow(() -> new RuntimeException("token校验失败"));
+        log.info("-------delOnLineById = " + resp);
+    }
 }

servers/boe-server-all/src/main/java/com/xboe/module/course/api/CourseManageApi.java

@@ -886,7 +886,7 @@ public class CourseManageApi extends ApiBaseController{
 	 * @return
 	 */
 	@PostMapping("/delete")
-	public JsonResponse<Boolean> delete(String id,Boolean erasable,String title,String remark){
+	public JsonResponse<Boolean> delete(String id,Boolean erasable,String title,String remark, HttpServletRequest request){
 		if(StringUtils.isBlank(id)){
 			return badRequest("参数错误");
 		}
@@ -901,6 +901,11 @@ public class CourseManageApi extends ApiBaseController{
 		try {
 			CurrentUser cu=getCurrent();
 			courseService.delete(id, erasable,cu.getAccountId(), cu.getName(), remark);
+
+			String token = request.getHeader("Xboe-Access-Token");
+			CourseParam param = new CourseParam();
+			param.setId(id);
+			thirdApi.delOnLineById(param,token);
 			return success(true);
 		} catch (Exception e) {
 			log.error("管理员删除课程错误",e);

servers/boe-server-all/src/main/java/com/xboe/module/course/entity/CourseTeacher.java

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

servers/boe-server-all/src/main/java/com/xboe/module/exam/service/impl/AloneExamServiceImpl.java

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

servers/boe-server-all/src/main/java/com/xboe/module/interaction/service/impl/CommentsServiceImpl.java

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

servers/boe-server-all/src/main/java/com/xboe/module/qa/service/impl/QuestionServiceImpl.java

@@ -86,7 +86,7 @@ public class QuestionServiceImpl implements IQuestionService {
 //            filters.add(FieldFilters.or(FieldFilters.like("title", questionDto.getKeyword()), FieldFilters.like("content", questionDto.getKeyword())));
             List<IFieldFilter> iFieldFilters = new ArrayList<>();
             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()));
             filters.add(FieldFilters.or(iFieldFilters));
         }
@@ -213,6 +213,14 @@ public class QuestionServiceImpl implements IQuestionService {
     @Override
     public void deleteQuestions(String 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());
+        }
     }
     /**
      * 设置精华问题*/

servers/boe-server-all/src/main/java/com/xboe/school/study/api/StudyCourseApi.java

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

servers/boe-server-all/src/main/java/com/xboe/system/api/SysUploaderApi.java

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

servers/boe-server-all/src/main/resources/application.yml

@@ -73,4 +73,5 @@ coursesuilt:
   updateOrSaveCourse: ${boe.domain}/manageApi/admin/teacherRecord/updateOrSaveCourse
   syncCourseStudent: ${boe.domain}/manageApi/admin/teacherRecord/syncCourseStudent
   syncOnLineScore: ${boe.domain}/manageApi/admin/teacherRecord/syncOnLineScore
-  updateOnLineStatua: ${boe.domain}/manageApi/admin/teacherRecord/updateOnLineStatua
+  updateOnLineStatua: ${boe.domain}/manageApi/admin/teacherRecord/updateOnLineStatua
+  delOnLineById: ${boe.domain}/manageApi/admin/teacherRecord/delOnLineById