diff --git a/src/main/java/com/sztzjy/resource_center/controller/CourseConfigController.java b/src/main/java/com/sztzjy/resource_center/controller/CourseConfigController.java index dc52588..e787d70 100644 --- a/src/main/java/com/sztzjy/resource_center/controller/CourseConfigController.java +++ b/src/main/java/com/sztzjy/resource_center/controller/CourseConfigController.java @@ -67,7 +67,8 @@ public class CourseConfigController { //判断文件type //todo 格式可能不够全 if (extension.equals(".pdf") || extension.equals(".ppt") || extension.equals(".pptx") || extension.equals(".xlsx") || extension.equals(".xls") - || extension.equals(".doc") || extension.equals(".docx")) { + || extension.equals(".doc") || extension.equals(".docx") + || extension.equals(".txt")) { sysResource.setResourceType("课件"); } else if (extension.equals(".mp4") || extension.equals(".wmv") || extension.equals(".avi")) { sysResource.setResourceType("视频"); diff --git a/src/main/java/com/sztzjy/resource_center/controller/CourseTagManageController.java b/src/main/java/com/sztzjy/resource_center/controller/CourseTagManageController.java index 0700e15..71839d3 100644 --- a/src/main/java/com/sztzjy/resource_center/controller/CourseTagManageController.java +++ b/src/main/java/com/sztzjy/resource_center/controller/CourseTagManageController.java @@ -4,12 +4,8 @@ import cn.hutool.core.util.IdUtil; import com.sztzjy.resource_center.annotation.AnonymousAccess; import com.sztzjy.resource_center.config.security.JwtUser; import com.sztzjy.resource_center.config.security.TokenProvider; -import com.sztzjy.resource_center.entity.SysOneCatalog; -import com.sztzjy.resource_center.entity.SysThreeCatalog; -import com.sztzjy.resource_center.entity.SysTwoCatalog; -import com.sztzjy.resource_center.mapper.SysOneCatalogMapper; -import com.sztzjy.resource_center.mapper.SysThreeCatalogMapper; -import com.sztzjy.resource_center.mapper.SysTwoCatalogMapper; +import com.sztzjy.resource_center.entity.*; +import com.sztzjy.resource_center.mapper.*; import com.sztzjy.resource_center.util.ResultEntity; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -25,6 +21,7 @@ import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.stream.Collectors; /** * @Author xcj @@ -42,6 +39,11 @@ public class CourseTagManageController { private SysThreeCatalogMapper sysThreeCatalogMapper; @Resource private AuthenticationManagerBuilder authenticationManagerBuilder; + @Autowired + private SysTopicAndCourseMapper sysTopicAndCourseMapper; + @Autowired + private SysResourceAndCourseMapper sysResourceAndCourseMapper; + @AnonymousAccess @ApiOperation("添加二级目录") @@ -89,10 +91,35 @@ public class CourseTagManageController { SysTwoCatalog sysTwoCatalog = sysTwoCatalogMapper.selectByPrimaryKey(id); sysTwoCatalog.setTwoName(name); sysTwoCatalogMapper.updateByPrimaryKey(sysTwoCatalog); + + SysResourceAndCourseExample example = new SysResourceAndCourseExample(); + example.createCriteria().andTwoIdEqualTo(id); + List sysResourceAndCourses = sysResourceAndCourseMapper.selectByExample(example); + List ids = sysResourceAndCourses.stream().map(SysResourceAndCourse::getId).collect(Collectors.toList()); + sysResourceAndCourseMapper.batchUpdateTwoName(ids, name); + + SysTopicAndCourseExample example1 =new SysTopicAndCourseExample(); + example1.createCriteria().andTwoIdEqualTo(id); + List sysTopicAndCourses = sysTopicAndCourseMapper.selectByExample(example1); + List collect = sysTopicAndCourses.stream().map(SysTopicAndCourse::getId).collect(Collectors.toList()); + sysTopicAndCourseMapper.batchUpdateTwoName(collect,name); } else { + SysThreeCatalog sysThreeCatalog = sysThreeCatalogMapper.selectByPrimaryKey(id); sysThreeCatalog.setThreeName(name); sysThreeCatalogMapper.updateByPrimaryKey(sysThreeCatalog); + + SysResourceAndCourseExample example = new SysResourceAndCourseExample(); + example.createCriteria().andThreeIdEqualTo(id); + List sysResourceAndCourses = sysResourceAndCourseMapper.selectByExample(example); + List ids = sysResourceAndCourses.stream().map(SysResourceAndCourse::getId).collect(Collectors.toList()); + sysResourceAndCourseMapper.batchUpdateThreeName(ids, name); + + SysTopicAndCourseExample example1 =new SysTopicAndCourseExample(); + example1.createCriteria().andThreeIdEqualTo(id); + List sysTopicAndCourses = sysTopicAndCourseMapper.selectByExample(example1); + List collect = sysTopicAndCourses.stream().map(SysTopicAndCourse::getId).collect(Collectors.toList()); + sysTopicAndCourseMapper.batchUpdateThreeName(collect,name); } return new ResultEntity<>(HttpStatus.OK, "修改成功"); } @@ -104,8 +131,25 @@ public class CourseTagManageController { public ResultEntity deleteTwoAndThreeCatalog(@ApiParam("二级目录传2/三级传3") @RequestParam int type, @RequestParam String id) { if (type == 2) { - sysTwoCatalogMapper.deleteByPrimaryKey(id); + //删除资源 + SysResourceAndCourseExample example1 = new SysResourceAndCourseExample(); + example1.createCriteria().andTwoIdEqualTo(id); + sysResourceAndCourseMapper.deleteByExample(example1); + + //删除题目 + SysTopicAndCourseExample example = new SysTopicAndCourseExample(); + example.createCriteria().andTwoIdEqualTo(id); + sysTopicAndCourseMapper.deleteByExample(example); } else { + //删除资源 + SysResourceAndCourseExample example1 = new SysResourceAndCourseExample(); + example1.createCriteria().andThreeIdEqualTo(id); + sysResourceAndCourseMapper.deleteByExample(example1); + + //删除题目 + SysTopicAndCourseExample example = new SysTopicAndCourseExample(); + example.createCriteria().andThreeIdEqualTo(id); + sysTopicAndCourseMapper.deleteByExample(example); sysThreeCatalogMapper.deleteByPrimaryKey(id); } return new ResultEntity<>(HttpStatus.OK, "删除成功"); @@ -153,7 +197,7 @@ public class CourseTagManageController { @AnonymousAccess @ApiOperation("二级目录重新排序") @PostMapping("setTwoCatalogueRank") - public ResultEntity setTwoCatalogueRank(@ApiParam("一级ID(可为空),二级ID和sort必传")@RequestBody List sysTwoCatalogs) { + public ResultEntity setTwoCatalogueRank(@ApiParam("一级ID(可为空),二级ID和sort必传") @RequestBody List sysTwoCatalogs) { for (SysTwoCatalog sysTwoCatalog : sysTwoCatalogs) { if (StringUtils.isBlank(sysTwoCatalog.getTwoId()) || sysTwoCatalog.getSort() == null) { @@ -168,7 +212,7 @@ public class CourseTagManageController { @AnonymousAccess @ApiOperation("三级目录重新排序") @PostMapping("setThreeCatalogueRank") - public ResultEntity setThreeCatalogueRank(@ApiParam("需要一级(可为空)二级(可为空),三级ID和sort必传")@RequestBody List sysThreeCatalogs) { + public ResultEntity setThreeCatalogueRank(@ApiParam("需要一级(可为空)二级(可为空),三级ID和sort必传") @RequestBody List sysThreeCatalogs) { for (SysThreeCatalog sysThreeCatalog : sysThreeCatalogs) { if (StringUtils.isBlank(sysThreeCatalog.getThreeId()) || sysThreeCatalog.getSort() == null) { return new ResultEntity<>(HttpStatus.BAD_REQUEST, "更新失败,缺少必须的数据!"); diff --git a/src/main/java/com/sztzjy/resource_center/controller/api/ResourceApi.java b/src/main/java/com/sztzjy/resource_center/controller/api/ResourceApi.java index ecb7c2a..ab8fccb 100644 --- a/src/main/java/com/sztzjy/resource_center/controller/api/ResourceApi.java +++ b/src/main/java/com/sztzjy/resource_center/controller/api/ResourceApi.java @@ -77,7 +77,8 @@ public class ResourceApi { //判断文件type //todo 格式可能不够全 if (extension.equals(".pdf") || extension.equals(".ppt") || extension.equals(".pptx") || extension.equals(".xlsx") || extension.equals(".xls") - || extension.equals(".doc") || extension.equals(".docx")) { + || extension.equals(".doc") || extension.equals(".docx") + || extension.equals(".txt")) { sysResource.setResourceType("课件"); } else if (extension.equals(".mp4") || extension.equals(".wmv") || extension.equals(".avi")) { sysResource.setResourceType("视频"); diff --git a/src/main/java/com/sztzjy/resource_center/mapper/SysResourceAndCourseMapper.java b/src/main/java/com/sztzjy/resource_center/mapper/SysResourceAndCourseMapper.java index 8423a8a..136fcd8 100644 --- a/src/main/java/com/sztzjy/resource_center/mapper/SysResourceAndCourseMapper.java +++ b/src/main/java/com/sztzjy/resource_center/mapper/SysResourceAndCourseMapper.java @@ -2,10 +2,11 @@ package com.sztzjy.resource_center.mapper; import com.sztzjy.resource_center.entity.SysResourceAndCourse; import com.sztzjy.resource_center.entity.SysResourceAndCourseExample; -import java.util.List; - import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; + +import java.util.List; + @Mapper public interface SysResourceAndCourseMapper { long countByExample(SysResourceAndCourseExample example); @@ -38,4 +39,7 @@ public interface SysResourceAndCourseMapper { void batchInsert(@Param("resourceAndCourses") List resourceAndCourses); + void batchUpdateTwoName(@Param("idList") List ids, @Param("twoName") String twoName); + + void batchUpdateThreeName(@Param("idList") List ids, @Param("threeName") String threeName); } \ No newline at end of file diff --git a/src/main/java/com/sztzjy/resource_center/mapper/SysResourceMapper.java b/src/main/java/com/sztzjy/resource_center/mapper/SysResourceMapper.java index 72b14a3..ab20183 100644 --- a/src/main/java/com/sztzjy/resource_center/mapper/SysResourceMapper.java +++ b/src/main/java/com/sztzjy/resource_center/mapper/SysResourceMapper.java @@ -47,6 +47,6 @@ public interface SysResourceMapper { List> getCountByType(@Param("list") List ids, @Param("schoolId") String schoolId); - @Select("SELECT resource_name FROM `sys_resource` ORDER BY count desc") + @Select("SELECT resource_name FROM `sys_resource` ORDER BY count desc limit 1") String getMostPopularName(); } \ No newline at end of file diff --git a/src/main/java/com/sztzjy/resource_center/mapper/SysTopicAndCourseMapper.java b/src/main/java/com/sztzjy/resource_center/mapper/SysTopicAndCourseMapper.java index 6174ada..648d0ef 100644 --- a/src/main/java/com/sztzjy/resource_center/mapper/SysTopicAndCourseMapper.java +++ b/src/main/java/com/sztzjy/resource_center/mapper/SysTopicAndCourseMapper.java @@ -34,4 +34,10 @@ public interface SysTopicAndCourseMapper { void batchInsert(@Param("list") List list); void batchDelete(@Param("list") List sysTopicAndCourses); + + void batchUpdateTwoName(@Param("idList") List ids, + @Param("twoName") String twoName); + + void batchUpdateThreeName(@Param("idList") List ids, + @Param("threeName") String threeName); } \ No newline at end of file diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index ddfc691..82f8b7b 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -11,8 +11,8 @@ spring: # 文件存储 file: type: local - path: /usr/local/tianzeProject/resourceCenter/uploadFile -# path: D:/home +# path: /usr/local/tianzeProject/resourceCenter/uploadFile + path: D:/home timer: enable: false diff --git a/src/main/resources/mapper/SysResourceAndCourseMapper.xml b/src/main/resources/mapper/SysResourceAndCourseMapper.xml index 9703e43..e0e93b9 100644 --- a/src/main/resources/mapper/SysResourceAndCourseMapper.xml +++ b/src/main/resources/mapper/SysResourceAndCourseMapper.xml @@ -289,4 +289,23 @@ + + + UPDATE sys_resource_and_course + SET two_name = #{twoName} + WHERE id IN + + #{id} + + + + + + UPDATE sys_resource_and_course + SET three_name = #{threeName} + WHERE id IN + + #{id} + + \ No newline at end of file diff --git a/src/main/resources/mapper/SysTopicAndCourseMapper.xml b/src/main/resources/mapper/SysTopicAndCourseMapper.xml index 46ce5a4..78baacf 100644 --- a/src/main/resources/mapper/SysTopicAndCourseMapper.xml +++ b/src/main/resources/mapper/SysTopicAndCourseMapper.xml @@ -307,4 +307,25 @@ AND three_id = #{item.threeId} + + + + UPDATE sys_topic_and_course + SET two_name = #{twoName} + WHERE id IN + + #{id} + + + + + + + UPDATE sys_topic_and_course + SET three_name = #{threeName} + WHERE id IN + + #{id} + + \ No newline at end of file