From 068fc7f2e81178e55fa191a13709af64b1a163f6 Mon Sep 17 00:00:00 2001
From: EricsHu <hrr145632>
Date: 星期一, 05 十二月 2022 14:27:43 +0800
Subject: [PATCH] 处理编码
---
src/main/java/com/qxueyou/scc/school/service/impl/InteactService.java | 76 +++++++++++++++++++-------------------
1 files changed, 38 insertions(+), 38 deletions(-)
diff --git a/src/main/java/com/qxueyou/scc/school/service/impl/InteactService.java b/src/main/java/com/qxueyou/scc/school/service/impl/InteactService.java
index 9a28da7..2f7e83d 100644
--- a/src/main/java/com/qxueyou/scc/school/service/impl/InteactService.java
+++ b/src/main/java/com/qxueyou/scc/school/service/impl/InteactService.java
@@ -32,7 +32,7 @@
private InteractDAO interactDAO;
- /** 扩展练习service */
+ /** 鎵╁睍缁冧範service */
@Autowired
private IExerciseService exerciseService;
@@ -41,7 +41,7 @@
}
/**
- * 依赖注入
+ * 渚濊禆娉ㄥ叆
*
* @param interactDAO
*/
@@ -58,7 +58,7 @@
@Override
public Result insertInteract(String interactName, String exerciseTime) {
- // 设置基本字段
+ // 璁剧疆鍩烘湰瀛楁
ExerciseGroup group = new ExerciseGroup();
TraceUtils.setCreateTrace(group);
group.setName(interactName);
@@ -69,7 +69,7 @@
this.exerciseService.saveExerciseGroup(group);
- // 添加组扩展表信息
+ // 娣诲姞缁勬墿灞曡〃淇℃伅
ExerciseGroupExtend extend = new ExerciseGroupExtend();
extend.setGroupId(group.getGroupId());
extend.setExerciseTime(exerciseTime);
@@ -105,7 +105,7 @@
}
@Override
- public Result doStartInteracts(String[] interactIds) {// 激活
+ public Result doStartInteracts(String[] interactIds) {// 婵�娲�
Result result = new Result(true);
@@ -117,7 +117,7 @@
TraceUtils.setUpdateTrace(interact);
save(interact);
}else{
- result = new Result(true,"只有锁定的互动才能激活");
+ result = new Result(true,"鍙湁閿佸畾鐨勪簰鍔ㄦ墠鑳芥縺娲�");
}
}
@@ -137,7 +137,7 @@
TraceUtils.setUpdateTrace(interact);
save(interact);
}else{
- result = new Result(true,"只有锁定和正在互动的互动才能停用");
+ result = new Result(true,"鍙湁閿佸畾鍜屾鍦ㄤ簰鍔ㄧ殑浜掑姩鎵嶈兘鍋滅敤");
}
}
@@ -145,7 +145,7 @@
}
/**
- * 修改互动状态
+ * 淇敼浜掑姩鐘舵��
* @param interactIds
* @param status
* @return
@@ -161,7 +161,7 @@
}*/
/**
- * 新增练习记录
+ * 鏂板缁冧範璁板綍
* @param groupId
* @return
*/
@@ -188,7 +188,7 @@
}
/**
- * 新增练习记录
+ * 鏂板缁冧範璁板綍
* @param groupId
* @return
*/
@@ -202,14 +202,14 @@
}
/**
- * 新增练习记录答案
+ * 鏂板缁冧範璁板綍绛旀
* @return
*/
public Result insertExerciseItemAnswerU(String exerciseId,
String exerciseRecordId, String answers, byte corrects) {
String userId = ClientUtils.getUserId();
- // 组装答案记录
+ // 缁勮绛旀璁板綍
ExerciseItemAnswerU answerU = new ExerciseItemAnswerU();
answerU.setExerciseItemId(exerciseId);
@@ -220,14 +220,14 @@
answerU.setDeleteFlag(false);
TraceUtils.setCreateTrace(answerU);
- // 保存
+ // 淇濆瓨
this.save(answerU);
return new Result(true);
}
/**
- * 更新练习记录答案
+ * 鏇存柊缁冧範璁板綍绛旀
* @return
*/
public Result updateExerciseItemAnswerU(ExerciseItemAnswerU answerU, String answers, byte corrects) {
@@ -235,33 +235,33 @@
answerU.setCorrect(corrects);
TraceUtils.setUpdateTrace(answerU);
- // 保存更新
+ // 淇濆瓨鏇存柊
this.save(answerU);
return new Result(true);
}
/**
- * 操作互动练习答案记录
+ * 鎿嶄綔浜掑姩缁冧範绛旀璁板綍
* @return
*/
@Override
public Result doOperInteractExerciseAnswer(String interactGroupId,
String exerciseId, String answers,byte corrects,String currTitleNumber) {
- // 1.互动组 判断 是否新纪录
+ // 1.浜掑姩缁� 鍒ゆ柇 鏄惁鏂扮邯褰�
String hql = "from ExerciseRecord where deleteFlag is false "
+ "and exerciseGroupId=? and userId=? ";
List<ExerciseRecord> lstRecord = this.find(hql,
CollectionUtils.newList(interactGroupId, ClientUtils.getUserId()), ExerciseRecord.class);
- // 练习记录id
+ // 缁冧範璁板綍id
String exerciseRecordId= "";
if(lstRecord.isEmpty()){
- // 1. 没有 互动组记录 插入一条新数据
+ // 1. 娌℃湁 浜掑姩缁勮褰� 鎻掑叆涓�鏉℃柊鏁版嵁
exerciseRecordId = this.insertExerciseRecord(interactGroupId,currTitleNumber);
}else{
- // 更新题号
+ // 鏇存柊棰樺彿
ExerciseRecord record = lstRecord.get(0);
record.setTitleMaxNumber(currTitleNumber);
updateExerciseRecord(record);
@@ -269,30 +269,30 @@
exerciseRecordId = record.getRecordId();
}
- /*// 判断是否重复提交 已经存在 先删除 再插入
+ /*// 鍒ゆ柇鏄惁閲嶅鎻愪氦 宸茬粡瀛樺湪 鍏堝垹闄� 鍐嶆彃鍏�
hql = "from ExerciseItemAnswerU where deleteFlag is false "
+ "and exerciseItemId=? and userId=? and exerciseRecordId=?";
List<ExerciseItemAnswerU> lstAnswerU = this.find(hql,
CollectionUtils.newList(exerciseId, ClientUtils.getUserId(),exerciseRecordId), ExerciseItemAnswerU.class);
- // 2.已经存在 更新
+ // 2.宸茬粡瀛樺湪 鏇存柊
if(!lstAnswerU.isEmpty()){
- // 答案obj
+ // 绛旀obj
ExerciseItemAnswerU answerU = lstAnswerU.get(0);
return updateExerciseItemAnswerU(answerU, answers, corrects);
}*/
- // 3.不存在 插入
+ // 3.涓嶅瓨鍦� 鎻掑叆
Result result = this.insertExerciseItemAnswerU(exerciseId, exerciseRecordId, answers, corrects);
return result;
}
/**
- * 查询互动练习结果
+ * 鏌ヨ浜掑姩缁冧範缁撴灉
* @param hql
* @param args
* @return
@@ -319,7 +319,7 @@
}
/**
- * 查询互动练习结果
+ * 鏌ヨ浜掑姩缁冧範缁撴灉
* @param hql
* @param args
* @return
@@ -332,7 +332,7 @@
}
/**
- * 操作互动练习答案记录
+ * 鎿嶄綔浜掑姩缁冧範绛旀璁板綍
* @return
*/
@Override
@@ -342,20 +342,20 @@
String exerciseGroupId = resultData.getExerciseGroupId();
String currTitleNumber = resultData.getCurrTitleNum();
- // 1.互动组 判断 是否新纪录
+ // 1.浜掑姩缁� 鍒ゆ柇 鏄惁鏂扮邯褰�
String hql = "from ExerciseRecord where deleteFlag is false "
+ "and exerciseGroupId=? and userId=? ";
List<ExerciseRecord> lstRecord = this.find(hql,
CollectionUtils.newList(exerciseGroupId, ClientUtils.getUserId()), ExerciseRecord.class);
- // 练习记录id
+ // 缁冧範璁板綍id
String exerciseRecordId= "";
if(lstRecord.isEmpty()){
- // 1. 没有 互动组记录 插入一条新数据
+ // 1. 娌℃湁 浜掑姩缁勮褰� 鎻掑叆涓�鏉℃柊鏁版嵁
exerciseRecordId = this.insertExerciseRecord(exerciseGroupId,currTitleNumber);
}else{
- // 更新题号
+ // 鏇存柊棰樺彿
ExerciseRecord record = lstRecord.get(0);
record.setTitleMaxNumber(currTitleNumber);
record.setStatus(ExerciseRecord.STATUS_SUBMIT);
@@ -366,7 +366,7 @@
}
- // 2.保存答案
+ // 2.淇濆瓨绛旀
this.saveInteractExerciseAnswerBatch(resultData.getItems(), exerciseRecordId);
@@ -374,7 +374,7 @@
}
/**
- * 批量保存互动答案
+ * 鎵归噺淇濆瓨浜掑姩绛旀
* @param resultData
* @param exerciseRecordId
* @return
@@ -398,7 +398,7 @@
lstAnswerU.add(answerU);
}
- // 保存结果
+ // 淇濆瓨缁撴灉
this.saveOrUpdateAll(lstAnswerU);
return new Result(true);
@@ -408,19 +408,19 @@
public Result doSubmitInteractResult(String interactGroupId) {
- // 1.互动组 判断 是否新纪录
+ // 1.浜掑姩缁� 鍒ゆ柇 鏄惁鏂扮邯褰�
String hql = "from ExerciseRecord where deleteFlag is false "
+ "and exerciseGroupId=? and userId=? ";
List<ExerciseRecord> lstRecord = this.find(hql,
CollectionUtils.newList(interactGroupId, ClientUtils.getUserId()), ExerciseRecord.class);
- // 练习记录id
+ // 缁冧範璁板綍id
if(lstRecord.isEmpty()){
- // 1. 没有 互动组记录 插入一条新数据
+ // 1. 娌℃湁 浜掑姩缁勮褰� 鎻掑叆涓�鏉℃柊鏁版嵁
this.insertExerciseRecord(interactGroupId,null);
}else{
- // 更新题号
+ // 鏇存柊棰樺彿
ExerciseRecord record = lstRecord.get(0);
record.setStatus(ExerciseRecord.STATUS_SUBMIT);
--
Gitblit v1.8.0