删除Module

src/main/java/com/sztzjy/marketing/controller/stu/StuConceptBlockController.java

@@ -76,9 +76,9 @@ public class StuConceptBlockController {
     @PostMapping("/getLearningAssessment")
     @AnonymousAccess
     @ApiOperation("哈希函数学习测评查看")
-    public ResultDataEntity<List<StuAssessmentQuestionDetailsDTO>> getLearningAssessment(@ApiParam("用户ID") String module,@ApiParam("用户ID") String userId) {
+    public ResultDataEntity<List<StuAssessmentQuestionDetailsDTO>> getLearningAssessment(@ApiParam("用户ID") String userId) {
 
-        List<StuAssessmentQuestionDetailsDTO> list = stuConceptBlockService.getLearningAssessment(module,userId);
+        List<StuAssessmentQuestionDetailsDTO> list = stuConceptBlockService.getLearningAssessment(userId);
         return new ResultDataEntity<>(HttpStatus.OK, list);
     }
     @PostMapping("/hashLearningAssessmentScore")
@@ -108,9 +108,9 @@ public class StuConceptBlockController {
     @GetMapping("/getReport")
     @ApiOperation("获取实训报告详情")
     @AnonymousAccess
-    public ResultDataEntity<StuPracticalTrainingReport> getReport(String userId, String module,String ascription) {
+    public ResultDataEntity<StuPracticalTrainingReport> getReport(String userId) {
 
-        StuPracticalTrainingReport report = stuConceptBlockService.getReport(userId,module,ascription);
+        StuPracticalTrainingReport report = stuConceptBlockService.getReport(userId);
         return new ResultDataEntity<>(HttpStatus.OK, report);
 
     }
@@ -139,9 +139,9 @@ public class StuConceptBlockController {
     @GetMapping("/download")
     @ApiOperation("下载实训报告")
     @AnonymousAccess
-    public void download(@RequestParam String userId, String TOKEN, HttpServletResponse response, String module,String ascription) {
+    public void download(@RequestParam String userId, String TOKEN, HttpServletResponse response) {
         TokenProvider.getJWTUser(TOKEN);
-        stuConceptBlockService.download(userId, response, module,ascription);
+        stuConceptBlockService.download(userId, response);
     }
 
     @GetMapping("/getResourceUrl")
@@ -155,50 +155,6 @@ public class StuConceptBlockController {
         return new ResultEntity<>(HttpStatus.OK,"获取成功","report"+stuResources.get(0).getResourcesUrl());
     }
 
-    @GetMapping("/getResource")
-    @ApiOperation("获取视频流")
-    @AnonymousAccess
-    public ResponseEntity<FileSystemResource> streamVideo(@RequestParam String module, @RequestParam String name, HttpServletResponse response) {
-        StuResourcesExample example = new StuResourcesExample();
-        example.createCriteria().andModuleEqualTo(module).andResourcesNameEqualTo(name);
-        List<StuResources> stuResources = stuResourcesMapper.selectByExample(example);
-        if (stuResources.size() > 0) {
-            StuResources stuResources1 = stuResources.get(0);
-            String url = stuResources1.getResourcesUrl();
-            String videoPath = filePath + url;
-            File videoFile = new File(videoPath);
-            if ("mp4".equals(stuResources1.getResourcesType())) {
-
-
-                if (videoFile.exists()) {
-                    Path path = Paths.get(videoPath);
-                    FileSystemResource fileSystemResource = new FileSystemResource(videoFile);
-                    return ResponseEntity.ok()
-                            .contentType(MediaType.parseMediaType("video/mp4"))
-                            .body(fileSystemResource);
-                } else {
-                    return ResponseEntity.notFound().build();
-                }
-            } else if ("pdf".equals(stuResources1.getResourcesType())) {
-
-//                fileUtil.getPdf(response,name,url);
-                if (videoFile.exists()) {
-                    Path path = Paths.get(videoPath);
-                    FileSystemResource fileSystemResource = new FileSystemResource(videoFile);
-                    return ResponseEntity.ok()
-                            .contentType(MediaType.parseMediaType("application/pdf"))
-                            .body(fileSystemResource);
-
-                } else {
-                    return ResponseEntity.notFound().build();
-                }
-
-            }
-
-        }
-        return ResponseEntity.notFound().build();
-
-    }
 
 
 

src/main/java/com/sztzjy/marketing/service/StuConceptBlockService.java

@@ -16,7 +16,7 @@ import java.util.List;
 public interface StuConceptBlockService {
 
 
-    List<StuAssessmentQuestionDetailsDTO> getLearningAssessment(String module, String userId);
+    List<StuAssessmentQuestionDetailsDTO> getLearningAssessment(String userId);
 
     void hashLearningAssessmentScore(StuLearningAssessmentScoreDTO stuLearningAssessmentScoreDTO);
     //区块链学习资源查看
@@ -27,9 +27,9 @@ public interface StuConceptBlockService {
 
     StuPracticalTrainingReport upload(MultipartFile file, StuBlockProductWithDTO stuBlockProductWithBLOBs);
 
-    void download(String id, HttpServletResponse response,String module,String ascription);
+    void download(String id, HttpServletResponse response);
 
-    StuPracticalTrainingReport getReport(String userId, String module,String ascription);
+    StuPracticalTrainingReport getReport(String userId);
 
     /**
         * 区块链知识笔记导出为pdf

src/main/java/com/sztzjy/marketing/service/impl/StuConceptBlockServiceImpl.java

@@ -98,18 +98,18 @@ public class StuConceptBlockServiceImpl implements StuConceptBlockService {
     /**
      * 学习测评查看
      *
-     * @param module 所属模块
+     *
      * @return
      */
     @Override
-    public List<StuAssessmentQuestionDetailsDTO> getLearningAssessment(String module, String userId) {
+    public List<StuAssessmentQuestionDetailsDTO> getLearningAssessment( String userId) {
         StuAssessmentQuestionDetailsExample detailsExample=new StuAssessmentQuestionDetailsExample();
-        detailsExample.createCriteria().andUserIdEqualTo(userId).andModuleEqualTo(module);
+        detailsExample.createCriteria().andUserIdEqualTo(userId);
         List<StuAssessmentQuestionDetails> stuAssessmentQuestionDetails = stuAssessmentQuestionDetailsMapper.selectByExample(detailsExample);
 
         StuLearningAssessmentExample example = new StuLearningAssessmentExample();
         StuLearningAssessmentExample.Criteria criteria = example.createCriteria();
-        criteria.andModuleEqualTo(module).andLogicEqualTo(1);
+        criteria.andLogicEqualTo(1);
         List<StuLearningAssessment> stuLearningAssessments = stuLearningAssessmentMapper.selectByExample(example);
         List<StuAssessmentQuestionDetailsDTO> stuAssessmentQuestionDetailsDTOS = convertUtil.entityToDTOList(stuLearningAssessments, StuAssessmentQuestionDetailsDTO.class);
         if(stuAssessmentQuestionDetails.size()!=0){
@@ -481,9 +481,9 @@ public class StuConceptBlockServiceImpl implements StuConceptBlockService {
      *下载报告
      */
     @Override
-    public void download(String id, HttpServletResponse response, String module,String ascription) {
+    public void download(String id, HttpServletResponse response) {
         StuPracticalTrainingReportExample reportExample = new StuPracticalTrainingReportExample();
-        reportExample.createCriteria().andModuleEqualTo(module).andUseridEqualTo(id).andAscriptionEqualTo(ascription);
+        reportExample.createCriteria().andUseridEqualTo(id);
 
 
 
@@ -506,15 +506,14 @@ public class StuConceptBlockServiceImpl implements StuConceptBlockService {
      * 获取实验报告
      *
      * @param userId
-     * @param module
      * @return
      */
     @Override
-    public StuPracticalTrainingReport getReport(String userId, String module,String ascription) {
+    public StuPracticalTrainingReport getReport(String userId) {
 
         //获取实验报告
         StuPracticalTrainingReportExample export = new StuPracticalTrainingReportExample();
-        export.createCriteria().andUseridEqualTo(userId).andModuleEqualTo(module).andAscriptionEqualTo(ascription);
+        export.createCriteria().andUseridEqualTo(userId);
 
         if (stuPracticalTrainingReportMapper.selectByExample(export).size() != 0) {
             StuPracticalTrainingReport report = stuPracticalTrainingReportMapper.selectByExample(export).get(0);