From 2b93646be2a3537342d802f1d9fafe22415fe62e Mon Sep 17 00:00:00 2001
From: java <linlangsur163@163.com>
Date: 星期三, 28 六月 2023 17:53:41 +0800
Subject: [PATCH] 课程信息：上课首页数据展示bug
---
cloud-server-account/src/main/java/com/dsh/account/controller/ClassDetailsController.java | 39 +++++++++++++++++----------------------
1 files changed, 17 insertions(+), 22 deletions(-)
diff --git a/cloud-server-account/src/main/java/com/dsh/account/controller/ClassDetailsController.java b/cloud-server-account/src/main/java/com/dsh/account/controller/ClassDetailsController.java
index e71152b..55abd29 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/controller/ClassDetailsController.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/controller/ClassDetailsController.java
@@ -3,16 +3,13 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.dsh.account.entity.TStudent;
-import com.dsh.account.model.vo.classDetails.classInsVo.StuDetailsReq;
-import com.dsh.account.model.vo.classDetails.classInsVo.StuListVo;
-import com.dsh.account.model.vo.classDetails.classInsVo.StuPhysicalVo;
+import com.dsh.account.model.vo.classDetails.classInsVo.*;
import com.dsh.account.service.TAppUserService;
import com.dsh.account.service.TStudentService;
import com.dsh.account.util.DateUtil;
import com.dsh.account.util.ResultUtil;
import com.dsh.account.util.TokenUtil;
import com.dsh.account.util.ToolUtil;
-import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
@@ -31,10 +28,8 @@
/**
* 学员上课情况 接口
*/
-@Api
-@CrossOrigin
@RestController
-@RequestMapping("/base/startCource")
+@RequestMapping("")
public class ClassDetailsController {
private Logger logger = LoggerFactory.getLogger("business-log");
@@ -51,14 +46,14 @@
@ResponseBody
- @PostMapping("/stu/queryStudentData")
- @ApiOperation(value = "根据登录用户ID查询学员信息", tags = {"APP-开始上课-用户学员信息"}, notes = "")
+ @PostMapping("/base/startCource/queryStudentData")
+ @ApiOperation(value = "上课首页", tags = {"APP-开始上课"})
@ApiImplicitParams({
@ApiImplicitParam(value = "经度值", name = "longitude", required = true, dataType = "String"),
@ApiImplicitParam(value = "纬度值", name = "latitude", required = true, dataType = "String"),
@ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
})
- public ResultUtil queryCouponRecord( @RequestBody String longitude, @RequestBody String latitude,HttpServletRequest request){
+ public ResultUtil<ClassInfoVo> queryCouponRecord(@RequestBody String longitude, @RequestBody String latitude, HttpServletRequest request){
try {
Integer userIdFormRedis = tokenUtil.getUserIdFormRedis(request);
if(null == userIdFormRedis){
@@ -73,8 +68,8 @@
@ResponseBody
- @PostMapping("/stu/queryPhysical")
- @ApiOperation(value = "获取学员测试报告", tags = {"APP-开始上课-获取学员测试报告"}, notes = "")
+ @PostMapping("/base/startCource/queryPhysical")
+ @ApiOperation(value = "获取学员测试报告", tags = {"APP-开始上课"})
@ApiImplicitParams({
@ApiImplicitParam(value = "学员id", name = "id", required = true, dataType = "int"),
@ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
@@ -95,8 +90,8 @@
* 添加学员信息
*/
@ResponseBody
- @PostMapping("/stu/addData")
- @ApiOperation(value = "添加学员信息", tags = {"APP-开始上课-添加学员信息"}, notes = "")
+ @PostMapping("/base/startCource/addData")
+ @ApiOperation(value = "添加学员信息", tags = {"APP-开始上课"})
@ApiImplicitParams({
@ApiImplicitParam(value = "学员信息", name = "stu", required = true, dataType = "int"),
@ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
@@ -119,12 +114,12 @@
* 该APP用户下的学员列表
*/
@ResponseBody
- @PostMapping("/stu/listOfStu")
- @ApiOperation(value = "该APP用户下的学员列表", tags = {"APP-开始上课-学员列表"}, notes = "")
+ @PostMapping("/base/startCource/listOfStu")
+ @ApiOperation(value = "学员列表", tags = {"APP-开始上课"})
@ApiImplicitParams({
@ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
})
- public ResultUtil queryStuList(HttpServletRequest request){
+ public ResultUtil<List<StuListVo>> queryStuList(HttpServletRequest request){
try {
Integer userIdFormRedis = tokenUtil.getUserIdFormRedis(request);
if(null == userIdFormRedis){
@@ -148,7 +143,7 @@
}
return ResultUtil.success(stuListVos);
}catch (Exception e){
- return ResultUtil.runErr(ResultUtil.ERROR);
+ return ResultUtil.runErr();
}
}
@@ -156,12 +151,12 @@
* 课时详情
*/
@ResponseBody
- @PostMapping("/stu/lessonDetails")
- @ApiOperation(value = "课时详情", tags = {"APP-开始上课-课时详情"}, notes = "")
+ @PostMapping("/base/startCource/lessonDetails")
+ @ApiOperation(value = "课时详情", tags = {"APP-开始上课"})
@ApiImplicitParams({
@ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
})
- public ResultUtil coursePackageDetails(@RequestBody Integer lessonId, @RequestBody Integer stuId, HttpServletRequest request){
+ public ResultUtil<ClassDetailsInsVo> coursePackageDetails(@RequestBody Integer lessonId, @RequestBody Integer stuId, HttpServletRequest request){
try {
Integer userIdFormRedis = tokenUtil.getUserIdFormRedis(request);
if(null == userIdFormRedis){
@@ -170,7 +165,7 @@
return ResultUtil.success(istuService.querySessionDetailsDt(userIdFormRedis,lessonId,stuId));
}catch (Exception e){
- return ResultUtil.runErr(ResultUtil.ERROR);
+ return ResultUtil.runErr();
}
}
--
Gitblit v1.7.1