From b7eec5ee6770cc531dd57a4eca940f6886224aff Mon Sep 17 00:00:00 2001 From: YYC <1833023622@qq.com> Date: 星期五, 29 八月 2025 16:39:01 +0800 Subject: [PATCH] 页面条件查询 --- src/main/java/com/fzzy/api/view/pr/Api1208PR.java | 61 +++++++++++++++++++++++++----- 1 files changed, 50 insertions(+), 11 deletions(-) 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..a27e2d1 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; @@ -84,12 +84,12 @@ predicates.add(predicate2); } if (null != param.getStart()) { - Predicate predicate3 = cb.greaterThan(root.get("rcsj"), ContextUtil.getCurZero(param.getStart())); + Predicate predicate3 = cb.greaterThan(root.get("zhgxsj"), ContextUtil.getCurZero(param.getStart())); predicates.add(predicate3); } if (null != param.getEnd()) { - Predicate predicate4 = cb.lessThan(root.get("rcsj"), ContextUtil.getNextZero(param.getEnd())); + Predicate predicate4 = cb.lessThan(root.get("zhgxsj"), ContextUtil.getNextZero(param.getEnd())); predicates.add(predicate4); } return cb.and(predicates.toArray(new Predicate[0])); @@ -164,22 +164,34 @@ */ @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 "绯荤粺娌℃湁褰撳墠鎺ㄩ�佸崗璁厤缃紝鎵ц澶辫触"; + 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 +207,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(); + } + } -- Gitblit v1.9.3