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/Api1107PR.java | 60 +++++++++++++++++++++++++++++++++++++++++++++++++++--------- 1 files changed, 51 insertions(+), 9 deletions(-) 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(); + } + } -- Gitblit v1.9.3