From ac4532f3b908a0b2ec47f52fd9cad6f2d0fd5d53 Mon Sep 17 00:00:00 2001
From: czt <czt18638530771@163.com>
Date: 星期五, 22 十一月 2024 11:47:57 +0800
Subject: [PATCH] 调整上海定制接口1
---
src/main/java/com/fzzy/otherview/sh2023/pr/SHApi1311PR.java | 100 +++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 86 insertions(+), 14 deletions(-)
diff --git a/src/main/java/com/fzzy/otherview/sh2023/pr/SHApi1311PR.java b/src/main/java/com/fzzy/otherview/sh2023/pr/SHApi1311PR.java
index 45c9c3a..567965d 100644
--- a/src/main/java/com/fzzy/otherview/sh2023/pr/SHApi1311PR.java
+++ b/src/main/java/com/fzzy/otherview/sh2023/pr/SHApi1311PR.java
@@ -19,8 +19,10 @@
import com.fzzy.push.sh2023.SH2023Constant;
import com.fzzy.push.sh2023.dto.SH2023Api1311;
import com.fzzy.push.sh2023.dto.SH2023Api2101;
+import com.fzzy.push.sh2023.dto.SH2023ShareApi1311;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang.time.DateFormatUtils;
+import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.PageRequest;
import org.springframework.data.domain.Pageable;
@@ -37,7 +39,7 @@
import java.util.List;
/**
- * 涓婃捣甯傛帴鍙�-2101 妫�鏂ゅ崟
+ * 涓婃捣甯傛帴鍙�-1311 瑙嗛鐩戞帶鎺ュ彛
*
* @author czt
* @date 2023/8/17
@@ -113,10 +115,11 @@
public void saveData(SH2023Api1311 data) {
ApiInfoData infoData;
- List<ApiInfoData> apiInfoList = apiInfoDataRep.getDataByInteAndData(SH2023Constant.SH_2023_API_CODE_1311, data.getSpjksbid(),data.getKqdm());
+ List<ApiInfoData> apiInfoList = apiInfoDataRep.getDataByInteAndData(SH2023Constant.SH_2023_API_CODE_1311, data.getSpjksbid(), data.getKqdm());
if (apiInfoList.size() != 0) {
infoData = apiInfoList.get(0);
infoData.setData(JSON.toJSONString(data));
+ infoData.setCzbz(data.getCzbz());
} else {
infoData = new ApiInfoData();
infoData.setId(ContextUtil.getUUID());
@@ -137,7 +140,7 @@
*/
@Expose
public void delData(SH2023Api1311 data) {
- List<ApiInfoData> apiInfoList = apiInfoDataRep.getDataByInteAndData(SH2023Constant.SH_2023_API_CODE_1311, data.getSpjksbid(),data.getKqdm());
+ List<ApiInfoData> apiInfoList = apiInfoDataRep.getDataByInteAndData(SH2023Constant.SH_2023_API_CODE_1311, data.getSpjksbid(), data.getKqdm());
apiInfoDataRep.deleteById(apiInfoList.get(0).getId());
}
@@ -149,7 +152,7 @@
if (null == data) {
return "鏃犳暟鎹墽琛�";
}
- List<ApiInfoData> apiInfoList = apiInfoDataRep.getDataByInteAndData(SH2023Constant.SH_2023_API_CODE_1311, data.getSpjksbid(),data.getKqdm());
+ List<ApiInfoData> apiInfoList = apiInfoDataRep.getDataByInteAndData(SH2023Constant.SH_2023_API_CODE_1311, data.getSpjksbid(), data.getKqdm());
data.setCzbz(Constant.CZBZ_D);
apiInfoDataRep.updateStatus(apiInfoList.get(0).getId(), JSON.toJSONString(data), Constant.CZBZ_D);
return null;
@@ -157,11 +160,11 @@
/**
- * sHApi1311PR#delUpdate
+ * sHApi1311PR#delUpdate
*/
@Expose
public String pushData(List<SH2023Api1311> items) {
- ResponseDto responseDto;
+
String result = "";
String kqdm = items.get(0).getKqdm();
@@ -172,7 +175,7 @@
}
//灏佽鍙傛暟
- ApiParam param = new ApiParam(apiConf, "21", SH2023Constant.SH_2023_API_CODE_1311);
+ ApiParam param = new ApiParam(apiConf, "90", Constant.API_CODE_9102);
//鑾峰彇瀹炵幇鎺ュ彛
ApiRemoteService apiService = apiPushManager.getApiRemoteService(param.getPushProtocol());
@@ -180,15 +183,14 @@
return "绯荤粺娌℃湁褰撳墠鎺ㄩ�佸崗璁厤缃紝鎵ц澶辫触";
}
- //鎺ㄩ�侊紝鏁版嵁涓洪泦鍚堝舰寮�
- responseDto = apiService.pushData(param, apiConf, items);
- if (responseDto.getSuccess() == 0) {
- //鎺ㄩ�佹垚鍔燂紝鏇存柊鏁版嵁涓婁紶鐘舵��
- ApiInfoData infoData;
- for (SH2023Api1311 data : items) {
+ ApiInfoData infoData;
+ ResponseDto responseDto;
+ for (SH2023Api1311 data : items) {
+ responseDto = apiService.pushData(param, apiConf, data);
+ if (responseDto.getSuccess() == 0) {
if (Constant.CZBZ_I.equals(data.getCzbz())) {
//鎺ㄩ�佹垚鍔燂紝鏇存柊鏁版嵁涓婁紶鐘舵��
- List<ApiInfoData> apiInfoList = apiInfoDataRep.getDataByInteAndData(SH2023Constant.SH_2023_API_CODE_1311, data.getSpjksbid(),data.getKqdm());
+ List<ApiInfoData> apiInfoList = apiInfoDataRep.getDataByInteAndData(SH2023Constant.SH_2023_API_CODE_1311, data.getSpjksbid(), data.getKqdm());
data.setCzbz(Constant.CZBZ_U);
infoData = apiInfoList.get(0);
infoData.setUpdateTime(new Date());
@@ -202,4 +204,74 @@
return result;
}
+ /**
+ * 鍏变韩鎷夊彇鏁版嵁
+ * sHApi1311PR#pullData
+ *
+ * @return
+ */
+ @Expose
+ public String pullData() {
+
+
+ //鑾峰彇閰嶇疆淇℃伅
+ List<ApiConfs> apiConfs = apiCommonService.listCacheConf();
+ if (null == apiConfs || apiConfs.isEmpty()) {
+ return "绯荤粺娌℃湁鑾峰彇鍒板簱鍖洪厤缃俊鎭紝鎵ц澶辫触";
+ }
+
+ ApiRemoteService apiService;
+ ApiParam param;
+ ResponseDto responseDto;
+ ApiInfoData infoData;
+ String result = "";
+ List<SH2023ShareApi1311> list;
+ SH2023Api1311 sh2023Api1311;
+ List<ApiInfoData> apiInfoDataList;
+ for (ApiConfs apiConf : apiConfs) {
+ apiService = apiPushManager.getApiRemoteService(apiConf.getPushProtocol());
+ if (null == apiService) {
+ continue;
+ }
+ //灏佽鍙傛暟
+ param = new ApiParam(apiConf, "13", SH2023Constant.SH_2023_API_CODE_1311);
+ responseDto = apiService.pullData(param, apiConf);
+
+ if (responseDto.getSuccess() == 0) {
+ list = JSONObject.parseArray(responseDto.getData(), SH2023ShareApi1311.class);
+ if(null != list && list.size() > 0){
+ for (SH2023ShareApi1311 shareData : list) {
+
+ apiInfoDataList = apiInfoDataRep.getDataByDataId(shareData.getSxtbh());
+ if(null == apiInfoDataList || apiInfoDataList.isEmpty()){
+ sh2023Api1311 = new SH2023Api1311();
+ sh2023Api1311.setSpjksbid(shareData.getSxtbh());
+ sh2023Api1311.setCzbz(Constant.CZBZ_I);
+ }else {
+ sh2023Api1311 = JSONObject.parseObject(apiInfoDataList.get(0).getData(), SH2023Api1311.class);
+ sh2023Api1311.setCzbz(apiInfoDataList.get(0).getCzbz());
+ }
+ if(StringUtils.isNotEmpty(shareData.getHwdm())){
+ sh2023Api1311.setHwdm(shareData.getHwdm());
+ }
+ sh2023Api1311.setJksbmc(shareData.getTdmc());
+ infoData = new ApiInfoData();
+ infoData.setId(sh2023Api1311.getSpjksbid());
+ infoData.setKqdm(apiConf.getKqdm());
+ infoData.setInteType("13");
+ infoData.setInteId(SH2023Constant.SH_2023_API_CODE_1311);
+ infoData.setUpdateTime(new Date());
+ infoData.setDataId(sh2023Api1311.getSpjksbid());
+ infoData.setData(JSON.toJSONString(sh2023Api1311));
+ infoData.setCzbz(sh2023Api1311.getCzbz());
+ apiInfoDataRep.save(infoData);
+ }
+ }
+ }
+ result += responseDto.toString();
+ return result;
+ }
+ return null;
+ }
+
}
--
Gitblit v1.9.3