submit

zhongzheng-admin-saas/src/main/resources/application-dev.yml

@@ -189,6 +189,8 @@ exam:
     subscribeSaveExam: http://192.168.1.7:9099/cd/subscribe/save/exam
     subscribeUpdateExam: http://192.168.1.7:9099/cd/subscribe/update/exam
     subscribeAddExamNum: http://192.168.1.7:9099/cd/subscribe/add/num
+    question: http://120.79.166.78:19013/common/question/getMeasureList
+    questionDetail: http://120.79.166.78:19013/common/question/getTopicList
 
 shared:
     statistics: http://gdxypx.xy.com/WitSystem/BussinessApi/HighSeasData

zhongzheng-admin/src/main/java/com/zhongzheng/controller/common/CommonController.java

@@ -854,14 +854,14 @@ public class CommonController extends BaseController {
     }
 
 
-    @GetMapping("/common/question/getMeasureList")
+    @PostMapping("/common/question/getMeasureList")
     public AjaxResult<String> getMeasureList() {
         String aa = iQuestionService.getMeasureList();
         return AjaxResult.success("操作成功",aa);
     }
 
-    @GetMapping("/common/question/getTopicList")
-    public AjaxResult<String> getTopicList(@RequestParam("topParam")String topParam) {
+    @PostMapping("/common/question/getTopicList")
+    public AjaxResult<String> getTopicList(@RequestBody String topParam) {
         String aa = iQuestionService.getTopicList(topParam);
         return AjaxResult.success("操作成功",aa);
     }

zhongzheng-admin/src/main/resources/application-dev.yml

@@ -190,6 +190,8 @@ exam:
     subscribeSaveExam: http://192.168.1.7:9099/cd/subscribe/save/exam
     subscribeUpdateExam: http://192.168.1.7:9099/cd/subscribe/update/exam
     subscribeAddExamNum: http://192.168.1.7:9099/cd/subscribe/add/num
+    question: http://120.79.166.78:19013/common/question/getMeasureList
+    questionDetail: http://120.79.166.78:19013/common/question/getTopicList
 
 shared:
     statistics: http://gdxypx.xy.com/WitSystem/BussinessApi/HighSeasData

zhongzheng-api/src/main/resources/application-dev.yml

@@ -192,6 +192,8 @@ exam:
     subscribeSaveExam: http://192.168.1.7:9099/cd/subscribe/save/exam
     subscribeUpdateExam: http://192.168.1.7:9099/cd/subscribe/update/exam
     subscribeAddExamNum: http://192.168.1.7:9099/cd/subscribe/add/num
+    question: http://120.79.166.78:19013/common/question/getMeasureList
+    questionDetail: http://120.79.166.78:19013/common/question/getTopicList
 
 shared:
     statistics: http://gdxypx.xy.com/WitSystem/BussinessApi/HighSeasData

zhongzheng-framework/src/main/java/com/zhongzheng/framework/config/SecurityConfig.java

@@ -153,8 +153,7 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter
                 .antMatchers("/common/create/tenant/admin/old").anonymous()
                 .antMatchers("/common/update/role").anonymous()
                 .antMatchers("/common/question/import").anonymous()
-                .antMatchers("/common/question/getMeasureList").anonymous()
-                .antMatchers("/common/question/getTopicList").anonymous()
+                .antMatchers("/common/question/*").anonymous()
                 .antMatchers("/common/free/**").anonymous()
                 .antMatchers("/common/download**").anonymous()
                 .antMatchers("/common/download/resource**").anonymous()

zhongzheng-system/src/main/java/com/zhongzheng/modules/bank/service/impl/QuestionServiceImpl.java

@@ -78,6 +78,8 @@ import java.math.BigDecimal;
 import java.text.NumberFormat;
 import java.util.*;
 import java.util.concurrent.TimeUnit;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 
 /**
@@ -176,6 +178,12 @@ public class QuestionServiceImpl extends ServiceImpl<QuestionMapper, Question> i
     @Value("${oldSys.questionDetail}")
     private String QUESTION_DETAIL;
 
+    @Value("${exam.question}")
+    private String EXAM_QUESTION;
+
+    @Value("${exam.questionDetail}")
+    private String EXAM_QUESTION_DETAIL;
+
     @Value("${aliyun.oss.endpoint}")
     private String OSS_PREFIX;
 
@@ -3126,7 +3134,10 @@ public class QuestionServiceImpl extends ServiceImpl<QuestionMapper, Question> i
     @Override
     @Transactional
     public void questionImport() {
-        String respone = HttpUtils.sendGet(QUESTION, "");
+        String tenantId = ServletUtils.getRequest().getHeader("TenantId");
+        HashMap<String, String> map = new HashMap<>();
+        map.put("TenantId", tenantId);
+        String respone = HttpUtils.sendPostJsonHeader(EXAM_QUESTION, "",map);
         List<ExternalQuestionVo> questionVos = JSONArray.parseArray(respone, ExternalQuestionVo.class);
         //考前培训
         CourseEducationType educationType = iCourseEducationTypeService
@@ -3217,6 +3228,7 @@ public class QuestionServiceImpl extends ServiceImpl<QuestionMapper, Question> i
             goods.setSubjectIds(subjectId.toString());
             iGoodsService.save(goods);
 
+            String upStr1 = "web/Uploads/qdytopic/";
             //题库
             List<ExternalQuestionVo> questionVos1 = questionVos.stream()
                     .filter(x -> x.getParentId().equals(item.getMeasureModelId())).sorted(Comparator.comparing(ExternalQuestionVo::getSortNumber)).collect(Collectors.toList());
@@ -3342,7 +3354,10 @@ public class QuestionServiceImpl extends ServiceImpl<QuestionMapper, Question> i
                                                     for (int i = 0; i < detailVo.getChildList().size(); i++) {
                                                         ExternalQuestionChildVo childVo = detailVo.getChildList().get(i);
                                                         QuestionDetailVo questionDetailVo = new QuestionDetailVo();
-                                                        questionDetailVo.setContent(childVo.getOptionTitle());
+                                                        if (childVo.getOptionTitle().contains(upStr1)){
+                                                            questionDetailVo.setImgUrl(getImgUrl(childVo.getOptionTitle()));
+                                                            questionDetailVo.setContent("如图所示");
+                                                        }
                                                         questionDetailVo.setOptionsId(i +1);
                                                         if (ObjectUtils.isNotNull(childVo.getIsAnswer()) && childVo.getIsAnswer()){
                                                             index = i + 1;
@@ -3390,7 +3405,10 @@ public class QuestionServiceImpl extends ServiceImpl<QuestionMapper, Question> i
                                                     for (int i = 0; i < detailVo.getChildList().size(); i++) {
                                                         ExternalQuestionChildVo childVo = detailVo.getChildList().get(i);
                                                         QuestionDetailVo questionDetailVo = new QuestionDetailVo();
-                                                        questionDetailVo.setContent(childVo.getOptionTitle());
+                                                        if (childVo.getOptionTitle().contains(upStr1)){
+                                                            questionDetailVo.setImgUrl(getImgUrl(childVo.getOptionTitle()));
+                                                            questionDetailVo.setContent("如图所示");
+                                                        }
                                                         questionDetailVo.setOptionsId(i + 1);
                                                         if (ObjectUtils.isNotNull(childVo.getIsAnswer()) && childVo.getIsAnswer()){
                                                             Integer x = i + 1;
@@ -3489,7 +3507,10 @@ public class QuestionServiceImpl extends ServiceImpl<QuestionMapper, Question> i
                                                                         ExternalQuestionChildVo childVo = topicVo.getChildList().get(i);
                                                                         QuestionDetailVo detailVo1 = new QuestionDetailVo();
                                                                         detailVo1.setOptionsId(i + 1);
-                                                                        detailVo1.setContent(childVo.getOptionTitle());
+                                                                        if (childVo.getOptionTitle().contains(upStr1)){
+                                                                            detailVo1.setImgUrl(getImgUrl(childVo.getOptionTitle()));
+                                                                            detailVo1.setContent("如图所示");
+                                                                        }
                                                                         if (ObjectUtils.isNotNull(childVo.getIsAnswer()) && childVo.getIsAnswer()){
                                                                             index = i + 1;
                                                                         }
@@ -3512,7 +3533,10 @@ public class QuestionServiceImpl extends ServiceImpl<QuestionMapper, Question> i
                                                                         ExternalQuestionChildVo childVo = topicVo.getChildList().get(i);
                                                                         QuestionDetailVo detailVo1 = new QuestionDetailVo();
                                                                         detailVo1.setOptionsId(i + 1);
-                                                                        detailVo1.setContent(childVo.getOptionTitle());
+                                                                        if (childVo.getOptionTitle().contains(upStr1)){
+                                                                            detailVo1.setImgUrl(getImgUrl(childVo.getOptionTitle()));
+                                                                            detailVo1.setContent("如图所示");
+                                                                        }
                                                                         if (ObjectUtils.isNotNull(childVo.getIsAnswer()) && childVo.getIsAnswer()){
                                                                             Integer x = i + 1 ;
                                                                             indexList.add(x+"");
@@ -3589,6 +3613,7 @@ public class QuestionServiceImpl extends ServiceImpl<QuestionMapper, Question> i
     private void handlePhoto(List<ExternalQuestionDetailVo> questionDetailVos) {
         String prefix = "\\Uploads\\qdytopic\\";
         String upStr = OSS_PREFIX + "/web/Uploads/qdytopic/";
+        String upStr1 = "web/Uploads/qdytopic/";
         for (ExternalQuestionDetailVo detailVo : questionDetailVos) {
             if (StringUtils.isNotBlank(detailVo.getTitle()) && detailVo.getTitle().contains(prefix)){
                 String title = detailVo.getTitle();
@@ -3607,7 +3632,7 @@ public class QuestionServiceImpl extends ServiceImpl<QuestionMapper, Question> i
                 for (ExternalQuestionChildVo childVo : childList) {
                     if (StringUtils.isNotBlank(childVo.getOptionTitle()) && childVo.getOptionTitle().contains(prefix)){
                         String optionTitle = childVo.getOptionTitle();
-                        String replace = optionTitle.replace(prefix, upStr);
+                        String replace = optionTitle.replace(prefix, upStr1);
                         childVo.setOptionTitle(replace);
                     }
                 }
@@ -3633,7 +3658,7 @@ public class QuestionServiceImpl extends ServiceImpl<QuestionMapper, Question> i
                         for (ExternalQuestionChildVo childVo : childList) {
                             if (StringUtils.isNotBlank(childVo.getOptionTitle()) && childVo.getOptionTitle().contains(prefix)){
                                 String optionTitle = childVo.getOptionTitle();
-                                String replace = optionTitle.replace(prefix, upStr);
+                                String replace = optionTitle.replace(prefix, upStr1);
                                 childVo.setOptionTitle(replace);
                             }
                         }
@@ -3644,6 +3669,17 @@ public class QuestionServiceImpl extends ServiceImpl<QuestionMapper, Question> i
 
     }
 
+    private String getImgUrl(String img){
+        Matcher m = Pattern.compile("<img.*?src=\"(.*?)\"").matcher(img);
+        String filePath = "";
+        while(m.find())
+        {
+            filePath = m.group(1);
+        }
+        return filePath;
+    }
+
+
     private boolean checkNameUnique(Question entity) {
         Question info = getOne(new LambdaQueryWrapper<Question>()
                 .eq(Question::getPrefixName, entity.getPrefixName()).eq(Question::getContent, entity.getContent()).ne(Question::getStatus, -1).last("limit 1"));

zhongzheng-system/src/main/java/com/zhongzheng/modules/bank/vo/QuestionDetailVo.java

@@ -16,5 +16,7 @@ public class QuestionDetailVo implements Serializable {
 
 	private String content;
 
+	private String imgUrl;
+
 	private Integer optionsId;
 }