Merge branch 'bug-branch' of chchen/exercise into master

练习册提交es索引问题

ssj-common-common/src/main/java/com/ssj/framework/core/security/manager/impl/RedisTokenManager.java

@@ -244,6 +244,8 @@ public class RedisTokenManager implements TokenManager {
                 return;
             }
 
+
+
             String userId = get(formatTokenUserId(token));
 
 

ssj-kmt-exercise-service-impl/src/main/java/com/ssj/service/kmt/kmt/service/impl/KmtExerciseSubmitServiceImpl.java

@@ -11,6 +11,7 @@ import com.ssj.bean.weixin.zyb.domain.ZuoybKnowHowDetailsSort;
 import com.ssj.dao.weixin.library.dao.IBookManagerDao;
 import com.ssj.dao.weixin.user.dao.UserDao;
 import com.ssj.dao.weixin.zuoyb.dao.ZuoybKnowHowDetailsSortDao;
+import com.ssj.es.service.ExerciseQuestionSearchService;
 import com.ssj.es.service.base.BaseSearchService;
 import com.ssj.framework.core.security.manager.TokenManager;
 import com.ssj.framework.core.util.ResponseConstant;
@@ -32,6 +33,8 @@ import com.ssj.service.weixin.push.service.PushTemplateService;
 import com.ssj.taskthread.ThreadPool;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.elasticsearch.index.query.QueryBuilder;
+import org.elasticsearch.index.query.QueryBuilders;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -64,6 +67,8 @@ public class KmtExerciseSubmitServiceImpl implements KmtExerciseSubmitService {
     private KmtExerciseQuestionService kmtExerciseQuestionService;
     @Autowired
     private BaseSearchService baseSearchService;
+    @Autowired
+    private ExerciseQuestionSearchService exerciseQuestionSearchService;
 
 
     @Override
@@ -144,8 +149,12 @@ public class KmtExerciseSubmitServiceImpl implements KmtExerciseSubmitService {
         for (KmtExerciseQuestion kmtExerciseQuestion : questions){
             kmtExerciseQuestionService.saveToEs(kmtExerciseQuestion);
         }
+
+        QueryBuilder queryBuilder = QueryBuilders.termsQuery("question_id.keyword", questionIds);
+        exerciseQuestionSearchService.deleteByQuery("kmt_exercise_question_know", queryBuilder);
         List<Map<String, Object>> knowEsData = kmtExerciseMapper.findData2EsByQuestionList(questionIds);
         if (CollectionUtils.isNotEmpty(knowEsData)) {
+            kmtExerciseService.appendQuestionMapFromJSONFile(knowEsData);
             baseSearchService.insertBatch("kmt_exercise_question_know", knowEsData, true);
         }
     }