图片编辑修改

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

@@ -540,12 +540,15 @@ public class KmtExerciseQuestionDealServiceImpl implements KmtExerciseQuestionDe
         kmtExerciseMapper.updateQuestionStartPointAndEndPoint(request.getStartX(), request.getStartY(),
                 request.getEndX(), request.getEndY(), request.getQuestionId());
         ResponseEntity responseEntity = new ResponseEntity();
-        String path = this.removeQuestionNumMark(request.getStartX(), request.getStartY(), request.getEndX(), request.getEndY(), kmtExerciseQuestion.getImage());
-        String content = JSONFileUtil.readJSONFile(PropertiesUtil.getValue("EXERCISE_JSON_FILE_PATH") + kmtExerciseQuestion.getQuestionPath());
-        if (StringUtil.isNotBlank(content) && StringUtil.isNotBlank(path)){
-            Map<String, Object> map = JSON.parseObject(content, Map.class);
-            map.put("question_json", Collections.singletonList(ExerciseUtil.getExerciseQuestionAnswerValue(PropertiesUtil.getValue("STATIC_FILE_URL") + path)));
-            JSONFileUtil.saveJSONFile(PropertiesUtil.getValue("EXERCISE_JSON_FILE_PATH") + kmtExerciseQuestion.getQuestionPath(), JSON.toJSONString(map));
+        TbLibManager manager = bookManagerDao.findByUserIdAndType(userId, 18);
+        if (manager != null && kmtExerciseQuestion.getDealStatus() > 3 && kmtExerciseQuestion.getDealStatus() != 7) {
+            String path = this.removeQuestionNumMark(request.getStartX(), request.getStartY(), request.getEndX(), request.getEndY(), kmtExerciseQuestion.getImage());
+            String content = JSONFileUtil.readJSONFile(PropertiesUtil.getValue("EXERCISE_JSON_FILE_PATH") + kmtExerciseQuestion.getQuestionPath());
+            if (StringUtil.isNotBlank(content) && StringUtil.isNotBlank(path)) {
+                Map<String, Object> map = JSON.parseObject(content, Map.class);
+                map.put("question_json", Collections.singletonList(ExerciseUtil.getExerciseQuestionAnswerValue(PropertiesUtil.getValue("STATIC_FILE_URL") + path)));
+                JSONFileUtil.saveJSONFile(PropertiesUtil.getValue("EXERCISE_JSON_FILE_PATH") + kmtExerciseQuestion.getQuestionPath(), JSON.toJSONString(map));
+            }
         }
         return responseEntity.success("成功");
     }

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

@@ -34,6 +34,7 @@ import com.ssj.service.weixin.push.service.PushTemplateService;
 import com.ssj.service.weixin.user.service.UserService;
 import com.ssj.service.weixin.zuoyb.service.ZuoybKnowHowDetailsSortService;
 import com.ssj.taskthread.ThreadPool;
