判断重复

zhongzheng-admin/src/main/java/com/zhongzheng/controller/grade/ClassGradeController.java

@@ -75,6 +75,7 @@ public class ClassGradeController extends BaseController {
         ClassGradeVo classGradeVo = iClassGradeService.queryList(bo).get(0);
         List<Integer> integers = new ArrayList<>();
         Integer status =1;
+        //判断字段是否填写，填写出现按钮
         if (classGradeVo.getInterfacePushId() != null ){
             integers.add(1);
         }

zhongzheng-admin/src/main/java/com/zhongzheng/controller/polyv/PolyvVideoController.java

@@ -94,8 +94,10 @@ public class PolyvVideoController extends BaseController {
      */
     @ApiOperation("查询保利威视频")
     @PreAuthorize("@ss.hasPermi('polyv:video:list')")
-    @GetMapping("/list")
-    public TableDataInfo<PolyvVideoVo> listPolyv(PolyvVideoQueryBo bo) throws Exception {
+    @PostMapping("/importList")
+    public TableDataInfo<PolyvVideoVo> listPolyv(@RequestBody PolyvVideoQueryBo bo) throws Exception {
+        bo.setPageSize(100000);
+        bo.setPageNum(1);
         TableDataInfo list = iPolyvVideoService.queryPolyv(bo);
         return list;
     }

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/service/impl/CourseStreamingServiceImpl.java

@@ -76,7 +76,7 @@ public class CourseStreamingServiceImpl extends ServiceImpl<CourseStreamingMappe
         lqw.eq(StrUtil.isNotBlank(bo.getIntroduce()), CourseStreaming::getIntroduce, bo.getIntroduce());
         lqw.eq(StrUtil.isNotBlank(bo.getRecordingVideoId()), CourseStreaming::getRecordingVideoId, bo.getRecordingVideoId());
         lqw.eq(StrUtil.isNotBlank(bo.getPlaybackUrl()), CourseStreaming::getPlaybackUrl, bo.getPlaybackUrl());
-        lqw.eq(bo.getStatus() != null, CourseStreaming::getStatus, bo.getStatus());
+        lqw.in(bo.getStatus() != null, CourseStreaming::getStatus, bo.getStatus());
         return entity2Vo(this.list(lqw));
     }
 

zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/service/impl/ClassGradeServiceImpl.java

@@ -336,7 +336,7 @@ public class ClassGradeServiceImpl extends ServiceImpl<ClassGradeMapper, ClassGr
     public List<ClassGradeStudentVo> listGrade(ClassGradeUserQueryBo bo) {
         //查找班级学员
         List<ClassGradeStudentVo> classGradeStudentVos = baseMapper.listGrade(bo);
-        //得到每个学员
+        //得到每个学员的课程学习记录
         for (ClassGradeStudentVo classGradeStudentVo : classGradeStudentVos) {
             Long secLong = 0L;
             Long studyLong = 0L;
@@ -368,6 +368,7 @@ public class ClassGradeServiceImpl extends ServiceImpl<ClassGradeMapper, ClassGr
         ClassGradeQueryBo classGradeQueryBo = new ClassGradeQueryBo();
         classGradeQueryBo.setGradeId(bo.getGradeId());
         ClassGradeVo classGradeVo = entity2Vo(baseMapper.queryList(classGradeQueryBo)).get(0);
+        //判断学员是否能加入班级
         if ((classGradeVo.getStudentUpper() - classGradeVo.getStudentNum()) < bo.getUserId().length) {
             throw new IllegalArgumentException("当前班级超出上限，不允许添加这么多学员");
         }

zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/service/impl/ClassGradeUserServiceImpl.java

@@ -145,7 +145,9 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
 
     @Override
     public List<ClassPeriodStudentVo> listUserPeriod(ClassGradeUserQueryBo bo) {
+        //查询班级学员信息
         List<ClassPeriodStudentVo> classPeriodStudentVos = baseMapper.listUserPeriod(bo);
+        //查找学员学习记录
         for (ClassPeriodStudentVo classPeriodStudentVo : classPeriodStudentVos) {
             Long secLong = 0L;
             Long studyLong = 0L;
@@ -176,6 +178,7 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
             ClassPeriodUserVo classPeriodUserVos = classPeriodUserVos1.get(0);
             classPeriodUserVos.setPending(classPeriodStudentVo.getSecAllNum()-classPeriodUserVos.getPass()-classPeriodUserVos.getCheat());
             classPeriodUserVos.setExamPending(classPeriodUserVos.getExamNum()-classPeriodUserVos.getExamPass()-classPeriodUserVos.getExamCheat());
+            //當前班級學員審核狀態 -1不可审核 0待審  1未通过 2通过
             if (classPeriodStudentVo.getStuAllNum().equals(classPeriodStudentVo.getSecAllNum()) && classPeriodStudentVo.getExamNum().equals(classPeriodStudentVo.getRecordNum())){
                 if (classPeriodUserVos.getPending() != 0 || classPeriodUserVos.getExamPending() != 0){
                     classPeriodStudentVo.setAllStatus(0);
@@ -189,6 +192,7 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
             }
             classPeriodStudentVo.setWaitRebuildNum(classPeriodUserVos.getCheat());
             if (!CollectionUtils.isEmpty(baseMapper.selectStart(classPeriodStudentVo.getUserId(),classPeriodStudentVo.getGoodsId(),classPeriodStudentVo.getGradeId()))) {
+                //查找开始学习时间
                 classPeriodStudentVo.setStartTime(baseMapper.selectStart(classPeriodStudentVo.getUserId(),classPeriodStudentVo.getGoodsId(),classPeriodStudentVo.getGradeId()).get(0));
             }
         }

zhongzheng-system/src/main/java/com/zhongzheng/modules/polyv/bo/PolyvVideoQueryBo.java

@@ -1,11 +1,13 @@
 package com.zhongzheng.modules.polyv.bo;
 
+import com.zhongzheng.modules.course.bo.CourseStreamingBusinessAddBo;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 import java.util.Date;
+import java.util.List;
 import java.util.Map;
 import java.util.HashMap;
 
@@ -65,7 +67,7 @@ public class PolyvVideoQueryBo extends BaseEntity {
 	private String mp4_2;
 	/** 分类id， 如1为根目录 */
 	@ApiModelProperty("分类id， 如1为根目录")
-	private String cataid;
+	private Long cataid;
 	/** 超清码率mp4格式视频地址 */
 	@ApiModelProperty("超清码率mp4格式视频地址")
 	private String mp4_3;
@@ -167,4 +169,14 @@ public class PolyvVideoQueryBo extends BaseEntity {
 	@ApiModelProperty("视频标题")
 	private String keyword;
 
+	@ApiModelProperty("流地址类型 1正式 2测试")
+	private Long streamingAddressType;
+	/** 描述 */
+	@ApiModelProperty("描述")
+	private String introduce;
+
+	/** 业务层级列表 */
+	@ApiModelProperty("业务层级列表")
+	private List<CourseStreamingBusinessAddBo> businessList;
+
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/polyv/service/impl/PolyvVideoServiceImpl.java

@@ -12,8 +12,15 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 import com.zhongzheng.common.core.page.TableDataInfo;
 import com.zhongzheng.common.core.redis.RedisCache;
 import com.zhongzheng.common.utils.DateUtils;
+import com.zhongzheng.common.utils.ServletUtils;
 import com.zhongzheng.common.utils.http.HttpUtils;
 import com.zhongzheng.common.utils.polyv.PolyvUtils;
+import com.zhongzheng.modules.course.bo.CourseStreamingBusinessAddBo;
+import com.zhongzheng.modules.course.bo.CourseStreamingQueryBo;
+import com.zhongzheng.modules.course.domain.CourseStreaming;
+import com.zhongzheng.modules.course.service.ICourseStreamingBusinessService;
+import com.zhongzheng.modules.course.service.ICourseStreamingService;
+import com.zhongzheng.modules.course.vo.CourseStreamingVo;
 import com.zhongzheng.modules.inform.bo.InformClassifyEditBo;
 import com.zhongzheng.modules.inform.domain.InformClassify;
 import com.zhongzheng.modules.polyv.bo.PolyvCataQueryBo;
@@ -71,6 +78,12 @@ public class PolyvVideoServiceImpl extends ServiceImpl<PolyvVideoMapper, PolyvVi
     @Autowired
     private IPolyvCataService iPolyvCataService;
 
+    @Autowired
+    private ICourseStreamingService iCourseStreamingService;
+
+    @Autowired
+    private ICourseStreamingBusinessService iCourseStreamingBusinessService;
+
     @Override
     @Transactional(rollbackFor = Exception.class)
     public PolyvVideoQuerVo queryById(String VId) throws Exception {
@@ -318,14 +331,16 @@ public class PolyvVideoServiceImpl extends ServiceImpl<PolyvVideoMapper, PolyvVi
 
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public TableDataInfo<PolyvVideoVo> queryPolyv(PolyvVideoQueryBo bo) throws Exception {
         //获得保利威sign
         Long ptime = System.currentTimeMillis();
         Map<String,String> map = new HashMap<>();
         //发送请求
         String param = "ptime="+ptime;
-        if (StringUtils.isNotBlank(bo.getCataid())){
+        if (bo.getCataid() != null){
             param = param.concat("&cataid="+bo.getCataid());
+            map.put("cataid",bo.getCataid().toString());
         }
         if (bo.getPageSize() != null){
             param =param.concat("&numPerPage="+bo.getPageSize());
@@ -349,6 +364,37 @@ public class PolyvVideoServiceImpl extends ServiceImpl<PolyvVideoMapper, PolyvVi
         JSONArray jsonArray=jsonObject.getJSONArray("data");
         Object total = jsonObject.get("total");
         List<PolyvVideoVo> list=jsonArray.toJavaList(PolyvVideoVo.class);
+        for (PolyvVideoVo polyvVideoVo : list) {
+            CourseStreamingQueryBo courseStreamingQueryBo = new CourseStreamingQueryBo();
+            courseStreamingQueryBo.setRecordingVideoId(polyvVideoVo.getVid());
+            List<Integer> status = new ArrayList<>();
+            status.add(1);
+            courseStreamingQueryBo.setStatus(status);
+            List<CourseStreamingVo> courseStreamingVos = iCourseStreamingService.selectList(courseStreamingQueryBo);
+            if (CollectionUtils.isEmpty(courseStreamingVos)) {
+                CourseStreaming add = new CourseStreaming();
+                add.setCode(ServletUtils.getEncoded("L"));
+                add.setRecordingVideoId(polyvVideoVo.getVid());
+                add.setStreamingAddressType(bo.getStreamingAddressType());
+                add.setStreamingName(polyvVideoVo.getTitle());
+                add.setStreamingType(2L);
+                add.setPlaybackUrl(polyvVideoVo.getMp4());
+                add.setIntroduce(bo.getIntroduce());
+                add.setStatus(1);
+                add.setCreateTime(DateUtils.getNowTime());
+                add.setUpdateTime(DateUtils.getNowTime());
+                boolean result = iCourseStreamingService.save(add);
+                if (result) {
+                    if (!CollectionUtils.isEmpty(bo.getBusinessList())) {
+                        for (int i = 0; i < bo.getBusinessList().size(); i++) {
+                            CourseStreamingBusinessAddBo item = bo.getBusinessList().get(i);
+                            item.setStreamingId(add.getId());
+                            iCourseStreamingBusinessService.insertByAddBo(item);
+                        }
+                    }
+                }
+            }
+        }
         TableDataInfo tableDataInfo = new TableDataInfo();
         tableDataInfo.setRows(list);
         tableDataInfo.setTotal(Convert.toLong(total));

zhongzheng-system/src/main/resources/mapper/modules/course/CourseStreamingMapper.xml

@@ -99,6 +99,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="streamingName != null and streamingName != ''">
             AND cs.streaming_name like concat('%', #{streamingName}, '%')
         </if>
+        <if test="recordingVideoId != null and recordingVideoId != ''">
+            AND cs.recording_video_id = #{recordingVideoId}
+        </if>
         <if test="status != null and status.size()!=0 ">
             AND cs.status in
             <foreach collection="status" item="item" index="index" open="(" close=")" separator=",">