From 1c5afb4320feceb5584e875dc375482b46bd5bb7 Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期三, 23 四月 2025 10:01:31 +0800
Subject: [PATCH] 数据同步调整
---
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1201.java | 88 ++++++++++++++++++++++++++++++++++++++-----
1 files changed, 77 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1201.java b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1201.java
index 7e08640..8d8f38c 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1201.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1201.java
@@ -1,14 +1,12 @@
package com.fzzy.async.fzzy40.impl;
import com.fzzy.api.Constant;
-import com.fzzy.api.entity.Api1102;
-import com.fzzy.api.entity.Api1201;
-import com.fzzy.api.entity.ApiLog;
+import com.fzzy.api.data.PushProtocol;
+import com.fzzy.api.entity.*;
import com.fzzy.api.service.ApiTriggerService;
import com.fzzy.api.utils.ContextUtil;
-import com.fzzy.api.view.repository.Api1102Rep;
-import com.fzzy.api.view.repository.Api1201Rep;
-import com.fzzy.api.view.repository.ApiLogRep;
+import com.fzzy.api.utils.FileUtils;
+import com.fzzy.api.view.repository.*;
import com.fzzy.async.fzzy40.entity.Fz40InoutContract;
import com.fzzy.async.fzzy40.entity.Fz40InoutCustomer;
import com.fzzy.async.fzzy40.repository.Fzzy40Sync1201Rep;
@@ -35,6 +33,12 @@
private Fzzy40Sync1201Rep fzzySync1201Rep;
@Autowired
private ApiTriggerService apiTriggerService;
+ @Autowired
+ private ApiConfsRep apiConfsRep;
+ @Autowired
+ private FileUtils fileUtil;
+ @Autowired
+ private Api1109Rep api1109Rep;
@Autowired
private Api1201Rep api1201Rep;
@Autowired
@@ -63,7 +67,7 @@
apiLog.setStatus(99);
apiLog.setId(ContextUtil.getUUID());
try {
- List<Fz40InoutContract> list = fzzySync1201Rep.listContract(deptId);
+ List<Fz40InoutContract> list = fzzySync1201Rep.listContract(deptId, start, end);
if (null == list || list.isEmpty()) {
log.debug("-------------娌℃湁鑾峰彇鍒板悎鍚屼俊鎭�------------------");
@@ -76,6 +80,8 @@
Api1201 apiData;
List<Api1201> api1201List;
List<Fz40InoutCustomer> listCustomer;
+ Api1109 api1109;
+ List<Api1109> api1109List;
for (Fz40InoutContract sysData : list) {
apiData = new Api1201();
@@ -86,6 +92,7 @@
//涓氬姟绫诲瀷
apiData.setYwlx(sysData.getType());
+ apiData.setHtzl(sysData.getType());
//瀹㈡埛绫诲瀷
apiData.setKhlx(sysData.getCustomerType());
@@ -96,6 +103,10 @@
continue;
}
apiData.setKhtyshxydm(listCustomer.get(0).getKhbh());
+ apiData.setSfzh(listCustomer.get(0).getCardId());
+ apiData.setLxrdh(listCustomer.get(0).getPhone());
+ apiData.setYzbm(StringUtils.isEmpty(listCustomer.get(0).getYzbm()) ? "000000" : listCustomer.get(0).getYzbm());
+ apiData.setDzyx(listCustomer.get(0).getDzyx());
}
@@ -104,15 +115,20 @@
apiData.setQdrq(sysData.getSigningTime());
- if(StringUtils.isEmpty(sysData.getFoodVariety())){
+ if (StringUtils.isEmpty(sysData.getFoodVariety())) {
continue;
}
- String mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSPZ, sysData.getFoodVariety().substring(0,3));
+ String mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSPZ, sysData.getFoodVariety().substring(0, 3));
apiData.setLspzdm(mappingCode);
mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSXZ, sysData.getFoodType());
apiData.setLsxzdm(mappingCode);
+
+ apiData.setYsfs(StringUtils.isEmpty(sysData.getYsfs()) ? "浠ュ叆浠撴暟閲忎负鏍囧噯" : sysData.getYsfs());
+
+
+ apiData.setFkfs(StringUtils.isEmpty(sysData.getFkfs()) ? "1" : sysData.getFkfs());
//鍗曚环锛氬厓/鍚�
apiData.setHtdj(sysData.getPrice() == null ? 0.0 : sysData.getPrice());
apiData.setYdgxlssl(sysData.getContactAmount() == null ? 0.0 : sysData.getContactAmount());
@@ -134,8 +150,19 @@
apiData.setBfzh(StringUtils.isEmpty(sysData.getBankAccount()) ? "100000000000000000" : sysData.getBankAccount());
apiData.setWcrq(sysData.getEndTime());
-
+ apiData.setLxrxm(StringUtils.isEmpty(sysData.getLxrxm()) ? apiData.getFddbr() : sysData.getLxrxm());
+ apiData.setJsyhtbyzyy(StringUtils.isEmpty(sysData.getJsyhtbyzyy()) ? "缁撶畻涓庡悎鍚屼笉涓�鑷村師鍥�" : sysData.getJsyhtbyzyy());
+ apiData.setQddd(StringUtils.isEmpty(sysData.getSignAddress()) ? "绛捐鍦扮偣" : sysData.getSignAddress());
+ apiData.setTxdz(StringUtils.isEmpty(sysData.getTxdz()) ? "閫氳鍦板潃" : sysData.getTxdz());
apiData.setZhgxsj(sysData.getCreateTime());
+ apiData.setShr(StringUtils.isEmpty(sysData.getAuditUser()) ? "瀹℃壒浜�" : sysData.getAuditUser());
+ apiData.setShsj(sysData.getAuditDate() == null ? new Date() : sysData.getAuditDate());
+ apiData.setSswcsj(sysData.getRelEndTime());
+ apiData.setYdwcsj(sysData.getEndTime());
+ apiData.setBfqyr(StringUtils.isEmpty(sysData.getSignUser()) ? "鏈柟绛剧害浜�" : sysData.getSignUser());
+
+ //璁剧疆骞村害
+ apiData.setLhnd(sysData.getYear());
apiData.setSyncTime(new Date());
apiData.setBizId(sysData.getId());
@@ -150,9 +177,48 @@
//淇濆瓨鏁版嵁
api1201Rep.save(apiData);
+ log.info("1201---鍚堝悓鍚屾鏁版嵁锛歿}", apiData.toString());
+ //鑻ラ檮浠秈d涓嶄负绌猴紝鍒欏垽鏂槸鍚︿负涓婃捣鍗忚锛屼笂娴峰崗璁椂锛岄渶鍚屾椂鍚屾鍚堝悓闄勪欢淇℃伅
+ if (StringUtils.isNotEmpty(sysData.getFileId())) {
+ //鑻ヤ负涓婃捣鐪佸钩鍙板崗璁紝鍒欓渶鍚屾椂鍚屾鍚堝悓闄勪欢淇℃伅
+ List<ApiConfs> apiConfs = apiConfsRep.getDataByKqdm(kqdm);
+ if (null != apiConfs && PushProtocol.SB_SH_2023.getCode().equals(apiConfs.get(0).getPushProtocol())) {
+ api1109 = new Api1109();
+ //涓婚敭id
+ api1109.setId(apiData.getHth());
+ //鏂囦欢璺緞
+ api1109.setWjdz(fileUtil.getCommonFilePath(sysData.getFileTime()) + sysData.getFileId());
- log.info("1201---鍚屾鏁版嵁锛歿}", apiData.toString());
+ String kzm = "pdf"; //鎵╁睍鍚嶏細榛樿涓簆df
+ String[] split = sysData.getFileId().split("\\.");
+ if (split.length > 0) {
+ kzm = split[split.length - 1];
+ }
+
+ //鏂囦欢鍚嶇О(鍚堝悓鍙�+鎵╁睍鍚�)
+ api1109.setWjmc(apiData.getHth() + "." + kzm);
+ //鏂囦欢绫诲瀷
+ api1109.setWjlx("6"); //6-鍚堝悓鏂囦欢(pdf,jpg)
+ api1109.setYwdh(apiData.getHth()); //6-鍚堝悓鏂囦欢(pdf,jpg)
+ //鎿嶄綔鏍囧織鍙婃渶鍚庢洿鏂版椂闂�
+ api1109.setZhgxsj(new Date());
+
+ //涓氬姟id銆佸簱鍖虹紪鐮併�佸悓姝ユ椂闂�
+ api1109.setBizId(apiData.getHth());
+ api1109.setKqdm(kqdm);
+ api1109.setSyncTime(new Date());
+ api1109List = api1109Rep.getDataByBizId(api1109.getBizId());
+ if (null == api1109List || api1109List.isEmpty()) {
+ api1109.setCzbz(Constant.CZBZ_I);
+ } else {
+ api1109.setCzbz(api1109List.get(0).getCzbz());
+ }
+ //淇濆瓨鏁版嵁
+ api1109Rep.save(api1109);
+ log.info("1201---鍚堝悓闄勪欢淇℃伅鍚屾锛歿}", api1109.toString());
+ }
+ }
}
} catch (Exception e) {
log.error("---鍚堝悓鍚屾鎵ц澶辫触----{}", e);
--
Gitblit v1.9.3