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-course/src/main/java/com/dsh/course/feignclient/CourseSessionNameClient.java | 3 +
cloud-server-account/src/main/java/com/dsh/account/controller/ClassDetailsController.java | 39 ++++++++-----------
cloud-server-account/src/main/java/com/dsh/account/service/impl/TAppUserServiceImpl.java | 3 +
cloud-server-account/src/main/java/com/dsh/account/feignclient/course/CourseSessionNameClient.java | 3 +
cloud-server-account/src/main/java/com/dsh/account/feignclient/course/model/StuAndAppuserIdsVo.java | 12 ++++++
cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackagePaymentController.java | 2
cloud-server-account/src/main/java/com/dsh/account/model/vo/classDetails/classInsVo/StuPhysicalVo.java | 9 ++--
7 files changed, 41 insertions(+), 30 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();
}
}
diff --git a/cloud-server-account/src/main/java/com/dsh/account/feignclient/course/CourseSessionNameClient.java b/cloud-server-account/src/main/java/com/dsh/account/feignclient/course/CourseSessionNameClient.java
index ca96e73..b961032 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/feignclient/course/CourseSessionNameClient.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/feignclient/course/CourseSessionNameClient.java
@@ -4,6 +4,7 @@
import com.dsh.account.feignclient.course.model.StuSessionDetailsVo;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestParam;
import java.util.List;
@@ -12,6 +13,6 @@
@PostMapping("/coursePack/sessionNames")
- List<StuSessionDetailsVo> getStuSessionList(Integer stuId, Integer appUserId);
+ List<StuSessionDetailsVo> getStuSessionList(@RequestParam("stuId") Integer stuId,@RequestParam("appUserId") Integer appUserId);
}
diff --git a/cloud-server-account/src/main/java/com/dsh/account/feignclient/course/model/StuAndAppuserIdsVo.java b/cloud-server-account/src/main/java/com/dsh/account/feignclient/course/model/StuAndAppuserIdsVo.java
new file mode 100644
index 0000000..7fd0a91
--- /dev/null
+++ b/cloud-server-account/src/main/java/com/dsh/account/feignclient/course/model/StuAndAppuserIdsVo.java
@@ -0,0 +1,12 @@
+package com.dsh.account.feignclient.course.model;
+
+
+import lombok.Data;
+
+@Data
+public class StuAndAppuserIdsVo {
+
+ Integer stuId;
+
+ Integer appUserId;
+}
diff --git a/cloud-server-account/src/main/java/com/dsh/account/model/vo/classDetails/classInsVo/StuPhysicalVo.java b/cloud-server-account/src/main/java/com/dsh/account/model/vo/classDetails/classInsVo/StuPhysicalVo.java
index 343b8be..e07a661 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/model/vo/classDetails/classInsVo/StuPhysicalVo.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/model/vo/classDetails/classInsVo/StuPhysicalVo.java
@@ -1,16 +1,17 @@
package com.dsh.account.model.vo.classDetails.classInsVo;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
public class StuPhysicalVo {
-
+ @ApiModelProperty(value = "身高")
private Double height;
-
+ @ApiModelProperty(value = "体重")
private Double weight;
-
+ @ApiModelProperty(value = "BMI参数")
private Double bmi;
-
+ @ApiModelProperty(value = "图片链接")
private String url;
}
diff --git a/cloud-server-account/src/main/java/com/dsh/account/service/impl/TAppUserServiceImpl.java b/cloud-server-account/src/main/java/com/dsh/account/service/impl/TAppUserServiceImpl.java
index 29debd2..89cda6c 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/service/impl/TAppUserServiceImpl.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/service/impl/TAppUserServiceImpl.java
@@ -25,6 +25,7 @@
import com.dsh.account.util.akeylogin.Md5Util;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import org.springframework.web.bind.annotation.RequestBody;
import javax.annotation.Resource;
import java.util.ArrayList;
@@ -139,7 +140,7 @@
* @param latitude
* @return
*/
- public List<WeekedCourse> dealDatas(List<CourseOfStoreVo> storeOfCourses,String longitude ,String latitude){
+ public List<WeekedCourse> dealDatas(List<CourseOfStoreVo> storeOfCourses,String longitude ,@RequestBody String latitude){
List<WeekedCourse> weekedCourses = new ArrayList<>();
for (int i = 1; i < 8; i++) {
WeekedCourse weekedCourse = new WeekedCourse();
diff --git a/cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackagePaymentController.java b/cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackagePaymentController.java
index e26735e..a40a5aa 100644
--- a/cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackagePaymentController.java
+++ b/cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackagePaymentController.java
@@ -86,7 +86,7 @@
* 课程名称列表
*/
@PostMapping("/coursePack/sessionNames")
- public List<StuSessionDetailsVo> getStuSessionList(@RequestBody Integer stuId,@RequestBody Integer appUserId){
+ public List<StuSessionDetailsVo> getStuSessionList(@RequestParam("stuId") Integer stuId,@RequestParam("appUserId") Integer appUserId){
List<StuSessionDetailsVo> detailsVos = new ArrayList<>();
List<TCoursePackagePayment> byUserId = packagePaymentService.queryAllCoursePackage(stuId,appUserId);
if (byUserId.size() > 0){
diff --git a/cloud-server-course/src/main/java/com/dsh/course/feignclient/CourseSessionNameClient.java b/cloud-server-course/src/main/java/com/dsh/course/feignclient/CourseSessionNameClient.java
index b72e59e..8bc5550 100644
--- a/cloud-server-course/src/main/java/com/dsh/course/feignclient/CourseSessionNameClient.java
+++ b/cloud-server-course/src/main/java/com/dsh/course/feignclient/CourseSessionNameClient.java
@@ -4,6 +4,7 @@
import com.dsh.course.feignclient.model.StuSessionDetailsVo;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestParam;
import java.util.List;
@@ -12,6 +13,6 @@
@PostMapping("/coursePack/sessionNames")
- List<StuSessionDetailsVo> getStuSessionList(Integer stuId,Integer appUserId);
+ List<StuSessionDetailsVo> getStuSessionList(@RequestParam("stuId") Integer stuId, @RequestParam("appUserId") Integer appUserId);
}
--
Gitblit v1.7.1