fix 同步

zhongzheng-admin/src/main/java/com/zhongzheng/controller/common/CommonController.java

@@ -161,10 +161,9 @@ public class CommonController
     @GetMapping("common/jzs/test")
     public AjaxResult<Void> testList()
     {
-
         UserPeriodEditBo queryBo = new UserPeriodEditBo();
-        queryBo.setGoodsId(911L);
-        queryBo.setGradeId(792L);
+        queryBo.setGoodsId(916L);
+        queryBo.setGradeId(794L);
         queryBo.setUserId(114L);
         iUserPeriodService.syncStudyLogToOld(queryBo);
         return AjaxResult.success();

zhongzheng-system/src/main/java/com/zhongzheng/modules/goods/service/impl/GoodsServiceImpl.java

@@ -641,12 +641,13 @@ public class GoodsServiceImpl extends ServiceImpl<GoodsMapper, Goods> implements
         List<GoodsVo> goodsVoList = queryList(goodsQueryBo);
         List<GoodsJzsVo> jzsVoList = new ArrayList<>();
         for(GoodsVo goodsVo : goodsVoList){
-            if(goodsVo.getGoodsId()!=911L){
+            if(goodsVo.getGoodsId()!=916L){
                 continue;
             }
             GoodsJzsVo jzsVo = new GoodsJzsVo();
             jzsVo.setGoodsId(goodsVo.getGoodsId());
             jzsVo.setGoodsName(goodsVo.getGoodsName());
+            jzsVo.setClassHours(goodsVo.getClassHours());
             CourseSubject courseSubject = iCourseSubjectService.getOne(new LambdaQueryWrapper<CourseSubject>().eq(CourseSubject::getId, goodsVo.getSubjectIds()).last("limit 1"));
             if(Validator.isNotEmpty(courseSubject)){
                 jzsVo.setSubjectName(courseSubject.getSubjectName());
@@ -687,7 +688,6 @@ public class GoodsServiceImpl extends ServiceImpl<GoodsMapper, Goods> implements
             jzsVo.setChapterList(jzsChapterVoList);
             jzsVoList.add(jzsVo);
         }
-        System.out.println(jzsVoList);
         List<SyncGoodsExport> exportList = new ArrayList<>();
         for(GoodsJzsVo jzsVo : jzsVoList){
             for(GoodsJzsChapterVo chapterVo : jzsVo.getChapterList()){
@@ -696,6 +696,7 @@ public class GoodsServiceImpl extends ServiceImpl<GoodsMapper, Goods> implements
                     goodsExport.setGoodsId(jzsVo.getGoodsId());
                     goodsExport.setGoodsName(jzsVo.getGoodsName());
                     goodsExport.setSubjectName(jzsVo.getSubjectName());
+                    goodsExport.setClassHours(jzsVo.getClassHours());
                     goodsExport.setChapterId(chapterVo.getChapterId());
                     goodsExport.setChapterName(chapterVo.getChapterName());
                     goodsExport.setSectionId(sectionVo.getSectionId());

zhongzheng-system/src/main/java/com/zhongzheng/modules/goods/vo/GoodsJzsVo.java

@@ -5,6 +5,7 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.math.BigDecimal;
 import java.util.List;
 
 @Data
@@ -25,6 +26,10 @@ public class GoodsJzsVo {
     @ApiModelProperty("科目名称")
     private String subjectName;
 
+    /** 学时 */
+    @ApiModelProperty("学时")
+    private BigDecimal classHours;
+
     @ApiModelProperty("章列表")
     private List<GoodsJzsChapterVo> chapterList;
 }

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

@@ -512,7 +512,7 @@ public class UserPeriodServiceImpl extends ServiceImpl<UserPeriodMapper, UserPer
                             userPeriodQueryBo2.setGoodsId(bo.getGoodsId());
                             userPeriodQueryBo2.setUserId(bo.getUserId());
                             userPeriodQueryBo2.setChapterId(courseModuleChapterVo.getChapterId());
-                            userPeriodQueryBo2.setModuleId(0L);
+                            userPeriodQueryBo2.setModuleId(courseMenuVo.getMenuId());
                             userPeriodQueryBo2.setGradeId(bo.getGradeId());
                             List<UserPeriodStatusVo> userPeriodStatusVos2 = userPeriodStatusService.selectPeriodStatus(userPeriodQueryBo2);
                             if (!CollectionUtils.isEmpty(userPeriodStatusVos2)) {
@@ -523,7 +523,7 @@ public class UserPeriodServiceImpl extends ServiceImpl<UserPeriodMapper, UserPer
                                 List<UserStudyRecordPhoto> videoPhoto2 = userStudyRecordPhotoService.list(lqw);
                                 syncUserStudyRec.setCreateTime(DateUtils.timestampToDateFormat(userPeriodStatusVo.getRecordStartTime(),DateUtils.YYYY_MM_DD_HH_MM_SS));
                                 syncUserStudyRec.setEndTime(DateUtils.timestampToDateFormat(userPeriodStatusVo.getRecordEndTime(),DateUtils.YYYY_MM_DD_HH_MM_SS));
-                                syncUserChapterItem.setStudyIP(userPeriodStatusVo.getIp());
+                                syncUserStudyRec.setStudyIP(userPeriodStatusVo.getIp());
                                 List<SyncUserImageRc> ImgList = new ArrayList<>();
                                 for (UserStudyRecordPhoto videoPhoto : videoPhoto2) {
                                     SyncUserImageRc imageRc = new SyncUserImageRc();
@@ -532,6 +532,7 @@ public class UserPeriodServiceImpl extends ServiceImpl<UserPeriodMapper, UserPer
                                     imageRc.setMatchData(Validator.isNotEmpty(videoPhoto.getSimilarity())?videoPhoto.getSimilarity().toString():null);
                                     ImgList.add(imageRc);
                                 }
+                                syncUserStudyRec.setImgList(ImgList);
                             }
                             RecList.add(syncUserStudyRec);
                         }
@@ -550,6 +551,7 @@ public class UserPeriodServiceImpl extends ServiceImpl<UserPeriodMapper, UserPer
         params.put("stamp", nowTime.toString());
         params.put("sign", sign);
         params.put("jsonstr", JSONObject.toJSONString(studyRec));
+        System.out.println(params);
         String respone = "";
         try {
             respone = HttpUtils.postFormBody(SYNC_PATH, params);

zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/vo/SyncGoodsExport.java

@@ -4,6 +4,7 @@ import cn.afterturn.easypoi.excel.annotation.Excel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.math.BigDecimal;
 import java.util.List;
 
 @Data
@@ -41,4 +42,9 @@ public class SyncGoodsExport {
     @Excel(name = "专业")
     @ApiModelProperty("专业")
     private String subjectName;
+
+    /** 学时 */
+    @Excel(name = "学时")
+    @ApiModelProperty("学时")
+    private BigDecimal classHours;
 }

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

@@ -20,6 +20,7 @@ import com.zhongzheng.modules.course.bo.*;
 import com.zhongzheng.modules.course.domain.CourseBusiness;
 import com.zhongzheng.modules.course.domain.CoursePhotoLog;
 import com.zhongzheng.modules.course.domain.CourseSection;
+import com.zhongzheng.modules.course.mapper.CourseChapterSectionMapper;
 import com.zhongzheng.modules.course.service.ICourseBusinessService;
 import com.zhongzheng.modules.course.service.ICourseChapterSectionService;
 import com.zhongzheng.modules.course.service.ICoursePhotoLogService;
@@ -137,6 +138,10 @@ public class UserStudyRecordServiceImpl extends ServiceImpl<UserStudyRecordMappe
 
     @Autowired
     private  RedisCache redisCache;
+
+    @Autowired
+    private CourseChapterSectionMapper courseChapterSectionMapper;
+
     @Override
     public UserStudyRecordVo queryById(Long recordId) {
         UserStudyRecord db = this.baseMapper.selectById(recordId);
@@ -658,7 +663,12 @@ public class UserStudyRecordServiceImpl extends ServiceImpl<UserStudyRecordMappe
 
     @Override
     public SectionStudyRecordVo getUserWatchLast(UserStudyRecordQueryBo bo) {
-        return this.baseMapper.getUserWatchLast(bo);
+        SectionStudyRecordVo vo = this.baseMapper.getUserWatchLast(bo);
+        Integer learning = courseChapterSectionMapper.learningCheck(vo.getSectionId(), vo.getGradeId(), bo.getUserId(), vo.getModuleId(), vo.getChapterId(), 0L,vo.getCourseId());
+        if (learning > 0) {
+            vo.setLearning(1L);
+        }
+        return vo;
     }
 
 

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/vo/SectionStudyRecordVo.java

@@ -121,4 +121,6 @@ public class SectionStudyRecordVo {
     @Excel(name = "录播和回放的url地址")
     @ApiModelProperty("录播和回放的url地址")
     private String recordingUrl;
+    @ApiModelProperty("1已学习")
+    private Long learning;
 }