tianzeOrg
/
tianze-pro
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改接口的约定路径

Browse Source
beetlsql3-dev
Mlxa0324
parent 827275ba3a
commit 6bb70273ea
7 changed files with 202 additions and 187 deletions

15
web/src/main/java/com/ibeetl/jlw/web/ResourcesQuestionSnapshotController.java
Unescape Escape View File

@ -81,6 +81,13 @@ public class ResourcesQuestionSnapshotController{
}
}
@PostMapping(API + "/list.do")
public JsonResult<PageQuery> list(ResourcesQuestionSnapshotQuery condition){
PageQuery page = condition.getPageQuery();
resourcesQuestionSnapshotService.queryByCondition(page);
return JsonResult.success(page);
}
/* 后台页面 */
@ -116,14 +123,6 @@ public class ResourcesQuestionSnapshotController{
/* 后台接口 */
@PostMapping(MODEL + "/list.json")
@Function("resourcesQuestionSnapshot.query")
public JsonResult<PageQuery> list(ResourcesQuestionSnapshotQuery condition){
PageQuery page = condition.getPageQuery();
resourcesQuestionSnapshotService.queryByCondition(page);
return JsonResult.success(page);
}
@PostMapping(MODEL + "/addAll.json")
@Function("resourcesQuestionSnapshot.add")
public JsonResult addAll(ResourcesQuestionSnapshotQuery resourcesQuestionSnapshotQuery,@SCoreUser CoreUser coreUser){

95
web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseChatLogController.java
Unescape Escape View File

@ -86,6 +86,61 @@ public class TeacherOpenCourseChatLogController{
}
}
@PostMapping(API + "/add.do")
public JsonResult addDo(
@Validated(ValidateConfig.ADD.class)
@RequestBody TeacherOpenCourseChatLogQuery teacherOpenCourseChatLogQuery,
BindingResult result,@SCoreUser CoreUser coreUser){
if(result.hasErrors()){
return JsonResult.failMessage(result);
}else{
teacherOpenCourseChatLogQuery.setUserId(coreUser.getId());
teacherOpenCourseChatLogQuery.setOrgId(coreUser.getOrgId());
if(null == teacherOpenCourseChatLogQuery.getTeacherOpenCourseChatLogStatus()){
teacherOpenCourseChatLogQuery.setTeacherOpenCourseChatLogStatus(1);
}
return teacherOpenCourseChatLogService.add(teacherOpenCourseChatLogQuery);
}
}
/**
* 教师端-给学生打分
* @param teacherOpenCourseChatLogId
* @param studentScore
* @param result
* @return
*/
@PostMapping(API + "/setScore.do")
public JsonResult setScore(
@NotNull(message = "互动ID不能为空！")
Long teacherOpenCourseChatLogId,
@NotNull(message = "学生分数不能为空！")
BigDecimal studentScore, BindingResult result){
if(result.hasErrors()){
return JsonResult.failMessage(result);
}else{
TeacherOpenCourseChatLogQuery teacherOpenCourseChatLogQuery = new TeacherOpenCourseChatLogQuery();
teacherOpenCourseChatLogQuery.setTeacherOpenCourseChatLogId(teacherOpenCourseChatLogId);
teacherOpenCourseChatLogQuery.setStudentScore(studentScore);
String msg = teacherOpenCourseChatLogService.edit(teacherOpenCourseChatLogQuery);
if (StringUtils.isBlank(msg)) {
return JsonResult.success();
} else {
return JsonResult.failMessage("更新失败,"+msg);
}
}
}
@PostMapping(API + "/treeList.do")
public JsonResult<PageQuery> treeList(TeacherOpenCourseChatLogQuery condition, @SCoreUser CoreUser coreUser) {
PageQuery page = condition.getPageQuery();
// 只查询顶级的列表
condition.setTeacherOpenCourseChatLogParentId(0L);
teacherOpenCourseChatLogService.queryByCondition(page);
return JsonResult.success(page);
}
/* 后台页面 */
@ -129,16 +184,6 @@ public class TeacherOpenCourseChatLogController{
return JsonResult.success(page);
}
@PostMapping(MODEL + "/treeList.json")
@Function("teacherOpenCourseChatLog.query")
public JsonResult<PageQuery> treeList(TeacherOpenCourseChatLogQuery condition, @SCoreUser CoreUser coreUser) {
PageQuery page = condition.getPageQuery();
// 只查询顶级的列表
condition.setTeacherOpenCourseChatLogParentId(0L);
teacherOpenCourseChatLogService.queryByCondition(page);
return JsonResult.success(page);
}
/**
* 学生端-分页查看评论区详情
* @param condition
@ -224,36 +269,6 @@ public class TeacherOpenCourseChatLogController{
}
}
/**
* 教师端-给学生打分
* @param teacherOpenCourseChatLogId
* @param studentScore
* @param result
* @return
*/
@PostMapping(MODEL + "/setScore.json")
@Function("teacherOpenCourseChatLog.edit")
public JsonResult setScore(
@NotNull(message = "互动ID不能为空！")
Long teacherOpenCourseChatLogId,
@NotNull(message = "学生分数不能为空！")
BigDecimal studentScore, BindingResult result){
if(result.hasErrors()){
return JsonResult.failMessage(result);
}else{
TeacherOpenCourseChatLogQuery teacherOpenCourseChatLogQuery = new TeacherOpenCourseChatLogQuery();
teacherOpenCourseChatLogQuery.setTeacherOpenCourseChatLogId(teacherOpenCourseChatLogId);
teacherOpenCourseChatLogQuery.setStudentScore(studentScore);
String msg = teacherOpenCourseChatLogService.edit(teacherOpenCourseChatLogQuery);
if (StringUtils.isBlank(msg)) {
return JsonResult.success();
} else {
return JsonResult.failMessage("更新失败,"+msg);
}
}
}
@PostMapping(MODEL + "/edit.json")
@Function("teacherOpenCourseChatLog.edit")
public JsonResult<String> update(@Validated(ValidateConfig.UPDATE.class) @RequestBody TeacherOpenCourseChatLogQuery teacherOpenCourseChatLogQuery, BindingResult result) {

63
web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseMergeStudentController.java
Unescape Escape View File

@ -134,6 +134,37 @@ public class TeacherOpenCourseMergeStudentController{
return JsonResult.success();
}
/**
* 学生端-通过验证码加入到课程中（这个班级分配的所有课程）
* @param teacherOpenCourseMergeStudentQuery
* @param teacherOpenCourseMergeTeacherAuthCode teacher_open_course_merge_teacher中的教师授权码
* @param result
* @param student 登录的学生
* @return
*/
@PostMapping(API + "/joinCourse.do")
public JsonResult joinCourse(TeacherOpenCourseMergeStudentQuery teacherOpenCourseMergeStudentQuery,
String teacherOpenCourseMergeTeacherAuthCode, BindingResult result, @TStudent Student student){
if(result.hasErrors()){
return JsonResult.failMessage(result);
}else{
return teacherOpenCourseMergeStudentService.joinCourse(teacherOpenCourseMergeStudentQuery, student, teacherOpenCourseMergeTeacherAuthCode);
}
}
/**
* 教师端-随机抽取开课下的学生数
*
* @param teacherOpenCourseId 开课ID
* @param randomCount 随机数量 null或者-1 则查询所有开课关联的学生
* @return
*/
@PostMapping(API + "/randomStudentList.do")
public JsonResult randomStudentList(Long teacherOpenCourseId, Long randomCount) {
return JsonResult.success(teacherOpenCourseMergeStudentService.randomStudentList(teacherOpenCourseId, randomCount));
}
/* 后台接口 */
@PostMapping(MODEL + "/list.json")
@ -217,36 +248,4 @@ public class TeacherOpenCourseMergeStudentController{
return JsonResult.success();
}
/**
* 学生端-通过验证码加入到课程中（这个班级分配的所有课程）
* @param teacherOpenCourseMergeStudentQuery
* @param teacherOpenCourseMergeTeacherAuthCode teacher_open_course_merge_teacher中的教师授权码
* @param result
* @param student 登录的学生
* @return
*/
@PostMapping(MODEL + "/joinCourse.json")
@Function("teacherOpenCourseMergeStudent.add")
public JsonResult joinCourse(TeacherOpenCourseMergeStudentQuery teacherOpenCourseMergeStudentQuery,
String teacherOpenCourseMergeTeacherAuthCode, BindingResult result, @TStudent Student student){
if(result.hasErrors()){
return JsonResult.failMessage(result);
}else{
return teacherOpenCourseMergeStudentService.joinCourse(teacherOpenCourseMergeStudentQuery, student, teacherOpenCourseMergeTeacherAuthCode);
}
}
/**
* 教师端-随机抽取开课下的学生数
*
* @param teacherOpenCourseId 开课ID
* @param randomCount 随机数量 null或者-1 则查询所有开课关联的学生
* @return
*/
@PostMapping(MODEL + "/randomStudentList.json")
@Function("teacherOpenCourseMergeStudent.query")
public JsonResult randomStudentList(Long teacherOpenCourseId, Long randomCount) {
return JsonResult.success(teacherOpenCourseMergeStudentService.randomStudentList(teacherOpenCourseId, randomCount));
}
}

155
web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseQuestionLogController.java
Unescape Escape View File

@ -78,6 +78,85 @@ public class TeacherOpenCourseQuestionLogController {
}
}
@PostMapping(API + "/list.do")
public JsonResult<PageQuery> listDo(TeacherOpenCourseQuestionLogQuery condition){
PageQuery page = condition.getPageQuery();
teacherOpenCourseQuestionLogService.queryByConditionQuery(page);
return JsonResult.success(page);
}
/**
* 学生端-教师端-根据题目配置信息，获取相关的题目
* 每次获取
*
* @param teacherOpenCourseQuestionSettingId 配置ID
* @param fromTypeEnum 来源类型
* @return
*/
@PostMapping(API + "/questionDetail.json")
public JsonResult questionDetail(Long teacherOpenCourseQuestionSettingId,
ResourcesQuestionSnapshotFromTypeEnum fromTypeEnum, @SCoreUser CoreUser coreUser) {
Assert.isTrue(coreUser.isStudent(), "非学生身份，无法获取题目!");
return JsonResult.success(teacherOpenCourseQuestionLogService.questionDetail(teacherOpenCourseQuestionSettingId, fromTypeEnum));
}
/**
* 学生端-和题目有关的提交方法 （章节测试、考试、作业）
* <li>支持附件上传</li>
* 答案集合中，会包含"/"字符串,则代表是路径地址，则是附件类型的答案
*
* @param questionLogMap <题目快照ID, [数组：前端传递过来不需要考虑排序和重复问题]> 例： {"10086": ["D", "A", "B", "A"]}
* @param questionSettingId 题目配置ID 简单理解，区分属于哪套卷子：章节测试、考试、作业 目前支持这三种类型。作业中，又区分题目作业，和附件作业。
* @param coreUser 用来验证用户登录，为了解耦不会传递到Service层
* @return
*/
@PostMapping(API + "/addQuestionLog.do")
@ResponseBody
public JsonResult addQuestionLog(
@RequestBody
Map<Long, TreeSet<String>> questionLogMap,
Long questionSettingId,
@SCoreUser
CoreUser coreUser) {
Assert.isTrue(coreUser.isStudent(), "非学生身份，无法提交!");
teacherOpenCourseQuestionLogService.insertQuestionLog(questionLogMap, questionSettingId);
return JsonResult.success();
}
/**
* 学生端-答题后显示答案、和分析
*
* @param questionSnapshotIds [题目快照ID]
* @param coreUser 用来验证用户登录，为了解耦不会传递到Service层
* @return
*/
@PostMapping(API + "/questionAnalysis.do")
@ResponseBody
public JsonResult questionAnalysis(
@RequestBody
TreeSet<Long> questionSnapshotIds,
@SCoreUser
CoreUser coreUser) {
Assert.isTrue(coreUser.isStudent(), "非学生身份，无法获取题目分析!");
return JsonResult.success(teacherOpenCourseQuestionLogService.questionAnalysis(questionSnapshotIds));
}
/**
* 学生端-教师端-学生总得分列表
*
* @param condition 题目配置ID
* @return
*/
@PostMapping(API + "/studentScoreList.do")
@ResponseBody
public JsonResult<PageQuery> studentScoreList(
@NotNull(message = "查询条件不能为空！") TeacherOpenCourseQuestionLogQuery condition){
PageQuery page = condition.getPageQuery();
teacherOpenCourseQuestionLogService.studentScoreList(page);
return JsonResult.success(page);
}
/* 后台页面 */
@ -194,82 +273,6 @@ public class TeacherOpenCourseQuestionLogController {
return JsonResult.success();
}
/**
* 学生端-教师端-根据题目配置信息，获取相关的题目
* 每次获取
*
* @param teacherOpenCourseQuestionSettingId 配置ID
* @param fromTypeEnum 来源类型
* @return
*/
@PostMapping(MODEL + "/questionDetail.json")
@Function("teacherOpenCourseQuestionLog.query")
public JsonResult questionDetail(Long teacherOpenCourseQuestionSettingId,
ResourcesQuestionSnapshotFromTypeEnum fromTypeEnum, @SCoreUser CoreUser coreUser) {
Assert.isTrue(coreUser.isStudent(), "非学生身份，无法获取题目!");
return JsonResult.success(teacherOpenCourseQuestionLogService.questionDetail(teacherOpenCourseQuestionSettingId, fromTypeEnum));
}
/**
* 学生端-和题目有关的提交方法 （章节测试、考试、作业）
* <li>支持附件上传</li>
* 答案集合中，会包含"/"字符串,则代表是路径地址，则是附件类型的答案
*
* @param questionLogMap <题目快照ID, [数组：前端传递过来不需要考虑排序和重复问题]> 例： {"10086": ["D", "A", "B", "A"]}
* @param questionSettingId 题目配置ID 简单理解，区分属于哪套卷子：章节测试、考试、作业 目前支持这三种类型。作业中，又区分题目作业，和附件作业。
* @param coreUser 用来验证用户登录，为了解耦不会传递到Service层
* @return
*/
@PostMapping(MODEL + "/addQuestionLog.json")
@Function("teacherOpenCourseQuestionLog.add")
@ResponseBody
public JsonResult addQuestionLog(
@RequestBody
Map<Long, TreeSet<String>> questionLogMap,
Long questionSettingId,
@SCoreUser
CoreUser coreUser) {
Assert.isTrue(coreUser.isStudent(), "非学生身份，无法提交!");
teacherOpenCourseQuestionLogService.insertQuestionLog(questionLogMap, questionSettingId);
return JsonResult.success();
}
/**
* 学生端-答题后显示答案、和分析
*
* @param questionSnapshotIds [题目快照ID]
* @param coreUser 用来验证用户登录，为了解耦不会传递到Service层
* @return
*/
@PostMapping(MODEL + "/questionAnalysis.json")
@Function("teacherOpenCourseQuestionLog.query")
@ResponseBody
public JsonResult questionAnalysis(
@RequestBody
TreeSet<Long> questionSnapshotIds,
@SCoreUser
CoreUser coreUser) {
Assert.isTrue(coreUser.isStudent(), "非学生身份，无法获取题目分析!");
return JsonResult.success(teacherOpenCourseQuestionLogService.questionAnalysis(questionSnapshotIds));
}
/**
* 学生端-教师端-学生总得分列表
*
* @param condition 题目配置ID
* @return
*/
@PostMapping(MODEL + "/studentScoreList.json")
@Function("teacherOpenCourseQuestionLog.query")
@ResponseBody
public JsonResult<PageQuery> studentScoreList(
@NotNull(message = "查询条件不能为空！") TeacherOpenCourseQuestionLogQuery condition){
PageQuery page = condition.getPageQuery();
teacherOpenCourseQuestionLogService.studentScoreList(page);
return JsonResult.success(page);
}
/**
* 学生端-教师端-单个学生做题日志详情
* 转到 {@link #list(TeacherOpenCourseQuestionLogQuery condition)}

51
web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseQuestionSettingController.java
Unescape Escape View File

@ -73,6 +73,31 @@ public class TeacherOpenCourseQuestionSettingController{
}
}
/**
* 教师端-根据类型添加作业（支持章节练习、考试、作业等）
* @param teacherOpenCourseQuestionSettingQuery
* @param result
* @param coreUser
* @return
*/
@PostMapping(API + "/addQuestionByType.do")
public JsonResult addQuestionByType(@RequestBody TeacherOpenCourseQuestionSettingQuery teacherOpenCourseQuestionSettingQuery,
BindingResult result, @SCoreUser CoreUser coreUser) {
if (result.hasErrors()) {
return JsonResult.failMessage(result);
}
teacherOpenCourseQuestionSettingQuery.setUserId(coreUser.getId());
teacherOpenCourseQuestionSettingQuery.setOrgId(coreUser.getOrgId());
if (null == teacherOpenCourseQuestionSettingQuery.getTeacherOpenCourseQuestionSettingStatus()) {
teacherOpenCourseQuestionSettingQuery.setTeacherOpenCourseQuestionSettingStatus(1);
}
if (null == teacherOpenCourseQuestionSettingQuery.getTeacherOpenCourseQuestionSettingPushStatus()) {
teacherOpenCourseQuestionSettingQuery.setTeacherOpenCourseQuestionSettingPushStatus(1);
}
teacherOpenCourseQuestionSettingService.addQuestionByType(teacherOpenCourseQuestionSettingQuery);
return JsonResult.success();
}
/* 后台页面 */
@ -189,30 +214,4 @@ public class TeacherOpenCourseQuestionSettingController{
return JsonResult.success();
}
/**
* 教师端-根据类型添加作业（支持章节练习、考试、作业等）
* @param teacherOpenCourseQuestionSettingQuery
* @param result
* @param coreUser
* @return
*/
@PostMapping(MODEL + "/addQuestionByType.json")
@Function("teacherOpenCourseQuestionSetting.add")
public JsonResult addQuestionByType(@RequestBody TeacherOpenCourseQuestionSettingQuery teacherOpenCourseQuestionSettingQuery,
BindingResult result, @SCoreUser CoreUser coreUser) {
if (result.hasErrors()) {
return JsonResult.failMessage(result);
}
teacherOpenCourseQuestionSettingQuery.setUserId(coreUser.getId());
teacherOpenCourseQuestionSettingQuery.setOrgId(coreUser.getOrgId());
if (null == teacherOpenCourseQuestionSettingQuery.getTeacherOpenCourseQuestionSettingStatus()) {
teacherOpenCourseQuestionSettingQuery.setTeacherOpenCourseQuestionSettingStatus(1);
}
if (null == teacherOpenCourseQuestionSettingQuery.getTeacherOpenCourseQuestionSettingPushStatus()) {
teacherOpenCourseQuestionSettingQuery.setTeacherOpenCourseQuestionSettingPushStatus(1);
}
teacherOpenCourseQuestionSettingService.addQuestionByType(teacherOpenCourseQuestionSettingQuery);
return JsonResult.success();
}
}

