Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/main/java/com/sztzjy/resource_center/controller/api/ResourceApi.java
master
xiaoCJ 8 months ago
commit 873fd0d3b5

@ -28,7 +28,7 @@ import java.util.*;
import java.util.stream.Collectors;
@RestController
@Api(tags = "课程方面API")
@Api(tags = "客观题方面API")
@RequestMapping("api/sys/ObjectiveApi")
public class ObjectiveApi {
@Autowired

@ -65,14 +65,15 @@ public class ResourceApi {
@RequestParam String schoolId,
@RequestParam String twoId,
@RequestParam String twoName,
@RequestParam String resourceName,
@RequestParam String systemOwner) {
@RequestParam String resourceType,
@RequestParam String systemOwner,
@RequestParam String fileName) {
if (file == null) {
return false;
}
//取到文件后缀名
int lastIndex = resourceName.lastIndexOf(".");
String extension = resourceName.substring(lastIndex);
int lastIndex = fileName.lastIndexOf(".");
String extension = fileName.substring(lastIndex);
SysResource sysResource = new SysResource();
//判断文件type //todo 格式可能不够全
@ -90,7 +91,7 @@ public class ResourceApi {
sysResource.setResourceId(uuid);
sysResource.setUrl(url);
sysResource.setSource(schoolId); //管理员或者 xx学校
sysResource.setResourceName(resourceName);
sysResource.setResourceName(fileName);
sysResource.setStatus(1);
sysResource.setCreateTime(new Date()); //todo 测试修改资源之后 新增时间会不会变化,有变化就错了
sysResourceMapper.insert(sysResource);

@ -30,7 +30,7 @@ import java.util.List;
import java.util.UUID;
@RestController
@Api(tags = "课程方面API")
@Api(tags = "数据集方面API")
@RequestMapping("api/tea/ResourceApi")
public class ResourceDataApi {

Loading…
Cancel
Save