From d83e2977769b3d56f4ca6fdbf798e22d3940e003 Mon Sep 17 00:00:00 2001
From: 李林 <z1292839451@163.com>
Date: 星期三, 06 三月 2024 18:00:45 +0800
Subject: [PATCH] 功能完善

---
 cnas-server/src/main/java/com/yuanchu/mom/controller/DeviceController.java |   18 ++++++++++--------
 1 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/cnas-server/src/main/java/com/yuanchu/mom/controller/DeviceController.java b/cnas-server/src/main/java/com/yuanchu/mom/controller/DeviceController.java
index 4536e8b..98b92c8 100644
--- a/cnas-server/src/main/java/com/yuanchu/mom/controller/DeviceController.java
+++ b/cnas-server/src/main/java/com/yuanchu/mom/controller/DeviceController.java
@@ -11,9 +11,11 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
+import javax.annotation.Resource;
 import java.io.File;
 import java.util.HashMap;
 import java.util.Map;
@@ -22,13 +24,16 @@
  * 璁惧(DeviceController)琛ㄦ帶鍒跺眰
  */
 @Api(tags = "璁惧")
-@AllArgsConstructor
 @RestController
 @RequestMapping("/deviceScope")
 public class DeviceController {
 
 
+    @Resource
     private DeviceService deviceService;
+
+    @Value("${file.path}")
+    private String filePath;
 
     @ApiOperation(value = "鏌ヨ璁惧璇︽儏鍒楄〃")
     @PostMapping("/selectDeviceParameter")
@@ -78,16 +83,14 @@
     }
 
     //鍥剧墖涓婁紶
-    @ApiOperation(value = "鍥剧墖涓婁紶")
+    @ApiOperation(value = "璁惧鍥剧墖涓婁紶")
     @PostMapping("/uploadFile")
     public Result uploadFile(MultipartFile file) {
-
-        System.out.println(file.getOriginalFilename());
-        String urlString = null;
-        String pathName = null;
+        String urlString;
+        String pathName;
         String filename = file.getOriginalFilename();
         try {
-            String path = "/Users/gaoaoy/webapp/images";
+            String path = filePath;
             File realpath = new File(path);
             if (!realpath.exists()) {
                 realpath.mkdirs();
@@ -95,7 +98,6 @@
             pathName = UUID.randomUUID() + "_" + file.getOriginalFilename();
             urlString = realpath + "/" + pathName;
             file.transferTo(new File(urlString));
-            System.out.println(pathName);
             HashMap<String, String> map = new HashMap<>();
             map.put("name", filename);
             map.put("url", pathName);

--
Gitblit v1.9.3