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-management/src/main/java/com/dsh/guns/modular/system/controller/code/TWelfareVideoController.java | 40 ++++++++++++++++++++++------------------
1 files changed, 22 insertions(+), 18 deletions(-)
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TWelfareVideoController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TWelfareVideoController.java
index a0b3d26..effa3e3 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TWelfareVideoController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TWelfareVideoController.java
@@ -2,10 +2,8 @@
import com.dsh.course.feignClient.activity.BenefitsVideoClient;
-import com.dsh.course.feignClient.activity.model.BenefitsVedioChangeStateVO;
-import com.dsh.course.feignClient.activity.model.BenefitsVideoClassification;
-import com.dsh.course.feignClient.activity.model.BenefitsVideos;
-import com.dsh.course.feignClient.activity.model.QueryBenefitsVedioVO;
+import com.dsh.course.feignClient.activity.PointMercharsClient;
+import com.dsh.course.feignClient.activity.model.*;
import com.dsh.course.feignClient.course.CourseClient;
import com.dsh.course.feignClient.course.model.CourseChangeStateDTO;
import com.dsh.guns.config.UserExt;
@@ -13,6 +11,7 @@
import com.dsh.guns.modular.system.model.TQueryBenefitsVO;
import com.dsh.guns.modular.system.model.TQueryBenefitsVideosDTO;
import com.dsh.guns.modular.system.model.TQueryBenefitsVideosVO;
+import com.dsh.guns.modular.system.model.dto.GetBenefitVideoById;
import com.dsh.guns.modular.system.util.ResultUtil;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -23,6 +22,7 @@
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
+import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@@ -92,14 +92,7 @@
@RequestMapping("/addBenefitsVideos/{id}")
public String addBenefitsVideos(Model model,@PathVariable("id")Integer id) {
model.addAttribute("id",id);
- List<BenefitsVideos> benefitVideoById = benefitsVideoClient.getBenefitVideoById(id);
-// // 所选福利视频分类下的视频的courseId集合
-// List<Integer> list = new ArrayList<>();
-// for (BenefitsVideos benefitsVideos : benefitVideoById) {
-// list.add(benefitsVideos.getCourseId());
-// }
TQueryBenefitsVideosDTO dto = new TQueryBenefitsVideosDTO();
-// dto.setCoursIds(list);
List<TQueryBenefitsVideosVO> courseByCourseIds = courseClient.getCourseByCourseIds(dto);
List<TQueryBenefitsVideosVO> tQueryBenefitsVideosVOS = new ArrayList<>();
for (TQueryBenefitsVideosVO courseByCourseId : courseByCourseIds) {
@@ -118,7 +111,7 @@
public String infoBenefitsVideos(Model model, @PathVariable("id") Integer id,@PathVariable("type") Integer type,@PathVariable("benefitsVideosId") Integer benefitsVideosId) {
TQueryBenefitsVideosVO tQueryBenefitsVideosVO = new TQueryBenefitsVideosVO();
BenefitsVideos benefitVideosById = benefitsVideoClient.getBenefitVideosById(benefitsVideosId);
- TCourse tCourse = courseClient.queryCourseById(id);
+ TCourse tCourse = courseClient.queryCourseById(benefitVideosById.getCourseId());
BeanUtils.copyProperties(tCourse,tQueryBenefitsVideosVO);
tQueryBenefitsVideosVO.setIntegral(benefitVideosById.getIntegral());
tQueryBenefitsVideosVO.setBenefitsVideosId(benefitVideosById.getId());
@@ -161,7 +154,10 @@
@ResponseBody
public List<TQueryBenefitsVideosVO> listBenefitsVideos(@PathVariable("id")Integer bId, String name, Integer type, Integer state) {
TQueryBenefitsVideosDTO vo = new TQueryBenefitsVideosDTO();
- List<BenefitsVideos> benefitVideoById = benefitsVideoClient.getBenefitVideoById(bId);
+ GetBenefitVideoById getBenefitVideoById = new GetBenefitVideoById();
+ getBenefitVideoById.setBenefitsVideoClassificationId(bId);
+ getBenefitVideoById.setState(state);
+ List<BenefitsVideos> benefitVideoById = benefitsVideoClient.getBenefitVideoById(getBenefitVideoById);
vo.setCoursIds(new ArrayList<>());
for (BenefitsVideos benefitsVideos : benefitVideoById) {
// 获取课程id集合
@@ -176,9 +172,11 @@
List<TQueryBenefitsVideosVO> courseByCourseIds = courseClient.getCourseByCourseIds(vo);
for (BenefitsVideos benefitsVideos : benefitVideoById) {
for (TQueryBenefitsVideosVO courseByCourseId : courseByCourseIds) {
- if (benefitsVideos.getCourseId() == courseByCourseId.getId()){
+ if (benefitsVideos.getCourseId().equals(courseByCourseId.getId())){
courseByCourseId.setIntegral(benefitsVideos.getIntegral());
courseByCourseId.setBenefitsVideosId(benefitsVideos.getId());
+ courseByCourseId.setState(benefitsVideos.getState());
+ courseByCourseId.setInsertTime(benefitsVideos.getInsertTime());
}
}
}
@@ -204,9 +202,9 @@
if (bvcf.getId()!=null){
return benefitsVideoClient.addBenefitsVideos(bvcf);
}else {
- bvcf.setState(1);
- bvcf.setInsertTime(new Date());
- return benefitsVideoClient.addBenefitsVideos(bvcf);
+ bvcf.setState(1);
+ bvcf.setInsertTime(new Date());
+ return benefitsVideoClient.addBenefitsVideos(bvcf);
}
}
@@ -227,10 +225,16 @@
*
* @return
*/
+
+ @Resource
+ private PointMercharsClient mercharsClient;
@RequestMapping("/changeCourseState")
@ResponseBody
public Object changeCourseState(@RequestBody CourseChangeStateDTO dto){
- courseClient.changeState(dto);
+ ChangeBenefitsVedioState changeBenefitsVedioState = new ChangeBenefitsVedioState();
+ changeBenefitsVedioState.setId(dto.getIds().get(0));
+ changeBenefitsVedioState.setState(dto.getState());
+ benefitsVideoClient.changeBenefitsVedioState(changeBenefitsVedioState);
return ResultUtil.success();
}
--
Gitblit v1.7.1