处理试题题型问题

sstudy/src/main/java/com/xhkjedu/sstudy/controller/question/ZQuestionUpdateController.java

@@ -1,11 +1,8 @@
 package com.xhkjedu.sstudy.controller.question;
 
-import com.xhkjedu.sstudy.model.question.TQuestion;
 import com.xhkjedu.sstudy.service.question.ZQuestionUpdateService;
-import com.xhkjedu.utils.N_Utils;
 import com.xhkjedu.vo.ResultVo;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -22,9 +19,13 @@ public class ZQuestionUpdateController {
     @Resource
     private ZQuestionUpdateService zQuestionUpdateService;
 
-    @PostMapping("/up")
-    public ResultVo updateQuestionType(@RequestBody TQuestion question) {
-        zQuestionUpdateService.saveQuestions();
-        return new ResultVo(0, "处理成功");
+    @GetMapping("/up")
+    public ResultVo updateQuestionType() {
+       try {
+            zQuestionUpdateService.saveQuestions();
+            return new ResultVo(0, "处理成功");
+        }catch (Exception e){
+            return new ResultVo(1,"处理失败："+e.getMessage());
+        }
     }
 }

sstudy/src/main/java/com/xhkjedu/sstudy/mapper/question/ZQuestionUpdateMapper.java

@@ -2,7 +2,10 @@ package com.xhkjedu.sstudy.mapper.question;
 
 import com.xhkjedu.sstudy.base.TkMapper;
 import com.xhkjedu.sstudy.model.question.TQuestion;
+import com.xhkjedu.sstudy.model.subjectbook.TSubject;
+import com.xhkjedu.sstudy.model.subjectbook.TSubjectQuestiontype;
 import com.xhkjedu.sstudy.vo.question.QuestionVo;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
@@ -14,5 +17,9 @@ import java.util.List;
  **/
 @Repository
 public interface ZQuestionUpdateMapper extends TkMapper<TQuestion> {
-    List<QuestionVo> listQuestions();
+    List<QuestionVo> listQuestions(@Param("level")Integer level,@Param("subjectid")String subjectid);
+
+    List<TSubjectQuestiontype> listSubjectQtype(@Param("level")Integer level,@Param("subjectid")String subjectid);
+
+    List<TSubject> listSubjects();
 }

sstudy/src/main/java/com/xhkjedu/sstudy/service/question/ZQuestionUpdateService.java

@@ -8,6 +8,8 @@ import com.xhkjedu.sstudy.mapper.question.ZQuestionUpdateMapper;
 import com.xhkjedu.sstudy.model.question.TQuestion;
 import com.xhkjedu.sstudy.model.question.TQuestionDirector;
 import com.xhkjedu.sstudy.model.question.TQuestionPoint;
+import com.xhkjedu.sstudy.model.subjectbook.TSubject;
+import com.xhkjedu.sstudy.model.subjectbook.TSubjectQuestiontype;
 import com.xhkjedu.sstudy.utils.StudyUtil;
 import com.xhkjedu.sstudy.vo.question.QuestionVo;
 import com.xhkjedu.sstudy.vo.subjectbook.DirectorVo;
@@ -17,11 +19,11 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
-import java.lang.reflect.Type;
 import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
+import java.util.TreeMap;
 
 /**
  * @Description
@@ -47,123 +49,145 @@ public class ZQuestionUpdateService {
      * @Date 2022/8/17 8:52
      **/
     @Transactional(rollbackFor = Exception.class)
-    public void saveQuestions(){
-        List<QuestionVo> list = zQuestionUpdateMapper.listQuestions();
-
-        List<TQuestion> questions = new ArrayList<>();
-        List<TQuestionDirector> directors = new ArrayList<>();
-        List<TQuestionPoint> points = new ArrayList<>();
-        int timestamp = N_Utils.getSecondTimestamp();
-        for(int k=0;k<list.size();k++){
-//            System.out.println("第几题："+(k+1));
-            QuestionVo qvo=list.get(k);
-            TQuestion q = new TQuestion();
-            String qid = StudyUtil.getId();
-
-            //处理子题
-            String qoption = qvo.getQoption();
-            String qanswer = qvo.getQanswer();
-            List<Map> optionlist = JSON.parseArray(qoption, Map.class);
-            List<String> answerlist = JSON.parseArray(qanswer,String.class);
-
-            q.setQuestionid(qid);
-            q.setQstem(qvo.getQstem());
-            q.setQstemtxt(qvo.getQstemtxt());
-            q.setQanalyze(qvo.getQanalyze());
-            q.setScore(qvo.getScore());
-            q.setComplexity(qvo.getComplexity());
-            q.setSubjectid(qvo.getSubjectid());
-            q.setCount(qvo.getCount());
-            q.setQlevel(2);
-            q.setSnum(optionlist.size());
-            q.setSorder(0);
-            q.setQstate(1);
-            q.setSource(qvo.getSource());
-            q.setYear(qvo.getYear());
-            q.setRegion(qvo.getRegion());
-            q.setSchoolname(qvo.getSchoolname());
-            q.setCreateid(qvo.getCreateid());
-            q.setCreatetime(timestamp);
-            q.setBelong(qvo.getBelong());
-            q.setSchoolid(qvo.getSchoolid());
-            if(qvo.getCtype() == 7 || qvo.getCtype() == 8 ){
-                q.setCtype(16);
-                q.setQtypeid("1QEQRU9B74");
-                q.setQtypename("完形填空(复合)");
-            }
-            if(qvo.getCtype() == 10){
-                q.setCtype(17);
-                q.setQtypeid("1QEQRV3BG1");
-                q.setQtypename("任务型阅读(复合)");
-            }
-            questions.add(q);//母题
-
-            List<PointVo> pointVoList = qvo.getPoints();
-            for(PointVo pointVo:pointVoList){
-                TQuestionPoint tp = new TQuestionPoint();
-                tp.setQpid(StudyUtil.getId());
-                tp.setQuestionid(qid);
-                tp.setPointid(pointVo.getPointid());
-                tp.setCreateid(qvo.getCreateid());
-                tp.setCreatetime(timestamp);
-                points.add(tp);
+    public void saveQuestions() throws Exception{
+        //需要处理试题的科目
+        List<TSubject> subjects = zQuestionUpdateMapper.listSubjects();
+        if(N_Utils.isListEmpty(subjects)){
+            throw new Exception("无需要处理试题");
+        }
+        for(TSubject s : subjects){
+            List<TSubjectQuestiontype> qtypelist = zQuestionUpdateMapper.listSubjectQtype(s.getLevel(),s.getSubjectid());
+            Map<Integer, TSubjectQuestiontype> tmap = new TreeMap();
+            if(N_Utils.isListEmpty(qtypelist)){
+                throw new Exception(s.getSubjectname() + "未设置题型");
             }
-            List<DirectorVo> directorVoList = qvo.getDirectors();
-            for(DirectorVo d : directorVoList){
-                TQuestionDirector td = new TQuestionDirector();
-                td.setQdid(StudyUtil.getId());
-                td.setQuestionid(qid);
-                td.setLsbid(d.getLsbid());
-                td.setDirectorid(d.getDirectorid());
-                td.setCreateid(qvo.getCreateid());
-                td.setCreatetime(timestamp);
-                directors.add(td);
+            for(TSubjectQuestiontype t : qtypelist){
+                tmap.put(t.getCtype(),t);
             }
 
+            List<QuestionVo> list = zQuestionUpdateMapper.listQuestions(s.getLevel(),s.getSubjectid());
+
+            List<TQuestion> questions = new ArrayList<>();
+            List<TQuestionDirector> directors = new ArrayList<>();
+            List<TQuestionPoint> points = new ArrayList<>();
+            int timestamp = N_Utils.getSecondTimestamp();
+            for(int k=0;k<list.size();k++){
+//            System.out.println("第几题："+(k+1));
+                QuestionVo qvo=list.get(k);
+                TQuestion q = new TQuestion();
+                String qid = StudyUtil.getId();
+
+                //处理子题
+                String qoption = qvo.getQoption();
+                String qanswer = qvo.getQanswer();
+                List<Map> optionlist = JSON.parseArray(qoption, Map.class);
+                List<String> answerlist = JSON.parseArray(qanswer,String.class);
+
+                q.setQuestionid(qid);
+                q.setQstem(qvo.getQstem());
+                q.setQstemtxt(qvo.getQstemtxt());
+                q.setQanalyze(qvo.getQanalyze());
+                q.setScore(qvo.getScore());
+                q.setComplexity(qvo.getComplexity());
+                q.setSubjectid(qvo.getSubjectid());
+                q.setCount(qvo.getCount());
+                q.setQlevel(2);
+                q.setSnum(optionlist.size());
+                q.setSorder(0);
+                q.setQstate(1);
+                q.setSource(qvo.getSource());
+                q.setYear(qvo.getYear());
+                q.setRegion(qvo.getRegion());
+                q.setSchoolname(qvo.getSchoolname());
+                q.setCreateid(qvo.getCreateid());
+                q.setCreatetime(timestamp);
+                q.setBelong(qvo.getBelong());
+                q.setSchoolid(qvo.getSchoolid());
+                if(qvo.getCtype() == 7 || qvo.getCtype() == 8 ){
+                    TSubjectQuestiontype st = tmap.get(16);
+                    q.setCtype(16);
+                    q.setQtypeid(st.getQtypeid());
+                    q.setQtypename(st.getQtypename());
+                }
+                if(qvo.getCtype() == 10){
+                    TSubjectQuestiontype st = tmap.get(17);
+                    q.setCtype(17);
+                    q.setQtypeid(st.getQtypeid());
+                    q.setQtypename(st.getQtypename());
+                }
+                questions.add(q);//母题
 
-            for(int i=0;i<optionlist.size();i++){
-                Map map = optionlist.get(i);
-                String sqstem = map.get("sqstem").toString();
-                String sqoptions = map.get("sqoptions").toString();
-                String sanswer = answerlist.get(i);
-                List<String> sanswerlist = new ArrayList<>();
-                sanswerlist.add(sanswer);
-                Double sscore = getDivide(qvo.getScore(),optionlist.size());
-
-                TQuestion sq = new TQuestion();
-                sq.setQuestionid(StudyUtil.getId());
-                sq.setQuestionpid(qid);
-                sq.setQstem(sqstem);
-                sq.setQstemtxt(sqstem);
-                sq.setQoption(sqoptions);
-                sq.setQanswer(JSON.toJSONString(sanswerlist));
-                sq.setScore(sscore);
-                sq.setComplexity(qvo.getComplexity());
-                sq.setSubjectid(qvo.getSubjectid());
-                sq.setCount(0);
-                sq.setQlevel(3);
-                sq.setSnum(0);
-                sq.setSorder(i+1);
-                sq.setQstate(1);
-                sq.setSource(qvo.getSource());
-                sq.setYear(qvo.getYear());
-                sq.setRegion(qvo.getRegion());
-                sq.setSchoolname(qvo.getSchoolname());
-                sq.setCreateid(qvo.getCreateid());
-                sq.setCreatetime(timestamp);
-                sq.setBelong(qvo.getBelong());
-                sq.setSchoolid(qvo.getSchoolid());
-                sq.setCtype(1);
-                sq.setQtypeid("1NJCIQ");
-                sq.setQtypename("单选题");
-
-                questions.add(sq);
+                List<PointVo> pointVoList = qvo.getPoints();
+                for(PointVo pointVo:pointVoList){
+                    TQuestionPoint tp = new TQuestionPoint();
+                    tp.setQpid(StudyUtil.getId());
+                    tp.setQuestionid(qid);
+                    tp.setPointid(pointVo.getPointid());
+                    tp.setCreateid(qvo.getCreateid());
+                    tp.setCreatetime(timestamp);
+                    points.add(tp);
+                }
+                List<DirectorVo> directorVoList = qvo.getDirectors();
+                for(DirectorVo d : directorVoList){
+                    TQuestionDirector td = new TQuestionDirector();
+                    td.setQdid(StudyUtil.getId());
+                    td.setQuestionid(qid);
+                    td.setLsbid(d.getLsbid());
+                    td.setDirectorid(d.getDirectorid());
+                    td.setCreateid(qvo.getCreateid());
+                    td.setCreatetime(timestamp);
+                    directors.add(td);
+                }
+
+
+                for(int i=0;i<optionlist.size();i++){
+                    Map map = optionlist.get(i);
+                    String sqstem = map.get("sqstem").toString();
+                    String sqoptions = map.get("sqoptions").toString();
+                    String sanswer = answerlist.get(i);
+                    List<String> sanswerlist = new ArrayList<>();
+                    sanswerlist.add(sanswer);
+                    Double sscore = getDivide(qvo.getScore(),optionlist.size());
+
+                    TQuestion sq = new TQuestion();
+                    sq.setQuestionid(StudyUtil.getId());
+                    sq.setQuestionpid(qid);
+                    sq.setQstem(sqstem);
+                    sq.setQstemtxt(sqstem);
+                    sq.setQoption(sqoptions);
+                    sq.setQanswer(JSON.toJSONString(sanswerlist));
+                    sq.setScore(sscore);
+                    sq.setComplexity(qvo.getComplexity());
+                    sq.setSubjectid(qvo.getSubjectid());
+                    sq.setCount(0);
+                    sq.setQlevel(3);
+                    sq.setSnum(0);
+                    sq.setSorder(i+1);
+                    sq.setQstate(1);
+                    sq.setSource(qvo.getSource());
+                    sq.setYear(qvo.getYear());
+                    sq.setRegion(qvo.getRegion());
+                    sq.setSchoolname(qvo.getSchoolname());
+                    sq.setCreateid(qvo.getCreateid());
+                    sq.setCreatetime(timestamp);
+                    sq.setBelong(qvo.getBelong());
+                    sq.setSchoolid(qvo.getSchoolid());
+
+                    TSubjectQuestiontype st = tmap.get(1);
+                    sq.setCtype(1);
+                    sq.setQtypeid(st.getQtypeid());
+                    sq.setQtypename(st.getQtypename());
+
+                    questions.add(sq);
+                }
             }
+
+            questionMapper.saveBathQuestion(questions);
+            questionDirectorMapper.batchSave(directors);
+            questionPointMapper.batchSave(points);
         }
-        
-        questionMapper.saveBathQuestion(questions);
-        questionDirectorMapper.batchSave(directors);
-        questionPointMapper.batchSave(points);
+
+
     }
 
     private Double getDivide(Double score,Integer num){

sstudy/src/main/resources/mapper/question/ZQuestionUpdateMapper.xml

@@ -51,7 +51,24 @@
         q.createid,q.schoolid ,qd.directorid,qd.lsbid
         from t_question q
         left join t_question_director qd on q.questionid=qd.questionid
-        where q.qstate=1 and q.ctype in (7,8,10)
+        left join t_subject s on q.subjectid=s.subjectid
+        where s.level=#{level} and q.qstate=1 and s.subjectid=#{subjectid} and q.ctype in (7,8,10)
     </select>
 
+    <!--获取指定学段的ctype为1,16，17的值-->
+    <select id="listSubjectQtype" resultType="com.xhkjedu.sstudy.model.subjectbook.TSubjectQuestiontype">
+        select q.qtypeid,q.qtypename,q.ctype from t_subject_questiontype q
+        left join t_subject s on q.subjectid=s.subjectid
+        where s.level=#{level} and q.belong=1 and s.subjectid=#{subjectid} and q.ctype in (1,16,17)
+    </select>
+
+    <!--需要处理的科目的题型-->
+    <select id="listSubjects" resultType="com.xhkjedu.sstudy.model.subjectbook.TSubject">
+        select s.subjectid,s.subjectname,s.level from t_question q
+         left join t_subject s on q.subjectid=s.subjectid
+        where q.qstate=1 and q.ctype in (7,8,10) group by s.subjectid
+    </select>
+
+
+
 </mapper>

sstudy/src/test/java/com/xhkjedu/sstudy/SstudyApplicationTests.java

@@ -1,20 +1,13 @@
 package com.xhkjedu.sstudy;
 
-import com.xhkjedu.sstudy.service.question.ZQuestionUpdateService;
 import org.junit.jupiter.api.Test;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 
-import javax.annotation.Resource;
-
 @SpringBootTest
 class SstudyApplicationTests {
-    @Resource
-    private ZQuestionUpdateService zQuestionUpdateService;
 
     @Test
     void contextLoads() {
-        zQuestionUpdateService.saveQuestions();
     }
 
 }