From 44dfbb4cc117b15f0c2f1b198b0e83280252279c Mon Sep 17 00:00:00 2001 From: ls Date: Wed, 23 Oct 2024 18:11:26 +0800 Subject: [PATCH] update --- .gitignore | 1 + docker-compose.yml | 4 + .../oss/controller/OssFileController.java | 154 ++++++++++-------- scripts/common.py | 12 +- 4 files changed, 100 insertions(+), 71 deletions(-) diff --git a/.gitignore b/.gitignore index b7838ca..b3518d7 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ os_del.cmd os_del_doc.cmd .svn derby.log +/scripts/downloaded_files/ diff --git a/docker-compose.yml b/docker-compose.yml index c51e3e7..92de87e 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -80,6 +80,10 @@ services: - 8005:80 physical-crawler: container_name: physical-crawler + restart: on-failure + depends_on: + - physical-mysql + - physical-minio image: registry.cn-shanghai.aliyuncs.com/physical/physical-crawler ports: - "25000:5000" diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/oss/controller/OssFileController.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/oss/controller/OssFileController.java index 21eeb3e..8edf451 100644 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/oss/controller/OssFileController.java +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/oss/controller/OssFileController.java @@ -1,9 +1,13 @@ package org.jeecg.modules.oss.controller; +import cn.hutool.core.collection.CollectionUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import io.swagger.v3.oas.annotations.Operation; import jakarta.servlet.http.HttpServletRequest; - +import lombok.extern.slf4j.Slf4j; import org.apache.shiro.authz.annotation.RequiresPermissions; -import org.apache.shiro.authz.annotation.RequiresRoles; import org.jeecg.common.api.vo.Result; import org.jeecg.common.system.query.QueryGenerator; import org.jeecg.modules.oss.entity.OssFile; @@ -13,14 +17,12 @@ import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; - -import lombok.extern.slf4j.Slf4j; +import java.util.ArrayList; +import java.util.List; /** * 云存储示例 DEMO + * * @author: jeecg-boot */ @Slf4j @@ -28,70 +30,92 @@ import lombok.extern.slf4j.Slf4j; @RequestMapping("/sys/oss/file") public class OssFileController { - @Autowired - private IOssFileService ossFileService; + @Autowired + private IOssFileService ossFileService; - @ResponseBody - @GetMapping("/list") - public Result> queryPageList(OssFile file, + @ResponseBody + @GetMapping("/list") + public Result> queryPageList(OssFile file, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest req) { - Result> result = new Result<>(); - QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(file, req.getParameterMap()); - Page page = new Page<>(pageNo, pageSize); - IPage pageList = ossFileService.page(page, queryWrapper); - result.setSuccess(true); - result.setResult(pageList); - return result; - } + Result> result = new Result<>(); + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(file, req.getParameterMap()); + Page page = new Page<>(pageNo, pageSize); + IPage pageList = ossFileService.page(page, queryWrapper); + result.setSuccess(true); + result.setResult(pageList); + return result; + } - @ResponseBody - @PostMapping("/upload") - //@RequiresRoles("admin") + @ResponseBody + @PostMapping("/upload") + //@RequiresRoles("admin") @RequiresPermissions("system:ossFile:upload") - public Result upload(@RequestParam("file") MultipartFile multipartFile) { - Result result = new Result(); - try { - ossFileService.upload(multipartFile); - result.success("上传成功！"); - } - catch (Exception ex) { - log.info(ex.getMessage(), ex); - result.error500("上传失败"); - } - return result; - } + public Result upload(@RequestParam("file") MultipartFile multipartFile) { + Result result = new Result(); + try { + ossFileService.upload(multipartFile); + result.success("上传成功！"); + } catch (Exception ex) { + log.info(ex.getMessage(), ex); + result.error500("上传失败"); + } + return result; + } - @ResponseBody - @DeleteMapping("/delete") - public Result delete(@RequestParam(name = "id") String id) { - Result result = new Result(); - OssFile file = ossFileService.getById(id); - if (file == null) { - result.error500("未找到对应实体"); - }else { - boolean ok = ossFileService.delete(file); - result.success("删除成功!"); - } - return result; - } + @ResponseBody + @DeleteMapping("/delete") + public Result delete(@RequestParam(name = "id") String id) { + Result result = new Result(); + OssFile file = ossFileService.getById(id); + if (file == null) { + result.error500("未找到对应实体"); + } else { + boolean ok = ossFileService.delete(file); + result.success("删除成功!"); + } + return result; + } - /** - * 通过id查询. - */ - @ResponseBody - @GetMapping("/queryById") - public Result queryById(@RequestParam(name = "id") String id) { - Result result = new Result<>(); - OssFile file = ossFileService.getById(id); - if (file == null) { - result.error500("未找到对应实体"); - } - else { - result.setResult(file); - result.setSuccess(true); - } - return result; - } + /** + * 通过id查询. + */ + @ResponseBody + @GetMapping("/queryById") + @Operation(summary = "文件管理-通过id查询") + public Result queryById(@RequestParam(name = "id") String id) { + Result result = new Result<>(); + OssFile file = ossFileService.getById(id); + if (file == null) { + result.error500("未找到对应实体"); + } else { + result.setResult(file); + result.setSuccess(true); + } + return result; + } + + /** + * 通过id查询. + */ + @ResponseBody + @GetMapping("/queryByIds") + @Operation(summary = "文件管理-通过多个id逗号分割批量查询查询") + public Result> queryByIdList(@RequestParam(name = "ids") String ids) { + Result> result = new Result<>(); + String[] idList = ids.split(","); + List resultList = new ArrayList<>(); + for (int i = 0; i < idList.length; i++) { + OssFile file = ossFileService.getById(idList[i]); + resultList.add(file); + } + if (CollectionUtil.isEmpty(resultList)) { + result.error500("未找到对应实体"); + } else { + result.setResult(resultList); + result.setSuccess(true); + } + return result; + } } diff --git a/scripts/common.py b/scripts/common.py index 8668b09..5da7a8d 100644 --- a/scripts/common.py +++ b/scripts/common.py @@ -9,10 +9,10 @@ from minio.error import S3Error minio_public_url = 'http://58.215.212.230:8005/oss/' # MySQL 连接配置 db_config = { - # 'host': 'physical-mysql', - # 'port': 3306, - 'host': '192.168.50.100', - 'port': 23306, + 'host': 'physical-mysql', + 'port': 3306, +# 'host': '192.168.50.100', +# 'port': 23306, 'user': 'root', 'password': '123456', 'database': 'physical-boot' @@ -20,8 +20,8 @@ db_config = { # minio 配置 minio_client = Minio( - # "physical-minio:9000", # MinIO服务器地址或IP - "192.168.50.100:29000", # MinIO服务器地址或IP + "physical-minio:9000", # MinIO服务器地址或IP +# "192.168.50.100:29000", # MinIO服务器地址或IP access_key="root", # 替换为你的Access Key secret_key="12345678", # 替换为你的Secret Key secure=False # 如果使用的是http则为False