合并代码

无关风月

2025-01-21 8f2abbbda6c87c59d0c2c5da9979e78ea38e74db

 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) {
@@ -120,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());
@@ -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集合
@@ -182,12 +176,10 @@
                    courseByCourseId.setIntegral(benefitsVideos.getIntegral());
                    courseByCourseId.setBenefitsVideosId(benefitsVideos.getId());
                    courseByCourseId.setState(benefitsVideos.getState());
                    courseByCourseId.setInsertTime(benefitsVideos.getInsertTime());
                }
            }
        }



        return courseByCourseIds;
    }
    /**
@@ -210,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);
        }
    }

@@ -239,10 +231,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();
    }