confict

src/main/java/com/teaching/backend/controller/resource/ResourceController.java

@@ -10,6 +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;
@@ -40,6 +44,42 @@ public class ResourceController {
     @Autowired
     private ResourceRelationshipService resourceRelationshipService;
 
+<<<<<<< HEAD
+
+
+
+
+    //上传资源
+    @PostMapping("/upload")
+    @ResponseBody
+    @ApiOperation(value = "上传资源")
+    public BaseResponse<String> uploadFile(@RequestPart("file") MultipartFile file) {
+        return resourceService.upload(file);
+    }
+
+//    //删除资源
+//    @GetMapping ("/deleteFile")
+//    @ResponseBody
+//    @ApiOperation(value = "删除资源")
+//    public BaseResponse<String> deleteResource(@RequestParam("filename") @NotBlank String filename) {
+//        return resourceService.delete(filename);
+//    }
+
+//    @GetMapping("/read")
+//    @ApiOperation(value = "查询资源")
+//    public ResponseEntity<InputStreamResource> readFile(@RequestParam @NotBlank String filename) {
+//        return  resourceService.readFile(filename);
+//    }
+//
+
+    @PostMapping("/add")
+    @ResponseBody
+    @ApiOperation(value = "添加资源")
+    public BaseResponse<ResourceMysql>  addResourceForMysql(@RequestPart("file") MultipartFile file,@RequestParam Long knowId){
+            return resourceService.addResourceForMysql(file,knowId);
+    }
+
+=======
 
 
 
@@ -74,6 +114,7 @@ public class ResourceController {
             return resourceService.addResourceForMysql(file,knowId);
     }
 
+>>>>>>> 2b31a38a8270bebc5e82f07db8833ab038aac30b
     @GetMapping("/delete")
     @ApiOperation(value = "删除资源")
     public BaseResponse<String>  deleteResourceForMysql(@RequestParam @NotNull long Id) throws Exception {
@@ -100,6 +141,14 @@ public class ResourceController {
     @ApiOperation(value = "添加知识点资源关系")
     public  BaseResponse<String> addResourcesRel(@RequestBody @Validated ResourceRelationshipDTO resourceRelationshipDto){
         return  resourceRelationshipService.addResourcesRel(resourceRelationshipDto);
+<<<<<<< HEAD
+    }
+
+    @GetMapping("/deleteResourcesRel")
+    @ApiOperation(value = "删除知识点资源关系")
+    public  BaseResponse<String> deleteResourcesRel(@RequestParam @NotNull Long KnowId, @RequestParam @NotNull Long resourceId){
+        return  resourceRelationshipService.deleteResourcesRel(KnowId,resourceId);
+=======
     }
 
     @GetMapping("/deleteResourcesRel")
@@ -139,6 +188,45 @@ public class ResourceController {
         return resourceGraphService.queryBesidesKnowToResources(knowId);
     }
 
+    //查询知识点下资源
+    @GetMapping("/queryResourcesByKnowId")
+    @ApiOperation(value = "查询知识点下所有资源")
+    BaseResponse<List<ResourceMysql>> queryResourcesById(@RequestParam @NotNull Long knowId){
+        return resourceGraphService.queryResourcesById(knowId);
+>>>>>>> 2b31a38a8270bebc5e82f07db8833ab038aac30b
+    }
+
+//
+//    @PostMapping("/myself/recoverdata")
+//    @ResponseBody
+//    @ApiOperation(value = "recoverdatal-neo")
+//    public BaseResponse<String>  recoverdata(){
+//        return resourceService.recoverdata();
+//    }
+
+
+
+    //查询课程下资源
+    @GetMapping("/queryByCourseId")
+    @ApiOperation(value = "查询课程下所有资源")
+    BaseResponse<List<ResourceMysql>> queryResourcesByCourseIdToNeo4j(@RequestParam @NotBlank String courseId){
+        return resourceGraphService.queryResourcesByCourseId(courseId);
+    }
+
+    //查询章节下资源
+    @GetMapping("/queryByChapterId")
+    @ApiOperation(value = "查询章节下所有资源")
+    BaseResponse<List<ResourceMysql>> queryResourcesByChapterId(@RequestParam @NotNull Long chapterId){
+        return resourceGraphService.queryResourcesByChapterId(chapterId);
+    }
+
+    //查询二级节点下资源
+    @ApiOperation(value = "查询二级节点下所有资源")
+    @GetMapping("/queryBesidesKnow")
+    BaseResponse<List<ResourceMysql>> queryBesidesKnowToResources(@RequestParam @NotNull Long knowId){
+        return resourceGraphService.queryBesidesKnowToResources(knowId);
+    }
+
     //查询知识点下资源
     @GetMapping("/queryResourcesByKnowId")
     @ApiOperation(value = "查询知识点下所有资源")
@@ -189,4 +277,46 @@ public class ResourceController {
 
 
 
+//    //查询知识点下资源 -mysql
+//    @GetMapping("/mysql/queryResourcesByKnowId")
+//    @ApiOperation(value = "查询知识点下所有资源  -mysql")
+//    BaseResponse<List<ResourceMysql>> queryResourcesByKnowId(@RequestParam @NotNull Long knowId){
+//        return resourceMysqlService.queryResourcesByKnowId(knowId);
+//    }
+
+
+//    //查询课程下资源 -mysql
+//    @GetMapping("/mysql/queryByCourseId")
+//    @ApiOperation(value = "查询课程下所有资源 -mysql")
+//    BaseResponse<List<ResourceMysql>> queryResourcesByCourseIdToMysql(@RequestParam @NotBlank String courseId){
+//        return resourceMysqlService.queryResourcesByCourseId(courseId);
+//    }
+
+
+
+//    @PostMapping("/upload")
+//    @ResponseBody
+//    @ApiOperation(value = "添加资源")
+//    public BaseResponse<String> uploadFileO(@RequestPart("file") MultipartFile file) throws IOException {
+//            return resourceService.uploadOSS(file);
+//    }
+//
+//    //删除资源
+//    @GetMapping ("/deleteFileOss")
+//    @ResponseBody
+//    @ApiOperation(value = "删除资源")
+//    //注意字符串是以 2024开头的
+//    public BaseResponse<String> deleteFileOss(@RequestParam("filename") String filename) {
+//        return resourceService.deleteFileOss(filename);
+//    }
+//
+//
+//    @GetMapping("/read/oss")
+//    @ApiOperation(value = "查询资源")
+//    public BaseResponse<InputStream> readFileOss(@RequestParam String filename) {
+//        return  resourceService.readFile(filename);
+//    }
+
+
+
 }

src/main/java/com/teaching/backend/controller/system/SystemSettingsController.java

@@ -2,6 +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;
@@ -41,7 +45,11 @@ public class SystemSettingsController {
      */
     @PutMapping
     @ApiOperation("编辑系统设置信息")
+<<<<<<< HEAD
+    public BaseResponse<String> update(@RequestBody SystemSettingDTO systemSetting){
+=======
     public BaseResponse<String> update(@RequestBody SystemSetting systemSetting){
+>>>>>>> 2b31a38a8270bebc5e82f07db8833ab038aac30b
         return systemSettingsService.updateSystemSettings(systemSetting);
     }
 

src/main/java/com/teaching/backend/model/dto/system/SystemSettingDTO.java

@@ -0,0 +1,63 @@
+package com.teaching.backend.model.dto.system;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+@Data
+@TableName("system_settings")
+public class SystemSettingDTO implements Serializable {
+
+    //主键
+    @TableId(type = IdType.AUTO)
+    private Long id;
+
+    //门户首页
+    private String home;
+
+    //系统名称
+    private String name;
+
+    //LOGO
+    private String logo;
+
+    //宣传图片
+    private String promotionalImages;
+
+    //登录地址
+    private String loginAddress;
+
+    //标题
+    private String title;
+
+    //版权信息
+    private String copyrightInformation;
+
+    //备案号
+    private String recordNumber;
+
+    //备案信息
+    private List<String> recordInformation;
+
+    //QQ
+    private String qqNumber;
+
+    //技术支持
+    private String tecNumber;
+
+    //邮箱
+    private String mailbox;
+
+    //手机号
+    private String phone;
+
+    //地址
+    private String address;
+
+    //二维码
+    private String qrCode;
+}

src/main/java/com/teaching/backend/model/entity/resource/ResourceRelationship.java

@@ -35,6 +35,9 @@ public class ResourceRelationship {
     @ApiModelProperty(value = "课程Id")
     private String courseId;
 
+<<<<<<< HEAD
+=======
     @ApiModelProperty(value = "创建时间")
     private LocalDateTime createTime;
+>>>>>>> 2b31a38a8270bebc5e82f07db8833ab038aac30b
 }

src/main/java/com/teaching/backend/model/vo/resources/ResourceUploadVO.java

@@ -11,11 +11,13 @@ 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;
 
-
     private String name;
 
     private Integer type;

src/main/java/com/teaching/backend/service/impl/knowtmp/knowPointServiceImpl.java

@@ -125,6 +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);

src/main/java/com/teaching/backend/service/impl/resource/ResourceServiceImpl.java

@@ -137,6 +137,20 @@ public class ResourceServiceImpl implements ResourceService {
 //    }
 
 
+<<<<<<< HEAD
+
+    @Override
+    public BaseResponse<String> 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(url);
+=======
 
 //    @Override
 //    public BaseResponse<ResourceUploadVO> upload(MultipartFile file) {
@@ -193,7 +207,25 @@ public class ResourceServiceImpl implements ResourceService {
             return ResultUtils.error(ErrorCode.SYSTEM_ERROR,"添加关系失败");
         }
         return ResultUtils.success(resourceMysql);
+>>>>>>> 2b31a38a8270bebc5e82f07db8833ab038aac30b
     }
+//
+//    @Override
+//    public BaseResponse<String> 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<InputStreamResource> readFile(String filename) {
+//        return  minioUtils.readFile(filename);
+//    }
 
 
 //    @Override
@@ -223,6 +255,32 @@ public class ResourceServiceImpl implements ResourceService {
 //    }
 
     @Override
+<<<<<<< HEAD
+    public BaseResponse<ResourceMysql> 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);
+=======
     public BaseResponse<String> deleteResourceForMysql(long id) throws Exception {
         ResourceMysql resourceMysql = resourceMapper.selectById(id);
         if(resourceMysql == null){
@@ -235,6 +293,117 @@ public class ResourceServiceImpl implements ResourceService {
            return ResultUtils.success("删除成功");
        }
        return ResultUtils.error(ErrorCode.PARAMS_ERROR,"删除失败");
+>>>>>>> 2b31a38a8270bebc5e82f07db8833ab038aac30b
+    }
+
+//    @Override
+//    @Transactional
+//    public BaseResponse<String> 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<ResourceRelationship> resourceRelationshipQueryWrapper = new QueryWrapper<>();
+//        resourceRelationshipQueryWrapper.eq("resource_id",id);
+//         List<ResourceRelationship> 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<String> recoverdata() {
+//        resourcesRepository.deleteAll();
+//        QueryWrapper<ResourceMysql> resourceMysqlQueryWrapper = new QueryWrapper<>();
+//        List<ResourceMysql> 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<Map<String, Object>> all = neo4jClient.query(temp).fetch().all();
+//            if(all == null){
+//                return ResultUtils.success("恢复失败");
+//            }
+//            System.out.println(all);
+//        }
+//        return ResultUtils.success("恢复成功");
+//
+//    }
+
+<<<<<<< HEAD
+//    @Override
+//    @Transactional
+//    public BaseResponse<ResourceMysql> 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
+    public BaseResponse<String> 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.error(ErrorCode.PARAMS_ERROR,"删除失败");
+       }
+       //删除资源与知识点的关系
+        QueryWrapper<ResourceRelationship> resourceRelationshipQueryWrapper = new QueryWrapper<>();
+        resourceRelationshipQueryWrapper.eq("resource_id", id);
+        resourceRelationshipMapper.delete(resourceRelationshipQueryWrapper);
+
+        return ResultUtils.success("删除成功");
     }
 
 //    @Override
@@ -300,4 +469,6 @@ public class ResourceServiceImpl implements ResourceService {
 //
 //    }
 
+=======
+>>>>>>> 2b31a38a8270bebc5e82f07db8833ab038aac30b
 }

src/main/java/com/teaching/backend/service/impl/system/SystemSettingsServiceImpl.java

@@ -5,6 +5,7 @@ import com.teaching.backend.common.BaseResponse;
 import com.teaching.backend.common.ErrorCode;
 import com.teaching.backend.common.ResultUtils;
 import com.teaching.backend.mapper.system.SystemSettingsMapper;
+import com.teaching.backend.model.dto.system.SystemSettingDTO;
 import com.teaching.backend.model.entity.system.SystemSetting;
 import com.teaching.backend.model.vo.system.SystemSettingVO;
 import com.teaching.backend.service.system.SystemSettingsService;
@@ -57,7 +58,19 @@ public class SystemSettingsServiceImpl extends ServiceImpl<SystemSettingsMapper,
     }
 
     @Override
+<<<<<<< HEAD
+    public BaseResponse<String> updateSystemSettings(SystemSettingDTO systemSettingdto) {
+        SystemSetting systemSetting = new SystemSetting();
+        BeanUtils.copyProperties(systemSettingdto,systemSetting);
+        List<String>recordInformationArray = systemSettingdto.getRecordInformation();
+        String s = new String();
+        for (int i = 0; i < recordInformationArray.size(); i++) {
+         s+=recordInformationArray.get(i);
+        }
+        systemSetting.setRecordInformation(s);
+=======
     public BaseResponse<String> updateSystemSettings(SystemSetting systemSetting) {
+>>>>>>> 2b31a38a8270bebc5e82f07db8833ab038aac30b
         int systemSettings = systemSettingsMapper.updateById(systemSetting);
         if (systemSettings > 0){
             return ResultUtils.success("修改成功");

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<String> upload(MultipartFile file) ;
+=======
 //    BaseResponse<ResourceUploadVO> upload(MultipartFile file) ;
+>>>>>>> 2b31a38a8270bebc5e82f07db8833ab038aac30b
 
 //    BaseResponse<String> delete(String filename) ;
 

src/main/java/com/teaching/backend/service/system/SystemSettingsService.java

@@ -2,11 +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<SystemSetting> {
     SystemSettingVO getSystemSettings();
 
+<<<<<<< HEAD
+    BaseResponse<String> updateSystemSettings(SystemSettingDTO systemSetting);
+=======
     BaseResponse<String> updateSystemSettings(SystemSetting systemSetting);
+>>>>>>> 2b31a38a8270bebc5e82f07db8833ab038aac30b
 }