From aee5c93d9d8f904d84ecdfff6025ddace615c6b2 Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期五, 07 三月 2025 14:36:55 +0800
Subject: [PATCH] 同步与上传调整
---
src/main/java/com/fzzy/api/entity/ApiParent.java | 2 +-
src/main/java/com/fzzy/push/gd2023/GD2023ApiRemoteService2023.java | 9 +++++++++
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1202.java | 2 +-
src/main/java/com/fzzy/api/entity/Api1208.java | 2 +-
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1205.java | 5 +++--
5 files changed, 15 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/fzzy/api/entity/Api1208.java b/src/main/java/com/fzzy/api/entity/Api1208.java
index dad173d..c932e6f 100644
--- a/src/main/java/com/fzzy/api/entity/Api1208.java
+++ b/src/main/java/com/fzzy/api/entity/Api1208.java
@@ -35,7 +35,7 @@
@JSONField(serialize = false)
@Id
- @Column(name = "id", length = 40)
+ @Column(name = "id", length = 50)
private String id;
@PropertyDef(label = "璐т綅浠ｇ爜")
diff --git a/src/main/java/com/fzzy/api/entity/ApiParent.java b/src/main/java/com/fzzy/api/entity/ApiParent.java
index 7097cc0..1e318ae 100644
--- a/src/main/java/com/fzzy/api/entity/ApiParent.java
+++ b/src/main/java/com/fzzy/api/entity/ApiParent.java
@@ -26,7 +26,7 @@
@JSONField(serialize = false)
@PropertyDef(label = "涓氬姟id")
- @Column(name = "bizId", length = 40)
+ @Column(name = "bizId", length = 50)
private String bizId;
diff --git a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1202.java b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1202.java
index 9e01afb..76ccc1e 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1202.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1202.java
@@ -222,7 +222,7 @@
//鎵ｉ噸 鍖栭獙鎬绘墸閲�
apiData.setZjklxj(sysData.getDeCheck());
- apiData.setBzw(sysData.getBzw());
+ apiData.setBzw(StringUtils.isEmpty(sysData.getBzw()) ? "9" : sysData.getBzw());
apiData.setBzwkl(0 - sysData.getDePackage());
apiData.setBzbjs(sysData.getBzbjs());
apiData.setCmsj(sysData.getCompleteTime());
diff --git a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1205.java b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1205.java
index 2bca00f..963afa1 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1205.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1205.java
@@ -161,13 +161,13 @@
//璐ㄦ鎶ュ憡鍗曞彿
List<Api1310> dataByHwdm = api1310Rep.getDataByHwdm(apiData.getHwdm(), "02");
- if(null != dataByHwdm && dataByHwdm.size() > 0){
+ if (null != dataByHwdm && dataByHwdm.size() > 0) {
apiData.setZjbgdh(dataByHwdm.get(0).getZjbgdh());
}
//鐢熸垚鏂瑰紡
apiData.setScfs(1);
- if(StringUtils.isNotEmpty(sysData.getRecordStatus()) && sysData.getRecordStatus().equals("ADD")){
+ if (StringUtils.isNotEmpty(sysData.getRecordStatus()) && sysData.getRecordStatus().equals("ADD")) {
apiData.setScfs(2);
apiData.setSdblyy("搴撳尯鍋滅數瀵艰嚧鏃犳硶鎸夋祦绋嬭繘琛屽嚭搴�");
}
@@ -237,6 +237,7 @@
apiData.setBz(StringUtils.isEmpty(sysData.getRemarks()) ? "鏆傛棤澶囨敞淇℃伅" : sysData.getRemarks());
apiData.setBzbdbz(25);
apiData.setBzbjs(0);
+ apiData.setBzw(StringUtils.isEmpty(sysData.getBzw()) ? "9" : sysData.getBzw());
apiData.setCmqrmgryxm(StringUtils.isEmpty(sysData.getRegisterUser()) ? "闂ㄥ矖浜�" : sysData.getRegisterUser());
apiData.setDjmgryxm(StringUtils.isEmpty(sysData.getRegisterUser()) ? "鐧昏浜�" : sysData.getRegisterUser());
apiData.setZcbgyxm(StringUtils.isEmpty(sysData.getHandleUser()) ? "鍊间粨鍛�" : sysData.getHandleUser());
diff --git a/src/main/java/com/fzzy/push/gd2023/GD2023ApiRemoteService2023.java b/src/main/java/com/fzzy/push/gd2023/GD2023ApiRemoteService2023.java
index ca72499..f18b4a8 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;
@@ -919,6 +920,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