优化处理丢弃题型试题

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

@@ -22,4 +22,7 @@ public interface ZQuestionUpdateMapper extends TkMapper<TQuestion> {
     List<TSubjectQuestiontype> listSubjectQtype(@Param("level")Integer level,@Param("subjectid")String subjectid);
 
     List<TSubject> listSubjects();
+
+    //修改原试题状态
+    void updateBatchQuestionState(@Param("questionids")List<String> questionids);
 }

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

@@ -42,46 +42,50 @@ public class ZQuestionUpdateService {
     private QuestionPointMapper questionPointMapper;
 
     /**
-     * @Description  处理万幸填空阅读理解
+     * @Description 处理万幸填空阅读理解
      * @Param []
      * @Return void
      * @Author wn
      * @Date 2022/8/17 8:52
      **/
     @Transactional(rollbackFor = Exception.class)
-    public void saveQuestions() throws Exception{
-        //需要处理试题的科目
+    public void saveQuestions() throws Exception {
+        // 需要处理试题的科目
         List<TSubject> subjects = zQuestionUpdateMapper.listSubjects();
-        if(N_Utils.isListEmpty(subjects)){
+
+        if (N_Utils.isListEmpty(subjects)) {
             throw new Exception("无需要处理试题");
         }
-        for(TSubject s : subjects){
-            List<TSubjectQuestiontype> qtypelist = zQuestionUpdateMapper.listSubjectQtype(s.getLevel(),s.getSubjectid());
+        for (TSubject s : subjects) {
+            List<TSubjectQuestiontype> qtypelist = zQuestionUpdateMapper.listSubjectQtype(s.getLevel(), s.getSubjectid());
             Map<Integer, TSubjectQuestiontype> tmap = new TreeMap();
-            if(N_Utils.isListEmpty(qtypelist)){
+            if (N_Utils.isListEmpty(qtypelist)) {
                 throw new Exception(s.getSubjectname() + "未设置题型");
             }
-            for(TSubjectQuestiontype t : qtypelist){
-                tmap.put(t.getCtype(),t);
+            for (TSubjectQuestiontype t : qtypelist) {
+                if(!tmap.containsKey(t.getCtype())){
+                    tmap.put(t.getCtype(), t);
+                }
             }
 
-            List<QuestionVo> list = zQuestionUpdateMapper.listQuestions(s.getLevel(),s.getSubjectid());
+            List<QuestionVo> list = zQuestionUpdateMapper.listQuestions(s.getLevel(), s.getSubjectid());
 
             List<TQuestion> questions = new ArrayList<>();
             List<TQuestionDirector> directors = new ArrayList<>();
             List<TQuestionPoint> points = new ArrayList<>();
+            List<String> questionids = new ArrayList<>();
             int timestamp = N_Utils.getSecondTimestamp();
-            for(int k=0;k<list.size();k++){
+            for (int k = 0; k < list.size(); k++) {
 //            System.out.println("第几题："+(k+1));
-                QuestionVo qvo=list.get(k);
+                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);
+                List<String> answerlist = JSON.parseArray(qanswer, String.class);
 
                 q.setQuestionid(qid);
                 q.setQstem(qvo.getQstem());
@@ -104,22 +108,27 @@ public class ZQuestionUpdateService {
                 q.setCreatetime(timestamp);
                 q.setBelong(qvo.getBelong());
                 q.setSchoolid(qvo.getSchoolid());
-                if(qvo.getCtype() == 7 || qvo.getCtype() == 8 ){
-                    TSubjectQuestiontype st = tmap.get(16);
+                TSubjectQuestiontype st = null;
+                if (qvo.getCtype() == 7 || qvo.getCtype() == 8) {
+                    st = tmap.get(16);
                     q.setCtype(16);
-                    q.setQtypeid(st.getQtypeid());
-                    q.setQtypename(st.getQtypename());
+
                 }
-                if(qvo.getCtype() == 10){
-                    TSubjectQuestiontype st = tmap.get(17);
+                if (qvo.getCtype() == 10) {
+                    st = tmap.get(17);
                     q.setCtype(17);
-                    q.setQtypeid(st.getQtypeid());
-                    q.setQtypename(st.getQtypename());
                 }
-                questions.add(q);//母题
+
+                if(st == null){
+                    throw new Exception("未设置题型："+ s.getSubjectname() + ":"+qvo.getQuestionid());
+                }
+
+                q.setQtypeid(st.getQtypeid());
+                q.setQtypename(st.getQtypename());
+                questions.add(q);// 母题
 
                 List<PointVo> pointVoList = qvo.getPoints();
-                for(PointVo pointVo:pointVoList){
+                for (PointVo pointVo : pointVoList) {
                     TQuestionPoint tp = new TQuestionPoint();
                     tp.setQpid(StudyUtil.getId());
                     tp.setQuestionid(qid);
@@ -129,7 +138,7 @@ public class ZQuestionUpdateService {
                     points.add(tp);
                 }
                 List<DirectorVo> directorVoList = qvo.getDirectors();
-                for(DirectorVo d : directorVoList){
+                for (DirectorVo d : directorVoList) {
                     TQuestionDirector td = new TQuestionDirector();
                     td.setQdid(StudyUtil.getId());
                     td.setQuestionid(qid);
@@ -141,14 +150,14 @@ public class ZQuestionUpdateService {
                 }
 
 
-                for(int i=0;i<optionlist.size();i++){
+                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());
+                    Double sscore = getDivide(qvo.getScore(), optionlist.size());
 
                     TQuestion sq = new TQuestion();
                     sq.setQuestionid(StudyUtil.getId());
@@ -163,7 +172,7 @@ public class ZQuestionUpdateService {
                     sq.setCount(0);
                     sq.setQlevel(3);
                     sq.setSnum(0);
-                    sq.setSorder(i+1);
+                    sq.setSorder(i + 1);
                     sq.setQstate(1);
                     sq.setHashear(0);
                     sq.setSource(qvo.getSource());
@@ -175,24 +184,25 @@ public class ZQuestionUpdateService {
                     sq.setBelong(qvo.getBelong());
                     sq.setSchoolid(qvo.getSchoolid());
 
-                    TSubjectQuestiontype st = tmap.get(1);
+                    TSubjectQuestiontype st1 = tmap.get(1);
                     sq.setCtype(1);
-                    sq.setQtypeid(st.getQtypeid());
-                    sq.setQtypename(st.getQtypename());
+                    sq.setQtypeid(st1.getQtypeid());
+                    sq.setQtypename(st1.getQtypename());
 
                     questions.add(sq);
                 }
+                questionids.add(qvo.getQuestionid());
             }
 
             questionMapper.saveBathQuestion(questions);
             questionDirectorMapper.batchSave(directors);
             questionPointMapper.batchSave(points);
+            zQuestionUpdateMapper.updateBatchQuestionState(questionids);
         }
 
-
     }
 
-    private Double getDivide(Double score,Integer num){
+    private Double getDivide(Double score, Integer num) {
         BigDecimal score1 = new BigDecimal(score);
         BigDecimal num1 = new BigDecimal(num);
         BigDecimal divide = score1.divide(num1, 1, BigDecimal.ROUND_FLOOR);

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

@@ -69,6 +69,14 @@
         where q.qstate=1 and q.ctype in (7,8,10) group by s.subjectid
     </select>
 
+    <!--更改原试题状态为已删除-->
+    <update id="updateBatchQuestionState">
+        update t_question set qstate=10 where questionid in
+        <foreach collection="questionids" item="questionid" index="index" open="(" close=")" separator=",">
+            #{questionid}
+        </foreach>
+    </update>
+
 
 
 </mapper>