From 9b362b55344d0c854355eb2db1de84219b53a77e Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期一, 29 十二月 2025 16:35:48 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/service/sd/OrderFileService.java | 49 +++++++++++++++++++++++++++++++++----------------
1 files changed, 33 insertions(+), 16 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/service/sd/OrderFileService.java b/north-glass-erp/src/main/java/com/example/erp/service/sd/OrderFileService.java
index e15bb07..d2e8300 100644
--- a/north-glass-erp/src/main/java/com/example/erp/service/sd/OrderFileService.java
+++ b/north-glass-erp/src/main/java/com/example/erp/service/sd/OrderFileService.java
@@ -11,6 +11,7 @@
import com.example.erp.common.Result;
import com.example.erp.entity.sd.OrderDetail;
import com.example.erp.entity.sd.OrderFile;
+import com.example.erp.mapper.sd.OrderDetailMapper;
import com.example.erp.mapper.sd.OrderFileMapper;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
@@ -26,6 +27,7 @@
@RequiredArgsConstructor
public class OrderFileService {
private final OrderFileMapper orderFileMapper;
+ private final OrderDetailMapper orderDetailMapper;
public List<OrderFile> getOrderFilePicture(List<Map<String,Object>> orderDetails) throws NoSuchFieldException {
Set<String> seenKeys = new HashSet<>();
List<Map<String,Object>> result = new ArrayList<>();
@@ -33,49 +35,60 @@
result = orderDetails.stream()
.collect(Collectors.collectingAndThen(
Collectors.toMap(
- map -> map.get("order_id"),
+ map -> {
+ Object v = map.get("order_id");
+ if (v == null) {
+ v = map.get("orderId");
+ }
+ return String.valueOf(v);
+ },
map -> map,
- (existing, replacement) -> existing // 淇濈暀绗竴涓嚭鐜扮殑
+ (existing, replacement) -> existing // 淇濈暀绗竴涓�
),
- map -> new ArrayList<>(map.values())
+ m -> new ArrayList<>(m.values())
));
//寰幆鑾峰彇鍥剧墖
List<OrderFile> orderFiles = new ArrayList<>();
- for (Map<String,Object> obj : result) {
- List<OrderFile> orderFile = orderFileMapper.selectList(new QueryWrapper<OrderFile>()
- .select("order_id, order_number, image_base64")
- .eq("order_id", obj.get("order_id"))
+ for (Map<String, Object> obj : result) {
+
+ Object orderId = obj.get("order_id");
+ if (orderId == null) {
+ orderId = obj.get("orderId");
+ }
+
+ List<OrderFile> orderFile = orderFileMapper.selectList(
+ new QueryWrapper<OrderFile>()
+ .select("order_id, order_number, image_base64")
+ .eq("order_id", orderId)
);
- if (orderFile != null){
+
+ if (orderFile != null && !orderFile.isEmpty()) {
orderFiles.addAll(orderFile);
}
}
return orderFiles;
}
- public Object updateOrderFileByOrderNumber(MultipartFile file,String name,String orderId,String orderNumber) throws IOException {
+ public Object updateOrderFileByOrderNumber(MultipartFile file,String name,String orderId,String orderNumber,Float width,Float height) throws IOException {
//鍒ゆ柇鏄惁瑙勫畾鐨勬牸寮忓悗缂�鍚�
if(!isAllowedFile(name)){
return null;
}
-
try (InputStream is = License.class.getResourceAsStream("/lisence.xml")) {
String base64 = null;
if(name.toLowerCase().endsWith(".dwg")){
-
License license = new License();
license.setLicense(is);
-
// 璋冪敤Image绫荤殑Load鏂规硶鏉ュ姞杞借緭鍏ョ殑DWG鏂囦欢銆�
Image image = Image.load(file.getInputStream());
// 鍒涘缓CadRasterizationOptions瀹炰緥浠ュ惎鐢–AD鏍呮牸鍖栭�夐」銆�
CadRasterizationOptions rasterizationOptions = new CadRasterizationOptions();
// 璁剧疆瀹藉害
- rasterizationOptions.setPageWidth(1000);
+ rasterizationOptions.setPageWidth(width);
// 璁剧疆楂樺害
- rasterizationOptions.setPageHeight(700);
+ rasterizationOptions.setPageHeight(height);
// 璋冪敤杩欎釜setEmbedBackground鏂规硶鏉ヨ缃儗鏅壊鏄惁涓嶇瓑浜庤緭鍑烘牸寮忕殑榛樿鑳屾櫙鑹�
//rasterizationOptions.setEmbedBackground(true);
// 涓虹敓鎴愮殑鍥惧儚鍒涘缓涓�涓狿ngOptions鐨勫疄渚嬶紝骞跺皢鍏跺垎閰嶇粰ImageOptionsBase绫荤殑瀹炰緥銆�
@@ -94,10 +107,12 @@
OrderFile orderFile = new OrderFile();
orderFile.setImageBase64(base64);
- orderFile.setFileName(file.getName());
+ orderFile.setFileName(name);
orderFile.setOrderId(orderId);
orderFile.setOrderNumber(orderNumber);
orderFile.setFileData(Arrays.toString(file.getBytes()));
+ orderFile.setWidth(width);
+ orderFile.setHeight(height);
OrderFile orderFileExist = orderFileMapper
.selectOne(new LambdaQueryWrapper<OrderFile>()
@@ -112,7 +127,9 @@
.eq(OrderFile::getOrderNumber, orderNumber)
);
}
-
+ orderDetailMapper.update(null,new LambdaUpdateWrapper<OrderDetail>()
+ .setSql("file_name = '" + name + "'")
+ .eq(OrderDetail::getOrderId, orderId));
return orderFile;
} catch (Exception e) {
--
Gitblit v1.8.0