Merge branch 'meiteng' of ssh://103.249.252.28:10022/lcy/education into meiteng

src/main/java/org/rcisoft/business/bchapter/controller/BChapterController.java

@@ -16,6 +16,7 @@ import org.rcisoft.business.bchapter.dto.ScoreInfoDTO;
 import org.rcisoft.business.bchapter.entity.BChapter;
 import org.rcisoft.business.bchapter.enums.IsCompleteEnum;
 import org.rcisoft.business.bchapter.service.BChapterService;
+import org.rcisoft.business.bfile.entity.BFile;
 import org.rcisoft.common.component.Global;
 import org.rcisoft.common.controller.PaginationController;
 import org.rcisoft.common.model.GridModel;
@@ -25,6 +26,7 @@ import org.rcisoft.core.exception.ServiceException;
 import org.rcisoft.core.model.PersistModel;
 import org.rcisoft.core.result.Result;
 import org.rcisoft.core.result.ResultServiceEnums;
+import org.rcisoft.core.util.IdGen;
 import org.rcisoft.core.util.UploadUtil;
 import org.rcisoft.sys.role.dao.SysRoleRepository;
 import org.rcisoft.sys.user.bean.CurUser;
@@ -55,8 +57,6 @@ import java.util.Map;
 public class BChapterController extends PaginationController<BChapter> {
     @Autowired
     private BChapterService bChapterService;
-//    @Autowired
-//    private BSlService bSlService;
 
     @Autowired
     private SysRoleRepository sysRoleRepository;
@@ -122,6 +122,17 @@ public class BChapterController extends PaginationController<BChapter> {
                 MessageConstant.MESSAGE_ALERT_ERROR,
                 bChapterService.queryBChaptersWithProgress(param,curUser.getCorpId()));
     }
+
+//    @ApiOperation(value = "206 获取uuid", notes = "获取uuid用于添加章节时使用")
+//    @PostMapping(value = "/getid")
+//    public Result getUuid() {
+//        String data = IdGen.uuid();
+//        return Result.builder(new PersistModel(1),
+//                MessageConstant.MESSAGE_ALERT_SUCCESS,
+//                MessageConstant.MESSAGE_ALERT_ERROR,
+//                data);
+//    }
+
 //
 //    @ApiOperation(value = "更改章节状态", notes = "根据章节ID更改章节状态")
 //    @ApiImplicitParams({@ApiImplicitParam(name = "businessId", value = "businessId", required = true, dataType = "varchar"),

src/main/java/org/rcisoft/business/bchapter/service/BChapterService.java

@@ -4,6 +4,7 @@ package org.rcisoft.business.bchapter.service;
 import org.rcisoft.business.bchapter.dto.*;
 import org.rcisoft.business.bchapter.entity.BChapter;
 import org.rcisoft.business.bchapter.vo.StudentChapterScoreVO;
+import org.rcisoft.business.bfile.entity.BFile;
 import org.rcisoft.core.aop.PageUtil;
 import org.rcisoft.core.model.PersistModel;
 
