From 9486766c806fe1d9e082b2fd02ea1cc558f1b443 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 08 五月 2025 09:21:57 +0800
Subject: [PATCH] bug修改
---
cloud-server-activity/src/main/java/com/dsh/activity/controller/BenefitVideoController.java | 127 ++++++++++++++++++++++++++++-------------
1 files changed, 86 insertions(+), 41 deletions(-)
diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/controller/BenefitVideoController.java b/cloud-server-activity/src/main/java/com/dsh/activity/controller/BenefitVideoController.java
index 1ad5527..64c7a92 100644
--- a/cloud-server-activity/src/main/java/com/dsh/activity/controller/BenefitVideoController.java
+++ b/cloud-server-activity/src/main/java/com/dsh/activity/controller/BenefitVideoController.java
@@ -5,6 +5,7 @@
import com.dsh.activity.entity.BenefitsVideoClassification;
import com.dsh.activity.entity.BenefitsVideos;
import com.dsh.activity.model.*;
+import com.dsh.activity.model.request.GetBenefitVideoById;
import com.dsh.activity.service.BenefitsVideosService;
import com.dsh.activity.service.IBenefitsVideoClassificationService;
import com.dsh.activity.util.ResultUtil;
@@ -31,95 +32,121 @@
private TokenUtil tokenUtil;
-
/**
* 获取所有福利视频分类
+ *
* @return
*/
@RequestMapping("/base/benefitVideo/list")
- public List<TQueryBenefitsVO> listAll(@RequestBody QueryBenefitsVedioVO vo){
+ public List<TQueryBenefitsVO> listAll(@RequestBody QueryBenefitsVedioVO vo) {
return benefitsVideoClassificationService.listAll(vo);
}
/**
* 查看详情/编辑
+ *
* @return
*/
@RequestMapping("/base/benefitVideo/getById")
- public BenefitsVideoClassification getById(@RequestBody Integer id){
+ public BenefitsVideoClassification getById(@RequestBody Integer id) {
return benefitsVideoClassificationService.getById(id);
}
/**
* 根据分类id查询福利视频分类下的视频
+ *
* @return
*/
@RequestMapping("/base/benefitVideo/getBenefitVideoById")
@ResponseBody
- public List<BenefitsVideos> getBenefitVideoById(@RequestBody Integer id){
- return bfvService.getBenefitVideoById(id);
+ public List<BenefitsVideos> getBenefitVideoById(@RequestBody GetBenefitVideoById getBenefitVideoById) {
+ return bfvService.getBenefitVideoById(getBenefitVideoById.getBenefitsVideoClassificationId(), getBenefitVideoById.getState());
}
/**
* 根据福利视频id获取福利视频信息
+ *
* @return
*/
@RequestMapping("/base/benefitVideo/getBenefitVideosById")
@ResponseBody
- public BenefitsVideos getBenefitVideosById(@RequestBody Integer id){
+ public BenefitsVideos getBenefitVideosById(@RequestBody Integer id) {
return bfvService.getById(id);
}
/**
* 添加/修改福利视频分类
+ *
* @return
*/
@RequestMapping("/base/benefitVideo/add")
- public Object addSite(@RequestBody BenefitsVideoClassification site){
- QueryWrapper<BenefitsVideoClassification> wrapper = new QueryWrapper<BenefitsVideoClassification>().eq("name", site.getName());
- if (benefitsVideoClassificationService.list(wrapper).size()==0){
- if(site.getId()!= null ){
- benefitsVideoClassificationService.updateById(site);
- return 200;
- }else {
- return benefitsVideoClassificationService.save(site);
- }
- }else return 500;
+ public Object addSite(@RequestBody BenefitsVideoClassification site) {
+ if (site.getId() != null) {
+ benefitsVideoClassificationService.updateById(site);
+ return 200;
+ } else {
+ return benefitsVideoClassificationService.save(site);
+ }
}
/**
* 添加/修改视频详情
+ *
* @return
*/
@RequestMapping("/base/addBenefitsVideos")
- public Object addBenefitsVideos(@RequestBody BenefitsVideos site){
+ public Object addBenefitsVideos(@RequestBody BenefitsVideos site) {
// 通过分类Id和课程id 查询视频
- List<BenefitsVideos> result = bfvService.getBybIdAndcId(site.getBenefitsVideoClassificationId(),site.getCourseId());
- if (result.size()>0){
- return 500;
+ List<BenefitsVideos> result = bfvService.getBybIdAndcId(site.getBenefitsVideoClassificationId(), site.getCourseId());
+ if (result.size() > 0) {
+ return false;
}
- if (site.getId() == null){
+ if (site.getId() == null) {
return bfvService.save(site);
- }else {
+ } else {
return bfvService.updateById(site);
}
}
+
/**
* 上/下架、删除福利视频分类 type=1为上架 2为下架 3为删除
*/
@RequestMapping("/base/benefitVideo/changeState")
- public Object changeState(@RequestBody BenefitsVedioChangeStateVO vo){
+ public Object changeState(@RequestBody BenefitsVedioChangeStateVO vo) {
return benefitsVideoClassificationService.changeState(vo);
}
-
- @PostMapping("base/benefitVideo/getList")
- public BenefitsVideos getVideosWithIds(@RequestBody Integer id){
- return bfvService.getOne(new QueryWrapper<BenefitsVideos>().eq("id",id).eq("state",1));
+
+ /**
+ * 修改状态
+ * @param changeBenefitsVedioState
+ */
+ @RequestMapping("/base/benefitVideo/changeBenefitsVedioState")
+ public void changeBenefitsVedioState(@RequestBody ChangeBenefitsVedioState changeBenefitsVedioState){
+ BenefitsVideos benefitsVideos = new BenefitsVideos();
+ benefitsVideos.setState(changeBenefitsVedioState.getState());
+ benefitsVideos.setId(changeBenefitsVedioState.getId());
+ bfvService.updateById(benefitsVideos);
}
-
-
+
+
+ /**
+ * 根据视频课程id删除福利视频数据
+ * @param courseId
+ */
+ @RequestMapping("/base/benefitVideo/delBenefitsVedio")
+ public void delBenefitsVedio(@RequestBody Integer courseId){
+ BenefitsVideos benefitsVideos = new BenefitsVideos();
+ benefitsVideos.setState(3);
+ bfvService.update(benefitsVideos, new QueryWrapper<BenefitsVideos>().eq("courseId", courseId).ne("state", 3));
+ }
+
+
+ @PostMapping("base/benefitVideo/getList")
+ public BenefitsVideos getVideosWithIds(@RequestBody Integer id) {
+ return bfvService.getOne(new QueryWrapper<BenefitsVideos>().eq("id", id).eq("state", 1));
+ }
@ResponseBody
@@ -130,15 +157,34 @@
@ApiImplicitParam(value = "搜索内容", name = "search", dataType = "string", required = false),
@ApiImplicitParam(name = "Authorization", value = "用户token（Bearer +token）", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
})
- public ResultUtil<List<BenefitsVideoClassificationListVo>> queryClassificationBenefitsVideosList(Integer position, String search){
+ public ResultUtil<List<BenefitsVideoClassificationListVo>> queryClassificationBenefitsVideosList(Integer position, String search) {
try {
Integer uid = tokenUtil.getUserIdFormRedis();
- if(null == uid){
+ if (null == uid) {
return ResultUtil.tokenErr();
}
List<BenefitsVideoClassificationListVo> listVos = bfvService.queryClassificationBenefitsVideosList(uid, position, search);
return ResultUtil.success(listVos);
- }catch (Exception e){
+ } catch (Exception e) {
+ e.printStackTrace();
+ return ResultUtil.runErr();
+ }
+ }
+
+ @ResponseBody
+ @PostMapping("/base/benefitsVideo/queryClassificationBenefitsVideosListOne")
+ @ApiOperation(value = "获取视频列表", tags = {"APP-线上课得积分", "APP-看视频得奖励"})
+ @ApiImplicitParams({
+ @ApiImplicitParam(value = "位置（1=线上课得积分，2=看视频得奖励）", name = "position", dataType = "int", required = true),
+ @ApiImplicitParam(value = "搜索内容", name = "search", dataType = "string", required = false),
+ @ApiImplicitParam(name = "Authorization", value = "用户token（Bearer +token）", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
+ })
+ public ResultUtil<List<BenefitsVideoClassificationListVo>> queryClassificationBenefitsVideosListOne(Integer position, String search) {
+ try {
+ Integer uid = -1;
+ List<BenefitsVideoClassificationListVo> listVos = bfvService.queryClassificationBenefitsVideosListOne(uid, position, search);
+ return ResultUtil.success(listVos);
+ } catch (Exception e) {
e.printStackTrace();
return ResultUtil.runErr();
}
@@ -155,20 +201,19 @@
@ApiImplicitParam(value = "搜索内容", name = "search", dataType = "string", required = false),
@ApiImplicitParam(name = "Authorization", value = "用户token（Bearer +token）", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
})
- public ResultUtil<List<BenefitsVideosListVo>> queryBenefitsVideosList(Integer classificationId, String search, Integer pageSize, Integer pageNo){
+ public ResultUtil<List<BenefitsVideosListVo>> queryBenefitsVideosList(Integer classificationId, String search, Integer pageSize, Integer pageNo) {
try {
Integer uid = tokenUtil.getUserIdFormRedis();
- if(null == uid){
+ if (null == uid) {
return ResultUtil.tokenErr();
}
List<BenefitsVideosListVo> benefitsVideosListVos = bfvService.queryBenefitsVideosList(uid, classificationId, search, pageSize, pageNo);
return ResultUtil.success(benefitsVideosListVos);
- }catch (Exception e){
+ } catch (Exception e) {
e.printStackTrace();
return ResultUtil.runErr();
}
}
-
@ResponseBody
@@ -178,15 +223,15 @@
@ApiImplicitParam(value = "视频id", name = "id", dataType = "int", required = true),
@ApiImplicitParam(name = "Authorization", value = "用户token（Bearer +token）", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
})
- public ResultUtil<BenefitsVideosInfoVo> queryBenefitsVideosInfo(Integer id){
+ public ResultUtil<BenefitsVideosInfoVo> queryBenefitsVideosInfo(Integer id) {
try {
Integer uid = tokenUtil.getUserIdFormRedis();
- if(null == uid){
+ if (null == uid) {
return ResultUtil.tokenErr();
}
BenefitsVideosInfoVo benefitsVideosInfoVo = bfvService.queryBenefitsVideosInfo(uid, id);
return ResultUtil.success(benefitsVideosInfoVo);
- }catch (Exception e){
+ } catch (Exception e) {
e.printStackTrace();
return ResultUtil.runErr();
}
@@ -202,12 +247,12 @@
public ResultUtil receiveAward(Integer id) {
try {
Integer uid = tokenUtil.getUserIdFormRedis();
- if(null == uid){
+ if (null == uid) {
return ResultUtil.tokenErr();
}
bfvService.receiveAward(uid, id);
return ResultUtil.success();
- }catch (Exception e){
+ } catch (Exception e) {
e.printStackTrace();
return ResultUtil.runErr();
}
--
Gitblit v1.7.1