From 92e9a188a146b3807909901cc9f6496a52700c23 Mon Sep 17 00:00:00 2001
From: CZT <czt18638530771@163.com>
Date: 星期四, 10 八月 2023 19:55:49 +0800
Subject: [PATCH] 优化客户信息同步
---
src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1212.java | 22 +++++++++++++++++-----
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1212.java | 27 +++++++++++++++++++--------
src/main/java/com/fzzy/api/view/Api1212.view.xml | 3 ++-
src/main/resources/application-dev.yml | 8 ++++----
4 files changed, 42 insertions(+), 18 deletions(-)
diff --git a/src/main/java/com/fzzy/api/view/Api1212.view.xml b/src/main/java/com/fzzy/api/view/Api1212.view.xml
index 2db167f..14007b0 100644
--- a/src/main/java/com/fzzy/api/view/Api1212.view.xml
+++ b/src/main/java/com/fzzy/api/view/Api1212.view.xml
@@ -27,7 +27,8 @@
<Property name="label">搴撳尯浠ｇ爜</Property>
</PropertyDef>
<PropertyDef name="id">
- <Property name="dataType">Integer</Property>
+ <Property></Property>
+ <Property name="label">涓婚敭ID</Property>
</PropertyDef>
<PropertyDef name="dwdm">
<Property></Property>
diff --git a/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1212.java b/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1212.java
index 1974870..109ad3b 100644
--- a/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1212.java
+++ b/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1212.java
@@ -1,10 +1,12 @@
package com.fzzy.async.fzzy35.impl;
import com.fzzy.api.Constant;
+import com.fzzy.api.entity.Api1101;
import com.fzzy.api.entity.Api1102;
import com.fzzy.api.entity.Api1212;
import com.fzzy.api.entity.ApiLog;
import com.fzzy.api.utils.ContextUtil;
+import com.fzzy.api.view.repository.Api1101Rep;
import com.fzzy.api.view.repository.Api1102Rep;
import com.fzzy.api.view.repository.Api1212Rep;
import com.fzzy.api.view.repository.ApiLogRep;
@@ -30,6 +32,8 @@
private Api1212Rep api1212Rep;
@Autowired
private Api1102Rep api1102Rep;
+ @Autowired
+ private Api1101Rep api1101Rep;
@Autowired
private ApiLogRep apiLogRep;
@@ -62,7 +66,8 @@
}
//鏍规嵁搴撳尯浠ｇ爜鑾峰彇鍗曚綅浠ｇ爜
- Api1102 api1201 = api1102Rep.findById(kqdm).get();
+ Api1102 api1102 = api1102Rep.findById(kqdm).get();
+ Api1101 api1101 = api1101Rep.findById(api1102.getDwdm()).get();
Api1212 apiData;
List<Api1212> api1212List;
@@ -71,17 +76,24 @@
apiData = new Api1212();
//鍗曚綅浠ｇ爜
apiData.setId(sysData.getId());
- apiData.setDwdm(api1201.getDwdm());
- apiData.setKqdm(kqdm);
+ apiData.setDwdm(api1101.getDwdm());
+ apiData.setDwmc(api1101.getDwmc());
+ apiData.setKqdm(api1102.getKqdm());
+ apiData.setKqmc(api1102.getKqmc());
apiData.setKhlx(sysData.getKhlx());
apiData.setKhtyshxydmhsfzh(sysData.getKhbh());
apiData.setKhmc(sysData.getName());
apiData.setFddbr(sysData.getFddbr());
apiData.setTxdz(StringUtils.isEmpty(sysData.getAddress()) ? "鍗曚綅鍦板潃" :sysData.getAddress());
- apiData.setYzbm(StringUtils.isEmpty(sysData.getYzbm()) ? "" :sysData.getYzbm());
+
apiData.setLxrxm(StringUtils.isEmpty(sysData.getContactUser()) ? sysData.getFddbr() :sysData.getContactUser());
apiData.setLxrdh(StringUtils.isEmpty(sysData.getPhone()) ? "" :sysData.getPhone());
- apiData.setLxrsfzh(StringUtils.isEmpty(sysData.getCardId()) ? "100000000000000000" :sysData.getCardId());
+ if(StringUtils.isNotEmpty(sysData.getCardId())){
+ apiData.setLxrsfzh(sysData.getCardId());
+ }
+ if(StringUtils.isNotEmpty(sysData.getYzbm())){
+ apiData.setYzbm(sysData.getYzbm());
+ }
apiData.setDzyx(StringUtils.isEmpty(sysData.getDzyx()) ? "" :sysData.getDzyx());
// apiData.setKhfkhh(StringUtils.isEmpty(sysData.getBank()) ? "" :sysData.getBank());
apiData.setKhfzh(StringUtils.isEmpty(sysData.getBankNum()) ? "" :sysData.getBankNum());
diff --git a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1212.java b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1212.java
index 7fbc451..ac48ab2 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1212.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1212.java
@@ -3,6 +3,7 @@
import com.fzzy.api.Constant;
import com.fzzy.api.entity.*;
import com.fzzy.api.utils.ContextUtil;
+import com.fzzy.api.view.repository.Api1101Rep;
import com.fzzy.api.view.repository.Api1102Rep;
import com.fzzy.api.view.repository.Api1212Rep;
import com.fzzy.api.view.repository.ApiLogRep;
@@ -28,6 +29,8 @@
private Api1102Rep api1102Rep;
@Autowired
private Api1212Rep api1212Rep;
+ @Autowired
+ private Api1101Rep api1101Rep;
@Autowired
private ApiLogRep apiLogRep;
@@ -58,8 +61,9 @@
return;
}
- //鏍规嵁搴撳尯浠ｇ爜鑾峰彇搴撳尯浠ｇ爜
- Api1102 api1201 = api1102Rep.findById(kqdm).get();
+ //鏍规嵁搴撳尯浠ｇ爜鑾峰彇鍗曚綅浠ｇ爜
+ Api1102 api1102 = api1102Rep.findById(kqdm).get();
+ Api1101 api1101 = api1101Rep.findById(api1102.getDwdm()).get();
Api1212 apiData;
List<Api1212> api1212List;
@@ -67,22 +71,29 @@
apiData = new Api1212();
//鍗曚綅浠ｇ爜
- apiData.setId(sysData.getKhbh());
- apiData.setDwdm(api1201.getDwdm());
- apiData.setKqdm(kqdm);
+ apiData.setId(sysData.getId());
+ apiData.setDwdm(api1101.getDwdm());
+ apiData.setDwmc(api1101.getDwmc());
+ apiData.setKqdm(api1102.getKqdm());
+ apiData.setKqmc(api1102.getKqmc());
apiData.setKhlx(sysData.getKhlx());
apiData.setKhtyshxydmhsfzh(sysData.getKhbh());
apiData.setKhmc(sysData.getName());
apiData.setFddbr(sysData.getFddbr());
apiData.setTxdz(StringUtils.isEmpty(sysData.getAddress()) ? "鍗曚綅鍦板潃" :sysData.getAddress());
- apiData.setYzbm(StringUtils.isEmpty(sysData.getYzbm()) ? "" :sysData.getYzbm());
+
apiData.setLxrxm(StringUtils.isEmpty(sysData.getContactUser()) ? sysData.getFddbr() :sysData.getContactUser());
apiData.setLxrdh(StringUtils.isEmpty(sysData.getPhone()) ? "" :sysData.getPhone());
- apiData.setLxrsfzh(StringUtils.isEmpty(sysData.getCardId()) ? "100000000000000000" :sysData.getCardId());
+ if(StringUtils.isNotEmpty(sysData.getCardId())){
+ apiData.setLxrsfzh(sysData.getCardId());
+ }
+ if(StringUtils.isNotEmpty(sysData.getYzbm())){
+ apiData.setYzbm(sysData.getYzbm());
+ }
apiData.setDzyx(StringUtils.isEmpty(sysData.getDzyx()) ? "" :sysData.getDzyx());
// apiData.setKhfkhh(StringUtils.isEmpty(sysData.getBank()) ? "" :sysData.getBank());
apiData.setKhfzh(StringUtils.isEmpty(sysData.getBankNum()) ? "" :sysData.getBankNum());
- apiData.setZhgxsj(sysData.getUpdateTime());
+ apiData.setZhgxsj(sysData.getUpdateTime() == null ? new Date() : sysData.getUpdateTime());
apiData.setBizId(sysData.getId());
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index cb7b865..14c0ab6 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -5,10 +5,10 @@
datasource:
#涓绘暟鎹簮
primary:
- url: jdbc:mysql://127.0.0.1:3306/igds_api_5016?useUnicode=true&useSSL=false&characterEncoding=utf-8
+# url: jdbc:mysql://127.0.0.1:3306/igds_api_5016?useUnicode=true&useSSL=false&characterEncoding=utf-8
# url: jdbc:mysql://127.0.0.1:3306/igds_api_5303?useUnicode=true&useSSL=false&characterEncoding=utf-8
# url: jdbc:mysql://127.0.0.1:3306/igds_api_5311?useUnicode=true&useSSL=false&characterEncoding=utf-8
-# url: jdbc:mysql://127.0.0.1:3306/igds_api_5317?useUnicode=true&useSSL=false&characterEncoding=utf-8
+ url: jdbc:mysql://127.0.0.1:3306/igds_api_5317?useUnicode=true&useSSL=false&characterEncoding=utf-8
# url: jdbc:mysql://127.0.0.1:3306/igds_api_5317_1?useUnicode=true&useSSL=false&characterEncoding=utf-8 #娓彛鏂颁粨
# url: jdbc:mysql://127.0.0.1:3306/igds_api_5317_2?useUnicode=true&useSSL=false&characterEncoding=utf-8 #鍏冲煚鑰佷粨
# url: jdbc:mysql://127.0.0.1:3306/igds_api_5317_3?useUnicode=true&useSSL=false&characterEncoding=utf-8 #鐩村睘浠撳簱
@@ -29,10 +29,10 @@
driver-class-name: com.mysql.jdbc.Driver
#娆℃暟鎹簮
secondary:
- url: jdbc:mysql://127.0.0.1:3306/igds_3.5_5016?useUnicode=true&useSSL=false&characterEncoding=utf-8
+# url: jdbc:mysql://127.0.0.1:3306/igds_3.5_5016?useUnicode=true&useSSL=false&characterEncoding=utf-8
# url: jdbc:mysql://127.0.0.1:3306/igds_3.5_5303?useUnicode=true&useSSL=false&characterEncoding=utf-8
# url: jdbc:mysql://127.0.0.1:3306/igds_3.5_5311?useUnicode=true&useSSL=false&characterEncoding=utf-8
-# url: jdbc:mysql://127.0.0.1:3306/igds_3.5_5317?useUnicode=true&useSSL=false&characterEncoding=utf-8
+ url: jdbc:mysql://127.0.0.1:3306/igds_3.5_5317?useUnicode=true&useSSL=false&characterEncoding=utf-8
# url: jdbc:mysql://127.0.0.1:3306/igds_3.5_5320?useUnicode=true&useSSL=false&characterEncoding=utf-8
# url: jdbc:mysql://127.0.0.1:3306/igds_3.5_5321?useUnicode=true&useSSL=false&characterEncoding=utf-8
# url: jdbc:mysql://127.0.0.1:3306/igds_4.0_5326?useUnicode=true&useSSL=false&characterEncoding=utf-8 #鎯犲窞鎯犳柊
--
Gitblit v1.9.3