From 0a76dacc5d525be4ce1a2dc5e12ddbe44fbddcad Mon Sep 17 00:00:00 2001
From: CZT <czt18638530771@163.com>
Date: 星期一, 08 一月 2024 21:24:16 +0800
Subject: [PATCH] 优化上海省平台接口
---
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1208.java | 4 ++++
src/main/java/com/fzzy/async/fzzy40/repository/Fzzy40Sync1403Rep.java | 4 ++--
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1403.java | 2 +-
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1404.java | 7 +++++--
src/main/java/com/fzzy/push/gd2022/GD2022ApiRemoteService2022.java | 7 +++++++
src/main/java/com/fzzy/push/shjdjw2023/ShjdjwApiRemoteService2023.java | 4 ++--
src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java | 14 ++++++++++++--
7 files changed, 33 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1208.java b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1208.java
index 7d1250d..46e3fef 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1208.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1208.java
@@ -127,6 +127,10 @@
apiData.setScdd("1");
//鍌ㄧ伯鏂瑰紡
apiData.setClfs(fz40DepotStore.getStoreType());
+ //鍖呰鍌ㄧ伯鏄紝鏍告煡鍖呭瓨绮寘鏁�
+ if("2".equals(apiData.getClfs())){
+ apiData.setBclbs((int)(fz40DepotStore.getStorageReal()/25));
+ }
//璐т綅鐘舵��
mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_HWZT, fz40DepotStore.getDepotStatus());
diff --git a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1403.java b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1403.java
index 47b8460..bb058d0 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1403.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1403.java
@@ -53,7 +53,7 @@
apiLog.setStatus(99);
apiLog.setId(ContextUtil.getUUID());
try {
- List<Fz40InoutPlan> list = fzzy40Sync1403Rep.findDateByTime(start, end);
+ List<Fz40InoutPlan> list = fzzy40Sync1403Rep.findDateByTime(deptId, start, end);
if (null == list || list.isEmpty()) {
return;
}
diff --git a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1404.java b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1404.java
index 4342aed..5cf46cd 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1404.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1404.java
@@ -61,7 +61,7 @@
apiLog.setStatus(99);
apiLog.setId(ContextUtil.getUUID());
try {
- List<Fz40InoutPlan> list = fzzy35Sync1403Rep.findDateByTime(start, end);
+ List<Fz40InoutPlan> list = fzzy35Sync1403Rep.findDateByTime(deptId, start, end);
if (null == list || list.isEmpty()) {
return;
@@ -94,7 +94,10 @@
api1404.setLsxzdm(mappingCode);
api1404.setShnd(StringUtils.isEmpty(fz35PlanDetail.getYear())?fz35Plan.getYear():fz35PlanDetail.getYear());
api1404.setLhhwdm(api1105.getHwdm());
- api1404.setLhsl(fz35PlanDetail.getPlanNum());
+ if(null == fz35PlanDetail.getPlanNum()){
+ fz35PlanDetail.setPlanNum(0.0);
+ }
+ api1404.setLhsl(fz35PlanDetail.getPlanNum()/1000);
api1404.setLhlx(fz35PlanDetail.getType());
api1404.setZhgxsj(new Date());
api1404.setKqdm(kqdm);
diff --git a/src/main/java/com/fzzy/async/fzzy40/repository/Fzzy40Sync1403Rep.java b/src/main/java/com/fzzy/async/fzzy40/repository/Fzzy40Sync1403Rep.java
index ab5696c..16adc4d 100644
--- a/src/main/java/com/fzzy/async/fzzy40/repository/Fzzy40Sync1403Rep.java
+++ b/src/main/java/com/fzzy/async/fzzy40/repository/Fzzy40Sync1403Rep.java
@@ -30,6 +30,6 @@
* @param end
* @return
*/
- @Query("from Fz40InoutPlan where createTime >=:start and createTime <:end order by createTime ")
- List<Fz40InoutPlan> findDateByTime(@Param("start") Date start, @Param("end") Date end);
+ @Query("from Fz40InoutPlan where deptId =:deptId and createTime >=:start and createTime <:end order by createTime ")
+ List<Fz40InoutPlan> findDateByTime(@Param("deptId") String deptId, @Param("start") Date start, @Param("end") Date end);
}
diff --git a/src/main/java/com/fzzy/push/gd2022/GD2022ApiRemoteService2022.java b/src/main/java/com/fzzy/push/gd2022/GD2022ApiRemoteService2022.java
index 1700868..e9ee780 100644
--- a/src/main/java/com/fzzy/push/gd2022/GD2022ApiRemoteService2022.java
+++ b/src/main/java/com/fzzy/push/gd2022/GD2022ApiRemoteService2022.java
@@ -434,6 +434,13 @@
}
if (Constant.API_CODE_1208.equals(inteId)) {
Gd2022Api1208 api1208 = new Gd2022Api1208();
+ //鍖呰鍌ㄧ伯鏄紝鏍告煡鍖呭瓨绮寘鏁�
+ if(null == api1208.getBclbs()){
+ api1208.setBclbs(0);
+ }
+ if("2".equals(api1208.getClfs()) && api1208.getBclbs() == 0){
+ api1208.setBclbs((int)(api1208.getSjsl()/25));
+ }
BeanUtils.copyProperties(data, api1208);
return JSON.toJSONString(api1208);
}
diff --git a/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java b/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java
index f93edb0..13f08c1 100644
--- a/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java
+++ b/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java
@@ -614,6 +614,13 @@
if (StringUtils.isEmpty(api1208.getCd())) {
api1208.setCd(api1208.getHwdm().substring(2, 8));
}
+ //鍖呰鍌ㄧ伯鏄紝鏍告煡鍖呭瓨绮寘鏁�
+ if(null == apiData.getBclbs()){
+ apiData.setBclbs(0);
+ }
+ if("2".equals(apiData.getClfs()) && apiData.getBclbs() == 0){
+ apiData.setBclbs((int)(apiData.getSjsl()/25));
+ }
//璁剧疆绌哄睘鎬т负榛樿鍊�
changeObject(api1208);
return api1208;
@@ -836,6 +843,9 @@
if (StringUtils.isEmpty(api1310.getShrxm())) {
api1310.setShrxm("瀹℃牳浜�");
}
+ if (StringUtils.isEmpty(api1310.getBglx())) {
+ api1310.setBglx("1");
+ }
//璁剧疆绌哄睘鎬т负榛樿鍊�
changeObject(api1310);
@@ -891,8 +901,8 @@
}
}
}
- api1403.setLrsl(lrsl/1000 + "");
- api1403.setLcsl(lcsl/1000 + "");
+ api1403.setLrsl(lrsl + "");
+ api1403.setLcsl(lcsl + "");
//璁剧疆绌哄睘鎬т负榛樿鍊�
changeObject(api1403);
diff --git a/src/main/java/com/fzzy/push/shjdjw2023/ShjdjwApiRemoteService2023.java b/src/main/java/com/fzzy/push/shjdjw2023/ShjdjwApiRemoteService2023.java
index e693018..c40bfac 100644
--- a/src/main/java/com/fzzy/push/shjdjw2023/ShjdjwApiRemoteService2023.java
+++ b/src/main/java/com/fzzy/push/shjdjw2023/ShjdjwApiRemoteService2023.java
@@ -453,8 +453,8 @@
}
}
}
- api1403.setLrsl(lrsl / 1000 + "");
- api1403.setLcsl(lcsl / 1000 + "");
+ api1403.setLrsl(lrsl + "");
+ api1403.setLcsl(lcsl + "");
//璁剧疆绌哄睘鎬т负榛樿鍊�
return api1403;
--
Gitblit v1.9.3