From dd57e7785687fa49096a2853589a02a29c37931d Mon Sep 17 00:00:00 2001
From: JYW <2013732181@qq.com>
Date: 星期二, 23 四月 2024 08:59:34 +0800
Subject: [PATCH] 2024-04-23 印章后端

---
 cnas-server/src/main/java/com/yuanchu/mom/controller/DeviceController.java |   70 +++++++++++++++++++++--------------
 1 files changed, 42 insertions(+), 28 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 c5f3e08..315c89e 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
@@ -9,14 +9,15 @@
 import com.yuanchu.mom.utils.JackSonUtil;
 import com.yuanchu.mom.vo.Result;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
 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.servlet.http.HttpServletRequest;
+import javax.annotation.Resource;
 import java.io.File;
-import java.io.IOException;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -24,12 +25,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")
@@ -79,32 +84,30 @@
     }
 
     //鍥剧墖涓婁紶
-    @ApiOperation(value = "鍥剧墖涓婁紶")
-    @RequestMapping(value = "/uploadFile", method = RequestMethod.POST)
-    public Result uploadFile(MultipartFile file, HttpServletRequest request) throws IOException {
-        //鑾峰彇鏂囦欢鍚嶇О
-        HashMap<String, String> list = new HashMap<>();
+    @ApiOperation(value = "璁惧鍥剧墖涓婁紶")
+    @PostMapping("/uploadFile")
+    public Result uploadFile(MultipartFile file) {
+        String urlString;
+        String pathName;
         String filename = file.getOriginalFilename();
-        String s = filename.substring(filename.lastIndexOf("."), filename.length());
-
-        System.out.println(filename);
-        //鑾峰彇鐪熷疄璺緞
-        String realPath = request.getServletContext().getRealPath("/Users/gaoaoy/webapp/images");
-        //鍒涘缓鏂囦欢
-        File file1 = new File(realPath);
-        if (!file1.exists()) {
-            file1.mkdirs();
+        try {
+            String path = filePath;
+            File realpath = new File(path);
+            if (!realpath.exists()) {
+                realpath.mkdirs();
+            }
+            pathName = UUID.randomUUID() + "_" + file.getOriginalFilename();
+            urlString = realpath + "/" + pathName;
+            file.transferTo(new File(urlString));
+            HashMap<String, String> map = new HashMap<>();
+            map.put("name", filename);
+            map.put("url", pathName);
+            return Result.success(map);
+        } catch (Exception e) {
+            e.printStackTrace();
+            System.err.println("鍥剧墖涓婁紶閿欒");
+            return null;
         }
-        file.transferTo(new File(file1 + "/" + filename));
-        String ss= filename;
-        UUID uuid = UUID.randomUUID();
-        ss = uuid.toString() + s;
-        String ful = "/Users/gaoaoy/webapp/images" + ss;
-        System.out.println(file1);
-
-        list.put("url", ful);
-        list.put("name", filename);
-        return Result.success(list);
     }
 
     @ApiOperation(value = "鑾峰彇璁惧璐熻矗浜�")
@@ -113,5 +116,16 @@
     public Result selectDevicePrincipal() {
         return Result.success(deviceService.selectDevicePrincipal());
     }
+
+    @ApiOperation(value = "閫氳繃璁惧鍒嗙被鑾峰彇璁惧鍒楄〃")
+    @PostMapping("/selectDeviceByCategory")
+    @ValueAuth
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "category", value = "璁惧鍒嗙被", dataTypeClass = String.class),
+    })
+    public Result selectDeviceByCategory(String category) {
+        return Result.success(deviceService.selectDeviceByCategory(category));
+    }
+
 }
 

--
Gitblit v1.9.3