From 954480166aad6d24c9e9889906a0edf762f0da2a Mon Sep 17 00:00:00 2001
From: czt <czt18638530771@163.com>
Date: 星期一, 10 二月 2025 16:32:56 +0800
Subject: [PATCH] 优化库存同步
---
src/main/java/com/fzzy/otherview/gd2022/pr/GDApi1023PR.java | 96 +++++++++++++++--------------------------------
1 files changed, 31 insertions(+), 65 deletions(-)
diff --git a/src/main/java/com/fzzy/otherview/gd2022/pr/GDApi1023PR.java b/src/main/java/com/fzzy/otherview/gd2022/pr/GDApi1023PR.java
index c2b54a5..0b7860a 100644
--- a/src/main/java/com/fzzy/otherview/gd2022/pr/GDApi1023PR.java
+++ b/src/main/java/com/fzzy/otherview/gd2022/pr/GDApi1023PR.java
@@ -16,13 +16,8 @@
import com.fzzy.api.service.ApiRemoteService;
import com.fzzy.api.utils.ContextUtil;
import com.fzzy.api.view.repository.ApiInfoDataRep;
-import com.fzzy.otherview.gd2022.dto.GdApi1023;
-import com.fzzy.otherview.gd2022.dto.GdApi1023Dtl;
-import com.fzzy.otherview.gd2022.dto.GdApi1023People;
-import com.fzzy.otherview.gd2022.dto.GdApi1023Way;
+import com.fzzy.push.gd2022.dto.Gd2022Api1023;
import com.fzzy.push.gd2022.ApiCodeConstant;
-import com.fzzy.push.sh2023.SH2023Constant;
-import com.fzzy.push.sh2023.dto.SH2023Api2103;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang.time.DateFormatUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -61,7 +56,7 @@
* @return
*/
@DataProvider
- public void listData(Page<GdApi1023> page, ApiParam param) {
+ public void listData(Page<Gd2022Api1023> page, ApiParam param) {
Pageable pageable = PageRequest.of(page.getPageNo() - 1, page.getPageSize(), Sort.Direction.DESC, "updateTime");
@@ -71,7 +66,7 @@
@Override
public Predicate toPredicate(Root<ApiInfoData> root, CriteriaQuery<?> criteriaQuery, CriteriaBuilder criteriaBuilder) {
List<Predicate> predicates = new ArrayList<>(); //鎵�鏈夌殑鏂█
- Predicate predicate = criteriaBuilder.equal(root.get("inteId"), ApiCodeConstant.API_1023);
+ Predicate predicate = criteriaBuilder.equal(root.get("inteId"), ApiCodeConstant.API_9201);
predicates.add(predicate);
if (null != param) {
if (StringUtils.isNotBlank(param.getKqdm())) {
@@ -98,59 +93,29 @@
};
org.springframework.data.domain.Page<ApiInfoData> japPage = apiInfoDataRep.findAll(specification, pageable);
page.setEntityCount((int) japPage.getTotalElements());
- List<GdApi1023> list = new ArrayList<>();
- GdApi1023 gdApi1023;
+ List<Gd2022Api1023> list = new ArrayList<>();
+ Gd2022Api1023 GD2022Api1023;
for (ApiInfoData infoData : japPage.getContent()) {
- gdApi1023 = JSONObject.parseObject(infoData.getData(), GdApi1023.class);
- list.add(gdApi1023);
+ GD2022Api1023 = JSONObject.parseObject(infoData.getData(), Gd2022Api1023.class);
+ list.add(GD2022Api1023);
}
page.setEntities(list);
}
/**
- * 鑾峰彇鐔忚捀浣滀笟浜哄憳淇℃伅琛�
- * gDApi1023PR#peopleList
- */
- @DataProvider
- public List<GdApi1023People> peopleList(String code) {
- return JSON.parseArray(code, GdApi1023People.class);
- }
-
- /**
- * 鑾峰彇鐔忚捀澶囨鏂瑰紡琛ㄨ〃淇℃伅
- * gDApi1023PR#wayList
- */
- @DataProvider
- public List<GdApi1023Way> wayList(String code) {
- return JSON.parseArray(code, GdApi1023Way.class);
- }
-
- /**
- * 瀹炴柦鐔忚捀浣滀笟鐨勫偍绮伯鎯呮槑缁嗚〃
- * gDApi1023PR#dtlList
- */
- @DataProvider
- public List<GdApi1023Dtl> dtlList(String code) {
- return JSON.parseArray(code, GdApi1023Dtl.class);
- }
-
- /**
* gDApi1023PR#saveData
*/
@DataResolver
- public void saveData(GdApi1023 data) {
- data.setDtlList(JSON.toJSONString(data.getDtls()));
- data.setWayList(JSON.toJSONString(data.getWays()));
- data.setPeopleList(JSON.toJSONString(data.getPeoples()));
+ public void saveData(Gd2022Api1023 data) {
ApiInfoData infoData;
- List<ApiInfoData> apiInfoList = apiInfoDataRep.getDataByInteAndData(ApiCodeConstant.API_1023, data.getXzbm());
+ List<ApiInfoData> apiInfoList = apiInfoDataRep.getDataByInteAndData(ApiCodeConstant.API_1023, DateFormatUtils.format(data.getTbrq(), "yyyyMMdd") + data.getXzbm(), data.getKqdm());
if (apiInfoList.size() != 0) {
infoData = apiInfoList.get(0);
infoData.setData(JSON.toJSONString(data));
} else {
infoData = new ApiInfoData();
- infoData.setId(ContextUtil.getUUID());
+ infoData.setId(data.getXzbm());
infoData.setKqdm(data.getKqdm());
infoData.setInteId(ApiCodeConstant.API_1023);
infoData.setUpdateTime(new Date());
@@ -166,8 +131,8 @@
* gDApi1023PR#delData
*/
@Expose
- public void delData(GdApi1023 data) {
- List<ApiInfoData> apiInfoList = apiInfoDataRep.getDataByInteAndData(ApiCodeConstant.API_1023, data.getXzbm());
+ public void delData(Gd2022Api1023 data) {
+ List<ApiInfoData> apiInfoList = apiInfoDataRep.getDataByInteAndData(ApiCodeConstant.API_1023, DateFormatUtils.format(data.getTbrq(), "yyyyMMdd") + data.getXzbm(), data.getKqdm());
apiInfoDataRep.deleteById(apiInfoList.get(0).getId());
}
@@ -175,11 +140,11 @@
* gDApi1023PR#delUpdate
*/
@Expose
- public String delUpdate(GdApi1023 data) {
+ public String delUpdate(Gd2022Api1023 data) {
if (null == data) {
return "鏃犳暟鎹墽琛�";
}
- List<ApiInfoData> apiInfoList = apiInfoDataRep.getDataByInteAndData(ApiCodeConstant.API_1023, data.getXzbm());
+ List<ApiInfoData> apiInfoList = apiInfoDataRep.getDataByInteAndData(ApiCodeConstant.API_1023, DateFormatUtils.format(data.getTbrq(), "yyyyMMdd") + data.getXzbm(), data.getKqdm());
data.setCzbz(Constant.CZBZ_D);
apiInfoDataRep.updateStatus(apiInfoList.get(0).getId(), JSON.toJSONString(data), Constant.CZBZ_D);
return null;
@@ -192,7 +157,7 @@
* @return
*/
@Expose
- public String pushData(List<GdApi1023> items) {
+ public String pushData(List<Gd2022Api1023> items) {
ResponseDto responseDto;
String result = "";
@@ -204,7 +169,7 @@
}
//灏佽鍙傛暟
- ApiParam param = new ApiParam(apiConf, "21", ApiCodeConstant.API_1023);
+ ApiParam param = new ApiParam(apiConf, "21", ApiCodeConstant.API_9201);
//鑾峰彇瀹炵幇鎺ュ彛
ApiRemoteService apiService = apiPushManager.getApiRemoteService(param.getPushProtocol());
@@ -212,20 +177,21 @@
return "绯荤粺娌℃湁褰撳墠鎺ㄩ�佸崗璁厤缃紝鎵ц澶辫触";
}
- //鎺ㄩ�侊紝鏁版嵁涓洪泦鍚堝舰寮�
- responseDto = apiService.pushData(param, apiConf, items);
- if (responseDto.getSuccess() == 0) {
- //鎺ㄩ�佹垚鍔燂紝鏇存柊鏁版嵁涓婁紶鐘舵��
-
- ApiInfoData infoData;
- for (GdApi1023 data : items) {
- List<ApiInfoData> apiInfoList = apiInfoDataRep.getDataByInteAndData(ApiCodeConstant.API_1023, data.getXzbm());
- data.setCzbz(Constant.CZBZ_U);
- infoData = apiInfoList.get(0);
- infoData.setUpdateTime(new Date());
- infoData.setCzbz(Constant.CZBZ_U);
- infoData.setData(JSON.toJSONString(data));
- apiInfoDataRep.save(infoData);
+ ApiInfoData infoData;
+ for (Gd2022Api1023 data : items) {
+ //鎺ㄩ�侊紝鏁版嵁涓洪泦鍚堝舰寮�
+ responseDto = apiService.pushData(param, apiConf, data);
+ if (responseDto.getSuccess() == 0) {
+ if (Constant.CZBZ_I.equals(data.getCzbz())) {
+ //鎺ㄩ�佹垚鍔燂紝鏇存柊鏁版嵁涓婁紶鐘舵��
+ List<ApiInfoData> apiInfoList = apiInfoDataRep.getDataByInteAndData(ApiCodeConstant.API_9201, DateFormatUtils.format(data.getTbrq(), "yyyyMMdd") + data.getXzbm(), data.getKqdm());
+ data.setCzbz(Constant.CZBZ_U);
+ infoData = apiInfoList.get(0);
+ infoData.setUpdateTime(new Date());
+ infoData.setCzbz(Constant.CZBZ_U);
+ infoData.setData(JSON.toJSONString(data));
+ apiInfoDataRep.save(infoData);
+ }
}
result += responseDto.toString();
}
--
Gitblit v1.9.3