From cb1ed0cb26f0aacf87343425270593fc2c3294dc Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期一, 18 十一月 2024 09:36:25 +0800
Subject: [PATCH] 佛山信息修改
---
src/main/java/com/fzzy/async/whhpjl/impl/Fz40ToWhjlSync1107.java | 81 +++++++++++++++++++++++++++-------------
1 files changed, 55 insertions(+), 26 deletions(-)
diff --git a/src/main/java/com/fzzy/async/whhpjl/impl/Fz40ToWhjlSync1107.java b/src/main/java/com/fzzy/async/whhpjl/impl/Fz40ToWhjlSync1107.java
index 9a153c6..a47009a 100644
--- a/src/main/java/com/fzzy/async/whhpjl/impl/Fz40ToWhjlSync1107.java
+++ b/src/main/java/com/fzzy/async/whhpjl/impl/Fz40ToWhjlSync1107.java
@@ -1,15 +1,16 @@
package com.fzzy.async.whhpjl.impl;
+import com.alibaba.fastjson.JSON;
import com.fzzy.api.Constant;
+import com.fzzy.api.entity.ApiInfoData;
import com.fzzy.api.entity.ApiLog;
import com.fzzy.api.utils.ContextUtil;
+import com.fzzy.api.view.repository.ApiInfoDataRep;
import com.fzzy.api.view.repository.ApiLogRep;
-import com.fzzy.async.whhpjl.entity.Fz40WhjlDefaultDepot;
import com.fzzy.async.whhpjl.entity.Fz40WhjlDefaultGranary;
import com.fzzy.async.whhpjl.repository.Fz40ToWhjlSync1106Rep;
-import com.fzzy.async.whhpjl.repository.Fz40ToWhjlSync1107Rep;
-import com.fzzy.whjl.dto.WhjlApi1106;
-import com.fzzy.whjl.dto.WhjlApi1107;
+import com.fzzy.otherview.whhpjl.WhjlConstant;
+import com.fzzy.otherview.whhpjl.dto.WhjlApi1107;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@@ -18,21 +19,22 @@
import java.util.List;
/**
- * 璐т綅淇℃伅
+ * 寤掗棿淇℃伅
*
* @Author:YAN
*/
@Slf4j
@Component
public class Fz40ToWhjlSync1107 {
-
@Autowired
- private Fz40ToWhjlSync1107Rep fz40ToWhjlSync1107Rep;
+ private Fz40ToWhjlSync1106Rep fz40ToWhjlSync1106Rep;
@Autowired
private ApiLogRep apiLogRep;
+ @Autowired
+ private ApiInfoDataRep apiInfoDataRep;
/**
- * 璐т綅淇℃伅
+ * 寤掗棿淇℃伅
*
* @param kqdm
* @param deptId
@@ -40,54 +42,81 @@
* @param end
*/
public void syncData(String kqdm, String deptId, Date start, Date end) {
- log.info("-------------1107鎺ュ彛鏁版嵁寮�濮嬪悓姝�------------------");
+ log.info("-------------1106鎺ュ彛鏁版嵁寮�濮嬪悓姝�------------------");
//鍚屾鏁版嵁锛屽彧璁板綍澶辫触鐨勪俊鎭�
ApiLog apiLog = new ApiLog();
apiLog.setType(ApiLog.TYPE_SYNC);
apiLog.setKqdm(deptId);
apiLog.setUploadTime(new Date());
- apiLog.setInteId(Constant.API_CODE_1107);
+ apiLog.setInteId(Constant.API_CODE_1106);
apiLog.setStatus(99);
apiLog.setId(ContextUtil.getUUID());
try {
- List<Fz40WhjlDefaultDepot> list = fz40ToWhjlSync1107Rep.listApi1107(deptId.substring(0, 4));
+ List<Fz40WhjlDefaultGranary> list = fz40ToWhjlSync1106Rep.listApi1106(deptId.substring(0, 4));
if (null == list || list.isEmpty()) {
log.info("-------------娌℃湁鑾峰彇鍒板崟浣嶄俊鎭�------------------");
return;
}
+ List<ApiInfoData> apiInfoDataList;
WhjlApi1107 apiData;
- for (Fz40WhjlDefaultDepot sysData : list) {
+ for (Fz40WhjlDefaultGranary sysData : list) {
apiData = new WhjlApi1107();
- apiData.setHwbh(sysData.getId()); //璐т綅缂栧彿
+ apiData.setAjbh(sysData.getAjdh()); //寤掗棿缂栧彿
apiData.setJlqybh(""); //鍐涚伯浼佷笟缂栧彿
apiData.setJlqymc(""); //鍐涚伯浼佷笟鍚嶇О
apiData.setJgzdbh(""); //鍐涗緵绔欑偣缂栧彿
apiData.setJlqymc(""); //鍐涗緵绔欑偣鍚嶇О
- apiData.setSscfbh(sysData.getBuildingId()); //浠撴埧缂栧彿
+ apiData.setSscfbh(sysData.getCfbh()); //浠撴埧缂栧彿
apiData.setSscfmc(""); //浠撴埧鍚嶇О
- apiData.setSsajbh(sysData.getGranaryId()); //寤掗棿缂栧彿
- apiData.setAjmc(""); //寤掗棿鍚嶇О
- apiData.setHwmc(sysData.getName()); //璐т綅鍚嶇О
- apiData.setHwqyrq(sysData.getStoreDate()); //璐т綅鍚敤鏃ユ湡
- apiData.setHwzt(sysData.getDepotStatus()); //璐т綅鐘舵��
- apiData.setClfs(sysData.getStoreType()); //鍌ㄧ伯鏂瑰紡
- apiData.setHwrl(sysData.getStorageMax()); //璐т綅瀹归噺
+ apiData.setAjmc(sysData.getAjmc()); //寤掗棿鍚嶇О
+ apiData.setAjcd(sysData.getAjcd()); //寤掗棿闀垮害
+ apiData.setAjkd(sysData.getAjkd()); //寤掗棿瀹藉害
+ apiData.setAjgd(sysData.getAjgd()); //寤掗棿楂樺害
+ apiData.setAjsjcr(sysData.getAjsjcr()); //寤掗棿璁捐浠撳
+ apiData.setAjsjcr01(null); //寤掗棿瀹為檯浠撳
+ apiData.setAjlxdh(sysData.getAjlxdh()); //寤掗棿鑱旂郴鐢佃瘽
+ apiData.setAjjd(null); //寤掗棿缁忓害
+ apiData.setAjwd(null); //寤掗棿绾害
+ apiData.setAjqyrq(sysData.getAjqyrq()); //寤掗棿鍚敤鏃ユ湡
+ apiData.setAjzt(sysData.getAjzt()); //寤掗棿鐘舵��
+ apiData.setAjsyzt(""); //寤掗棿浣跨敤鐘舵��
apiData.setSfyx(""); //鏄惁鏈夋晥
-
+ apiData.setBizId(sysData.getAjdh());
apiData.setUpdateTime(new Date());
- //TODO 鎸佷箙鍖栦繚瀛樺緟瀹炵幇
+ //鎸佷箙鍖栦繚瀛橈紝鍗曠嫭瀛樺叆闈炲浗鏍囨帴鍙h〃
+ ApiInfoData infoData = new ApiInfoData();
+ infoData.setId(sysData.getAjdh());
+ infoData.setKqdm(kqdm);
+ infoData.setInteType(WhjlConstant.API_CATEGORY_11);
+ infoData.setInteId(WhjlConstant.API_CODE_1106);
+ infoData.setUpdateTime(new Date());
+ infoData.setDataId(sysData.getAjdh());
+ infoData.setRemarks("澶囨敞淇℃伅");
+
+ //璁剧疆鎿嶄綔鏍囧織
+ apiInfoDataList = apiInfoDataRep.getDataByDataId(infoData.getDataId());
+ if (null == apiInfoDataList || apiInfoDataList.isEmpty()) {
+ apiData.setCzbz(Constant.CZBZ_I);
+ infoData.setCzbz(Constant.CZBZ_I);
+ } else {
+ apiData.setCzbz(apiInfoDataList.get(0).getCzbz());
+ infoData.setCzbz(apiInfoDataList.get(0).getCzbz());
+ }
+
+ infoData.setData(JSON.toJSONString(apiData));
+ apiInfoDataRep.save(infoData);
- log.info("1107---璐т綅-鍚屾鏁版嵁锛歿}", apiData.toString());
+ log.info("1106---寤掗棿-鍚屾鏁版嵁锛歿}", apiData.toString());
}
} catch (Exception e) {
- log.error("---1107璐т綅-鍚屾鏁版嵁鎵ц澶辫触----{}", e.getMessage());
- apiLog.setResult("1107璐т綅淇℃伅鍚屾澶辫触锛�" + e.getMessage());
+ log.error("---1106寤掗棿-鍚屾鏁版嵁鎵ц澶辫触----{}", e.getMessage());
+ apiLog.setResult("1106寤掗棿淇℃伅鍚屾澶辫触锛�" + e.getMessage());
apiLogRep.save(apiLog);
}
}
--
Gitblit v1.9.3