he2802 vor 3 Jahren
Ursprung
Commit
a6d9fff21f

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

@@ -202,6 +202,7 @@ public class ClassGradeController extends BaseController {
     @PreAuthorize("@ss.hasPermi('grade:grade:select')")
     @GetMapping("/select")
     public AjaxResult<Integer> select(ClassGradeAddBo bo) {
+        //自己公司的TenantId出现选择官方接口
         boolean tenantId = ServletUtils.getRequest().getHeader("TenantId").equals("867735392558919680");
         return AjaxResult.success(tenantId ? 1 : 0);
     }
@@ -308,9 +309,9 @@ public class ClassGradeController extends BaseController {
     }*/
 
 
-    /**
+   /* *//**
      * 学时审核
-     */
+     *//*
     @ApiOperation("学时审核第一次請求獲得商品的章節")
     @PreAuthorize("@ss.hasPermi('grade:user:list')")
     @GetMapping("/listPeriodAuditOne")
@@ -320,9 +321,9 @@ public class ClassGradeController extends BaseController {
         return getDataTable(list);
     }
 
-    /**
+    *//**
      * 学时审核
-     */
+     *//*
     @ApiOperation("学时审核獲得商品模塊下的章")
     @PreAuthorize("@ss.hasPermi('grade:user:list')")
     @GetMapping("/listPeriodAuditChapter")
@@ -332,9 +333,9 @@ public class ClassGradeController extends BaseController {
         return getDataTable(list);
     }
 
-    /**
+    *//**
      * 学时审核
-     */
+     *//*
     @ApiOperation("学时审核獲得商品章下面的節")
     @PreAuthorize("@ss.hasPermi('grade:user:list')")
     @GetMapping("/listPeriodAuditSection")
@@ -343,7 +344,7 @@ public class ClassGradeController extends BaseController {
         List<ClassPeriodSectionVo> list = iClassGradeUserService.listPeriodAuditSection(bo);
         return getDataTable(list);
     }
-
+*/
     /**
      * 学时审核
      */

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

@@ -83,17 +83,17 @@ public class PolyvVideoController extends BaseController {
      * 查询保利威视频分类
      */
     @ApiOperation("更新视频分类")
-    @PreAuthorize("@ss.hasPermi('modules.polyv:video:list')")
+    @PreAuthorize("@ss.hasPermi('modules.polyv:video:edit')")
     @PostMapping("/cata")
-    public  AjaxResult<List<PolyvCataData>> list(PolyvVideoQueryBo bo) throws Exception {
+    public  AjaxResult list(@RequestBody PolyvVideoQueryBo bo) throws Exception {
         List<PolyvCataData> list = iPolyvVideoService.queryCataList(bo);
-        return AjaxResult.success(list);
+        return AjaxResult.success();
     }
     /**
      * 查询考试安排列表
      */
-    @ApiOperation("查询保利威视频")
-    @PreAuthorize("@ss.hasPermi('polyv:video:list')")
+    @ApiOperation("同步保利威视频")
+    @PreAuthorize("@ss.hasPermi('polyv:video:edit')")
     @PostMapping("/importList")
     public TableDataInfo<PolyvVideoVo> listPolyv(@RequestBody PolyvVideoQueryBo bo) throws Exception {
         bo.setPageSize(100000);

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

@@ -201,6 +201,7 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
 
     @Override
     public List<ClassPeriodUserVo> listPeriod(ClassGradeUserQueryBo bo) {
+        //班级学员信息
         List<ClassPeriodUserVo> classPeriodUserVos = baseMapper.listPeriod(bo);
         for (ClassPeriodUserVo classPeriodUserVo : classPeriodUserVos) {
             Long secLong = 0L;
@@ -210,6 +211,7 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
             subjectStudyRecordQueryBo.setUserId(bo.getUserId());
             subjectStudyRecordQueryBo.setGradeId(bo.getGradeId());
             List<SubjectStudyRecordVo> subjectStudyRecordVos = iUserStudyRecordService.listSubject(subjectStudyRecordQueryBo);
+            //班级下每个课程得学习节数和总节数累加
             for (SubjectStudyRecordVo subjectStudyRecordVo : subjectStudyRecordVos) {
                 secLong = new BigDecimal(secLong.toString()).add(new BigDecimal(subjectStudyRecordVo.getSectionNum().toString())).longValue();
                 studyLong = new BigDecimal(studyLong.toString()).add(new BigDecimal(subjectStudyRecordVo.getRecordNum().toString())).longValue();
@@ -217,11 +219,13 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
             }
             //BigDecimal divide = new BigDecimal(studyLong.toString()).divide(new BigDecimal(secLong.toString()),2,BigDecimal.ROUND_HALF_UP);
             //classGradeStudentVo.setStudyNum(divide.multiply(new BigDecimal("100")).longValue());
+            //总节数
             classPeriodUserVo.setSecAllNum(secLong);
+            //学习节数
             classPeriodUserVo.setStuAllNum(studyLong);
             classPeriodUserVo.setPending(classPeriodUserVo.getSecAllNum()-classPeriodUserVo.getPass()-classPeriodUserVo.getCheat());
             classPeriodUserVo.setExamPending(classPeriodUserVo.getExamNum()-classPeriodUserVo.getExamPass()-classPeriodUserVo.getExamCheat());
-
+                //當前班級學員審核狀態 -1不可审核 0待審  1未通过 2通过
             if (classPeriodUserVo.getStuAllNum().equals(classPeriodUserVo.getSecAllNum()) && classPeriodUserVo.getExamNum().equals(classPeriodUserVo.getRecordNum())){
                 if (classPeriodUserVo.getPending() != 0 || classPeriodUserVo.getExamPending() != 0){
                     classPeriodUserVo.setAllStatus(0);
@@ -239,10 +243,11 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
 
     @Override
     public List<ClassPeriodVo> listPeriodAudit(ClassGradeUserQueryBo bo) {
-        //查找最外层课程目录
+        //查找最外层课程目录 模块 章 节
         List<ClassPeriodVo> classPeriodVos = baseMapper.listPeriodAudit(bo);
         classPeriodVos.addAll(baseMapper.listPeriodAuditSection(bo));
         for (ClassPeriodVo classPeriodVo : classPeriodVos) {
+            //为模块搜索下面的章 和节 并搜索学时记录
             if (classPeriodVo.getType() == 1){
                 List<ClassPeriodChapterVo> classPeriodChapterVos = baseMapper.listperiodChapter(classPeriodVo.getId(), bo.getGoodsId(),classPeriodVo.getCourseId(), bo.getUserId(),bo.getGradeId());
                 for (ClassPeriodChapterVo classPeriodChapterVo : classPeriodChapterVos) {
@@ -319,6 +324,7 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
                 }
                 classPeriodVo.setClassPeriods(classPeriodChapterVos);
             }
+            //为章搜索节记录和学时记录
             if (classPeriodVo.getType() == 2){
                 List<ClassPeriodSectionVo> classPeriodSectionVos = baseMapper.listPeriodSection(classPeriodVo.getId(), bo.getGoodsId(), classPeriodVo.getCourseId(), bo.getUserId());
                 for (ClassPeriodSectionVo classPeriodSectionVo : classPeriodSectionVos) {
@@ -388,6 +394,8 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
                 classPeriodSectionVos.addAll(classPeriodSectionVos1);
                 classPeriodVo.setClassPeriodSectionList(classPeriodSectionVos);
             }
+
+            //为节搜索学时记录
             if (classPeriodVo.getType() == 3){
                 UserPeriodQueryBo userPeriodQueryBo = new UserPeriodQueryBo();
                 userPeriodQueryBo.setSectionId(classPeriodVo.getId());
@@ -445,12 +453,15 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
 
     @Override
     public ClassPeriodSectionVo listPeriodAuditStatus(UserPeriodQueryBo bo) {
+        //获得审核节的所有记录
         List<UserPeriodStatusVo> userPeriodStatusVos = userPeriodStatusService.selectPeriodStatus(bo);
+        //获得照片记录
         for (UserPeriodStatusVo userPeriodStatusVo : userPeriodStatusVos) {
             LambdaQueryWrapper<UserStudyRecordPhoto> lqw = Wrappers.lambdaQuery();
             lqw.eq(UserStudyRecordPhoto::getPeriodId,userPeriodStatusVo.getId());
             userPeriodStatusVo.setUserStudyRecordPhotoList(entity2PhotoVo(userStudyRecordPhotoService.list(lqw)));
         }
+        //取前端获得需要的第几条记录
         int numIndex = Convert.toInt(bo.getNumIndex()) - 1;
         UserPeriodStatusVo userPeriodStatusVo = userPeriodStatusVos.get(numIndex);
         ClassPeriodSectionVo classPeriodSectionVo = BeanUtil.toBean(bo, ClassPeriodSectionVo.class);
@@ -467,6 +478,7 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
         classPeriodSectionVo.setPeriodStatus(userPeriodStatusVo.getPeriodStatus());
         classPeriodSectionVo.setPeriodId(userPeriodStatusVo.getPeriodId());
         classPeriodSectionVo.setPeriodStatusId(userPeriodStatusVo.getId());
+        //判断是节还是试卷
         if (bo.getSectionId() != null) {
             classPeriodSectionVo.setId(bo.getSectionId());
             classPeriodSectionVo.setType(3L);

+ 14 - 1
zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/service/impl/UserPeriodServiceImpl.java

@@ -132,7 +132,7 @@ public class UserPeriodServiceImpl extends ServiceImpl<UserPeriodMapper, UserPer
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Boolean updateByEditBo(UserPeriodEditBo bo) {
-
+        //更改审核状态
         UserPeriodStatus userUp = new UserPeriodStatus();
         userUp.setPeriodStatus(1);
         userUp.setId(bo.getId());
@@ -148,6 +148,7 @@ public class UserPeriodServiceImpl extends ServiceImpl<UserPeriodMapper, UserPer
         lqw.eq(userPeriodVo.getGoodsId() != null, UserPeriod::getGoodsId, userPeriodVo.getGoodsId());
         lqw.eq(userPeriodVo.getGradeId() != null, UserPeriod::getGradeId, userPeriodVo.getGradeId());
         List<UserPeriod> listPeriodVo = this.list(lqw);
+        //通过情况下判断是否已经全部审核完成,完成发送消息
         if (bo.getStatus().equals(1)) {
             for (UserPeriod userPeriod : listPeriodVo) {
                 LambdaQueryWrapper<UserPeriodStatus> userPeriods = Wrappers.lambdaQuery();
@@ -155,6 +156,7 @@ public class UserPeriodServiceImpl extends ServiceImpl<UserPeriodMapper, UserPer
                 userPeriods.eq(UserPeriodStatus::getPeriodStatus, 1);
                 userPeriods.eq(UserPeriodStatus::getStatus, 1);
                 List<UserPeriodStatus> list1 = userPeriodStatusService.list(userPeriods);
+                //只有有一个不是通过即返回
                 if (CollectionUtils.isEmpty(list1)) {
                     return true;
                 }
@@ -164,9 +166,11 @@ public class UserPeriodServiceImpl extends ServiceImpl<UserPeriodMapper, UserPer
             userPeriodEditBo.setGoodsId(userPeriodVo.getGoodsId());
             userPeriodEditBo.setGradeId(userPeriodVo.getGradeId());
             userPeriodEditBo.setStatus(bo.getStatus());
+            //发送消息
             sendPeriodSMS(userPeriodEditBo);
             sendPeriodSevenSMS(userPeriodEditBo);
 
+            //修改学员班级审核状态
             LambdaQueryWrapper<ClassGradeUser> classGradeUser = Wrappers.lambdaQuery();
             classGradeUser.eq(ClassGradeUser::getUserId, userPeriodVo.getUserId());
             classGradeUser.eq(ClassGradeUser::getGradeId, userPeriodVo.getGradeId());
@@ -176,12 +180,14 @@ public class UserPeriodServiceImpl extends ServiceImpl<UserPeriodMapper, UserPer
             List<ClassGradeUser> list1 = iClassGradeUserService.list(classGradeUser);
             iClassGradeUserService.update(classGradeUser1, classGradeUser);
         } else {
+            //作弊情况下判断是否已经全部审核完成,完成发送消息
             for (UserPeriod userPeriod : listPeriodVo) {
                 LambdaQueryWrapper<UserPeriodStatus> userPeriods = Wrappers.lambdaQuery();
                 userPeriods.eq(UserPeriodStatus::getPeriodId, userPeriod.getId());
                 userPeriods.eq(UserPeriodStatus::getPeriodStatus, 1);
                 userPeriods.notIn(UserPeriodStatus::getStatus, 1);
                 List<UserPeriodStatus> list1 = userPeriodStatusService.list(userPeriods);
+                //只有有一个不是作弊即返回
                 if (CollectionUtils.isEmpty(list1)) {
                     return true;
                 }
@@ -191,8 +197,11 @@ public class UserPeriodServiceImpl extends ServiceImpl<UserPeriodMapper, UserPer
             userPeriodEditBo.setGoodsId(userPeriodVo.getGoodsId());
             userPeriodEditBo.setGradeId(userPeriodVo.getGradeId());
             userPeriodEditBo.setStatus(bo.getStatus());
+            //发送消息
             sendPeriodSMS(userPeriodEditBo);
             sendPeriodSevenSMS(userPeriodEditBo);
+
+            //更改班级学员为未通过
             LambdaQueryWrapper<ClassGradeUser> classGradeUser = Wrappers.lambdaQuery();
             classGradeUser.eq(ClassGradeUser::getUserId, userPeriodVo.getUserId());
             classGradeUser.eq(ClassGradeUser::getGradeId, userPeriodVo.getGradeId());
@@ -226,11 +235,13 @@ public class UserPeriodServiceImpl extends ServiceImpl<UserPeriodMapper, UserPer
     @Override
     @Transactional(rollbackFor = Exception.class)
     public boolean editPeriodAll(UserPeriodEditBo bo) {
+        //查询所有审核记录
         LambdaQueryWrapper<UserPeriod> lqw = Wrappers.lambdaQuery();
         lqw.eq(bo.getUserId() != null, UserPeriod::getUserId, bo.getUserId());
         lqw.eq(bo.getGoodsId() != null, UserPeriod::getGoodsId, bo.getGoodsId());
         lqw.eq(bo.getGradeId() != null, UserPeriod::getGradeId, bo.getGradeId());
         List<UserPeriod> list = this.list(lqw);
+        //更改审核状态
         for (UserPeriod userPeriod : list) {
             UserPeriodStatus userPeriodStatus = new UserPeriodStatus();
             userPeriodStatus.setPeriodStatus(1);
@@ -241,6 +252,7 @@ public class UserPeriodServiceImpl extends ServiceImpl<UserPeriodMapper, UserPer
             userPeriods.eq(UserPeriodStatus::getPeriodStatus, 1);
             userPeriodStatusService.update(userPeriodStatus, userPeriods);
         }
+        //更新班级学员信息
         LambdaQueryWrapper<ClassGradeUser> classGradeUser = Wrappers.lambdaQuery();
         classGradeUser.eq(ClassGradeUser::getUserId, bo.getUserId());
         classGradeUser.eq(ClassGradeUser::getGradeId, bo.getGradeId());
@@ -248,6 +260,7 @@ public class UserPeriodServiceImpl extends ServiceImpl<UserPeriodMapper, UserPer
         classGradeUser1.setPeriodStatus(bo.getStatus());
         classGradeUser1.setUpdateTime(DateUtils.getNowTime());
         iClassGradeUserService.update(classGradeUser1, classGradeUser);
+        //发送消息
         sendPeriodSMS(bo);
         sendPeriodSevenSMS(bo);
         return true;

+ 1 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/inform/service/impl/InformRemindServiceImpl.java

@@ -142,6 +142,7 @@ public class InformRemindServiceImpl extends ServiceImpl<InformRemindMapper, Inf
         InformRemind update = BeanUtil.toBean(bo, InformRemind.class);
         validEntityBeforeSave(update);
         update.setUpdateTime(DateUtils.getNowTime());
+        //新增业务
         if (bo.getBusinessId() != null) {
             LambdaQueryWrapper<InformRemindBusiness> lqw = Wrappers.lambdaQuery();
             lqw.eq(InformRemindBusiness::getRemindId, bo.getId());

+ 2 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/inform/service/impl/InformServiceImpl.java

@@ -137,6 +137,7 @@ public class InformServiceImpl extends ServiceImpl<InformMapper, Inform> impleme
         add.setUpdateTime(DateUtils.getNowTime());
         add.setCreateBy(SecurityUtils.getUsername());
         boolean save = this.save(add);
+        //添加通知的课程和题库
         for (InformExamAddBo informExamAddBo : bo.getInformExamAddBo()) {
             informExamAddBo.setInformId(add.getInformId());
             iInformExamService.insertByAddBo(informExamAddBo);
@@ -145,6 +146,7 @@ public class InformServiceImpl extends ServiceImpl<InformMapper, Inform> impleme
             informCourseAddBo.setInformId(add.getInformId());
             iInformCourseService.insertByAddBo(informCourseAddBo);
         }
+        //添加学员
         for (Long userId : bo.getUserId()) {
             //筛选没有商品的学员出去
             if (bo.getOrderStatus().equals(2)) {

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

@@ -246,6 +246,8 @@ public class PolyvVideoServiceImpl extends ServiceImpl<PolyvVideoMapper, PolyvVi
         if (HttpStatus.HTTP_OK != Convert.toInt(jsonObject.get("code"))){
             throw new RuntimeException(Convert.toStr(jsonObject.get("message")));
         }
+        LambdaQueryWrapper<PolyvCata> lqw = Wrappers.lambdaQuery();
+        iPolyvCataService.remove(lqw);
         //将数据加入数据库
         JSONArray jsonArray=jsonObject.getJSONArray("data");
         List<PolyvCataData> list=jsonArray.toJavaList(PolyvCataData.class);
@@ -253,45 +255,7 @@ public class PolyvVideoServiceImpl extends ServiceImpl<PolyvVideoMapper, PolyvVi
             PolyvCataQueryBo polyvCataQueryBo = new PolyvCataQueryBo();
             polyvCataQueryBo.setCataid(polyvCataData.getCataid());
             List<PolyvCataVo> polyvCataVos = iPolyvCataService.queryList(polyvCataQueryBo);
-            if (CollectionUtils.isNotEmpty(polyvCataVos)){
-                PolyvCata polyvCata = BeanUtil.toBean(polyvCataData, PolyvCata.class);
-                LambdaQueryWrapper<PolyvCata> lqw = Wrappers.lambdaQuery();
-                lqw.eq( PolyvCata::getCataid, polyvCataData.getCataid());
-                polyvCata.setUpdateTime(DateUtils.getNowTime());
-                iPolyvCataService.update(polyvCata,lqw);
-                List<Nodes> listOne=polyvCataData.getNodes();
-                if (CollectionUtils.isNotEmpty(listOne)){
-                    for (Nodes cata : listOne) {
-                        PolyvCata polyvCataOne = BeanUtil.toBean(cata, PolyvCata.class);
-                        LambdaQueryWrapper<PolyvCata> lqwOne = Wrappers.lambdaQuery();
-                        lqw.eq( PolyvCata::getCataid, polyvCataData.getCataid());
-                        polyvCataOne.setUpdateTime(DateUtils.getNowTime());
-                        iPolyvCataService.update(polyvCataOne,lqwOne);
-                        List<Nodes> listTwo=cata.getNodes();
-                        if (CollectionUtils.isNotEmpty(listTwo)){
-                            for (Nodes cataTwo : listTwo) {
-                                PolyvCata polyvCataTwo = BeanUtil.toBean(cataTwo, PolyvCata.class);
-                                LambdaQueryWrapper<PolyvCata> lqwTwo = Wrappers.lambdaQuery();
-                                lqw.eq( PolyvCata::getCataid, polyvCataData.getCataid());
-                                polyvCataTwo.setUpdateTime(DateUtils.getNowTime());
-                                iPolyvCataService.update(polyvCataTwo,lqwTwo);
-                                List<Nodes> listThree=cataTwo.getNodes();
-                                if (CollectionUtils.isNotEmpty(listThree)){
-                                    for (Nodes cataThree : listThree) {
-                                        PolyvCata polyvCataThree = BeanUtil.toBean(cataThree, PolyvCata.class);
-                                        LambdaQueryWrapper<PolyvCata> lqwThree = Wrappers.lambdaQuery();
-                                        lqw.eq( PolyvCata::getCataid, polyvCataData.getCataid());
-                                        polyvCataThree.setUpdateTime(DateUtils.getNowTime());
-                                        iPolyvCataService.update(polyvCataThree,lqwThree);
-                                    }
-                                }
-                            }
-                        }
-                    }
-                }
-
 
-            }else {
                 PolyvCata polyvCata = BeanUtil.toBean(polyvCataData, PolyvCata.class);
                 polyvCata.setCreateTime(DateUtils.getNowTime());
                 polyvCata.setUpdateTime(DateUtils.getNowTime());
@@ -324,7 +288,7 @@ public class PolyvVideoServiceImpl extends ServiceImpl<PolyvVideoMapper, PolyvVi
                         }
                     }
                 }
-            }
+
         }
         return list;
     }
@@ -364,32 +328,34 @@ 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);
+        if (CollectionUtils.isEmpty(list)) {
+            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);
+                            }
                         }
                     }
                 }

+ 18 - 2
zhongzheng-system/src/main/java/com/zhongzheng/modules/user/service/impl/UserStudyRecordServiceImpl.java

@@ -18,8 +18,10 @@ import com.zhongzheng.modules.goods.vo.GoodsUserVo;
 import com.zhongzheng.modules.goods.vo.GoodsVo;
 import com.zhongzheng.modules.grade.bo.UserPeriodAddBo;
 import com.zhongzheng.modules.grade.bo.UserPeriodStatusAddBo;
+import com.zhongzheng.modules.grade.domain.ClassGradeUser;
 import com.zhongzheng.modules.grade.domain.UserPeriod;
 import com.zhongzheng.modules.grade.domain.UserPeriodStatus;
+import com.zhongzheng.modules.grade.service.IClassGradeUserService;
 import com.zhongzheng.modules.grade.service.IUserPeriodService;
 import com.zhongzheng.modules.grade.service.IUserPeriodStatusService;
 import com.zhongzheng.modules.grade.vo.UserPeriodStatusVo;
@@ -82,6 +84,9 @@ public class UserStudyRecordServiceImpl extends ServiceImpl<UserStudyRecordMappe
     @Autowired
     private IGoodsService iGoodsService;
 
+    @Autowired
+    private IClassGradeUserService iClassGradeUserService;
+
     @Autowired
     private com.zhongzheng.modules.alisms.service.IAliSmsService IAliSmsService;
 
@@ -190,6 +195,16 @@ public class UserStudyRecordServiceImpl extends ServiceImpl<UserStudyRecordMappe
             }
             //发送课时完成
             if (secLong.equals(studyLong)) {
+
+                LambdaQueryWrapper<ClassGradeUser> classGradeUser = Wrappers.lambdaQuery();
+                classGradeUser.eq(ClassGradeUser::getUserId, bo.getUserId());
+                classGradeUser.eq(ClassGradeUser::getGradeId, bo.getGradeId());
+                ClassGradeUser classGradeUser1 = new ClassGradeUser();
+                classGradeUser1.setPeriodStatus(2);
+                classGradeUser1.setUpdateTime(DateUtils.getNowTime());
+                List<ClassGradeUser> list1 = iClassGradeUserService.list(classGradeUser);
+                iClassGradeUserService.update(classGradeUser1, classGradeUser);
+
                 InformRemindQueryBo informRemindQueryBo = new InformRemindQueryBo();
                 informRemindQueryBo.setSort(8L);
                 List<InformRemindVo> list = iInformRemindService.queryList(informRemindQueryBo);
@@ -423,12 +438,13 @@ public class UserStudyRecordServiceImpl extends ServiceImpl<UserStudyRecordMappe
 
     @Override
     public List<GoodsStudyRecordVo> queryGoods(UserQueryBo bo) {
+        //查询学员拥有商品
         List<GoodsStudyRecordVo> list = baseMapper.queryGoods(bo);
 
         for (GoodsStudyRecordVo goodsStudyRecordVo : list) {
             Long secLong = 0L;
             Long studyLong = 0L;
-
+            //查询学习记录
             SubjectStudyRecordQueryBo subjectStudyRecordQueryBo = new SubjectStudyRecordQueryBo();
             subjectStudyRecordQueryBo.setGoodsId(goodsStudyRecordVo.getGoodsId());
             subjectStudyRecordQueryBo.setUserId(goodsStudyRecordVo.getUserId());
@@ -437,7 +453,7 @@ public class UserStudyRecordServiceImpl extends ServiceImpl<UserStudyRecordMappe
                 String sectionType = "";
                 secLong = new BigDecimal(secLong.toString()).add(new BigDecimal(subjectStudyRecordVo.getSectionNum().toString())).longValue();
                 studyLong = new BigDecimal(studyLong.toString()).add(new BigDecimal(subjectStudyRecordVo.getRecordNum().toString())).longValue();
-
+                //节里面有什么类型
                 if (CollectionUtils.isNotEmpty(baseMapper.sectionType(subjectStudyRecordVo.getCourseId(), 1L))) {
                     sectionType = sectionType.concat("1,");
                 }