diff --git a/src/main/java/com/teaching/backend/controller/resource/ResourceController.java b/src/main/java/com/teaching/backend/controller/resource/ResourceController.java index 6c1566c..588483a 100644 --- a/src/main/java/com/teaching/backend/controller/resource/ResourceController.java +++ b/src/main/java/com/teaching/backend/controller/resource/ResourceController.java @@ -10,7 +10,10 @@ package com.teaching.backend.controller.resource; import com.teaching.backend.common.BaseResponse; import com.teaching.backend.model.dto.resource.ResourceRelationshipDTO; import com.teaching.backend.model.entity.resource.ResourceMysql; +<<<<<<< HEAD import com.teaching.backend.model.vo.resources.ResourceUploadVO; +======= +>>>>>>> 2b31a38a8270bebc5e82f07db8833ab038aac30b import com.teaching.backend.service.resource.ResourceGraphService; import com.teaching.backend.service.resource.ResourceRelationshipService; import com.teaching.backend.service.resource.ResourceService; @@ -41,6 +44,7 @@ public class ResourceController { @Autowired private ResourceRelationshipService resourceRelationshipService; +<<<<<<< HEAD @@ -75,6 +79,42 @@ public class ResourceController { return resourceService.addResourceForMysql(file,knowId); } +======= + + + +// +// //添加知识点 +// @PostMapping("/upload") +// @ResponseBody +// @ApiOperation(value = "添加资源") +// public BaseResponse uploadFile(@RequestPart("file") MultipartFile file) { +// return resourceService.upload(file); +// } + +// //删除资源 +// @GetMapping ("/deleteFile") +// @ResponseBody +// @ApiOperation(value = "删除资源") +// public BaseResponse deleteResource(@RequestParam("filename") @NotBlank String filename) { +// return resourceService.delete(filename); +// } + +// @GetMapping("/read") +// @ApiOperation(value = "查询资源") +// public ResponseEntity readFile(@RequestParam @NotBlank String filename) { +// return resourceService.readFile(filename); +// } +// + + @PostMapping("/add") + @ResponseBody + @ApiOperation(value = "添加资源") + public BaseResponse addResourceForMysql(@RequestPart("file") MultipartFile file,@RequestParam Long knowId){ + return resourceService.addResourceForMysql(file,knowId); + } + +>>>>>>> 2b31a38a8270bebc5e82f07db8833ab038aac30b @GetMapping("/delete") @ApiOperation(value = "删除资源") public BaseResponse deleteResourceForMysql(@RequestParam @NotNull long Id) throws Exception { @@ -101,6 +141,14 @@ public class ResourceController { @ApiOperation(value = "添加知识点资源关系") public BaseResponse addResourcesRel(@RequestBody @Validated ResourceRelationshipDTO resourceRelationshipDto){ return resourceRelationshipService.addResourcesRel(resourceRelationshipDto); +<<<<<<< HEAD + } + + @GetMapping("/deleteResourcesRel") + @ApiOperation(value = "删除知识点资源关系") + public BaseResponse deleteResourcesRel(@RequestParam @NotNull Long KnowId, @RequestParam @NotNull Long resourceId){ + return resourceRelationshipService.deleteResourcesRel(KnowId,resourceId); +======= } @GetMapping("/deleteResourcesRel") @@ -119,6 +167,45 @@ public class ResourceController { + //查询课程下资源 + @GetMapping("/queryByCourseId") + @ApiOperation(value = "查询课程下所有资源") + BaseResponse> queryResourcesByCourseIdToNeo4j(@RequestParam @NotBlank String courseId){ + return resourceGraphService.queryResourcesByCourseId(courseId); + } + + //查询章节下资源 + @GetMapping("/queryByChapterId") + @ApiOperation(value = "查询章节下所有资源 -neo4j") + BaseResponse> queryResourcesByChapterId(@RequestParam @NotNull Long chapterId){ + return resourceGraphService.queryResourcesByChapterId(chapterId); + } + + //查询二级节点下资源 + @ApiOperation(value = "查询二级节点下所有资源") + @GetMapping("/queryBesidesKnow") + BaseResponse> queryBesidesKnowToResources(@RequestParam @NotNull Long knowId){ + return resourceGraphService.queryBesidesKnowToResources(knowId); + } + + //查询知识点下资源 + @GetMapping("/queryResourcesByKnowId") + @ApiOperation(value = "查询知识点下所有资源") + BaseResponse> queryResourcesById(@RequestParam @NotNull Long knowId){ + return resourceGraphService.queryResourcesById(knowId); +>>>>>>> 2b31a38a8270bebc5e82f07db8833ab038aac30b + } + +// +// @PostMapping("/myself/recoverdata") +// @ResponseBody +// @ApiOperation(value = "recoverdatal-neo") +// public BaseResponse recoverdata(){ +// return resourceService.recoverdata(); +// } + + + //查询课程下资源 @GetMapping("/queryByCourseId") @ApiOperation(value = "查询课程下所有资源") @@ -190,4 +277,46 @@ public class ResourceController { +// //查询知识点下资源 -mysql +// @GetMapping("/mysql/queryResourcesByKnowId") +// @ApiOperation(value = "查询知识点下所有资源 -mysql") +// BaseResponse> queryResourcesByKnowId(@RequestParam @NotNull Long knowId){ +// return resourceMysqlService.queryResourcesByKnowId(knowId); +// } + + +// //查询课程下资源 -mysql +// @GetMapping("/mysql/queryByCourseId") +// @ApiOperation(value = "查询课程下所有资源 -mysql") +// BaseResponse> queryResourcesByCourseIdToMysql(@RequestParam @NotBlank String courseId){ +// return resourceMysqlService.queryResourcesByCourseId(courseId); +// } + + + +// @PostMapping("/upload") +// @ResponseBody +// @ApiOperation(value = "添加资源") +// public BaseResponse uploadFileO(@RequestPart("file") MultipartFile file) throws IOException { +// return resourceService.uploadOSS(file); +// } +// +// //删除资源 +// @GetMapping ("/deleteFileOss") +// @ResponseBody +// @ApiOperation(value = "删除资源") +// //注意字符串是以 2024开头的 +// public BaseResponse deleteFileOss(@RequestParam("filename") String filename) { +// return resourceService.deleteFileOss(filename); +// } +// +// +// @GetMapping("/read/oss") +// @ApiOperation(value = "查询资源") +// public BaseResponse readFileOss(@RequestParam String filename) { +// return resourceService.readFile(filename); +// } + + + } diff --git a/src/main/java/com/teaching/backend/controller/system/SystemSettingsController.java b/src/main/java/com/teaching/backend/controller/system/SystemSettingsController.java index e056e54..e5fbd60 100644 --- a/src/main/java/com/teaching/backend/controller/system/SystemSettingsController.java +++ b/src/main/java/com/teaching/backend/controller/system/SystemSettingsController.java @@ -2,7 +2,10 @@ package com.teaching.backend.controller.system; import com.teaching.backend.common.BaseResponse; import com.teaching.backend.common.ResultUtils; +<<<<<<< HEAD import com.teaching.backend.model.dto.system.SystemSettingDTO; +======= +>>>>>>> 2b31a38a8270bebc5e82f07db8833ab038aac30b import com.teaching.backend.model.entity.system.SystemSetting; import com.teaching.backend.model.vo.system.SystemSettingVO; import com.teaching.backend.service.system.SystemSettingsService; @@ -42,7 +45,11 @@ public class SystemSettingsController { */ @PutMapping @ApiOperation("编辑系统设置信息") +<<<<<<< HEAD public BaseResponse update(@RequestBody SystemSettingDTO systemSetting){ +======= + public BaseResponse update(@RequestBody SystemSetting systemSetting){ +>>>>>>> 2b31a38a8270bebc5e82f07db8833ab038aac30b return systemSettingsService.updateSystemSettings(systemSetting); } diff --git a/src/main/java/com/teaching/backend/model/entity/resource/ResourceRelationship.java b/src/main/java/com/teaching/backend/model/entity/resource/ResourceRelationship.java index a260adf..762137a 100644 --- a/src/main/java/com/teaching/backend/model/entity/resource/ResourceRelationship.java +++ b/src/main/java/com/teaching/backend/model/entity/resource/ResourceRelationship.java @@ -35,4 +35,9 @@ public class ResourceRelationship { @ApiModelProperty(value = "课程Id") private String courseId; +<<<<<<< HEAD +======= + @ApiModelProperty(value = "创建时间") + private LocalDateTime createTime; +>>>>>>> 2b31a38a8270bebc5e82f07db8833ab038aac30b } diff --git a/src/main/java/com/teaching/backend/model/vo/resources/ResourceUploadVO.java b/src/main/java/com/teaching/backend/model/vo/resources/ResourceUploadVO.java index fe34797..a1e4eba 100644 --- a/src/main/java/com/teaching/backend/model/vo/resources/ResourceUploadVO.java +++ b/src/main/java/com/teaching/backend/model/vo/resources/ResourceUploadVO.java @@ -11,6 +11,10 @@ import lombok.EqualsAndHashCode; @Data @EqualsAndHashCode public class ResourceUploadVO { +<<<<<<< HEAD:src/main/java/com/teaching/backend/model/vo/resources/ResourceUploadVO.java +======= + +>>>>>>> 2b31a38a8270bebc5e82f07db8833ab038aac30b:src/main/java/com/teaching/backend/model/dto/resource/ResourceUploadDto.java private String url; diff --git a/src/main/java/com/teaching/backend/service/impl/knowtmp/knowPointServiceImpl.java b/src/main/java/com/teaching/backend/service/impl/knowtmp/knowPointServiceImpl.java index 277001d..012ce3c 100644 --- a/src/main/java/com/teaching/backend/service/impl/knowtmp/knowPointServiceImpl.java +++ b/src/main/java/com/teaching/backend/service/impl/knowtmp/knowPointServiceImpl.java @@ -125,7 +125,10 @@ public class knowPointServiceImpl implements KnowPointService { } KnowPoint knowtmp = new KnowPoint(); BeanUtils.copyProperties(knowPointAddRequest,knowtmp); +<<<<<<< HEAD knowtmp.setCourseId(chapter.getCourseId()); +======= +>>>>>>> 2b31a38a8270bebc5e82f07db8833ab038aac30b //顺序计算 分配学时以及顺序 Long chapterid = knowPointAddRequest.getChapterId(); String res = ComputeLearnHours(chapterid,knowtmp); diff --git a/src/main/java/com/teaching/backend/service/impl/resource/ResourceServiceImpl.java b/src/main/java/com/teaching/backend/service/impl/resource/ResourceServiceImpl.java index f8f7ad5..47414a4 100644 --- a/src/main/java/com/teaching/backend/service/impl/resource/ResourceServiceImpl.java +++ b/src/main/java/com/teaching/backend/service/impl/resource/ResourceServiceImpl.java @@ -137,6 +137,7 @@ public class ResourceServiceImpl implements ResourceService { // } +<<<<<<< HEAD @Override public BaseResponse upload(MultipartFile file) { @@ -149,6 +150,64 @@ public class ResourceServiceImpl implements ResourceService { // String objectName = ResourceUploadVO.getObjectName(); return ResultUtils.success(url); +======= + +// @Override +// public BaseResponse upload(MultipartFile file) { +// ResourceUploadVO ResourceUploadVO = minioUtils.upload(file); +// if (ResourceUploadVO == null) { +// return ResultUtils.error(ErrorCode.OPERATION_ERROR, "上传失败"); +// } +// String url = ResourceUploadVO.getUrl(); +// String name = ResourceUploadVO.getName(); +// String objectName = ResourceUploadVO.getObjectName(); +// +// return ResultUtils.success(ResourceUploadVO); +// } +// +// @Override +// public BaseResponse delete(String objectName) { +// try { +// minioUtils.delete(objectName); +// }catch (Exception e){ +// e.printStackTrace(); +// LOGGER.info("删除失败，故障"); +// return ResultUtils.error(ErrorCode.OPERATION_ERROR, "删除失败"); +// } +// return ResultUtils.success("删除成功"); +// } + + +// public ResponseEntity readFile(String filename) { +// return minioUtils.readFile(filename); +// } + + @Override + public BaseResponse addResourceForMysql(MultipartFile file,Long knowId) { + ResourceUploadVO ResourceUploadVO = minioUtils.upload(file); + ResourceMysql resourceMysql = new ResourceMysql(); + resourceMysql.setName(ResourceUploadVO.getName()); + resourceMysql.setType(ResourceUploadVO.getType()); + resourceMysql.setStatus(status); + resourceMysql.setUrl(ResourceUploadVO.getUrl()); + resourceMysql.setCreateTime(LocalDateTime.now()); + int ans = resourceMapper.insert(resourceMysql); + if(ans <= 0){ + return ResultUtils.error(ErrorCode.OPERATION_ERROR,"添加资源失败"); + } + //查询知识点 + KnowPoint knowPoint = knowtmpMapper.selectById(knowId); + //添加资源和知识点的关系 + ResourceRelationship resourceRelationship = new ResourceRelationship(); + resourceRelationship.setResourceId(resourceMysql.getId()); + resourceRelationship.setCourseId(knowPoint.getCourseId()); + resourceRelationship.setKnowId(knowId); + int ans2 = resourceRelationshipMapper.insert(resourceRelationship); + if(ans2 < 0){ + return ResultUtils.error(ErrorCode.SYSTEM_ERROR,"添加关系失败"); + } + return ResultUtils.success(resourceMysql); +>>>>>>> 2b31a38a8270bebc5e82f07db8833ab038aac30b } // // @Override @@ -168,7 +227,35 @@ public class ResourceServiceImpl implements ResourceService { // return minioUtils.readFile(filename); // } + +// @Override +// @Transactional +// public BaseResponse addResource(MultipartFile file) { +// ResourceUploadVO ResourceUploadVO = minioUtils.upload(file); +// //添加mysql +// ResourceMysql resourceMysql = new ResourceMysql(); +// resourceMysql.setName(ResourceUploadVO.getName()); +// resourceMysql.setType(ResourceUploadVO.getType()); +// resourceMysql.setStatus(status); +// resourceMysql.setUrl(ResourceUploadVO.getUrl()); +// long ans = resourceMapper.insert(resourceMysql); +// //添加neo4j +// Resources resources = new Resources(); +// resources.setType(ResourceUploadVO.getType()); +// resources.setName(ResourceUploadVO.getName()); +// resources.setStatus(status); +// resources.setResourceId(resourceMysql.getId()); +// resources.setUrl(ResourceUploadVO.getUrl()); +// Resources resourcesNew = resourcesRepository.save(resources); +// if (resourcesNew != null && ans > 0) { +// return ResultUtils.success(resourceMysql); +// } +// +// return ResultUtils.error(ErrorCode.OPERATION_ERROR,"添加资原失败"); +// } + @Override +<<<<<<< HEAD public BaseResponse addResourceForMysql(MultipartFile file,Long knowId) { ResourceUploadVO ResourceUploadVO = minioUtils.upload(file); ResourceMysql resourceMysql = new ResourceMysql(); @@ -193,9 +280,86 @@ public class ResourceServiceImpl implements ResourceService { return ResultUtils.error(ErrorCode.SYSTEM_ERROR,"添加关系失败"); } return ResultUtils.success(resourceMysql); +======= + public BaseResponse deleteResourceForMysql(long id) throws Exception { + ResourceMysql resourceMysql = resourceMapper.selectById(id); + if(resourceMysql == null){ + return ResultUtils.error(ErrorCode.PARAMS_ERROR,"删除ID不存在"); + } + minioUtils.delete(resourceMysql.getName()); + + int ans = resourceMapper.deleteById(id); + if (ans > 0) { + return ResultUtils.success("删除成功"); + } + return ResultUtils.error(ErrorCode.PARAMS_ERROR,"删除失败"); +>>>>>>> 2b31a38a8270bebc5e82f07db8833ab038aac30b } +// @Override +// @Transactional +// public BaseResponse deleteResource(long id) throws Exception { +// Resources resources = resourcesRepository.queryResourcesByIds(id); +// if (resources == null) { +// return ResultUtils.error(ErrorCode.PARAMS_ERROR, "删除ID不存在"); +// } +// minioUtils.delete(resources.getName()); +// +// int ans = resourceMapper.deleteById(resources.getResourceId()); +// if (ans <= 0) { +// return ResultUtils.error(ErrorCode.PARAMS_ERROR, "删除-mysql-失败"); +// } +// Boolean flag = resourcesRepository.deleteByid(id); +// if(flag){ +// return ResultUtils.success("删除成功"); +// } +// return ResultUtils.error(ErrorCode.PARAMS_ERROR, "删除-neo4j-失败"); +// } +// +// //查询资源-关系表 +// QueryWrapper resourceRelationshipQueryWrapper = new QueryWrapper<>(); +// resourceRelationshipQueryWrapper.eq("resource_id",id); +// List resourceRelationshipList = resourceRelationshipMapper.selectList(resourceRelationshipQueryWrapper); +// if(resourceRelationshipList != null){ +// int delete = resourceRelationshipMapper.delete(resourceRelationshipQueryWrapper); +// if(delete <= 0){ +// return ResultUtils.error(ErrorCode.PARAMS_ERROR,"删除-mysql-resource关系失败"); +// } +// } +// +// boolean f = resourcesRepository.deleteByResourceId(id); +// if(f){ +// return ResultUtils.success("删除成功"); +// } +// return ResultUtils.error(ErrorCode.PARAMS_ERROR,"删除失败"); +// } + +// @Override +// public BaseResponse recoverdata() { +// resourcesRepository.deleteAll(); +// QueryWrapper resourceMysqlQueryWrapper = new QueryWrapper<>(); +// List resourceMysqls = resourceMapper.selectList(resourceMysqlQueryWrapper); +// for (ResourceMysql rs:resourceMysqls) { +// String temp = "CREATE (n:Resources {" +// +"name: '"+rs.getName()+"'," +// +"resourceId: "+rs.getId()+"," +// +"url: '"+rs.getUrl()+"'," +// +"status: "+rs.getStatus()+"," +// +"type: "+rs.getType()+"," +// +"tags: '"+rs.getTags()+"'," +// +"description: '"+rs.getDescription() +// +"'}) return ID(n)"; +// Collection> all = neo4jClient.query(temp).fetch().all(); +// if(all == null){ +// return ResultUtils.success("恢复失败"); +// } +// System.out.println(all); +// } +// return ResultUtils.success("恢复成功"); +// +// } +<<<<<<< HEAD // @Override // @Transactional // public BaseResponse addResource(MultipartFile file) { @@ -305,4 +469,6 @@ public class ResourceServiceImpl implements ResourceService { // // } +======= +>>>>>>> 2b31a38a8270bebc5e82f07db8833ab038aac30b } diff --git a/src/main/java/com/teaching/backend/service/impl/system/SystemSettingsServiceImpl.java b/src/main/java/com/teaching/backend/service/impl/system/SystemSettingsServiceImpl.java index 431aa50..7fe6f38 100644 --- a/src/main/java/com/teaching/backend/service/impl/system/SystemSettingsServiceImpl.java +++ b/src/main/java/com/teaching/backend/service/impl/system/SystemSettingsServiceImpl.java @@ -58,6 +58,7 @@ public class SystemSettingsServiceImpl extends ServiceImpl updateSystemSettings(SystemSettingDTO systemSettingdto) { SystemSetting systemSetting = new SystemSetting(); BeanUtils.copyProperties(systemSettingdto,systemSetting); @@ -67,6 +68,9 @@ public class SystemSettingsServiceImpl extends ServiceImpl updateSystemSettings(SystemSetting systemSetting) { +>>>>>>> 2b31a38a8270bebc5e82f07db8833ab038aac30b int systemSettings = systemSettingsMapper.updateById(systemSetting); if (systemSettings > 0){ return ResultUtils.success("修改成功"); diff --git a/src/main/java/com/teaching/backend/service/resource/ResourceService.java b/src/main/java/com/teaching/backend/service/resource/ResourceService.java index e162cba..cec7aa9 100644 --- a/src/main/java/com/teaching/backend/service/resource/ResourceService.java +++ b/src/main/java/com/teaching/backend/service/resource/ResourceService.java @@ -16,7 +16,11 @@ import org.springframework.web.multipart.MultipartFile; public interface ResourceService { +<<<<<<< HEAD BaseResponse upload(MultipartFile file) ; +======= +// BaseResponse upload(MultipartFile file) ; +>>>>>>> 2b31a38a8270bebc5e82f07db8833ab038aac30b // BaseResponse delete(String filename) ; diff --git a/src/main/java/com/teaching/backend/service/system/SystemSettingsService.java b/src/main/java/com/teaching/backend/service/system/SystemSettingsService.java index 6d0a4b6..1e62880 100644 --- a/src/main/java/com/teaching/backend/service/system/SystemSettingsService.java +++ b/src/main/java/com/teaching/backend/service/system/SystemSettingsService.java @@ -2,12 +2,19 @@ package com.teaching.backend.service.system; import com.baomidou.mybatisplus.extension.service.IService; import com.teaching.backend.common.BaseResponse; +<<<<<<< HEAD import com.teaching.backend.model.dto.system.SystemSettingDTO; +======= +>>>>>>> 2b31a38a8270bebc5e82f07db8833ab038aac30b import com.teaching.backend.model.entity.system.SystemSetting; import com.teaching.backend.model.vo.system.SystemSettingVO; public interface SystemSettingsService extends IService { SystemSettingVO getSystemSettings(); +<<<<<<< HEAD BaseResponse updateSystemSettings(SystemSettingDTO systemSetting); +======= + BaseResponse updateSystemSettings(SystemSetting systemSetting); +>>>>>>> 2b31a38a8270bebc5e82f07db8833ab038aac30b }