From 7d6d02e3d501a0a5f5cbdff16bf594c77f2fc7cd Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期一, 18 九月 2023 18:58:44 +0800
Subject: [PATCH] 优化上海接口-手动上传时根据协议区分数据是否为集合形式
---
src/main/java/com/fzzy/api/view/pr/Api1304PR.java | 61 +
src/main/java/com/fzzy/api/view/pr/Api1303PR.java | 63 +
src/main/java/com/fzzy/api/view/pr/Api1302PR.java | 63 +
src/main/java/com/fzzy/api/view/pr/Api1305PR.java | 61 +
src/main/java/com/fzzy/api/view/pr/Api1306PR.java | 61 +
src/main/java/com/fzzy/api/view/pr/Api1310PR.java | 62 +
src/main/java/com/fzzy/api/view/pr/Api1109PR.java | 60 +
src/main/java/com/fzzy/api/view/pr/Api1106PR.java | 57 +
src/main/java/com/fzzy/api/view/pr/Api1105PR.java | 55 +
src/main/java/com/fzzy/api/view/pr/Api1107PR.java | 60 +
src/main/java/com/fzzy/api/view/pr/Api1104PR.java | 54
src/main/java/com/fzzy/api/view/pr/Api1108PR.java | 58 +
src/main/java/com/fzzy/api/view/pr/Api1112PR.java | 57 +
src/main/java/com/fzzy/api/view/pr/Api1113PR.java | 213 ++-
src/main/java/com/fzzy/api/view/pr/Api1309PR.java | 60 +
src/main/java/com/fzzy/api/view/pr/Api1111PR.java | 60 +
src/main/java/com/fzzy/api/view/pr/Api1307PR.java | 61 +
src/main/java/com/fzzy/api/view/pr/Api1308PR.java | 61 +
src/main/java/com/fzzy/api/view/pr/Api1301PR.java | 115 +
src/main/java/com/fzzy/api/view/pr/Api1208PR.java | 60 +
src/main/java/com/fzzy/api/view/pr/Api1209PR.java | 59 +
src/main/java/com/fzzy/api/view/pr/Api1110PR.java | 58 +
src/main/java/com/fzzy/api/view/repository/Api1111Rep.java | 6
src/main/java/com/fzzy/api/view/pr/Api1402PR.java | 61 +
src/main/java/com/fzzy/api/view/pr/Api1403PR.java | 49 +
src/main/java/com/fzzy/api/view/pr/Api1102PR.java | 60 +
src/main/java/com/fzzy/api/view/pr/Api1103PR.java | 218 ++-
src/main/java/com/fzzy/api/view/pr/Api1401PR.java | 60 +
src/main/java/com/fzzy/api/view/pr/Api1404PR.java | 58 +
src/main/java/com/fzzy/api/view/pr/Api1405PR.java | 60 +
src/main/java/com/fzzy/api/view/pr/Api1201PR.java | 63 +
src/main/java/com/fzzy/api/view/pr/Api1210PR.java | 60 +
src/main/java/com/fzzy/api/view/pr/Api1501PR.java | 61 +
src/main/java/com/fzzy/api/view/pr/Api1502PR.java | 65 +
src/main/java/com/fzzy/api/view/pr/Api1202PR.java | 87 +
src/main/java/com/fzzy/api/view/pr/Api1503PR.java | 64 +
src/main/java/com/fzzy/api/view/pr/Api1205PR.java | 60 +
src/main/java/com/fzzy/api/view/pr/Api1204PR.java | 57 +
src/main/java/com/fzzy/api/view/pr/Api1206PR.java | 59 +
src/main/java/com/fzzy/api/view/pr/Api1203PR.java | 63 +
src/main/java/com/fzzy/api/view/pr/Api1207PR.java | 60 +
src/main/java/com/fzzy/api/view/pr/Api1211PR.java | 58 +
src/main/java/com/fzzy/api/view/pr/Api1212PR.java | 60 +
43 files changed, 2,368 insertions(+), 540 deletions(-)
diff --git a/src/main/java/com/fzzy/api/view/pr/Api1102PR.java b/src/main/java/com/fzzy/api/view/pr/Api1102PR.java
index 0f60235..5dd0ba1 100644
--- a/src/main/java/com/fzzy/api/view/pr/Api1102PR.java
+++ b/src/main/java/com/fzzy/api/view/pr/Api1102PR.java
@@ -4,6 +4,8 @@
import com.bstek.dorado.annotation.DataResolver;
import com.bstek.dorado.annotation.Expose;
import com.fzzy.api.data.ApiParam;
+import com.fzzy.api.data.PushProtocol;
+import com.fzzy.api.entity.Api1101;
import com.fzzy.api.entity.ApiConfs;
import com.fzzy.api.service.ApiCommonService;
import com.fzzy.api.service.ApiPushManager;
@@ -100,22 +102,37 @@
*/
@Expose
public String pushData(List<Api1102> items) {
- ResponseDto responseDto;
- String result = "";
-
//鑾峰彇閰嶇疆
String kqdm = items.get(0).getKqdm();
ApiConfs apiConf = apiCommonService.getConf(kqdm);
if (null == apiConf) return "绯荤粺娌℃湁鑾峰彇鍒板綋鍓嶅簱鍖洪厤缃俊鎭紝鎵ц澶辫触";
- //灏佽鍙傛暟
- ApiParam param = new ApiParam(apiConf, Constant.API_CATEGORY_11, Constant.API_CODE_1102);
-
//鑾峰彇瀹炵幇鎺ュ彛
- ApiRemoteService apiRemoteService = apiPushManager.getApiRemoteService(param.getPushProtocol());
+ ApiRemoteService apiRemoteService = apiPushManager.getApiRemoteService(apiConf.getPushProtocol());
if (null == apiRemoteService) return "绯荤粺娌℃湁褰撳墠鎺ㄩ�佸崗璁厤缃紝鎵ц澶辫触";
+ //鏍规嵁鐪佷唤鍗忚锛屽垽鏂槸闆嗗悎褰㈠紡涓婃姤杩樻槸鍗曟潯json涓婃姤,涓婃捣2023闆嗗悎褰㈠紡涓婃姤
+ if (PushProtocol.SB_SH_2023.getCode().equals(apiConf.getPushProtocol())) {
+ return pushDataList(items, apiRemoteService, apiConf);
+ }
+ return pushDataSingle(items, apiRemoteService, apiConf);
+ }
+
+ /**
+ * 鍗曟潯鏁版嵁json鎺ㄩ��
+ *
+ * @param items
+ * @param apiRemoteService
+ * @param apiConf
+ * @return
+ */
+ private String pushDataSingle(List<Api1102> items, ApiRemoteService apiRemoteService, ApiConfs apiConf) {
+ ResponseDto responseDto;
+ String result = "";
+
+ //灏佽鍙傛暟
+ ApiParam param = new ApiParam(apiConf, Constant.API_CATEGORY_11, Constant.API_CODE_1102);
Api1102 d;
for (Api1102 data : items) {
d = new Api1102();
@@ -133,4 +150,33 @@
return result;
}
+ /**
+ * 澶氭潯鏁版嵁json鎺ㄩ��
+ *
+ * @param items
+ * @param apiRemoteService
+ * @param apiConf
+ * @return
+ */
+ private String pushDataList(List<Api1102> items, ApiRemoteService apiRemoteService, ApiConfs apiConf) {
+
+ //灏佽鍙傛暟
+ ApiParam param = new ApiParam(apiConf, Constant.API_CATEGORY_11, Constant.API_CODE_1102);
+
+ //鎺ㄩ�侊紝鏁版嵁涓洪泦鍚堝舰寮�
+ ResponseDto responseDto = apiRemoteService.pushData(param, apiConf, items);
+ if (responseDto.getSuccess() == 0) {
+ //鎺ㄩ�佹垚鍔燂紝鏇存柊鏁版嵁涓婁紶鐘舵��
+ for (Api1102 data : items) {
+ if (Constant.CZBZ_I.equals(data.getCzbz())) {
+ //鏇存柊鐘舵��
+ api1102Rep.updateStatus(data.getKqdm(), Constant.CZBZ_U);
+ }
+ }
+ }
+
+
+ return responseDto.toString();
+ }
+
}
diff --git a/src/main/java/com/fzzy/api/view/pr/Api1103PR.java b/src/main/java/com/fzzy/api/view/pr/Api1103PR.java
index 8669930..53c942b 100644
--- a/src/main/java/com/fzzy/api/view/pr/Api1103PR.java
+++ b/src/main/java/com/fzzy/api/view/pr/Api1103PR.java
@@ -4,6 +4,7 @@
import com.bstek.dorado.annotation.DataResolver;
import com.bstek.dorado.annotation.Expose;
import com.fzzy.api.data.ApiParam;
+import com.fzzy.api.data.PushProtocol;
import com.fzzy.api.entity.Api1103;
import com.fzzy.api.entity.ApiConfs;
import com.fzzy.api.service.ApiCommonService;
@@ -20,117 +21,160 @@
/**
* 浠撴埧淇℃伅
+ *
* @author he
*/
@Component
public class Api1103PR {
- @Autowired
- private Api1103Rep api1103Rep;
+ @Autowired
+ private Api1103Rep api1103Rep;
- @Autowired
- private ApiCommonService apiCommonService;
+ @Autowired
+ private ApiCommonService apiCommonService;
- @Autowired
- private ApiPushManager apiPushManager;
+ @Autowired
+ private ApiPushManager apiPushManager;
- /**
- * api1103PR#listAll
- *
- * @return
- */
- @DataProvider
- public List<Api1103> listAll() {
- return api1103Rep.findAll();
- }
+ /**
+ * api1103PR#listAll
+ *
+ * @return
+ */
+ @DataProvider
+ public List<Api1103> listAll() {
+ return api1103Rep.findAll();
+ }
- /**
- * api1103PR#updateSave
- *
- * @param entity
- */
- @DataResolver
- public void updateSave(Api1103 entity) {
+ /**
+ * api1103PR#updateSave
+ *
+ * @param entity
+ */
+ @DataResolver
+ public void updateSave(Api1103 entity) {
- // 鎵嬪姩灏哾oradoEntity瀵硅薄杞崲涓烘爣鍑咮ean瀵硅薄
- Api1103 data = new Api1103();
- BeanUtils.copyProperties(entity, data);
- data.setCfdm(data.getCfdm().trim());
- api1103Rep.save(data);
+ // 鎵嬪姩灏哾oradoEntity瀵硅薄杞崲涓烘爣鍑咮ean瀵硅薄
+ Api1103 data = new Api1103();
+ BeanUtils.copyProperties(entity, data);
+ data.setCfdm(data.getCfdm().trim());
+ api1103Rep.save(data);
- //鍒锋柊缂撳瓨
- apiCommonService.flushApi1103Cache(listAll());
- }
+ //鍒锋柊缂撳瓨
+ apiCommonService.flushApi1103Cache(listAll());
+ }
- /**
- * api1103PR#delData
- *
- * @param data
- */
- @Expose
- public String delData(Api1103 data) {
+ /**
+ * api1103PR#delData
+ *
+ * @param data
+ */
+ @Expose
+ public String delData(Api1103 data) {
- api1103Rep.deleteById(data.getCfdm());
+ api1103Rep.deleteById(data.getCfdm());
- return null;
- }
+ return null;
+ }
- /**
- *
- * 鏇存柊鍒犻櫎鏍囪 api1103PR#delUpdate
- *
- * @param entity
- */
- @Expose
- public String delUpdate(Api1103 entity) {
+ /**
+ * 鏇存柊鍒犻櫎鏍囪 api1103PR#delUpdate
+ *
+ * @param entity
+ */
+ @Expose
+ public String delUpdate(Api1103 entity) {
- entity.setCzbz(Constant.CZBZ_D);
+ entity.setCzbz(Constant.CZBZ_D);
- Api1103 data = new Api1103();
- BeanUtils.copyProperties(entity, data);
+ Api1103 data = new Api1103();
+ BeanUtils.copyProperties(entity, data);
- api1103Rep.save(data);
- return null;
- }
+ api1103Rep.save(data);
+ return null;
+ }
- /**
- * api1103PR#pushData
- *
- * @param items
- */
- @Expose
- public String pushData(List<Api1103> items) {
- ResponseDto responseDto;
- String result = "";
+ /**
+ * api1103PR#pushData
+ *
+ * @param items
+ */
+ @Expose
+ public String pushData(List<Api1103> items) {
- //鑾峰彇閰嶇疆
- String kqdm = items.get(0).getKqdm();
- ApiConfs apiConf = apiCommonService.getConf(kqdm);
+ //鑾峰彇閰嶇疆
+ String kqdm = items.get(0).getKqdm();
+ ApiConfs apiConf = apiCommonService.getConf(kqdm);
- if (null == apiConf) return "绯荤粺娌℃湁鑾峰彇鍒板綋鍓嶅簱鍖洪厤缃俊鎭紝鎵ц澶辫触";
+ if (null == apiConf) return "绯荤粺娌℃湁鑾峰彇鍒板綋鍓嶅簱鍖洪厤缃俊鎭紝鎵ц澶辫触";
- //灏佽鍙傛暟
- ApiParam param = new ApiParam(apiConf, Constant.API_CATEGORY_11, Constant.API_CODE_1103);
+ //鑾峰彇瀹炵幇鎺ュ彛
+ ApiRemoteService apiRemoteService = apiPushManager.getApiRemoteService(apiConf.getPushProtocol());
+ if (null == apiRemoteService) return "绯荤粺娌℃湁褰撳墠鎺ㄩ�佸崗璁厤缃紝鎵ц澶辫触";
- //鑾峰彇瀹炵幇鎺ュ彛
- ApiRemoteService apiRemoteService = apiPushManager.getApiRemoteService(param.getPushProtocol());
- if (null == apiRemoteService) return "绯荤粺娌℃湁褰撳墠鎺ㄩ�佸崗璁厤缃紝鎵ц澶辫触";
+ if (PushProtocol.SB_SH_2023.getCode().equals(apiConf.getPushProtocol())) {
+ return pushDataList(items, apiRemoteService, apiConf);
+ }
+ return pushDataSingle(items, apiRemoteService, apiConf);
+ }
- Api1103 d;
- for (Api1103 data : items) {
- d = new Api1103();
- BeanUtils.copyProperties(data, d);
- param.setBizId(data.getBizId());
- responseDto = apiRemoteService.pushData(param, apiConf, d);
+ /**
+ * 鍗曟潯鏁版嵁json鎺ㄩ��
+ *
+ * @param items
+ * @param apiRemoteService
+ * @param apiConf
+ * @return
+ */
+ private String pushDataSingle(List<Api1103> items, ApiRemoteService apiRemoteService, ApiConfs apiConf) {
+ ResponseDto responseDto;
+ String result = "";
- result += responseDto.toString();
- if (responseDto.getSuccess() == 0) {
- if (Constant.CZBZ_I.equals(d.getCzbz())) {
- api1103Rep.updateStatus(data.getCfdm(), Constant.CZBZ_U);
- }
- }
- }
- return result;
- }
+ //灏佽鍙傛暟
+ ApiParam param = new ApiParam(apiConf, Constant.API_CATEGORY_11, Constant.API_CODE_1103);
+ Api1103 d;
+ for (Api1103 data : items) {
+ d = new Api1103();
+ BeanUtils.copyProperties(data, d);
+ param.setBizId(data.getBizId());
+ responseDto = apiRemoteService.pushData(param, apiConf, d);
+
+ result += responseDto.toString();
+ if (responseDto.getSuccess() == 0) {
+ if (Constant.CZBZ_I.equals(d.getCzbz())) {
+ api1103Rep.updateStatus(data.getCfdm(), Constant.CZBZ_U);
+ }
+ }
+ }
+ return result;
+ }
+
+ /**
+ * 澶氭潯鏁版嵁json鎺ㄩ��
+ *
+ * @param items
+ * @param apiRemoteService
+ * @param apiConf
+ * @return
+ */
+ private String pushDataList(List<Api1103> items, ApiRemoteService apiRemoteService, ApiConfs apiConf) {
+
+ //灏佽鍙傛暟
+ ApiParam param = new ApiParam(apiConf, Constant.API_CATEGORY_11, Constant.API_CODE_1102);
+
+ //鎺ㄩ�侊紝鏁版嵁涓洪泦鍚堝舰寮�
+ ResponseDto responseDto = apiRemoteService.pushData(param, apiConf, items);
+ if (responseDto.getSuccess() == 0) {
+ //鎺ㄩ�佹垚鍔燂紝鏇存柊鏁版嵁涓婁紶鐘舵��
+ for (Api1103 data : items) {
+ if (Constant.CZBZ_I.equals(data.getCzbz())) {
+ //鏇存柊鐘舵��
+ api1103Rep.updateStatus(data.getCfdm(), Constant.CZBZ_U);
+ }
+ }
+ }
+ return responseDto.toString();
+ }
+
}
diff --git a/src/main/java/com/fzzy/api/view/pr/Api1104PR.java b/src/main/java/com/fzzy/api/view/pr/Api1104PR.java
index 230fe33..25a1f25 100644
--- a/src/main/java/com/fzzy/api/view/pr/Api1104PR.java
+++ b/src/main/java/com/fzzy/api/view/pr/Api1104PR.java
@@ -4,6 +4,7 @@
import com.bstek.dorado.annotation.DataResolver;
import com.bstek.dorado.annotation.Expose;
import com.fzzy.api.data.ApiParam;
+import com.fzzy.api.data.PushProtocol;
import com.fzzy.api.entity.ApiConfs;
import com.fzzy.api.service.ApiCommonService;
import com.fzzy.api.service.ApiPushManager;
@@ -101,8 +102,6 @@
*/
@Expose
public String pushData(List<Api1104> items) {
- ResponseDto responseDto;
- String result = "";
//鑾峰彇閰嶇疆
String kqdm = items.get(0).getKqdm();
@@ -110,13 +109,30 @@
if (null == apiConf) return "绯荤粺娌℃湁鑾峰彇鍒板綋鍓嶅簱鍖洪厤缃俊鎭紝鎵ц澶辫触";
- //灏佽鍙傛暟
- ApiParam param = new ApiParam(apiConf, Constant.API_CATEGORY_11, Constant.API_CODE_1104);
-
//鑾峰彇瀹炵幇鎺ュ彛
- ApiRemoteService apiRemoteService = apiPushManager.getApiRemoteService(param.getPushProtocol());
+ ApiRemoteService apiRemoteService = apiPushManager.getApiRemoteService(apiConf.getPushProtocol());
if (null == apiRemoteService) return "绯荤粺娌℃湁褰撳墠鎺ㄩ�佸崗璁厤缃紝鎵ц澶辫触";
+ if (PushProtocol.SB_SH_2023.getCode().equals(apiConf.getPushProtocol())) {
+ return pushDataList(items, apiRemoteService, apiConf);
+ }
+ return pushDataSingle(items, apiRemoteService, apiConf);
+ }
+
+ /**
+ * 鍗曟潯鏁版嵁json鎺ㄩ��
+ *
+ * @param items
+ * @param apiRemoteService
+ * @param apiConf
+ * @return
+ */
+ private String pushDataSingle(List<Api1104> items, ApiRemoteService apiRemoteService, ApiConfs apiConf) {
+ ResponseDto responseDto;
+ String result = "";
+
+ //灏佽鍙傛暟
+ ApiParam param = new ApiParam(apiConf, Constant.API_CATEGORY_11, Constant.API_CODE_1104);
Api1104 d;
for (Api1104 data : items) {
d = new Api1104();
@@ -134,4 +150,30 @@
return result;
}
+ /**
+ * 澶氭潯鏁版嵁json鎺ㄩ��
+ *
+ * @param items
+ * @param apiRemoteService
+ * @param apiConf
+ * @return
+ */
+ private String pushDataList(List<Api1104> items, ApiRemoteService apiRemoteService, ApiConfs apiConf) {
+
+ //灏佽鍙傛暟
+ ApiParam param = new ApiParam(apiConf, Constant.API_CATEGORY_11, Constant.API_CODE_1104);
+
+ //鎺ㄩ�侊紝鏁版嵁涓洪泦鍚堝舰寮�
+ ResponseDto responseDto = apiRemoteService.pushData(param, apiConf, items);
+ if (responseDto.getSuccess() == 0) {
+ //鎺ㄩ�佹垚鍔燂紝鏇存柊鏁版嵁涓婁紶鐘舵��
+ for (Api1104 data : items) {
+ if (Constant.CZBZ_I.equals(data.getCzbz())) {
+ //鏇存柊鐘舵��
+ api1104Rep.updateStatus(data.getAjdh(), Constant.CZBZ_U);
+ }
+ }
+ }
+ return responseDto.toString();
+ }
}
diff --git a/src/main/java/com/fzzy/api/view/pr/Api1105PR.java b/src/main/java/com/fzzy/api/view/pr/Api1105PR.java
index 9e68d44..e49698a 100644
--- a/src/main/java/com/fzzy/api/view/pr/Api1105PR.java
+++ b/src/main/java/com/fzzy/api/view/pr/Api1105PR.java
@@ -4,6 +4,7 @@
import com.bstek.dorado.annotation.DataResolver;
import com.bstek.dorado.annotation.Expose;
import com.fzzy.api.data.ApiParam;
+import com.fzzy.api.data.PushProtocol;
import com.fzzy.api.entity.ApiConfs;
import com.fzzy.api.service.ApiPushManager;
import com.fzzy.api.service.ApiRemoteService;
@@ -103,8 +104,6 @@
*/
@Expose
public String pushData(List<Api1105> items) {
- ResponseDto responseDto;
- String result = "";
//鑾峰彇閰嶇疆
String kqdm = items.get(0).getKqdm();
@@ -112,13 +111,30 @@
if (null == apiConf) return "绯荤粺娌℃湁鑾峰彇鍒板綋鍓嶅簱鍖洪厤缃俊鎭紝鎵ц澶辫触";
- //灏佽鍙傛暟
- ApiParam param = new ApiParam(apiConf, Constant.API_CATEGORY_11, Constant.API_CODE_1105);
-
//鑾峰彇瀹炵幇鎺ュ彛
- ApiRemoteService apiRemoteService = apiPushManager.getApiRemoteService(param.getPushProtocol());
+ ApiRemoteService apiRemoteService = apiPushManager.getApiRemoteService(apiConf.getPushProtocol());
if (null == apiRemoteService) return "绯荤粺娌℃湁褰撳墠鎺ㄩ�佸崗璁厤缃紝鎵ц澶辫触";
+ if (PushProtocol.SB_SH_2023.getCode().equals(apiConf.getPushProtocol())){
+ return pushDataList(items,apiRemoteService,apiConf);
+ }
+ return pushDataSingle(items,apiRemoteService,apiConf);
+ }
+
+ /**
+ * 鍗曟潯鏁版嵁json鎺ㄩ��
+ *
+ * @param items
+ * @param apiRemoteService
+ * @param apiConf
+ * @return
+ */
+ private String pushDataSingle(List<Api1105> items, ApiRemoteService apiRemoteService, ApiConfs apiConf) {
+ ResponseDto responseDto;
+ String result = "";
+
+ //灏佽鍙傛暟
+ ApiParam param = new ApiParam(apiConf, Constant.API_CATEGORY_11, Constant.API_CODE_1105);
Api1105 d;
for (Api1105 data : items) {
d = new Api1105();
@@ -135,4 +151,31 @@
}
return result;
}
+
+ /**
+ * 澶氭潯鏁版嵁json鎺ㄩ��
+ *
+ * @param items
+ * @param apiRemoteService
+ * @param apiConf
+ * @return
+ */
+ private String pushDataList(List<Api1105> items, ApiRemoteService apiRemoteService, ApiConfs apiConf) {
+
+ //灏佽鍙傛暟
+ ApiParam param = new ApiParam(apiConf, Constant.API_CATEGORY_11, Constant.API_CODE_1105);
+
+ //鎺ㄩ�侊紝鏁版嵁涓洪泦鍚堝舰寮�
+ ResponseDto responseDto = apiRemoteService.pushData(param, apiConf, items);
+ if (responseDto.getSuccess() == 0) {
+ //鎺ㄩ�佹垚鍔燂紝鏇存柊鏁版嵁涓婁紶鐘舵��
+ for (Api1105 data : items) {
+ if (Constant.CZBZ_I.equals(data.getCzbz())) {
+ //鏇存柊鐘舵��
+ api1105Rep.updateStatus(data.getHwdm(), Constant.CZBZ_U);
+ }
+ }
+ }
+ return responseDto.toString();
+ }
}
diff --git a/src/main/java/com/fzzy/api/view/pr/Api1106PR.java b/src/main/java/com/fzzy/api/view/pr/Api1106PR.java
index 6966815..c64f895 100644
--- a/src/main/java/com/fzzy/api/view/pr/Api1106PR.java
+++ b/src/main/java/com/fzzy/api/view/pr/Api1106PR.java
@@ -4,6 +4,7 @@
import com.bstek.dorado.annotation.DataResolver;
import com.bstek.dorado.annotation.Expose;
import com.fzzy.api.data.ApiParam;
+import com.fzzy.api.data.PushProtocol;
import com.fzzy.api.entity.ApiConfs;
import com.fzzy.api.service.ApiCommonService;
import com.fzzy.api.service.ApiPushManager;
@@ -98,9 +99,6 @@
*/
@Expose
public String pushData(List<Api1106> items) {
- ResponseDto responseDto;
- String result = "";
- Api1106 d;
//鑾峰彇閰嶇疆
String kqdm = items.get(0).getKqdm();
@@ -108,14 +106,32 @@
if (null == apiConf) return "绯荤粺娌℃湁鑾峰彇鍒板綋鍓嶅簱鍖洪厤缃俊鎭紝鎵ц澶辫触";
- //灏佽鍙傛暟
- ApiParam param = new ApiParam(apiConf, Constant.API_CATEGORY_11, Constant.API_CODE_1106);
-
//鑾峰彇瀹炵幇鎺ュ彛
- ApiRemoteService apiRemoteService = apiPushManager.getApiRemoteService(param.getPushProtocol());
+ ApiRemoteService apiRemoteService = apiPushManager.getApiRemoteService(apiConf.getPushProtocol());
if (null == apiRemoteService) return "绯荤粺娌℃湁褰撳墠鎺ㄩ�佸崗璁厤缃紝鎵ц澶辫触";
+ if (PushProtocol.SB_SH_2023.getCode().equals(apiConf.getPushProtocol())){
+ return pushDataList(items,apiRemoteService,apiConf);
+ }
+ return pushDataSingle(items,apiRemoteService,apiConf);
+ }
+
+ /**
+ * 鍗曟潯鏁版嵁json鎺ㄩ��
+ *
+ * @param items
+ * @param apiRemoteService
+ * @param apiConf
+ * @return
+ */
+ private String pushDataSingle(List<Api1106> items, ApiRemoteService apiRemoteService, ApiConfs apiConf) {
+ ResponseDto responseDto;
+ String result = "";
+
+ //灏佽鍙傛暟
+ ApiParam param = new ApiParam(apiConf, Constant.API_CATEGORY_11, Constant.API_CODE_1106);
+ Api1106 d;
for (Api1106 data : items) {
d = new Api1106();
BeanUtils.copyProperties(data, d);
@@ -132,4 +148,31 @@
return result;
}
+ /**
+ * 澶氭潯鏁版嵁json鎺ㄩ��
+ *
+ * @param items
+ * @param apiRemoteService
+ * @param apiConf
+ * @return
+ */
+ private String pushDataList(List<Api1106> items, ApiRemoteService apiRemoteService, ApiConfs apiConf) {
+
+ //灏佽鍙傛暟
+ ApiParam param = new ApiParam(apiConf, Constant.API_CATEGORY_11, Constant.API_CODE_1106);
+
+ //鎺ㄩ�侊紝鏁版嵁涓洪泦鍚堝舰寮�
+ ResponseDto responseDto = apiRemoteService.pushData(param, apiConf, items);
+ if (responseDto.getSuccess() == 0) {
+ //鎺ㄩ�佹垚鍔燂紝鏇存柊鏁版嵁涓婁紶鐘舵��
+ for (Api1106 data : items) {
+ if (Constant.CZBZ_I.equals(data.getCzbz())) {
+ //鏇存柊鐘舵��
+ api1106Rep.updateStatus(data.getKqdm(), Constant.CZBZ_U);
+ }
+ }
+ }
+ return responseDto.toString();
+ }
+
}
diff --git a/src/main/java/com/fzzy/api/view/pr/Api1107PR.java b/src/main/java/com/fzzy/api/view/pr/Api1107PR.java
index 592b31a..ff2db80 100644
--- a/src/main/java/com/fzzy/api/view/pr/Api1107PR.java
+++ b/src/main/java/com/fzzy/api/view/pr/Api1107PR.java
@@ -4,6 +4,7 @@
import com.bstek.dorado.annotation.DataResolver;
import com.bstek.dorado.annotation.Expose;
import com.fzzy.api.data.ApiParam;
+import com.fzzy.api.data.PushProtocol;
import com.fzzy.api.entity.ApiConfs;
import com.fzzy.api.service.ApiCommonService;
import com.fzzy.api.service.ApiPushManager;
@@ -75,7 +76,7 @@
}
/**
- *
+ *
* 鏇存柊鍒犻櫎鏍囪 api1107PR#delUpdate
*
* @param entity
@@ -99,23 +100,37 @@
*/
@Expose
public String pushData(List<Api1107> items) {
- ResponseDto responseDto;
- String result = "";
- Api1107 d;
-
//鑾峰彇閰嶇疆
String kqdm = items.get(0).getKqdm();
ApiConfs apiConf = apiCommonService.getConf(kqdm);
if (null == apiConf) return "绯荤粺娌℃湁鑾峰彇鍒板綋鍓嶅簱鍖洪厤缃俊鎭紝鎵ц澶辫触";
- //灏佽鍙傛暟
- ApiParam param = new ApiParam(apiConf, Constant.API_CATEGORY_11, Constant.API_CODE_1107);
-
//鑾峰彇瀹炵幇鎺ュ彛
- ApiRemoteService apiRemoteService = apiPushManager.getApiRemoteService(param.getPushProtocol());
+ ApiRemoteService apiRemoteService = apiPushManager.getApiRemoteService(apiConf.getPushProtocol());
if (null == apiRemoteService) return "绯荤粺娌℃湁褰撳墠鎺ㄩ�佸崗璁厤缃紝鎵ц澶辫触";
+ if (PushProtocol.SB_SH_2023.getCode().equals(apiConf.getPushProtocol())){
+ return pushDataList(items,apiRemoteService,apiConf);
+ }
+ return pushDataSingle(items,apiRemoteService,apiConf);
+ }
+
+ /**
+ * 鍗曟潯鏁版嵁json鎺ㄩ��
+ *
+ * @param items
+ * @param apiRemoteService
+ * @param apiConf
+ * @return
+ */
+ private String pushDataSingle(List<Api1107> items, ApiRemoteService apiRemoteService, ApiConfs apiConf) {
+ ResponseDto responseDto;
+ String result = "";
+
+ //灏佽鍙傛暟
+ ApiParam param = new ApiParam(apiConf, Constant.API_CATEGORY_11, Constant.API_CODE_1107);
+ Api1107 d;
for (Api1107 data : items) {
d = new Api1107();
BeanUtils.copyProperties(data, d);
@@ -132,4 +147,31 @@
return result;
}
+ /**
+ * 澶氭潯鏁版嵁json鎺ㄩ��
+ *
+ * @param items
+ * @param apiRemoteService
+ * @param apiConf
+ * @return
+ */
+ private String pushDataList(List<Api1107> items, ApiRemoteService apiRemoteService, ApiConfs apiConf) {
+
+ //灏佽鍙傛暟
+ ApiParam param = new ApiParam(apiConf, Constant.API_CATEGORY_11, Constant.API_CODE_1107);
+
+ //鎺ㄩ�侊紝鏁版嵁涓洪泦鍚堝舰寮�
+ ResponseDto responseDto = apiRemoteService.pushData(param, apiConf, items);
+ if (responseDto.getSuccess() == 0) {
+ //鎺ㄩ�佹垚鍔燂紝鏇存柊鏁版嵁涓婁紶鐘舵��
+ for (Api1107 data : items) {
+ if (Constant.CZBZ_I.equals(data.getCzbz())) {
+ //鏇存柊鐘舵��
+ api1107Rep.updateStatus(data.getBizId(), Constant.CZBZ_U);
+ }
+ }
+ }
+ return responseDto.toString();
+ }
+
}
diff --git a/src/main/java/com/fzzy/api/view/pr/Api1108PR.java b/src/main/java/com/fzzy/api/view/pr/Api1108PR.java
index 30fd443..07f0d0d 100644
--- a/src/main/java/com/fzzy/api/view/pr/Api1108PR.java
+++ b/src/main/java/com/fzzy/api/view/pr/Api1108PR.java
@@ -4,6 +4,7 @@
import com.bstek.dorado.annotation.DataResolver;
import com.bstek.dorado.annotation.Expose;
import com.fzzy.api.data.ApiParam;
+import com.fzzy.api.data.PushProtocol;
import com.fzzy.api.entity.ApiConfs;
import com.fzzy.api.service.ApiCommonService;
import com.fzzy.api.service.ApiPushManager;
@@ -97,22 +98,38 @@
*/
@Expose
public String pushData(List<Api1108> items) {
- ResponseDto responseDto;
- String result = "";
- Api1108 d;
+
//鑾峰彇閰嶇疆
String kqdm = items.get(0).getKqdm();
ApiConfs apiConf = apiCommonService.getConf(kqdm);
if (null == apiConf) return "绯荤粺娌℃湁鑾峰彇鍒板綋鍓嶅簱鍖洪厤缃俊鎭紝鎵ц澶辫触";
- //灏佽鍙傛暟
- ApiParam param = new ApiParam(apiConf, Constant.API_CATEGORY_11, Constant.API_CODE_1108);
-
//鑾峰彇瀹炵幇鎺ュ彛
- ApiRemoteService apiRemoteService = apiPushManager.getApiRemoteService(param.getPushProtocol());
+ ApiRemoteService apiRemoteService = apiPushManager.getApiRemoteService(apiConf.getPushProtocol());
if (null == apiRemoteService) return "绯荤粺娌℃湁褰撳墠鎺ㄩ�佸崗璁厤缃紝鎵ц澶辫触";
+ if (PushProtocol.SB_SH_2023.getCode().equals(apiConf.getPushProtocol())){
+ return pushDataList(items,apiRemoteService,apiConf);
+ }
+ return pushDataSingle(items,apiRemoteService,apiConf);
+ }
+
+ /**
+ * 鍗曟潯鏁版嵁json鎺ㄩ��
+ *
+ * @param items
+ * @param apiRemoteService
+ * @param apiConf
+ * @return
+ */
+ private String pushDataSingle(List<Api1108> items, ApiRemoteService apiRemoteService, ApiConfs apiConf) {
+ ResponseDto responseDto;
+ String result = "";
+
+ //灏佽鍙傛暟
+ ApiParam param = new ApiParam(apiConf, Constant.API_CATEGORY_11, Constant.API_CODE_1108);
+ Api1108 d;
for (Api1108 data : items) {
d = new Api1108();
BeanUtils.copyProperties(data, d);
@@ -129,4 +146,31 @@
return result;
}
+ /**
+ * 澶氭潯鏁版嵁json鎺ㄩ��
+ *
+ * @param items
+ * @param apiRemoteService
+ * @param apiConf
+ * @return
+ */
+ private String pushDataList(List<Api1108> items, ApiRemoteService apiRemoteService, ApiConfs apiConf) {
+
+ //灏佽鍙傛暟
+ ApiParam param = new ApiParam(apiConf, Constant.API_CATEGORY_11, Constant.API_CODE_1108);
+
+ //鎺ㄩ�侊紝鏁版嵁涓洪泦鍚堝舰寮�
+ ResponseDto responseDto = apiRemoteService.pushData(param, apiConf, items);
+ if (responseDto.getSuccess() == 0) {
+ //鎺ㄩ�佹垚鍔燂紝鏇存柊鏁版嵁涓婁紶鐘舵��
+ for (Api1108 data : items) {
+ if (Constant.CZBZ_I.equals(data.getCzbz())) {
+ //鏇存柊鐘舵��
+ api1108Rep.updateStatus(data.getKqdm(), Constant.CZBZ_U);
+ }
+ }
+ }
+ return responseDto.toString();
+ }
+
}
diff --git a/src/main/java/com/fzzy/api/view/pr/Api1109PR.java b/src/main/java/com/fzzy/api/view/pr/Api1109PR.java
index 404ba5c..f9d4348 100644
--- a/src/main/java/com/fzzy/api/view/pr/Api1109PR.java
+++ b/src/main/java/com/fzzy/api/view/pr/Api1109PR.java
@@ -5,6 +5,7 @@
import com.bstek.dorado.annotation.Expose;
import com.bstek.dorado.data.provider.Page;
import com.fzzy.api.data.ApiParam;
+import com.fzzy.api.data.PushProtocol;
import com.fzzy.api.service.ApiCommonService;
import com.fzzy.api.service.ApiPushManager;
import com.fzzy.api.service.ApiRemoteService;
@@ -136,7 +137,7 @@
}
/**
- *
+ *
* 鏇存柊鍒犻櫎鏍囪 api1109PR#delUpdate
*
* @param entity
@@ -160,22 +161,38 @@
*/
@Expose
public String pushData(List<Api1109> items) {
- ResponseDto responseDto;
- String result = "";
- Api1109 d;
+
//鑾峰彇閰嶇疆
String kqdm = items.get(0).getKqdm();
ApiConfs apiConf = apiCommonService.getConf(kqdm);
if (null == apiConf) return "绯荤粺娌℃湁鑾峰彇鍒板綋鍓嶅簱鍖洪厤缃俊鎭紝鎵ц澶辫触";
- //灏佽鍙傛暟
- ApiParam param = new ApiParam(apiConf, Constant.API_CATEGORY_11, Constant.API_CODE_1109);
-
//鑾峰彇瀹炵幇鎺ュ彛
- ApiRemoteService apiRemoteService = apiPushManager.getApiRemoteService(param.getPushProtocol());
+ ApiRemoteService apiRemoteService = apiPushManager.getApiRemoteService(apiConf.getPushProtocol());
if (null == apiRemoteService) return "绯荤粺娌℃湁褰撳墠鎺ㄩ�佸崗璁厤缃紝鎵ц澶辫触";
+ if (PushProtocol.SB_SH_2023.getCode().equals(apiConf.getPushProtocol())){
+ return pushDataList(items,apiRemoteService,apiConf);
+ }
+ return pushDataSingle(items,apiRemoteService,apiConf);
+ }
+
+ /**
+ * 鍗曟潯鏁版嵁json鎺ㄩ��
+ *
+ * @param items
+ * @param apiRemoteService
+ * @param apiConf
+ * @return
+ */
+ private String pushDataSingle(List<Api1109> items, ApiRemoteService apiRemoteService, ApiConfs apiConf) {
+ ResponseDto responseDto;
+ String result = "";
+
+ //灏佽鍙傛暟
+ ApiParam param = new ApiParam(apiConf, Constant.API_CATEGORY_11, Constant.API_CODE_1109);
+ Api1109 d;
for (Api1109 data : items) {
d = new Api1109();
BeanUtils.copyProperties(data, d);
@@ -192,6 +209,33 @@
return result;
}
+ /**
+ * 澶氭潯鏁版嵁json鎺ㄩ��
+ *
+ * @param items
+ * @param apiRemoteService
+ * @param apiConf
+ * @return
+ */
+ private String pushDataList(List<Api1109> items, ApiRemoteService apiRemoteService, ApiConfs apiConf) {
+
+ //灏佽鍙傛暟
+ ApiParam param = new ApiParam(apiConf, Constant.API_CATEGORY_11, Constant.API_CODE_1109);
+
+ //鎺ㄩ�侊紝鏁版嵁涓洪泦鍚堝舰寮�
+ ResponseDto responseDto = apiRemoteService.pushData(param, apiConf, items);
+ if (responseDto.getSuccess() == 0) {
+ //鎺ㄩ�佹垚鍔燂紝鏇存柊鏁版嵁涓婁紶鐘舵��
+ for (Api1109 data : items) {
+ if (Constant.CZBZ_I.equals(data.getCzbz())) {
+ //鏇存柊鐘舵��
+ api1109Rep.updateStatus(data.getId(), Constant.CZBZ_U);
+ }
+ }
+ }
+ return responseDto.toString();
+ }
+
/**
* imgFile 鍥剧墖鏈湴瀛樺偍璺緞
diff --git a/src/main/java/com/fzzy/api/view/pr/Api1110PR.java b/src/main/java/com/fzzy/api/view/pr/Api1110PR.java
index 83dd31a..1d869a3 100644
--- a/src/main/java/com/fzzy/api/view/pr/Api1110PR.java
+++ b/src/main/java/com/fzzy/api/view/pr/Api1110PR.java
@@ -4,6 +4,7 @@
import com.bstek.dorado.annotation.DataResolver;
import com.bstek.dorado.annotation.Expose;
import com.fzzy.api.data.ApiParam;
+import com.fzzy.api.data.PushProtocol;
import com.fzzy.api.entity.ApiConfs;
import com.fzzy.api.service.ApiCommonService;
import com.fzzy.api.service.ApiPushManager;
@@ -97,22 +98,38 @@
*/
@Expose
public String pushData(List<Api1110> items) {
- ResponseDto responseDto;
- String result = "";
- Api1110 d;
+
//鑾峰彇閰嶇疆
String kqdm = items.get(0).getKqdm();
ApiConfs apiConf = apiCommonService.getConf(kqdm);
if (null == apiConf) return "绯荤粺娌℃湁鑾峰彇鍒板綋鍓嶅簱鍖洪厤缃俊鎭紝鎵ц澶辫触";
- //灏佽鍙傛暟
- ApiParam param = new ApiParam(apiConf, Constant.API_CATEGORY_11, Constant.API_CODE_1110);
-
//鑾峰彇瀹炵幇鎺ュ彛
- ApiRemoteService apiRemoteService = apiPushManager.getApiRemoteService(param.getPushProtocol());
+ ApiRemoteService apiRemoteService = apiPushManager.getApiRemoteService(apiConf.getPushProtocol());
if (null == apiRemoteService) return "绯荤粺娌℃湁褰撳墠鎺ㄩ�佸崗璁厤缃紝鎵ц澶辫触";
+ if (PushProtocol.SB_SH_2023.getCode().equals(apiConf.getPushProtocol())){
+ return pushDataList(items,apiRemoteService,apiConf);
+ }
+ return pushDataSingle(items,apiRemoteService,apiConf);
+ }
+
+ /**
+ * 鍗曟潯鏁版嵁json鎺ㄩ��
+ *
+ * @param items
+ * @param apiRemoteService
+ * @param apiConf
+ * @return
+ */
+ private String pushDataSingle(List<Api1110> items, ApiRemoteService apiRemoteService, ApiConfs apiConf) {
+ ResponseDto responseDto;
+ String result = "";
+
+ //灏佽鍙傛暟
+ ApiParam param = new ApiParam(apiConf, Constant.API_CATEGORY_11, Constant.API_CODE_1110);
+ Api1110 d;
for (Api1110 data : items) {
d = new Api1110();
BeanUtils.copyProperties(data, d);
@@ -129,4 +146,31 @@
return result;
}
+ /**
+ * 澶氭潯鏁版嵁json鎺ㄩ��
+ *
+ * @param items
+ * @param apiRemoteService
+ * @param apiConf
+ * @return
+ */
+ private String pushDataList(List<Api1110> items, ApiRemoteService apiRemoteService, ApiConfs apiConf) {
+
+ //灏佽鍙傛暟
+ ApiParam param = new ApiParam(apiConf, Constant.API_CATEGORY_11, Constant.API_CODE_1110);
+
+ //鎺ㄩ�侊紝鏁版嵁涓洪泦鍚堝舰寮�
+ ResponseDto responseDto = apiRemoteService.pushData(param, apiConf, items);
+ if (responseDto.getSuccess() == 0) {
+ //鎺ㄩ�佹垚鍔燂紝鏇存柊鏁版嵁涓婁紶鐘舵��
+ for (Api1110 data : items) {
+ if (Constant.CZBZ_I.equals(data.getCzbz())) {
+ //鏇存柊鐘舵��
+ api1110Rep.updateStatus(data.getHwdm(), Constant.CZBZ_U);
+ }
+ }
+ }
+ return responseDto.toString();
+ }
+
}
diff --git a/src/main/java/com/fzzy/api/view/pr/Api1111PR.java b/src/main/java/com/fzzy/api/view/pr/Api1111PR.java
index f4038ee..6beaecd 100644
--- a/src/main/java/com/fzzy/api/view/pr/Api1111PR.java
+++ b/src/main/java/com/fzzy/api/view/pr/Api1111PR.java
@@ -4,6 +4,7 @@
import com.bstek.dorado.annotation.DataResolver;
import com.bstek.dorado.annotation.Expose;
import com.fzzy.api.data.ApiParam;
+import com.fzzy.api.data.PushProtocol;
import com.fzzy.api.entity.ApiConfs;
import com.fzzy.api.service.ApiCommonService;
import com.fzzy.api.service.ApiPushManager;
@@ -72,7 +73,7 @@
}
/**
- *
+ *
* 鏇存柊鍒犻櫎鏍囪 api1111PR#delUpdate
*
* @param entity
@@ -96,22 +97,38 @@
*/
@Expose
public String pushData(List<Api1111> items) {
- ResponseDto responseDto;
- String result = "";
- Api1111 d;
+
//鑾峰彇閰嶇疆
String kqdm = items.get(0).getKqdm();
ApiConfs apiConf = apiCommonService.getConf(kqdm);
if (null == apiConf) return "绯荤粺娌℃湁鑾峰彇鍒板綋鍓嶅簱鍖洪厤缃俊鎭紝鎵ц澶辫触";
- //灏佽鍙傛暟
- ApiParam param = new ApiParam(apiConf, Constant.API_CATEGORY_11, Constant.API_CODE_1111);
-
//鑾峰彇瀹炵幇鎺ュ彛
- ApiRemoteService apiRemoteService = apiPushManager.getApiRemoteService(param.getPushProtocol());
+ ApiRemoteService apiRemoteService = apiPushManager.getApiRemoteService(apiConf.getPushProtocol());
if (null == apiRemoteService) return "绯荤粺娌℃湁褰撳墠鎺ㄩ�佸崗璁厤缃紝鎵ц澶辫触";
+ if (PushProtocol.SB_SH_2023.getCode().equals(apiConf.getPushProtocol())){
+ return pushDataList(items,apiRemoteService,apiConf);
+ }
+ return pushDataSingle(items,apiRemoteService,apiConf);
+ }
+
+ /**
+ * 鍗曟潯鏁版嵁json鎺ㄩ��
+ *
+ * @param items
+ * @param apiRemoteService
+ * @param apiConf
+ * @return
+ */
+ private String pushDataSingle(List<Api1111> items, ApiRemoteService apiRemoteService, ApiConfs apiConf) {
+ ResponseDto responseDto;
+ String result = "";
+
+ //灏佽鍙傛暟
+ ApiParam param = new ApiParam(apiConf, Constant.API_CATEGORY_11, Constant.API_CODE_1111);
+ Api1111 d;
for (Api1111 data : items) {
d = new Api1111();
BeanUtils.copyProperties(data, d);
@@ -128,4 +145,31 @@
return result;
}
+ /**
+ * 澶氭潯鏁版嵁json鎺ㄩ��
+ *
+ * @param items
+ * @param apiRemoteService
+ * @param apiConf
+ * @return
+ */
+ private String pushDataList(List<Api1111> items, ApiRemoteService apiRemoteService, ApiConfs apiConf) {
+
+ //灏佽鍙傛暟
+ ApiParam param = new ApiParam(apiConf, Constant.API_CATEGORY_11, Constant.API_CODE_1111);
+
+ //鎺ㄩ�侊紝鏁版嵁涓洪泦鍚堝舰寮�
+ ResponseDto responseDto = apiRemoteService.pushData(param, apiConf, items);
+ if (responseDto.getSuccess() == 0) {
+ //鎺ㄩ�佹垚鍔燂紝鏇存柊鏁版嵁涓婁紶鐘舵��
+ for (Api1111 data : items) {
+ if (Constant.CZBZ_I.equals(data.getCzbz())) {
+ //鏇存柊鐘舵��
+ api1111Rep.updateStatus(data.getSpjksbid(), Constant.CZBZ_U);
+ }
+ }
+ }
+ return responseDto.toString();
+ }
+
}
diff --git a/src/main/java/com/fzzy/api/view/pr/Api1112PR.java b/src/main/java/com/fzzy/api/view/pr/Api1112PR.java
index c7babfc..88e0e65 100644
--- a/src/main/java/com/fzzy/api/view/pr/Api1112PR.java
+++ b/src/main/java/com/fzzy/api/view/pr/Api1112PR.java
@@ -4,6 +4,7 @@
import com.bstek.dorado.annotation.DataResolver;
import com.bstek.dorado.annotation.Expose;
import com.fzzy.api.data.ApiParam;
+import com.fzzy.api.data.PushProtocol;
import com.fzzy.api.entity.ApiConfs;
import com.fzzy.api.service.ApiCommonService;
import com.fzzy.api.service.ApiPushManager;
@@ -96,22 +97,38 @@
*/
@Expose
public String pushData(List<Api1112> items) {
- ResponseDto responseDto;
- String result = "";
- Api1112 d;
+
//鑾峰彇閰嶇疆
String kqdm = items.get(0).getKqdm();
ApiConfs apiConf = apiCommonService.getConf(kqdm);
if (null == apiConf) return "绯荤粺娌℃湁鑾峰彇鍒板綋鍓嶅簱鍖洪厤缃俊鎭紝鎵ц澶辫触";
- //灏佽鍙傛暟
- ApiParam param = new ApiParam(apiConf, Constant.API_CATEGORY_11, Constant.API_CODE_1112);
-
//鑾峰彇瀹炵幇鎺ュ彛
- ApiRemoteService apiRemoteService = apiPushManager.getApiRemoteService(param.getPushProtocol());
+ ApiRemoteService apiRemoteService = apiPushManager.getApiRemoteService(apiConf.getPushProtocol());
if (null == apiRemoteService) return "绯荤粺娌℃湁褰撳墠鎺ㄩ�佸崗璁厤缃紝鎵ц澶辫触";
+ if (PushProtocol.SB_SH_2023.getCode().equals(apiConf.getPushProtocol())){
+ return pushDataList(items,apiRemoteService,apiConf);
+ }
+ return pushDataSingle(items,apiRemoteService,apiConf);
+ }
+
+ /**
+ * 鍗曟潯鏁版嵁json鎺ㄩ��
+ *
+ * @param items
+ * @param apiRemoteService
+ * @param apiConf
+ * @return
+ */
+ private String pushDataSingle(List<Api1112> items, ApiRemoteService apiRemoteService, ApiConfs apiConf) {
+ ResponseDto responseDto;
+ String result = "";
+
+ //灏佽鍙傛暟
+ ApiParam param = new ApiParam(apiConf, Constant.API_CATEGORY_11, Constant.API_CODE_1112);
+ Api1112 d;
for (Api1112 data : items) {
d = new Api1112();
BeanUtils.copyProperties(data, d);
@@ -128,4 +145,30 @@
return result;
}
+ /**
+ * 澶氭潯鏁版嵁json鎺ㄩ��
+ *
+ * @param items
+ * @param apiRemoteService
+ * @param apiConf
+ * @return
+ */
+ private String pushDataList(List<Api1112> items, ApiRemoteService apiRemoteService, ApiConfs apiConf) {
+
+ //灏佽鍙傛暟
+ ApiParam param = new ApiParam(apiConf, Constant.API_CATEGORY_11, Constant.API_CODE_1112);
+
+ //鎺ㄩ�侊紝鏁版嵁涓洪泦鍚堝舰寮�
+ ResponseDto responseDto = apiRemoteService.pushData(param, apiConf, items);
+ if (responseDto.getSuccess() == 0) {
+ //鎺ㄩ�佹垚鍔燂紝鏇存柊鏁版嵁涓婁紶鐘舵��
+ for (Api1112 data : items) {
+ if (Constant.CZBZ_I.equals(data.getCzbz())) {
+ //鏇存柊鐘舵��
+ api1112Rep.updateStatus(data.getSfzhm(), Constant.CZBZ_U);
+ }
+ }
+ }
+ return responseDto.toString();
+ }
}
diff --git a/src/main/java/com/fzzy/api/view/pr/Api1113PR.java b/src/main/java/com/fzzy/api/view/pr/Api1113PR.java
index a86565b..c7c3448 100644
--- a/src/main/java/com/fzzy/api/view/pr/Api1113PR.java
+++ b/src/main/java/com/fzzy/api/view/pr/Api1113PR.java
@@ -4,6 +4,7 @@
import com.bstek.dorado.annotation.DataResolver;
import com.bstek.dorado.annotation.Expose;
import com.fzzy.api.data.ApiParam;
+import com.fzzy.api.data.PushProtocol;
import com.fzzy.api.entity.ApiConfs;
import com.fzzy.api.service.ApiCommonService;
import com.fzzy.api.service.ApiPushManager;
@@ -20,112 +21,156 @@
/**
* 浼佷笟淇＄敤淇℃伅
+ *
* @author he
*/
@Component
public class Api1113PR {
- @Autowired
- private Api1113Rep api1113Rep;
+ @Autowired
+ private Api1113Rep api1113Rep;
- @Autowired
- private ApiCommonService apiCommonService;
+ @Autowired
+ private ApiCommonService apiCommonService;
- @Autowired
- private ApiPushManager apiPushManager;
+ @Autowired
+ private ApiPushManager apiPushManager;
- /**
- * api1113PR#listAll
- *
- * @return
- */
- @DataProvider
- public List<Api1113> listAll() {
- return api1113Rep.findAll();
- }
+ /**
+ * api1113PR#listAll
+ *
+ * @return
+ */
+ @DataProvider
+ public List<Api1113> listAll() {
+ return api1113Rep.findAll();
+ }
- /**
- * api1113PR#updateSave
- *
- * @param entity
- */
- @DataResolver
- public void updateSave(Api1113 entity) {
+ /**
+ * api1113PR#updateSave
+ *
+ * @param entity
+ */
+ @DataResolver
+ public void updateSave(Api1113 entity) {
- // 鎵嬪姩灏哾oradoEntity瀵硅薄杞崲涓烘爣鍑咮ean瀵硅薄
- Api1113 data = new Api1113();
- BeanUtils.copyProperties(entity, data);
+ // 鎵嬪姩灏哾oradoEntity瀵硅薄杞崲涓烘爣鍑咮ean瀵硅薄
+ Api1113 data = new Api1113();
+ BeanUtils.copyProperties(entity, data);
- api1113Rep.save(data);
- }
+ api1113Rep.save(data);
+ }
- /**
- * api1113PR#delData
- *
- * @param data
- */
- @Expose
- public String delData(Api1113 data) {
+ /**
+ * api1113PR#delData
+ *
+ * @param data
+ */
+ @Expose
+ public String delData(Api1113 data) {
- api1113Rep.deleteById(data.getDwdm());
+ api1113Rep.deleteById(data.getDwdm());
- return null;
- }
+ return null;
+ }
- /**
- *
- * 鏇存柊鍒犻櫎鏍囪 api1113PR#delUpdate
- *
- * @param entity
- */
- @Expose
- public String delUpdate(Api1113 entity) {
+ /**
+ * 鏇存柊鍒犻櫎鏍囪 api1113PR#delUpdate
+ *
+ * @param entity
+ */
+ @Expose
+ public String delUpdate(Api1113 entity) {
- entity.setCzbz(Constant.CZBZ_D);
+ entity.setCzbz(Constant.CZBZ_D);
- Api1113 data = new Api1113();
- BeanUtils.copyProperties(entity, data);
+ Api1113 data = new Api1113();
+ BeanUtils.copyProperties(entity, data);
- api1113Rep.save(data);
- return null;
- }
+ api1113Rep.save(data);
+ return null;
+ }
- /**
- * api1113PR#pushData
- *
- * @param items
- */
- @Expose
- public String pushData(List<Api1113> items) {
- ResponseDto responseDto;
- String result = "";
- Api1113 d;
- //鑾峰彇閰嶇疆
- String kqdm = items.get(0).getKqdm();
- ApiConfs apiConf = apiCommonService.getConf(kqdm);
+ /**
+ * api1113PR#pushData
+ *
+ * @param items
+ */
+ @Expose
+ public String pushData(List<Api1113> items) {
+ ResponseDto responseDto;
+ String result = "";
+ Api1113 d;
+ //鑾峰彇閰嶇疆
+ String kqdm = items.get(0).getKqdm();
+ ApiConfs apiConf = apiCommonService.getConf(kqdm);
- if (null == apiConf) return "绯荤粺娌℃湁鑾峰彇鍒板綋鍓嶅簱鍖洪厤缃俊鎭紝鎵ц澶辫触";
+ if (null == apiConf) return "绯荤粺娌℃湁鑾峰彇鍒板綋鍓嶅簱鍖洪厤缃俊鎭紝鎵ц澶辫触";
- //灏佽鍙傛暟
- ApiParam param = new ApiParam(apiConf, Constant.API_CATEGORY_11, Constant.API_CODE_1113);
+ //鑾峰彇瀹炵幇鎺ュ彛
+ ApiRemoteService apiRemoteService = apiPushManager.getApiRemoteService(apiConf.getPushProtocol());
+ if (null == apiRemoteService) return "绯荤粺娌℃湁褰撳墠鎺ㄩ�佸崗璁厤缃紝鎵ц澶辫触";
+ if (PushProtocol.SB_SH_2023.getCode().equals(apiConf.getPushProtocol())) {
+ return pushDataList(items, apiRemoteService, apiConf);
+ }
+ return pushDataSingle(items, apiRemoteService, apiConf);
+ }
- //鑾峰彇瀹炵幇鎺ュ彛
- ApiRemoteService apiRemoteService = apiPushManager.getApiRemoteService(param.getPushProtocol());
- if (null == apiRemoteService) return "绯荤粺娌℃湁褰撳墠鎺ㄩ�佸崗璁厤缃紝鎵ц澶辫触";
+ /**
+ * 鍗曟潯鏁版嵁json鎺ㄩ��
+ *
+ * @param items
+ * @param apiRemoteService
+ * @param apiConf
+ * @return
+ */
+ private String pushDataSingle(List<Api1113> items, ApiRemoteService apiRemoteService, ApiConfs apiConf) {
+ ResponseDto responseDto;
+ String result = "";
- for (Api1113 data : items) {
- d = new Api1113();
- BeanUtils.copyProperties(data, d);
- param.setBizId(data.getBizId());
- responseDto = apiRemoteService.pushData(param, apiConf, d);
+ //灏佽鍙傛暟
+ ApiParam param = new ApiParam(apiConf, Constant.API_CATEGORY_11, Constant.API_CODE_1113);
+ Api1113 d;
+ for (Api1113 data : items) {
+ d = new Api1113();
+ BeanUtils.copyProperties(data, d);
+ param.setBizId(data.getBizId());
+ responseDto = apiRemoteService.pushData(param, apiConf, d);
- result += responseDto.toString();
- if (responseDto.getSuccess() == 0) {
- if (Constant.CZBZ_I.equals(d.getCzbz())) {
- api1113Rep.updateStatus(data.getKqdm(), Constant.CZBZ_U);
- }
- }
- }
- return result;
- }
+ result += responseDto.toString();
+ if (responseDto.getSuccess() == 0) {
+ if (Constant.CZBZ_I.equals(d.getCzbz())) {
+ api1113Rep.updateStatus(data.getKqdm(), Constant.CZBZ_U);
+ }
+ }
+ }
+ return result;
+ }
+
+ /**
+ * 澶氭潯鏁版嵁json鎺ㄩ��
+ *
+ * @param items
+ * @param apiRemoteService
+ * @param apiConf
+ * @return
+ */
+ private String pushDataList(List<Api1113> items, ApiRemoteService apiRemoteService, ApiConfs apiConf) {
+
+ //灏佽鍙傛暟
+ ApiParam param = new ApiParam(apiConf, Constant.API_CATEGORY_11, Constant.API_CODE_1113);
+
+ //鎺ㄩ�侊紝鏁版嵁涓洪泦鍚堝舰寮�
+ ResponseDto responseDto = apiRemoteService.pushData(param, apiConf, items);
+ if (responseDto.getSuccess() == 0) {
+ //鎺ㄩ�佹垚鍔燂紝鏇存柊鏁版嵁涓婁紶鐘舵��
+ for (Api1113 data : items) {
+ if (Constant.CZBZ_I.equals(data.getCzbz())) {
+ //鏇存柊鐘舵��
+ api1113Rep.updateStatus(data.getKqdm(), Constant.CZBZ_U);
+ }
+ }
+ }
+ return responseDto.toString();
+ }
}
diff --git a/src/main/java/com/fzzy/api/view/pr/Api1201PR.java b/src/main/java/com/fzzy/api/view/pr/Api1201PR.java
index b2b0c1c..a658e24 100644
--- a/src/main/java/com/fzzy/api/view/pr/Api1201PR.java
+++ b/src/main/java/com/fzzy/api/view/pr/Api1201PR.java
@@ -4,6 +4,8 @@
import com.bstek.dorado.annotation.DataResolver;
import com.bstek.dorado.annotation.Expose;
import com.bstek.dorado.data.provider.Page;
+import com.fzzy.api.data.PushProtocol;
+import com.fzzy.api.entity.Api1201;
import com.fzzy.api.entity.ApiConfs;
import com.fzzy.api.service.ApiCommonService;
import com.fzzy.api.service.ApiPushManager;
@@ -168,26 +170,73 @@
if (null == apiConf) return "绯荤粺娌℃湁鑾峰彇鍒板綋鍓嶅簱鍖洪厤缃俊鎭紝鎵ц澶辫触";
- //灏佽鍙傛暟
- ApiParam param = new ApiParam(apiConf, Constant.API_CATEGORY_11, Constant.API_CODE_1201);
-
//鑾峰彇瀹炵幇鎺ュ彛
- ApiRemoteService apiService = apiPushManager.getApiRemoteService(param.getPushProtocol());
+ ApiRemoteService apiService = apiPushManager.getApiRemoteService(apiConf.getPushProtocol());
if (null == apiService) return "绯荤粺娌℃湁褰撳墠鎺ㄩ�佸崗璁厤缃紝鎵ц澶辫触";
+ if (PushProtocol.SB_SH_2023.getCode().equals(apiConf.getPushProtocol())){
+ return pushDataList(items,apiService,apiConf);
+ }
+ return pushDataSingle(items,apiService,apiConf);
+ }
+
+ /**
+ * 鍗曟潯鏁版嵁json鎺ㄩ��
+ *
+ * @param items
+ * @param apiRemoteService
+ * @param apiConf
+ * @return
+ */
+ private String pushDataSingle(List<Api1201> items, ApiRemoteService apiRemoteService, ApiConfs apiConf) {
+ ResponseDto responseDto;
+ String result = "";
+
+ //灏佽鍙傛暟
+ ApiParam param = new ApiParam(apiConf, Constant.API_CATEGORY_12, Constant.API_CODE_1201);
+ Api1201 d;
for (Api1201 data : items) {
d = new Api1201();
BeanUtils.copyProperties(data, d);
- responseDto = apiService.pushData(param, apiConf, d);
+ param.setBizId(data.getBizId());
+ responseDto = apiRemoteService.pushData(param, apiConf, d);
+
result += responseDto.toString();
if (responseDto.getSuccess() == 0) {
- if ("i".equals(d.getCzbz())) {
- apiRepository.updateStatus(d.getHth(), Constant.CZBZ_U);
+ if (Constant.CZBZ_I.equals(d.getCzbz())) {
+ apiRepository.updateStatus(data.getHth(), Constant.CZBZ_U);
}
}
}
return result;
}
+ /**
+ * 澶氭潯鏁版嵁json鎺ㄩ��
+ *
+ * @param items
+ * @param apiRemoteService
+ * @param apiConf
+ * @return
+ */
+ private String pushDataList(List<Api1201> items, ApiRemoteService apiRemoteService, ApiConfs apiConf) {
+
+ //灏佽鍙傛暟
+ ApiParam param = new ApiParam(apiConf, Constant.API_CATEGORY_12, Constant.API_CODE_1201);
+
+ //鎺ㄩ�侊紝鏁版嵁涓洪泦鍚堝舰寮�
+ ResponseDto responseDto = apiRemoteService.pushData(param, apiConf, items);
+ if (responseDto.getSuccess() == 0) {
+ //鎺ㄩ�佹垚鍔燂紝鏇存柊鏁版嵁涓婁紶鐘舵��
+ for (Api1201 data : items) {
+ if (Constant.CZBZ_I.equals(data.getCzbz())) {
+ //鏇存柊鐘舵��
+ apiRepository.updateStatus(data.getHth(), Constant.CZBZ_U);
+ }
+ }
+ }
+ return responseDto.toString();
+ }
+
}
diff --git a/src/main/java/com/fzzy/api/view/pr/Api1202PR.java b/src/main/java/com/fzzy/api/view/pr/Api1202PR.java
index c8efa98..98d2c12 100644
--- a/src/main/java/com/fzzy/api/view/pr/Api1202PR.java
+++ b/src/main/java/com/fzzy/api/view/pr/Api1202PR.java
@@ -4,6 +4,7 @@
import com.bstek.dorado.annotation.DataResolver;
import com.bstek.dorado.annotation.Expose;
import com.bstek.dorado.data.provider.Page;
+import com.fzzy.api.data.PushProtocol;
import com.fzzy.api.entity.ApiConfs;
import com.fzzy.api.service.ApiCommonService;
import com.fzzy.api.service.ApiPushManager;
@@ -160,35 +161,77 @@
*/
@Expose
public String pushData(List<Api1202> items) {
- ResponseDto responseDto;
- String result = "";
- Api1202 d;
- String kqdm = items.get(0).getKqdm();
- ApiConfs apiConf = apiCommonService.getConf(kqdm);
- if (null == apiConf) return "绯荤粺娌℃湁鑾峰彇鍒板綋鍓嶅簱鍖洪厤缃俊鎭紝鎵ц澶辫触";
+ String kqdm = items.get(0).getKqdm();
+ ApiConfs apiConf = apiCommonService.getConf(kqdm);
- //灏佽鍙傛暟
- ApiParam param = new ApiParam(apiConf, Constant.API_CATEGORY_11, Constant.API_CODE_1202);
+ if (null == apiConf) return "绯荤粺娌℃湁鑾峰彇鍒板綋鍓嶅簱鍖洪厤缃俊鎭紝鎵ц澶辫触";
+ //鑾峰彇瀹炵幇鎺ュ彛
+ ApiRemoteService apiService = apiPushManager.getApiRemoteService(apiConf.getPushProtocol());
+ if (null == apiService) return "绯荤粺娌℃湁褰撳墠鎺ㄩ�佸崗璁厤缃紝鎵ц澶辫触";
- //鑾峰彇瀹炵幇鎺ュ彛
- ApiRemoteService apiService = apiPushManager.getApiRemoteService(param.getPushProtocol());
- if (null == apiService) return "绯荤粺娌℃湁褰撳墠鎺ㄩ�佸崗璁厤缃紝鎵ц澶辫触";
+ if (PushProtocol.SB_SH_2023.getCode().equals(apiConf.getPushProtocol())) {
+ return pushDataList(items, apiService, apiConf);
+ }
+ return pushDataSingle(items, apiService, apiConf);
+ }
- for (Api1202 data : items) {
- d = new Api1202();
- BeanUtils.copyProperties(data, d);
- responseDto = apiService.pushData(param, apiConf, d);
- result += responseDto.toString();
- if (responseDto.getSuccess() == 0) {
- //todo 浠ｈ〃涓婁紶鎴愬姛 ,鍚庢湡闇�瑕佷繚瀛樻棩蹇�
- if ("i".equals(d.getCzbz())) {
- apiRepository.updateStatus(d.getRkywdh(), Constant.CZBZ_U);
- }
+ /**
+ * 鍗曟潯鏁版嵁json鎺ㄩ��
+ *
+ * @param items
+ * @param apiRemoteService
+ * @param apiConf
+ * @return
+ */
+ private String pushDataSingle(List<Api1202> items, ApiRemoteService apiRemoteService, ApiConfs apiConf) {
+ ResponseDto responseDto;
+ String result = "";
+
+ //灏佽鍙傛暟
+ ApiParam param = new ApiParam(apiConf, Constant.API_CATEGORY_12, Constant.API_CODE_1202);
+ Api1202 d;
+ for (Api1202 data : items) {
+ d = new Api1202();
+ BeanUtils.copyProperties(data, d);
+ responseDto = apiRemoteService.pushData(param, apiConf, d);
+ result += responseDto.toString();
+ if (responseDto.getSuccess() == 0) {
+ //todo 浠ｈ〃涓婁紶鎴愬姛 ,鍚庢湡闇�瑕佷繚瀛樻棩蹇�
+ if ("i".equals(d.getCzbz())) {
+ apiRepository.updateStatus(d.getRkywdh(), Constant.CZBZ_U);
}
}
- return result;
}
+ return result;
+ }
+
+ /**
+ * 澶氭潯鏁版嵁json鎺ㄩ��
+ *
+ * @param items
+ * @param apiRemoteService
+ * @param apiConf
+ * @return
+ */
+ private String pushDataList(List<Api1202> items, ApiRemoteService apiRemoteService, ApiConfs apiConf) {
+
+ //灏佽鍙傛暟
+ ApiParam param = new ApiParam(apiConf, Constant.API_CATEGORY_12, Constant.API_CODE_1202);
+
+ //鎺ㄩ�侊紝鏁版嵁涓洪泦鍚堝舰寮�
+ ResponseDto responseDto = apiRemoteService.pushData(param, apiConf, items);
+ if (responseDto.getSuccess() == 0) {
+ //鎺ㄩ�佹垚鍔燂紝鏇存柊鏁版嵁涓婁紶鐘舵��
+ for (Api1202 data : items) {
+ if (Constant.CZBZ_I.equals(data.getCzbz())) {
+ //鏇存柊鐘舵��
+ apiRepository.updateStatus(data.getRkywdh(), Constant.CZBZ_U);
+ }
+ }
+ }
+ return responseDto.toString();
+ }
}
diff --git a/src/main/java/com/fzzy/api/view/pr/Api1203PR.java b/src/main/java/com/fzzy/api/view/pr/Api1203PR.java
index cc6f12e..91967e1 100644
--- a/src/main/java/com/fzzy/api/view/pr/Api1203PR.java
+++ b/src/main/java/com/fzzy/api/view/pr/Api1203PR.java
@@ -4,6 +4,8 @@
import com.bstek.dorado.annotation.DataResolver;
import com.bstek.dorado.annotation.Expose;
import com.bstek.dorado.data.provider.Page;
+import com.fzzy.api.data.PushProtocol;
+import com.fzzy.api.entity.Api1203;
import com.fzzy.api.entity.ApiConfs;
import com.fzzy.api.service.ApiCommonService;
import com.fzzy.api.service.ApiPushManager;
@@ -161,26 +163,41 @@
*/
@Expose
public String pushData(List<Api1203> items) {
- ResponseDto responseDto;
- String result = "";
- Api1203 d;
+
String kqdm = items.get(0).getKqdm();
ApiConfs apiConf = apiCommonService.getConf(kqdm);
if (null == apiConf) return "绯荤粺娌℃湁鑾峰彇鍒板綋鍓嶅簱鍖洪厤缃俊鎭紝鎵ц澶辫触";
- //灏佽鍙傛暟
- ApiParam param = new ApiParam(apiConf, Constant.API_CATEGORY_11, Constant.API_CODE_1203);
-
-
//鑾峰彇瀹炵幇鎺ュ彛
- ApiRemoteService apiService = apiPushManager.getApiRemoteService(param.getPushProtocol());
+ ApiRemoteService apiService = apiPushManager.getApiRemoteService(apiConf.getPushProtocol());
if (null == apiService) return "绯荤粺娌℃湁褰撳墠鎺ㄩ�佸崗璁厤缃紝鎵ц澶辫触";
+ if (PushProtocol.SB_SH_2023.getCode().equals(apiConf.getPushProtocol())) {
+ return pushDataList(items, apiService, apiConf);
+ }
+ return pushDataSingle(items, apiService, apiConf);
+ }
+
+ /**
+ * 鍗曟潯鏁版嵁json鎺ㄩ��
+ *
+ * @param items
+ * @param apiRemoteService
+ * @param apiConf
+ * @return
+ */
+ private String pushDataSingle(List<Api1203> items, ApiRemoteService apiRemoteService, ApiConfs apiConf) {
+ ResponseDto responseDto;
+ String result = "";
+
+ //灏佽鍙傛暟
+ ApiParam param = new ApiParam(apiConf, Constant.API_CATEGORY_12, Constant.API_CODE_1203);
+ Api1203 d;
for (Api1203 data : items) {
d = new Api1203();
BeanUtils.copyProperties(data, d);
- responseDto = apiService.pushData(param, apiConf, d);
+ responseDto = apiRemoteService.pushData(param, apiConf, d);
result += responseDto.toString();
if (responseDto.getSuccess() == 0) {
//todo 浠ｈ〃涓婁紶鎴愬姛 ,鍚庢湡闇�瑕佷繚瀛樻棩蹇�
@@ -192,4 +209,32 @@
return result;
}
+ /**
+ * 澶氭潯鏁版嵁json鎺ㄩ��
+ *
+ * @param items
+ * @param apiRemoteService
+ * @param apiConf
+ * @return
+ */
+ private String pushDataList(List<Api1203> items, ApiRemoteService apiRemoteService, ApiConfs apiConf) {
+
+ //灏佽鍙傛暟
+ ApiParam param = new ApiParam(apiConf, Constant.API_CATEGORY_12, Constant.API_CODE_1203);
+
+ //鎺ㄩ�侊紝鏁版嵁涓洪泦鍚堝舰寮�
+ ResponseDto responseDto = apiRemoteService.pushData(param, apiConf, items);
+ if (responseDto.getSuccess() == 0) {
+ //鎺ㄩ�佹垚鍔燂紝鏇存柊鏁版嵁涓婁紶鐘舵��
+ for (Api1203 data : items) {
+ if (Constant.CZBZ_I.equals(data.getCzbz())) {
+ //鏇存柊鐘舵��
+ apiRepository.updateStatus(data.getRkywdh(), Constant.CZBZ_U);
+ }
+ }
+ }
+ return responseDto.toString();
+ }
+
+
}
diff --git a/src/main/java/com/fzzy/api/view/pr/Api1204PR.java b/src/main/java/com/fzzy/api/view/pr/Api1204PR.java
index e9773e0..f14ee11 100644
--- a/src/main/java/com/fzzy/api/view/pr/Api1204PR.java
+++ b/src/main/java/com/fzzy/api/view/pr/Api1204PR.java
@@ -4,6 +4,8 @@
import com.bstek.dorado.annotation.DataResolver;
import com.bstek.dorado.annotation.Expose;
import com.bstek.dorado.data.provider.Page;
+import com.fzzy.api.data.PushProtocol;
+import com.fzzy.api.entity.Api1204;
import com.fzzy.api.entity.Api1204;
import com.fzzy.api.entity.ApiConfs;
import com.fzzy.api.service.ApiCommonService;
@@ -170,18 +172,34 @@
if (null == apiConf) return "绯荤粺娌℃湁鑾峰彇鍒板綋鍓嶅簱鍖洪厤缃俊鎭紝鎵ц澶辫触";
- //灏佽鍙傛暟
- ApiParam param = new ApiParam(apiConf, Constant.API_CATEGORY_11, Constant.API_CODE_1204);
-
-
//鑾峰彇瀹炵幇鎺ュ彛
- ApiRemoteService apiService = apiPushManager.getApiRemoteService(param.getPushProtocol());
+ ApiRemoteService apiService = apiPushManager.getApiRemoteService(apiConf.getPushProtocol());
if (null == apiService) return "绯荤粺娌℃湁褰撳墠鎺ㄩ�佸崗璁厤缃紝鎵ц澶辫触";
+ if (PushProtocol.SB_SH_2023.getCode().equals(apiConf.getPushProtocol())) {
+ return pushDataList(items, apiService, apiConf);
+ }
+ return pushDataSingle(items, apiService, apiConf);
+ }
+ /**
+ * 鍗曟潯鏁版嵁json鎺ㄩ��
+ *
+ * @param items
+ * @param apiRemoteService
+ * @param apiConf
+ * @return
+ */
+ private String pushDataSingle(List<Api1204> items, ApiRemoteService apiRemoteService, ApiConfs apiConf) {
+ ResponseDto responseDto;
+ String result = "";
+
+ //灏佽鍙傛暟
+ ApiParam param = new ApiParam(apiConf, Constant.API_CATEGORY_12, Constant.API_CODE_1204);
+ Api1204 d;
for (Api1204 data : items) {
d = new Api1204();
BeanUtils.copyProperties(data, d);
- responseDto = apiService.pushData(param, apiConf, d);
+ responseDto = apiRemoteService.pushData(param, apiConf, d);
result += responseDto.toString();
if (responseDto.getSuccess() == 0) {
//todo 浠ｈ〃涓婁紶鎴愬姛 ,鍚庢湡闇�瑕佷繚瀛樻棩蹇�
@@ -193,4 +211,31 @@
return result;
}
+ /**
+ * 澶氭潯鏁版嵁json鎺ㄩ��
+ *
+ * @param items
+ * @param apiRemoteService
+ * @param apiConf
+ * @return
+ */
+ private String pushDataList(List<Api1204> items, ApiRemoteService apiRemoteService, ApiConfs apiConf) {
+
+ //灏佽鍙傛暟
+ ApiParam param = new ApiParam(apiConf, Constant.API_CATEGORY_12, Constant.API_CODE_1204);
+
+ //鎺ㄩ�侊紝鏁版嵁涓洪泦鍚堝舰寮�
+ ResponseDto responseDto = apiRemoteService.pushData(param, apiConf, items);
+ if (responseDto.getSuccess() == 0) {
+ //鎺ㄩ�佹垚鍔燂紝鏇存柊鏁版嵁涓婁紶鐘舵��
+ for (Api1204 data : items) {
+ if (Constant.CZBZ_I.equals(data.getCzbz())) {
+ //鏇存柊鐘舵��
+ apiRepository.updateStatus(data.getRkjsdh(), Constant.CZBZ_U);
+ }
+ }
+ }
+ return responseDto.toString();
+ }
+
}
diff --git a/src/main/java/com/fzzy/api/view/pr/Api1205PR.java b/src/main/java/com/fzzy/api/view/pr/Api1205PR.java
index 7dd9401..4d62e76 100644
--- a/src/main/java/com/fzzy/api/view/pr/Api1205PR.java
+++ b/src/main/java/com/fzzy/api/view/pr/Api1205PR.java
@@ -4,7 +4,7 @@
import com.bstek.dorado.annotation.DataResolver;
import com.bstek.dorado.annotation.Expose;
import com.bstek.dorado.data.provider.Page;
-import com.fzzy.api.entity.Api1205;
+import com.fzzy.api.data.PushProtocol;
import com.fzzy.api.entity.ApiConfs;
import com.fzzy.api.service.ApiCommonService;
import com.fzzy.api.service.ApiPushManager;
@@ -162,22 +162,37 @@
*/
@Expose
public String pushData(List<Api1205> items) {
- ResponseDto responseDto;
- String result = "";
- Api1205 d;
+
String kqdm = items.get(0).getKqdm();
ApiConfs apiConf = apiCommonService.getConf(kqdm);
if (null == apiConf) return "绯荤粺娌℃湁鑾峰彇鍒板綋鍓嶅簱鍖洪厤缃俊鎭紝鎵ц澶辫触";
- //灏佽鍙傛暟
- ApiParam param = new ApiParam(apiConf, Constant.API_CATEGORY_11, Constant.API_CODE_1205);
-
-
//鑾峰彇瀹炵幇鎺ュ彛
- ApiRemoteService apiService = apiPushManager.getApiRemoteService(param.getPushProtocol());
+ ApiRemoteService apiService = apiPushManager.getApiRemoteService(apiConf.getPushProtocol());
if (null == apiService) return "绯荤粺娌℃湁褰撳墠鎺ㄩ�佸崗璁厤缃紝鎵ц澶辫触";
+ if (PushProtocol.SB_SH_2023.getCode().equals(apiConf.getPushProtocol())) {
+ return pushDataList(items, apiService, apiConf);
+ }
+ return pushDataSingle(items, apiService, apiConf);
+ }
+
+ /**
+ * 鍗曟潯鏁版嵁json鎺ㄩ��
+ *
+ * @param items
+ * @param apiService
+ * @param apiConf
+ * @return
+ */
+ private String pushDataSingle(List<Api1205> items, ApiRemoteService apiService, ApiConfs apiConf) {
+ ResponseDto responseDto;
+ String result = "";
+
+ //灏佽鍙傛暟
+ ApiParam param = new ApiParam(apiConf, Constant.API_CATEGORY_12, Constant.API_CODE_1205);
+ Api1205 d;
for (Api1205 data : items) {
d = new Api1205();
BeanUtils.copyProperties(data, d);
@@ -193,4 +208,31 @@
return result;
}
+ /**
+ * 澶氭潯鏁版嵁json鎺ㄩ��
+ *
+ * @param items
+ * @param apiRemoteService
+ * @param apiConf
+ * @return
+ */
+ private String pushDataList(List<Api1205> items, ApiRemoteService apiRemoteService, ApiConfs apiConf) {
+
+ //灏佽鍙傛暟
+ ApiParam param = new ApiParam(apiConf, Constant.API_CATEGORY_12, Constant.API_CODE_1205);
+
+ //鎺ㄩ�侊紝鏁版嵁涓洪泦鍚堝舰寮�
+ ResponseDto responseDto = apiRemoteService.pushData(param, apiConf, items);
+ if (responseDto.getSuccess() == 0) {
+ //鎺ㄩ�佹垚鍔燂紝鏇存柊鏁版嵁涓婁紶鐘舵��
+ for (Api1205 data : items) {
+ if (Constant.CZBZ_I.equals(data.getCzbz())) {
+ //鏇存柊鐘舵��
+ apiRepository.updateStatus(data.getCkywdh(), Constant.CZBZ_U);
+ }
+ }
+ }
+ return responseDto.toString();
+ }
+
}
diff --git a/src/main/java/com/fzzy/api/view/pr/Api1206PR.java b/src/main/java/com/fzzy/api/view/pr/Api1206PR.java
index 529d246..7a7f794 100644
--- a/src/main/java/com/fzzy/api/view/pr/Api1206PR.java
+++ b/src/main/java/com/fzzy/api/view/pr/Api1206PR.java
@@ -4,7 +4,7 @@
import com.bstek.dorado.annotation.DataResolver;
import com.bstek.dorado.annotation.Expose;
import com.bstek.dorado.data.provider.Page;
-import com.fzzy.api.entity.Api1206;
+import com.fzzy.api.data.PushProtocol;
import com.fzzy.api.entity.ApiConfs;
import com.fzzy.api.service.ApiCommonService;
import com.fzzy.api.service.ApiPushManager;
@@ -162,22 +162,36 @@
*/
@Expose
public String pushData(List<Api1206> items) {
- ResponseDto responseDto;
- String result = "";
- Api1206 d;
String kqdm = items.get(0).getKqdm();
ApiConfs apiConf = apiCommonService.getConf(kqdm);
if (null == apiConf) return "绯荤粺娌℃湁鑾峰彇鍒板綋鍓嶅簱鍖洪厤缃俊鎭紝鎵ц澶辫触";
- //灏佽鍙傛暟
- ApiParam param = new ApiParam(apiConf, Constant.API_CATEGORY_11, Constant.API_CODE_1206);
-
-
//鑾峰彇瀹炵幇鎺ュ彛
- ApiRemoteService apiService = apiPushManager.getApiRemoteService(param.getPushProtocol());
+ ApiRemoteService apiService = apiPushManager.getApiRemoteService(apiConf.getPushProtocol());
if (null == apiService) return "绯荤粺娌℃湁褰撳墠鎺ㄩ�佸崗璁厤缃紝鎵ц澶辫触";
+ if (PushProtocol.SB_SH_2023.getCode().equals(apiConf.getPushProtocol())) {
+ return pushDataList(items, apiService, apiConf);
+ }
+ return pushDataSingle(items, apiService, apiConf);
+ }
+
+ /**
+ * 鍗曟潯鏁版嵁json鎺ㄩ��
+ *
+ * @param items
+ * @param apiService
+ * @param apiConf
+ * @return
+ */
+ private String pushDataSingle(List<Api1206> items, ApiRemoteService apiService, ApiConfs apiConf) {
+ ResponseDto responseDto;
+ String result = "";
+
+ //灏佽鍙傛暟
+ ApiParam param = new ApiParam(apiConf, Constant.API_CATEGORY_12, Constant.API_CODE_1206);
+ Api1206 d;
for (Api1206 data : items) {
d = new Api1206();
BeanUtils.copyProperties(data, d);
@@ -193,4 +207,31 @@
return result;
}
+ /**
+ * 澶氭潯鏁版嵁json鎺ㄩ��
+ *
+ * @param items
+ * @param apiRemoteService
+ * @param apiConf
+ * @return
+ */
+ private String pushDataList(List<Api1206> items, ApiRemoteService apiRemoteService, ApiConfs apiConf) {
+
+ //灏佽鍙傛暟
+ ApiParam param = new ApiParam(apiConf, Constant.API_CATEGORY_12, Constant.API_CODE_1206);
+
+ //鎺ㄩ�侊紝鏁版嵁涓洪泦鍚堝舰寮�
+ ResponseDto responseDto = apiRemoteService.pushData(param, apiConf, items);
+ if (responseDto.getSuccess() == 0) {
+ //鎺ㄩ�佹垚鍔燂紝鏇存柊鏁版嵁涓婁紶鐘舵��
+ for (Api1206 data : items) {
+ if (Constant.CZBZ_I.equals(data.getCzbz())) {
+ //鏇存柊鐘舵��
+ apiRepository.updateStatus(data.getCkjsdh(), Constant.CZBZ_U);
+ }
+ }
+ }
+ return responseDto.toString();
+ }
+
}
diff --git a/src/main/java/com/fzzy/api/view/pr/Api1207PR.java b/src/main/java/com/fzzy/api/view/pr/Api1207PR.java
index b96913b..93f72c5 100644
--- a/src/main/java/com/fzzy/api/view/pr/Api1207PR.java
+++ b/src/main/java/com/fzzy/api/view/pr/Api1207PR.java
@@ -4,6 +4,8 @@
import com.bstek.dorado.annotation.DataResolver;
import com.bstek.dorado.annotation.Expose;
import com.bstek.dorado.data.provider.Page;
+import com.fzzy.api.data.PushProtocol;
+import com.fzzy.api.entity.Api1207;
import com.fzzy.api.entity.Api1207;
import com.fzzy.api.entity.ApiConfs;
import com.fzzy.api.service.ApiCommonService;
@@ -162,22 +164,37 @@
*/
@Expose
public String pushData(List<Api1207> items) {
- ResponseDto responseDto;
- String result = "";
- Api1207 d;
+
String kqdm = items.get(0).getKqdm();
ApiConfs apiConf = apiCommonService.getConf(kqdm);
if (null == apiConf) return "绯荤粺娌℃湁鑾峰彇鍒板綋鍓嶅簱鍖洪厤缃俊鎭紝鎵ц澶辫触";
- //灏佽鍙傛暟
- ApiParam param = new ApiParam(apiConf, Constant.API_CATEGORY_11, Constant.API_CODE_1207);
-
-
//鑾峰彇瀹炵幇鎺ュ彛
- ApiRemoteService apiService = apiPushManager.getApiRemoteService(param.getPushProtocol());
+ ApiRemoteService apiService = apiPushManager.getApiRemoteService(apiConf.getPushProtocol());
if (null == apiService) return "绯荤粺娌℃湁褰撳墠鎺ㄩ�佸崗璁厤缃紝鎵ц澶辫触";
+ if (PushProtocol.SB_SH_2023.getCode().equals(apiConf.getPushProtocol())) {
+ return pushDataList(items, apiService, apiConf);
+ }
+ return pushDataSingle(items, apiService, apiConf);
+ }
+
+ /**
+ * 鍗曟潯鏁版嵁json鎺ㄩ��
+ *
+ * @param items
+ * @param apiService
+ * @param apiConf
+ * @return
+ */
+ private String pushDataSingle(List<Api1207> items, ApiRemoteService apiService, ApiConfs apiConf) {
+ ResponseDto responseDto;
+ String result = "";
+
+ //灏佽鍙傛暟
+ ApiParam param = new ApiParam(apiConf, Constant.API_CATEGORY_12, Constant.API_CODE_1207);
+ Api1207 d;
for (Api1207 data : items) {
d = new Api1207();
BeanUtils.copyProperties(data, d);
@@ -193,4 +210,31 @@
return result;
}
+ /**
+ * 澶氭潯鏁版嵁json鎺ㄩ��
+ *
+ * @param items
+ * @param apiRemoteService
+ * @param apiConf
+ * @return
+ */
+ private String pushDataList(List<Api1207> items, ApiRemoteService apiRemoteService, ApiConfs apiConf) {
+
+ //灏佽鍙傛暟
+ ApiParam param = new ApiParam(apiConf, Constant.API_CATEGORY_12, Constant.API_CODE_1207);
+
+ //鎺ㄩ�侊紝鏁版嵁涓洪泦鍚堝舰寮�
+ ResponseDto responseDto = apiRemoteService.pushData(param, apiConf, items);
+ if (responseDto.getSuccess() == 0) {
+ //鎺ㄩ�佹垚鍔燂紝鏇存柊鏁版嵁涓婁紶鐘舵��
+ for (Api1207 data : items) {
+ if (Constant.CZBZ_I.equals(data.getCzbz())) {
+ //鏇存柊鐘舵��
+ apiRepository.updateStatus(data.getDcdh(), Constant.CZBZ_U);
+ }
+ }
+ }
+ return responseDto.toString();
+ }
+
}
diff --git a/src/main/java/com/fzzy/api/view/pr/Api1208PR.java b/src/main/java/com/fzzy/api/view/pr/Api1208PR.java
index 458225e..dad7ea8 100644
--- a/src/main/java/com/fzzy/api/view/pr/Api1208PR.java
+++ b/src/main/java/com/fzzy/api/view/pr/Api1208PR.java
@@ -4,7 +4,7 @@
import com.bstek.dorado.annotation.DataResolver;
import com.bstek.dorado.annotation.Expose;
import com.bstek.dorado.data.provider.Page;
-import com.fzzy.api.entity.Api1208;
+import com.fzzy.api.data.PushProtocol;
import com.fzzy.api.entity.ApiConfs;
import com.fzzy.api.service.ApiCommonService;
import com.fzzy.api.service.ApiPushManager;
@@ -164,22 +164,37 @@
*/
@Expose
public String pushData(List<Api1208> items) {
- ResponseDto responseDto;
- String result = "";
- Api1208 d;
+
String kqdm = items.get(0).getKqdm();
ApiConfs apiConf = apiCommonService.getConf(kqdm);
if (null == apiConf) return "绯荤粺娌℃湁鑾峰彇鍒板綋鍓嶅簱鍖洪厤缃俊鎭紝鎵ц澶辫触";
- //灏佽鍙傛暟
- ApiParam param = new ApiParam(apiConf, Constant.API_CATEGORY_11, Constant.API_CODE_1208);
-
-
//鑾峰彇瀹炵幇鎺ュ彛
- ApiRemoteService apiService = apiPushManager.getApiRemoteService(param.getPushProtocol());
+ ApiRemoteService apiService = apiPushManager.getApiRemoteService(apiConf.getPushProtocol());
if (null == apiService) return "绯荤粺娌℃湁褰撳墠鎺ㄩ�佸崗璁厤缃紝鎵ц澶辫触";
+ if (PushProtocol.SB_SH_2023.getCode().equals(apiConf.getPushProtocol())) {
+ return pushDataList(items, apiService, apiConf);
+ }
+ return pushDataSingle(items, apiService, apiConf);
+ }
+
+ /**
+ * 鍗曟潯鏁版嵁json鎺ㄩ��
+ *
+ * @param items
+ * @param apiService
+ * @param apiConf
+ * @return
+ */
+ private String pushDataSingle(List<Api1208> items, ApiRemoteService apiService, ApiConfs apiConf) {
+ ResponseDto responseDto;
+ String result = "";
+
+ //灏佽鍙傛暟
+ ApiParam param = new ApiParam(apiConf, Constant.API_CATEGORY_12, Constant.API_CODE_1208);
+ Api1208 d;
for (Api1208 data : items) {
d = new Api1208();
BeanUtils.copyProperties(data, d);
@@ -195,4 +210,31 @@
return result;
}
+ /**
+ * 澶氭潯鏁版嵁json鎺ㄩ��
+ *
+ * @param items
+ * @param apiRemoteService
+ * @param apiConf
+ * @return
+ */
+ private String pushDataList(List<Api1208> items, ApiRemoteService apiRemoteService, ApiConfs apiConf) {
+
+ //灏佽鍙傛暟
+ ApiParam param = new ApiParam(apiConf, Constant.API_CATEGORY_12, Constant.API_CODE_1208);
+
+ //鎺ㄩ�侊紝鏁版嵁涓洪泦鍚堝舰寮�
+ ResponseDto responseDto = apiRemoteService.pushData(param, apiConf, items);
+ if (responseDto.getSuccess() == 0) {
+ //鎺ㄩ�佹垚鍔燂紝鏇存柊鏁版嵁涓婁紶鐘舵��
+ for (Api1208 data : items) {
+ if (Constant.CZBZ_I.equals(data.getCzbz())) {
+ //鏇存柊鐘舵��
+ apiRepository.updateStatus(data.getId(), Constant.CZBZ_U);
+ }
+ }
+ }
+ return responseDto.toString();
+ }
+
}
diff --git a/src/main/java/com/fzzy/api/view/pr/Api1209PR.java b/src/main/java/com/fzzy/api/view/pr/Api1209PR.java
index 1acd1cc..1c411c0 100644
--- a/src/main/java/com/fzzy/api/view/pr/Api1209PR.java
+++ b/src/main/java/com/fzzy/api/view/pr/Api1209PR.java
@@ -4,7 +4,7 @@
import com.bstek.dorado.annotation.DataResolver;
import com.bstek.dorado.annotation.Expose;
import com.bstek.dorado.data.provider.Page;
-import com.fzzy.api.entity.Api1209;
+import com.fzzy.api.data.PushProtocol;
import com.fzzy.api.entity.ApiConfs;
import com.fzzy.api.service.ApiCommonService;
import com.fzzy.api.service.ApiPushManager;
@@ -162,22 +162,37 @@
*/
@Expose
public String pushData(List<Api1209> items) {
- ResponseDto responseDto;
- String result = "";
- Api1209 d;
+
String kqdm = items.get(0).getKqdm();
ApiConfs apiConf = apiCommonService.getConf(kqdm);
if (null == apiConf) return "绯荤粺娌℃湁鑾峰彇鍒板綋鍓嶅簱鍖洪厤缃俊鎭紝鎵ц澶辫触";
- //灏佽鍙傛暟
- ApiParam param = new ApiParam(apiConf, Constant.API_CATEGORY_11, Constant.API_CODE_1209);
-
-
//鑾峰彇瀹炵幇鎺ュ彛
- ApiRemoteService apiService = apiPushManager.getApiRemoteService(param.getPushProtocol());
+ ApiRemoteService apiService = apiPushManager.getApiRemoteService(apiConf.getPushProtocol());
if (null == apiService) return "绯荤粺娌℃湁褰撳墠鎺ㄩ�佸崗璁厤缃紝鎵ц澶辫触";
+ if (PushProtocol.SB_SH_2023.getCode().equals(apiConf.getPushProtocol())) {
+ return pushDataList(items, apiService, apiConf);
+ }
+ return pushDataSingle(items, apiService, apiConf);
+ }
+
+ /**
+ * 鍗曟潯鏁版嵁json鎺ㄩ��
+ *
+ * @param items
+ * @param apiService
+ * @param apiConf
+ * @return
+ */
+ private String pushDataSingle(List<Api1209> items, ApiRemoteService apiService, ApiConfs apiConf) {
+ ResponseDto responseDto;
+ String result = "";
+
+ //灏佽鍙傛暟
+ ApiParam param = new ApiParam(apiConf, Constant.API_CATEGORY_12, Constant.API_CODE_1209);
+ Api1209 d;
for (Api1209 data : items) {
d = new Api1209();
BeanUtils.copyProperties(data, d);
@@ -193,4 +208,30 @@
return result;
}
+ /**
+ * 澶氭潯鏁版嵁json鎺ㄩ��
+ *
+ * @param items
+ * @param apiRemoteService
+ * @param apiConf
+ * @return
+ */
+ private String pushDataList(List<Api1209> items, ApiRemoteService apiRemoteService, ApiConfs apiConf) {
+
+ //灏佽鍙傛暟
+ ApiParam param = new ApiParam(apiConf, Constant.API_CATEGORY_12, Constant.API_CODE_1209);
+
+ //鎺ㄩ�侊紝鏁版嵁涓洪泦鍚堝舰寮�
+ ResponseDto responseDto = apiRemoteService.pushData(param, apiConf, items);
+ if (responseDto.getSuccess() == 0) {
+ //鎺ㄩ�佹垚鍔燂紝鏇存柊鏁版嵁涓婁紶鐘舵��
+ for (Api1209 data : items) {
+ if (Constant.CZBZ_I.equals(data.getCzbz())) {
+ //鏇存柊鐘舵��
+ apiRepository.updateStatus(data.getSydh(), Constant.CZBZ_U);
+ }
+ }
+ }
+ return responseDto.toString();
+ }
}
diff --git a/src/main/java/com/fzzy/api/view/pr/Api1210PR.java b/src/main/java/com/fzzy/api/view/pr/Api1210PR.java
index 391d2d6..374c887 100644
--- a/src/main/java/com/fzzy/api/view/pr/Api1210PR.java
+++ b/src/main/java/com/fzzy/api/view/pr/Api1210PR.java
@@ -4,7 +4,7 @@
import com.bstek.dorado.annotation.DataResolver;
import com.bstek.dorado.annotation.Expose;
import com.bstek.dorado.data.provider.Page;
-import com.fzzy.api.entity.Api1210;
+import com.fzzy.api.data.PushProtocol;
import com.fzzy.api.entity.ApiConfs;
import com.fzzy.api.service.ApiCommonService;
import com.fzzy.api.service.ApiPushManager;
@@ -162,22 +162,37 @@
*/
@Expose
public String pushData(List<Api1210> items) {
- ResponseDto responseDto;
- String result = "";
- Api1210 d;
+
String kqdm = items.get(0).getKqdm();
ApiConfs apiConf = apiCommonService.getConf(kqdm);
if (null == apiConf) return "绯荤粺娌℃湁鑾峰彇鍒板綋鍓嶅簱鍖洪厤缃俊鎭紝鎵ц澶辫触";
- //灏佽鍙傛暟
- ApiParam param = new ApiParam(apiConf, Constant.API_CATEGORY_11, Constant.API_CODE_1210);
-
-
//鑾峰彇瀹炵幇鎺ュ彛
- ApiRemoteService apiService = apiPushManager.getApiRemoteService(param.getPushProtocol());
+ ApiRemoteService apiService = apiPushManager.getApiRemoteService(apiConf.getPushProtocol());
if (null == apiService) return "绯荤粺娌℃湁褰撳墠鎺ㄩ�佸崗璁厤缃紝鎵ц澶辫触";
+ if (PushProtocol.SB_SH_2023.getCode().equals(apiConf.getPushProtocol())) {
+ return pushDataList(items, apiService, apiConf);
+ }
+ return pushDataSingle(items, apiService, apiConf);
+ }
+
+ /**
+ * 鍗曟潯鏁版嵁json鎺ㄩ��
+ *
+ * @param items
+ * @param apiService
+ * @param apiConf
+ * @return
+ */
+ private String pushDataSingle(List<Api1210> items, ApiRemoteService apiService, ApiConfs apiConf) {
+ ResponseDto responseDto;
+ String result = "";
+
+ //灏佽鍙傛暟
+ ApiParam param = new ApiParam(apiConf, Constant.API_CATEGORY_12, Constant.API_CODE_1210);
+ Api1210 d;
for (Api1210 data : items) {
d = new Api1210();
BeanUtils.copyProperties(data, d);
@@ -193,4 +208,31 @@
return result;
}
+ /**
+ * 澶氭潯鏁版嵁json鎺ㄩ��
+ *
+ * @param items
+ * @param apiRemoteService
+ * @param apiConf
+ * @return
+ */
+ private String pushDataList(List<Api1210> items, ApiRemoteService apiRemoteService, ApiConfs apiConf) {
+
+ //灏佽鍙傛暟
+ ApiParam param = new ApiParam(apiConf, Constant.API_CATEGORY_12, Constant.API_CODE_1210);
+
+ //鎺ㄩ�侊紝鏁版嵁涓洪泦鍚堝舰寮�
+ ResponseDto responseDto = apiRemoteService.pushData(param, apiConf, items);
+ if (responseDto.getSuccess() == 0) {
+ //鎺ㄩ�佹垚鍔燂紝鏇存柊鏁版嵁涓婁紶鐘舵��
+ for (Api1210 data : items) {
+ if (Constant.CZBZ_I.equals(data.getCzbz())) {
+ //鏇存柊鐘舵��
+ apiRepository.updateStatus(data.getLsxzzbdh(), Constant.CZBZ_U);
+ }
+ }
+ }
+ return responseDto.toString();
+ }
+
}
diff --git a/src/main/java/com/fzzy/api/view/pr/Api1211PR.java b/src/main/java/com/fzzy/api/view/pr/Api1211PR.java
index c1b9212..ec689a6 100644
--- a/src/main/java/com/fzzy/api/view/pr/Api1211PR.java
+++ b/src/main/java/com/fzzy/api/view/pr/Api1211PR.java
@@ -4,6 +4,7 @@
import com.bstek.dorado.annotation.DataResolver;
import com.bstek.dorado.annotation.Expose;
import com.bstek.dorado.data.provider.Page;
+import com.fzzy.api.data.PushProtocol;
import com.fzzy.api.entity.Api1211;
import com.fzzy.api.entity.ApiConfs;
import com.fzzy.api.service.ApiCommonService;
@@ -161,22 +162,37 @@
*/
@Expose
public String pushData(List<Api1211> items) {
- ResponseDto responseDto;
- String result = "";
- Api1211 d;
+
String kqdm = items.get(0).getKqdm();
ApiConfs apiConf = apiCommonService.getConf(kqdm);
if (null == apiConf) return "绯荤粺娌℃湁鑾峰彇鍒板綋鍓嶅簱鍖洪厤缃俊鎭紝鎵ц澶辫触";
- //灏佽鍙傛暟
- ApiParam param = new ApiParam(apiConf, Constant.API_CATEGORY_11, Constant.API_CODE_1211);
-
-
//鑾峰彇瀹炵幇鎺ュ彛
- ApiRemoteService apiService = apiPushManager.getApiRemoteService(param.getPushProtocol());
+ ApiRemoteService apiService = apiPushManager.getApiRemoteService(apiConf.getPushProtocol());
if (null == apiService) return "绯荤粺娌℃湁褰撳墠鎺ㄩ�佸崗璁厤缃紝鎵ц澶辫触";
+ if (PushProtocol.SB_SH_2023.getCode().equals(apiConf.getPushProtocol())) {
+ return pushDataList(items, apiService, apiConf);
+ }
+ return pushDataSingle(items, apiService, apiConf);
+ }
+
+ /**
+ * 鍗曟潯鏁版嵁json鎺ㄩ��
+ *
+ * @param items
+ * @param apiService
+ * @param apiConf
+ * @return
+ */
+ private String pushDataSingle(List<Api1211> items, ApiRemoteService apiService, ApiConfs apiConf) {
+ ResponseDto responseDto;
+ String result = "";
+
+ //灏佽鍙傛暟
+ ApiParam param = new ApiParam(apiConf, Constant.API_CATEGORY_12, Constant.API_CODE_1211);
+ Api1211 d;
for (Api1211 data : items) {
d = new Api1211();
BeanUtils.copyProperties(data, d);
@@ -192,4 +208,30 @@
return result;
}
+ /**
+ * 澶氭潯鏁版嵁json鎺ㄩ��
+ *
+ * @param items
+ * @param apiRemoteService
+ * @param apiConf
+ * @return
+ */
+ private String pushDataList(List<Api1211> items, ApiRemoteService apiRemoteService, ApiConfs apiConf) {
+
+ //灏佽鍙傛暟
+ ApiParam param = new ApiParam(apiConf, Constant.API_CATEGORY_12, Constant.API_CODE_1211);
+
+ //鎺ㄩ�侊紝鏁版嵁涓洪泦鍚堝舰寮�
+ ResponseDto responseDto = apiRemoteService.pushData(param, apiConf, items);
+ if (responseDto.getSuccess() == 0) {
+ //鎺ㄩ�佹垚鍔燂紝鏇存柊鏁版嵁涓婁紶鐘舵��
+ for (Api1211 data : items) {
+ if (Constant.CZBZ_I.equals(data.getCzbz())) {
+ //鏇存柊鐘舵��
+ apiRepository.updateStatus(data.getId(), Constant.CZBZ_U);
+ }
+ }
+ }
+ return responseDto.toString();
+ }
}
diff --git a/src/main/java/com/fzzy/api/view/pr/Api1212PR.java b/src/main/java/com/fzzy/api/view/pr/Api1212PR.java
index 9585656..89aaea0 100644
--- a/src/main/java/com/fzzy/api/view/pr/Api1212PR.java
+++ b/src/main/java/com/fzzy/api/view/pr/Api1212PR.java
@@ -4,7 +4,7 @@
import com.bstek.dorado.annotation.DataResolver;
import com.bstek.dorado.annotation.Expose;
import com.bstek.dorado.data.provider.Page;
-import com.fzzy.api.entity.Api1212;
+import com.fzzy.api.data.PushProtocol;
import com.fzzy.api.entity.ApiConfs;
import com.fzzy.api.service.ApiCommonService;
import com.fzzy.api.service.ApiPushManager;
@@ -165,22 +165,37 @@
*/
@Expose
public String pushData(List<Api1212> items) {
- ResponseDto responseDto;
- String result = "";
- Api1212 d;
+
String kqdm = items.get(0).getKqdm();
ApiConfs apiConf = apiCommonService.getConf(kqdm);
if (null == apiConf) return "绯荤粺娌℃湁鑾峰彇鍒板綋鍓嶅簱鍖洪厤缃俊鎭紝鎵ц澶辫触";
- //灏佽鍙傛暟
- ApiParam param = new ApiParam(apiConf, Constant.API_CATEGORY_11, Constant.API_CODE_1212);
-
-
//鑾峰彇瀹炵幇鎺ュ彛
- ApiRemoteService apiService = apiPushManager.getApiRemoteService(param.getPushProtocol());
+ ApiRemoteService apiService = apiPushManager.getApiRemoteService(apiConf.getPushProtocol());
if (null == apiService) return "绯荤粺娌℃湁褰撳墠鎺ㄩ�佸崗璁厤缃紝鎵ц澶辫触";
+ if (PushProtocol.SB_SH_2023.getCode().equals(apiConf.getPushProtocol())) {
+ return pushDataList(items, apiService, apiConf);
+ }
+ return pushDataSingle(items, apiService, apiConf);
+ }
+
+ /**
+ * 鍗曟潯鏁版嵁json鎺ㄩ��
+ *
+ * @param items
+ * @param apiService
+ * @param apiConf
+ * @return
+ */
+ private String pushDataSingle(List<Api1212> items, ApiRemoteService apiService, ApiConfs apiConf) {
+ ResponseDto responseDto;
+ String result = "";
+
+ //灏佽鍙傛暟
+ ApiParam param = new ApiParam(apiConf, Constant.API_CATEGORY_12, Constant.API_CODE_1212);
+ Api1212 d;
for (Api1212 data : items) {
d = new Api1212();
BeanUtils.copyProperties(data, d);
@@ -196,4 +211,31 @@
return result;
}
+ /**
+ * 澶氭潯鏁版嵁json鎺ㄩ��
+ *
+ * @param items
+ * @param apiRemoteService
+ * @param apiConf
+ * @return
+ */
+ private String pushDataList(List<Api1212> items, ApiRemoteService apiRemoteService, ApiConfs apiConf) {
+
+ //灏佽鍙傛暟
+ ApiParam param = new ApiParam(apiConf, Constant.API_CATEGORY_12, Constant.API_CODE_1212);
+
+ //鎺ㄩ�侊紝鏁版嵁涓洪泦鍚堝舰寮�
+ ResponseDto responseDto = apiRemoteService.pushData(param, apiConf, items);
+ if (responseDto.getSuccess() == 0) {
+ //鎺ㄩ�佹垚鍔燂紝鏇存柊鏁版嵁涓婁紶鐘舵��
+ for (Api1212 data : items) {
+ if (Constant.CZBZ_I.equals(data.getCzbz())) {
+ //鏇存柊鐘舵��
+ apiRepository.updateStatus(data.getId(), Constant.CZBZ_U);
+ }
+ }
+ }
+ return responseDto.toString();
+ }
+
}
diff --git a/src/main/java/com/fzzy/api/view/pr/Api1301PR.java b/src/main/java/com/fzzy/api/view/pr/Api1301PR.java
index 2c2a19d..5a7f644 100644
--- a/src/main/java/com/fzzy/api/view/pr/Api1301PR.java
+++ b/src/main/java/com/fzzy/api/view/pr/Api1301PR.java
@@ -4,7 +4,7 @@
import com.bstek.dorado.annotation.DataResolver;
import com.bstek.dorado.annotation.Expose;
import com.bstek.dorado.data.provider.Page;
-import com.fzzy.api.entity.Api1301;
+import com.fzzy.api.data.PushProtocol;
import com.fzzy.api.entity.ApiConfs;
import com.fzzy.api.service.ApiCommonService;
import com.fzzy.api.service.ApiPushManager;
@@ -36,6 +36,7 @@
/**
* 瀹夊叏绠＄悊鏁版嵁
+ *
* @author chen
*/
@Slf4j
@@ -79,7 +80,7 @@
}
if (StringUtils.isNotBlank(param.getCzbz())) {
- Predicate predicate2 = cb.equal(root.get("czbz"),param.getCzbz());
+ Predicate predicate2 = cb.equal(root.get("czbz"), param.getCzbz());
predicates.add(predicate2);
}
if (null != param.getStart()) {
@@ -114,44 +115,43 @@
Api1301 data = new Api1301();
BeanUtils.copyProperties(entity, data);
- if(StringUtils.isEmpty(data.getId())){
+ if (StringUtils.isEmpty(data.getId())) {
data.setId(ContextUtil.getUUID());
}
api1301Rep.save(data);
}
- /**
- * api1301PR#delData
- *
- * @param data
- */
- @Expose
- public String delData(Api1301 data) {
+ /**
+ * api1301PR#delData
+ *
+ * @param data
+ */
+ @Expose
+ public String delData(Api1301 data) {
- api1301Rep.deleteById(data.getId());
+ api1301Rep.deleteById(data.getId());
- return null;
- }
+ return null;
+ }
- /**
- *
- * 鏇存柊鍒犻櫎鏍囪 api1301PR#delUpdate
- *
- * @param entity
- */
- @Expose
- public String delUpdate(Api1301 entity) {
+ /**
+ * 鏇存柊鍒犻櫎鏍囪 api1301PR#delUpdate
+ *
+ * @param entity
+ */
+ @Expose
+ public String delUpdate(Api1301 entity) {
- entity.setCzbz(Constant.CZBZ_D);
+ entity.setCzbz(Constant.CZBZ_D);
- Api1301 data = new Api1301();
- BeanUtils.copyProperties(entity, data);
+ Api1301 data = new Api1301();
+ BeanUtils.copyProperties(entity, data);
- api1301Rep.save(data);
+ api1301Rep.save(data);
- return null;
- }
+ return null;
+ }
/**
* api1301PR#pushData
@@ -160,22 +160,37 @@
*/
@Expose
public String pushData(List<Api1301> items) {
- ResponseDto responseDto;
- String result = "";
- Api1301 d;
+
String kqdm = items.get(0).getKqdm();
ApiConfs apiConf = apiCommonService.getConf(kqdm);
if (null == apiConf) return "绯荤粺娌℃湁鑾峰彇鍒板綋鍓嶅簱鍖洪厤缃俊鎭紝鎵ц澶辫触";
- //灏佽鍙傛暟
- ApiParam param = new ApiParam(apiConf, Constant.API_CATEGORY_11, Constant.API_CODE_1301);
-
-
//鑾峰彇瀹炵幇鎺ュ彛
- ApiRemoteService apiService = apiPushManager.getApiRemoteService(param.getPushProtocol());
+ ApiRemoteService apiService = apiPushManager.getApiRemoteService(apiConf.getPushProtocol());
if (null == apiService) return "绯荤粺娌℃湁褰撳墠鎺ㄩ�佸崗璁厤缃紝鎵ц澶辫触";
+ if (PushProtocol.SB_SH_2023.getCode().equals(apiConf.getPushProtocol())) {
+ return pushDataList(items, apiService, apiConf);
+ }
+ return pushDataSingle(items, apiService, apiConf);
+ }
+
+ /**
+ * 鍗曟潯鏁版嵁json鎺ㄩ��
+ *
+ * @param items
+ * @param apiService
+ * @param apiConf
+ * @return
+ */
+ private String pushDataSingle(List<Api1301> items, ApiRemoteService apiService, ApiConfs apiConf) {
+ ResponseDto responseDto;
+ String result = "";
+
+ //灏佽鍙傛暟
+ ApiParam param = new ApiParam(apiConf, Constant.API_CATEGORY_13, Constant.API_CODE_1301);
+ Api1301 d;
for (Api1301 data : items) {
d = new Api1301();
BeanUtils.copyProperties(data, d);
@@ -183,7 +198,7 @@
result += responseDto.toString();
if (responseDto.getSuccess() == 0) {
//todo 浠ｈ〃涓婁紶鎴愬姛 ,鍚庢湡闇�瑕佷繚瀛樻棩蹇�
- if("i".equals(d.getCzbz())){
+ if ("i".equals(d.getCzbz())) {
d.setCzbz("u");
api1301Rep.save(d);
}
@@ -191,4 +206,32 @@
}
return result;
}
+
+ /**
+ * 澶氭潯鏁版嵁json鎺ㄩ��
+ *
+ * @param items
+ * @param apiRemoteService
+ * @param apiConf
+ * @return
+ */
+ private String pushDataList(List<Api1301> items, ApiRemoteService apiRemoteService, ApiConfs apiConf) {
+
+ //灏佽鍙傛暟
+ ApiParam param = new ApiParam(apiConf, Constant.API_CATEGORY_13, Constant.API_CODE_1301);
+
+ //鎺ㄩ�侊紝鏁版嵁涓洪泦鍚堝舰寮�
+ ResponseDto responseDto = apiRemoteService.pushData(param, apiConf, items);
+ if (responseDto.getSuccess() == 0) {
+ //鎺ㄩ�佹垚鍔燂紝鏇存柊鏁版嵁涓婁紶鐘舵��
+ for (Api1301 data : items) {
+ if (Constant.CZBZ_I.equals(data.getCzbz())) {
+ //鏇存柊鐘舵��
+ data.setCzbz(Constant.CZBZ_U);
+ api1301Rep.save(data);
+ }
+ }
+ }
+ return responseDto.toString();
+ }
}
diff --git a/src/main/java/com/fzzy/api/view/pr/Api1302PR.java b/src/main/java/com/fzzy/api/view/pr/Api1302PR.java
index 2418609..c490f0d 100644
--- a/src/main/java/com/fzzy/api/view/pr/Api1302PR.java
+++ b/src/main/java/com/fzzy/api/view/pr/Api1302PR.java
@@ -4,7 +4,7 @@
import com.bstek.dorado.annotation.DataResolver;
import com.bstek.dorado.annotation.Expose;
import com.bstek.dorado.data.provider.Page;
-import com.fzzy.api.entity.Api1302;
+import com.fzzy.api.data.PushProtocol;
import com.fzzy.api.entity.ApiConfs;
import com.fzzy.api.service.ApiCommonService;
import com.fzzy.api.service.ApiPushManager;
@@ -158,22 +158,37 @@
*/
@Expose
public String pushData(List<Api1302> items) {
- ResponseDto responseDto;
- String result = "";
- Api1302 d;
+
String kqdm = items.get(0).getKqdm();
ApiConfs apiConf = apiCommonService.getConf(kqdm);
if (null == apiConf) return "绯荤粺娌℃湁鑾峰彇鍒板綋鍓嶅簱鍖洪厤缃俊鎭紝鎵ц澶辫触";
- //灏佽鍙傛暟
- ApiParam param = new ApiParam(apiConf, Constant.API_CATEGORY_11, Constant.API_CODE_1302);
-
-
//鑾峰彇瀹炵幇鎺ュ彛
- ApiRemoteService apiService = apiPushManager.getApiRemoteService(param.getPushProtocol());
+ ApiRemoteService apiService = apiPushManager.getApiRemoteService(apiConf.getPushProtocol());
if (null == apiService) return "绯荤粺娌℃湁褰撳墠鎺ㄩ�佸崗璁厤缃紝鎵ц澶辫触";
+ if (PushProtocol.SB_SH_2023.getCode().equals(apiConf.getPushProtocol())) {
+ return pushDataList(items, apiService, apiConf);
+ }
+ return pushDataSingle(items, apiService, apiConf);
+ }
+
+ /**
+ * 鍗曟潯鏁版嵁json鎺ㄩ��
+ *
+ * @param items
+ * @param apiService
+ * @param apiConf
+ * @return
+ */
+ private String pushDataSingle(List<Api1302> items, ApiRemoteService apiService, ApiConfs apiConf) {
+ ResponseDto responseDto;
+ String result = "";
+
+ //灏佽鍙傛暟
+ ApiParam param = new ApiParam(apiConf, Constant.API_CATEGORY_13, Constant.API_CODE_1302);
+ Api1302 d;
for (Api1302 data : items) {
d = new Api1302();
BeanUtils.copyProperties(data, d);
@@ -181,7 +196,7 @@
result += responseDto.toString();
if (responseDto.getSuccess() == 0) {
//todo 浠ｈ〃涓婁紶鎴愬姛 ,鍚庢湡闇�瑕佷繚瀛樻棩蹇�
- if("i".equals(d.getCzbz())){
+ if ("i".equals(d.getCzbz())) {
d.setCzbz("u");
apiRepository.save(d);
}
@@ -190,4 +205,32 @@
return result;
}
+ /**
+ * 澶氭潯鏁版嵁json鎺ㄩ��
+ *
+ * @param items
+ * @param apiRemoteService
+ * @param apiConf
+ * @return
+ */
+ private String pushDataList(List<Api1302> items, ApiRemoteService apiRemoteService, ApiConfs apiConf) {
+
+ //灏佽鍙傛暟
+ ApiParam param = new ApiParam(apiConf, Constant.API_CATEGORY_13, Constant.API_CODE_1302);
+
+ //鎺ㄩ�侊紝鏁版嵁涓洪泦鍚堝舰寮�
+ ResponseDto responseDto = apiRemoteService.pushData(param, apiConf, items);
+ if (responseDto.getSuccess() == 0) {
+ //鎺ㄩ�佹垚鍔燂紝鏇存柊鏁版嵁涓婁紶鐘舵��
+ for (Api1302 data : items) {
+ if (Constant.CZBZ_I.equals(data.getCzbz())) {
+ //鏇存柊鐘舵��
+ data.setCzbz(Constant.CZBZ_U);
+ apiRepository.save(data);
+ }
+ }
+ }
+ return responseDto.toString();
+ }
+
}
diff --git a/src/main/java/com/fzzy/api/view/pr/Api1303PR.java b/src/main/java/com/fzzy/api/view/pr/Api1303PR.java
index 03de6ee..d6be102 100644
--- a/src/main/java/com/fzzy/api/view/pr/Api1303PR.java
+++ b/src/main/java/com/fzzy/api/view/pr/Api1303PR.java
@@ -4,7 +4,7 @@
import com.bstek.dorado.annotation.DataResolver;
import com.bstek.dorado.annotation.Expose;
import com.bstek.dorado.data.provider.Page;
-import com.fzzy.api.entity.Api1303;
+import com.fzzy.api.data.PushProtocol;
import com.fzzy.api.entity.ApiConfs;
import com.fzzy.api.service.ApiCommonService;
import com.fzzy.api.service.ApiPushManager;
@@ -158,21 +158,37 @@
*/
@Expose
public String pushData(List<Api1303> items) {
- ResponseDto responseDto;
- String result = "";
- Api1303 d;
+
String kqdm = items.get(0).getKqdm();
ApiConfs apiConf = apiCommonService.getConf(kqdm);
if (null == apiConf) return "绯荤粺娌℃湁鑾峰彇鍒板綋鍓嶅簱鍖洪厤缃俊鎭紝鎵ц澶辫触";
- //灏佽鍙傛暟
- ApiParam param = new ApiParam(apiConf, Constant.API_CATEGORY_11, Constant.API_CODE_1303);
-
-
//鑾峰彇瀹炵幇鎺ュ彛
- ApiRemoteService apiService = apiPushManager.getApiRemoteService(param.getPushProtocol());
+ ApiRemoteService apiService = apiPushManager.getApiRemoteService(apiConf.getPushProtocol());
if (null == apiService) return "绯荤粺娌℃湁褰撳墠鎺ㄩ�佸崗璁厤缃紝鎵ц澶辫触";
+
+ if (PushProtocol.SB_SH_2023.getCode().equals(apiConf.getPushProtocol())) {
+ return pushDataList(items, apiService, apiConf);
+ }
+ return pushDataSingle(items, apiService, apiConf);
+ }
+
+ /**
+ * 鍗曟潯鏁版嵁json鎺ㄩ��
+ *
+ * @param items
+ * @param apiService
+ * @param apiConf
+ * @return
+ */
+ private String pushDataSingle(List<Api1303> items, ApiRemoteService apiService, ApiConfs apiConf) {
+ ResponseDto responseDto;
+ String result = "";
+
+ //灏佽鍙傛暟
+ ApiParam param = new ApiParam(apiConf, Constant.API_CATEGORY_13, Constant.API_CODE_1303);
+ Api1303 d;
for (Api1303 data : items) {
d = new Api1303();
@@ -188,6 +204,35 @@
}
}
return result;
+
+ }
+
+ /**
+ * 澶氭潯鏁版嵁json鎺ㄩ��
+ *
+ * @param items
+ * @param apiRemoteService
+ * @param apiConf
+ * @return
+ */
+ private String pushDataList(List<Api1303> items, ApiRemoteService apiRemoteService, ApiConfs apiConf) {
+
+ //灏佽鍙傛暟
+ ApiParam param = new ApiParam(apiConf, Constant.API_CATEGORY_13, Constant.API_CODE_1303);
+
+ //鎺ㄩ�侊紝鏁版嵁涓洪泦鍚堝舰寮�
+ ResponseDto responseDto = apiRemoteService.pushData(param, apiConf, items);
+ if (responseDto.getSuccess() == 0) {
+ //鎺ㄩ�佹垚鍔燂紝鏇存柊鏁版嵁涓婁紶鐘舵��
+ for (Api1303 data : items) {
+ if (Constant.CZBZ_I.equals(data.getCzbz())) {
+ //鏇存柊鐘舵��
+ data.setCzbz(Constant.CZBZ_U);
+ api1303Rep.save(data);
+ }
+ }
+ }
+ return responseDto.toString();
}
}
diff --git a/src/main/java/com/fzzy/api/view/pr/Api1304PR.java b/src/main/java/com/fzzy/api/view/pr/Api1304PR.java
index df9cb4b..01ba44b 100644
--- a/src/main/java/com/fzzy/api/view/pr/Api1304PR.java
+++ b/src/main/java/com/fzzy/api/view/pr/Api1304PR.java
@@ -4,7 +4,7 @@
import com.bstek.dorado.annotation.DataResolver;
import com.bstek.dorado.annotation.Expose;
import com.bstek.dorado.data.provider.Page;
-import com.fzzy.api.entity.Api1304;
+import com.fzzy.api.data.PushProtocol;
import com.fzzy.api.entity.ApiConfs;
import com.fzzy.api.service.ApiCommonService;
import com.fzzy.api.service.ApiPushManager;
@@ -158,22 +158,36 @@
*/
@Expose
public String pushData(List<Api1304> items) {
- ResponseDto responseDto;
- String result = "";
- Api1304 d;
+
String kqdm = items.get(0).getKqdm();
ApiConfs apiConf = apiCommonService.getConf(kqdm);
if (null == apiConf) return "绯荤粺娌℃湁鑾峰彇鍒板綋鍓嶅簱鍖洪厤缃俊鎭紝鎵ц澶辫触";
- //灏佽鍙傛暟
- ApiParam param = new ApiParam(apiConf, Constant.API_CATEGORY_11, Constant.API_CODE_1304);
-
-
//鑾峰彇瀹炵幇鎺ュ彛
- ApiRemoteService apiService = apiPushManager.getApiRemoteService(param.getPushProtocol());
+ ApiRemoteService apiService = apiPushManager.getApiRemoteService(apiConf.getPushProtocol());
if (null == apiService) return "绯荤粺娌℃湁褰撳墠鎺ㄩ�佸崗璁厤缃紝鎵ц澶辫触";
+ if (PushProtocol.SB_SH_2023.getCode().equals(apiConf.getPushProtocol())) {
+ return pushDataList(items, apiService, apiConf);
+ }
+ return pushDataSingle(items, apiService, apiConf);
+ }
+ /**
+ * 鍗曟潯鏁版嵁json鎺ㄩ��
+ *
+ * @param items
+ * @param apiService
+ * @param apiConf
+ * @return
+ */
+ private String pushDataSingle(List<Api1304> items, ApiRemoteService apiService, ApiConfs apiConf) {
+ ResponseDto responseDto;
+ String result = "";
+
+ //灏佽鍙傛暟
+ ApiParam param = new ApiParam(apiConf, Constant.API_CATEGORY_13, Constant.API_CODE_1304);
+ Api1304 d;
for (Api1304 data : items) {
d = new Api1304();
BeanUtils.copyProperties(data, d);
@@ -189,4 +203,33 @@
}
return result;
}
+
+ /**
+ * 澶氭潯鏁版嵁json鎺ㄩ��
+ *
+ * @param items
+ * @param apiRemoteService
+ * @param apiConf
+ * @return
+ */
+ private String pushDataList(List<Api1304> items, ApiRemoteService apiRemoteService, ApiConfs apiConf) {
+
+ //灏佽鍙傛暟
+ ApiParam param = new ApiParam(apiConf, Constant.API_CATEGORY_13, Constant.API_CODE_1304);
+
+ //鎺ㄩ�侊紝鏁版嵁涓洪泦鍚堝舰寮�
+ ResponseDto responseDto = apiRemoteService.pushData(param, apiConf, items);
+ if (responseDto.getSuccess() == 0) {
+ //鎺ㄩ�佹垚鍔燂紝鏇存柊鏁版嵁涓婁紶鐘舵��
+ for (Api1304 data : items) {
+ if (Constant.CZBZ_I.equals(data.getCzbz())) {
+ //鏇存柊鐘舵��
+ data.setCzbz(Constant.CZBZ_U);
+ api1304Rep.save(data);
+ }
+ }
+ }
+ return responseDto.toString();
+ }
+
}
diff --git a/src/main/java/com/fzzy/api/view/pr/Api1305PR.java b/src/main/java/com/fzzy/api/view/pr/Api1305PR.java
index 14d4639..ddc04a1 100644
--- a/src/main/java/com/fzzy/api/view/pr/Api1305PR.java
+++ b/src/main/java/com/fzzy/api/view/pr/Api1305PR.java
@@ -4,7 +4,7 @@
import com.bstek.dorado.annotation.DataResolver;
import com.bstek.dorado.annotation.Expose;
import com.bstek.dorado.data.provider.Page;
-import com.fzzy.api.entity.Api1305;
+import com.fzzy.api.data.PushProtocol;
import com.fzzy.api.entity.ApiConfs;
import com.fzzy.api.service.ApiCommonService;
import com.fzzy.api.service.ApiPushManager;
@@ -159,22 +159,37 @@
*/
@Expose
public String pushData(List<Api1305> items) {
- ResponseDto responseDto;
- String result = "";
- Api1305 d;
+
String kqdm = items.get(0).getKqdm();
ApiConfs apiConf = apiCommonService.getConf(kqdm);
if (null == apiConf) return "绯荤粺娌℃湁鑾峰彇鍒板綋鍓嶅簱鍖洪厤缃俊鎭紝鎵ц澶辫触";
- //灏佽鍙傛暟
- ApiParam param = new ApiParam(apiConf, Constant.API_CATEGORY_11, Constant.API_CODE_1305);
-
-
//鑾峰彇瀹炵幇鎺ュ彛
- ApiRemoteService apiService = apiPushManager.getApiRemoteService(param.getPushProtocol());
+ ApiRemoteService apiService = apiPushManager.getApiRemoteService(apiConf.getPushProtocol());
if (null == apiService) return "绯荤粺娌℃湁褰撳墠鎺ㄩ�佸崗璁厤缃紝鎵ц澶辫触";
+ if (PushProtocol.SB_SH_2023.getCode().equals(apiConf.getPushProtocol())) {
+ return pushDataList(items, apiService, apiConf);
+ }
+ return pushDataSingle(items, apiService, apiConf);
+ }
+
+ /**
+ * 鍗曟潯鏁版嵁json鎺ㄩ��
+ *
+ * @param items
+ * @param apiService
+ * @param apiConf
+ * @return
+ */
+ private String pushDataSingle(List<Api1305> items, ApiRemoteService apiService, ApiConfs apiConf) {
+ ResponseDto responseDto;
+ String result = "";
+
+ //灏佽鍙傛暟
+ ApiParam param = new ApiParam(apiConf, Constant.API_CATEGORY_13, Constant.API_CODE_1305);
+ Api1305 d;
for (Api1305 data : items) {
d = new Api1305();
BeanUtils.copyProperties(data, d);
@@ -191,4 +206,32 @@
return result;
}
+ /**
+ * 澶氭潯鏁版嵁json鎺ㄩ��
+ *
+ * @param items
+ * @param apiRemoteService
+ * @param apiConf
+ * @return
+ */
+ private String pushDataList(List<Api1305> items, ApiRemoteService apiRemoteService, ApiConfs apiConf) {
+
+ //灏佽鍙傛暟
+ ApiParam param = new ApiParam(apiConf, Constant.API_CATEGORY_13, Constant.API_CODE_1305);
+
+ //鎺ㄩ�侊紝鏁版嵁涓洪泦鍚堝舰寮�
+ ResponseDto responseDto = apiRemoteService.pushData(param, apiConf, items);
+ if (responseDto.getSuccess() == 0) {
+ //鎺ㄩ�佹垚鍔燂紝鏇存柊鏁版嵁涓婁紶鐘舵��
+ for (Api1305 data : items) {
+ if (Constant.CZBZ_I.equals(data.getCzbz())) {
+ //鏇存柊鐘舵��
+ data.setCzbz(Constant.CZBZ_U);
+ api1305Rep.save(data);
+ }
+ }
+ }
+ return responseDto.toString();
+ }
+
}
diff --git a/src/main/java/com/fzzy/api/view/pr/Api1306PR.java b/src/main/java/com/fzzy/api/view/pr/Api1306PR.java
index 4018d46..386ca8b 100644
--- a/src/main/java/com/fzzy/api/view/pr/Api1306PR.java
+++ b/src/main/java/com/fzzy/api/view/pr/Api1306PR.java
@@ -4,7 +4,7 @@
import com.bstek.dorado.annotation.DataResolver;
import com.bstek.dorado.annotation.Expose;
import com.bstek.dorado.data.provider.Page;
-import com.fzzy.api.entity.Api1306;
+import com.fzzy.api.data.PushProtocol;
import com.fzzy.api.entity.ApiConfs;
import com.fzzy.api.service.ApiCommonService;
import com.fzzy.api.service.ApiPushManager;
@@ -158,22 +158,37 @@
*/
@Expose
public String pushData(List<Api1306> items) {
- ResponseDto responseDto;
- String result = "";
- Api1306 d;
+
String kqdm = items.get(0).getKqdm();
ApiConfs apiConf = apiCommonService.getConf(kqdm);
if (null == apiConf) return "绯荤粺娌℃湁鑾峰彇鍒板綋鍓嶅簱鍖洪厤缃俊鎭紝鎵ц澶辫触";
- //灏佽鍙傛暟
- ApiParam param = new ApiParam(apiConf, Constant.API_CATEGORY_11, Constant.API_CODE_1306);
-
-
//鑾峰彇瀹炵幇鎺ュ彛
- ApiRemoteService apiService = apiPushManager.getApiRemoteService(param.getPushProtocol());
+ ApiRemoteService apiService = apiPushManager.getApiRemoteService(apiConf.getPushProtocol());
if (null == apiService) return "绯荤粺娌℃湁褰撳墠鎺ㄩ�佸崗璁厤缃紝鎵ц澶辫触";
+ if (PushProtocol.SB_SH_2023.getCode().equals(apiConf.getPushProtocol())) {
+ return pushDataList(items, apiService, apiConf);
+ }
+ return pushDataSingle(items, apiService, apiConf);
+ }
+
+ /**
+ * 鍗曟潯鏁版嵁json鎺ㄩ��
+ *
+ * @param items
+ * @param apiService
+ * @param apiConf
+ * @return
+ */
+ private String pushDataSingle(List<Api1306> items, ApiRemoteService apiService, ApiConfs apiConf) {
+ ResponseDto responseDto;
+ String result = "";
+
+ //灏佽鍙傛暟
+ ApiParam param = new ApiParam(apiConf, Constant.API_CATEGORY_13, Constant.API_CODE_1306);
+ Api1306 d;
for (Api1306 data : items) {
d = new Api1306();
BeanUtils.copyProperties(data, d);
@@ -190,4 +205,32 @@
return result;
}
+ /**
+ * 澶氭潯鏁版嵁json鎺ㄩ��
+ *
+ * @param items
+ * @param apiRemoteService
+ * @param apiConf
+ * @return
+ */
+ private String pushDataList(List<Api1306> items, ApiRemoteService apiRemoteService, ApiConfs apiConf) {
+
+ //灏佽鍙傛暟
+ ApiParam param = new ApiParam(apiConf, Constant.API_CATEGORY_13, Constant.API_CODE_1306);
+
+ //鎺ㄩ�侊紝鏁版嵁涓洪泦鍚堝舰寮�
+ ResponseDto responseDto = apiRemoteService.pushData(param, apiConf, items);
+ if (responseDto.getSuccess() == 0) {
+ //鎺ㄩ�佹垚鍔燂紝鏇存柊鏁版嵁涓婁紶鐘舵��
+ for (Api1306 data : items) {
+ if (Constant.CZBZ_I.equals(data.getCzbz())) {
+ //鏇存柊鐘舵��
+ data.setCzbz(Constant.CZBZ_U);
+ api1306Rep.save(data);
+ }
+ }
+ }
+ return responseDto.toString();
+ }
+
}
diff --git a/src/main/java/com/fzzy/api/view/pr/Api1307PR.java b/src/main/java/com/fzzy/api/view/pr/Api1307PR.java
index 704f4a4..ed31140 100644
--- a/src/main/java/com/fzzy/api/view/pr/Api1307PR.java
+++ b/src/main/java/com/fzzy/api/view/pr/Api1307PR.java
@@ -4,7 +4,7 @@
import com.bstek.dorado.annotation.DataResolver;
import com.bstek.dorado.annotation.Expose;
import com.bstek.dorado.data.provider.Page;
-import com.fzzy.api.entity.Api1307;
+import com.fzzy.api.data.PushProtocol;
import com.fzzy.api.entity.ApiConfs;
import com.fzzy.api.service.ApiCommonService;
import com.fzzy.api.service.ApiPushManager;
@@ -162,22 +162,37 @@
*/
@Expose
public String pushData(List<Api1307> items) {
- ResponseDto responseDto;
- String result = "";
- Api1307 d;
+
String kqdm = items.get(0).getKqdm();
ApiConfs apiConf = apiCommonService.getConf(kqdm);
if (null == apiConf) return "绯荤粺娌℃湁鑾峰彇鍒板綋鍓嶅簱鍖洪厤缃俊鎭紝鎵ц澶辫触";
- //灏佽鍙傛暟
- ApiParam param = new ApiParam(apiConf, Constant.API_CATEGORY_11, Constant.API_CODE_1307);
-
-
//鑾峰彇瀹炵幇鎺ュ彛
- ApiRemoteService apiService = apiPushManager.getApiRemoteService(param.getPushProtocol());
+ ApiRemoteService apiService = apiPushManager.getApiRemoteService(apiConf.getPushProtocol());
if (null == apiService) return "绯荤粺娌℃湁褰撳墠鎺ㄩ�佸崗璁厤缃紝鎵ц澶辫触";
+ if (PushProtocol.SB_SH_2023.getCode().equals(apiConf.getPushProtocol())) {
+ return pushDataList(items, apiService, apiConf);
+ }
+ return pushDataSingle(items, apiService, apiConf);
+ }
+
+ /**
+ * 鍗曟潯鏁版嵁json鎺ㄩ��
+ *
+ * @param items
+ * @param apiService
+ * @param apiConf
+ * @return
+ */
+ private String pushDataSingle(List<Api1307> items, ApiRemoteService apiService, ApiConfs apiConf) {
+ ResponseDto responseDto;
+ String result = "";
+
+ //灏佽鍙傛暟
+ ApiParam param = new ApiParam(apiConf, Constant.API_CATEGORY_13, Constant.API_CODE_1307);
+ Api1307 d;
for (Api1307 data : items) {
d = new Api1307();
BeanUtils.copyProperties(data, d);
@@ -194,4 +209,32 @@
return result;
}
+ /**
+ * 澶氭潯鏁版嵁json鎺ㄩ��
+ *
+ * @param items
+ * @param apiRemoteService
+ * @param apiConf
+ * @return
+ */
+ private String pushDataList(List<Api1307> items, ApiRemoteService apiRemoteService, ApiConfs apiConf) {
+
+ //灏佽鍙傛暟
+ ApiParam param = new ApiParam(apiConf, Constant.API_CATEGORY_13, Constant.API_CODE_1307);
+
+ //鎺ㄩ�侊紝鏁版嵁涓洪泦鍚堝舰寮�
+ ResponseDto responseDto = apiRemoteService.pushData(param, apiConf, items);
+ if (responseDto.getSuccess() == 0) {
+ //鎺ㄩ�佹垚鍔燂紝鏇存柊鏁版嵁涓婁紶鐘舵��
+ for (Api1307 data : items) {
+ if (Constant.CZBZ_I.equals(data.getCzbz())) {
+ //鏇存柊鐘舵��
+ data.setCzbz(Constant.CZBZ_U);
+ api1307Rep.save(data);
+ }
+ }
+ }
+ return responseDto.toString();
+ }
+
}
diff --git a/src/main/java/com/fzzy/api/view/pr/Api1308PR.java b/src/main/java/com/fzzy/api/view/pr/Api1308PR.java
index f1b4601..32154ab 100644
--- a/src/main/java/com/fzzy/api/view/pr/Api1308PR.java
+++ b/src/main/java/com/fzzy/api/view/pr/Api1308PR.java
@@ -4,7 +4,7 @@
import com.bstek.dorado.annotation.DataResolver;
import com.bstek.dorado.annotation.Expose;
import com.bstek.dorado.data.provider.Page;
-import com.fzzy.api.entity.Api1308;
+import com.fzzy.api.data.PushProtocol;
import com.fzzy.api.entity.ApiConfs;
import com.fzzy.api.service.ApiCommonService;
import com.fzzy.api.service.ApiPushManager;
@@ -160,22 +160,37 @@
*/
@Expose
public String pushData(List<Api1308> items) {
- ResponseDto responseDto;
- String result = "";
- Api1308 d;
+
String kqdm = items.get(0).getKqdm();
ApiConfs apiConf = apiCommonService.getConf(kqdm);
if (null == apiConf) return "绯荤粺娌℃湁鑾峰彇鍒板綋鍓嶅簱鍖洪厤缃俊鎭紝鎵ц澶辫触";
- //灏佽鍙傛暟
- ApiParam param = new ApiParam(apiConf, Constant.API_CATEGORY_11, Constant.API_CODE_1308);
-
-
//鑾峰彇瀹炵幇鎺ュ彛
- ApiRemoteService apiService = apiPushManager.getApiRemoteService(param.getPushProtocol());
+ ApiRemoteService apiService = apiPushManager.getApiRemoteService(apiConf.getPushProtocol());
if (null == apiService) return "绯荤粺娌℃湁褰撳墠鎺ㄩ�佸崗璁厤缃紝鎵ц澶辫触";
+ if (PushProtocol.SB_SH_2023.getCode().equals(apiConf.getPushProtocol())) {
+ return pushDataList(items, apiService, apiConf);
+ }
+ return pushDataSingle(items, apiService, apiConf);
+ }
+
+ /**
+ * 鍗曟潯鏁版嵁json鎺ㄩ��
+ *
+ * @param items
+ * @param apiService
+ * @param apiConf
+ * @return
+ */
+ private String pushDataSingle(List<Api1308> items, ApiRemoteService apiService, ApiConfs apiConf) {
+ ResponseDto responseDto;
+ String result = "";
+
+ //灏佽鍙傛暟
+ ApiParam param = new ApiParam(apiConf, Constant.API_CATEGORY_13, Constant.API_CODE_1308);
+ Api1308 d;
for (Api1308 data : items) {
d = new Api1308();
BeanUtils.copyProperties(data, d);
@@ -192,4 +207,32 @@
return result;
}
+ /**
+ * 澶氭潯鏁版嵁json鎺ㄩ��
+ *
+ * @param items
+ * @param apiRemoteService
+ * @param apiConf
+ * @return
+ */
+ private String pushDataList(List<Api1308> items, ApiRemoteService apiRemoteService, ApiConfs apiConf) {
+
+ //灏佽鍙傛暟
+ ApiParam param = new ApiParam(apiConf, Constant.API_CATEGORY_13, Constant.API_CODE_1308);
+
+ //鎺ㄩ�侊紝鏁版嵁涓洪泦鍚堝舰寮�
+ ResponseDto responseDto = apiRemoteService.pushData(param, apiConf, items);
+ if (responseDto.getSuccess() == 0) {
+ //鎺ㄩ�佹垚鍔燂紝鏇存柊鏁版嵁涓婁紶鐘舵��
+ for (Api1308 data : items) {
+ if (Constant.CZBZ_I.equals(data.getCzbz())) {
+ //鏇存柊鐘舵��
+ data.setCzbz(Constant.CZBZ_U);
+ api1308Rep.save(data);
+ }
+ }
+ }
+ return responseDto.toString();
+ }
+
}
diff --git a/src/main/java/com/fzzy/api/view/pr/Api1309PR.java b/src/main/java/com/fzzy/api/view/pr/Api1309PR.java
index b194931..b339b29 100644
--- a/src/main/java/com/fzzy/api/view/pr/Api1309PR.java
+++ b/src/main/java/com/fzzy/api/view/pr/Api1309PR.java
@@ -4,6 +4,7 @@
import com.bstek.dorado.annotation.DataResolver;
import com.bstek.dorado.annotation.Expose;
import com.bstek.dorado.data.provider.Page;
+import com.fzzy.api.data.PushProtocol;
import com.fzzy.api.entity.Api1309;
import com.fzzy.api.entity.ApiConfs;
import com.fzzy.api.service.ApiCommonService;
@@ -158,22 +159,37 @@
*/
@Expose
public String pushData(List<Api1309> items) {
- ResponseDto responseDto;
- String result = "";
- Api1309 d;
+
String kqdm = items.get(0).getKqdm();
ApiConfs apiConf = apiCommonService.getConf(kqdm);
if (null == apiConf) return "绯荤粺娌℃湁鑾峰彇鍒板綋鍓嶅簱鍖洪厤缃俊鎭紝鎵ц澶辫触";
- //灏佽鍙傛暟
- ApiParam param = new ApiParam(apiConf, Constant.API_CATEGORY_11, Constant.API_CODE_1309);
-
-
//鑾峰彇瀹炵幇鎺ュ彛
- ApiRemoteService apiService = apiPushManager.getApiRemoteService(param.getPushProtocol());
+ ApiRemoteService apiService = apiPushManager.getApiRemoteService(apiConf.getPushProtocol());
if (null == apiService) return "绯荤粺娌℃湁褰撳墠鎺ㄩ�佸崗璁厤缃紝鎵ц澶辫触";
+ if (PushProtocol.SB_SH_2023.getCode().equals(apiConf.getPushProtocol())) {
+ return pushDataList(items, apiService, apiConf);
+ }
+ return pushDataSingle(items, apiService, apiConf);
+ }
+
+ /**
+ * 鍗曟潯鏁版嵁json鎺ㄩ��
+ *
+ * @param items
+ * @param apiService
+ * @param apiConf
+ * @return
+ */
+ private String pushDataSingle(List<Api1309> items, ApiRemoteService apiService, ApiConfs apiConf) {
+ ResponseDto responseDto;
+ String result = "";
+
+ //灏佽鍙傛暟
+ ApiParam param = new ApiParam(apiConf, Constant.API_CATEGORY_13, Constant.API_CODE_1309);
+ Api1309 d;
for (Api1309 data : items) {
d = new Api1309();
BeanUtils.copyProperties(data, d);
@@ -190,4 +206,32 @@
return result;
}
+ /**
+ * 澶氭潯鏁版嵁json鎺ㄩ��
+ *
+ * @param items
+ * @param apiRemoteService
+ * @param apiConf
+ * @return
+ */
+ private String pushDataList(List<Api1309> items, ApiRemoteService apiRemoteService, ApiConfs apiConf) {
+
+ //灏佽鍙傛暟
+ ApiParam param = new ApiParam(apiConf, Constant.API_CATEGORY_13, Constant.API_CODE_1309);
+
+ //鎺ㄩ�侊紝鏁版嵁涓洪泦鍚堝舰寮�
+ ResponseDto responseDto = apiRemoteService.pushData(param, apiConf, items);
+ if (responseDto.getSuccess() == 0) {
+ //鎺ㄩ�佹垚鍔燂紝鏇存柊鏁版嵁涓婁紶鐘舵��
+ for (Api1309 data : items) {
+ if (Constant.CZBZ_I.equals(data.getCzbz())) {
+ //鏇存柊鐘舵��
+ data.setCzbz(Constant.CZBZ_U);
+ api1309Rep.save(data);
+ }
+ }
+ }
+ return responseDto.toString();
+ }
+
}
diff --git a/src/main/java/com/fzzy/api/view/pr/Api1310PR.java b/src/main/java/com/fzzy/api/view/pr/Api1310PR.java
index e0098d1..ce899fd 100644
--- a/src/main/java/com/fzzy/api/view/pr/Api1310PR.java
+++ b/src/main/java/com/fzzy/api/view/pr/Api1310PR.java
@@ -4,7 +4,7 @@
import com.bstek.dorado.annotation.DataResolver;
import com.bstek.dorado.annotation.Expose;
import com.bstek.dorado.data.provider.Page;
-import com.fzzy.api.entity.Api1310;
+import com.fzzy.api.data.PushProtocol;
import com.fzzy.api.entity.ApiConfs;
import com.fzzy.api.service.ApiCommonService;
import com.fzzy.api.service.ApiPushManager;
@@ -157,22 +157,38 @@
*/
@Expose
public String pushData(List<Api1310> items) {
- ResponseDto responseDto;
- String result = "";
- Api1310 d;
+
String kqdm = items.get(0).getKqdm();
ApiConfs apiConf = apiCommonService.getConf(kqdm);
if (null == apiConf) return "绯荤粺娌℃湁鑾峰彇鍒板綋鍓嶅簱鍖洪厤缃俊鎭紝鎵ц澶辫触";
- //灏佽鍙傛暟
- ApiParam param = new ApiParam(apiConf, Constant.API_CATEGORY_11, Constant.API_CODE_1310);
-
-
//鑾峰彇瀹炵幇鎺ュ彛
- ApiRemoteService apiService = apiPushManager.getApiRemoteService(param.getPushProtocol());
+ ApiRemoteService apiService = apiPushManager.getApiRemoteService(apiConf.getPushProtocol());
if (null == apiService) return "绯荤粺娌℃湁褰撳墠鎺ㄩ�佸崗璁厤缃紝鎵ц澶辫触";
+ if (PushProtocol.SB_SH_2023.getCode().equals(apiConf.getPushProtocol())) {
+ return pushDataList(items, apiService, apiConf);
+ }
+ return pushDataSingle(items, apiService, apiConf);
+ }
+
+
+ /**
+ * 鍗曟潯鏁版嵁json鎺ㄩ��
+ *
+ * @param items
+ * @param apiService
+ * @param apiConf
+ * @return
+ */
+ private String pushDataSingle(List<Api1310> items, ApiRemoteService apiService, ApiConfs apiConf) {
+ ResponseDto responseDto;
+ String result = "";
+
+ //灏佽鍙傛暟
+ ApiParam param = new ApiParam(apiConf, Constant.API_CATEGORY_13, Constant.API_CODE_1310);
+ Api1310 d;
for (Api1310 data : items) {
d = new Api1310();
BeanUtils.copyProperties(data, d);
@@ -189,4 +205,32 @@
return result;
}
+ /**
+ * 澶氭潯鏁版嵁json鎺ㄩ��
+ *
+ * @param items
+ * @param apiRemoteService
+ * @param apiConf
+ * @return
+ */
+ private String pushDataList(List<Api1310> items, ApiRemoteService apiRemoteService, ApiConfs apiConf) {
+
+ //灏佽鍙傛暟
+ ApiParam param = new ApiParam(apiConf, Constant.API_CATEGORY_13, Constant.API_CODE_1310);
+
+ //鎺ㄩ�侊紝鏁版嵁涓洪泦鍚堝舰寮�
+ ResponseDto responseDto = apiRemoteService.pushData(param, apiConf, items);
+ if (responseDto.getSuccess() == 0) {
+ //鎺ㄩ�佹垚鍔燂紝鏇存柊鏁版嵁涓婁紶鐘舵��
+ for (Api1310 data : items) {
+ if (Constant.CZBZ_I.equals(data.getCzbz())) {
+ //鏇存柊鐘舵��
+ data.setCzbz(Constant.CZBZ_U);
+ api1310Rep.save(data);
+ }
+ }
+ }
+ return responseDto.toString();
+ }
+
}
diff --git a/src/main/java/com/fzzy/api/view/pr/Api1401PR.java b/src/main/java/com/fzzy/api/view/pr/Api1401PR.java
index 8dc2c0a..f3306ef 100644
--- a/src/main/java/com/fzzy/api/view/pr/Api1401PR.java
+++ b/src/main/java/com/fzzy/api/view/pr/Api1401PR.java
@@ -4,6 +4,7 @@
import com.bstek.dorado.annotation.DataResolver;
import com.bstek.dorado.annotation.Expose;
import com.bstek.dorado.data.provider.Page;
+import com.fzzy.api.data.PushProtocol;
import com.fzzy.api.entity.Api1401;
import com.fzzy.api.entity.ApiConfs;
import com.fzzy.api.service.ApiCommonService;
@@ -158,22 +159,37 @@
*/
@Expose
public String pushData(List<Api1401> items) {
- ResponseDto responseDto;
- String result = "";
- Api1401 d;
+
String kqdm = items.get(0).getKqdm();
ApiConfs apiConf = apiCommonService.getConf(kqdm);
if (null == apiConf) return "绯荤粺娌℃湁鑾峰彇鍒板綋鍓嶅簱鍖洪厤缃俊鎭紝鎵ц澶辫触";
- //灏佽鍙傛暟
- ApiParam param = new ApiParam(apiConf, Constant.API_CATEGORY_11, Constant.API_CODE_1401);
-
-
//鑾峰彇瀹炵幇鎺ュ彛
- ApiRemoteService apiService = apiPushManager.getApiRemoteService(param.getPushProtocol());
+ ApiRemoteService apiService = apiPushManager.getApiRemoteService(apiConf.getPushProtocol());
if (null == apiService) return "绯荤粺娌℃湁褰撳墠鎺ㄩ�佸崗璁厤缃紝鎵ц澶辫触";
+ if (PushProtocol.SB_SH_2023.getCode().equals(apiConf.getPushProtocol())) {
+ return pushDataList(items, apiService, apiConf);
+ }
+ return pushDataSingle(items, apiService, apiConf);
+ }
+
+ /**
+ * 鍗曟潯鏁版嵁json鎺ㄩ��
+ *
+ * @param items
+ * @param apiService
+ * @param apiConf
+ * @return
+ */
+ private String pushDataSingle(List<Api1401> items, ApiRemoteService apiService, ApiConfs apiConf) {
+ ResponseDto responseDto;
+ String result = "";
+
+ //灏佽鍙傛暟
+ ApiParam param = new ApiParam(apiConf, Constant.API_CATEGORY_14, Constant.API_CODE_1401);
+ Api1401 d;
for (Api1401 data : items) {
d = new Api1401();
BeanUtils.copyProperties(data, d);
@@ -189,4 +205,32 @@
}
return result;
}
+
+ /**
+ * 澶氭潯鏁版嵁json鎺ㄩ��
+ *
+ * @param items
+ * @param apiRemoteService
+ * @param apiConf
+ * @return
+ */
+ private String pushDataList(List<Api1401> items, ApiRemoteService apiRemoteService, ApiConfs apiConf) {
+
+ //灏佽鍙傛暟
+ ApiParam param = new ApiParam(apiConf, Constant.API_CATEGORY_14, Constant.API_CODE_1401);
+
+ //鎺ㄩ�侊紝鏁版嵁涓洪泦鍚堝舰寮�
+ ResponseDto responseDto = apiRemoteService.pushData(param, apiConf, items);
+ if (responseDto.getSuccess() == 0) {
+ //鎺ㄩ�佹垚鍔燂紝鏇存柊鏁版嵁涓婁紶鐘舵��
+ for (Api1401 data : items) {
+ if (Constant.CZBZ_I.equals(data.getCzbz())) {
+ //鏇存柊鐘舵��
+ data.setCzbz(Constant.CZBZ_U);
+ api1401Rep.save(data);
+ }
+ }
+ }
+ return responseDto.toString();
+ }
}
diff --git a/src/main/java/com/fzzy/api/view/pr/Api1402PR.java b/src/main/java/com/fzzy/api/view/pr/Api1402PR.java
index 8ad273e..d3d0730 100644
--- a/src/main/java/com/fzzy/api/view/pr/Api1402PR.java
+++ b/src/main/java/com/fzzy/api/view/pr/Api1402PR.java
@@ -4,7 +4,7 @@
import com.bstek.dorado.annotation.DataResolver;
import com.bstek.dorado.annotation.Expose;
import com.bstek.dorado.data.provider.Page;
-import com.fzzy.api.entity.Api1402;
+import com.fzzy.api.data.PushProtocol;
import com.fzzy.api.entity.ApiConfs;
import com.fzzy.api.service.ApiCommonService;
import com.fzzy.api.service.ApiPushManager;
@@ -158,22 +158,37 @@
*/
@Expose
public String pushData(List<Api1402> items) {
- ResponseDto responseDto;
- String result = "";
- Api1402 d;
+
String kqdm = items.get(0).getKqdm();
ApiConfs apiConf = apiCommonService.getConf(kqdm);
if (null == apiConf) return "绯荤粺娌℃湁鑾峰彇鍒板綋鍓嶅簱鍖洪厤缃俊鎭紝鎵ц澶辫触";
- //灏佽鍙傛暟
- ApiParam param = new ApiParam(apiConf, Constant.API_CATEGORY_11, Constant.API_CODE_1402);
-
-
//鑾峰彇瀹炵幇鎺ュ彛
- ApiRemoteService apiService = apiPushManager.getApiRemoteService(param.getPushProtocol());
+ ApiRemoteService apiService = apiPushManager.getApiRemoteService(apiConf.getPushProtocol());
if (null == apiService) return "绯荤粺娌℃湁褰撳墠鎺ㄩ�佸崗璁厤缃紝鎵ц澶辫触";
+ if (PushProtocol.SB_SH_2023.getCode().equals(apiConf.getPushProtocol())) {
+ return pushDataList(items, apiService, apiConf);
+ }
+ return pushDataSingle(items, apiService, apiConf);
+ }
+
+ /**
+ * 鍗曟潯鏁版嵁json鎺ㄩ��
+ *
+ * @param items
+ * @param apiService
+ * @param apiConf
+ * @return
+ */
+ private String pushDataSingle(List<Api1402> items, ApiRemoteService apiService, ApiConfs apiConf) {
+ ResponseDto responseDto;
+ String result = "";
+
+ //灏佽鍙傛暟
+ ApiParam param = new ApiParam(apiConf, Constant.API_CATEGORY_14, Constant.API_CODE_1402);
+ Api1402 d;
for (Api1402 data : items) {
d = new Api1402();
BeanUtils.copyProperties(data, d);
@@ -190,4 +205,32 @@
return result;
}
+ /**
+ * 澶氭潯鏁版嵁json鎺ㄩ��
+ *
+ * @param items
+ * @param apiRemoteService
+ * @param apiConf
+ * @return
+ */
+ private String pushDataList(List<Api1402> items, ApiRemoteService apiRemoteService, ApiConfs apiConf) {
+
+ //灏佽鍙傛暟
+ ApiParam param = new ApiParam(apiConf, Constant.API_CATEGORY_14, Constant.API_CODE_1402);
+
+ //鎺ㄩ�侊紝鏁版嵁涓洪泦鍚堝舰寮�
+ ResponseDto responseDto = apiRemoteService.pushData(param, apiConf, items);
+ if (responseDto.getSuccess() == 0) {
+ //鎺ㄩ�佹垚鍔燂紝鏇存柊鏁版嵁涓婁紶鐘舵��
+ for (Api1402 data : items) {
+ if (Constant.CZBZ_I.equals(data.getCzbz())) {
+ //鏇存柊鐘舵��
+ data.setCzbz(Constant.CZBZ_U);
+ api1402Rep.save(data);
+ }
+ }
+ }
+ return responseDto.toString();
+ }
+
}
diff --git a/src/main/java/com/fzzy/api/view/pr/Api1403PR.java b/src/main/java/com/fzzy/api/view/pr/Api1403PR.java
index 66f41e6..0fde731 100644
--- a/src/main/java/com/fzzy/api/view/pr/Api1403PR.java
+++ b/src/main/java/com/fzzy/api/view/pr/Api1403PR.java
@@ -4,6 +4,7 @@
import com.bstek.dorado.annotation.DataResolver;
import com.bstek.dorado.annotation.Expose;
import com.bstek.dorado.data.provider.Page;
+import com.fzzy.api.data.PushProtocol;
import com.fzzy.api.entity.Api1403;
import com.fzzy.api.entity.ApiConfs;
import com.fzzy.api.service.ApiCommonService;
@@ -173,7 +174,27 @@
//鑾峰彇瀹炵幇鎺ュ彛
ApiRemoteService apiService = apiPushManager.getApiRemoteService(param.getPushProtocol());
if (null == apiService) return "绯荤粺娌℃湁褰撳墠鎺ㄩ�佸崗璁厤缃紝鎵ц澶辫触";
+ if (PushProtocol.SB_SH_2023.getCode().equals(apiConf.getPushProtocol())) {
+ return pushDataList(items, apiService, apiConf);
+ }
+ return pushDataSingle(items, apiService, apiConf);
+ }
+ /**
+ * 鍗曟潯鏁版嵁json鎺ㄩ��
+ *
+ * @param items
+ * @param apiService
+ * @param apiConf
+ * @return
+ */
+ private String pushDataSingle(List<Api1403> items, ApiRemoteService apiService, ApiConfs apiConf) {
+ ResponseDto responseDto;
+ String result = "";
+
+ //灏佽鍙傛暟
+ ApiParam param = new ApiParam(apiConf, Constant.API_CATEGORY_14, Constant.API_CODE_1403);
+ Api1403 d;
for (Api1403 data : items) {
d = new Api1403();
BeanUtils.copyProperties(data, d);
@@ -189,4 +210,32 @@
}
return result;
}
+
+ /**
+ * 澶氭潯鏁版嵁json鎺ㄩ��
+ *
+ * @param items
+ * @param apiRemoteService
+ * @param apiConf
+ * @return
+ */
+ private String pushDataList(List<Api1403> items, ApiRemoteService apiRemoteService, ApiConfs apiConf) {
+
+ //灏佽鍙傛暟
+ ApiParam param = new ApiParam(apiConf, Constant.API_CATEGORY_14, Constant.API_CODE_1403);
+
+ //鎺ㄩ�侊紝鏁版嵁涓洪泦鍚堝舰寮�
+ ResponseDto responseDto = apiRemoteService.pushData(param, apiConf, items);
+ if (responseDto.getSuccess() == 0) {
+ //鎺ㄩ�佹垚鍔燂紝鏇存柊鏁版嵁涓婁紶鐘舵��
+ for (Api1403 data : items) {
+ if (Constant.CZBZ_I.equals(data.getCzbz())) {
+ //鏇存柊鐘舵��
+ data.setCzbz(Constant.CZBZ_U);
+ api1403Rep.save(data);
+ }
+ }
+ }
+ return responseDto.toString();
+ }
}
diff --git a/src/main/java/com/fzzy/api/view/pr/Api1404PR.java b/src/main/java/com/fzzy/api/view/pr/Api1404PR.java
index f5d1010..cfbf5e6 100644
--- a/src/main/java/com/fzzy/api/view/pr/Api1404PR.java
+++ b/src/main/java/com/fzzy/api/view/pr/Api1404PR.java
@@ -4,6 +4,7 @@
import com.bstek.dorado.annotation.DataResolver;
import com.bstek.dorado.annotation.Expose;
import com.bstek.dorado.data.provider.Page;
+import com.fzzy.api.data.PushProtocol;
import com.fzzy.api.entity.Api1404;
import com.fzzy.api.entity.ApiConfs;
import com.fzzy.api.service.ApiCommonService;
@@ -158,22 +159,35 @@
*/
@Expose
public String pushData(List<Api1404> items) {
- ResponseDto responseDto;
- String result = "";
- Api1404 d;
+
String kqdm = items.get(0).getKqdm();
ApiConfs apiConf = apiCommonService.getConf(kqdm);
if (null == apiConf) return "绯荤粺娌℃湁鑾峰彇鍒板綋鍓嶅簱鍖洪厤缃俊鎭紝鎵ц澶辫触";
- //灏佽鍙傛暟
- ApiParam param = new ApiParam(apiConf, Constant.API_CATEGORY_11, Constant.API_CODE_1404);
-
-
//鑾峰彇瀹炵幇鎺ュ彛
- ApiRemoteService apiService = apiPushManager.getApiRemoteService(param.getPushProtocol());
+ ApiRemoteService apiService = apiPushManager.getApiRemoteService(apiConf.getPushProtocol());
if (null == apiService) return "绯荤粺娌℃湁褰撳墠鎺ㄩ�佸崗璁厤缃紝鎵ц澶辫触";
+ if (PushProtocol.SB_SH_2023.getCode().equals(apiConf.getPushProtocol())) {
+ return pushDataList(items, apiService, apiConf);
+ }
+ return pushDataSingle(items, apiService, apiConf);
+ }
+ /**
+ * 鍗曟潯鏁版嵁json鎺ㄩ��
+ *
+ * @param items
+ * @param apiService
+ * @param apiConf
+ * @return
+ */
+ private String pushDataSingle(List<Api1404> items, ApiRemoteService apiService, ApiConfs apiConf) {
+ ResponseDto responseDto;
+ String result = "";
+ //灏佽鍙傛暟
+ ApiParam param = new ApiParam(apiConf, Constant.API_CATEGORY_14, Constant.API_CODE_1404);
+ Api1404 d;
for (Api1404 data : items) {
d = new Api1404();
BeanUtils.copyProperties(data, d);
@@ -190,4 +204,32 @@
return result;
}
+ /**
+ * 澶氭潯鏁版嵁json鎺ㄩ��
+ *
+ * @param items
+ * @param apiRemoteService
+ * @param apiConf
+ * @return
+ */
+ private String pushDataList(List<Api1404> items, ApiRemoteService apiRemoteService, ApiConfs apiConf) {
+
+ //灏佽鍙傛暟
+ ApiParam param = new ApiParam(apiConf, Constant.API_CATEGORY_14, Constant.API_CODE_1404);
+
+ //鎺ㄩ�侊紝鏁版嵁涓洪泦鍚堝舰寮�
+ ResponseDto responseDto = apiRemoteService.pushData(param, apiConf, items);
+ if (responseDto.getSuccess() == 0) {
+ //鎺ㄩ�佹垚鍔燂紝鏇存柊鏁版嵁涓婁紶鐘舵��
+ for (Api1404 data : items) {
+ if (Constant.CZBZ_I.equals(data.getCzbz())) {
+ //鏇存柊鐘舵��
+ data.setCzbz(Constant.CZBZ_U);
+ api1404Rep.save(data);
+ }
+ }
+ }
+ return responseDto.toString();
+ }
+
}
diff --git a/src/main/java/com/fzzy/api/view/pr/Api1405PR.java b/src/main/java/com/fzzy/api/view/pr/Api1405PR.java
index 1d8bd89..014b0b1 100644
--- a/src/main/java/com/fzzy/api/view/pr/Api1405PR.java
+++ b/src/main/java/com/fzzy/api/view/pr/Api1405PR.java
@@ -4,6 +4,7 @@
import com.bstek.dorado.annotation.DataResolver;
import com.bstek.dorado.annotation.Expose;
import com.bstek.dorado.data.provider.Page;
+import com.fzzy.api.data.PushProtocol;
import com.fzzy.api.entity.Api1405;
import com.fzzy.api.entity.ApiConfs;
import com.fzzy.api.service.ApiCommonService;
@@ -157,22 +158,37 @@
*/
@Expose
public String pushData(List<Api1405> items) {
- ResponseDto responseDto;
- String result = "";
- Api1405 d;
+
String kqdm = items.get(0).getKqdm();
ApiConfs apiConf = apiCommonService.getConf(kqdm);
if (null == apiConf) return "绯荤粺娌℃湁鑾峰彇鍒板綋鍓嶅簱鍖洪厤缃俊鎭紝鎵ц澶辫触";
- //灏佽鍙傛暟
- ApiParam param = new ApiParam(apiConf, Constant.API_CATEGORY_11, Constant.API_CODE_1405);
-
-
//鑾峰彇瀹炵幇鎺ュ彛
- ApiRemoteService apiService = apiPushManager.getApiRemoteService(param.getPushProtocol());
+ ApiRemoteService apiService = apiPushManager.getApiRemoteService(apiConf.getPushProtocol());
if (null == apiService) return "绯荤粺娌℃湁褰撳墠鎺ㄩ�佸崗璁厤缃紝鎵ц澶辫触";
+ if (PushProtocol.SB_SH_2023.getCode().equals(apiConf.getPushProtocol())) {
+ return pushDataList(items, apiService, apiConf);
+ }
+ return pushDataSingle(items, apiService, apiConf);
+ }
+
+ /**
+ * 鍗曟潯鏁版嵁json鎺ㄩ��
+ *
+ * @param items
+ * @param apiService
+ * @param apiConf
+ * @return
+ */
+ private String pushDataSingle(List<Api1405> items, ApiRemoteService apiService, ApiConfs apiConf) {
+ ResponseDto responseDto;
+ String result = "";
+
+ //灏佽鍙傛暟
+ ApiParam param = new ApiParam(apiConf, Constant.API_CATEGORY_14, Constant.API_CODE_1405);
+ Api1405 d;
for (Api1405 data : items) {
d = new Api1405();
BeanUtils.copyProperties(data, d);
@@ -189,4 +205,32 @@
return result;
}
+ /**
+ * 澶氭潯鏁版嵁json鎺ㄩ��
+ *
+ * @param items
+ * @param apiRemoteService
+ * @param apiConf
+ * @return
+ */
+ private String pushDataList(List<Api1405> items, ApiRemoteService apiRemoteService, ApiConfs apiConf) {
+
+ //灏佽鍙傛暟
+ ApiParam param = new ApiParam(apiConf, Constant.API_CATEGORY_14, Constant.API_CODE_1405);
+
+ //鎺ㄩ�侊紝鏁版嵁涓洪泦鍚堝舰寮�
+ ResponseDto responseDto = apiRemoteService.pushData(param, apiConf, items);
+ if (responseDto.getSuccess() == 0) {
+ //鎺ㄩ�佹垚鍔燂紝鏇存柊鏁版嵁涓婁紶鐘舵��
+ for (Api1405 data : items) {
+ if (Constant.CZBZ_I.equals(data.getCzbz())) {
+ //鏇存柊鐘舵��
+ data.setCzbz(Constant.CZBZ_U);
+ api1405Rep.save(data);
+ }
+ }
+ }
+ return responseDto.toString();
+ }
+
}
diff --git a/src/main/java/com/fzzy/api/view/pr/Api1501PR.java b/src/main/java/com/fzzy/api/view/pr/Api1501PR.java
index 9ba6f05..b89a998 100644
--- a/src/main/java/com/fzzy/api/view/pr/Api1501PR.java
+++ b/src/main/java/com/fzzy/api/view/pr/Api1501PR.java
@@ -4,6 +4,7 @@
import com.bstek.dorado.annotation.DataResolver;
import com.bstek.dorado.annotation.Expose;
import com.fzzy.api.data.ApiParam;
+import com.fzzy.api.data.PushProtocol;
import com.fzzy.api.entity.Api1501;
import com.fzzy.api.entity.ApiConfs;
import com.fzzy.api.service.ApiCommonService;
@@ -97,22 +98,36 @@
*/
@Expose
public String pushData(List<Api1501> items) {
- ResponseDto responseDto;
- String result = "";
- Api1501 d;
+
String kqdm = items.get(0).getKqdm();
ApiConfs apiConf = apiCommonService.getConf(kqdm);
if (null == apiConf) return "绯荤粺娌℃湁鑾峰彇鍒板綋鍓嶅簱鍖洪厤缃俊鎭紝鎵ц澶辫触";
+ //鑾峰彇瀹炵幇鎺ュ彛
+ ApiRemoteService apiService = apiPushManager.getApiRemoteService(apiConf.getPushProtocol());
+ if (null == apiService) return "绯荤粺娌℃湁褰撳墠鎺ㄩ�佸崗璁厤缃紝鎵ц澶辫触";
+ if (PushProtocol.SB_SH_2023.getCode().equals(apiConf.getPushProtocol())) {
+ return pushDataList(items, apiService, apiConf);
+ }
+ return pushDataSingle(items, apiService, apiConf);
+ }
+
+ /**
+ * 鍗曟潯鏁版嵁json鎺ㄩ��
+ *
+ * @param items
+ * @param apiService
+ * @param apiConf
+ * @return
+ */
+ private String pushDataSingle(List<Api1501> items, ApiRemoteService apiService, ApiConfs apiConf) {
+ ResponseDto responseDto;
+ String result = "";
+
//灏佽鍙傛暟
ApiParam param = new ApiParam(apiConf, Constant.API_CATEGORY_11, Constant.API_CODE_1501);
-
-
- //鑾峰彇瀹炵幇鎺ュ彛
- ApiRemoteService apiService = apiPushManager.getApiRemoteService(param.getPushProtocol());
- if (null == apiService) return "绯荤粺娌℃湁褰撳墠鎺ㄩ�佸崗璁厤缃紝鎵ц澶辫触";
-
+ Api1501 d;
for (Api1501 data : items) {
d = new Api1501();
BeanUtils.copyProperties(data, d);
@@ -129,4 +144,32 @@
return result;
}
+ /**
+ * 澶氭潯鏁版嵁json鎺ㄩ��
+ *
+ * @param items
+ * @param apiRemoteService
+ * @param apiConf
+ * @return
+ */
+ private String pushDataList(List<Api1501> items, ApiRemoteService apiRemoteService, ApiConfs apiConf) {
+
+ //灏佽鍙傛暟
+ ApiParam param = new ApiParam(apiConf, Constant.API_CATEGORY_11, Constant.API_CODE_1501);
+
+ //鎺ㄩ�侊紝鏁版嵁涓洪泦鍚堝舰寮�
+ ResponseDto responseDto = apiRemoteService.pushData(param, apiConf, items);
+ if (responseDto.getSuccess() == 0) {
+ //鎺ㄩ�佹垚鍔燂紝鏇存柊鏁版嵁涓婁紶鐘舵��
+ for (Api1501 data : items) {
+ if (Constant.CZBZ_I.equals(data.getCzbz())) {
+ //鏇存柊鐘舵��
+ data.setCzbz(Constant.CZBZ_U);
+ api1501Rep.save(data);
+ }
+ }
+ }
+ return responseDto.toString();
+ }
+
}
diff --git a/src/main/java/com/fzzy/api/view/pr/Api1502PR.java b/src/main/java/com/fzzy/api/view/pr/Api1502PR.java
index 7daa188..5b5f552 100644
--- a/src/main/java/com/fzzy/api/view/pr/Api1502PR.java
+++ b/src/main/java/com/fzzy/api/view/pr/Api1502PR.java
@@ -4,8 +4,8 @@
import com.bstek.dorado.annotation.DataResolver;
import com.bstek.dorado.annotation.Expose;
import com.fzzy.api.data.ApiParam;
-import com.fzzy.api.entity.Api1502;
-import com.fzzy.api.entity.ApiConfs;
+import com.fzzy.api.data.PushProtocol;
+import com.fzzy.api.entity.*;
import com.fzzy.api.service.ApiCommonService;
import com.fzzy.api.service.ApiPushManager;
import com.fzzy.api.service.ApiRemoteService;
@@ -13,7 +13,6 @@
import com.fzzy.api.Constant;
import com.fzzy.api.dto.ResponseDto;
import com.fzzy.api.entity.Api1502;
-import com.fzzy.api.entity.ApiParent;
import com.fzzy.api.view.repository.Api1502Rep;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -97,22 +96,36 @@
*/
@Expose
public String pushData(List<Api1502> items) {
- ResponseDto responseDto;
- String result = "";
- Api1502 d;
+
String kqdm = items.get(0).getKqdm();
ApiConfs apiConf = apiCommonService.getConf(kqdm);
if (null == apiConf) return "绯荤粺娌℃湁鑾峰彇鍒板綋鍓嶅簱鍖洪厤缃俊鎭紝鎵ц澶辫触";
+ //鑾峰彇瀹炵幇鎺ュ彛
+ ApiRemoteService apiService = apiPushManager.getApiRemoteService(apiConf.getPushProtocol());
+ if (null == apiService) return "绯荤粺娌℃湁褰撳墠鎺ㄩ�佸崗璁厤缃紝鎵ц澶辫触";
+ if (PushProtocol.SB_SH_2023.getCode().equals(apiConf.getPushProtocol())) {
+ return pushDataList(items, apiService, apiConf);
+ }
+ return pushDataSingle(items, apiService, apiConf);
+ }
+
+ /**
+ * 鍗曟潯鏁版嵁json鎺ㄩ��
+ *
+ * @param items
+ * @param apiService
+ * @param apiConf
+ * @return
+ */
+ private String pushDataSingle(List<Api1502> items, ApiRemoteService apiService, ApiConfs apiConf) {
+ ResponseDto responseDto;
+ String result = "";
+
//灏佽鍙傛暟
ApiParam param = new ApiParam(apiConf, Constant.API_CATEGORY_11, Constant.API_CODE_1502);
-
-
- //鑾峰彇瀹炵幇鎺ュ彛
- ApiRemoteService apiService = apiPushManager.getApiRemoteService(param.getPushProtocol());
- if (null == apiService) return "绯荤粺娌℃湁褰撳墠鎺ㄩ�佸崗璁厤缃紝鎵ц澶辫触";
-
+ Api1502 d;
for (Api1502 data : items) {
d = new Api1502();
BeanUtils.copyProperties(data, d);
@@ -128,4 +141,32 @@
}
return result;
}
+
+ /**
+ * 澶氭潯鏁版嵁json鎺ㄩ��
+ *
+ * @param items
+ * @param apiRemoteService
+ * @param apiConf
+ * @return
+ */
+ private String pushDataList(List<Api1502> items, ApiRemoteService apiRemoteService, ApiConfs apiConf) {
+
+ //灏佽鍙傛暟
+ ApiParam param = new ApiParam(apiConf, Constant.API_CATEGORY_11, Constant.API_CODE_1502);
+
+ //鎺ㄩ�侊紝鏁版嵁涓洪泦鍚堝舰寮�
+ ResponseDto responseDto = apiRemoteService.pushData(param, apiConf, items);
+ if (responseDto.getSuccess() == 0) {
+ //鎺ㄩ�佹垚鍔燂紝鏇存柊鏁版嵁涓婁紶鐘舵��
+ for (Api1502 data : items) {
+ if (Constant.CZBZ_I.equals(data.getCzbz())) {
+ //鏇存柊鐘舵��
+ data.setCzbz(Constant.CZBZ_U);
+ api1502Rep.save(data);
+ }
+ }
+ }
+ return responseDto.toString();
+ }
}
diff --git a/src/main/java/com/fzzy/api/view/pr/Api1503PR.java b/src/main/java/com/fzzy/api/view/pr/Api1503PR.java
index 10e9bca..d3395af 100644
--- a/src/main/java/com/fzzy/api/view/pr/Api1503PR.java
+++ b/src/main/java/com/fzzy/api/view/pr/Api1503PR.java
@@ -4,7 +4,7 @@
import com.bstek.dorado.annotation.DataResolver;
import com.bstek.dorado.annotation.Expose;
import com.fzzy.api.data.ApiParam;
-import com.fzzy.api.entity.Api1503;
+import com.fzzy.api.data.PushProtocol;
import com.fzzy.api.entity.ApiConfs;
import com.fzzy.api.service.ApiCommonService;
import com.fzzy.api.service.ApiPushManager;
@@ -74,7 +74,7 @@
}
/**
- *
+ *
* 鏇存柊鍒犻櫎鏍囪 api1503PR#delUpdate
*
* @param entity
@@ -98,22 +98,36 @@
*/
@Expose
public String pushData(List<Api1503> items) {
- ResponseDto responseDto;
- String result = "";
- Api1503 d;
+
String kqdm = items.get(0).getKqdm();
ApiConfs apiConf = apiCommonService.getConf(kqdm);
if (null == apiConf) return "绯荤粺娌℃湁鑾峰彇鍒板綋鍓嶅簱鍖洪厤缃俊鎭紝鎵ц澶辫触";
+ //鑾峰彇瀹炵幇鎺ュ彛
+ ApiRemoteService apiService = apiPushManager.getApiRemoteService(apiConf.getPushProtocol());
+ if (null == apiService) return "绯荤粺娌℃湁褰撳墠鎺ㄩ�佸崗璁厤缃紝鎵ц澶辫触";
+ if (PushProtocol.SB_SH_2023.getCode().equals(apiConf.getPushProtocol())) {
+ return pushDataList(items, apiService, apiConf);
+ }
+ return pushDataSingle(items, apiService, apiConf);
+ }
+
+ /**
+ * 鍗曟潯鏁版嵁json鎺ㄩ��
+ *
+ * @param items
+ * @param apiService
+ * @param apiConf
+ * @return
+ */
+ private String pushDataSingle(List<Api1503> items, ApiRemoteService apiService, ApiConfs apiConf) {
+ ResponseDto responseDto;
+ String result = "";
+
//灏佽鍙傛暟
ApiParam param = new ApiParam(apiConf, Constant.API_CATEGORY_11, Constant.API_CODE_1503);
-
-
- //鑾峰彇瀹炵幇鎺ュ彛
- ApiRemoteService apiService = apiPushManager.getApiRemoteService(param.getPushProtocol());
- if (null == apiService) return "绯荤粺娌℃湁褰撳墠鎺ㄩ�佸崗璁厤缃紝鎵ц澶辫触";
-
+ Api1503 d;
for (Api1503 data : items) {
d = new Api1503();
BeanUtils.copyProperties(data, d);
@@ -129,4 +143,32 @@
}
return result;
}
+
+ /**
+ * 澶氭潯鏁版嵁json鎺ㄩ��
+ *
+ * @param items
+ * @param apiRemoteService
+ * @param apiConf
+ * @return
+ */
+ private String pushDataList(List<Api1503> items, ApiRemoteService apiRemoteService, ApiConfs apiConf) {
+
+ //灏佽鍙傛暟
+ ApiParam param = new ApiParam(apiConf, Constant.API_CATEGORY_11, Constant.API_CODE_1503);
+
+ //鎺ㄩ�侊紝鏁版嵁涓洪泦鍚堝舰寮�
+ ResponseDto responseDto = apiRemoteService.pushData(param, apiConf, items);
+ if (responseDto.getSuccess() == 0) {
+ //鎺ㄩ�佹垚鍔燂紝鏇存柊鏁版嵁涓婁紶鐘舵��
+ for (Api1503 data : items) {
+ if (Constant.CZBZ_I.equals(data.getCzbz())) {
+ //鏇存柊鐘舵��
+ data.setCzbz(Constant.CZBZ_U);
+ api1503Rep.save(data);
+ }
+ }
+ }
+ return responseDto.toString();
+ }
}
diff --git a/src/main/java/com/fzzy/api/view/repository/Api1111Rep.java b/src/main/java/com/fzzy/api/view/repository/Api1111Rep.java
index c48ddb1..3e0b3ec 100644
--- a/src/main/java/com/fzzy/api/view/repository/Api1111Rep.java
+++ b/src/main/java/com/fzzy/api/view/repository/Api1111Rep.java
@@ -6,12 +6,14 @@
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.query.Param;
import org.springframework.transaction.annotation.Transactional;
+
import java.util.List;
public interface Api1111Rep extends JpaRepository<Api1111, String> {
/**
* 鏌ヨ鎵�鏈夌殑鐩戞帶鐐逛綅淇℃伅
+ *
* @param kqdm
* @return
*/
@@ -20,17 +22,19 @@
/**
* 鏍规嵁琛ㄥ崟涓婚敭鏇存柊鎿嶄綔鏍囧織鐘舵��
+ *
* @param id
* @param czbz
* @return
*/
@Transactional
@Modifying
- @Query("update Api1111 set czbz=:czbz where id=:id ")
+ @Query("update Api1111 set czbz=:czbz where spjksbid=:id ")
int updateStatus(@Param("id") String id, @Param("czbz") String czbz);
/**
* 鏍规嵁鐩戞帶鐐逛綅id鑾峰彇鐩戞帶淇℃伅
+ *
* @param spjksbid
* @return
*/
--
Gitblit v1.9.3