From ecca9ab70a9a87bcb60977c92fbf81053b8fc1bb Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期三, 04 九月 2024 09:17:55 +0800
Subject: [PATCH] 新增优化
---
ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/OssController.java | 46 ++++------------------------------------------
1 files changed, 4 insertions(+), 42 deletions(-)
diff --git a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/OssController.java b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/OssController.java
index 49a9523..f5c9caa 100644
--- a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/OssController.java
+++ b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/OssController.java
@@ -1,12 +1,7 @@
package com.ruoyi.admin.controller;
-import com.ruoyi.admin.entity.Order;
-import com.ruoyi.admin.service.OrderService;
-import com.ruoyi.admin.utils.ObsUploadUtil;
-import com.ruoyi.common.core.constant.Constants;
+import com.ruoyi.admin.utils.TencentCosUtil;
import com.ruoyi.common.core.domain.R;
-import com.ruoyi.common.core.exception.GlobalException;
-import com.ruoyi.common.core.utils.GaoDeMapUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
@@ -18,7 +13,6 @@
import org.springframework.web.multipart.MultipartFile;
import javax.annotation.Resource;
-import java.io.IOException;
/**
* @author HJL
@@ -31,7 +25,7 @@
public class OssController {
@Resource
- private OrderService orderService;
+ private TencentCosUtil tencentCosUtil;
@PostMapping("/upload")
@ApiOperation(value = "文件上传", tags = "公共-文件上传")
@@ -39,40 +33,8 @@
@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("文件上传失败！");
- }
- }
-
- @PostMapping("/uploadPhoto")
- @ApiOperation(value = "师傅端-上传完工照片", tags = "公共-文件上传")
- @ApiImplicitParams({
- @ApiImplicitParam(value = "照片", name = "file", dataType = "MultipartFile", required = true),
- @ApiImplicitParam(value = "订单id", name = "orderId", dataType = "Integer", required = true),
- @ApiImplicitParam(value = "师傅所在经度", name = "longitude", dataType = "String", required = true),
- @ApiImplicitParam(value = "师傅所在纬度", name = "latitude", dataType = "String", required = true)
- })
- public R<String> uploadPhoto(@RequestParam("file") MultipartFile file, @RequestParam String orderId,
- @RequestParam String longitude, @RequestParam String latitude) {
- // 校验经纬度
- Order order = orderService.lambdaQuery().eq(Order::getIsDelete, orderId).eq(Order::getIsDelete, 0).one();
- // 用户下单位置经纬度
- String orderPosition = order.getLongitude() + "," + order.getLatitude();
- // 师傅经纬度
- String workerPosition = longitude + "," + latitude;
- // 师傅当前位置离用户下单位置具体距离
- Long distance = GaoDeMapUtil.getDistance(orderPosition, workerPosition).getDatas();
- // 上传时判断是否在下单位置附件，距离大于某个值则 不允许上传
- if (distance > Constants.THREE_THOUSAND) {
- throw new GlobalException("您当前手机定位超出当前订单预约地址范围 3km，无法提供回收服务！");
- }
- try {
- return R.ok(ObsUploadUtil.obsUpload(file));
- } catch (IOException e) {
- return R.fail("文件上传失败！");
- }
+ String s = tencentCosUtil.upLoadFile(file);
+ return R.ok(s, s);
}
}
--
Gitblit v1.7.1