From bf13676673e9f0f090a68bd8cfbaefbf0d696d32 Mon Sep 17 00:00:00 2001
From: EricsHu <hrr145632>
Date: 星期日, 26 十一月 2023 13:03:00 +0800
Subject: [PATCH] 讨论区关键字过滤、首页班级显示班级信息
---
src/main/java/com/qxueyou/scc/exercise/action/ExerciseExtendController.java | 460 ++++++++++++++++++++++++++++----------------------------
1 files changed, 230 insertions(+), 230 deletions(-)
diff --git a/src/main/java/com/qxueyou/scc/exercise/action/ExerciseExtendController.java b/src/main/java/com/qxueyou/scc/exercise/action/ExerciseExtendController.java
index 5774e78..4afb954 100644
--- a/src/main/java/com/qxueyou/scc/exercise/action/ExerciseExtendController.java
+++ b/src/main/java/com/qxueyou/scc/exercise/action/ExerciseExtendController.java
@@ -34,81 +34,81 @@
import com.qxueyou.scc.exercise.service.IExerciseExtendService;
/**
- * 练习扩展控制
- * 如收藏 错题 笔记
+ * 缁冧範鎵╁睍鎺у埗
+ * 濡傛敹钘� 閿欓 绗旇
* @author zhiyong
*
*/
@Controller
@RequestMapping(value = "/exercise/Extend")
public class ExerciseExtendController {
- /** 日志 */
+ /** 鏃ュ織 */
private static final Logger log = LogManager.getLogger("ExerciseExtendController");
/** commonDAO */
@Autowired
private CommonDAO commonDAO;
- /** 练习扩展service */
+ /** 缁冧範鎵╁睍service */
@Autowired
private IExerciseExtendService exerciseExtendService;
- /**-----------------------------------------APP V2.0 接口 start----------------------------------------------------------- */
+ /**-----------------------------------------APP V2.0 鎺ュ彛 start----------------------------------------------------------- */
/**
- * APP2.0: 查询错题本ListItem
+ * APP2.0: 鏌ヨ閿欓鏈琇istItem
* URL: /exercise/Extend/faultList
*
- * 请求参数={
- subjectId:课程id，//可选，用于高校版
- exerType:练习类型,//必传
- page:当前页,//必传,大于0
- limit:每页限制条数,//必传,大于0
+ * 璇锋眰鍙傛暟={
+ subjectId:璇剧▼id锛�//鍙�夛紝鐢ㄤ簬楂樻牎鐗�
+ exerType:缁冧範绫诲瀷,//蹇呬紶
+ page:褰撳墠椤�,//蹇呬紶,澶т簬0
+ limit:姣忛〉闄愬埗鏉℃暟,//蹇呬紶,澶т簬0
}
- 返回参数=[
+ 杩斿洖鍙傛暟=[
{
- "groupId":"组id",
- "classId":班级id,
- "courseId":科目id,
- "orgId":机构id,
- "subjectId":课程id,
- "name":"组名",
- "type":组类型 ,
- "updateTime":更新时间,
- "answerUpdateTime":本套题答题更新时间,
- "allCount":题目总数,
- "exerciseTime":"考试时间",
- "exerciseRecordId":"记录id",
- "doCount": 做题个数,
- "correctCount": 正确个数,
- "submitNumber":已提交人数(家庭作业),
- "currTitleNumber":当前做题序号,
- "status":做题状态(0：未提交 1：已提交),
- "completionRate": 完成率,
- "accuracy": 正确率,
- "score": 分数,
- "extendAllCount":错题本、收藏本总数
+ "groupId":"缁刬d",
+ "classId":鐝骇id,
+ "courseId":绉戠洰id,
+ "orgId":鏈烘瀯id,
+ "subjectId":璇剧▼id,
+ "name":"缁勫悕",
+ "type":缁勭被鍨� ,
+ "updateTime":鏇存柊鏃堕棿,
+ "answerUpdateTime":鏈棰樼瓟棰樻洿鏂版椂闂�,
+ "allCount":棰樼洰鎬绘暟,
+ "exerciseTime":"鑰冭瘯鏃堕棿",
+ "exerciseRecordId":"璁板綍id",
+ "doCount": 鍋氶涓暟,
+ "correctCount": 姝ｇ‘涓暟,
+ "submitNumber":宸叉彁浜や汉鏁�(瀹跺涵浣滀笟),
+ "currTitleNumber":褰撳墠鍋氶搴忓彿,
+ "status":鍋氶鐘舵��(0锛氭湭鎻愪氦 1锛氬凡鎻愪氦),
+ "completionRate": 瀹屾垚鐜�,
+ "accuracy": 姝ｇ‘鐜�,
+ "score": 鍒嗘暟,
+ "extendAllCount":閿欓鏈�佹敹钘忔湰鎬绘暟
},
- ...循环多个
+ ...寰幆澶氫釜
]
*
* @return
*/
@RequestMapping(value = "faultList", method = RequestMethod.GET)
public @ResponseBody List<ExerGroupResponseData> queryFaultList(
- @RequestParam(value="exerType") int exerType,// 0 表示全部错题
+ @RequestParam(value="exerType") int exerType,// 0 琛ㄧず鍏ㄩ儴閿欓
@RequestParam(value="subjectId", required = false) String subjectId,
@RequestParam(value="page", required = false) Integer page,
@RequestParam(value="limit", required = false) Integer limit) {
- // 得到分页数据
+ // 寰楀埌鍒嗛〉鏁版嵁
Pager pager = getPager(page, limit);
- // 查询结果
+ // 鏌ヨ缁撴灉
List<ExerGroupResponseData> lstResult = exerciseExtendService.
queryExerciseFaultListData(exerType, null, pager);
- if(null == lstResult){// 结果转换成 []
+ if(null == lstResult){// 缁撴灉杞崲鎴� []
lstResult = new ArrayList<ExerGroupResponseData>();
}
@@ -116,26 +116,26 @@
}
/**
- * APP2.0: 查询收藏本ListItem
+ * APP2.0: 鏌ヨ鏀惰棌鏈琇istItem
* URL: /exercise/Extend/favorList
*
* @return
*/
@RequestMapping(value = "favorList", method = RequestMethod.GET)
public @ResponseBody List<ExerGroupResponseData> queryFavorList(
- @RequestParam(value="exerType") int exerType,// 0全部收藏
+ @RequestParam(value="exerType") int exerType,// 0鍏ㄩ儴鏀惰棌
@RequestParam(value="subjectId", required = false) String subjectId,
@RequestParam(value="page", required = false) Integer page,
@RequestParam(value="limit", required = false) Integer limit) {
- // 得到分页数据
+ // 寰楀埌鍒嗛〉鏁版嵁
Pager pager = getPager(page, limit);
- // 查询结果
+ // 鏌ヨ缁撴灉
List<ExerGroupResponseData> lstResult = exerciseExtendService.
queryExerciseFavorListData(exerType, null, pager);
- if(null == lstResult){// 结果转换成 []
+ if(null == lstResult){// 缁撴灉杞崲鎴� []
lstResult = new ArrayList<ExerGroupResponseData>();
}
@@ -144,25 +144,25 @@
/**
- * APP2.0: 获取错题练习题目数据
+ * APP2.0: 鑾峰彇閿欓缁冧範棰樼洰鏁版嵁
* URL: /exercise/Exercise/faultExercise
- * @param groupId 组id
- * @param exerciseRecordId 练习记录id
+ * @param groupId 缁刬d
+ * @param exerciseRecordId 缁冧範璁板綍id
* @return
*/
@RequestMapping(value = "faultExercise", method = RequestMethod.GET)
public @ResponseBody ExerItemResponseData getFaultExerciseData(
@RequestParam(value = "groupId") String groupId) {
- // 查询结果
+ // 鏌ヨ缁撴灉
ExerItemResponseData resultData = exerciseExtendService.queryExerciseFaultData(groupId);
return resultData;
}
/**
- * 查询多套题收藏题目
- * @param groupId 格式"111,222,333...."
+ * 鏌ヨ澶氬棰樻敹钘忛鐩�
+ * @param groupId 鏍煎紡"111,222,333...."
* @return
*/
@RequestMapping(value = "faultMutiExercise", method = RequestMethod.GET)
@@ -180,12 +180,12 @@
for(String exerGroupId:groupIds){
try{
- // 查询结果
+ // 鏌ヨ缁撴灉
resultDataLst.add(exerciseExtendService.queryExerciseMutiFaultData(exerGroupId));
}catch(Exception e){
- log.error("查询多套题faultMutiExercise结果失败，groupId="+exerGroupId,e);
+ log.error("鏌ヨ澶氬棰榝aultMutiExercise缁撴灉澶辫触锛実roupId="+exerGroupId,e);
}
}
@@ -217,7 +217,7 @@
}
/**
- * APP2.0: 获取全部错题练习题目数据
+ * APP2.0: 鑾峰彇鍏ㄩ儴閿欓缁冧範棰樼洰鏁版嵁
* URL: /exercise/Extend/allFaultExercise
* @return
*/
@@ -226,103 +226,103 @@
@RequestParam(value="limit", required = false) Integer limit,
@RequestParam(value="page", required = false) Integer page) {
- // 得到分页数据
+ // 寰楀埌鍒嗛〉鏁版嵁
Pager pager = getPager(page, limit);
- // 查询结果
+ // 鏌ヨ缁撴灉
ExerItemResponseData resultData = exerciseExtendService.queryAllExerciseFaultData(pager);
return resultData;
}
/**
- * APP2.0: 获取收藏练习题目数据
+ * APP2.0: 鑾峰彇鏀惰棌缁冧範棰樼洰鏁版嵁
* URL: /exercise/Exercise/favorExercise
*
- 返回数据={
- "items":[// 题目集合
+ 杩斿洖鏁版嵁={
+ "items":[// 棰樼洰闆嗗悎
{
- "exerciseId":练习id,
+ "exerciseId":缁冧範id,
"chapterId":null,
"lessonId":null,
- "title":标题,
- "type":题目类型,
- "answer":正确答案,
+ "title":鏍囬,
+ "type":棰樼洰绫诲瀷,
+ "answer":姝ｇ‘绛旀,
"options":[
{
- "optionId":选项id,
+ "optionId":閫夐」id,
"checked":true,
- "content":内容,
- "optionOrder":题目序号,
- "exerciseItemId":"练习id",
+ "content":鍐呭,
+ "optionOrder":棰樼洰搴忓彿,
+ "exerciseItemId":"缁冧範id",
"imgs":[
{
- "imgId":"图片id",
+ "imgId":"鍥剧墖id",
"exerciseObjectId":null,
- "imgPath":图片路径,
- "imgOrder":排序,
- "objectType":图片类型 1：题目 2：选项
+ "imgPath":鍥剧墖璺緞,
+ "imgOrder":鎺掑簭,
+ "objectType":鍥剧墖绫诲瀷 1锛氶鐩� 2锛氶�夐」
},
- ... 循环多个
+ ... 寰幆澶氫釜
]
},
- ... 循环多个
+ ... 寰幆澶氫釜
],
"scores":null,
"itemNo":null,
"analisisResult":{
- "allAccuracy":全站统计 正确率,
- "analysis":"解析",
- "submitAllNumber":全站 提交总数,
- "usualFaultAnswers":易错题,
+ "allAccuracy":鍏ㄧ珯缁熻 姝ｇ‘鐜�,
+ "analysis":"瑙ｆ瀽",
+ "submitAllNumber":鍏ㄧ珯 鎻愪氦鎬绘暟,
+ "usualFaultAnswers":鏄撻敊棰�,
"exerciseAnalisisUId":null,
- "accuracy":个人统计 正确率,
- "submitNumber":个人统计 提交总数,
- "submitErrorNumber":个人统计 提交错误总数,
+ "accuracy":涓汉缁熻 姝ｇ‘鐜�,
+ "submitNumber":涓汉缁熻 鎻愪氦鎬绘暟,
+ "submitErrorNumber":涓汉缁熻 鎻愪氦閿欒鎬绘暟,
},
"imgs":[
{
- "imgId":"图片id",
+ "imgId":"鍥剧墖id",
"exerciseObjectId":null,
- "imgPath":图片路径,
- "imgOrder":排序,
- "objectType":图片类型 1：题目 2：选项
+ "imgPath":鍥剧墖璺緞,
+ "imgOrder":鎺掑簭,
+ "objectType":鍥剧墖绫诲瀷 1锛氶鐩� 2锛氶�夐」
},
- ... 循环多个
+ ... 寰幆澶氫釜
],
"commentFlag": null,
}
],
- "answers":[// 个人答案集合
+ "answers":[// 涓汉绛旀闆嗗悎
{
- "answerUId":"主键id",
- "answer":选择答案 如：多选为(A,B,C),
+ "answerUId":"涓婚敭id",
+ "answer":閫夋嫨绛旀 濡傦細澶氶�変负(A,B,C),
"correct":0,
- "exerciseItemId":练习id,
- "exerciseRecordId":记录id,
- "userId":用户id
+ "exerciseItemId":缁冧範id,
+ "exerciseRecordId":璁板綍id,
+ "userId":鐢ㄦ埛id
},
- ... 循环多个
+ ... 寰幆澶氫釜
]
}
*
- * @param groupId 组id
- * @param exerciseRecordId 练习记录id
+ * @param groupId 缁刬d
+ * @param exerciseRecordId 缁冧範璁板綍id
* @return
*/
@RequestMapping(value = "favorExercise", method = RequestMethod.GET)
public @ResponseBody ExerItemResponseData getFavorExerciseData(
@RequestParam(value = "groupId") String groupId) {
- // 查询结果
+ // 鏌ヨ缁撴灉
ExerItemResponseData resultData = exerciseExtendService.queryExerciseFavorData(groupId);
return resultData;
}
/**
- * 查询多套题收藏题目
- * @param groupId 格式"111,222,333...."
+ * 鏌ヨ澶氬棰樻敹钘忛鐩�
+ * @param groupId 鏍煎紡"111,222,333...."
* @return
*/
@RequestMapping(value = "favorMutiExercise", method = RequestMethod.GET)
@@ -340,12 +340,12 @@
for(String exerGroupId:groupIds){
try{
- // 查询结果
+ // 鏌ヨ缁撴灉
resultDataLst.add(exerciseExtendService.queryExerciseMutiFavorData(exerGroupId));
}catch(Exception e){
- log.error("查询多套题favorMutiExercise结果失败，groupId="+exerGroupId,e);
+ log.error("鏌ヨ澶氬棰榝avorMutiExercise缁撴灉澶辫触锛実roupId="+exerGroupId,e);
}
}
@@ -355,7 +355,7 @@
/**
- * APP2.0: 获取全部收藏练习题目数据
+ * APP2.0: 鑾峰彇鍏ㄩ儴鏀惰棌缁冧範棰樼洰鏁版嵁
* URL: /exercise/Exercise/allFavorExercise
* @return
*/
@@ -364,26 +364,26 @@
@RequestParam(value="limit", required = false) Integer limit,
@RequestParam(value="page", required = false) Integer page) {
- // 得到分页数据
+ // 寰楀埌鍒嗛〉鏁版嵁
Pager pager = getPager(page, limit);
- // 查询结果
+ // 鏌ヨ缁撴灉
ExerItemResponseData resultData = exerciseExtendService.queryAllExerciseFavorData(pager);
return resultData;
}
/**
- * APP2.0: 提交错题本的记录到DB
+ * APP2.0: 鎻愪氦閿欓鏈殑璁板綍鍒癉B
* URL: /exercise/Extend/submitFaultData
*
- * 返回数据={
- "exerciseGroupType": 练习类型,
- "exerciseGroupId": 练习组id,
+ * 杩斿洖鏁版嵁={
+ "exerciseGroupType": 缁冧範绫诲瀷,
+ "exerciseGroupId": 缁冧範缁刬d,
"items":[
{
- "exerciseId": 练习id,
- "flag": 状态, // (true:添加 false:移除)
+ "exerciseId": 缁冧範id,
+ "flag": 鐘舵��, // (true:娣诲姞 false:绉婚櫎)
},
.....
@@ -402,7 +402,7 @@
try {
ObjectMapper mapper = new ObjectMapper();
- // 装换json到对象
+ // 瑁呮崲json鍒板璞�
ExciseExtendReqData recordResult = mapper.readValue(records, ExciseExtendReqData.class);
List<ExerciseExtendRecordData> lstRecords = recordResult.getItems();
@@ -410,7 +410,7 @@
return result;
}
- // 提交结果
+ // 鎻愪氦缁撴灉
Map<String,Object> resultMap = exerciseExtendService.doOperExerciseFaultRecordData(null, recordResult);
result.setResult(true);
result.setData(resultMap);
@@ -425,16 +425,16 @@
/**
- * APP2.0: 提交错题本的记录到DB
+ * APP2.0: 鎻愪氦閿欓鏈殑璁板綍鍒癉B
* URL: /exercise/Extend/submitFaultData
*
- * 返回数据={
- "exerciseGroupType": 练习类型,
- "exerciseGroupId": 练习组id,
+ * 杩斿洖鏁版嵁={
+ "exerciseGroupType": 缁冧範绫诲瀷,
+ "exerciseGroupId": 缁冧範缁刬d,
"items":[
{
- "exerciseId": 练习id,
- "flag": 状态, // (true:添加 false:移除)
+ "exerciseId": 缁冧範id,
+ "flag": 鐘舵��, // (true:娣诲姞 false:绉婚櫎)
},
.....
@@ -456,14 +456,14 @@
try {
ObjectMapper mapper = new ObjectMapper();
- // 装换json到对象
+ // 瑁呮崲json鍒板璞�
ExciseExtendReqListData recordData = mapper.readValue(records, ExciseExtendReqListData.class);
//String subjectId = recordData.getSubjectId();
List<ExciseExtendReqData> recordResults = recordData.getDatas();
resultList = new ArrayList<Map<String,Object>>(recordResults.size());
- // 循环记录
+ // 寰幆璁板綍
List<ExerciseExtendRecordData> lstRecords = null;
for(ExciseExtendReqData recordResult:recordResults){
@@ -473,7 +473,7 @@
continue;
}
- // 提交结果
+ // 鎻愪氦缁撴灉
returnMap = exerciseExtendService.doOperExerciseFaultRecordData(null, recordResult);
resultList.add(returnMap);
@@ -481,9 +481,9 @@
resultMap.put("success", true);
resultMap.put("attrs", resultList);
- resultMap.put("msg", "提交成功");
+ resultMap.put("msg", "鎻愪氦鎴愬姛");
} catch (Exception e) {
- resultMap.put("msg", "提交失败");
+ resultMap.put("msg", "鎻愪氦澶辫触");
log.error(e);
}
@@ -491,10 +491,10 @@
}
/**
- * APP2.0: 提交收藏本的记录到DB
+ * APP2.0: 鎻愪氦鏀惰棌鏈殑璁板綍鍒癉B
* URL: /exercise/Extend/submitFavorData
*
- * @param records json字符串
+ * @param records json瀛楃涓�
* @return
*/
@RequestMapping(value = "submitFavorData", method = RequestMethod.POST)
@@ -505,7 +505,7 @@
Result result = new Result(false);
try {
ObjectMapper mapper = new ObjectMapper();
- // 装换json到对象
+ // 瑁呮崲json鍒板璞�
ExciseExtendReqData recordResult = mapper.readValue(records, ExciseExtendReqData.class);
List<ExerciseExtendRecordData> lstRecords = recordResult.getItems();
@@ -513,7 +513,7 @@
return result;
}
- // 提交结果
+ // 鎻愪氦缁撴灉
Map<String,Object> resultMap = exerciseExtendService.doOperExerciseFavorRecordData(null, recordResult);
result.setResult(true);
result.setData(resultMap);
@@ -528,10 +528,10 @@
/**
- * APP2.0: 提交收藏本的记录到DB
+ * APP2.0: 鎻愪氦鏀惰棌鏈殑璁板綍鍒癉B
* URL: /exercise/Extend/submitFavorData
*
- * @param records json字符串
+ * @param records json瀛楃涓�
* @return
*/
@RequestMapping(value = "submitFavorMutiData", method = RequestMethod.POST)
@@ -547,14 +547,14 @@
ObjectMapper mapper = new ObjectMapper();
- // 装换json到对象
+ // 瑁呮崲json鍒板璞�
ExciseExtendReqListData recordData = mapper.readValue(records, ExciseExtendReqListData.class);
//String subjectId = recordData.getSubjectId();
List<ExciseExtendReqData> recordResults = recordData.getDatas();
resultList = new ArrayList<Map<String,Object>>(recordResults.size());
- // 循环记录
+ // 寰幆璁板綍
List<ExerciseExtendRecordData> lstRecords = null;
for(ExciseExtendReqData recordResult:recordResults){
@@ -564,14 +564,14 @@
continue;
}
- // 提交结果
+ // 鎻愪氦缁撴灉
returnMap = exerciseExtendService.doOperExerciseFavorRecordData(null, recordResult);
resultList.add(returnMap);
}
resultMap.put("success", true);
resultMap.put("attrs", resultList);
- resultMap.put("msg", "提交成功");
+ resultMap.put("msg", "鎻愪氦鎴愬姛");
} catch (Exception e) {
log.error(e);
@@ -581,8 +581,8 @@
}
/**
- * 获得多套题答案
- * @param groupId 格式"111,222,333...."
+ * 鑾峰緱澶氬棰樼瓟妗�
+ * @param groupId 鏍煎紡"111,222,333...."
* @return
*/
@RequestMapping(value = "getExtendAnswers", method = RequestMethod.GET)
@@ -602,13 +602,13 @@
for(String exerGroupId:groupIds){
try{
- if(Constants.EXERCISE_TYPE_FAULT.equals(exerciseType)){// 错题本
+ if(Constants.EXERCISE_TYPE_FAULT.equals(exerciseType)){// 閿欓鏈�
- // 查询结果
+ // 鏌ヨ缁撴灉
resultDataLst.add(exerciseExtendService.queryExerciseFaultAnswerData(exerGroupId));
- }else if(Constants.EXERCISE_TYPE_FAVORT.equals(exerciseType)){// 收藏
- // 查询结果
+ }else if(Constants.EXERCISE_TYPE_FAVORT.equals(exerciseType)){// 鏀惰棌
+ // 鏌ヨ缁撴灉
resultDataLst.add(exerciseExtendService.queryExerciseFavorAnswerData(exerGroupId));
}else{
return null;
@@ -616,7 +616,7 @@
}catch(Exception e){
- log.error("获得多套题答案getExtendAnswers结果失败，groupId="+exerGroupId,e);
+ log.error("鑾峰緱澶氬棰樼瓟妗坓etExtendAnswers缁撴灉澶辫触锛実roupId="+exerGroupId,e);
}
}
@@ -625,40 +625,40 @@
/**
- * APP2.0: 提交练习答案
+ * APP2.0: 鎻愪氦缁冧範绛旀
* URL: /exercise/Extend/exerExtendAnswers
*
- * 请求数据= answers={
- "exerciseGroupId": 组id,
- "exerciseRecordId": 记录id,
+ * 璇锋眰鏁版嵁= answers={
+ "exerciseGroupId": 缁刬d,
+ "exerciseRecordId": 璁板綍id,
"exerciseExtendId": null,
- "currTitleNum": "当前题号",
- "status": 状态,
- "type": 练习类型,// 整型
- "doCount": 练习类型,
- "correctCount": 正确个数,
- "allCount":题目总数,
+ "currTitleNum": "褰撳墠棰樺彿",
+ "status": 鐘舵��,
+ "type": 缁冧範绫诲瀷,// 鏁村瀷
+ "doCount": 缁冧範绫诲瀷,
+ "correctCount": 姝ｇ‘涓暟,
+ "allCount":棰樼洰鎬绘暟,
"items": [
{
- "exerciseId": "练习id",
- "type": 练习类型,// 整数型
- "answer": "选择答案",
- "correct": 是否正确(0:错误 1：正确 2:未知)
+ "exerciseId": "缁冧範id",
+ "type": 缁冧範绫诲瀷,// 鏁存暟鍨�
+ "answer": "閫夋嫨绛旀",
+ "correct": 鏄惁姝ｇ‘(0:閿欒 1锛氭纭� 2:鏈煡)
},
{
- "exerciseId": "练习id",
- "type": 练习类型,
- "answer": "选择答案",
- "correct": 是否正确(0:错误 1：正确 2:未知)
+ "exerciseId": "缁冧範id",
+ "type": 缁冧範绫诲瀷,
+ "answer": "閫夋嫨绛旀",
+ "correct": 鏄惁姝ｇ‘(0:閿欒 1锛氭纭� 2:鏈煡)
}
]
}
- 返回数据= {"success":true,//true:成功 false:失败
- "attrs":{"exerciseRecordId":练习记录id,
- "updateTime":修改时间
+ 杩斿洖鏁版嵁= {"success":true,//true:鎴愬姛 false:澶辫触
+ "attrs":{"exerciseRecordId":缁冧範璁板綍id,
+ "updateTime":淇敼鏃堕棿
},
- "msg":"提交成功",//结果信息
+ "msg":"鎻愪氦鎴愬姛",//缁撴灉淇℃伅
}
*
* @param answers
@@ -667,21 +667,21 @@
@RequestMapping(value = "exerExtendAnswers", method = RequestMethod.POST)
public @ResponseBody Result doSubmitExerExtendAnswer(
@RequestParam(value = "answers") String answers) {
- // 用户本次做题提交的数据
+ // 鐢ㄦ埛鏈鍋氶鎻愪氦鐨勬暟鎹�
Result result = new Result(false);
String initExerciseRecordId = "";
try {
ObjectMapper mapper = new ObjectMapper();
- // 装换json到对象
+ // 瑁呮崲json鍒板璞�
ExerciseSubmitAnswerData answerResult = mapper.readValue(answers, ExerciseSubmitAnswerData.class);
- // 1.---------记录提交的数据日志
- // 记录id
+ // 1.---------璁板綍鎻愪氦鐨勬暟鎹棩蹇�
+ // 璁板綍id
initExerciseRecordId = answerResult.getExerciseRecordId();
if(answerResult.getItems().isEmpty()
&& !ExerciseRecord.STATUS_SUBMIT.equals(answerResult.getStatus())
- && answerResult.getSubmitType() != 1){// 提交状态
+ && answerResult.getSubmitType() != 1){// 鎻愪氦鐘舵��
exerciseExtendService.doSaveExerciseDataSubmitLog(answers,
initExerciseRecordId, ExerciseDataSubmitLog.TYPE_SUBMIT_EXTEND_ANSWER,
@@ -690,7 +690,7 @@
return result;
}
- // 2.提交答案
+ // 2.鎻愪氦绛旀
result = exerciseExtendService.doSubmitExerciseAnswerData(answerResult);
int status = 0;
@@ -700,13 +700,13 @@
status = ExerciseDataSubmitLog.STATUS_FAILED;
}
- // 记录提交的数据日志
+ // 璁板綍鎻愪氦鐨勬暟鎹棩蹇�
String exerciseDataLogId = exerciseExtendService.doSaveExerciseDataSubmitLog(answers,
initExerciseRecordId, ExerciseDataSubmitLog.TYPE_SUBMIT_EXTEND_ANSWER,
status,"/exercise/Extend/exerExtendAnswers");
if(StringUtils.isBlank(initExerciseRecordId)
- && result.getData("exerciseRecordId") != null){// 为空 说明第一次提交 更新日志记录id
+ && result.getData("exerciseRecordId") != null){// 涓虹┖ 璇存槑绗竴娆℃彁浜� 鏇存柊鏃ュ織璁板綍id
exerciseExtendService.doUpdateExerciseDataSubmitLog(exerciseDataLogId,
String.valueOf(result.getData("exerciseRecordId")));
@@ -716,7 +716,7 @@
result = new Result(false);
log.error(e);
- // 记录提交的数据日志
+ // 璁板綍鎻愪氦鐨勬暟鎹棩蹇�
exerciseExtendService.doSaveExerciseDataSubmitLog(answers,
initExerciseRecordId, ExerciseDataSubmitLog.TYPE_SUBMIT_EXTEND_ANSWER,
ExerciseDataSubmitLog.STATUS_FAILED,"/exercise/Extend/exerExtendAnswers");
@@ -727,40 +727,40 @@
/**
- * APP2.0: 提交练习答案
+ * APP2.0: 鎻愪氦缁冧範绛旀
* URL: /exercise/Extend/exerExtendMutiAnswers
*
- * 请求数据= answers=[{
- "exerciseGroupId": 组id,
- "exerciseRecordId": 记录id,
+ * 璇锋眰鏁版嵁= answers=[{
+ "exerciseGroupId": 缁刬d,
+ "exerciseRecordId": 璁板綍id,
"exerciseExtendId": null,
- "currTitleNum": "当前题号",
- "status": 状态,
- "type": 练习类型,// 整型
- "doCount": 练习类型,
- "correctCount": 正确个数,
- "allCount":题目总数,
+ "currTitleNum": "褰撳墠棰樺彿",
+ "status": 鐘舵��,
+ "type": 缁冧範绫诲瀷,// 鏁村瀷
+ "doCount": 缁冧範绫诲瀷,
+ "correctCount": 姝ｇ‘涓暟,
+ "allCount":棰樼洰鎬绘暟,
"items": [
{
- "exerciseId": "练习id",
- "type": 练习类型,// 整数型
- "answer": "选择答案",
- "correct": 是否正确(0:错误 1：正确 2:未知)
+ "exerciseId": "缁冧範id",
+ "type": 缁冧範绫诲瀷,// 鏁存暟鍨�
+ "answer": "閫夋嫨绛旀",
+ "correct": 鏄惁姝ｇ‘(0:閿欒 1锛氭纭� 2:鏈煡)
},
{
- "exerciseId": "练习id",
- "type": 练习类型,
- "answer": "选择答案",
- "correct": 是否正确(0:错误 1：正确 2:未知)
+ "exerciseId": "缁冧範id",
+ "type": 缁冧範绫诲瀷,
+ "answer": "閫夋嫨绛旀",
+ "correct": 鏄惁姝ｇ‘(0:閿欒 1锛氭纭� 2:鏈煡)
}
]
}]
- 返回数据= {"success":true,//true:成功 false:失败
- "attrs":{"exerciseRecordId":练习记录id,
- "updateTime":修改时间
+ 杩斿洖鏁版嵁= {"success":true,//true:鎴愬姛 false:澶辫触
+ "attrs":{"exerciseRecordId":缁冧範璁板綍id,
+ "updateTime":淇敼鏃堕棿
},
- "msg":"提交成功",//结果信息
+ "msg":"鎻愪氦鎴愬姛",//缁撴灉淇℃伅
}
*
* @param answers
@@ -769,21 +769,21 @@
@RequestMapping(value = "exerExtendMutiAnswers", method = RequestMethod.POST)
public @ResponseBody Object doSubmitExerExtendMutiAnswer(
@RequestParam(value = "answers") String answers) {
- // 用户本次做题提交的数据
+ // 鐢ㄦ埛鏈鍋氶鎻愪氦鐨勬暟鎹�
Map<String,Object> resultMap = new HashMap<String,Object>(2);
resultMap.put("success", false);
resultMap.put("attrs", null);
try {
ObjectMapper mapper = new ObjectMapper();
- // 装换json到对象
+ // 瑁呮崲json鍒板璞�
ExerciseSubmitAnswerDataList answerDataList = mapper.readValue(answers, ExerciseSubmitAnswerDataList.class);
- // 提交答案
+ // 鎻愪氦绛旀
resultMap = exerciseExtendService.doSubmitMutiExerciseAnswerData(answerDataList);
} catch (Exception e) {
log.error(e);
- resultMap.put("msg", "提交练习答案请求异常");
+ resultMap.put("msg", "鎻愪氦缁冧範绛旀璇锋眰寮傚父");
exerciseExtendService.doSaveExerciseDataSubmitLog(answers,
"exerExtendMutiAnswers", ExerciseDataSubmitLog.TYPE_SUBMIT_EXTEND_ANSWER,
@@ -794,29 +794,29 @@
}
/**
- * APP2.0: app端重新开始做题 更新状态
+ * APP2.0: app绔噸鏂板紑濮嬪仛棰� 鏇存柊鐘舵��
* URL: /exercise/Extend/updateNewExerRecordNew
*
- * @param groupId 习题组ID 如果为All时，表示全部错题
+ * @param groupId 涔犻缁処D 濡傛灉涓篈ll鏃讹紝琛ㄧず鍏ㄩ儴閿欓
* @return
*/
@RequestMapping(value = "updateNewExerRecordNew", method = RequestMethod.GET)
public @ResponseBody Result doUpdateExerItemNumber(
- @RequestParam(value = "groupId") String groupId,// 习题组ID 如果为All时，表示全部错题、全部收藏
+ @RequestParam(value = "groupId") String groupId,// 涔犻缁処D 濡傛灉涓篈ll鏃讹紝琛ㄧず鍏ㄩ儴閿欓銆佸叏閮ㄦ敹钘�
@RequestParam(value = "exerciseType") String exerciseType) {
Map<String,Object> map = null;
- Result result = new Result(true, "状态更新成功");
- if(Constants.EXERCISE_TYPE_FAULT.equals(exerciseType)){// 错题本
+ Result result = new Result(true, "鐘舵�佹洿鏂版垚鍔�");
+ if(Constants.EXERCISE_TYPE_FAULT.equals(exerciseType)){// 閿欓鏈�
map = exerciseExtendService.doUpdateFaultExerRecordNew(groupId);
- }else if(Constants.EXERCISE_TYPE_FAVORT.equals(exerciseType)){// 收藏
+ }else if(Constants.EXERCISE_TYPE_FAVORT.equals(exerciseType)){// 鏀惰棌
map = exerciseExtendService.doUpdateFavortExerRecordNew(groupId);
}else{
- result = new Result(false, "exerciseType传值错误：exerciseType="+exerciseType);
+ result = new Result(false, "exerciseType浼犲�奸敊璇細exerciseType="+exerciseType);
}
result.setData(map);
@@ -825,29 +825,29 @@
}
/**
- * APP2.0: 更新练习作业题号 app端重新开始做题
+ * APP2.0: 鏇存柊缁冧範浣滀笟棰樺彿 app绔噸鏂板紑濮嬪仛棰�
* URL: /exercise/Extend/updateExerciseRecord
*
- * @param groupId 习题组ID
+ * @param groupId 涔犻缁処D
* @return
*/
@RequestMapping(value = "updateExerciseRecord", method = RequestMethod.GET)
public @ResponseBody Result doUpdateExerciseRecord(
- @RequestParam(value = "groupId") String groupId,// all 表示全部错误或收藏
+ @RequestParam(value = "groupId") String groupId,// all 琛ㄧず鍏ㄩ儴閿欒鎴栨敹钘�
@RequestParam(value = "exerciseType") String exerciseType,
@RequestParam(value = "exerciseRecordId") String exerciseRecordId,
@RequestParam(value = "currTitleNum", required = false) String currTitleNum) {
- Result result = new Result(true, "状态更新成功");
+ Result result = new Result(true, "鐘舵�佹洿鏂版垚鍔�");
if(StringUtils.isBlank(exerciseRecordId) && !"All".equals(groupId)){
- return new Result(false, "更新失败，exerciseRecordId为空");
+ return new Result(false, "鏇存柊澶辫触锛宔xerciseRecordId涓虹┖");
}
- if(Constants.EXERCISE_TYPE_FAULT.equals(exerciseType)){// 错题本
+ if(Constants.EXERCISE_TYPE_FAULT.equals(exerciseType)){// 閿欓鏈�
- if("All".equals(groupId)){// 全部错题
+ if("All".equals(groupId)){// 鍏ㄩ儴閿欓
return exerciseExtendService.doUpdateExerciseFaultBook(currTitleNum);
}
@@ -856,9 +856,9 @@
result = exerciseExtendService.doUpdateExerciseFaultRecord(record);
- }else if(Constants.EXERCISE_TYPE_FAVORT.equals(exerciseType)){// 收藏
+ }else if(Constants.EXERCISE_TYPE_FAVORT.equals(exerciseType)){// 鏀惰棌
- if("All".equals(groupId)){// 全部收藏
+ if("All".equals(groupId)){// 鍏ㄩ儴鏀惰棌
return exerciseExtendService.doUpdateExerciseFavorBook(currTitleNum);
}
@@ -868,16 +868,16 @@
result = exerciseExtendService.doUpdateExerciseFavorRecord(record);
}else{
- result = new Result(false, "exerciseType传值错误：exerciseType="+exerciseType);
+ result = new Result(false, "exerciseType浼犲�奸敊璇細exerciseType="+exerciseType);
}
return result;
}
/**
- * APP2.0: 查询错题 收藏笔记个数
+ * APP2.0: 鏌ヨ閿欓 鏀惰棌绗旇涓暟
* URL: /exercise/Extend/queryExerCount
- * @return 键值对：iFavor 收藏个数 iFault 错误个数
+ * @return 閿�煎锛歩Favor 鏀惰棌涓暟 iFault 閿欒涓暟
*/
@RequestMapping(value = "exerBookInfo", method = RequestMethod.GET)
public @ResponseBody Result queryExtendListCount(
@@ -885,45 +885,45 @@
Map<String, Object> map = null;
Result result = new Result(false);
- if(Constants.EXERCISE_TYPE_FAULT.equals(exerciseType)){// 错题本
+ if(Constants.EXERCISE_TYPE_FAULT.equals(exerciseType)){// 閿欓鏈�
map = exerciseExtendService.queryExerFaultInfo();
- }else if(Constants.EXERCISE_TYPE_FAVORT.equals(exerciseType)){// 收藏
+ }else if(Constants.EXERCISE_TYPE_FAVORT.equals(exerciseType)){// 鏀惰棌
map = exerciseExtendService.queryExerFavorInfo();
}else{
- result = new Result(false, "exerciseType传值错误：exerciseType="+exerciseType);
+ result = new Result(false, "exerciseType浼犲�奸敊璇細exerciseType="+exerciseType);
}
- result = new Result(true, "查询成功");
+ result = new Result(true, "鏌ヨ鎴愬姛");
result.setData(map);
return result;
}
/**
- * APP2.0: 题目答案分析
+ * APP2.0: 棰樼洰绛旀鍒嗘瀽
* URL: /exercise/Extend/itemstatisics
*
*
*
- * @param groupId 习题组ID
+ * @param groupId 涔犻缁処D
* @return
*/
@RequestMapping(value = "itemStatisics", method = RequestMethod.GET)
public @ResponseBody List<Map<String, Object>> doQueryExerciseItemStatisics(
@RequestParam(value = "exerciseType") String exerciseType) {
- // 查询结果
+ // 鏌ヨ缁撴灉
List<Map<String, Object>> resultLst = exerciseExtendService.queryExerciseItemStatisics(exerciseType);
return resultLst;
}
/**
- * 错题统计接口
+ * 閿欓缁熻鎺ュ彛
* URL: /exercise/Extend/faultStatis
*
* @return
@@ -935,10 +935,10 @@
}
/**
- *得到 错题统计信息
+ *寰楀埌 閿欓缁熻淇℃伅
* URL: /exercise/Extend/faultStatis
*
- * type :week 最近一周 month:最近一月 year：最近一年
+ * type :week 鏈�杩戜竴鍛� month:鏈�杩戜竴鏈� year锛氭渶杩戜竴骞�
* @return
*/
@RequestMapping(value = "getfaultStatis", method = RequestMethod.GET)
@@ -948,7 +948,7 @@
return exerciseExtendService.doGetFaultStatisInfo(type);
}
- /**-----------------------------------------APP V2.0 接口 end----------------------------------------------------------- */
+ /**-----------------------------------------APP V2.0 鎺ュ彛 end----------------------------------------------------------- */
@RequestMapping(value = "initFaultStatisData", method = RequestMethod.GET)
public @ResponseBody Result doInitExerRecentRecord() {
@@ -980,8 +980,8 @@
List<Object[]> lstData2 =commonDAO.findwithRawResult(sql2, new ArrayList<Object>());
- if(lstData2.isEmpty()){//抛异常回滚
- return new Result(false,"错题数据为空2222");
+ if(lstData2.isEmpty()){//鎶涘紓甯稿洖婊�
+ return new Result(false,"閿欓鏁版嵁涓虹┖2222");
}
String hql_existRecord = "from ExerciseFaultRecord where resumeBookId=? and exerciseGroupId=? ";
@@ -1020,7 +1020,7 @@
i++;
}
- return new Result(true, "更新ExerciseFault条数："+i);
+ return new Result(true, "鏇存柊ExerciseFault鏉℃暟锛�"+i);
}
@@ -1042,8 +1042,8 @@
List<Object[]> lstData2 =commonDAO.findwithRawResult(sql2, new ArrayList<Object>());
- if(lstData2.isEmpty()){//抛异常回滚
- return new Result(false,"收藏数据为空2222");
+ if(lstData2.isEmpty()){//鎶涘紓甯稿洖婊�
+ return new Result(false,"鏀惰棌鏁版嵁涓虹┖2222");
}
String hql_existRecord = "from ExerciseFavoriteRecord where favoriteBookId=? and exerciseGroupId=? ";
@@ -1083,7 +1083,7 @@
i++;
}
- return new Result(true,"|更新ExerciseFavorite条数："+i);
+ return new Result(true,"|鏇存柊ExerciseFavorite鏉℃暟锛�"+i);
}
@SuppressWarnings("unchecked")
@@ -1136,6 +1136,6 @@
}
}
- return new Result(true,"|更新ExerciseItemAnswerU条数："+j);
+ return new Result(true,"|鏇存柊ExerciseItemAnswerU鏉℃暟锛�"+j);
}*/
}
--
Gitblit v1.8.0