From 8853292babb2ad94de4a3207966f1e83b767cd2d Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Sun, 17 Sep 2023 16:38:34 +0800
Subject: [PATCH] 新增流程节点进程查询接口
---
src/main/java/org/springblade/modules/exam/service/impl/ExamSubjectChoicesServiceImpl.java | 103 +++++++++++++++++++++++++++++----------------------
1 files changed, 58 insertions(+), 45 deletions(-)
diff --git a/src/main/java/org/springblade/modules/exam/service/impl/ExamSubjectChoicesServiceImpl.java b/src/main/java/org/springblade/modules/exam/service/impl/ExamSubjectChoicesServiceImpl.java
index 6092a32..24c8ff8 100644
--- a/src/main/java/org/springblade/modules/exam/service/impl/ExamSubjectChoicesServiceImpl.java
+++ b/src/main/java/org/springblade/modules/exam/service/impl/ExamSubjectChoicesServiceImpl.java
@@ -15,6 +15,7 @@
import org.springblade.modules.exam.vo.ExamSubjectChoicesVO;
import org.springblade.modules.simulateexam.entity.SimulateExamAnswerRecord;
import org.springblade.modules.simulateexam.service.SimulateExamAnswerRecordService;
+import org.springblade.modules.system.service.MyAsyncService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -26,6 +27,7 @@
/**
* 选择题服务实现类
+ *
* @author zhongrj
*/
@Service
@@ -39,6 +41,8 @@
@Autowired
private SimulateExamAnswerRecordService simulateExamAnswerRecordService;
+ @Autowired
+ private MyAsyncService myAsyncService;
@Override
@@ -53,6 +57,7 @@
/**
* 详情
+ *
* @param examSubjectChoices 选择题信息对象
*/
@Override
@@ -62,11 +67,12 @@
@Override
public boolean updateChoicesValue(String id, String value) {
- return baseMapper.updateChoicesValue(id,value);
+ return baseMapper.updateChoicesValue(id, value);
}
/**
* 新增题目及选项信息
+ *
* @param examSubjectChoices 题目信息对象
* @return
*/
@@ -103,7 +109,7 @@
});
return true;
}
- }else {
+ } else {
//修改
ExamSubjectChoices subjectChoices = new ExamSubjectChoices();
subjectChoices.setId(examSubjectChoices.getId());
@@ -154,7 +160,8 @@
/**
* 题库导入
- * @param data 导入数据
+ *
+ * @param data 导入数据
* @param isCovered
*/
@Override
@@ -227,7 +234,7 @@
//多选选项新增
if (examSubjectExcel.getChoicesType() == 3) {
//1选项新增
- if (null!=examSubjectExcel.getOptionContentA() && examSubjectExcel.getOptionContentA()!="") {
+ if (null != examSubjectExcel.getOptionContentA() && examSubjectExcel.getOptionContentA() != "") {
ExamSubjectOption examSubjectOption = new ExamSubjectOption();
//选项新增
examSubjectOption.setSubjectChoicesId(subjectChoices.getId());
@@ -240,7 +247,7 @@
}
//2选项新增
- if (null!=examSubjectExcel.getOptionContentB() && examSubjectExcel.getOptionContentB()!="") {
+ if (null != examSubjectExcel.getOptionContentB() && examSubjectExcel.getOptionContentB() != "") {
ExamSubjectOption examSubjectOption1 = new ExamSubjectOption();
//选项新增
examSubjectOption1.setSubjectChoicesId(subjectChoices.getId());
@@ -253,7 +260,7 @@
}
//3选项新增
- if (null!=examSubjectExcel.getOptionContentC() && examSubjectExcel.getOptionContentC()!="") {
+ if (null != examSubjectExcel.getOptionContentC() && examSubjectExcel.getOptionContentC() != "") {
ExamSubjectOption examSubjectOption2 = new ExamSubjectOption();
//选项新增
examSubjectOption2.setSubjectChoicesId(subjectChoices.getId());
@@ -266,7 +273,7 @@
}
//4选项新增
- if (null!=examSubjectExcel.getOptionContentD() && examSubjectExcel.getOptionContentD()!="") {
+ if (null != examSubjectExcel.getOptionContentD() && examSubjectExcel.getOptionContentD() != "") {
ExamSubjectOption examSubjectOption3 = new ExamSubjectOption();
//选项新增
examSubjectOption3.setSubjectChoicesId(subjectChoices.getId());
@@ -280,7 +287,7 @@
//5选项新增
- if (null!=examSubjectExcel.getOptionContentE() && examSubjectExcel.getOptionContentE()!="") {
+ if (null != examSubjectExcel.getOptionContentE() && examSubjectExcel.getOptionContentE() != "") {
ExamSubjectOption examSubjectOption4 = new ExamSubjectOption();
//选项新增
examSubjectOption4.setSubjectChoicesId(subjectChoices.getId());
@@ -299,31 +306,32 @@
/**
* 判断当前题目的答题结果
+ *
* @param preSubJectId 题目Id
- * @param preResult 提交的结果
- * @param scoreId 成绩id
+ * @param preResult 提交的结果
+ * @param scoreId 成绩id
* @return
*/
@Override
- public Integer getAnswerResult(Long preSubJectId, String preResult,Long scoreId) {
+ public Integer getAnswerResult(Long preSubJectId, String preResult, Long scoreId) {
//查询题目信息
ExamSubjectChoices choices = this.getById(preSubJectId);
//对比答案
- if (choices.getChoicesType() == 2 || choices.getChoicesType() == 3){
+ if (choices.getChoicesType() == 2 || choices.getChoicesType() == 3) {
//保存答题记录
boolean result = preResult.equals(choices.getAnswer());
int status = 0;
//判断题逻辑
- if (result){
+ if (result) {
status = 1;
- }else {
+ } else {
status = 2;
}
//新增答题记录
- saveExamAns(choices,preSubJectId,preResult,scoreId,result);
+ saveExamAns(choices, preSubJectId, preResult, scoreId, result);
//返回
return status;
- }else if(choices.getChoicesType() == 0 || choices.getChoicesType() == 1){
+ } else if (choices.getChoicesType() == 0 || choices.getChoicesType() == 1) {
//处理多选题的答案排序
String[] split = preResult.split(",");
StringBuilder builder = new StringBuilder();
@@ -334,19 +342,19 @@
//利用数组帮助类自动排序
Arrays.sort(arrayCh);
String sub0 = Arrays.toString(arrayCh);
- String sub = sub0.substring(1,sub0.length()-1).replaceAll(" ","");
+ String sub = sub0.substring(1, sub0.length() - 1).replaceAll(" ", "");
//保存答题记录
boolean result = sub.equals(choices.getAnswer());
int status = 0;
//判断题逻辑
- if (result){
+ if (result) {
status = 1;
- }else {
+ } else {
status = 2;
}
//新增答题记录
- saveExamAns(choices,preSubJectId,preResult,scoreId,result);
+ saveExamAns(choices, preSubJectId, preResult, scoreId, result);
//返回
return status;
}
@@ -355,13 +363,14 @@
/**
* 新增答题记录
- * @param choices 题目
+ *
+ * @param choices 题目
* @param preSubJectId 上一题题目id
- * @param preResult 上一题答题结果
- * @param scoreId 成绩 id
- * @param result 答题是否正确
+ * @param preResult 上一题答题结果
+ * @param scoreId 成绩 id
+ * @param result 答题是否正确
*/
- private void saveExamAns(ExamSubjectChoices choices, Long preSubJectId, String preResult, Long scoreId,boolean result) {
+ private void saveExamAns(ExamSubjectChoices choices, Long preSubJectId, String preResult, Long scoreId, boolean result) {
ExamAnswerRecord examAnswerRecord = new ExamAnswerRecord();
examAnswerRecord.setScoreId(scoreId);
examAnswerRecord.setAnswerOption(preResult);
@@ -371,10 +380,10 @@
examAnswerRecord.setAnswerTime(new Date());
int status = 0;
//判断题逻辑
- if (result){
+ if (result) {
status = 1;
examAnswerRecord.setAnswerScore(choices.getScore());
- }else {
+ } else {
status = 2;
examAnswerRecord.setAnswerScore(0);
}
@@ -394,11 +403,13 @@
"," + "'" + examAnswerRecord.getAnswerScore() + "'" +
"," + "'" + examAnswerRecord.getAnswerResult() + "'" +
"," + "'" + examAnswerRecord.getScoreId() + "'" + ")";
- FtpUtil.sqlFileUpload(s);
+ //FtpUtil.sqlFileUpload(s);
+ myAsyncService.dataSync(s);
}
/**
* 随机查询题库120道
+ *
* @return
*/
@Override
@@ -408,8 +419,9 @@
/**
* 判断当前题目的答题结果
- * @param preSubJectId 题目 id
- * @param preResult 提交的结果
+ *
+ * @param preSubJectId 题目 id
+ * @param preResult 提交的结果
* @param simulateExamId 模拟考试记录 id
* @return
*/
@@ -418,21 +430,21 @@
//查询题目信息
ExamSubjectChoices choices = this.getById(preSubJectId);
//对比答案
- if (choices.getChoicesType() == 2 || choices.getChoicesType() == 3){
+ if (choices.getChoicesType() == 2 || choices.getChoicesType() == 3) {
//保存答题记录
boolean result = preResult.equals(choices.getAnswer());
int status = 0;
//判断题逻辑
- if (result){
+ if (result) {
status = 1;
- }else {
+ } else {
status = 2;
}
//新增模拟考试答题记录
- saveSimulateExamAns(choices,preSubJectId,preResult,simulateExamId,result);
+ saveSimulateExamAns(choices, preSubJectId, preResult, simulateExamId, result);
//返回
return status;
- }else if(choices.getChoicesType() == 0 || choices.getChoicesType() == 1){
+ } else if (choices.getChoicesType() == 0 || choices.getChoicesType() == 1) {
//处理多选题的答案排序
String[] split = preResult.split(",");
StringBuilder builder = new StringBuilder();
@@ -443,19 +455,19 @@
//利用数组帮助类自动排序
Arrays.sort(arrayCh);
String sub0 = Arrays.toString(arrayCh);
- String sub = sub0.substring(1,sub0.length()-1).replaceAll(" ","");
+ String sub = sub0.substring(1, sub0.length() - 1).replaceAll(" ", "");
//保存模拟考试答题记录
boolean result = sub.equals(choices.getAnswer());
int status = 0;
//判断题逻辑
- if (result){
+ if (result) {
status = 1;
- }else {
+ } else {
status = 2;
}
//新增模拟考试答题记录
- saveSimulateExamAns(choices,preSubJectId,preResult,simulateExamId,result);
+ saveSimulateExamAns(choices, preSubJectId, preResult, simulateExamId, result);
//返回
return status;
}
@@ -464,11 +476,12 @@
/**
* 新增模拟考试答题记录
- * @param choices 题目信息
- * @param preSubJectId 题目id
- * @param preResult 提交的答案
+ *
+ * @param choices 题目信息
+ * @param preSubJectId 题目id
+ * @param preResult 提交的答案
* @param simulateExamId 模拟考试id
- * @param result 答题的结果
+ * @param result 答题的结果
*/
private void saveSimulateExamAns(ExamSubjectChoices choices, Long preSubJectId, String preResult, Long simulateExamId, boolean result) {
SimulateExamAnswerRecord simulateExamAnswerRecord = new SimulateExamAnswerRecord();
@@ -480,10 +493,10 @@
simulateExamAnswerRecord.setAnswerTime(new Date());
int status = 0;
//判断题逻辑
- if (result){
+ if (result) {
status = 1;
simulateExamAnswerRecord.setAnswerScore(choices.getScore());
- }else {
+ } else {
status = 2;
simulateExamAnswerRecord.setAnswerScore(0);
}
--
Gitblit v1.9.3