submit

zhongzheng-admin/src/main/java/com/zhongzheng/controller/bank/QuestionController.java

@@ -317,8 +317,8 @@ public class QuestionController extends BaseController {
 
     @ApiOperation("识别图片文案2")
     @PostMapping("/image/word/two")
-    public AjaxResult<Void> getImageWordTwo(MultipartFile file,String major) {
-        iQuestionService.getImageWordTwo(file,major);
+    public AjaxResult<Void> getImageWordTwo(MultipartFile file,String major,String exam) {
+        iQuestionService.getImageWordTwo(file,major,exam);
         return AjaxResult.success();
     }
 

zhongzheng-system/src/main/java/com/zhongzheng/modules/bank/bo/QuestionWaiBuBo.java

@@ -0,0 +1,15 @@
+package com.zhongzheng.modules.bank.bo;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class QuestionWaiBuBo implements Serializable {
+
+    private Long eduId;
+    private Long proId;
+    private Long businessId;
+    private Long subId;
+    private String content;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/bank/mapper/QuestionMapper.java

@@ -2,6 +2,7 @@ package com.zhongzheng.modules.bank.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.zhongzheng.modules.bank.bo.QuestionQueryBo;
+import com.zhongzheng.modules.bank.bo.QuestionWaiBuBo;
 import com.zhongzheng.modules.bank.domain.Question;
 import com.zhongzheng.modules.bank.vo.QuestionVo;
 import com.zhongzheng.modules.course.bo.CourseQueryBo;
@@ -39,4 +40,6 @@ public interface QuestionMapper extends BaseMapper<Question> {
     List<BankGoodsExamVo> getBankGoodsExamList(@Param("goodsId") Long goodsId);
 
     Question getQuestionByTenant(@Param("code") String code,@Param("newTenantId") Long newTenantId);
+
+    Question getQuestionByWaiBu(QuestionWaiBuBo bo);
 }

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

@@ -122,5 +122,5 @@ public interface IQuestionService extends IService<Question> {
 
 	Map<String, Object> importImage(List<QuestionImageVo> questionList2);
 
-    void getImageWordTwo(MultipartFile file, String major);
+    void getImageWordTwo(MultipartFile file, String major,String exam);
 }

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

@@ -4605,7 +4605,8 @@ public class QuestionServiceImpl extends ServiceImpl<QuestionMapper, Question> i
     }
 
     @Override
-    public void getImageWordTwo(MultipartFile file, String major) {
+    @Transactional(rollbackFor = Exception.class)
+    public void getImageWordTwo(MultipartFile file, String major,String exam) {
         OCRClient client = new OCRClient("de165480ad1fe94abd16f29a8897b7dd", "6904aae4f8e468d376a3a56f91398e78");
 
         HashMap<String, Object> options = new HashMap<>();
@@ -4645,14 +4646,31 @@ public class QuestionServiceImpl extends ServiceImpl<QuestionMapper, Question> i
             if (jsonNode.has("result") && jsonNode.get("result").has("markdown")) {
                 String markdown = jsonNode.get("result").get("markdown").asText();
                 List<String> strings = extractPureText(markdown);
-                questionReset(strings,major);
+                questionReset(strings,major,exam);
             }
         } catch (Exception e) {
             e.printStackTrace();
         }
     }
 
-    private void questionReset(List<String> questions,String majorName){
+
+    private void questionReset(List<String> questions,String majorName,String exam){
+
+        //题库业务层次
+        CourseEducationType educationType = iCourseEducationTypeService
+                .getOne(new LambdaQueryWrapper<CourseEducationType>().eq(CourseEducationType::getEducationName, "考前培训").eq(CourseEducationType::getStatus, 1).last("limit 1"));
+        Long eduId = educationType.getId();
+        CourseProjectType projectType = iCourseProjectTypeService
+                .getOne(new LambdaQueryWrapper<CourseProjectType>().eq(CourseProjectType::getProjectName, "施工现场专业人员").eq(CourseProjectType::getEducationId, eduId).eq(CourseProjectType::getStatus, 1).last("limit 1"));
+        Long proId = projectType.getId();
+        CourseBusiness business = iCourseBusinessService
+                .getOne(new LambdaQueryWrapper<CourseBusiness>().eq(CourseBusiness::getBusinessName, "七大员").eq(CourseBusiness::getProjectId, proId).eq(CourseBusiness::getStatus, 1).last("limit 1"));
+        Long businessId = business.getId();
+        List<CourseSubjectProject> list = iCourseSubjectProjectService.list(new LambdaQueryWrapper<CourseSubjectProject>().eq(CourseSubjectProject::getProjectId, proId));
+        List<Long> subIds = list.stream().map(CourseSubjectProject::getSubjectId).collect(Collectors.toList());
+        CourseSubject courseSubject = iCourseSubjectService.getOne(new LambdaQueryWrapper<CourseSubject>().in(CourseSubject::getId, subIds).eq(CourseSubject::getSubjectName, majorName).last("limit 1"));
+        Long subId = courseSubject.getId();
+
         //题库ID
         Long questionId = 0L;
         //处理题库
@@ -4670,17 +4688,194 @@ public class QuestionServiceImpl extends ServiceImpl<QuestionMapper, Question> i
         List<String> content = questions.subList(start + 1, end);
         //获取第一个判断题型
         String bt = content.get(0);
+        if (bt.contains("理解题")){
+            if (StringUtils.isBlank(exam)){
+                throw new CustomException("案例题需要补充试卷名称");
+            }
+            //就是案例题,分解获取案例题文本
+            Integer start1 = 0;
+            Integer end1 = 0;
+            for (int i = 0; i < content.size(); i++) {
+                String s = content.get(i);
+                List<String> list1 = Arrays.asList("多选题", "单选题", "判断题");
+                if (list1.stream().anyMatch(x -> s.contains(x))){
+                    end1 = i;
+                }
+            }
+            //案例题文案
+            List<String> anLi = content.subList(start1, end1);
+            //提取文本
+            String anLiStr = "";
+            for (String text : anLi) {
+                // 排除条件（这些不是问题描述）
+                if (text.matches("^[0-9]{1,3}\\..*题$") ||  // 题号类型
+                        text.matches(".*[0-9]分$") ||          // 简单分数
+                        text.matches("^[A-E][｜、:：]?.*") ||   // 选项
+                        text.length() < 10) {                  // 太短的文本
+                    continue;
+                }
+                anLiStr = text;
+            }
+            if (StringUtils.isBlank(anLiStr)) {
+                throw new CustomException("案例题文案获取失败");
+            }
+            //案例题序号
+            String anLiXu = bt.replaceAll("^([0-9]+)、.*", "$1");
+            //检查是否已经存在
+            QuestionWaiBuBo bo = new QuestionWaiBuBo();
+            bo.setEduId(eduId);
+            bo.setProId(proId);
+            bo.setBusinessId(businessId);
+            bo.setSubId(subId);
+            String keyWord = String.format("[%s]案例题序号：%s",exam,anLiXu);
+            bo.setContent(keyWord);
+            Question entity = baseMapper.getQuestionByWaiBu(bo);
+            if (ObjectUtils.isNotNull(entity)){
+                //修改
+                entity.setContent(anLiStr);
+                updateById(entity);
+            }else {
+                //新增
+                Question question = new Question();
+                question.setContent(anLiStr);
+                question.setType(4);
+                question.setStatus(1);
+                question.setCreateTime(DateUtils.getNowTime());
+                question.setUpdateTime(DateUtils.getNowTime());
+                question.setCode(ServletUtils.getEncoded("TM"));
+                question.setPrefixName(String.format("外部系统拉取（%s）[%s]案例题序号：%s",DateUtils.getDate(),exam,anLiXu));
+                question.setPublishStatus(1);
+                question.setFromPlat(1);
+                save(question);
+                QuestionBusiness questionBusiness = new QuestionBusiness();
+                questionBusiness.setEducationTypeId(eduId);
+                questionBusiness.setProjectId(proId);
+                questionBusiness.setBusinessId(businessId);
+                questionBusiness.setSubjectId(subId);
+                questionBusiness.setType(1);
+                questionBusiness.setMajorId(question.getQuestionId());
+                iQuestionBusinessService.save(questionBusiness);
+            }
+
+            //案例题小题
+            content = content.subList(end1,content.size());
+            bt = content.get(0);
+        }
         // 匹配带小数的数字
         Pattern pattern = Pattern.compile("\\d+(\\.\\d+)");
         Matcher matcher = pattern.matcher(bt);
         if (matcher.find()){
+            if (StringUtils.isBlank(exam)){
+                throw new CustomException("案例题需要补充试卷名称");
+            }
             //带有小数点是案例题
             String group = matcher.group(0);
-            List<String> list = Arrays.asList(group.split("\\."));
+            List<String> list1 = Arrays.asList(group.split("\\."));
             //案例序号
-            String xuh = list.get(0);
+            String xuh = list1.get(0);
             //案例小题序号
-            String xuxh = list.get(1);
+            String xuxh = list1.get(1);
+            String content2 = String.format("[%s]案例题序号：%s",exam, xuh);
+
+            //解析题库
+            List<QuestionInfoVo> infoVoList = new ArrayList<>();
+            if (bt.contains("单选题")){
+                List<String> questionList = filterContent(content);
+                //第一个是标题
+                String s = questionList.get(0);
+                QuestionInfoVo infoVo = new QuestionInfoVo();
+                infoVo.setContent(s);
+                infoVo.setType(1);
+                infoVo.setWaiBuSort(Integer.valueOf(xuxh));
+                List<QuestionDetailVo> detailVoList = new ArrayList<>();
+                for (int i = 1; i < questionList.size(); i++) {
+                    String s1 = questionList.get(i);
+                    QuestionDetailVo detailVo = new QuestionDetailVo();
+                    detailVo.setContent(s1);
+                    detailVo.setOptionsId(i);
+                    detailVoList.add(detailVo);
+                }
+                infoVo.setOptionsList(detailVoList);
+                //分解答案
+                String answer = getAnswer(questions);
+                infoVo.setAnswerQuestion(simpleConvert(answer));
+                infoVoList.add(infoVo);
+
+            }
+
+            if (bt.contains("多选题")){
+                List<String> questionList = filterContent(content);
+                //第一个是标题
+                String s = questionList.get(0);
+                QuestionInfoVo infoVo = new QuestionInfoVo();
+                infoVo.setContent(s);
+                infoVo.setType(2);
+                infoVo.setWaiBuSort(Integer.valueOf(xuxh));
+                List<QuestionDetailVo> detailVoList = new ArrayList<>();
+                for (int i = 1; i < questionList.size(); i++) {
+                    String s1 = questionList.get(i);
+                    QuestionDetailVo detailVo = new QuestionDetailVo();
+                    detailVo.setContent(s1);
+                    detailVo.setOptionsId(i);
+                    detailVoList.add(detailVo);
+                }
+                infoVo.setOptionsList(detailVoList);
+                //分解答案
+                String answer = getAnswer(questions);
+                infoVo.setAnswerQuestion(simpleConvert(answer));
+                infoVoList.add(infoVo);
+            }
+
+            if (bt.contains("判断题")){
+                List<String> questionList = filterContent(content);
+                //第一个是标题
+                String s = questionList.get(0);
+                QuestionInfoVo infoVo = new QuestionInfoVo();
+                infoVo.setContent(s);
+                infoVo.setType(3);
+                infoVo.setWaiBuSort(Integer.valueOf(xuxh));
+                //分解答案
+                String answer = getAnswer(questions);
+                infoVo.setAnswerQuestion(answer.contains("错") ? "0":"1");
+                infoVoList.add(infoVo);
+            }
+            //判断是否已经在
+            QuestionWaiBuBo bo = new QuestionWaiBuBo();
+            bo.setEduId(eduId);
+            bo.setProId(proId);
+            bo.setBusinessId(businessId);
+            bo.setSubId(subId);
+            bo.setContent(content2);
+            Question entity = baseMapper.getQuestionByWaiBu(bo);
+            if (ObjectUtils.isNotNull(entity)){
+                //已存在，添加案例小题
+                String jsonStr = entity.getJsonStr();
+                if (StringUtils.isNotBlank(jsonStr)){
+                    List<QuestionInfoVo> infoVoList1 = JSONArray.parseArray(jsonStr, QuestionInfoVo.class);
+                    infoVoList1.addAll(infoVoList);
+                    List<QuestionInfoVo> collect = infoVoList1.stream().sorted(Comparator.comparingInt(QuestionInfoVo::getWaiBuSort)).collect(Collectors.toList());
+                    entity.setJsonStr(JSONArray.toJSONString(collect));
+                }else {
+                    entity.setJsonStr(JSONArray.toJSONString(infoVoList));
+                }
+                updateById(entity);
+                questionId = entity.getQuestionId();
+            }else {
+                //新增
+                Question question = new Question();
+                question.setContent(content2);
+                question.setType(4);
+                question.setStatus(1);
+                question.setCreateTime(DateUtils.getNowTime());
+                question.setUpdateTime(DateUtils.getNowTime());
+                question.setCode(ServletUtils.getEncoded("TM"));
+                question.setPrefixName(String.format("外部系统拉取（%s）[%s]案例题序号：%s",DateUtils.getDate(),exam,xuh));
+                question.setPublishStatus(1);
+                question.setFromPlat(1);
+                question.setJsonStr(JSONArray.toJSONString(infoVoList));
+                save(question);
+                questionId = question.getQuestionId();
+            }
 
         }else {
             //判断题,多选题,单选题
@@ -4770,20 +4965,6 @@ public class QuestionServiceImpl extends ServiceImpl<QuestionMapper, Question> i
             throw new CustomException("题库解析失败");
         }
 
-        //题库业务层次
-        CourseEducationType educationType = iCourseEducationTypeService
-                .getOne(new LambdaQueryWrapper<CourseEducationType>().eq(CourseEducationType::getEducationName, "考前培训").eq(CourseEducationType::getStatus, 1).last("limit 1"));
-        Long eduId = educationType.getId();
-        CourseProjectType projectType = iCourseProjectTypeService
-                .getOne(new LambdaQueryWrapper<CourseProjectType>().eq(CourseProjectType::getProjectName, "施工现场专业人员").eq(CourseProjectType::getEducationId, eduId).eq(CourseProjectType::getStatus, 1).last("limit 1"));
-        Long proId = projectType.getId();
-        CourseBusiness business = iCourseBusinessService
-                .getOne(new LambdaQueryWrapper<CourseBusiness>().eq(CourseBusiness::getBusinessName, "七大员").eq(CourseBusiness::getProjectId, proId).eq(CourseBusiness::getStatus, 1).last("limit 1"));
-        Long businessId = business.getId();
-        List<CourseSubjectProject> list = iCourseSubjectProjectService.list(new LambdaQueryWrapper<CourseSubjectProject>().eq(CourseSubjectProject::getProjectId, proId));
-        List<Long> subIds = list.stream().map(CourseSubjectProject::getSubjectId).collect(Collectors.toList());
-        CourseSubject courseSubject = iCourseSubjectService.getOne(new LambdaQueryWrapper<CourseSubject>().in(CourseSubject::getId, subIds).eq(CourseSubject::getSubjectName, majorName).last("limit 1"));
-        Long subId = courseSubject.getId();
         QuestionBusiness questionBusiness = new QuestionBusiness();
         questionBusiness.setEducationTypeId(eduId);
         questionBusiness.setProjectId(proId);
@@ -4809,14 +4990,15 @@ public class QuestionServiceImpl extends ServiceImpl<QuestionMapper, Question> i
     }
 
     private String getAnswer(List<String> question){
+        //找正确答案
         Integer index =0;
         for (int i = 0; i < question.size(); i++) {
             String s = question.get(i);
-            if (s.contains("X") || s.contains("x")){
+            if (s.equals("正确答案")){
                 index = i;
             }
         }
-        return question.get(index+1);
+        return question.get(index+3);
     }
 
     private List<String> filterContent(List<String> lines) {
@@ -4843,6 +5025,8 @@ public class QuestionServiceImpl extends ServiceImpl<QuestionMapper, Question> i
                 trimmed = trimmed.substring(1).trim();
             }
 
+            //去除首字母或者| 这种符号
+            trimmed = trimmed.replaceAll("^[A-E][\\|｜]?", "");
             // 去除结尾的括号
 //            trimmed = trimmed.replaceAll("[（）()]+$", "");
 
@@ -4854,7 +5038,6 @@ public class QuestionServiceImpl extends ServiceImpl<QuestionMapper, Question> i
         return result;
     }
 
-
     /**
      * 提取纯文本信息，过滤掉所有链接、HTML标签和Markdown符号
      */

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

@@ -17,6 +17,8 @@ public class QuestionInfoVo implements Serializable {
 
 	private String analysisContent;
 
+	private Integer waiBuSort;
+
 	private String answerQuestion;
 
 	private String content;

zhongzheng-system/src/main/resources/mapper/modules/bank/QuestionMapper.xml

@@ -741,4 +741,22 @@
         select * from question where `code` = #{code} and tenant_id = #{newTenantId}
     </select>
 
+    <select id="getQuestionByWaiBu" parameterType="com.zhongzheng.modules.bank.bo.QuestionWaiBuBo" resultType="com.zhongzheng.modules.bank.domain.Question">
+        SELECT
+            q.*
+        FROM
+            `question` q
+                LEFT JOIN question_business qb ON q.question_id = qb.major_id
+        WHERE
+            q.`status` = 1
+            AND qb.type = 1
+            AND qb.education_type_id = #{eduId}
+            AND qb.project_id = #{proId}
+            AND qb.business_id = #{businessId}
+            AND qb.subject_id = #{subId}
+            AND q.prefix_name like concat('%', #{content}, '%')
+            ORDER BY q.create_time DESC
+              LIMIT 1
+    </select>
+
 </mapper>