From a4d873761dd03a74950d05f204171255509bd5fb Mon Sep 17 00:00:00 2001
From: zhibing.pu <393733352@qq.com>
Date: 星期一, 17 六月 2024 16:03:35 +0800
Subject: [PATCH] 修改 bug
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TWelfareVideoController.java | 30 ++++++++++--------------------
1 files changed, 10 insertions(+), 20 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 1126a4c..b2ed1d4 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
@@ -3,10 +3,7 @@
import com.dsh.course.feignClient.activity.BenefitsVideoClient;
import com.dsh.course.feignClient.activity.PointMercharsClient;
-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.model.*;
import com.dsh.course.feignClient.course.CourseClient;
import com.dsh.course.feignClient.course.model.CourseChangeStateDTO;
import com.dsh.guns.config.UserExt;
@@ -14,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;
@@ -94,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) {
@@ -163,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集合
@@ -179,16 +173,12 @@
for (BenefitsVideos benefitsVideos : benefitVideoById) {
for (TQueryBenefitsVideosVO courseByCourseId : courseByCourseIds) {
if (benefitsVideos.getCourseId().equals(courseByCourseId.getId())){
- courseByCourseId.setId(benefitsVideos.getId());
courseByCourseId.setIntegral(benefitsVideos.getIntegral());
courseByCourseId.setBenefitsVideosId(benefitsVideos.getId());
courseByCourseId.setState(benefitsVideos.getState());
}
}
}
-
-
-
return courseByCourseIds;
}
/**
@@ -240,10 +230,10 @@
@RequestMapping("/changeCourseState")
@ResponseBody
public Object changeCourseState(@RequestBody CourseChangeStateDTO dto){
-
- courseClient.changeState(dto);
- mercharsClient.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