From dbef4eea6194ffba3bd25f978b33e09d65f5a6de Mon Sep 17 00:00:00 2001
From: czt <czt18638530771@163.com>
Date: 星期五, 01 十一月 2024 14:07:21 +0800
Subject: [PATCH] 根据国家局接口，调整基础表字段
---
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync2104.java | 25 +++++++++----------------
1 files changed, 9 insertions(+), 16 deletions(-)
diff --git a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync2104.java b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync2104.java
index e5988d4..6572dc9 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync2104.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync2104.java
@@ -7,22 +7,15 @@
import com.fzzy.api.service.ApiTriggerService;
import com.fzzy.api.utils.ContextUtil;
import com.fzzy.api.view.repository.*;
-import com.fzzy.async.fzzy40.entity.Fz40InoutCustomer;
-import com.fzzy.async.fzzy40.entity.Fz40InoutNoticeIn;
import com.fzzy.async.fzzy40.entity.Fz40InoutRecord;
import com.fzzy.async.fzzy40.repository.Fzzy40Sync1202Rep;
-import com.fzzy.async.fzzy40.repository.Fzzy40Sync1212Rep;
-import com.fzzy.async.fzzy40.repository.Fzzy40SyncNoticeInRep;
import com.fzzy.push.sh2023.SH2023Constant;
import com.fzzy.push.sh2023.dto.SH2023Api2104;
import com.fzzy.push.sh2023.dto.ShAreaBjw;
import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang.StringUtils;
-import org.apache.commons.lang.time.DateFormatUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
-import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@@ -34,8 +27,6 @@
@Slf4j
@Component
public class Fzzy40Sync2104 {
-
- private final static String INOUT_TYPE_IN = "IN";
@Autowired
private Fzzy40Sync1202Rep fzzy40Sync1202Rep;
@@ -81,7 +72,6 @@
List<ApiInfoData> apiInfoDataList;
List<Api1102> api1102List = api1102Rep.findPushData(kqdm);
String bjw = "";
- String mappingCode = "";
if (null != api1102List && api1102List.size() > 0) {
bjw = ShAreaBjw.getBjw(api1102List.get(0).getXzqhdm());
}
@@ -93,23 +83,26 @@
sh2023Api2104.setJzrq(sysData.getCompleteTime());
sh2023Api2104.setCch(sysData.getPlateNum());
- sh2023Api2104.setLspzdm(sysData.getFoodVariety());
- mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSXZ, sysData.getFoodType());
+
+ String mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSXZ, sysData.getFoodType());
sh2023Api2104.setLsxzdm(mappingCode);
+ mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSPZ, sysData.getFoodVariety());
+ sh2023Api2104.setLspzdm(mappingCode);
sh2023Api2104.setLldm(kqdm);
sh2023Api2104.setJz(sysData.getNetWeight());
- sh2023Api2104.setZhgxsh(sysData.getUpdateTime());
+ sh2023Api2104.setZhgxsj(sysData.getUpdateTime());
//鑾峰彇璐т綅淇℃伅
api1105 = commonService.getApi1105Cache(sysData.getDepotId());
sh2023Api2104.setPch(api1105.getHwdm() + sysData.getFoodYear());
sh2023Api2104.setBjw(bjw);
+
//鎸佷箙鍖栦繚瀛橈紝鍗曠嫭瀛樺叆闈炲浗鏍囨帴鍙ｈ〃
ApiInfoData infoData = new ApiInfoData();
- infoData.setId(sh2023Api2104.getBydh());
+ infoData.setId(ContextUtil.getUUID());
infoData.setKqdm(kqdm);
infoData.setInteType(Constant.API_CATEGORY_12);
infoData.setInteId(SH2023Constant.SH_2023_API_CODE_2104);
@@ -118,7 +111,7 @@
infoData.setRemarks("甯傚偍椹宠繍鍗�");
//璁剧疆鎿嶄綔鏍囧織
- apiInfoDataList = apiInfoDataRep.getDataByDataId(infoData.getDataId());
+ apiInfoDataList = apiInfoDataRep.getDataByInteAndData(SH2023Constant.SH_2023_API_CODE_2104, infoData.getDataId(),kqdm);
if (null == apiInfoDataList || apiInfoDataList.isEmpty()) {
infoData.setCzbz(Constant.CZBZ_I);
sh2023Api2104.setCzbz(Constant.CZBZ_I);
@@ -130,7 +123,7 @@
infoData.setData(JSON.toJSONString(sh2023Api2104));
apiInfoDataRep.save(infoData);
- log.info("2103---甯傚偍椹宠繍鍗�-鍚屾鏁版嵁锛歿}", sh2023Api2104.toString());
+ log.info("2104---甯傚偍椹宠繍鍗�-鍚屾鏁版嵁锛歿}", sh2023Api2104.toString());
}
--
Gitblit v1.9.3