From 9f6dacf7b39e5aeba37d8faf575c9e56d8cbe51a Mon Sep 17 00:00:00 2001 From: czt <czt18638530771@163.com> Date: 星期六, 11 十月 2025 13:35:42 +0800 Subject: [PATCH] 武汉黄陂军粮-质检报告共享接口同步及推送 --- src/main/java/com/fzzy/push/impl/ComPushService90.java | 36 +++++++++++++++++++++--------------- 1 files changed, 21 insertions(+), 15 deletions(-) diff --git a/src/main/java/com/fzzy/push/impl/ComPushService90.java b/src/main/java/com/fzzy/push/impl/ComPushService90.java index aa9d213..1491262 100644 --- a/src/main/java/com/fzzy/push/impl/ComPushService90.java +++ b/src/main/java/com/fzzy/push/impl/ComPushService90.java @@ -1,6 +1,7 @@ package com.fzzy.push.impl; import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.fzzy.api.Constant; import com.fzzy.api.data.ApiParam; @@ -9,6 +10,10 @@ import com.fzzy.api.service.ApiRemoteService; import com.fzzy.api.view.repository.*; import com.fzzy.push.gd2022.dto.Gd2022Api1023; +import com.fzzy.push.gd2022.dto.Gd2022Api1023Dtl; +import com.fzzy.push.gd2022.dto.Gd2022Api1023People; +import com.fzzy.push.gd2022.dto.Gd2022Api1023Way; +import com.fzzy.push.gd2023.dto.Gd2023Api1023; import com.fzzy.push.sh2023.SH2023Constant; import com.fzzy.push.sh2023.dto.SH2023Api1115; import com.fzzy.push.sh2023.dto.SH2023Api1311; @@ -30,6 +35,8 @@ @Autowired private ApiInfoDataRep apiInfoDataRep; @Autowired + private Api9201Rep api9201Rep; + @Autowired private Api9109Rep api9109Rep; @Autowired private Api9110Rep api9110Rep; @@ -47,11 +54,12 @@ private Api9116Rep api9116Rep; /*==========涓婃捣甯傚钩鍙板畾鍒舵帴鍙� -- 寮�濮�==========*/ + /** * 9101 鏁版嵁鐩哥鎬ф帴鍙�--涓婃捣甯傚钩鍙� */ public void pushData9101(ApiRemoteService apiRemoteService, ApiParam param) { - // 鑾峰彇 瑙嗛鐩戞帶鎺ュ彛鏁版嵁 + // 鑾峰彇 鏁版嵁鐩哥鎬ф帴鍙f暟鎹� List<ApiInfoData> items = apiInfoDataRep.getDataByInteId(Constant.API_CODE_9101); if (null == items || items.isEmpty()) { @@ -438,34 +446,32 @@ /*==========涓婃捣甯傚钩鍙板畾鍒舵帴鍙� -- 缁撴潫==========*/ /*==========骞夸笢鐪佸钩鍙板畾鍒舵帴鍙� -- 寮�濮�==========*/ + /** * 9201 鐔忚捀澶囨鎺ュ彛 */ public void pushData9201(ApiRemoteService apiRemoteService, ApiParam param) { //鑾峰彇鐔忚捀澶囨淇℃伅 - List<ApiInfoData> items = apiInfoDataRep.getDataByInteId(Constant.API_CODE_9201); +// List<ApiInfoData> items = apiInfoDataRep.getDataByInteId(Constant.API_CODE_9201); + List<Api9201> items = api9201Rep.findPushDataByTime(param.getKqdm(), param.getStart(), param.getEnd()); if (null == items || items.isEmpty()) { - log.error("-----骞夸笢鐪佸钩鍙�2022鐗堬細鏈幏鍙栧埌鐔忚捀澶囨淇℃伅锛屼笉鎺ㄩ��-----"); + log.error("-----骞夸笢鐪佸钩鍙�2023鐗堬細鏈幏鍙栧埌鐔忚捀澶囨淇℃伅锛屼笉鎺ㄩ��-----"); return; } param.setInteCategory(Constant.API_CATEGORY_90); param.setInteId(Constant.API_CODE_9201); - Gd2022Api1023 gd2022Api1023; ResponseDto responseDto; - for (ApiInfoData infoData : items) { - gd2022Api1023 = JSONObject.parseObject(infoData.getData(), Gd2022Api1023.class); - gd2022Api1023.setZhgxsj(infoData.getUpdateTime()); - - param.setBizId(infoData.getDataId()); - responseDto = apiRemoteService.pushData(param, gd2022Api1023); + for (Api9201 api9201 : items) { + api9201.setDtls(JSONArray.parseArray(api9201.getDtl(), Gd2022Api1023Dtl.class)); + api9201.setPeoples(JSONArray.parseArray(api9201.getPeople(), Gd2022Api1023People.class)); + api9201.setWays(JSONArray.parseArray(api9201.getWay(), Gd2022Api1023Way.class)); + responseDto = apiRemoteService.pushData(param, api9201); if (responseDto.getSuccess() == 0) { - if (Constant.CZBZ_I.equals(infoData.getCzbz())) { - infoData.setCzbz(Constant.CZBZ_U); - gd2022Api1023.setCzbz(Constant.CZBZ_U); - infoData.setData(JSON.toJSONString(gd2022Api1023)); - apiInfoDataRep.save(infoData); + if (Constant.CZBZ_I.equals(api9201.getCzbz())) { + api9201.setCzbz(Constant.CZBZ_U); + api9201Rep.save(api9201); } } } -- Gitblit v1.9.3