@@ -55,7 +56,7 @@ public interface BChapterService{
     * @param model
     * @return
     */
-    PersistModel persist(BChapter model,String corpId);
+    PersistModel persist(BChapter model, String corpId);
 
     /**
      * 修改

src/main/java/org/rcisoft/business/bchapter/service/impl/BChapterServiceImpl.java

@@ -11,6 +11,7 @@ import org.rcisoft.business.bchapter.enums.HasMarkEnum;
 import org.rcisoft.business.bchapter.enums.StateEnum;
 import org.rcisoft.business.bchapter.service.BChapterService;
 import org.rcisoft.business.bchapter.vo.StudentChapterScoreVO;
+import org.rcisoft.business.bfile.util.GetVideoTime;
 import org.rcisoft.business.blesson.dao.BLessonRepository;
 import org.rcisoft.business.blesson.entity.BLesson;
 import org.rcisoft.business.bfile.dao.BFileRepository;
@@ -120,6 +121,7 @@ public class BChapterServiceImpl implements BChapterService {
     @Override
     public PersistModel persist(BChapter model,String corpId) {
         int line = 0;
+
         if (model.getBusinessId() == null) {
             UserUtil.setCurrentPersistOperation(model);
             if (model.getClassHour() == null || model.getClassHour().equals("")) {

src/main/java/org/rcisoft/business/bcourse/service/impl/BCourseServiceImpl.java

@@ -195,7 +195,6 @@ public class BCourseServiceImpl implements BCourseService {
                         }
                         bCourses.add(bCourse1);
                     }
-
                 }
             }
             bCourses.add(bCourse);

src/main/java/org/rcisoft/business/bfile/controller/BFileController.java

@@ -16,6 +16,7 @@ import org.rcisoft.core.model.PersistModel;
 import org.rcisoft.core.result.Result;
 import org.rcisoft.core.result.ResultServiceEnums;
 import org.rcisoft.core.util.UserUtil;
+import org.rcisoft.sys.user.bean.CurUser;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
@@ -38,72 +39,6 @@ public class BFileController extends PaginationController<BFile> {
     @Autowired
     private Global global;
 
-//
-//    @ApiOperation(value="添加/编辑视频", notes="businessId为空时是添加方法，不为空时是修改方法")
-//    @ApiImplicitParams({@ApiImplicitParam(name = "businessId", value = "businessId", required = false, dataType = "varchar"),
-//            @ApiImplicitParam(name = "videoName", value = "视频名称(1-200)", required = false, dataType = "varchar"),
-//            @ApiImplicitParam(name = "videoUrl", value = "视频地址(1-200)", required = true, dataType = "varchar"),
-//            @ApiImplicitParam(name = "type", value = "'0'为视频，'1'为附件", required = false, dataType = "varchar"),
-//            @ApiImplicitParam(name = "remarks", value = "备注", required = false, dataType = "varchar")})
-//    @PostMapping(value = "/add")
-//    public Result add(BFile bFile) {
-//        PersistModel data = bFileService.persist(bFile);
-//        return Result.builder(data,
-//                MessageConstant.MESSAGE_ALERT_SUCCESS,
-//                MessageConstant.MESSAGE_ALERT_ERROR,
-//                bFile);
-//    }
-//
-//    @ApiOperation(value="逻辑删除", notes="根据ID删除一条记录")
-//    @ApiImplicitParam(name = "id", value = "businessId", required = true, dataType = "varchar")
-//    @PostMapping(value = "/remove")
-//    public Result remove(String id) {
-//        PersistModel data = bFileService.removeBVideo(id);
-//        return Result.builder(data,
-//                MessageConstant.MESSAGE_ALERT_SUCCESS,
-//                MessageConstant.MESSAGE_ALERT_ERROR,
-//                id);
-//    }
-//
-//    @ApiOperation(value="唯一查找", notes="根据ID查找一条记录")
-//    @ApiImplicitParam(name = "businessId", value = "businessId", required = true, dataType = "varchar")
-//    @GetMapping(value = "/one")
-//    public Result queryOne(String businessId) {
-//        return Result.builder(new PersistModel(1),
-//                MessageConstant.MESSAGE_ALERT_SUCCESS,
-//                MessageConstant.MESSAGE_ALERT_ERROR,
-//                bFileService.selectOne(businessId));
-//    }
-//
-//
-//    @ApiOperation(value="根据条件分页查询", notes="根据条件分页查询视频信息")
-//    @ApiImplicitParams({@ApiImplicitParam(name = "businessId", value = "businessId", required = false, dataType = "varchar"),
-//            @ApiImplicitParam(name = "videoName", value = "视频名称", required = false, dataType = "varchar"),
-//            @ApiImplicitParam(name = "videoUrl", value = "视频地址", required = false, dataType = "varchar"),
-//            @ApiImplicitParam(name = "type", value = "'0'为视频，'1'为附件", required = false, dataType = "varchar"),
-//            @ApiImplicitParam(name = "remarks", value = "备注", required = false, dataType = "varchar")})
-//    @GetMapping(value = "/queryBVideosByPagination")
-//    public GridModel queryBVideosByPagination(BFile param) {
-//        bFileService.queryBVideosByPagination(getPaginationUtility(),param);
-//        GridModel gridModel = getGridModelResponse();
-//        return gridModel;
-//    }
-//
-//    @ApiOperation(value="根据条件分页查询", notes="根据条件分页查询视频信息")
-//    @ApiImplicitParams({@ApiImplicitParam(name = "businessId", value = "businessId", required = false, dataType = "varchar"),
-//            @ApiImplicitParam(name = "videoName", value = "视频名称", required = false, dataType = "varchar"),
-//            @ApiImplicitParam(name = "videoUrl", value = "视频地址", required = false, dataType = "varchar"),
-//            @ApiImplicitParam(name = "type", value = "'0'为视频，'1'为附件", required = false, dataType = "varchar"),
-//            @ApiImplicitParam(name = "remarks", value = "备注", required = false, dataType = "varchar")})
-//    @GetMapping(value = "/queryBVideos")
-//    public Result queryBVideos(BFile param) {
-//        return Result.builder(new PersistModel(1),
-//                MessageConstant.MESSAGE_ALERT_SUCCESS,
-//                MessageConstant.MESSAGE_ALERT_ERROR,
-//                bFileService.queryBVideos(param));
-//    }
-
-
     @ApiOperation(value="401 上传文件", notes="上传文件")
     @ApiImplicitParams({@ApiImplicitParam(name = "chapterId", value = "章节ID", required = true, dataType = "varchar"),
             @ApiImplicitParam(name = "type", value = "0视频 1音频 2ppt 3pdf 4附件", required = true, dataType = "varchar"),