From ec6d43aa07ee0e8faf34498057ebcfbb446aa015 Mon Sep 17 00:00:00 2001
From: hjl <1657978663@qq.com>
Date: 星期二, 16 七月 2024 09:21:51 +0800
Subject: [PATCH] feat: 代码重构
---
ruoyi-service/ruoyi-worker/src/main/java/com/ruoyi/worker/controller/OssController.java | 26 +++++++++-----------------
1 files changed, 9 insertions(+), 17 deletions(-)
diff --git a/ruoyi-service/ruoyi-worker/src/main/java/com/ruoyi/worker/controller/OssController.java b/ruoyi-service/ruoyi-worker/src/main/java/com/ruoyi/worker/controller/OssController.java
index 500f7f4..9f45fc5 100644
--- a/ruoyi-service/ruoyi-worker/src/main/java/com/ruoyi/worker/controller/OssController.java
+++ b/ruoyi-service/ruoyi-worker/src/main/java/com/ruoyi/worker/controller/OssController.java
@@ -3,9 +3,9 @@
import com.ruoyi.common.core.constant.Constants;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.utils.GaoDeMapUtil;
-import com.ruoyi.common.core.utils.ObsUploadUtil;
-import com.ruoyi.worker.entity.Order;
-import com.ruoyi.worker.service.OrderService;
+import com.ruoyi.order.api.entity.Order;
+import com.ruoyi.order.api.feignClient.OrderClient;
+import com.ruoyi.worker.utils.TencentCosUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
@@ -17,7 +17,6 @@
import org.springframework.web.multipart.MultipartFile;
import javax.annotation.Resource;
-import java.io.IOException;
/**
* @author HJL
@@ -30,7 +29,9 @@
public class OssController {
@Resource
- private OrderService orderService;
+ private OrderClient orderClient;
+ @Resource
+ private TencentCosUtil tencentCosUtil;
@PostMapping("/upload")
@ApiOperation(value = "文件上传", tags = "师傅端-文件上传")
@@ -38,11 +39,7 @@
@ApiImplicitParam(value = "文件", name = "file", dataType = "MultipartFile", required = true)
})
public R<String> upload(@RequestParam("file") MultipartFile file) {
- try {
- return R.ok(ObsUploadUtil.obsUpload(file), "");
- } catch (IOException e) {
- return R.fail("文件上传失败！");
- }
+ return R.ok(tencentCosUtil.upLoadFile(file));
}
@PostMapping("/uploadPhoto")
@@ -56,8 +53,7 @@
public R<Boolean> uploadPhoto(@RequestParam("file") MultipartFile file, @RequestParam String orderId,
@RequestParam String longitude, @RequestParam String latitude) {
// 校验经纬度
- Order order = orderService.lambdaQuery().eq(Order::getId, orderId)
- .eq(Order::getIsDelete, 0).one();
+ Order order = orderClient.detail(orderId).getData();
// 用户下单位置经纬度
String orderPosition = order.getLongitude() + "," + order.getLatitude();
// 师傅经纬度
@@ -69,11 +65,7 @@
// throw new GlobalException("您当前手机定位超出当前订单预约地址范围 3km，无法提供回收服务！");
return R.fail(Boolean.FALSE, "您当前手机定位超出当前订单预约地址范围 3km，无法提供回收服务！");
}
- try {
- return R.ok(ObsUploadUtil.obsUpload(file));
- } catch (IOException e) {
- return R.fail("文件上传失败！");
- }
+ return R.ok(tencentCosUtil.upLoadFile(file));
}
}
--
Gitblit v1.7.1