From 9f6dacf7b39e5aeba37d8faf575c9e56d8cbe51a Mon Sep 17 00:00:00 2001
From: czt <czt18638530771@163.com>
Date: 星期六, 11 十月 2025 13:35:42 +0800
Subject: [PATCH] 武汉黄陂军粮-质检报告共享接口同步及推送
---
src/main/java/com/fzzy/push/gd2023/GD2023ApiRemoteService2023.java | 46 +++++++++++++++++++++++++++++++---------------
1 files changed, 31 insertions(+), 15 deletions(-)
diff --git a/src/main/java/com/fzzy/push/gd2023/GD2023ApiRemoteService2023.java b/src/main/java/com/fzzy/push/gd2023/GD2023ApiRemoteService2023.java
index 8fae9e4..8f1ec15 100644
--- a/src/main/java/com/fzzy/push/gd2023/GD2023ApiRemoteService2023.java
+++ b/src/main/java/com/fzzy/push/gd2023/GD2023ApiRemoteService2023.java
@@ -16,6 +16,7 @@
import com.fzzy.api.view.repository.Api1102Rep;
import com.fzzy.api.view.repository.Api1404Rep;
import com.fzzy.api.view.repository.ApiLogRep;
+import com.fzzy.push.gd2022.dto.Gd2022Api1023;
import com.fzzy.push.gd2023.dto.*;
import com.fzzy.push.gd2023.dto.Gd2023Api1101;
import lombok.Data;
@@ -28,6 +29,9 @@
import org.springframework.stereotype.Service;
import java.lang.reflect.Field;
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+import java.text.DecimalFormat;
import java.util.*;
/**
@@ -315,8 +319,7 @@
BeanUtils.copyProperties(data, api1102);
//鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ搴撳尯淇℃伅杩涜璧嬪��
if (StringUtils.isEmpty(api1102.getTydwbm())) {
- String tydwbm = apiCommonService.getTydwbm(api1102.getDwdm());
- api1102.setTydwbm(tydwbm);
+ api1102.setTydwbm(api1102.getTykqbm().substring(0, 20));
}
api1102.setZhgxsj(DateUtils.addSeconds(new Date(), -10));
return JSON.toJSONString(api1102);
@@ -357,7 +360,8 @@
return JSON.toJSONString(api1105);
}
if (Constant.API_CODE_1106.equals(inteId)) {
- Gd2023Api1106 api1106 = (Gd2023Api1106) data;
+ Gd2023Api1106 api1106 = new Gd2023Api1106();
+ BeanUtils.copyProperties(data, api1106);
api1106.setZhgxsj(DateUtils.addSeconds(new Date(), -10));
//鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ搴撳尯淇℃伅杩涜璧嬪��
if (StringUtils.isEmpty(api1106.getTykqbm())) {
@@ -375,8 +379,7 @@
api1107.setTykqbm(tykqbm);
}
if (StringUtils.isEmpty(api1107.getTydwbm())) {
- String tydwbm = apiCommonService.getTydwbm(api1107.getDwdm());
- api1107.setTydwbm(tydwbm);
+ api1107.setTydwbm(api1107.getTykqbm().substring(0, 20));
}
api1107.setZhgxsj(DateUtils.addSeconds(new Date(), -10));
return JSON.toJSONString(api1107);
@@ -390,8 +393,7 @@
api1108.setTykqbm(tykqbm);
}
if (StringUtils.isEmpty(api1108.getTydwbm())) {
- String tydwbm = apiCommonService.getTydwbm(api1108.getDwdm());
- api1108.setTydwbm(tydwbm);
+ api1108.setTydwbm(api1108.getTykqbm().substring(0, 20));
}
api1108.setZhgxsj(DateUtils.addSeconds(new Date(), -10));
return JSON.toJSONString(api1108);
@@ -430,8 +432,7 @@
api1110.setTykqbm(tyhwbm.substring(0, 22));
}
if ("0".equals(api1110.getTydwbm()) || StringUtils.isEmpty(api1110.getTydwbm())) {
- String tydwbm = apiCommonService.getTydwbm(api1110.getDwdm());
- api1110.setTydwbm(tydwbm);
+ api1110.setTydwbm(api1110.getTykqbm().substring(0, 20));
}
api1110.setZhgxsj(DateUtils.addSeconds(new Date(), -10));
return JSON.toJSONString(api1110);
@@ -446,7 +447,7 @@
api1111.setTykqbm(api1102List.getTykqbm());
}
if ("0".equals(api1111.getTydwbm()) || StringUtils.isEmpty(api1111.getTydwbm())) {
- api1111.setTydwbm(apiCommonService.getTydwbm(api1111.getDwdm()));
+ api1111.setTydwbm(api1111.getTykqbm().substring(0, 20));
}
}
Api1101 api1101List = api1101Rep.findData(api1111.getDwdm());
@@ -459,8 +460,7 @@
api1111.setTykqbm(tykqbm);
}
if ("0".equals(api1111.getTydwbm()) || StringUtils.isEmpty(api1111.getTydwbm())) {
- String tydwbm = apiCommonService.getTydwbm(api1111.getDwdm());
- api1111.setTydwbm(tydwbm);
+ api1111.setTydwbm(api1111.getTykqbm().substring(0, 20));
}
api1111.setZhgxsj(DateUtils.addSeconds(new Date(), -10));
return JSON.toJSONString(api1111);
@@ -515,6 +515,9 @@
String tydwbm = apiCommonService.getTydwbm(apiData.getLqgsdwdm());
apiData.setLqgsdwtybm(tydwbm);
}
+ if (StringUtils.isEmpty(apiData.getBzw())) {
+ apiData.setBzw("3");
+ }
apiData.setZhgxsj(DateUtils.addSeconds(new Date(), -10));
return JSON.toJSONString(apiData);
}
@@ -547,6 +550,9 @@
if ("0".equals(apiData.getTyhwbm()) || StringUtils.isEmpty(apiData.getTyhwbm())) {
String tyhwbm = apiCommonService.getTyhwbm(apiData.getHwdm());
apiData.setTyhwbm(tyhwbm);
+ }
+ if (StringUtils.isEmpty(apiData.getBzw())) {
+ apiData.setBzw("3");
}
apiData.setZhgxsj(DateUtils.addSeconds(new Date(), -10));
return JSON.toJSONString(apiData);
@@ -621,6 +627,8 @@
String tyhwbm = apiCommonService.getTyhwbm(apiData.getHwdm());
apiData.setTyhwbm(tyhwbm);
}
+ BigDecimal bigDecimal = BigDecimal.valueOf(apiData.getQzzrshde());
+ apiData.setQzzrshde(bigDecimal.setScale(3, RoundingMode.UP).doubleValue());
apiData.setZhgxsj(DateUtils.addSeconds(new Date(), -10));
return JSON.toJSONString(apiData);
}
@@ -874,8 +882,8 @@
}
}
- api1403.setRotationInQty(lrsl);
- api1403.setRotationOutQty(lcsl);
+ api1403.setRotationInQty(Double.valueOf(String.format("%.3f",lrsl)));
+ api1403.setRotationOutQty(Double.valueOf(String.format("%.3f",lcsl)));
api1403.setDtls(dtls);
//鍏堜笂浼犳枃浠�,鑾峰彇鏂囦欢id
GD2023ResponseDto responseDto = GD2023HttpClientUtil.postUploadData(url, authToken, api1403.getWjdz());
@@ -904,7 +912,7 @@
return JSON.toJSONString(apiData);
}
if (Constant.API_CODE_1213.equals(inteId)) {
- Api1213 api1213 = (Api1213)data;
+ Api1213 api1213 = (Api1213) data;
Gd2023Api1213 apiData = new Gd2023Api1213();
BeanUtils.copyProperties(api1213, apiData);
//鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
@@ -917,6 +925,14 @@
apiData.setFcsrq(api1213.getFcsqr());
return JSON.toJSONString(apiData);
}
+ //鐔忚捀澶囨
+ if (Constant.API_CODE_9201.equals(inteId)) {
+ Api9201 api9201 = (Api9201) data;
+ Gd2023Api1023 apiData = new Gd2023Api1023();
+ BeanUtils.copyProperties(api9201, apiData);
+ apiData.setZhgxsj(DateUtils.addSeconds(new Date(), -10));
+ return JSON.toJSONString(apiData);
+ }
return JSON.toJSONString(data);
}
--
Gitblit v1.9.3