+import com.ssj.utils.ExerciseUtil;
 import com.ssj.utils.SortByChineseUtil;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -438,8 +439,15 @@ public class KmtExerciseServiceImpl implements KmtExerciseService {
                     if (StringUtil.isNotBlank(kmtExerciseQuestion.getConciseId())){
                         startX = Integer.parseInt(kmtExerciseQuestion.getConciseId());
                     }
-                    kmtExerciseQuestionDealService.removeQuestionNumMark(startX, kmtExerciseQuestion.getAnalysisSubmitType(),
+                    String path = kmtExerciseQuestionDealService.removeQuestionNumMark(startX, kmtExerciseQuestion.getAnalysisSubmitType(),
                             kmtExerciseQuestion.getUpdateType(), kmtExerciseQuestion.getEsLoaded(), kmtExerciseQuestion.getImage());
+                    String content = JSONFileUtil.readJSONFile(PropertiesUtil.getValue("EXERCISE_JSON_FILE_PATH") + kmtExerciseQuestion.getQuestionPath());
+                    if (StringUtil.isNotBlank(content) && StringUtil.isNotBlank(path)){
+                        Map<String, Object> map = JSON.parseObject(content, Map.class);
+                        map.put("question_json", Collections.singletonList(ExerciseUtil.getExerciseQuestionAnswerValue(PropertiesUtil.getValue("STATIC_FILE_URL") + path)));
+                        JSONFileUtil.saveJSONFile(PropertiesUtil.getValue("EXERCISE_JSON_FILE_PATH") + kmtExerciseQuestion.getQuestionPath(), JSON.toJSONString(map));
+                        kmtExerciseQuestion.setQuestionJson(JSON.toJSONString(map.get("question_json")));
+                    }
                 }
                 kmtExerciseQuestion.setPublishTime(new Date());
             } else if (kmtExerciseQuestion.getDealStatus() == 0 || kmtExerciseQuestion.getDealStatus() == 1){

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

@@ -1,6 +1,7 @@
 package com.ssj.service.kmt.kmt.service.impl;
 
 import com.alibaba.dubbo.config.annotation.Service;
+import com.alibaba.fastjson.JSON;
 import com.ssj.bean.kmt.kmt.domain.KmtExerciseBook;
 import com.ssj.bean.kmt.kmt.domain.KmtExerciseQuestion;
 import com.ssj.bean.kmt.kmt.domain.KmtExerciseQuestionKnow;
@@ -14,11 +15,13 @@ 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.PropertiesUtil;
 import com.ssj.framework.core.util.ResponseConstant;
 import com.ssj.framework.core.util.ResponseEntity;
 import com.ssj.framework.core.util.StringUtil;
 import com.ssj.framework.idworker.IdWorker;
 import com.ssj.framework.weixin.util.DateUtil;
+import com.ssj.kmt.utils.JSONFileUtil;
 import com.ssj.service.kmt.dto.KnowHowDetailsDTO;
 import com.ssj.service.kmt.dto.KnowledgeBaseDto;
 import com.ssj.service.kmt.exercisesys.enums.ProofreadStatusEnum;
@@ -32,6 +35,7 @@ import com.ssj.service.mapper.KmtExerciseMapper;
 import com.ssj.service.task.SyncRefreshExerciseBookStatusTask;
 import com.ssj.service.weixin.push.service.PushTemplateService;
 import com.ssj.taskthread.ThreadPool;
+import com.ssj.utils.ExerciseUtil;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.elasticsearch.index.query.QueryBuilder;
@@ -512,6 +516,19 @@ public class KmtExerciseSubmitServiceImpl implements KmtExerciseSubmitService {
                     this.updateKmtQuestionCommonData(question, updateRequest);
                     question.setPublishTime(new Date());
                     question.setDealStatus(5);
+                    int startX = 0;
+                    if (StringUtil.isNotBlank(question.getConciseId())){
+                        startX = Integer.parseInt(question.getConciseId());
+                    }
+                    String path = kmtExerciseQuestionDealService.removeQuestionNumMark(startX, question.getAnalysisSubmitType(),
+                            question.getUpdateType(), question.getEsLoaded(), question.getImage());
+                    String content = JSONFileUtil.readJSONFile(PropertiesUtil.getValue("EXERCISE_JSON_FILE_PATH") + question.getQuestionPath());
+                    if (StringUtil.isNotBlank(content) && StringUtil.isNotBlank(path)){
+                        Map<String, Object> map = JSON.parseObject(content, Map.class);
+                        map.put("question_json", Collections.singletonList(ExerciseUtil.getExerciseQuestionAnswerValue(PropertiesUtil.getValue("STATIC_FILE_URL") + path)));
+                        JSONFileUtil.saveJSONFile(PropertiesUtil.getValue("EXERCISE_JSON_FILE_PATH") + question.getQuestionPath(), JSON.toJSONString(map));
+                        question.setQuestionJson(JSON.toJSONString(map.get("question_json")));
+                    }
                 }
             }
         }