From a6b22395d5b137d684c83d9197c40f596f689ded Mon Sep 17 00:00:00 2001 From: YYC <1833023622@qq.com> Date: 星期四, 07 九月 2023 19:26:07 +0800 Subject: [PATCH] 数据同步问题修改 --- src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1306.java | 6 +- src/main/java/com/fzzy/async/fzzy40/Fzzy40SyncService13.java | 19 ++++----- src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1023.java | 20 +++++----- src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1303.java | 6 +- src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1302.java | 32 ++++++++-------- src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1304.java | 6 +- src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1305.java | 8 ++-- 7 files changed, 48 insertions(+), 49 deletions(-) diff --git a/src/main/java/com/fzzy/async/fzzy40/Fzzy40SyncService13.java b/src/main/java/com/fzzy/async/fzzy40/Fzzy40SyncService13.java index 201b3a5..25dc873 100644 --- a/src/main/java/com/fzzy/async/fzzy40/Fzzy40SyncService13.java +++ b/src/main/java/com/fzzy/async/fzzy40/Fzzy40SyncService13.java @@ -49,39 +49,38 @@ if (StringUtils.isNotEmpty(param.getPushProtocol()) && PushProtocol.SB_GD_2022.getCode().equals(param.getPushProtocol())) { //骞夸笢鐪佸钩鍙�2022鐗堬紝闇�瑕佸悓姝ョ啅钂稿妗堜俊鎭� //鐔忚捀澶囨鏁版嵁鍚屾 - fzzySync1023.syncData(param.getDeptId(), param.getStart(), param.getEnd()); - //瑙嗛鐩戞帶淇℃伅鍚屾 - fzzySync1311.syncData(param.getKqdm(), param.getDeptId(), param.getStart(), param.getEnd()); - + fzzySync1023.syncData(param.getKqdm(), param.getDeptId(), param.getStart(), param.getEnd()); } if (StringUtils.isNotEmpty(param.getPushProtocol()) && PushProtocol.SB_SH_2023.equals(param.getPushProtocol())) { //涓婃捣甯傚钩鍙�2023鐗堬紝闇�瑕佸悓姝ョ伯鎯呰澶囬厤缃俊鎭� //鍚屾绮儏璁惧閰嶇疆淇℃伅 fzzy40Sync2103.syncData(param.getKqdm(), param.getDeptId(), param.getStart(), param.getEnd()); + //瑙嗛鐩戞帶淇℃伅鍚屾 + fzzySync1311.syncData(param.getKqdm(), param.getDeptId(), param.getStart(), param.getEnd()); } /*-----鍏叡鎺ュ彛-----*/ //娓╂箍搴︽娴嬫暟鎹悓姝� - fzzySync1302.syncData(param.getDeptId(), param.getStart(), param.getEnd()); + fzzySync1302.syncData(param.getKqdm(), param.getDeptId(), param.getStart(), param.getEnd()); //铏妫�娴嬪悓姝� - fzzySync1303.syncData(param.getDeptId(), param.getStart(), param.getEnd()); + fzzySync1303.syncData(param.getKqdm(), param.getDeptId(), param.getStart(), param.getEnd()); //姘斾綋妫�娴嬪悓姝� - fzzySync1304.syncData(param.getDeptId(), param.getStart(), param.getEnd()); + fzzySync1304.syncData(param.getKqdm(), param.getDeptId(), param.getStart(), param.getEnd()); //璐ㄦ鍚屾 fzzySync1310.syncData(param.getKqdm(), param.getDeptId(), param.getStart(), param.getEnd()); //閫氶浣滀笟淇℃伅鍚屾 - fzzySync1305.syncData(param.getDeptId(), param.getStart(), param.getEnd()); + fzzySync1305.syncData(param.getKqdm(), param.getDeptId(), param.getStart(), param.getEnd()); //鐔忚捀浣滀笟淇℃伅鍚屾 - fzzySync1306.syncData(param.getDeptId(), param.getStart(), param.getEnd()); + fzzySync1306.syncData(param.getKqdm(), param.getDeptId(), param.getStart(), param.getEnd()); - fzzySync1023.syncData(param.getDeptId(), param.getStart(), param.getEnd()); + fzzySync1023.syncData(param.getKqdm(), param.getDeptId(), param.getStart(), param.getEnd()); } diff --git a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1023.java b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1023.java index 1df9693..187a941 100644 --- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1023.java +++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1023.java @@ -56,7 +56,7 @@ * @param start * @param end */ - public void syncData(String deptId, Date start, Date end) { + public void syncData(String kqdm, String deptId, Date start, Date end) { log.info("-------------1023鎺ュ彛璁惧淇℃伅寮�濮嬪悓姝�------------------"); //鍚屾鏁版嵁锛屽彧璁板綍澶辫触鐨勪俊鎭� @@ -81,10 +81,10 @@ for (Fz4DrugLogApply data : list) { //鍌ㄧ伯绮儏鏄庣粏琛� String tbrq = ""; - if(null != data.getTbrq()){ + if (null != data.getTbrq()) { tbrq = DateFormatUtils.format(data.getTbrq(), "yyyyMMdd"); } - List<Fz40DrugLogDtl> dtls = drugLogDtlRep.listDrugLogDtl(data.getXzbm()+data.getDeptId()+tbrq); + List<Fz40DrugLogDtl> dtls = drugLogDtlRep.listDrugLogDtl(data.getXzbm() + data.getDeptId() + tbrq); for (Fz40DrugLogDtl dtl : dtls) { GdApi1023Dtl gdApi1023Dtl = new GdApi1023Dtl(); BeanUtils.copyProperties(dtl, gdApi1023Dtl); @@ -97,13 +97,13 @@ gdApi1023Dtl.setZz(dtl.getPerImpurity()); dtlList.add(gdApi1023Dtl); } - List<Fz40DrugLogWay> ways = drugLogWayRep.listDrugLogWay(data.getXzbm()+data.getDeptId()+tbrq); + List<Fz40DrugLogWay> ways = drugLogWayRep.listDrugLogWay(data.getXzbm() + data.getDeptId() + tbrq); for (Fz40DrugLogWay way : ways) { GdApi1023Way gdApi1023Way = new GdApi1023Way(); BeanUtils.copyProperties(way, gdApi1023Way); wayList.add(gdApi1023Way); } - List<Fz40DrugLogPeople> peoples = drugLogPeopleRep.listDrugLogPeople(data.getXzbm()+data.getDeptId()+tbrq); + List<Fz40DrugLogPeople> peoples = drugLogPeopleRep.listDrugLogPeople(data.getXzbm() + kqdm + tbrq); for (Fz40DrugLogPeople people : peoples) { GdApi1023People gdApi1023People = new GdApi1023People(); BeanUtils.copyProperties(people, gdApi1023People); @@ -112,9 +112,9 @@ } GdApi1023 gdApi1023 = new GdApi1023(); - BeanUtils.copyProperties(data , gdApi1023); + BeanUtils.copyProperties(data, gdApi1023); gdApi1023.setXzbm(data.getXzbm()); - gdApi1023.setKqdm(data.getDeptId()); + gdApi1023.setKqdm(kqdm); gdApi1023.setYjmc(data.getDrugName()); gdApi1023.setYjlx(data.getDrugType()); gdApi1023.setZhgxsj(data.getUpdateTime()); @@ -126,14 +126,14 @@ //鎸佷箙鍖栦繚瀛橈紝鍗曠嫭瀛樺叆闈炲浗鏍囨帴鍙h〃 ApiInfoData infoData = new ApiInfoData(); infoData.setId(ContextUtil.getUUID()); - infoData.setKqdm(data.getDeptId()); + infoData.setKqdm(kqdm); infoData.setInteType(Constant.API_CATEGORY_13); infoData.setInteId(ApiCodeConstant.API_1023); infoData.setBizType(PushProtocol.SB_GD_2022.getCode()); infoData.setUpdateTime(data.getUpdateTime()); - infoData.setDataId(data.getXzbm() + data.getDeptId() + DateFormatUtils.format(data.getTbrq(), "yyMMdd")); + infoData.setDataId(kqdm + DateFormatUtils.format(data.getTbrq(), "yyMMdd") + data.getXzbm()); - List<ApiInfoData> apiInfoList = apiInfoDataRep.getDataByDataId(data.getXzbm() + data.getDeptId() + DateFormatUtils.format(data.getTbrq(), "yyMMdd")); + List<ApiInfoData> apiInfoList = apiInfoDataRep.getDataByDataId(DateFormatUtils.format(data.getTbrq(), "yyMMdd") + kqdm + data.getXzbm()); if (null == apiInfoList || apiInfoList.isEmpty()) { gdApi1023.setCzbz(Constant.CZBZ_I); infoData.setCzbz(Constant.CZBZ_I); diff --git a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1302.java b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1302.java index 398f346..ac9a55b 100644 --- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1302.java +++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1302.java @@ -48,7 +48,7 @@ * @param start 璧峰鏃堕棿 * @param end 鎴鏃堕棿 */ - public void syncData(String deptId, Date start, Date end) { + public void syncData(String kqdm, String deptId, Date start, Date end) { log.info("-------------1302鎺ュ彛鏁版嵁寮�濮嬪悓姝�------------------"); //鍚屾鏁版嵁锛屽彧璁板綍澶辫触鐨勪俊鎭� @@ -61,8 +61,8 @@ apiLog.setId(ContextUtil.getUUID()); try { List<Fz40Grain> list = fzzySync1302Rep.findByReceiveDate(start, end); - log.info(DateUtils.format("yyyy-MM-dd HH:mm:ss",start)); - log.info(DateUtils.format("yyyy-MM-dd HH:mm:ss",end)); + log.info(DateUtils.format("yyyy-MM-dd HH:mm:ss", start)); + log.info(DateUtils.format("yyyy-MM-dd HH:mm:ss", end)); if (null == list || list.isEmpty()) { log.info("1302---鍚屾鏁版嵁锛氭病鏈夋煡璇㈠埌闇�瑕佸悓姝ョ殑鏁版嵁"); return; @@ -85,23 +85,23 @@ api1302.setJcsj(fz40Grain.getReceiveDate()); api1302.setHwdm(api1105.getHwdm()); - api1302.setCfww(fz40Grain.getTempOut() == null ? 0.00: fz40Grain.getTempOut()); - if(null == fz40Grain.getHumidityOut() || fz40Grain.getHumidityOut() < 0){ + api1302.setCfww(fz40Grain.getTempOut() == null ? 0.00 : fz40Grain.getTempOut()); + if (null == fz40Grain.getHumidityOut() || fz40Grain.getHumidityOut() < 0) { api1302.setCfws(-1); - }else { + } else { api1302.setCfws(fz40Grain.getHumidityOut()); } - api1302.setCfnw(fz40Grain.getTempIn() == null ? 0.00: fz40Grain.getTempIn()); - if(null == fz40Grain.getHumidityIn() || fz40Grain.getHumidityIn() < 0){ + api1302.setCfnw(fz40Grain.getTempIn() == null ? 0.00 : fz40Grain.getTempIn()); + if (null == fz40Grain.getHumidityIn() || fz40Grain.getHumidityIn() < 0) { api1302.setCfns(-1); - }else { + } else { api1302.setCfns(fz40Grain.getHumidityIn()); } - api1302.setLszgw(fz40Grain.getTempMax() == null ? 0.00: fz40Grain.getTempMax()); - api1302.setLspjw(fz40Grain.getTempAve() == null ? 0.00: fz40Grain.getTempAve()); - api1302.setLszdw(fz40Grain.getTempMin() == null ? 0.00: fz40Grain.getTempMin()); + api1302.setLszgw(fz40Grain.getTempMax() == null ? 0.00 : fz40Grain.getTempMax()); + api1302.setLspjw(fz40Grain.getTempAve() == null ? 0.00 : fz40Grain.getTempAve()); + api1302.setLszdw(fz40Grain.getTempMin() == null ? 0.00 : fz40Grain.getTempMin()); //娓╁害闆嗗悎 if (StringUtils.isEmpty(fz40Grain.getCableCir())) { @@ -118,9 +118,9 @@ api1302.setKqdm(api1105.getKqdm()); api1302.setSyncTime(syncTime); api1302List = api1302Rep.getDataByWsdjcdh(api1302.getWsdjcdh()); - if(null == api1302List || api1302List.isEmpty()){ + if (null == api1302List || api1302List.isEmpty()) { api1302.setCzbz(Constant.CZBZ_I); - }else { + } else { api1302.setCzbz(api1302List.get(0).getCzbz()); } log.info("1302---鍚屾鏁版嵁锛�" + api1302.toString()); @@ -200,7 +200,7 @@ int h = Integer.valueOf(cab[1]); int l = Integer.valueOf(cab[2]); - // String[] points = point.split(","); + // String[] points = point.split(","); String result = ""; for (int i = 1; i <= l; i++) { for (int j = 1; j <= h; j++) { @@ -227,7 +227,7 @@ int g1 = 1; //鍦堣捣濮嬫牴鏁� int g2 = 0; //鍦堟埅姝㈡牴鏁� - // String[] points = point.split(","); + // String[] points = point.split(","); String result = ""; for (int i = 1; i <= q; i++) { g1 += g2; diff --git a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1303.java b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1303.java index aa87fd4..29888bf 100644 --- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1303.java +++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1303.java @@ -46,7 +46,7 @@ * @param start 璧峰鏃堕棿 * @param end 鎴鏃堕棿 */ - public void syncData(String deptId, Date start, Date end) { + public void syncData(String kqdm, String deptId, Date start, Date end) { log.info("-------------1303鎺ュ彛鏁版嵁寮�濮嬪悓姝�------------------"); @@ -108,9 +108,9 @@ api1303.setKqdm(api1105.getKqdm()); api1303.setSyncTime(syncTime); api1303List = api1303Rep.getDataByHcjcdh(api1303.getHcjcdh()); - if(null == api1303List || api1303List.isEmpty()){ + if (null == api1303List || api1303List.isEmpty()) { api1303.setCzbz(Constant.CZBZ_I); - }else { + } else { api1303.setCzbz(api1303List.get(0).getCzbz()); } api1303Rep.save(api1303); diff --git a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1304.java b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1304.java index d947cf5..6ff55c2 100644 --- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1304.java +++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1304.java @@ -44,7 +44,7 @@ * @param start 璧峰鏃堕棿 * @param end 鎴鏃堕棿 */ - public void syncData(String deptId, Date start, Date end) { + public void syncData(String kqdm, String deptId, Date start, Date end) { log.info("-------------1304鎺ュ彛鏁版嵁寮�濮嬪悓姝�------------------"); //鍚屾鏁版嵁锛屽彧璁板綍澶辫触鐨勪俊鎭� ApiLog apiLog = new ApiLog(); @@ -85,9 +85,9 @@ api1304.setKqdm(api1105.getKqdm()); api1304.setSyncTime(syncTime); api1304List = api1304Rep.getDataByQtndjcdh(api1304.getQtndjcdh()); - if(null == api1304List || api1304List.isEmpty()){ + if (null == api1304List || api1304List.isEmpty()) { api1304.setCzbz(Constant.CZBZ_I); - }else { + } else { api1304.setCzbz(api1304List.get(0).getCzbz()); } api1304Rep.save(api1304); diff --git a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1305.java b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1305.java index 6054fda..f68c530 100644 --- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1305.java +++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1305.java @@ -46,7 +46,7 @@ * @param start 璧峰鏃堕棿 * @param end 鎴鏃堕棿 */ - public void syncData(String deptId, Date start, Date end) { + public void syncData(String kqdm, String deptId, Date start, Date end) { log.info("-------------1305鎺ュ彛鏁版嵁寮�濮嬪悓姝�------------------"); //鍚屾鏁版嵁锛屽彧璁板綍澶辫触鐨勪俊鎭� ApiLog apiLog = new ApiLog(); @@ -78,7 +78,7 @@ api1305.setTfzydh(fzAreationData.getId()); api1305.setTfrq(fzAreationData.getStartTime()); - api1305.setCfdm(fzAreationData.getDeptId()); + api1305.setCfdm(fzAreationData.getDepotId()); api1305.setTfmd(fzAreationData.getObjective()); api1305.setTflx(fzAreationData.getType()); api1305.setFdxs(fzAreationData.getWindNetType()); @@ -95,9 +95,9 @@ api1305.setZhgxsj(fzAreationData.getUpdateTime()); api1305List = api1305Rep.getDataById(api1305.getTfzydh()); - if(null == api1305List || api1305List.isEmpty()){ + if (null == api1305List || api1305List.isEmpty()) { api1305.setCzbz(Constant.CZBZ_I); - }else { + } else { api1305.setCzbz(api1305List.get(0).getCzbz()); } api1305Rep.save(api1305); diff --git a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1306.java b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1306.java index 4ebdc94..860e04e 100644 --- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1306.java +++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1306.java @@ -46,7 +46,7 @@ * @param start 璧峰鏃堕棿 * @param end 鎴鏃堕棿 */ - public void syncData(String deptId, Date start, Date end) { + public void syncData(String kqdm, String deptId, Date start, Date end) { log.info("-------------1306鎺ュ彛鏁版嵁寮�濮嬪悓姝�------------------"); //鍚屾鏁版嵁锛屽彧璁板綍澶辫触鐨勪俊鎭� ApiLog apiLog = new ApiLog(); @@ -95,9 +95,9 @@ api1306.setZhgxsj(fz40DrugLog.getUpdateTime()); api1306List = api1306Rep.getDataById(api1306.getXzzydh()); - if(null == api1306List || api1306List.isEmpty()){ + if (null == api1306List || api1306List.isEmpty()) { api1306.setCzbz(Constant.CZBZ_I); - }else { + } else { api1306.setCzbz(api1306List.get(0).getCzbz()); } -- Gitblit v1.9.3