fix bug

src/main/java/io/v/nutz/question/controller/QuestionH5Controller.java

@@ -2,6 +2,7 @@ package io.v.nutz.question.controller;
 
 import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.ObjectUtil;
 import cn.wizzer.framework.base.Result;
 import cn.wizzer.framework.page.Pagination;
 import io.v.nutz.activity.models.ActivityUserScope;
@@ -15,6 +16,7 @@ import org.nutz.dao.Dao;
 import org.nutz.dao.Sqls;
 import org.nutz.dao.sql.Sql;
 import org.nutz.dao.util.Daos;
+import org.nutz.dao.util.cri.Static;
 import org.nutz.ioc.loader.annotation.Inject;
 import org.nutz.ioc.loader.annotation.IocBean;
 import org.nutz.lang.Lang;
@@ -282,10 +284,39 @@ public class QuestionH5Controller {
         } else if (ctMode == 3) {
             //常规模式
             //判断是否将题目加进去了
-            QuestionRandomIssue randomIssue = dao.fetch(QuestionRandomIssue.class, Cnd.where("questionId", "=", question.getQid()).and("userId", "=", ShiroUtil.getUserId()));
-            if (Lang.isEmpty(randomIssue)) {
-                Sql issueSql = Sqls.create(" SELECT iid FROM `question_issue` where iqid = @qid");
-                issueSql.setParam("qid", id);
+
+            Sql issueSql = Sqls.create(" SELECT iid FROM `question_issue` $condition");
+            Cnd commonIssueCnd = Cnd.NEW();
+            commonIssueCnd.and("iqid", "=", id);
+
+            //判断是否要随机
+            Integer ranDomSum = question.getRanDomSum();
+            Integer ranDomSingleIssueNum = question.getRanDomSingleIssueNum();
+
+            //已经回答最大次数
+            int maxAnswer = 0;
+
+            boolean needFor = true;
+
+            List<QuestionRandomIssue> randomIssues = dao.query(QuestionRandomIssue.class, Cnd.where("questionId", "=", question.getQid()).and("userId", "=", ShiroUtil.getUserId()));
+            if (Lang.isNotEmpty(randomIssues)) {
+                maxAnswer = randomIssues.stream().mapToInt(QuestionRandomIssue::getNum).max().orElse(0);
+                int finalMaxAnswer = maxAnswer;
+                QuestionRandomIssue maxQuestionRandomIssue = randomIssues.stream().filter(randomIssue -> randomIssue.getNum() == finalMaxAnswer).findFirst().orElse(null);
+                if (randomIssues.size() < ranDomSum && Lang.isNotEmpty(maxQuestionRandomIssue) && maxQuestionRandomIssue.getIsFinish()) {
+                    List<String> allIssueIds = randomIssues.stream().flatMap(randomIssue -> randomIssue.getIssueIds().stream()).collect(Collectors.toList());
+                    commonIssueCnd.andEX("iid", "not in", allIssueIds);
+                }else{
+                    needFor = false;
+                }
+            }
+
+            if (ObjectUtil.isAllNotEmpty(ranDomSum, ranDomSingleIssueNum)) {
+                commonIssueCnd.and(new Static("1=1 order by rand() limit " + ranDomSingleIssueNum));
+            }
+
+            if(needFor){
+                issueSql.setCondition(commonIssueCnd);
                 issueSql.setCallback(Sqls.callback.strList());
                 dao.execute(issueSql);
                 List<String> randomIssueIds = (List<String>) issueSql.getResult();
@@ -294,13 +325,40 @@ public class QuestionH5Controller {
                 questionRandomIssue.setQuestionId(id);
                 questionRandomIssue.setUserId(ShiroUtil.getUserId());
                 questionRandomIssue.setIssueIds(randomIssueIds);
-                questionRandomIssue.setNum(null);
+                questionRandomIssue.setNum(maxAnswer + 1);
                 questionRandomIssue.setIsFinish(false);
                 dao.insert(questionRandomIssue);
                 issueCnd.and("iid", "in", randomIssueIds);
-            } else {
-                issueCnd.and("iid", "in", randomIssue.getIssueIds());
+            }else{
+//                List<String> allIssueIds = randomIssues.stream().flatMap(randomIssue -> randomIssue.getIssueIds().stream()).collect(Collectors.toList());
+                int finalMaxAnswer1 = maxAnswer;
+                List<String> allIssueIds = randomIssues.stream().filter(randomIssue -> randomIssue.getNum() == finalMaxAnswer1).flatMap(randomIssue -> randomIssue.getIssueIds().stream()).collect(Collectors.toList());
+                issueCnd.and("iid", "in", allIssueIds);
             }
+
+//            if (Lang.isEmpty(randomIssue)) {
+//
+//                Sql issueSql = Sqls.create(" SELECT iid FROM `question_issue` where iqid = @qid $randLimit");
+//                issueSql.setParam("qid", id);
+//                if (ranDomSingleIssueNum != null && ranDomSingleIssueNum > 0) {
+//                    issueSql.setVar("randLimit", " order by rand() limit " + ranDomSingleIssueNum);
+//                }
+//
+//                issueSql.setCallback(Sqls.callback.strList());
+//                dao.execute(issueSql);
+//                List<String> randomIssueIds = (List<String>) issueSql.getResult();
+//                Collections.shuffle(randomIssueIds);
+//                QuestionRandomIssue questionRandomIssue = new QuestionRandomIssue();
+//                questionRandomIssue.setQuestionId(id);
+//                questionRandomIssue.setUserId(ShiroUtil.getUserId());
+//                questionRandomIssue.setIssueIds(randomIssueIds);
+//                questionRandomIssue.setNum(null);
+//                questionRandomIssue.setIsFinish(false);
+//                dao.insert(questionRandomIssue);
+//                issueCnd.and("iid", "in", randomIssueIds);
+//            } else {
+//                issueCnd.and("iid", "in", randomIssue.getIssueIds());
+//            }
         }
 
 //        issueCnd.asc("ipxbh");

src/main/java/io/v/nutz/question/controller/QuestionMangeController.java

@@ -225,12 +225,13 @@ public class QuestionMangeController {
 
         List<String> newIssueIds = issues.stream().map(v -> v.getIid()).collect(Collectors.toList());
         List<Question_issue> deleteIssues = oldIssues.stream().filter(v -> !newIssueIds.contains(v.getIid())).collect(Collectors.toList());
+        List<String> deleteIssueIds = deleteIssues.stream().map(v -> v.getIid()).collect(Collectors.toList());
         //题目删掉
-        dao.clear(Question_issue.class, Cnd.where("iid", "in", deleteIssues));
+        dao.clear(Question_issue.class, Cnd.where("iid", "in", deleteIssueIds));
         //选项删掉
-        dao.clear(Question_wor.class, Cnd.where("wiid", "in", deleteIssues));
+        dao.clear(Question_wor.class, Cnd.where("wiid", "in", deleteIssueIds));
         //回答记录删掉
-        dao.clear(Question_reply.class, Cnd.where("issueId", "in", deleteIssues));
+        dao.clear(Question_reply.class, Cnd.where("issueId", "in", deleteIssueIds));
 
 
         for (Question_issue oldIssue : oldIssues) {

src/main/java/io/v/nutz/question/model/Question_issue.java

@@ -51,7 +51,7 @@ public class Question_issue implements Serializable {
     private Boolean iisbd;
 
     @Column
-    @Comment("题型 （1 选择题 2 填空题）")
+    @Comment("题型 （1 选择题 2 填空题 3 判断题）")
     @J4EIgnore
     @ColDefine(type = ColType.INT, width = 2)
     private Integer itx;

src/main/java/io/v/nutz/question/model/Question_wor.java

@@ -33,7 +33,7 @@ public class Question_wor implements Serializable {
     @Column
     @Comment("选项文字")
     @J4EIgnore
-    @ColDefine(type = ColType.VARCHAR, width = 100)
+    @ColDefine(type = ColType.VARCHAR, width = 500)
     private String wtxt;
 
     @Column

src/main/resources/views/mobile/question/answer.html

@@ -250,7 +250,7 @@ layout("/mobile/platform.html"){
                         <van-button type="info" block @click="submit()">提交</van-button>
                     </div>
                     <div class="page-control" style="grid-template-columns: auto"
-                         v-if="canAnswerAgain && finishAnswer && moment().format('YYYY-MM-DD') === vue.currentDate">
+                         v-if="canAnswerAgain && finishAnswer && moment().format('YYYY-MM-DD') === currentDate">
                         <van-button type="info" block @click="answerAgain">
                             再答一次
                         </van-button>
@@ -572,14 +572,19 @@ layout("/mobile/platform.html"){
             },
 
             answerAgain() {
-                this.finishAnswer = false
-                setTimeout(() => {
-                    this.questionData.issues.forEach(issue => {
-                        issue.wors.forEach(wor => {
-                            this.$refs['checkboxes' + wor.wid][0].toggle(false)
+                if(this.questionData.ctMode===3){
+                    location.reload()
+                }else{
+                    this.finishAnswer = false
+                    setTimeout(() => {
+                        this.questionData.issues.forEach(issue => {
+                            issue.wors.forEach(wor => {
+                                this.$refs['checkboxes' + wor.wid][0].toggle(false)
+                            })
                         })
-                    })
-                }, 0)
+                    }, 0)
+                    this.checkTimer()
+                }
             },
 
             async getUserHasAnswerRandomNum() {
@@ -608,19 +613,22 @@ layout("/mobile/platform.html"){
                 this.currentScore = resp.data
             },
             checkTimer() {
-                if (this.timerInterval) {
-                    clearInterval(this.timerInterval)
-                }
-                if (!this.finishAnswer) {
-                    this.$dialog.alert({
-                        title: '提示',
-                        message: '本次答题时间' + this.questionData.timerMinute + '分钟，请尽快完成！'
-                    }).then(() => {
-                        this.countDownSeconds = this.questionData.timerMinute * 60
-                        this.timerInterval = setInterval(() => {
+                if(this.questionData.enableTimer){
+                    if (this.timerInterval) {
+                        clearInterval(this.timerInterval)
+                    }
+                    if (!this.finishAnswer) {
+                        this.$dialog.alert({
+                            title: '提示',
+                            message: '本次答题时间' + this.questionData.timerMinute + '分钟，请尽快完成！'
+                        }).then(() => {
+                            this.countDownSeconds = this.questionData.timerMinute * 60
                             this.updateCountdown()
-                        }, 1000)
-                    });
+                            this.timerInterval = setInterval(() => {
+                                this.updateCountdown()
+                            }, 1000)
+                        });
+                    }
                 }
             },
 

src/main/resources/views/platform/question/components/batchInsert.js

@@ -0,0 +1,156 @@
+const batchInsert = {
+    template: `
+        <el-dialog title="批量添加1111" :visible.sync="visible" width="70%" top="50px" :close-on-click-modal="false">
+            <div style="display: flex;justify-content: space-between;align-items: center">
+                <p style="line-height: 24px;margin-bottom: 10px;color: #333;">1、题目的识别基于标题前的题型说明，放在标题的前面，格式为“<span>[题型]标题内容((描述))</span>“<br>2、题干与选项，及各选项之间需回车换行</p>
+                <el-button size="medium">清空文本</el-button>
+                <div>
+                    {{errorMsg}}
+                </div>
+            </div>
+            
+            <div style="display: flex;height: 60vh;max-height: 1000px;border: 1px solid #ccc;">
+                <div style="border-right: 1px solid #ccc;height: 100%;width: 50%;overflow: auto">
+                    <textarea name="txtContentNew"
+                              v-model="txt"
+                              cols="20"
+                              rows="2"
+                              wrap="off"
+                              style="height: 59vh;width: 100%;overflow: auto;border: none;padding: 20px 10px 10px;display:inline-block;line-height: 20px;outline: none;"
+                              placeholder=""></textarea>
+                </div>
+                <div style="height: 100%;width: 50%;overflow: auto;padding: 20px 10px 10px">
+                    <div v-for="(issue,index) in issues" :key="index" style="margin-bottom: 10px">
+                        <div style="display: flex">
+                            <div>{{index+1}}、</div>
+                            <div>{{issue.iname}}</div>
+                        </div>
+                        <div v-if="issue.wors">
+                             <el-radio-group v-if="issue.iisdx">
+                                <div v-for="wor in issue.wors" :key="wor.wtxt">
+                                    <el-radio :label="wor.wtxt">{{wor.wtxt}}</el-radio>
+                                </div>
+                             </el-radio-group>
+                             <el-checkbox-group v-if="!issue.iisdx">
+                                 <el-radio :label="wor.wtxt" :key="wor.wtxt" v-for="wor in issue.wors">{{wor.wtxt}}</el-radio>
+                             </el-checkbox-group>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <div slot="footer" class="dialog-footer">
+                <el-button @click="visible = false">取 消</el-button>
+                <el-button type="primary" @click="confirm">确 定</el-button>
+            </div>
+        </el-dialog>
+    `,
+    data() {
+        return {
+            visible: false,
+            txt: null,
+            errorMsg: null
+        }
+    },
+    computed: {
+        issues() {
+            if (!this.txt) {
+                return []
+            }
+            let errorMsg = ''
+
+            // 使用正则表达式分割文本为单独的问题
+            // const questionTexts = this.txt.split('\n').map(line => line.trim()).join(); // 每个问题之间用换行符分隔
+            const questionTexts = this.txt.split('\n').map(v => v.trim()).join('\n').split("\n\n")
+            // 初始化问题数组
+            const questions = [];
+            // 遍历每个问题文本
+            questionTexts.forEach((questionText, index) => {
+                // 提取问题编号和题干
+                const match = questionText.trim().split('\n').slice(0, 1).join('').match(/^(?:\d+\.|\d+、)?\s*(.*?)\s*\[(.*题)\]\s*(?:\（(\d+)分\）|\((\d+)分\))?$/);
+                if (match) {
+                    const questionContent = match[1].trim();
+                    const questionType = match[2];
+                    const scoreChinese = match[3];
+                    const scoreEnglish = match[4];
+                    const score = scoreChinese || scoreEnglish;
+
+                    // 题型合法性校验
+                    const validTypes = ['多选题', '单选题'];
+                    if (!validTypes.includes(questionType)) {
+                        console.warn('问题' + (index + 1) + '的题型不合法: ' + questionType);
+                        errorMsg += '\n问题' + (index + 1) + '的题型不合法: ' + questionType;
+                        return;
+                    }
+
+                    // 分数格式校验
+                    if (score) {
+                        const scoreNumber = parseInt(score, 10);
+                        if (isNaN(scoreNumber)) {
+                            console.warn('问题' + (index + 1) + '的分数格式无效: ' + score);
+                            errorMsg += '\n问题' + (index + 1) + '的分数格式无效: ' + score;
+                            return;
+                        }
+                    }
+
+                    // 提取选项
+                    const optionTexts = questionText.replaceAll(match.input, "").split('\n').slice(1).filter(line => line.trim()); // 假设选项从第二行开始
+                    const options = [];
+
+                    optionTexts.forEach(optionText => {
+                        // 使用正则表达式提取选项名称和是否正确
+                        const optionMatch = optionText.match(/^([A-Z])\.?(.+?)\((正确答案|错误答案)\)/);
+                        if (optionMatch) {
+                            const optionName = optionMatch[1] + optionMatch[2].trim();
+                            const isCorrect = optionMatch[3] === '正确答案';
+                            options.push({wtxt: optionName, correct: isCorrect});
+                        } else {
+                            options.push({wtxt: optionText.trim(), correct: false});
+                        }
+                    });
+
+                    // 构建问题对象
+                    const question = {
+                        //是否必答
+                        iisbd: true,
+                        //单选还是多选
+                        iisdx: questionType === '单选题',
+                        //是否随机选项？？？
+                        iisrandom: false,
+                        //题干
+                        iname: questionContent,
+                        //排列方式 没用
+                        iplfs: 1,
+                        //提示
+                        its: null,
+                        //题型 （1 选择题 2 填空题 3 判断题）
+                        itx: (questionType === '单选题' || questionType === '多选题') ? 1 : 3,
+                        //分数
+                        fraction: score,
+                        //选项
+                        wors: options
+                    };
+                    // 添加到问题数组中
+                    questions.push(question);
+                }
+            });
+            this.errorMsg = errorMsg
+            console.log(questions)
+            return questions
+        }
+    },
+    methods: {
+        onOpen() {
+            debugger
+            this.txt = null
+            this.visible = true
+        },
+        async confirm() {
+            if (this.errorMsg) {
+                this.$message.warning('存在不合法的题目，请调整后再提交')
+                return
+            }
+            this.$emit('confirm', this.issues)
+            this.visible = false
+        },
+    }
+}

src/main/resources/views/platform/question/question.html

@@ -302,7 +302,7 @@ layout("/layouts/platform.html"){
                         </el-radio-group>
                     </el-form-item>
 
-                    <el-row :gutter="20" v-if="formData.ctMode==2">
+                    <el-row :gutter="20" v-if="formData.ctMode==2 || formData.ctMode==3">
                         <el-col :span="6">
                             <el-form-item label="单次随机题数" prop="ranDomSingleIssueNum"
                                           :rules="[{required: true, message: '必填', trigger: ['blur', 'change']}]">
@@ -323,6 +323,7 @@ layout("/layouts/platform.html"){
                         </el-col>
                     </el-row>
 
+
                     <el-row :gutter="20"
                             v-if="formData.ctMode!=2 || (formData.ctMode==2 && formData.startTime && formData.endTime && moment(formData.endTime).diff(formData.startTime,'days') >= 1)">
                         <el-col :span="24">
@@ -457,7 +458,8 @@ layout("/layouts/platform.html"){
                     </el-form-item>
 
                     <vi-title2 title="计时设置"></vi-title2>
-                    <el-form-item label="是否开启计时" prop="enableTimer" :rules="[{required: true, message: '必填', trigger: ['blur', 'change']}]">
+                    <el-form-item label="是否开启计时" prop="enableTimer"
+                                  :rules="[{required: true, message: '必填', trigger: ['blur', 'change']}]">
                         <el-radio-group v-model="formData.enableTimer" size="small">
                             <el-radio :label="true" border>是</el-radio>
                             <el-radio :label="false" border>否</el-radio>
@@ -471,7 +473,6 @@ layout("/layouts/platform.html"){
                     </el-form-item>
 
 
-
                     <!--                    <el-form-item label="抽奖时间" prop="raffleTime"-->
                     <!--                                  v-if="formData.isRaffle"-->
                     <!--                                  :rules="[{required: true, message: '必填', trigger: ['blur', 'change']}]">-->
@@ -622,8 +623,9 @@ layout("/layouts/platform.html"){
 
                 <el-row class="mt10 p10" style="border-top: 1px dashed #e5e1e1;" type="flex"
                         justify="center">
+                    <el-button type="primary" @click="openBatchInsert(questionData)">批量添加</el-button>
                     <el-button
-                            type="success"
+                            type="primary"
                             :disabled="questionData.qlx===4 && issueData && issueData.length===1"
                             @click="issueData.push({wors:[{wtxt:'选项1',correct:false},{wtxt:'选项2',correct:false}],itx:1,its:'',iisrandom:false,iisbd:true,iisdx:true,iname:'<p><b>标题</b></p>',iplfs:1})">
                         添加题目
@@ -1066,8 +1068,12 @@ layout("/layouts/platform.html"){
 
     <open-qr-code ref="openQRCode" :url="url"></open-qr-code>
 
+    <batch-insert ref="batchInsertRef" @confirm="batchInsertConfirm"></batch-insert>
+
 </div>
 <script>
+    <!--#include("./components/batchInsert.js"){}#-->
+
     let upTxtEditor
     let cakeEditor
     let vue = new Vue({
@@ -1141,9 +1147,19 @@ layout("/layouts/platform.html"){
             'user-scope': httpVueLoader('/components/plugins/UserScope.vue'),
             'send-msg': httpVueLoader('/components/plugins/SendMsgByGroupId.vue'),
             'drawer-user-scope': httpVueLoader('/components/plugins/DrawerUserScope.vue'),
-            'open-qr-code': httpVueLoader('/components/plugins/OpenQRCode.vue')
+            'open-qr-code': httpVueLoader('/components/plugins/OpenQRCode.vue'),
+            "batch-insert": batchInsert
         },
         methods: {
+            openBatchInsert() {
+                console.log(this.$refs.batchInsertRef)
+                this.$refs.batchInsertRef.onOpen()
+            },
+            batchInsertConfirm(val){
+                this.issueData = this.issueData.concat(val)
+                console.log(val)
+            },
+
             openCakeDesc({$index}) {
                 debugger
                 this.cake_subject_option_index = $index
@@ -1410,7 +1426,7 @@ layout("/layouts/platform.html"){
                 if (this.questionData.qlx === 2) {
                     if (this.issueData.some(v => v.fraction == null || v.fraction === '')) {
                         this.$message.warning('每题都需要设置分数')
-                        return
+                        // return
                     }
                 }