From 864c18c46c2db1ae92220181e40b291b3b0d9446 Mon Sep 17 00:00:00 2001
From: dubin <bindu_bean@163.com>
Date: 星期一, 27 十月 2025 09:57:48 +0800
Subject: [PATCH] #1
---
src/main/java/com/zy/asrs/controller/ImagePreviewController.java | 58 +++++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 45 insertions(+), 13 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/ImagePreviewController.java b/src/main/java/com/zy/asrs/controller/ImagePreviewController.java
index ae763f0..75ca0e0 100644
--- a/src/main/java/com/zy/asrs/controller/ImagePreviewController.java
+++ b/src/main/java/com/zy/asrs/controller/ImagePreviewController.java
@@ -1,10 +1,14 @@
package com.zy.asrs.controller;
+import com.core.common.R;
+import com.sun.prism.Image;
+import com.zy.asrs.entity.ImageView;
import com.zy.asrs.utils.ImagePreviewUtils;
import com.zy.common.web.BaseController;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiResponse;
import io.swagger.annotations.ApiResponses;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
@@ -14,14 +18,16 @@
import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.IOException;
+import java.nio.file.Files;
import java.util.*;
+@Slf4j
@RestController
@RequestMapping()
public class ImagePreviewController extends BaseController {
//涓婁紶鍥剧墖
@ApiResponses({@ApiResponse(code = 200, message = "涓婁紶鎴愬姛"), @ApiResponse(code = 400, message = "涓婁紶澶辫触"), @ApiResponse(code = 500, message = "鏈嶅姟鍣ㄥ唴閮ㄩ敊璇�")})
- //@RequestMapping(value = "/saveImage", method = RequestMethod.POST)
+ @RequestMapping(value = "/saveImage", method = RequestMethod.POST)
public Map<String, Object> saveImage(@RequestParam("files") MultipartFile[] files) {
Map<String, Object> map = new HashMap<>();
List<String> list = new ArrayList<>();
@@ -30,14 +36,14 @@
//鑾峰彇鏂囦欢鍚庣紑
String suffixName = ImagePreviewUtils.getSaveImagePath(mfile);
//鐢熸垚鏂版枃浠跺悕绉�
- String newFileName = ImagePreviewUtils.getNewImageFileName(suffixName);
+ //String newFileName = ImagePreviewUtils.getNewImageFileName(suffixName);
//淇濆瓨鏂囦欢
- File file = new File(ImagePreviewUtils.getNewImagePath(newFileName));
+ File file = new File(ImagePreviewUtils.getNewImagePath(mfile.getOriginalFilename()));
boolean state = ImagePreviewUtils.saveImage(mfile, file);
if (state) {
// list.add(ImageUtil.getNewImagePath(newFileName));
//淇濆瓨鏁版嵁搴撶殑鍥剧墖璺緞涓� 鐩稿璺緞
- list.add("uploadimage/" + newFileName);
+ list.add("uploadimage/" + mfile.getOriginalFilename());
}
}
map.put("imgList", list);
@@ -46,18 +52,16 @@
}
//棰勮鍥剧墖
- //@RequestMapping("previewImage")
+ @RequestMapping("/previewImage")
@ApiOperation(value = "鏍规嵁鏂囦欢鍚嶅疄鐜伴瑙堝姛鑳�")
- public void previewFile(
- HttpServletResponse response) throws IOException {
- showImg("D:\\"+"images\\"+"20251022efda188c-56b3-4c38-9940-78d0b61b43a1.png", response);
- }
-
- public static void showImg(String path, HttpServletResponse response){
- if(path!=null&&!path.equals("")){
+ public String previewFile(
+ HttpServletResponse response,String maktx) throws IOException {
+// String[] s = matnr.split("__");
+ showImg("D:\\"+"images\\"+maktx+".png", response,maktx);
+ if("D:\\"+"images\\"+maktx+".png"!=null){
try {
- FileInputStream fis = new FileInputStream(path);
+ FileInputStream fis = new FileInputStream("D:\\"+"images\\"+maktx+".png");
ServletOutputStream os = response.getOutputStream();
byte [] b = new byte[1024*8];
@@ -66,9 +70,37 @@
}
} catch (FileNotFoundException e) {
e.printStackTrace();
+ return "璇ョ畝鍥句笉瀛樺湪锛岃涓婁紶";
} catch (IOException e) {
e.printStackTrace();
}
}
+ return "";
+ }
+
+ public static void showImg(String path, HttpServletResponse response,String maktx){
+
+ }
+ public static R showImgToBase64(String path, HttpServletResponse response,String maktx){
+ byte[] imageBytes = null;
+ try {
+ File file =new File(path);
+ imageBytes = Files.readAllBytes(file.toPath());
+ }catch (IOException e){
+ e.printStackTrace();
+ return null;
+ }
+ String pics = Base64.getEncoder().encodeToString(imageBytes);
+ List<String> list = new ArrayList<>();
+ List<ImageView> imageViewList = new ArrayList<>();
+ ImageView imageView = new ImageView();
+ //String s = "http://192.168.0.2/image/"+pics+".jpg";
+ list.add(pics);
+ imageView.setPics(list);
+ imageView.setMaktx(maktx);
+ imageViewList.add(imageView);
+ //log.info(s);
+ log.info(pics);
+ return R.ok().add(imageViewList);
}
}
--
Gitblit v1.9.1