From add0cbc4e4655ae400ed577260b795e3ae33e6ac Mon Sep 17 00:00:00 2001
From: wangxiang <1827945911@qq.com>
Date: Wed, 24 Jan 2024 01:54:03 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BF=AE=E5=A4=8D=E5=A4=A7=E5=B1=8F?=
 =?UTF-8?q?=E8=AE=BE=E8=AE=A1=E5=99=A8bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/VisualMapController.java       |  9 +++++++
 .../controller/VisualProxyController.java     | 27 ++++++++++++++++---
 2 files changed, 32 insertions(+), 4 deletions(-)

diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/controller/VisualMapController.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/controller/VisualMapController.java
index fb71f3ff..47cd24da 100644
--- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/controller/VisualMapController.java
+++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/controller/VisualMapController.java
@@ -1,5 +1,6 @@
 package com.cloud.kicc.system.bigscreen.controller;
 
+import cn.hutool.json.JSONUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.cloud.kicc.common.core.api.R;
@@ -14,6 +15,7 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
 import java.util.Arrays;
+import java.util.Map;
 
 
 /**
@@ -46,6 +48,13 @@ public class VisualMapController {
 		return R.ok(detail);
 	}
 
+	@GetMapping("/data")
+	@ApiOperation(value = "设计器获取地图数据", notes = "传入id")
+	public Map data(String id) {
+		VisualMap detail = visualMapService.getById(id);
+		return JSONUtil.toBean(detail.getData(), Map.class);
+	}
+
 	@PostMapping("/save")
 	@ApiOperation(value = "新增", notes = "传入visualMap")
 	public R save(@Valid @RequestBody VisualMap visualMap) {
diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/controller/VisualProxyController.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/controller/VisualProxyController.java
index 9b8c1b5c..64564941 100644
--- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/controller/VisualProxyController.java
+++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/controller/VisualProxyController.java
@@ -7,17 +7,20 @@ import cn.hutool.json.JSONUtil;
 import com.cloud.kicc.common.core.api.R;
 import com.cloud.kicc.common.core.constant.AppConstants;
 import com.cloud.kicc.common.core.constant.StringPool;
+import com.cloud.kicc.common.security.annotation.Inner;
 import com.cloud.kicc.system.api.bigscreen.dto.VisualProxyDto;
+import com.cloud.kicc.system.api.entity.OssFile;
 import com.cloud.kicc.system.bigscreen.util.RequestUtil;
+import com.cloud.kicc.system.service.FileService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
 import springfox.documentation.annotations.ApiIgnore;
 
+import javax.servlet.http.HttpServletResponse;
 import java.util.Map;
 
 /**
@@ -29,13 +32,15 @@ import java.util.Map;
  * @since: 2023/7/3
  */
 @Slf4j
+@ApiIgnore
 @RestController
 @AllArgsConstructor
 @RequestMapping(AppConstants.APP_BIGSCREEN + "/visual")
-@ApiIgnore
 @Api(value = "接口代理", tags = "接口代理")
 public class VisualProxyController {
 
+	private final FileService fileService;
+
 	@RequestMapping("/proxy")
 	@ApiOperation(value = "接口代理", notes = "接口代理")
 	public R proxy(@RequestBody VisualProxyDto proxy) {
@@ -67,4 +72,18 @@ public class VisualProxyController {
 		}
 	}
 
+	@Inner(false)
+	@PostMapping("/put-file")
+	public R upload(@RequestPart("file") MultipartFile file) {;
+		OssFile ossFile = fileService.uploadFile(file, null);
+		ossFile.setAvailablePath(String.format("/visual/getFile/%s/%s", ossFile.getBucketName(), ossFile.getFileName()));
+		return R.ok(ossFile);
+	}
+
+	@Inner(false)
+	@GetMapping("/getFile/{bucket}/{fileName}")
+	public void getById(@PathVariable String bucket, @PathVariable String fileName, HttpServletResponse response) {
+		fileService.getFile(bucket, fileName, response);
+	}
+
 }