From c678894e37d15cca116d962eba5c107c99176945 Mon Sep 17 00:00:00 2001
From: lisy <linlangsur163@163.com>
Date: 星期四, 20 七月 2023 17:39:05 +0800
Subject: [PATCH] 开始上课的主页中课包列表展示；bmi工具类匹配对应的身体状态
---
cloud-server-account/src/main/java/com/dsh/account/controller/ClassDetailsController.java | 89 +++++++++++++++++++++++++++-----------------
1 files changed, 54 insertions(+), 35 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 5996ede..d757092 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
@@ -4,7 +4,9 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.dsh.account.entity.TStudent;
import com.dsh.account.feignclient.competition.model.PurchaseRecordVo;
+import com.dsh.account.model.vo.classDetails.AppointmentRecordVo;
import com.dsh.account.model.vo.classDetails.ClasspaymentRequest;
+import com.dsh.account.model.vo.classDetails.CourseVenue;
import com.dsh.account.model.vo.classDetails.classInsVo.*;
import com.dsh.account.model.vo.commentDetail.StuCommentsVo;
import com.dsh.account.model.vo.medalDetail.GongVo;
@@ -16,10 +18,7 @@
import com.dsh.account.service.StudentHonorService;
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 com.dsh.account.util.*;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
@@ -27,7 +26,10 @@
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
@@ -64,17 +66,15 @@
@PostMapping("/api/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<ClassInfoVo> queryCouponRecord(String longitude, String latitude){
+ public ResultUtil<ClassInfoVo> queryCouponRecord(){
try {
Integer userIdFormRedis = tokenUtil.getUserIdFormRedis();
if(null == userIdFormRedis){
return ResultUtil.tokenErr();
}
- return ResultUtil.success(tappuService.queryUserOfStus(userIdFormRedis,longitude,latitude));
+ return ResultUtil.success(tappuService.queryUserOfStus(userIdFormRedis));
}catch (Exception e){
e.printStackTrace();
return ResultUtil.runErr();
@@ -83,10 +83,35 @@
@ResponseBody
+ @PostMapping("/api/startCource/weeksOfCourseDetails")
+ @ApiOperation(value = "上课首页-课程列表", tags = {"APP-开始上课"})
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9....."),
+ @ApiImplicitParam(value = "查询时间yyyy-MM-dd", name = "time", required = true, dataType = "string"),
+ @ApiImplicitParam(value = "学员id", name = "stuId", required = true, dataType = "int"),
+ @ApiImplicitParam(value = "用户经度", name = "longitude", required = true, dataType = "string"),
+ @ApiImplicitParam(value = "用户纬度", name = "latitude", required = true, dataType = "string"),
+ })
+ public ResultUtil<List<CourseVenue>> queryWeeksOfClassInfo(String time,Integer stuId, String longitude, String latitude){
+ try {
+ Integer appUserId = tokenUtil.getUserIdFormRedis();
+ if(null == appUserId){
+ return ResultUtil.tokenErr();
+ }
+ return ResultUtil.success(tappuService.queryWeekOfCourseDetails(appUserId,stuId,time,longitude,latitude));
+ }catch (Exception e){
+ e.printStackTrace();
+ return ResultUtil.runErr();
+ }
+
+ }
+
+
+ @ResponseBody
@PostMapping("/api/startCource/queryPhysical")
@ApiOperation(value = "获取学员测试报告", tags = {"APP-开始上课"})
@ApiImplicitParams({
- @ApiImplicitParam(value = "学员id", name = "id", required = true, dataType = "int"),
+ @ApiImplicitParam(value = "学员id", name = "stuID", required = true, dataType = "int"),
@ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
})
public ResultUtil<StuPhysicalVo> getStuPhysicalInfo(Integer stuID){
@@ -94,6 +119,7 @@
TStudent tStudent = istuService.getById(stuID);
if (ToolUtil.isNotEmpty(tStudent)){
vo.setBmi(tStudent.getBmi());
+ vo.setBodyStatus(BMIBodyUtil.getBodyStatus(tStudent.getBmi()));
vo.setUrl(tStudent.getLateralSurface());
vo.setHeight(tStudent.getHeight());
vo.setWeight(tStudent.getWeight());
@@ -108,7 +134,6 @@
@PostMapping("/api/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.....")
})
@Transactional
@@ -118,8 +143,7 @@
if(null == userIdFormRedis){
return ResultUtil.tokenErr();
}
- istuService.addStuOfAppUser(stu,userIdFormRedis);
- return ResultUtil.success();
+ return istuService.addStuOfAppUser(stu,userIdFormRedis);
}catch (Exception e){
return ResultUtil.runErr(ResultUtil.ERROR);
}
@@ -245,7 +269,9 @@
@PostMapping("/api/startCource/renewal")
@ApiOperation(value = "课时详情-续课课包详情", tags = {"APP-开始上课"})
@ApiImplicitParams({
- @ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
+ @ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9....."),
+ @ApiImplicitParam(value = "课包id", name = "lessonId", required = true, dataType = "int"),
+ @ApiImplicitParam(value = "学员id", name = "stuId", required = true, dataType = "int"),
})
public ResultUtil<CourseDetailsOfContinuationResp> renewalOfCourses(Integer lessonId, Integer stuId){
try {
@@ -318,7 +344,7 @@
@ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9....."),
@ApiImplicitParam(value = "学员id", name = "stuId", required = true, dataType = "int"),
})
- public ResultUtil<List<StuCommentsVo>> queryStuComment(@RequestParam("stuId") Integer stuId){
+ public ResultUtil<List<StuCommentsVo>> queryStuComment( Integer stuId){
try {
return ResultUtil.success(evalstuService.queryStuCommentsList(stuId));
}catch (Exception e){
@@ -337,7 +363,7 @@
@ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9....."),
@ApiImplicitParam(value = "学员id", name = "stuId", required = true, dataType = "int"),
})
- public ResultUtil<List<StuMedalVo>> queryStuMedal(@RequestParam("stuId") Integer stuId){
+ public ResultUtil<List<StuMedalVo>> queryStuMedal( Integer stuId){
try {
Integer appUserId = tokenUtil.getUserIdFormRedis();
if(null == appUserId){
@@ -360,7 +386,7 @@
@ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9....."),
@ApiImplicitParam(value = "学员id", name = "stuId", required = true, dataType = "int"),
})
- public ResultUtil<List<GongVo>> queryStuGoog(@RequestParam("stuId") Integer stuId){
+ public ResultUtil<List<GongVo>> queryStuGoog(Integer stuId){
try {
Integer appUserId = tokenUtil.getUserIdFormRedis();
if(null == appUserId){
@@ -373,56 +399,49 @@
}
/**
- * 课后视频课表
+ * 上课预约记录
*/
@ResponseBody
- @PostMapping("/api/startCource/afterSourceDetails")
- @ApiOperation(value = "课后视频课表", tags = {"APP-开始上课"})
+ @PostMapping("/api/startCource/stuAppointList")
+ @ApiOperation(value = "上课预约记录", tags = {"APP-开始上课"})
@ApiImplicitParams({
@ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9....."),
@ApiImplicitParam(value = "学员id", name = "stuId", required = true, dataType = "int"),
})
- public ResultUtil queryAfterSourceDetails(@RequestParam("stuId") Integer stuId){
+ public ResultUtil<AppointmentRecordVo> cgeClassAppointmentRecordList(Integer stuId){
try {
Integer appUserId = tokenUtil.getUserIdFormRedis();
if(null == appUserId){
return ResultUtil.tokenErr();
}
- // TODO: 2023/7/4
- return ResultUtil.success();
+ return ResultUtil.success(istuService.getAppointmentRecords(stuId,appUserId));
}catch (Exception e){
return ResultUtil.runErr();
}
-
-
}
/**
- * 已报名课程列表
+ * 取消预约
*/
@ResponseBody
- @PostMapping("/api/startCource/registeredCourses")
- @ApiOperation(value = "已报名课程列表", tags = {"APP-开始上课"})
+ @PostMapping("/api/startCource/cancelCourse")
+ @ApiOperation(value = "上课预约-取消预约", tags = {"APP-开始上课"})
@ApiImplicitParams({
@ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9....."),
- @ApiImplicitParam(value = "学员id", name = "stuId", required = true, dataType = "int"),
+ @ApiImplicitParam(value = "上课记录id", name = "courseStuRecordId", required = true, dataType = "int"),
})
- public ResultUtil<List<RegisterCourseVo>> queryRegisteredCoursesDetails(@RequestParam("stuId") Integer stuId){
+ public ResultUtil cancelReservation(Integer courseStuRecordId){
try {
Integer appUserId = tokenUtil.getUserIdFormRedis();
if(null == appUserId){
return ResultUtil.tokenErr();
}
- return ResultUtil.success();
+ return istuService.cancelReservationOfCourse(courseStuRecordId);
}catch (Exception e){
return ResultUtil.runErr();
}
-
-
}
-
-
}
--
Gitblit v1.7.1