From aa925d851857f50eff0556411366690d9a78a0e5 Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期一, 27 十一月 2023 17:30:26 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/PlayPai
---
cloud-server-activity/src/main/java/com/dsh/activity/controller/BenefitVideoController.java | 76 ++++++++++++++++++++------------------
1 files changed, 40 insertions(+), 36 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 3eb3c69..22638c7 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
@@ -31,92 +31,96 @@
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){
+ public List<BenefitsVideos> getBenefitVideoById(@RequestBody Integer id) {
return bfvService.getBenefitVideoById(id);
}
/**
* 根据福利视频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){
- if(site.getId()!= null ){
- benefitsVideoClassificationService.updateById(site);
- return 200;
- }else {
- return benefitsVideoClassificationService.save(site);
- }
+ 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){
+ List<BenefitsVideos> result = bfvService.getBybIdAndcId(site.getBenefitsVideoClassificationId(), site.getCourseId());
+ if (result.size() > 0) {
return 500;
}
- 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));
+ public BenefitsVideos getVideosWithIds(@RequestBody Integer id) {
+ return bfvService.getOne(new QueryWrapper<BenefitsVideos>().eq("id", id).eq("state", 1));
}
-
-
@ResponseBody
@@ -127,19 +131,20 @@
@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-看视频得奖励"})
@@ -148,12 +153,12 @@
@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){
+ 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){
+ } catch (Exception e) {
e.printStackTrace();
return ResultUtil.runErr();
}
@@ -170,20 +175,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
@@ -193,15 +197,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();
}
@@ -217,12 +221,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