8
web/src/test/java/com/ibeetl/jlw/web/TeacherOpenCourseQuestionLogControllerTest.java
Unescape Escape View File

@ -74,7 +74,7 @@ class TeacherOpenCourseQuestionLogControllerTest extends BaseTest {
loginInfo = putStudentLoginInfoToEnv();
//构造请求参数
RequestBuilder rb = MockMvcRequestBuilders.post(MODEL + "/questionDetail.json")
RequestBuilder rb = MockMvcRequestBuilders.post(API + "/questionDetail.do")
.contentType(MediaType.APPLICATION_FORM_URLENCODED_VALUE)
.param("teacherOpenCourseQuestionSettingId", String.valueOf(teacherOpenCourseQuestionSettingId))
.param("fromTypeEnum", fromTypeEnum.name());
@ -148,7 +148,7 @@ class TeacherOpenCourseQuestionLogControllerTest extends BaseTest {
putLoginInfoToEnv(loginInfo[0], loginInfo[1]);
//构造请求参数
RequestBuilder rb = MockMvcRequestBuilders.post(MODEL + "/addQuestionLog.json")
RequestBuilder rb = MockMvcRequestBuilders.post(API + "/addQuestionLog.do")
.contentType(MediaType.APPLICATION_JSON_VALUE)
.param("questionSettingId", teacherOpenCourseQuestionSettingId.toString())
.content(toJsonStr(answerRandomMap));
@ -189,7 +189,7 @@ class TeacherOpenCourseQuestionLogControllerTest extends BaseTest {
putLoginInfoToEnv(loginInfo[0], loginInfo[1]);
//构造请求参数
RequestBuilder rb = MockMvcRequestBuilders.post(MODEL + "/questionAnalysis.json")
RequestBuilder rb = MockMvcRequestBuilders.post(API + "/questionAnalysis.do")
.contentType(MediaType.APPLICATION_JSON_VALUE)
.content(JSONUtil.toJsonStr(questionSnapshotIds));
@ -220,7 +220,7 @@ class TeacherOpenCourseQuestionLogControllerTest extends BaseTest {
Assert.assertTrue(ObjectUtil.isNotEmpty(questionSnapshots));
//构造请求参数
RequestBuilder rb = MockMvcRequestBuilders.post(MODEL + "/studentScoreList.json")
RequestBuilder rb = MockMvcRequestBuilders.post(API + "/studentScoreList.do")
.contentType(MediaType.APPLICATION_FORM_URLENCODED_VALUE)
.params(toMultiMap(questionSnapshots.get(0)));

2
web/src/test/java/com/ibeetl/jlw/web/TeacherOpenCourseQuestionSettingControllerTest.java
Unescape Escape View File

@ -181,7 +181,7 @@ class TeacherOpenCourseQuestionSettingControllerTest extends BaseTest {
System.out.println("请求参数：" + JSONUtil.toJsonPrettyStr(teacherOpenCourseQuestionSettingQuery));
//构造请求参数
RequestBuilder rb = MockMvcRequestBuilders.post(MODEL + "/addQuestionByType.json")
RequestBuilder rb = MockMvcRequestBuilders.post(API + "/addQuestionByType.do")
.contentType(MediaType.APPLICATION_JSON_VALUE)
.content(toJsonStr(teacherOpenCourseQuestionSettingQuery));
//发送请求，验证返回结果

Write Preview
Loading…
Cancel
Save