From 11430ae628f098654579811131abc522d679e870 Mon Sep 17 00:00:00 2001 From: czt <czt18638530771@163.com> Date: 星期一, 22 九月 2025 17:04:42 +0800 Subject: [PATCH] 上海对农接口调整-增加自动上传 --- src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1210.java | 37 ++++++++++++++++++++++++++----------- 1 files changed, 26 insertions(+), 11 deletions(-) diff --git a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1210.java b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1210.java index b124a0f..88b74f2 100644 --- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1210.java +++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1210.java @@ -6,6 +6,7 @@ import com.fzzy.api.entity.Api1210; import com.fzzy.api.entity.ApiLog; import com.fzzy.api.service.ApiCommonService; +import com.fzzy.api.service.ApiTriggerService; import com.fzzy.api.utils.ContextUtil; import com.fzzy.api.view.repository.Api1209Rep; import com.fzzy.api.view.repository.Api1210Rep; @@ -15,6 +16,7 @@ import com.fzzy.async.fzzy40.repository.Fzzy40Sync1209Rep; import com.fzzy.async.fzzy40.repository.Fzzy40Sync1210Rep; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; @@ -36,6 +38,8 @@ private Api1210Rep api1210Rep; @Autowired private ApiCommonService commonService; + @Autowired + private ApiTriggerService apiTriggerService; @Autowired private ApiLogRep apiLogRep; @@ -61,7 +65,7 @@ Api1210 apiData; Api1105 api1105; - + List<Api1210> api1210List; for (Fz40InoutVarietyChange sysData : list) { //鑾峰彇璐т綅淇℃伅 api1105 = commonService.getApi1105Cache(sysData.getDepotId()); @@ -74,23 +78,34 @@ apiData.setLssl(sysData.getNumber()); apiData.setHzsl(sysData.getChangeNumber()); apiData.setBzwh(sysData.getApprovalId()); - apiData.setLspzdm(sysData.getFoodVariety()); - apiData.setHzqlsxzdm(sysData.getFoodType()); - apiData.setHzhlsxzdm(sysData.getNewFoodType()); + String mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSPZ, sysData.getFoodVariety()); + apiData.setLspzdm(mappingCode); + mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSXZ, sysData.getFoodType()); + apiData.setHzqlsxzdm(mappingCode); + mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSXZ, sysData.getNewFoodType()); + apiData.setHzhlsxzdm(mappingCode); apiData.setHzrq(sysData.getChangeTime()); - apiData.setCcshr(sysData.getCcshr()); - apiData.setZjshr(sysData.getZjshr()); - apiData.setTjshr(sysData.getTjshr()); - apiData.setKjshr(sysData.getKjshr()); - apiData.setLdshr(sysData.getLdshr()); + apiData.setCcshr(StringUtils.isEmpty(sysData.getCcshr()) ? "瀹℃壒浜�" : sysData.getCcshr()); + apiData.setZjshr(StringUtils.isEmpty(sysData.getZjshr()) ? "瀹℃壒浜�" : sysData.getZjshr()); + apiData.setTjshr(StringUtils.isEmpty(sysData.getTjshr()) ? "瀹℃壒浜�" : sysData.getTjshr()); + apiData.setKjshr(StringUtils.isEmpty(sysData.getKjshr()) ? "瀹℃壒浜�" : sysData.getKjshr()); + apiData.setLdshr(StringUtils.isEmpty(sysData.getLdshr()) ? "瀹℃壒浜�" : sysData.getLdshr()); apiData.setBz(sysData.getRemark()); - apiData.setCzbz(Constant.CZBZ_I); - apiData.setZhgxsj(sysData.getUpdateTime()); + apiData.setZhgxsj(new Date()); //涓氬姟id銆佸簱鍖虹紪鐮併�佸悓姝ユ椂闂� apiData.setBizId(sysData.getId()); apiData.setKqdm(kqdm); apiData.setSyncTime(new Date()); + api1210List = api1210Rep.getDataById(apiData.getLsxzzbdh()); + if (null == api1210List || api1210List.isEmpty()) { + apiData.setCzbz(Constant.CZBZ_I); + } else { + if (StringUtils.isNotEmpty(api1210List.get(0).getJhmxdh())) { + apiData.setJhmxdh(api1210List.get(0).getJhmxdh()); + } + apiData.setCzbz(api1210List.get(0).getCzbz()); + } //淇濆瓨鏁版嵁 api1210Rep.save(apiData); -- Gitblit v1.9.3