fix 节历史

zhongzheng-admin/src/main/java/com/zhongzheng/controller/course/CourseSectionController.java

@@ -3,6 +3,10 @@ package com.zhongzheng.controller.course;
 import java.util.List;
 import java.util.Arrays;
 
+import cn.hutool.core.lang.Validator;
+import com.zhongzheng.common.core.domain.model.LoginUser;
+import com.zhongzheng.common.utils.ServletUtils;
+import com.zhongzheng.modules.bank.vo.QuestionImport;
 import com.zhongzheng.modules.course.bo.CourseSectionAddBo;
 import com.zhongzheng.modules.course.bo.CourseSectionEditBo;
 import com.zhongzheng.modules.course.bo.CourseSectionQueryBo;
@@ -29,6 +33,7 @@ import com.zhongzheng.common.utils.poi.ExcelUtil;
 import com.zhongzheng.common.core.page.TableDataInfo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.springframework.web.multipart.MultipartFile;
 
 /**
  * 课程小节Controller
@@ -104,6 +109,25 @@ public class CourseSectionController extends BaseController {
         return toAjax(iCourseSectionService.updateByEditBo(bo) ? 1 : 0);
     }
 
+    @Log(title = "导入节模板", businessType = BusinessType.IMPORT)
+    @ApiOperation("导入节模板")
+    @PreAuthorize("@ss.hasPermi('system:section:import')")
+    @PostMapping("/importData")
+    public AjaxResult importData(MultipartFile file, boolean updateSupport) throws Exception
+    {
+       /* ExcelUtil<QuestionImport> util = new ExcelUtil<QuestionImport>(QuestionImport.class);
+        List<QuestionImport> questionList = util.importExcel(file.getInputStream());
+        LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
+        String operName = loginUser.getUsername();
+        String message = iQuestionService.importQuestion(questionList, updateSupport, operName);
+        if(Validator.isNotEmpty(message)){
+            return AjaxResult.error(message);
+        }else{
+            return AjaxResult.success(message);
+        }*/
+        return AjaxResult.success(null);
+    }
+
     /**
      * 删除课程小节
      */

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/bo/CourseSectionImportBo.java

@@ -0,0 +1,68 @@
+package com.zhongzheng.modules.course.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+
+/**
+ * 课程小节添加对象 course_section
+ *
+ * @author hjl
+ * @date 2021-10-11
+ */
+@Data
+@ApiModel("课程小节添加对象")
+public class CourseSectionImportBo {
+
+    /** 名称 */
+    @ApiModelProperty("名称")
+    private String name;
+    /** 排序 */
+    @ApiModelProperty("排序")
+    private Long sort;
+    /** 添加时间 */
+    @ApiModelProperty("添加时间")
+    private Long createTime;
+    /** 修改时间 */
+    @ApiModelProperty("修改时间")
+    private Long updateTime;
+    /** 前缀名称 */
+    @ApiModelProperty("前缀名称")
+    private String prefixName;
+    /** 状态 1正常 0关闭 */
+    @ApiModelProperty("状态 1正常 0关闭")
+    private Integer status;
+    /** 节类型 1录播 2直播 3回放 */
+    @ApiModelProperty("节类型 1录播 2直播 3回放")
+    private Integer sectionType;
+    /** 发布状态 1发布 0未发布 */
+    @ApiModelProperty("发布状态 1发布 0未发布")
+    private Integer publishStatus;
+    /** 直播流地址 */
+    @ApiModelProperty("直播流地址")
+    private String liveUrl;
+    /** 直播开始时间 */
+    @ApiModelProperty("直播开始时间")
+    private Long liveStartTime;
+    /** 直播结束时间 */
+    @ApiModelProperty("直播结束时间")
+    private Long liveEndTime;
+    /** 录播和回放的url地址 */
+    @ApiModelProperty("录播和回放的url地址")
+    private String recordingUrl;
+    /** 节时长(分钟) */
+    @ApiModelProperty("节时长(分钟)")
+    private Long durationTime;
+    /** 业务层级列表 */
+    @ApiModelProperty("业务层级列表")
+    private List<CourseSectionBusinessAddBo> businessList;
+    /** 封面地址 */
+    @ApiModelProperty("封面地址")
+    private String coverUrl;
+    /** 编码 */
+    @ApiModelProperty("编码")
+    private String code;
+}

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

@@ -138,9 +138,9 @@ public class CourseSectionServiceImpl extends ServiceImpl<CourseSectionMapper, C
      */
     private void validEntityBeforeSave(CourseSection entity){
         //TODO 做一些数据校验,如唯一约束
-       /* if(checkNameUnique(entity)){
+        if(checkNameUnique(entity)){
             throw new CustomException("名称重复");
-        }*/
+        }
         if(entity.getSectionId()!=null&&entity.getPublishStatus()!=null&&entity.getPublishStatus()==0){
             CourseMenu one = iCourseMenuService.getOne(new LambdaQueryWrapper<CourseMenu>().eq(CourseMenu::getMenuId, entity.getSectionId()).eq(CourseMenu::getType,3).last("limit 1"));
             if(one!=null){

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

@@ -2,6 +2,7 @@ package com.zhongzheng.modules.user.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.convert.Convert;
+import cn.hutool.core.lang.Validator;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
@@ -110,7 +111,11 @@ public class UserStudyRecordServiceImpl extends ServiceImpl<UserStudyRecordMappe
         lqw.eq(bo.getGoodsId() != null, UserStudyRecord::getGoodsId, bo.getGoodsId());
         lqw.eq(bo.getModuleId() != null, UserStudyRecord::getModuleId, bo.getModuleId());
         lqw.orderByDesc(UserStudyRecord::getRecordId);
-        return BeanUtil.toBean(this.getOne(lqw.last("limit 1")), UserStudyRecordVo.class);
+        UserStudyRecord last = this.getOne(lqw.last("limit 1"));
+        if(Validator.isNotEmpty(last)&&last.getStatus()==0){
+            return BeanUtil.toBean(last, UserStudyRecordVo.class);
+        }
+        return null;
     }
 
     @Override