From 918fa28b3f48b9598e264d0f483508b92f8d8a3b Mon Sep 17 00:00:00 2001
From: whycxzp <glperry@163.com>
Date: 星期四, 03 四月 2025 21:52:47 +0800
Subject: [PATCH] 库位和托盘Json解析优化
---
src/main/java/com/whyc/service/WmsService.java | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/whyc/service/WmsService.java b/src/main/java/com/whyc/service/WmsService.java
index cdec99c..8331563 100644
--- a/src/main/java/com/whyc/service/WmsService.java
+++ b/src/main/java/com/whyc/service/WmsService.java
@@ -11,6 +11,7 @@
import com.whyc.util.ThreadLocalUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import sun.applet.Main;
import java.util.Date;
import java.util.HashMap;
@@ -93,11 +94,12 @@
//瀵圭粨鏋滆繘琛屽鐞�
if(response.getCode() == 1){ //璇锋眰鎴愬姛,data鏈夋甯告暟鎹�
String dataStr = (String) response.getData();
- //鎴彇dataStr涓�"data:"鍚庣殑瀛楃涓�
+ /*//鎴彇dataStr涓�"data:"鍚庣殑瀛楃涓�
int index = dataStr.indexOf("data");
dataStr = dataStr.substring(index+6, dataStr.length()-3);
- //WmsLocationDto wmsLocationDto = JsonUtil.getGson().fromJson(dataStr, WmsLocationDto.class);
- List<WmsLocationDto> wmsLocationDtoList = JsonUtil.getGson().fromJson(dataStr, new TypeToken<List<WmsLocationDto>>(){}.getType());
+ //WmsLocationDto wmsLocationDto = JsonUtil.getGson().fromJson(dataStr, WmsLocationDto.class);*/
+ WmsResponse<List<WmsLocationDto>> wmsResponse = JsonUtil.getGson().fromJson(dataStr, new TypeToken<WmsResponse<List<WmsLocationDto>>>(){}.getType());
+ List<WmsLocationDto> wmsLocationDtoList = wmsResponse.getData();
response.set(1,wmsLocationDtoList);
}
return response;
@@ -113,11 +115,13 @@
//瀵圭粨鏋滆繘琛屽鐞�
if(response.getCode() == 1){ //璇锋眰鎴愬姛,data鏈夋甯告暟鎹�
String dataStr = (String) response.getData();
+ /*
//鎴彇dataStr涓�"data:"鍚庣殑瀛楃涓�
int index = dataStr.indexOf("data");
dataStr = dataStr.substring(index+6, dataStr.length()-3);
- //WmsLocationDto wmsLocationDto = JsonUtil.getGson().fromJson(dataStr, WmsLocationDto.class);
- List<WmsPallet> wmsPalletList = JsonUtil.getGson().fromJson(dataStr, new TypeToken<List<WmsPallet>>(){}.getType());
+ List<WmsPallet> wmsPalletList = JsonUtil.getGson().fromJson(dataStr, new TypeToken<List<WmsPallet>>(){}.getType());*/
+ WmsResponse<List<WmsPallet>> wmsResponse = JsonUtil.getGson().fromJson(dataStr, new TypeToken<WmsResponse<List<WmsPallet>>>(){}.getType());
+ List<WmsPallet> wmsPalletList = wmsResponse.getData();
response.set(1,wmsPalletList);
}
return response;
--
Gitblit v1.9.1