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 1b6b489..dc52588 100644 --- a/src/main/java/com/sztzjy/resource_center/controller/CourseConfigController.java +++ b/src/main/java/com/sztzjy/resource_center/controller/CourseConfigController.java @@ -128,7 +128,6 @@ public class CourseConfigController { public ResultEntity> selectResource(@ApiParam("课程ID") @RequestParam(required = false) String oneID, @ApiParam("章ID") @RequestParam(required = false) String twoID, @ApiParam("节ID") @RequestParam(required = false) String threeID, - @RequestParam(required = false) String source, //子系统调用时传 @RequestParam Integer index, @RequestParam Integer size) { PageHelper.startPage(index, size); 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 e06a4cb..745f0eb 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 @@ -30,7 +30,7 @@ import java.util.stream.Collectors; @RestController @Api(tags = "资源方面API") -@RequestMapping("api/tea/ResourceApi") +@RequestMapping("api/tea/ResourceCenterApi") public class ResourceApi { @Autowired private SysResourceMapper sysResourceMapper; @@ -65,15 +65,14 @@ public class ResourceApi { @RequestParam String schoolId, @RequestParam String twoId, @RequestParam String twoName, - @RequestParam String resourceType, + @RequestParam String resourceName, @RequestParam String systemOwner) { if (file == null) { return false; } //取到文件后缀名 - String fileName = file.getName(); - int lastIndex = fileName.lastIndexOf("."); - String extension = fileName.substring(lastIndex); + int lastIndex = resourceName.lastIndexOf("."); + String extension = resourceName.substring(lastIndex); SysResource sysResource = new SysResource(); //判断文件type //todo 格式可能不够全 @@ -91,7 +90,7 @@ public class ResourceApi { sysResource.setResourceId(uuid); sysResource.setUrl(url); sysResource.setSource(schoolId); //管理员或者 xx学校 - sysResource.setResourceName(fileName); + sysResource.setResourceName(resourceName); sysResource.setStatus(1); sysResource.setCreateTime(new Date()); //todo 测试修改资源之后 新增时间会不会变化,有变化就错了 sysResourceMapper.insert(sysResource); diff --git a/src/main/resources/mapper/SysResourceMapper.xml b/src/main/resources/mapper/SysResourceMapper.xml index 62da8df..fe824d1 100644 --- a/src/main/resources/mapper/SysResourceMapper.xml +++ b/src/main/resources/mapper/SysResourceMapper.xml @@ -427,7 +427,7 @@ and sc.three_id = #{threeId} - and sr.source = #{source} + and sr.source in (#{source},'管理员') order by sr.create_time