submit

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

@@ -4,7 +4,7 @@ spring:
         type: com.alibaba.druid.pool.DruidDataSource
         driverClassName: com.mysql.cj.jdbc.Driver
         druid:
-            url: jdbc:mysql://192.168.1.222:3306/zz_edu_saas?rewriteBatchedStatements=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true
+            url: jdbc:mysql://192.168.1.222:3306/zz_edu_saas_pre?rewriteBatchedStatements=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true
             username: root
             password: zhongzheng2021
             # 初始连接数

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

@@ -7,6 +7,7 @@ import cn.hutool.http.HttpStatus;
 import com.alibaba.fastjson.JSON;
 
 import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
@@ -3138,7 +3139,8 @@ public class QuestionServiceImpl extends ServiceImpl<QuestionMapper, Question> i
         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);
+        JSONObject jsonObject1 = JSONObject.parseObject(respone);
+        List<ExternalQuestionVo> questionVos = JSONArray.parseArray(jsonObject1.get("data").toString(), ExternalQuestionVo.class);
         //考前培训
         CourseEducationType educationType = iCourseEducationTypeService
                 .getOne(new LambdaQueryWrapper<CourseEducationType>()
@@ -3295,8 +3297,9 @@ public class QuestionServiceImpl extends ServiceImpl<QuestionMapper, Question> i
                         if (ObjectUtils.isNotNull(item2.getIsTopic()) && item2.getIsTopic()){
                             //获取题目内容
                             String topParam = String.format("MeasureModelId=%s",item2.getMeasureModelId());
-                            String topRespone = HttpUtils.sendGet(QUESTION_DETAIL, topParam);
-                            List<ExternalQuestionDetailVo> questionDetailVos = JSONArray.parseArray(topRespone, ExternalQuestionDetailVo.class);
+                            String respone2 = HttpUtils.sendPostJsonHeader(EXAM_QUESTION_DETAIL, topParam,map);
+                            JSONObject jsonObject = JSONObject.parseObject(respone2);
+                            List<ExternalQuestionDetailVo> questionDetailVos = JSONArray.parseArray(jsonObject.get("data").toString(), ExternalQuestionDetailVo.class);
 
                             if (CollectionUtils.isNotEmpty(questionDetailVos)){
                                 //处理图片
@@ -3357,6 +3360,8 @@ public class QuestionServiceImpl extends ServiceImpl<QuestionMapper, Question> i
                                                         if (childVo.getOptionTitle().contains(upStr1)){
                                                             questionDetailVo.setImgUrl(getImgUrl(childVo.getOptionTitle()));
                                                             questionDetailVo.setContent("如图所示");
+                                                        }else {
+                                                            questionDetailVo.setContent(childVo.getOptionTitle());
                                                         }
                                                         questionDetailVo.setOptionsId(i +1);
                                                         if (ObjectUtils.isNotNull(childVo.getIsAnswer()) && childVo.getIsAnswer()){
@@ -3408,6 +3413,8 @@ public class QuestionServiceImpl extends ServiceImpl<QuestionMapper, Question> i
                                                         if (childVo.getOptionTitle().contains(upStr1)){
                                                             questionDetailVo.setImgUrl(getImgUrl(childVo.getOptionTitle()));
                                                             questionDetailVo.setContent("如图所示");
+                                                        }else {
+                                                            questionDetailVo.setContent(childVo.getOptionTitle());
                                                         }
                                                         questionDetailVo.setOptionsId(i + 1);
                                                         if (ObjectUtils.isNotNull(childVo.getIsAnswer()) && childVo.getIsAnswer()){
@@ -3510,6 +3517,8 @@ public class QuestionServiceImpl extends ServiceImpl<QuestionMapper, Question> i
                                                                         if (childVo.getOptionTitle().contains(upStr1)){
                                                                             detailVo1.setImgUrl(getImgUrl(childVo.getOptionTitle()));
                                                                             detailVo1.setContent("如图所示");
+                                                                        }else {
+                                                                            detailVo1.setContent(childVo.getOptionTitle());
                                                                         }
                                                                         if (ObjectUtils.isNotNull(childVo.getIsAnswer()) && childVo.getIsAnswer()){
                                                                             index = i + 1;
@@ -3536,6 +3545,8 @@ public class QuestionServiceImpl extends ServiceImpl<QuestionMapper, Question> i
                                                                         if (childVo.getOptionTitle().contains(upStr1)){
                                                                             detailVo1.setImgUrl(getImgUrl(childVo.getOptionTitle()));
                                                                             detailVo1.setContent("如图所示");
+                                                                        }else {
+                                                                            detailVo1.setContent(childVo.getOptionTitle());
                                                                         }
                                                                         if (ObjectUtils.isNotNull(childVo.getIsAnswer()) && childVo.getIsAnswer()){
                                                                             Integer x = i + 1 ;