From 6bfa6ba153338df9e17eb5fcda4ecfc20e88ceca Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期三, 08 四月 2026 15:34:47 +0800
Subject: [PATCH] fix: 报工工序上传的图片预览
---
doc/宁夏-中盛建材.sql | 10 +++++++++-
src/main/java/com/ruoyi/production/service/impl/ProductionRecordServiceImpl.java | 15 +++++++++++++++
src/main/java/com/ruoyi/production/pojo/ProductionProductRouteItemFile.java | 5 ++++-
src/main/resources/mapper/production/ProductionProductRouteItemFileMapper.xml | 1 +
4 files changed, 29 insertions(+), 2 deletions(-)
diff --git "a/doc/\345\256\201\345\244\217-\344\270\255\347\233\233\345\273\272\346\235\220.sql" "b/doc/\345\256\201\345\244\217-\344\270\255\347\233\233\345\273\272\346\235\220.sql"
index 67f4c6f..1164c9f 100644
--- "a/doc/\345\256\201\345\244\217-\344\270\255\347\233\233\345\273\272\346\235\220.sql"
+++ "b/doc/\345\256\201\345\244\217-\344\270\255\347\233\233\345\273\272\346\235\220.sql"
@@ -528,4 +528,12 @@
DROP COLUMN `diff_total`;
ALTER TABLE `product-inventory-management-zsjc`.`production_settlement_batches`
- MODIFY COLUMN `period_time` varchar(255) NULL DEFAULT NULL COMMENT '鏍哥畻褰掑睘骞存湀' AFTER `id`;
\ No newline at end of file
+ MODIFY COLUMN `period_time` varchar(255) NULL DEFAULT NULL COMMENT '鏍哥畻褰掑睘骞存湀' AFTER `id`;
+
+ALTER TABLE `product-inventory-management-zsjc`.`production_product_route_item_file`
+ ADD COLUMN `url` varchar(255) NULL COMMENT '璁块棶鍦板潃' AFTER `file_name`,
+ MODIFY COLUMN `file_url` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '鏂囦欢鍦板潃' AFTER `file_name`;
+
+ALTER TABLE `product-inventory-management-zsjc`.`production_product_route_item_file`
+ MODIFY COLUMN `file_url` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '鏂囦欢瀛樺偍鍦板潃' AFTER `file_name`,
+ MODIFY COLUMN `url` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '鏂囦欢璁块棶鍦板潃' AFTER `file_url`;
\ No newline at end of file
diff --git a/src/main/java/com/ruoyi/production/pojo/ProductionProductRouteItemFile.java b/src/main/java/com/ruoyi/production/pojo/ProductionProductRouteItemFile.java
index 26df9ee..1f70b74 100644
--- a/src/main/java/com/ruoyi/production/pojo/ProductionProductRouteItemFile.java
+++ b/src/main/java/com/ruoyi/production/pojo/ProductionProductRouteItemFile.java
@@ -37,9 +37,12 @@
@ApiModelProperty(value = "鏂囦欢鍚嶇О")
private String fileName;
- @ApiModelProperty(value = "鏂囦欢璁块棶鍦板潃")
+ @ApiModelProperty(value = "鏂囦欢瀛樺偍鍦板潃")
private String fileUrl;
+ @ApiModelProperty(value = "鏂囦欢璁块棶鍦板潃")
+ private String url;
+
@ApiModelProperty(value = "鏂囦欢澶у皬")
private Long fileSize;
diff --git a/src/main/java/com/ruoyi/production/service/impl/ProductionRecordServiceImpl.java b/src/main/java/com/ruoyi/production/service/impl/ProductionRecordServiceImpl.java
index c3fcb00..0289e84 100644
--- a/src/main/java/com/ruoyi/production/service/impl/ProductionRecordServiceImpl.java
+++ b/src/main/java/com/ruoyi/production/service/impl/ProductionRecordServiceImpl.java
@@ -5,6 +5,7 @@
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.framework.config.RuoYiConfig;
import com.ruoyi.other.mapper.TempFileMapper;
import com.ruoyi.other.pojo.TempFile;
import com.ruoyi.production.dto.*;
@@ -52,6 +53,9 @@
@Value("${file.upload-dir}")
private String uploadDir;
+
+ @Autowired
+ private RuoYiConfig ruoYiConfig;
@Autowired
private ProductionProductMainService productionProductMainService;
@@ -347,6 +351,11 @@
fileEntity.setProductionProductRouteItemId(productRouteItemEntity.getId());
fileEntity.setFileName(originalFilename);
fileEntity.setFileUrl(formalFilePath.toString());
+ Path basePath = Paths.get(RuoYiConfig.getProfile());
+ String relativePath = basePath.relativize(formalFilePath).toString();
+ relativePath = relativePath.replace("\\", "/");
+ String url = "/profile/" + relativePath;
+ fileEntity.setUrl(url);
fileEntity.setFileSuffix(fileExtension);
fileEntity.setFileSize(Files.size(formalFilePath));
fileEntity.setCreateTime(LocalDateTime.now());
@@ -780,6 +789,12 @@
fileEntity.setProductionProductRouteItemId(routeItemId);
fileEntity.setFileName(originalFilename);
fileEntity.setFileUrl(formalFilePath.toString());
+ Path basePath = Paths.get(RuoYiConfig.getProfile());
+ String relativePath = basePath.relativize(formalFilePath).toString();
+ relativePath = relativePath.replace("\\", "/");
+ String url = "/profile/" + relativePath;
+
+ fileEntity.setUrl(url);
fileEntity.setFileSuffix(fileExtension);
fileEntity.setFileSize(Files.size(formalFilePath));
fileEntity.setCreateTime(LocalDateTime.now());
diff --git a/src/main/resources/mapper/production/ProductionProductRouteItemFileMapper.xml b/src/main/resources/mapper/production/ProductionProductRouteItemFileMapper.xml
index 29638eb..f40b077 100644
--- a/src/main/resources/mapper/production/ProductionProductRouteItemFileMapper.xml
+++ b/src/main/resources/mapper/production/ProductionProductRouteItemFileMapper.xml
@@ -7,6 +7,7 @@
<result column="production_product_route_item_id" property="productionProductRouteItemId" />
<result column="file_name" property="fileName" />
<result column="file_url" property="fileUrl" />
+ <result column="url" property="url" />
<result column="file_size" property="fileSize" />
<result column="file_suffix" property="fileSuffix" />
<result column="create_user" property="createUser" />
--
Gitblit v1.9.3