From 7a988c17fe25f18815889ff5221a5ebcf01fabdc Mon Sep 17 00:00:00 2001
From: czt <czt18638530771@163.com>
Date: 星期一, 13 十月 2025 18:15:59 +0800
Subject: [PATCH] 武汉黄陂军粮-质检报告共享接口同步及推送3
---
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1108.java | 54 ++++++++++++++++++++++++++++--------------------------
1 files changed, 28 insertions(+), 26 deletions(-)
diff --git a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1108.java b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1108.java
index 7101e67..0c9c72c 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1108.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1108.java
@@ -1,21 +1,17 @@
package com.fzzy.async.fzzy40.impl;
import com.fzzy.api.Constant;
-import com.fzzy.api.entity.Api1101;
-import com.fzzy.api.entity.Api1102;
-import com.fzzy.api.entity.Api1108;
-import com.fzzy.api.entity.ApiLog;
+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.Api1108Rep;
import com.fzzy.api.view.repository.ApiLogRep;
import com.fzzy.async.fzzy40.entity.Fz40Drug;
import com.fzzy.async.fzzy40.repository.Fzzy40Sync1108Rep;
import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
-
import java.util.Date;
import java.util.List;
@@ -32,8 +28,6 @@
private Fzzy40Sync1108Rep fzzy40Sync1108Rep;
@Autowired
private ApiLogRep apiLogRep;
- @Autowired
- private Api1101Rep api1101Rep;
@Autowired
private Api1102Rep api1102Rep;
@Autowired
@@ -61,40 +55,48 @@
apiLog.setId(ContextUtil.getUUID());
try {
- List<Fz40Drug> list = fzzy40Sync1108Rep.listDrug(deptId);
+ List<Fz40Drug> list = fzzy40Sync1108Rep.listDrug(deptId, start, end);
if (null == list || list.isEmpty()) {
log.info("-------------娌℃湁鑾峰彇鍒拌嵂鍓備俊鎭�------------------");
return;
}
Api1102 api1102 = api1102Rep.findById(kqdm).get();
- Api1101 api1101 = api1101Rep.findById(api1102.getDwdm()).get();
Api1108 apiData;
+ List<Api1108> api1108List;
for (Fz40Drug sysData : list) {
apiData = new Api1108();
- apiData.setId(ContextUtil.getUUID());//ID
+ apiData.setId(kqdm + sysData.getId());//ID
apiData.setBizId(sysData.getId());//涓氬姟id
- apiData.setDwdm(api1101.getDwdm());//鍗曚綅浠ｇ爜
+ apiData.setDwdm(api1102.getDwdm());//鍗曚綅浠ｇ爜
apiData.setKqdm(api1102.getKqdm());//搴撳尯浠ｇ爜
apiData.setKqmc(api1102.getKqmc());//搴撳尯鍚嶇О
- apiData.setYjbh(sysData.getId());//鑽墏缂栧彿
+ apiData.setYjbh(kqdm + sysData.getId().substring(8));//鑽墏缂栧彿
apiData.setYjmc(sysData.getName());//鑽墏鍚嶇О
- apiData.setBzw(sysData.getBzw());//鍖呰鐗�
- apiData.setGgxh(sysData.getGgxh());//鍨嬪彿瑙勬牸
- apiData.setAqsysms(sysData.getAqsysms());//瀹夊叏浣跨敤璇存槑涔�
- apiData.setSccj(sysData.getSccj());//鐢熶骇鍘傚
- apiData.setCgly(sysData.getCgly());//閲囪喘鏉ユ簮
- apiData.setCctj(sysData.getCctj());//瀛樺偍鏉′欢
- apiData.setCcdd(sysData.getCcdd());//鍌ㄥ瓨鍦扮偣
- apiData.setBzwclfs(sysData.getBzwclfs());//鍖呰鐗╁鐞嗘柟寮�
- apiData.setCzclfs(sysData.getCzclfs());//娈嬫福澶勭悊鏂瑰紡
- apiData.setBzq(sysData.getBzq());//淇濊川鏈�
- apiData.setCgrq(sysData.getCgrq());//閲囪喘鏃ユ湡
+ apiData.setBzw(StringUtils.isEmpty(sysData.getBzw())?"":sysData.getBzw());//鍖呰鐗�
+ apiData.setGgxh(StringUtils.isEmpty(sysData.getGgxh())?"":sysData.getGgxh());//鍨嬪彿瑙勬牸
+ apiData.setAqsysms(StringUtils.isEmpty(sysData.getAqsysms())?"":sysData.getAqsysms());//瀹夊叏浣跨敤璇存槑涔�
+ apiData.setSccj(StringUtils.isEmpty(sysData.getSccj())?"":sysData.getSccj());//鐢熶骇鍘傚
+ apiData.setCgly(StringUtils.isEmpty(sysData.getCgly())?"":sysData.getCgly());//閲囪喘鏉ユ簮
+ apiData.setCctj(StringUtils.isEmpty(sysData.getCctj())?"":sysData.getCctj());//瀛樺偍鏉′欢
+ apiData.setCcdd(StringUtils.isEmpty(sysData.getCcdd())?"":sysData.getCcdd());//鍌ㄥ瓨鍦扮偣
+ apiData.setBzwclfs(StringUtils.isEmpty(sysData.getBzwclfs())?"":sysData.getBzwclfs());//鍖呰鐗╁鐞嗘柟寮�
+ apiData.setCzclfs(StringUtils.isEmpty(sysData.getCzclfs())?"":sysData.getCzclfs());//娈嬫福澶勭悊鏂瑰紡
+ apiData.setBzq(StringUtils.isEmpty(sysData.getBzw())? "1骞�": sysData.getBzq());//淇濊川鏈�
+ apiData.setCgrq(null == sysData.getBzw()?new Date():sysData.getCgrq());//閲囪喘鏃ユ湡
apiData.setKcsl(sysData.getCount());//搴撳瓨鏁伴噺
- apiData.setKcsldw(sysData.getKcsldw());//搴撳瓨鏁伴噺鍗曚綅
- apiData.setCzbz(Constant.CZBZ_I);//鎿嶄綔鏍囧織
+ apiData.setKcsldw(StringUtils.isEmpty(sysData.getKcsldw())?"":sysData.getKcsldw());//搴撳瓨鏁伴噺鍗曚綅
+
apiData.setZhgxsj(sysData.getUpdateTime());//鏈�鍚庢洿鏂版椂闂�
+ apiData.setBizId(sysData.getId());//涓氬姟id
+
+ api1108List = api1108Rep.getDataByBizId(apiData.getBizId());
+ if (null == api1108List || api1108List.isEmpty()) {
+ apiData.setCzbz(Constant.CZBZ_I);
+ } else {
+ apiData.setCzbz(api1108List.get(0).getCzbz());
+ }
//淇濆瓨鏁版嵁
api1108Rep.save(apiData);
--
Gitblit v1.9.3