From 7bd3853222e52b4a054aa7357edcd79b4e13c389 Mon Sep 17 00:00:00 2001 From: wr <1754607820@qq.com> Date: Thu, 24 Apr 2025 19:57:31 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E6=88=90influxdb=E8=BF=81=E7=A7=BB?= =?UTF-8?q?=E5=B7=A5=E5=85=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../njcn/api/MigrationInsertFeignClient.java | 3 + ...ationInsertFeignClientFallbackFactory.java | 7 + .../main/java/com/njcn/po/influx/DataV.java | 8 +- .../com/njcn/po/influx/PqsCommunicate.java | 6 +- .../njcn/insert/mapper/EventDetailMapper.java | 17 -- .../insert/service/InsertIRmpEventDetail.java | 14 -- .../impl/InsertRmpEventDetailImpl.java | 16 -- .../MigrationInsertBootApplication.java | 2 +- .../controller/MigrationInsertController.java | 18 +- .../imapper/InsertDataFlickerMapper.java | 2 +- .../insert/imapper/InsertDataFlucMapper.java | 2 +- .../imapper/InsertDataHarmRateIMapper.java | 2 +- .../imapper/InsertDataHarmRateVMapper.java | 2 +- .../imapper/InsertDataHarmphasicIMapper.java | 2 +- .../imapper/InsertDataHarmphasicVMapper.java | 2 +- .../imapper/InsertDataHarmpowerPMapper.java | 2 +- .../imapper/InsertDataHarmpowerQMapper.java | 2 +- .../imapper/InsertDataHarmpowerSMapper.java | 2 +- .../insert/imapper/InsertDataIMapper.java | 2 +- .../imapper/InsertDataInharmIMapper.java | 2 +- .../imapper/InsertDataInharmVMapper.java | 2 +- .../insert/imapper/InsertDataPltMapper.java | 2 +- .../insert/imapper/InsertDataVMapper.java | 2 +- .../imapper/InsertPqsCommunicateMapper.java | 2 +- .../insert/mapper/EventDetailMapper.java | 17 ++ .../insert/service/InsertIDataFlicker.java | 2 +- .../insert/service/InsertIDataFluc.java | 2 +- .../insert/service/InsertIDataHarmRateI.java | 2 +- .../insert/service/InsertIDataHarmRateV.java | 2 +- .../service/InsertIDataHarmphasicI.java | 2 +- .../service/InsertIDataHarmphasicV.java | 2 +- .../insert/service/InsertIDataHarmpowerP.java | 2 +- .../insert/service/InsertIDataHarmpowerQ.java | 2 +- .../insert/service/InsertIDataHarmpowerS.java | 2 +- .../insert/service/InsertIDataI.java | 2 +- .../insert/service/InsertIDataInharmI.java | 2 +- .../insert/service/InsertIDataInharmV.java | 2 +- .../insert/service/InsertIDataPlt.java | 2 +- .../insert/service/InsertIDataV.java | 2 +- .../insert/service/InsertIPqsCommunicate.java | 2 +- .../insert/service/InsertIRmpEventDetail.java | 19 ++ .../service/impl/InsertDataFlickerImpl.java | 7 +- .../service/impl/InsertDataFlucImpl.java | 7 +- .../service/impl/InsertDataHarmRateIImpl.java | 7 +- .../service/impl/InsertDataHarmRateVImpl.java | 7 +- .../impl/InsertDataHarmphasicIImpl.java | 7 +- .../impl/InsertDataHarmphasicVImpl.java | 7 +- .../impl/InsertDataHarmpowerPImpl.java | 7 +- .../impl/InsertDataHarmpowerQImpl.java | 7 +- .../impl/InsertDataHarmpowerSImpl.java | 7 +- .../insert/service/impl/InsertDataIImpl.java | 7 +- .../service/impl/InsertDataInharmIImpl.java | 7 +- .../service/impl/InsertDataInharmVImpl.java | 7 +- .../service/impl/InsertDataPltImpl.java | 7 +- .../insert/service/impl/InsertDataVImpl.java | 7 +- .../impl/InsertPqsCommunicateImpl.java | 7 +- .../impl/InsertRmpEventDetailImpl.java | 33 ++++ .../migration-influxdb-read-boot/pom.xml | 81 ++++++++- .../read/MigrationReadBootApplication.java | 5 +- .../MigrationInfluxDBController.java | 110 ++++++++++++ .../read/imapper/DataFlickerMapper.java | 2 +- .../read/imapper/DataFlucMapper.java | 2 +- .../read/imapper/DataHarmRateIMapper.java | 2 +- .../read/imapper/DataHarmRateVMapper.java | 2 +- .../read/imapper/DataHarmphasicIMapper.java | 2 +- .../read/imapper/DataHarmphasicVMapper.java | 2 +- .../read/imapper/DataHarmpowerPMapper.java | 2 +- .../read/imapper/DataHarmpowerQMapper.java | 2 +- .../read/imapper/DataHarmpowerSMapper.java | 2 +- .../read/imapper/DataIMapper.java | 2 +- .../read/imapper/DataInharmIMapper.java | 2 +- .../read/imapper/DataInharmVMapper.java | 2 +- .../read/imapper/DataPltMapper.java | 2 +- .../read/imapper/DataVMapper.java | 2 +- .../read/imapper/PqsCommunicateMapper.java | 2 +- .../read/job/MigrationInfluxDBJob.java | 101 +++++++++++ .../read/mapper/RmpEventDetailMapper.java | 2 +- .../read/service/IDataFlicker.java | 2 +- .../read/service/IDataFluc.java | 2 +- .../read/service/IDataHarmRateI.java | 2 +- .../read/service/IDataHarmRateV.java | 2 +- .../read/service/IDataHarmphasicI.java | 2 +- .../read/service/IDataHarmphasicV.java | 2 +- .../read/service/IDataHarmpowerP.java | 2 +- .../read/service/IDataHarmpowerQ.java | 2 +- .../read/service/IDataHarmpowerS.java | 2 +- .../{ => migration}/read/service/IDataI.java | 2 +- .../read/service/IDataInharmI.java | 2 +- .../read/service/IDataInharmV.java | 2 +- .../read/service/IDataPlt.java | 2 +- .../{ => migration}/read/service/IDataV.java | 2 +- .../read/service/IPqsCommunicate.java | 4 +- .../read/service/IRmpEventDetail.java | 27 +++ .../read/service/MigrationService.java | 21 +++ .../read/service/impl/DataFlickerImpl.java | 7 +- .../read/service/impl/DataFlucImpl.java | 7 +- .../read/service/impl/DataHarmRateIImpl.java | 7 +- .../read/service/impl/DataHarmRateVImpl.java | 7 +- .../service/impl/DataHarmphasicIImpl.java | 7 +- .../service/impl/DataHarmphasicVImpl.java | 7 +- .../read/service/impl/DataHarmpowerPImpl.java | 7 +- .../read/service/impl/DataHarmpowerQImpl.java | 6 +- .../read/service/impl/DataHarmpowerSImpl.java | 7 +- .../read/service/impl/DataIImpl.java | 7 +- .../read/service/impl/DataInharmIImpl.java | 7 +- .../read/service/impl/DataInharmVImpl.java | 7 +- .../read/service/impl/DataPltImpl.java | 7 +- .../read/service/impl/DataVImpl.java | 15 +- .../service/impl/MigrationServiceImpl.java | 164 ++++++++++++++++++ .../read/service/impl/PqsCommunicateImpl.java | 33 +++- .../read/service/impl/RmpEventDetailImpl.java | 38 ++++ .../{ => migration}/read/util/TableEnum.java | 2 +- .../njcn/migration/read/util/TimeUtil.java | 137 +++++++++++++++ .../njcn/read/service/IRmpEventDetail.java | 14 -- .../njcn/read/service/MigrationService.java | 13 -- .../service/impl/MigrationServiceImpl.java | 87 ---------- .../read/service/impl/RmpEventDetailImpl.java | 16 -- .../java/com/njcn/read/util/TimeUtil.java | 55 ------ .../src/main/resources/file/sj.xlsx | Bin 0 -> 3545 bytes .../src/test/java/BaseJunitTest.java | 44 ++++- 120 files changed, 1015 insertions(+), 427 deletions(-) delete mode 100644 migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/insert/mapper/EventDetailMapper.java delete mode 100644 migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/insert/service/InsertIRmpEventDetail.java delete mode 100644 migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/insert/service/impl/InsertRmpEventDetailImpl.java rename migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/{ => migration}/insert/MigrationInsertBootApplication.java (95%) rename migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/{ => migration}/insert/controller/MigrationInsertController.java (93%) rename migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/{ => migration}/insert/imapper/InsertDataFlickerMapper.java (85%) rename migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/{ => migration}/insert/imapper/InsertDataFlucMapper.java (85%) rename migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/{ => migration}/insert/imapper/InsertDataHarmRateIMapper.java (82%) rename migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/{ => migration}/insert/imapper/InsertDataHarmRateVMapper.java (82%) rename migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/{ => migration}/insert/imapper/InsertDataHarmphasicIMapper.java (86%) rename migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/{ => migration}/insert/imapper/InsertDataHarmphasicVMapper.java (86%) rename migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/{ => migration}/insert/imapper/InsertDataHarmpowerPMapper.java (86%) rename migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/{ => migration}/insert/imapper/InsertDataHarmpowerQMapper.java (86%) rename migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/{ => migration}/insert/imapper/InsertDataHarmpowerSMapper.java (86%) rename migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/{ => migration}/insert/imapper/InsertDataIMapper.java (84%) rename migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/{ => migration}/insert/imapper/InsertDataInharmIMapper.java (85%) rename migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/{ => migration}/insert/imapper/InsertDataInharmVMapper.java (85%) rename migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/{ => migration}/insert/imapper/InsertDataPltMapper.java (85%) rename migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/{ => migration}/insert/imapper/InsertDataVMapper.java (84%) rename migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/{ => migration}/insert/imapper/InsertPqsCommunicateMapper.java (85%) create mode 100644 migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/migration/insert/mapper/EventDetailMapper.java rename migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/{ => migration}/insert/service/InsertIDataFlicker.java (89%) rename migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/{ => migration}/insert/service/InsertIDataFluc.java (89%) rename migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/{ => migration}/insert/service/InsertIDataHarmRateI.java (88%) rename migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/{ => migration}/insert/service/InsertIDataHarmRateV.java (87%) rename migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/{ => migration}/insert/service/InsertIDataHarmphasicI.java (90%) rename migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/{ => migration}/insert/service/InsertIDataHarmphasicV.java (90%) rename migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/{ => migration}/insert/service/InsertIDataHarmpowerP.java (90%) rename migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/{ => migration}/insert/service/InsertIDataHarmpowerQ.java (90%) rename migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/{ => migration}/insert/service/InsertIDataHarmpowerS.java (90%) rename migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/{ => migration}/insert/service/InsertIDataI.java (92%) rename migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/{ => migration}/insert/service/InsertIDataInharmI.java (90%) rename migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/{ => migration}/insert/service/InsertIDataInharmV.java (90%) rename migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/{ => migration}/insert/service/InsertIDataPlt.java (89%) rename migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/{ => migration}/insert/service/InsertIDataV.java (92%) rename migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/{ => migration}/insert/service/InsertIPqsCommunicate.java (89%) create mode 100644 migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/migration/insert/service/InsertIRmpEventDetail.java rename migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/{ => migration}/insert/service/impl/InsertDataFlickerImpl.java (93%) rename migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/{ => migration}/insert/service/impl/InsertDataFlucImpl.java (92%) rename migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/{ => migration}/insert/service/impl/InsertDataHarmRateIImpl.java (92%) rename migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/{ => migration}/insert/service/impl/InsertDataHarmRateVImpl.java (93%) rename migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/{ => migration}/insert/service/impl/InsertDataHarmphasicIImpl.java (93%) rename migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/{ => migration}/insert/service/impl/InsertDataHarmphasicVImpl.java (93%) rename migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/{ => migration}/insert/service/impl/InsertDataHarmpowerPImpl.java (93%) rename migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/{ => migration}/insert/service/impl/InsertDataHarmpowerQImpl.java (93%) rename migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/{ => migration}/insert/service/impl/InsertDataHarmpowerSImpl.java (93%) rename migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/{ => migration}/insert/service/impl/InsertDataIImpl.java (94%) rename migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/{ => migration}/insert/service/impl/InsertDataInharmIImpl.java (93%) rename migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/{ => migration}/insert/service/impl/InsertDataInharmVImpl.java (93%) rename migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/{ => migration}/insert/service/impl/InsertDataPltImpl.java (92%) rename migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/{ => migration}/insert/service/impl/InsertDataVImpl.java (96%) rename migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/{ => migration}/insert/service/impl/InsertPqsCommunicateImpl.java (92%) create mode 100644 migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/migration/insert/service/impl/InsertRmpEventDetailImpl.java rename migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/{ => migration}/read/MigrationReadBootApplication.java (86%) create mode 100644 migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/migration/read/controller/MigrationInfluxDBController.java rename migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/{ => migration}/read/imapper/DataFlickerMapper.java (86%) rename migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/{ => migration}/read/imapper/DataFlucMapper.java (85%) rename migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/{ => migration}/read/imapper/DataHarmRateIMapper.java (82%) rename migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/{ => migration}/read/imapper/DataHarmRateVMapper.java (82%) rename migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/{ => migration}/read/imapper/DataHarmphasicIMapper.java (86%) rename migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/{ => migration}/read/imapper/DataHarmphasicVMapper.java (86%) rename migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/{ => migration}/read/imapper/DataHarmpowerPMapper.java (86%) rename migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/{ => migration}/read/imapper/DataHarmpowerQMapper.java (86%) rename migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/{ => migration}/read/imapper/DataHarmpowerSMapper.java (86%) rename migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/{ => migration}/read/imapper/DataIMapper.java (84%) rename migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/{ => migration}/read/imapper/DataInharmIMapper.java (86%) rename migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/{ => migration}/read/imapper/DataInharmVMapper.java (86%) rename migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/{ => migration}/read/imapper/DataPltMapper.java (85%) rename migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/{ => migration}/read/imapper/DataVMapper.java (84%) rename migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/{ => migration}/read/imapper/PqsCommunicateMapper.java (85%) create mode 100644 migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/migration/read/job/MigrationInfluxDBJob.java rename migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/{ => migration}/read/mapper/RmpEventDetailMapper.java (84%) rename migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/{ => migration}/read/service/IDataFlicker.java (90%) rename migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/{ => migration}/read/service/IDataFluc.java (90%) rename migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/{ => migration}/read/service/IDataHarmRateI.java (89%) rename migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/{ => migration}/read/service/IDataHarmRateV.java (90%) rename migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/{ => migration}/read/service/IDataHarmphasicI.java (91%) rename migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/{ => migration}/read/service/IDataHarmphasicV.java (92%) rename migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/{ => migration}/read/service/IDataHarmpowerP.java (92%) rename migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/{ => migration}/read/service/IDataHarmpowerQ.java (92%) rename migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/{ => migration}/read/service/IDataHarmpowerS.java (92%) rename migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/{ => migration}/read/service/IDataI.java (93%) rename migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/{ => migration}/read/service/IDataInharmI.java (91%) rename migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/{ => migration}/read/service/IDataInharmV.java (91%) rename migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/{ => migration}/read/service/IDataPlt.java (90%) rename migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/{ => migration}/read/service/IDataV.java (93%) rename migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/{ => migration}/read/service/IPqsCommunicate.java (76%) create mode 100644 migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/migration/read/service/IRmpEventDetail.java create mode 100644 migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/migration/read/service/MigrationService.java rename migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/{ => migration}/read/service/impl/DataFlickerImpl.java (93%) rename migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/{ => migration}/read/service/impl/DataFlucImpl.java (93%) rename migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/{ => migration}/read/service/impl/DataHarmRateIImpl.java (93%) rename migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/{ => migration}/read/service/impl/DataHarmRateVImpl.java (93%) rename migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/{ => migration}/read/service/impl/DataHarmphasicIImpl.java (94%) rename migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/{ => migration}/read/service/impl/DataHarmphasicVImpl.java (93%) rename migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/{ => migration}/read/service/impl/DataHarmpowerPImpl.java (93%) rename migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/{ => migration}/read/service/impl/DataHarmpowerQImpl.java (94%) rename migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/{ => migration}/read/service/impl/DataHarmpowerSImpl.java (93%) rename migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/{ => migration}/read/service/impl/DataIImpl.java (94%) rename migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/{ => migration}/read/service/impl/DataInharmIImpl.java (94%) rename migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/{ => migration}/read/service/impl/DataInharmVImpl.java (94%) rename migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/{ => migration}/read/service/impl/DataPltImpl.java (93%) rename migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/{ => migration}/read/service/impl/DataVImpl.java (90%) create mode 100644 migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/migration/read/service/impl/MigrationServiceImpl.java rename migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/{ => migration}/read/service/impl/PqsCommunicateImpl.java (65%) create mode 100644 migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/migration/read/service/impl/RmpEventDetailImpl.java rename migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/{ => migration}/read/util/TableEnum.java (98%) create mode 100644 migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/migration/read/util/TimeUtil.java delete mode 100644 migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/read/service/IRmpEventDetail.java delete mode 100644 migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/read/service/MigrationService.java delete mode 100644 migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/read/service/impl/MigrationServiceImpl.java delete mode 100644 migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/read/service/impl/RmpEventDetailImpl.java delete mode 100644 migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/read/util/TimeUtil.java create mode 100644 migration-influxDB/migration-influxdb-read-boot/src/main/resources/file/sj.xlsx diff --git a/migration-influxDB/migration-influxDB-api/src/main/java/com/njcn/api/MigrationInsertFeignClient.java b/migration-influxDB/migration-influxDB-api/src/main/java/com/njcn/api/MigrationInsertFeignClient.java index 5ff2ad3..96f5ce5 100644 --- a/migration-influxDB/migration-influxDB-api/src/main/java/com/njcn/api/MigrationInsertFeignClient.java +++ b/migration-influxDB/migration-influxDB-api/src/main/java/com/njcn/api/MigrationInsertFeignClient.java @@ -6,6 +6,7 @@ import com.njcn.common.pojo.constant.OperateType; import com.njcn.common.pojo.enums.common.LogEnum; import com.njcn.common.pojo.response.HttpResult; import com.njcn.po.influx.*; +import com.njcn.po.mysql.RmpEventDetail; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -76,4 +77,6 @@ public interface MigrationInsertFeignClient { @PostMapping("/insertPqsCommunicate") HttpResult insertPqsCommunicate(@RequestBody List list); + @PostMapping("/batchInsertion") + HttpResult batchInsertion(@RequestBody List list); } diff --git a/migration-influxDB/migration-influxDB-api/src/main/java/com/njcn/api/fallback/MigrationInsertFeignClientFallbackFactory.java b/migration-influxDB/migration-influxDB-api/src/main/java/com/njcn/api/fallback/MigrationInsertFeignClientFallbackFactory.java index 0c9b634..9d40d9f 100644 --- a/migration-influxDB/migration-influxDB-api/src/main/java/com/njcn/api/fallback/MigrationInsertFeignClientFallbackFactory.java +++ b/migration-influxDB/migration-influxDB-api/src/main/java/com/njcn/api/fallback/MigrationInsertFeignClientFallbackFactory.java @@ -6,6 +6,7 @@ import com.njcn.common.pojo.exception.BusinessException; import com.njcn.common.pojo.response.HttpResult; import com.njcn.dataProcess.util.DataProcessingEnumUtil; import com.njcn.po.influx.*; +import com.njcn.po.mysql.RmpEventDetail; import feign.hystrix.FallbackFactory; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; @@ -128,6 +129,12 @@ public class MigrationInsertFeignClientFallbackFactory implements FallbackFactor log.error("{}异常，降级处理，异常为：{}","insertPqsCommunicate批量插入数据",cause.toString()); throw new BusinessException(finalExceptionEnum); } + + @Override + public HttpResult batchInsertion(List list) { + log.error("{}异常，降级处理，异常为：{}","eventDetail批量插入数据",cause.toString()); + throw new BusinessException(finalExceptionEnum); + } }; } } diff --git a/migration-influxDB/migration-influxDB-api/src/main/java/com/njcn/po/influx/DataV.java b/migration-influxDB/migration-influxDB-api/src/main/java/com/njcn/po/influx/DataV.java index 23c6a1d..c75c584 100644 --- a/migration-influxDB/migration-influxDB-api/src/main/java/com/njcn/po/influx/DataV.java +++ b/migration-influxDB/migration-influxDB-api/src/main/java/com/njcn/po/influx/DataV.java @@ -1,8 +1,9 @@ package com.njcn.po.influx; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer; import com.njcn.influx.utils.InstantDateSerializer; import lombok.Data; import org.influxdb.annotation.Column; @@ -11,7 +12,6 @@ import org.influxdb.annotation.TimeColumn; import org.springframework.format.annotation.DateTimeFormat; import java.time.Instant; -import java.time.LocalDateTime; /** * 类的介绍： @@ -31,9 +31,13 @@ public class DataV { @JsonIgnore private Instant time; + @ExcelProperty(value = "时间",index = 1) + @ColumnWidth(30) private String timeId; @Column(name = "line_id", tag = true) + @ExcelProperty(value = "监测点id",index = 0) + @ColumnWidth(30) private String lineId; @Column(name = "phasic_type", tag = true) diff --git a/migration-influxDB/migration-influxDB-api/src/main/java/com/njcn/po/influx/PqsCommunicate.java b/migration-influxDB/migration-influxDB-api/src/main/java/com/njcn/po/influx/PqsCommunicate.java index 2404db1..bb5b253 100644 --- a/migration-influxDB/migration-influxDB-api/src/main/java/com/njcn/po/influx/PqsCommunicate.java +++ b/migration-influxDB/migration-influxDB-api/src/main/java/com/njcn/po/influx/PqsCommunicate.java @@ -1,5 +1,7 @@ package com.njcn.po.influx; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.njcn.influx.utils.InstantDateSerializer; @@ -9,7 +11,6 @@ import org.influxdb.annotation.Measurement; import org.influxdb.annotation.TimeColumn; import java.time.Instant; -import java.time.ZoneId; /** * 类的介绍： @@ -27,9 +28,12 @@ public class PqsCommunicate { @JsonIgnore private Instant time; + @ExcelProperty(value = "时间",index = 1) private String timeId; @Column(name = "dev_id",tag = true) + @ExcelProperty(value = "终端id",index = 0) + @ColumnWidth(30) private String devId; @Column(name = "description") diff --git a/migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/insert/mapper/EventDetailMapper.java b/migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/insert/mapper/EventDetailMapper.java deleted file mode 100644 index 0f9f99e..0000000 --- a/migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/insert/mapper/EventDetailMapper.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.njcn.insert.mapper; - -import com.njcn.db.mapper.BatchBaseMapper; -import com.njcn.po.mysql.RmpEventDetail; - -/** - * pqs - * - * @author cdf - * @date 2023/6/19 - */ -public interface EventDetailMapper extends BatchBaseMapper { - - - - -} diff --git a/migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/insert/service/InsertIRmpEventDetail.java b/migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/insert/service/InsertIRmpEventDetail.java deleted file mode 100644 index 50f6bb1..0000000 --- a/migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/insert/service/InsertIRmpEventDetail.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.njcn.insert.service; - - -/** - * Description: - * Date: 2024/11/28 9:04【需求编号】 - * - * @author clam - * @version V1.0.0 - */ -public interface InsertIRmpEventDetail { - - -} diff --git a/migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/insert/service/impl/InsertRmpEventDetailImpl.java b/migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/insert/service/impl/InsertRmpEventDetailImpl.java deleted file mode 100644 index 87c7efd..0000000 --- a/migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/insert/service/impl/InsertRmpEventDetailImpl.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.njcn.insert.service.impl; - - -import com.njcn.insert.service.InsertIRmpEventDetail; - -/** - * Description: - * Date: 2024/11/28 9:04【需求编号】 - * - * @author clam - * @version V1.0.0 - */ -public class InsertRmpEventDetailImpl implements InsertIRmpEventDetail { - - -} diff --git a/migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/insert/MigrationInsertBootApplication.java b/migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/migration/insert/MigrationInsertBootApplication.java similarity index 95% rename from migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/insert/MigrationInsertBootApplication.java rename to migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/migration/insert/MigrationInsertBootApplication.java index 22a35b6..67db230 100644 --- a/migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/insert/MigrationInsertBootApplication.java +++ b/migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/migration/insert/MigrationInsertBootApplication.java @@ -1,4 +1,4 @@ -package com.njcn.insert; +package com.njcn.migration.insert; import lombok.extern.slf4j.Slf4j; import org.mybatis.spring.annotation.MapperScan; diff --git a/migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/insert/controller/MigrationInsertController.java b/migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/migration/insert/controller/MigrationInsertController.java similarity index 93% rename from migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/insert/controller/MigrationInsertController.java rename to migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/migration/insert/controller/MigrationInsertController.java index 5102b4b..7983497 100644 --- a/migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/insert/controller/MigrationInsertController.java +++ b/migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/migration/insert/controller/MigrationInsertController.java @@ -1,4 +1,4 @@ -package com.njcn.insert.controller; +package com.njcn.migration.insert.controller; import cn.hutool.core.collection.CollUtil; import com.njcn.common.pojo.annotation.OperateInfo; @@ -7,10 +7,10 @@ import com.njcn.common.pojo.enums.common.LogEnum; import com.njcn.common.pojo.enums.response.CommonResponseEnum; import com.njcn.common.pojo.response.HttpResult; import com.njcn.common.utils.HttpResultUtil; -import com.njcn.insert.service.*; +import com.njcn.migration.insert.service.*; import com.njcn.po.influx.*; +import com.njcn.po.mysql.RmpEventDetail; import com.njcn.web.controller.BaseController; -import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Controller; @@ -45,6 +45,7 @@ public class MigrationInsertController extends BaseController { private final InsertIDataPlt dataPlt; private final InsertIDataV dataV; private final InsertIPqsCommunicate pqsCommunicate; + private final InsertIRmpEventDetail eventDetail; @OperateInfo(info = LogEnum.BUSINESS_COMMON,operateType = OperateType.ADD) @@ -199,4 +200,15 @@ public class MigrationInsertController extends BaseController { } return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe); } + + @OperateInfo(info = LogEnum.BUSINESS_COMMON,operateType = OperateType.ADD) + @PostMapping("/batchInsertion") + @ApiOperation("数据插入") + public HttpResult batchInsertion(@RequestBody List list) { + String methodDescribe = getMethodDescribe("batchInsertion"); + if(CollUtil.isNotEmpty(list)){ + eventDetail.batchInsertion(list); + } + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe); + } } diff --git a/migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/insert/imapper/InsertDataFlickerMapper.java b/migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/migration/insert/imapper/InsertDataFlickerMapper.java similarity index 85% rename from migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/insert/imapper/InsertDataFlickerMapper.java rename to migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/migration/insert/imapper/InsertDataFlickerMapper.java index c151449..761f5ce 100644 --- a/migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/insert/imapper/InsertDataFlickerMapper.java +++ b/migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/migration/insert/imapper/InsertDataFlickerMapper.java @@ -1,4 +1,4 @@ -package com.njcn.insert.imapper; +package com.njcn.migration.insert.imapper; import com.njcn.influx.base.InfluxDbBaseMapper; diff --git a/migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/insert/imapper/InsertDataFlucMapper.java b/migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/migration/insert/imapper/InsertDataFlucMapper.java similarity index 85% rename from migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/insert/imapper/InsertDataFlucMapper.java rename to migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/migration/insert/imapper/InsertDataFlucMapper.java index 912eefc..88a991f 100644 --- a/migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/insert/imapper/InsertDataFlucMapper.java +++ b/migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/migration/insert/imapper/InsertDataFlucMapper.java @@ -1,4 +1,4 @@ -package com.njcn.insert.imapper; +package com.njcn.migration.insert.imapper; import com.njcn.influx.base.InfluxDbBaseMapper; diff --git a/migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/insert/imapper/InsertDataHarmRateIMapper.java b/migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/migration/insert/imapper/InsertDataHarmRateIMapper.java similarity index 82% rename from migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/insert/imapper/InsertDataHarmRateIMapper.java rename to migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/migration/insert/imapper/InsertDataHarmRateIMapper.java index faf6378..a1352a9 100644 --- a/migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/insert/imapper/InsertDataHarmRateIMapper.java +++ b/migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/migration/insert/imapper/InsertDataHarmRateIMapper.java @@ -1,4 +1,4 @@ -package com.njcn.insert.imapper; +package com.njcn.migration.insert.imapper; import com.njcn.influx.base.InfluxDbBaseMapper; import com.njcn.po.influx.DataHarmrateI; diff --git a/migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/insert/imapper/InsertDataHarmRateVMapper.java b/migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/migration/insert/imapper/InsertDataHarmRateVMapper.java similarity index 82% rename from migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/insert/imapper/InsertDataHarmRateVMapper.java rename to migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/migration/insert/imapper/InsertDataHarmRateVMapper.java index b71f7b6..e303985 100644 --- a/migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/insert/imapper/InsertDataHarmRateVMapper.java +++ b/migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/migration/insert/imapper/InsertDataHarmRateVMapper.java @@ -1,4 +1,4 @@ -package com.njcn.insert.imapper; +package com.njcn.migration.insert.imapper; import com.njcn.influx.base.InfluxDbBaseMapper; import com.njcn.po.influx.DataHarmrateV; diff --git a/migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/insert/imapper/InsertDataHarmphasicIMapper.java b/migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/migration/insert/imapper/InsertDataHarmphasicIMapper.java similarity index 86% rename from migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/insert/imapper/InsertDataHarmphasicIMapper.java rename to migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/migration/insert/imapper/InsertDataHarmphasicIMapper.java index b7f27e4..0577d49 100644 --- a/migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/insert/imapper/InsertDataHarmphasicIMapper.java +++ b/migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/migration/insert/imapper/InsertDataHarmphasicIMapper.java @@ -1,4 +1,4 @@ -package com.njcn.insert.imapper; +package com.njcn.migration.insert.imapper; import com.njcn.influx.base.InfluxDbBaseMapper; diff --git a/migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/insert/imapper/InsertDataHarmphasicVMapper.java b/migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/migration/insert/imapper/InsertDataHarmphasicVMapper.java similarity index 86% rename from migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/insert/imapper/InsertDataHarmphasicVMapper.java rename to migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/migration/insert/imapper/InsertDataHarmphasicVMapper.java index d48ef29..a82cc8b 100644 --- a/migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/insert/imapper/InsertDataHarmphasicVMapper.java +++ b/migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/migration/insert/imapper/InsertDataHarmphasicVMapper.java @@ -1,4 +1,4 @@ -package com.njcn.insert.imapper; +package com.njcn.migration.insert.imapper; import com.njcn.influx.base.InfluxDbBaseMapper; diff --git a/migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/insert/imapper/InsertDataHarmpowerPMapper.java b/migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/migration/insert/imapper/InsertDataHarmpowerPMapper.java similarity index 86% rename from migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/insert/imapper/InsertDataHarmpowerPMapper.java rename to migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/migration/insert/imapper/InsertDataHarmpowerPMapper.java index 05500be..9dacab6 100644 --- a/migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/insert/imapper/InsertDataHarmpowerPMapper.java +++ b/migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/migration/insert/imapper/InsertDataHarmpowerPMapper.java @@ -1,4 +1,4 @@ -package com.njcn.insert.imapper; +package com.njcn.migration.insert.imapper; import com.njcn.influx.base.InfluxDbBaseMapper; diff --git a/migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/insert/imapper/InsertDataHarmpowerQMapper.java b/migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/migration/insert/imapper/InsertDataHarmpowerQMapper.java similarity index 86% rename from migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/insert/imapper/InsertDataHarmpowerQMapper.java rename to migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/migration/insert/imapper/InsertDataHarmpowerQMapper.java index 341ccf0..9b516cc 100644 --- a/migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/insert/imapper/InsertDataHarmpowerQMapper.java +++ b/migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/migration/insert/imapper/InsertDataHarmpowerQMapper.java @@ -1,4 +1,4 @@ -package com.njcn.insert.imapper; +package com.njcn.migration.insert.imapper; import com.njcn.influx.base.InfluxDbBaseMapper; diff --git a/migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/insert/imapper/InsertDataHarmpowerSMapper.java b/migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/migration/insert/imapper/InsertDataHarmpowerSMapper.java similarity index 86% rename from migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/insert/imapper/InsertDataHarmpowerSMapper.java rename to migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/migration/insert/imapper/InsertDataHarmpowerSMapper.java index b7c6067..ff2a3c9 100644 --- a/migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/insert/imapper/InsertDataHarmpowerSMapper.java +++ b/migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/migration/insert/imapper/InsertDataHarmpowerSMapper.java @@ -1,4 +1,4 @@ -package com.njcn.insert.imapper; +package com.njcn.migration.insert.imapper; import com.njcn.influx.base.InfluxDbBaseMapper; diff --git a/migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/insert/imapper/InsertDataIMapper.java b/migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/migration/insert/imapper/InsertDataIMapper.java similarity index 84% rename from migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/insert/imapper/InsertDataIMapper.java rename to migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/migration/insert/imapper/InsertDataIMapper.java index 18bdd61..2d967fb 100644 --- a/migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/insert/imapper/InsertDataIMapper.java +++ b/migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/migration/insert/imapper/InsertDataIMapper.java @@ -1,4 +1,4 @@ -package com.njcn.insert.imapper; +package com.njcn.migration.insert.imapper; import com.njcn.influx.base.InfluxDbBaseMapper; import com.njcn.po.influx.DataI; diff --git a/migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/insert/imapper/InsertDataInharmIMapper.java b/migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/migration/insert/imapper/InsertDataInharmIMapper.java similarity index 85% rename from migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/insert/imapper/InsertDataInharmIMapper.java rename to migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/migration/insert/imapper/InsertDataInharmIMapper.java index 5e537af..d84fa79 100644 --- a/migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/insert/imapper/InsertDataInharmIMapper.java +++ b/migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/migration/insert/imapper/InsertDataInharmIMapper.java @@ -1,4 +1,4 @@ -package com.njcn.insert.imapper; +package com.njcn.migration.insert.imapper; import com.njcn.influx.base.InfluxDbBaseMapper; diff --git a/migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/insert/imapper/InsertDataInharmVMapper.java b/migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/migration/insert/imapper/InsertDataInharmVMapper.java similarity index 85% rename from migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/insert/imapper/InsertDataInharmVMapper.java rename to migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/migration/insert/imapper/InsertDataInharmVMapper.java index 9266c73..a4066ee 100644 --- a/migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/insert/imapper/InsertDataInharmVMapper.java +++ b/migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/migration/insert/imapper/InsertDataInharmVMapper.java @@ -1,4 +1,4 @@ -package com.njcn.insert.imapper; +package com.njcn.migration.insert.imapper; import com.njcn.influx.base.InfluxDbBaseMapper; diff --git a/migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/insert/imapper/InsertDataPltMapper.java b/migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/migration/insert/imapper/InsertDataPltMapper.java similarity index 85% rename from migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/insert/imapper/InsertDataPltMapper.java rename to migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/migration/insert/imapper/InsertDataPltMapper.java index 1a41ddf..2442984 100644 --- a/migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/insert/imapper/InsertDataPltMapper.java +++ b/migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/migration/insert/imapper/InsertDataPltMapper.java @@ -1,4 +1,4 @@ -package com.njcn.insert.imapper; +package com.njcn.migration.insert.imapper; import com.njcn.influx.base.InfluxDbBaseMapper; diff --git a/migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/insert/imapper/InsertDataVMapper.java b/migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/migration/insert/imapper/InsertDataVMapper.java similarity index 84% rename from migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/insert/imapper/InsertDataVMapper.java rename to migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/migration/insert/imapper/InsertDataVMapper.java index c519abb..461f383 100644 --- a/migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/insert/imapper/InsertDataVMapper.java +++ b/migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/migration/insert/imapper/InsertDataVMapper.java @@ -1,4 +1,4 @@ -package com.njcn.insert.imapper; +package com.njcn.migration.insert.imapper; import com.njcn.influx.base.InfluxDbBaseMapper; import com.njcn.po.influx.DataV; diff --git a/migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/insert/imapper/InsertPqsCommunicateMapper.java b/migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/migration/insert/imapper/InsertPqsCommunicateMapper.java similarity index 85% rename from migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/insert/imapper/InsertPqsCommunicateMapper.java rename to migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/migration/insert/imapper/InsertPqsCommunicateMapper.java index 0e357f2..42fac01 100644 --- a/migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/insert/imapper/InsertPqsCommunicateMapper.java +++ b/migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/migration/insert/imapper/InsertPqsCommunicateMapper.java @@ -1,4 +1,4 @@ -package com.njcn.insert.imapper; +package com.njcn.migration.insert.imapper; import com.njcn.influx.base.InfluxDbBaseMapper; import com.njcn.po.influx.PqsCommunicate; diff --git a/migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/migration/insert/mapper/EventDetailMapper.java b/migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/migration/insert/mapper/EventDetailMapper.java new file mode 100644 index 0000000..386c642 --- /dev/null +++ b/migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/migration/insert/mapper/EventDetailMapper.java @@ -0,0 +1,17 @@ +package com.njcn.migration.insert.mapper; + +import com.github.jeffreyning.mybatisplus.base.MppBaseMapper; +import com.njcn.po.mysql.RmpEventDetail; + +/** + * pqs + * + * @author cdf + * @date 2023/6/19 + */ +public interface EventDetailMapper extends MppBaseMapper { + + + + +} diff --git a/migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/insert/service/InsertIDataFlicker.java b/migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/migration/insert/service/InsertIDataFlicker.java similarity index 89% rename from migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/insert/service/InsertIDataFlicker.java rename to migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/migration/insert/service/InsertIDataFlicker.java index 7fff34b..9c62a62 100644 --- a/migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/insert/service/InsertIDataFlicker.java +++ b/migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/migration/insert/service/InsertIDataFlicker.java @@ -1,4 +1,4 @@ -package com.njcn.insert.service; +package com.njcn.migration.insert.service; import com.njcn.param.LineCountEvaluateParam; diff --git a/migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/insert/service/InsertIDataFluc.java b/migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/migration/insert/service/InsertIDataFluc.java similarity index 89% rename from migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/insert/service/InsertIDataFluc.java rename to migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/migration/insert/service/InsertIDataFluc.java index 2524d9b..949cec7 100644 --- a/migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/insert/service/InsertIDataFluc.java +++ b/migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/migration/insert/service/InsertIDataFluc.java @@ -1,4 +1,4 @@ -package com.njcn.insert.service; +package com.njcn.migration.insert.service; import com.njcn.param.LineCountEvaluateParam; diff --git a/migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/insert/service/InsertIDataHarmRateI.java b/migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/migration/insert/service/InsertIDataHarmRateI.java similarity index 88% rename from migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/insert/service/InsertIDataHarmRateI.java rename to migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/migration/insert/service/InsertIDataHarmRateI.java index 4be7c61..f197ddd 100644 --- a/migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/insert/service/InsertIDataHarmRateI.java +++ b/migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/migration/insert/service/InsertIDataHarmRateI.java @@ -1,4 +1,4 @@ -package com.njcn.insert.service; +package com.njcn.migration.insert.service; import com.njcn.param.LineCountEvaluateParam; diff --git a/migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/insert/service/InsertIDataHarmRateV.java b/migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/migration/insert/service/InsertIDataHarmRateV.java similarity index 87% rename from migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/insert/service/InsertIDataHarmRateV.java rename to migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/migration/insert/service/InsertIDataHarmRateV.java index d183617..87c07c9 100644 --- a/migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/insert/service/InsertIDataHarmRateV.java +++ b/migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/migration/insert/service/InsertIDataHarmRateV.java @@ -1,4 +1,4 @@ -package com.njcn.insert.service; +package com.njcn.migration.insert.service; import com.njcn.param.LineCountEvaluateParam; diff --git a/migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/insert/service/InsertIDataHarmphasicI.java b/migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/migration/insert/service/InsertIDataHarmphasicI.java similarity index 90% rename from migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/insert/service/InsertIDataHarmphasicI.java rename to migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/migration/insert/service/InsertIDataHarmphasicI.java index b98d454..ea687f7 100644 --- a/migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/insert/service/InsertIDataHarmphasicI.java +++ b/migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/migration/insert/service/InsertIDataHarmphasicI.java @@ -1,4 +1,4 @@ -package com.njcn.insert.service; +package com.njcn.migration.insert.service; import com.njcn.param.LineCountEvaluateParam; diff --git a/migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/insert/service/InsertIDataHarmphasicV.java b/migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/migration/insert/service/InsertIDataHarmphasicV.java similarity index 90% rename from migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/insert/service/InsertIDataHarmphasicV.java rename to migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/migration/insert/service/InsertIDataHarmphasicV.java index 4a4b628..e39aeb5 100644 --- a/migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/insert/service/InsertIDataHarmphasicV.java +++ b/migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/migration/insert/service/InsertIDataHarmphasicV.java @@ -1,4 +1,4 @@ -package com.njcn.insert.service; +package com.njcn.migration.insert.service; import com.njcn.param.LineCountEvaluateParam; diff --git a/migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/insert/service/InsertIDataHarmpowerP.java b/migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/migration/insert/service/InsertIDataHarmpowerP.java similarity index 90% rename from migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/insert/service/InsertIDataHarmpowerP.java rename to migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/migration/insert/service/InsertIDataHarmpowerP.java index 63174c6..1dac9c9 100644 --- a/migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/insert/service/InsertIDataHarmpowerP.java +++ b/migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/migration/insert/service/InsertIDataHarmpowerP.java @@ -1,4 +1,4 @@ -package com.njcn.insert.service; +package com.njcn.migration.insert.service; import com.njcn.param.LineCountEvaluateParam; diff --git a/migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/insert/service/InsertIDataHarmpowerQ.java b/migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/migration/insert/service/InsertIDataHarmpowerQ.java similarity index 90% rename from migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/insert/service/InsertIDataHarmpowerQ.java rename to migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/migration/insert/service/InsertIDataHarmpowerQ.java index e2bf645..94ecbb1 100644 --- a/migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/insert/service/InsertIDataHarmpowerQ.java +++ b/migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/migration/insert/service/InsertIDataHarmpowerQ.java @@ -1,4 +1,4 @@ -package com.njcn.insert.service; +package com.njcn.migration.insert.service; import com.njcn.param.LineCountEvaluateParam; diff --git a/migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/insert/service/InsertIDataHarmpowerS.java b/migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/migration/insert/service/InsertIDataHarmpowerS.java similarity index 90% rename from migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/insert/service/InsertIDataHarmpowerS.java rename to migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/migration/insert/service/InsertIDataHarmpowerS.java index a6c4066..da11a6a 100644 --- a/migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/insert/service/InsertIDataHarmpowerS.java +++ b/migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/migration/insert/service/InsertIDataHarmpowerS.java @@ -1,4 +1,4 @@ -package com.njcn.insert.service; +package com.njcn.migration.insert.service; import com.njcn.param.LineCountEvaluateParam; diff --git a/migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/insert/service/InsertIDataI.java b/migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/migration/insert/service/InsertIDataI.java similarity index 92% rename from migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/insert/service/InsertIDataI.java rename to migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/migration/insert/service/InsertIDataI.java index 7e69f13..0cc7b54 100644 --- a/migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/insert/service/InsertIDataI.java +++ b/migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/migration/insert/service/InsertIDataI.java @@ -1,4 +1,4 @@ -package com.njcn.insert.service; +package com.njcn.migration.insert.service; import com.njcn.param.LineCountEvaluateParam; diff --git a/migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/insert/service/InsertIDataInharmI.java b/migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/migration/insert/service/InsertIDataInharmI.java similarity index 90% rename from migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/insert/service/InsertIDataInharmI.java rename to migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/migration/insert/service/InsertIDataInharmI.java index a133190..4c521a9 100644 --- a/migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/insert/service/InsertIDataInharmI.java +++ b/migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/migration/insert/service/InsertIDataInharmI.java @@ -1,4 +1,4 @@ -package com.njcn.insert.service; +package com.njcn.migration.insert.service; import com.njcn.param.LineCountEvaluateParam; diff --git a/migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/insert/service/InsertIDataInharmV.java b/migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/migration/insert/service/InsertIDataInharmV.java similarity index 90% rename from migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/insert/service/InsertIDataInharmV.java rename to migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/migration/insert/service/InsertIDataInharmV.java index 8fbc9db..6f8ec33 100644 --- a/migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/insert/service/InsertIDataInharmV.java +++ b/migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/migration/insert/service/InsertIDataInharmV.java @@ -1,4 +1,4 @@ -package com.njcn.insert.service; +package com.njcn.migration.insert.service; import com.njcn.param.LineCountEvaluateParam; diff --git a/migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/insert/service/InsertIDataPlt.java b/migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/migration/insert/service/InsertIDataPlt.java similarity index 89% rename from migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/insert/service/InsertIDataPlt.java rename to migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/migration/insert/service/InsertIDataPlt.java index 74da5d0..b2306aa 100644 --- a/migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/insert/service/InsertIDataPlt.java +++ b/migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/migration/insert/service/InsertIDataPlt.java @@ -1,4 +1,4 @@ -package com.njcn.insert.service; +package com.njcn.migration.insert.service; import com.njcn.param.LineCountEvaluateParam; diff --git a/migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/insert/service/InsertIDataV.java b/migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/migration/insert/service/InsertIDataV.java similarity index 92% rename from migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/insert/service/InsertIDataV.java rename to migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/migration/insert/service/InsertIDataV.java index 9635321..d590971 100644 --- a/migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/insert/service/InsertIDataV.java +++ b/migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/migration/insert/service/InsertIDataV.java @@ -1,4 +1,4 @@ -package com.njcn.insert.service; +package com.njcn.migration.insert.service; import com.njcn.param.LineCountEvaluateParam; diff --git a/migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/insert/service/InsertIPqsCommunicate.java b/migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/migration/insert/service/InsertIPqsCommunicate.java similarity index 89% rename from migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/insert/service/InsertIPqsCommunicate.java rename to migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/migration/insert/service/InsertIPqsCommunicate.java index ff2c370..8f0f2b6 100644 --- a/migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/insert/service/InsertIPqsCommunicate.java +++ b/migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/migration/insert/service/InsertIPqsCommunicate.java @@ -1,4 +1,4 @@ -package com.njcn.insert.service; +package com.njcn.migration.insert.service; import com.njcn.param.LineCountEvaluateParam; diff --git a/migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/migration/insert/service/InsertIRmpEventDetail.java b/migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/migration/insert/service/InsertIRmpEventDetail.java new file mode 100644 index 0000000..aa0f395 --- /dev/null +++ b/migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/migration/insert/service/InsertIRmpEventDetail.java @@ -0,0 +1,19 @@ +package com.njcn.migration.insert.service; + + +import com.github.jeffreyning.mybatisplus.service.IMppService; +import com.njcn.po.mysql.RmpEventDetail; + +import java.util.List; + +/** + * Description: + * Date: 2024/11/28 9:04【需求编号】 + * + * @author clam + * @version V1.0.0 + */ +public interface InsertIRmpEventDetail extends IMppService { + + void batchInsertion(List list); +} diff --git a/migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/insert/service/impl/InsertDataFlickerImpl.java b/migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/migration/insert/service/impl/InsertDataFlickerImpl.java similarity index 93% rename from migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/insert/service/impl/InsertDataFlickerImpl.java rename to migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/migration/insert/service/impl/InsertDataFlickerImpl.java index 9f5c3aa..f744a7d 100644 --- a/migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/insert/service/impl/InsertDataFlickerImpl.java +++ b/migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/migration/insert/service/impl/InsertDataFlickerImpl.java @@ -1,15 +1,14 @@ -package com.njcn.insert.service.impl; +package com.njcn.migration.insert.service.impl; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.date.DatePattern; import cn.hutool.core.date.LocalDateTimeUtil; import com.njcn.influx.query.InfluxQueryWrapper; -import com.njcn.insert.imapper.InsertDataFlickerMapper; -import com.njcn.insert.service.InsertIDataFlicker; +import com.njcn.migration.insert.imapper.InsertDataFlickerMapper; +import com.njcn.migration.insert.service.InsertIDataFlicker; import com.njcn.param.LineCountEvaluateParam; import com.njcn.po.influx.DataFlicker; -import com.njcn.po.influx.DataV; import lombok.RequiredArgsConstructor; import org.apache.commons.collections4.ListUtils; import org.springframework.stereotype.Service; diff --git a/migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/insert/service/impl/InsertDataFlucImpl.java b/migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/migration/insert/service/impl/InsertDataFlucImpl.java similarity index 92% rename from migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/insert/service/impl/InsertDataFlucImpl.java rename to migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/migration/insert/service/impl/InsertDataFlucImpl.java index 5331557..09cdedf 100644 --- a/migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/insert/service/impl/InsertDataFlucImpl.java +++ b/migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/migration/insert/service/impl/InsertDataFlucImpl.java @@ -1,14 +1,13 @@ -package com.njcn.insert.service.impl; +package com.njcn.migration.insert.service.impl; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.date.DatePattern; import cn.hutool.core.date.LocalDateTimeUtil; import com.njcn.influx.query.InfluxQueryWrapper; -import com.njcn.insert.imapper.InsertDataFlucMapper; -import com.njcn.insert.service.InsertIDataFluc; +import com.njcn.migration.insert.imapper.InsertDataFlucMapper; +import com.njcn.migration.insert.service.InsertIDataFluc; import com.njcn.param.LineCountEvaluateParam; -import com.njcn.po.influx.DataFlicker; import com.njcn.po.influx.DataFluc; import lombok.RequiredArgsConstructor; import org.apache.commons.collections4.ListUtils; diff --git a/migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/insert/service/impl/InsertDataHarmRateIImpl.java b/migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/migration/insert/service/impl/InsertDataHarmRateIImpl.java similarity index 92% rename from migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/insert/service/impl/InsertDataHarmRateIImpl.java rename to migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/migration/insert/service/impl/InsertDataHarmRateIImpl.java index 8a3fc0e..a6ebbad 100644 --- a/migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/insert/service/impl/InsertDataHarmRateIImpl.java +++ b/migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/migration/insert/service/impl/InsertDataHarmRateIImpl.java @@ -1,4 +1,4 @@ -package com.njcn.insert.service.impl; +package com.njcn.migration.insert.service.impl; import cn.hutool.core.collection.CollUtil; @@ -7,10 +7,9 @@ import cn.hutool.core.date.LocalDateTimeUtil; import com.njcn.common.utils.HarmonicTimesUtil; import com.njcn.influx.constant.InfluxDbSqlConstant; import com.njcn.influx.query.InfluxQueryWrapper; -import com.njcn.insert.imapper.InsertDataHarmRateIMapper; -import com.njcn.insert.service.InsertIDataHarmRateI; +import com.njcn.migration.insert.imapper.InsertDataHarmRateIMapper; +import com.njcn.migration.insert.service.InsertIDataHarmRateI; import com.njcn.param.LineCountEvaluateParam; -import com.njcn.po.influx.DataFlicker; import com.njcn.po.influx.DataHarmrateI; import lombok.RequiredArgsConstructor; import org.apache.commons.collections4.ListUtils; diff --git a/migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/insert/service/impl/InsertDataHarmRateVImpl.java b/migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/migration/insert/service/impl/InsertDataHarmRateVImpl.java similarity index 93% rename from migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/insert/service/impl/InsertDataHarmRateVImpl.java rename to migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/migration/insert/service/impl/InsertDataHarmRateVImpl.java index e5bbc0e..1403f8f 100644 --- a/migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/insert/service/impl/InsertDataHarmRateVImpl.java +++ b/migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/migration/insert/service/impl/InsertDataHarmRateVImpl.java @@ -1,4 +1,4 @@ -package com.njcn.insert.service.impl; +package com.njcn.migration.insert.service.impl; import cn.hutool.core.collection.CollUtil; @@ -7,10 +7,9 @@ import cn.hutool.core.date.LocalDateTimeUtil; import com.njcn.common.utils.HarmonicTimesUtil; import com.njcn.influx.constant.InfluxDbSqlConstant; import com.njcn.influx.query.InfluxQueryWrapper; -import com.njcn.insert.imapper.InsertDataHarmRateVMapper; -import com.njcn.insert.service.InsertIDataHarmRateV; +import com.njcn.migration.insert.imapper.InsertDataHarmRateVMapper; +import com.njcn.migration.insert.service.InsertIDataHarmRateV; import com.njcn.param.LineCountEvaluateParam; -import com.njcn.po.influx.DataFlicker; import com.njcn.po.influx.DataHarmrateV; import lombok.RequiredArgsConstructor; import org.apache.commons.collections4.ListUtils; diff --git a/migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/insert/service/impl/InsertDataHarmphasicIImpl.java b/migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/migration/insert/service/impl/InsertDataHarmphasicIImpl.java similarity index 93% rename from migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/insert/service/impl/InsertDataHarmphasicIImpl.java rename to migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/migration/insert/service/impl/InsertDataHarmphasicIImpl.java index ef83fc1..a633f4b 100644 --- a/migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/insert/service/impl/InsertDataHarmphasicIImpl.java +++ b/migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/migration/insert/service/impl/InsertDataHarmphasicIImpl.java @@ -1,4 +1,4 @@ -package com.njcn.insert.service.impl; +package com.njcn.migration.insert.service.impl; import cn.hutool.core.collection.CollUtil; @@ -7,10 +7,9 @@ import cn.hutool.core.date.LocalDateTimeUtil; import com.njcn.common.utils.HarmonicTimesUtil; import com.njcn.influx.constant.InfluxDbSqlConstant; import com.njcn.influx.query.InfluxQueryWrapper; -import com.njcn.insert.imapper.InsertDataHarmphasicIMapper; -import com.njcn.insert.service.InsertIDataHarmphasicI; +import com.njcn.migration.insert.imapper.InsertDataHarmphasicIMapper; +import com.njcn.migration.insert.service.InsertIDataHarmphasicI; import com.njcn.param.LineCountEvaluateParam; -import com.njcn.po.influx.DataFlicker; import com.njcn.po.influx.DataHarmphasicI; import lombok.RequiredArgsConstructor; import org.apache.commons.collections4.ListUtils; diff --git a/migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/insert/service/impl/InsertDataHarmphasicVImpl.java b/migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/migration/insert/service/impl/InsertDataHarmphasicVImpl.java similarity index 93% rename from migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/insert/service/impl/InsertDataHarmphasicVImpl.java rename to migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/migration/insert/service/impl/InsertDataHarmphasicVImpl.java index ca18030..660c3b3 100644 --- a/migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/insert/service/impl/InsertDataHarmphasicVImpl.java +++ b/migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/migration/insert/service/impl/InsertDataHarmphasicVImpl.java @@ -1,4 +1,4 @@ -package com.njcn.insert.service.impl; +package com.njcn.migration.insert.service.impl; import cn.hutool.core.collection.CollUtil; @@ -7,10 +7,9 @@ import cn.hutool.core.date.LocalDateTimeUtil; import com.njcn.common.utils.HarmonicTimesUtil; import com.njcn.influx.constant.InfluxDbSqlConstant; import com.njcn.influx.query.InfluxQueryWrapper; -import com.njcn.insert.imapper.InsertDataHarmphasicVMapper; -import com.njcn.insert.service.InsertIDataHarmphasicV; +import com.njcn.migration.insert.imapper.InsertDataHarmphasicVMapper; +import com.njcn.migration.insert.service.InsertIDataHarmphasicV; import com.njcn.param.LineCountEvaluateParam; -import com.njcn.po.influx.DataFlicker; import com.njcn.po.influx.DataHarmphasicV; import lombok.RequiredArgsConstructor; import org.apache.commons.collections4.ListUtils; diff --git a/migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/insert/service/impl/InsertDataHarmpowerPImpl.java b/migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/migration/insert/service/impl/InsertDataHarmpowerPImpl.java similarity index 93% rename from migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/insert/service/impl/InsertDataHarmpowerPImpl.java rename to migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/migration/insert/service/impl/InsertDataHarmpowerPImpl.java index cde49d5..cffb1d8 100644 --- a/migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/insert/service/impl/InsertDataHarmpowerPImpl.java +++ b/migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/migration/insert/service/impl/InsertDataHarmpowerPImpl.java @@ -1,4 +1,4 @@ -package com.njcn.insert.service.impl; +package com.njcn.migration.insert.service.impl; import cn.hutool.core.collection.CollUtil; @@ -7,10 +7,9 @@ import cn.hutool.core.date.LocalDateTimeUtil; import com.njcn.common.utils.HarmonicTimesUtil; import com.njcn.influx.constant.InfluxDbSqlConstant; import com.njcn.influx.query.InfluxQueryWrapper; -import com.njcn.insert.imapper.InsertDataHarmpowerPMapper; -import com.njcn.insert.service.InsertIDataHarmpowerP; +import com.njcn.migration.insert.imapper.InsertDataHarmpowerPMapper; +import com.njcn.migration.insert.service.InsertIDataHarmpowerP; import com.njcn.param.LineCountEvaluateParam; -import com.njcn.po.influx.DataFlicker; import com.njcn.po.influx.DataHarmpowerP; import lombok.RequiredArgsConstructor; import org.apache.commons.collections4.ListUtils; diff --git a/migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/insert/service/impl/InsertDataHarmpowerQImpl.java b/migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/migration/insert/service/impl/InsertDataHarmpowerQImpl.java similarity index 93% rename from migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/insert/service/impl/InsertDataHarmpowerQImpl.java rename to migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/migration/insert/service/impl/InsertDataHarmpowerQImpl.java index ab102ac..3c76c90 100644 --- a/migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/insert/service/impl/InsertDataHarmpowerQImpl.java +++ b/migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/migration/insert/service/impl/InsertDataHarmpowerQImpl.java @@ -1,4 +1,4 @@ -package com.njcn.insert.service.impl; +package com.njcn.migration.insert.service.impl; import cn.hutool.core.collection.CollUtil; @@ -7,10 +7,9 @@ import cn.hutool.core.date.LocalDateTimeUtil; import com.njcn.common.utils.HarmonicTimesUtil; import com.njcn.influx.constant.InfluxDbSqlConstant; import com.njcn.influx.query.InfluxQueryWrapper; -import com.njcn.insert.imapper.InsertDataHarmpowerQMapper; -import com.njcn.insert.service.InsertIDataHarmpowerQ; +import com.njcn.migration.insert.imapper.InsertDataHarmpowerQMapper; +import com.njcn.migration.insert.service.InsertIDataHarmpowerQ; import com.njcn.param.LineCountEvaluateParam; -import com.njcn.po.influx.DataFlicker; import com.njcn.po.influx.DataHarmpowerQ; import lombok.RequiredArgsConstructor; import org.apache.commons.collections4.ListUtils; diff --git a/migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/insert/service/impl/InsertDataHarmpowerSImpl.java b/migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/migration/insert/service/impl/InsertDataHarmpowerSImpl.java similarity index 93% rename from migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/insert/service/impl/InsertDataHarmpowerSImpl.java rename to migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/migration/insert/service/impl/InsertDataHarmpowerSImpl.java index 976faaf..cdad7e0 100644 --- a/migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/insert/service/impl/InsertDataHarmpowerSImpl.java +++ b/migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/migration/insert/service/impl/InsertDataHarmpowerSImpl.java @@ -1,4 +1,4 @@ -package com.njcn.insert.service.impl; +package com.njcn.migration.insert.service.impl; import cn.hutool.core.collection.CollUtil; @@ -7,10 +7,9 @@ import cn.hutool.core.date.LocalDateTimeUtil; import com.njcn.common.utils.HarmonicTimesUtil; import com.njcn.influx.constant.InfluxDbSqlConstant; import com.njcn.influx.query.InfluxQueryWrapper; -import com.njcn.insert.imapper.InsertDataHarmpowerSMapper; -import com.njcn.insert.service.InsertIDataHarmpowerS; +import com.njcn.migration.insert.imapper.InsertDataHarmpowerSMapper; +import com.njcn.migration.insert.service.InsertIDataHarmpowerS; import com.njcn.param.LineCountEvaluateParam; -import com.njcn.po.influx.DataFlicker; import com.njcn.po.influx.DataHarmpowerS; import lombok.RequiredArgsConstructor; import org.apache.commons.collections4.ListUtils; diff --git a/migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/insert/service/impl/InsertDataIImpl.java b/migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/migration/insert/service/impl/InsertDataIImpl.java similarity index 94% rename from migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/insert/service/impl/InsertDataIImpl.java rename to migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/migration/insert/service/impl/InsertDataIImpl.java index 20acb8e..b6df087 100644 --- a/migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/insert/service/impl/InsertDataIImpl.java +++ b/migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/migration/insert/service/impl/InsertDataIImpl.java @@ -1,4 +1,4 @@ -package com.njcn.insert.service.impl; +package com.njcn.migration.insert.service.impl; import cn.hutool.core.collection.CollUtil; @@ -7,10 +7,9 @@ import cn.hutool.core.date.LocalDateTimeUtil; import com.njcn.common.utils.HarmonicTimesUtil; import com.njcn.influx.constant.InfluxDbSqlConstant; import com.njcn.influx.query.InfluxQueryWrapper; -import com.njcn.insert.imapper.InsertDataIMapper; -import com.njcn.insert.service.InsertIDataI; +import com.njcn.migration.insert.imapper.InsertDataIMapper; +import com.njcn.migration.insert.service.InsertIDataI; import com.njcn.param.LineCountEvaluateParam; -import com.njcn.po.influx.DataFlicker; import com.njcn.po.influx.DataI; import lombok.RequiredArgsConstructor; import org.apache.commons.collections4.ListUtils; diff --git a/migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/insert/service/impl/InsertDataInharmIImpl.java b/migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/migration/insert/service/impl/InsertDataInharmIImpl.java similarity index 93% rename from migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/insert/service/impl/InsertDataInharmIImpl.java rename to migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/migration/insert/service/impl/InsertDataInharmIImpl.java index 8242297..5f51c3f 100644 --- a/migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/insert/service/impl/InsertDataInharmIImpl.java +++ b/migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/migration/insert/service/impl/InsertDataInharmIImpl.java @@ -1,4 +1,4 @@ -package com.njcn.insert.service.impl; +package com.njcn.migration.insert.service.impl; import cn.hutool.core.collection.CollUtil; @@ -7,10 +7,9 @@ import cn.hutool.core.date.LocalDateTimeUtil; import com.njcn.common.utils.HarmonicTimesUtil; import com.njcn.influx.constant.InfluxDbSqlConstant; import com.njcn.influx.query.InfluxQueryWrapper; -import com.njcn.insert.imapper.InsertDataInharmIMapper; -import com.njcn.insert.service.InsertIDataInharmI; +import com.njcn.migration.insert.imapper.InsertDataInharmIMapper; +import com.njcn.migration.insert.service.InsertIDataInharmI; import com.njcn.param.LineCountEvaluateParam; -import com.njcn.po.influx.DataFlicker; import com.njcn.po.influx.DataInharmI; import lombok.RequiredArgsConstructor; import org.apache.commons.collections4.ListUtils; diff --git a/migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/insert/service/impl/InsertDataInharmVImpl.java b/migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/migration/insert/service/impl/InsertDataInharmVImpl.java similarity index 93% rename from migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/insert/service/impl/InsertDataInharmVImpl.java rename to migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/migration/insert/service/impl/InsertDataInharmVImpl.java index 048c699..fbc171a 100644 --- a/migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/insert/service/impl/InsertDataInharmVImpl.java +++ b/migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/migration/insert/service/impl/InsertDataInharmVImpl.java @@ -1,4 +1,4 @@ -package com.njcn.insert.service.impl; +package com.njcn.migration.insert.service.impl; import cn.hutool.core.collection.CollUtil; @@ -7,10 +7,9 @@ import cn.hutool.core.date.LocalDateTimeUtil; import com.njcn.common.utils.HarmonicTimesUtil; import com.njcn.influx.constant.InfluxDbSqlConstant; import com.njcn.influx.query.InfluxQueryWrapper; -import com.njcn.insert.imapper.InsertDataInharmVMapper; -import com.njcn.insert.service.InsertIDataInharmV; +import com.njcn.migration.insert.imapper.InsertDataInharmVMapper; +import com.njcn.migration.insert.service.InsertIDataInharmV; import com.njcn.param.LineCountEvaluateParam; -import com.njcn.po.influx.DataFlicker; import com.njcn.po.influx.DataInharmV; import lombok.RequiredArgsConstructor; import org.apache.commons.collections4.ListUtils; diff --git a/migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/insert/service/impl/InsertDataPltImpl.java b/migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/migration/insert/service/impl/InsertDataPltImpl.java similarity index 92% rename from migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/insert/service/impl/InsertDataPltImpl.java rename to migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/migration/insert/service/impl/InsertDataPltImpl.java index d587857..0414bcf 100644 --- a/migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/insert/service/impl/InsertDataPltImpl.java +++ b/migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/migration/insert/service/impl/InsertDataPltImpl.java @@ -1,14 +1,13 @@ -package com.njcn.insert.service.impl; +package com.njcn.migration.insert.service.impl; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.date.DatePattern; import cn.hutool.core.date.LocalDateTimeUtil; import com.njcn.influx.query.InfluxQueryWrapper; -import com.njcn.insert.imapper.InsertDataPltMapper; -import com.njcn.insert.service.InsertIDataPlt; +import com.njcn.migration.insert.imapper.InsertDataPltMapper; +import com.njcn.migration.insert.service.InsertIDataPlt; import com.njcn.param.LineCountEvaluateParam; -import com.njcn.po.influx.DataFlicker; import com.njcn.po.influx.DataPlt; import lombok.RequiredArgsConstructor; import org.apache.commons.collections4.ListUtils; diff --git a/migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/insert/service/impl/InsertDataVImpl.java b/migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/migration/insert/service/impl/InsertDataVImpl.java similarity index 96% rename from migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/insert/service/impl/InsertDataVImpl.java rename to migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/migration/insert/service/impl/InsertDataVImpl.java index b0d244b..0fe3009 100644 --- a/migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/insert/service/impl/InsertDataVImpl.java +++ b/migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/migration/insert/service/impl/InsertDataVImpl.java @@ -1,4 +1,4 @@ -package com.njcn.insert.service.impl; +package com.njcn.migration.insert.service.impl; import cn.hutool.core.collection.CollUtil; @@ -7,8 +7,8 @@ import cn.hutool.core.date.LocalDateTimeUtil; import com.njcn.common.utils.HarmonicTimesUtil; import com.njcn.influx.constant.InfluxDbSqlConstant; import com.njcn.influx.query.InfluxQueryWrapper; -import com.njcn.insert.imapper.InsertDataVMapper; -import com.njcn.insert.service.InsertIDataV; +import com.njcn.migration.insert.imapper.InsertDataVMapper; +import com.njcn.migration.insert.service.InsertIDataV; import com.njcn.param.LineCountEvaluateParam; import com.njcn.po.influx.DataV; import lombok.RequiredArgsConstructor; @@ -16,7 +16,6 @@ import org.apache.commons.collections4.ListUtils; import org.springframework.stereotype.Service; import java.time.Instant; -import java.time.LocalDateTime; import java.time.ZoneId; import java.util.ArrayList; import java.util.List; diff --git a/migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/insert/service/impl/InsertPqsCommunicateImpl.java b/migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/migration/insert/service/impl/InsertPqsCommunicateImpl.java similarity index 92% rename from migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/insert/service/impl/InsertPqsCommunicateImpl.java rename to migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/migration/insert/service/impl/InsertPqsCommunicateImpl.java index e2c05f4..6f80292 100644 --- a/migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/insert/service/impl/InsertPqsCommunicateImpl.java +++ b/migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/migration/insert/service/impl/InsertPqsCommunicateImpl.java @@ -1,14 +1,13 @@ -package com.njcn.insert.service.impl; +package com.njcn.migration.insert.service.impl; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.date.DatePattern; import cn.hutool.core.date.LocalDateTimeUtil; import com.njcn.influx.query.InfluxQueryWrapper; -import com.njcn.insert.imapper.InsertPqsCommunicateMapper; -import com.njcn.insert.service.InsertIPqsCommunicate; +import com.njcn.migration.insert.imapper.InsertPqsCommunicateMapper; +import com.njcn.migration.insert.service.InsertIPqsCommunicate; import com.njcn.param.LineCountEvaluateParam; -import com.njcn.po.influx.DataFlicker; import com.njcn.po.influx.PqsCommunicate; import lombok.RequiredArgsConstructor; import org.apache.commons.collections4.ListUtils; diff --git a/migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/migration/insert/service/impl/InsertRmpEventDetailImpl.java b/migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/migration/insert/service/impl/InsertRmpEventDetailImpl.java new file mode 100644 index 0000000..d262955 --- /dev/null +++ b/migration-influxDB/migration-influxdb-insert-boot/src/main/java/com/njcn/migration/insert/service/impl/InsertRmpEventDetailImpl.java @@ -0,0 +1,33 @@ +package com.njcn.migration.insert.service.impl; + + +import com.github.jeffreyning.mybatisplus.service.MppServiceImpl; +import com.njcn.migration.insert.mapper.EventDetailMapper; +import com.njcn.migration.insert.service.InsertIRmpEventDetail; +import com.njcn.po.mysql.RmpEventDetail; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; + +import java.util.List; +import java.util.stream.Collectors; + +/** + * Description: + * Date: 2024/11/28 9:04【需求编号】 + * + * @author clam + * @version V1.0.0 + */ +@Service +@RequiredArgsConstructor +public class InsertRmpEventDetailImpl extends MppServiceImpl implements InsertIRmpEventDetail { + + @Override + public void batchInsertion(List list) { + List ids = list.stream().map(RmpEventDetail::getEventId).distinct().collect(Collectors.toList()); + this.removeByIds(ids); + this.saveBatch(list); + } + + +} diff --git a/migration-influxDB/migration-influxdb-read-boot/pom.xml b/migration-influxDB/migration-influxdb-read-boot/pom.xml index 298e9b3..f97b288 100644 --- a/migration-influxDB/migration-influxdb-read-boot/pom.xml +++ b/migration-influxDB/migration-influxdb-read-boot/pom.xml @@ -38,6 +38,85 @@ 1.0.0 compile - + + + cglib + cglib + 3.3.0 + + + + org.ow2.asm + asm + 7.3.1 + + + + + + org.apache.maven.plugins + maven-resources-plugin + + UTF-8 + + xlsx + + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.8.0 + + -Xlint:unchecked + + + + org.springframework.boot + spring-boot-maven-plugin + + + package + + repackage + + + + + + + com.spotify + docker-maven-plugin + 1.0.0 + + + build-image + ${docker.operate} + + build + + + + + + http://${docker.repostory} + + ${docker.repostory}/${docker.registry.name}/${project.artifactId} + + latest + + ${docker.url} + ${basedir}/ + + + /ROOT + ${project.build.directory} + ${project.build.finalName}.jar + + + + + + \ No newline at end of file diff --git a/migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/read/MigrationReadBootApplication.java b/migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/migration/read/MigrationReadBootApplication.java similarity index 86% rename from migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/read/MigrationReadBootApplication.java rename to migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/migration/read/MigrationReadBootApplication.java index 708ada5..8f51eb8 100644 --- a/migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/read/MigrationReadBootApplication.java +++ b/migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/migration/read/MigrationReadBootApplication.java @@ -1,4 +1,4 @@ -package com.njcn.read; +package com.njcn.migration.read; import lombok.extern.slf4j.Slf4j; import org.mybatis.spring.annotation.MapperScan; @@ -6,12 +6,14 @@ import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.cloud.openfeign.EnableFeignClients; import org.springframework.context.annotation.DependsOn; +import org.springframework.scheduling.annotation.EnableAsync; /** * @author xy */ @Slf4j +@EnableAsync @DependsOn("proxyMapperRegister") @MapperScan("com.njcn.**.mapper") @EnableFeignClients(basePackages = "com.njcn") @@ -20,6 +22,7 @@ public class MigrationReadBootApplication { public static void main(String[] args) { SpringApplication.run(MigrationReadBootApplication.class, args); + } } diff --git a/migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/migration/read/controller/MigrationInfluxDBController.java b/migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/migration/read/controller/MigrationInfluxDBController.java new file mode 100644 index 0000000..6b7b63a --- /dev/null +++ b/migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/migration/read/controller/MigrationInfluxDBController.java @@ -0,0 +1,110 @@ +package com.njcn.migration.read.controller; + +import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.date.DatePattern; +import cn.hutool.core.date.DateUtil; +import cn.hutool.core.date.LocalDateTimeUtil; +import cn.hutool.core.util.CharsetUtil; +import com.alibaba.excel.EasyExcel; +import com.alibaba.excel.ExcelWriter; +import com.alibaba.excel.write.metadata.WriteSheet; +import com.alibaba.excel.write.style.column.LongestMatchColumnWidthStyleStrategy; +import com.njcn.migration.read.service.IDataV; +import com.njcn.migration.read.service.IPqsCommunicate; +import com.njcn.migration.read.util.TimeUtil; +import com.njcn.param.LineCountEvaluateParam; +import com.njcn.migration.read.service.MigrationService; +import com.njcn.po.influx.DataV; +import com.njcn.po.influx.PqsCommunicate; +import io.swagger.annotations.*; +import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.core.io.ClassPathResource; +import org.springframework.http.MediaType; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.net.URLEncoder; +import java.time.LocalDateTime; +import java.time.LocalTime; +import java.time.format.DateTimeFormatter; +import java.time.temporal.ChronoUnit; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + + +/** + * Description: + * Date: 2024/1/15 18:47【需求编号】 + * + * @author clam + * @version V1.0.0 + */ +@Validated +@Slf4j +@RestController +@RequestMapping("/data") +@Api(tags = "迁移信息数据同步") +@AllArgsConstructor +public class MigrationInfluxDBController { + + private final MigrationService migrationService; + private final IDataV dataV; + private final IPqsCommunicate communicate; + @GetMapping("/influxdb") + @ApiOperation("influxdb数据同步->天数按小时进行分组同步") + @ApiImplicitParams({ + @ApiImplicitParam(name = "startDate", value = "开始时间(yyyy-MM-dd HH:mm:ss)", required = true), + @ApiImplicitParam(name = "endDate", value = "结束时间(yyyy-MM-dd HH:mm:ss)", required = true) + }) + public Boolean eventBatch(@RequestParam("startDate") String startDateTime,@RequestParam("endDate") String endDateTime) { + try { + DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern(DatePattern.NORM_DATETIME_PATTERN); + LineCountEvaluateParam param=new LineCountEvaluateParam(); + param.setIsManual(true); + LocalDateTime startDate = LocalDateTimeUtil.parse(startDateTime, DatePattern.NORM_DATETIME_PATTERN); + LocalDateTime endDate = LocalDateTimeUtil.parse(endDateTime, DatePattern.NORM_DATETIME_PATTERN); + long betweenDay = LocalDateTimeUtil.between(startDate, endDate, ChronoUnit.HOURS); + param.setStartTime(startDate.format(dateTimeFormatter)); + param.setEndTime(startDate.with(LocalTime.of(startDate.getHour(), 59, 59)).format(dateTimeFormatter)); + migrationService.hourseLineDataBacthSysc(param); + migrationService.hourseDevDataBacthSysc(param); + for (int i = 0; i excelDataV = EasyExcel.read(picPathResource.getFile()) + .head(DataV.class) + .sheet(0).doReadSync(); + List datav = dataV.listDataVDesc(new LineCountEvaluateParam()); + if (CollUtil.isNotEmpty(excelDataV)) { + //获取最新监测点最新数据集合 + List ids = excelDataV.stream().map(DataV::getLineId).collect(Collectors.toList()); + List notExcel = datav.stream().filter(x -> !ids.contains(x.getLineId())).collect(Collectors.toList()); + if (CollUtil.isNotEmpty(notExcel)) { + for (DataV v : notExcel) { + TimeUtil.putLineTime(v.getLineId(), DateUtil.format(DateUtil.beginOfDay(DateUtil.parse(v.getTimeId(), DatePattern.NORM_DATETIME_FORMAT)), DatePattern.NORM_DATETIME_FORMAT)); + } + } + } + + List excelCommunicates = EasyExcel.read(picPathResource.getFile()) + .head(PqsCommunicate.class) + .sheet(1).doReadSync(); + List communicates = communicate.listPqsCommunicateDesc(new LineCountEvaluateParam()); + if (CollUtil.isNotEmpty(excelCommunicates)) { + //获取最新监测点最新数据集合 + List ids = excelCommunicates.stream().map(PqsCommunicate::getDevId).collect(Collectors.toList()); + List notExcel = communicates.stream().filter(x -> !ids.contains(x.getDevId())).collect(Collectors.toList()); + if (CollUtil.isNotEmpty(notExcel)) { + for (PqsCommunicate v : notExcel) { + TimeUtil.putDevTime(v.getDevId(), DateUtil.format(DateUtil.beginOfDay(DateUtil.parse(v.getTimeId(), DatePattern.NORM_DATETIME_FORMAT)), DatePattern.NORM_DATETIME_FORMAT)); + } + } + } + + } + +} diff --git a/migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/read/mapper/RmpEventDetailMapper.java b/migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/migration/read/mapper/RmpEventDetailMapper.java similarity index 84% rename from migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/read/mapper/RmpEventDetailMapper.java rename to migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/migration/read/mapper/RmpEventDetailMapper.java index 984af74..e362fee 100644 --- a/migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/read/mapper/RmpEventDetailMapper.java +++ b/migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/migration/read/mapper/RmpEventDetailMapper.java @@ -1,4 +1,4 @@ -package com.njcn.read.mapper; +package com.njcn.migration.read.mapper; import com.njcn.db.mapper.BatchBaseMapper; import com.njcn.po.mysql.RmpEventDetail; diff --git a/migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/read/service/IDataFlicker.java b/migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/migration/read/service/IDataFlicker.java similarity index 90% rename from migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/read/service/IDataFlicker.java rename to migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/migration/read/service/IDataFlicker.java index 269e043..84cdfbe 100644 --- a/migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/read/service/IDataFlicker.java +++ b/migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/migration/read/service/IDataFlicker.java @@ -1,4 +1,4 @@ -package com.njcn.read.service; +package com.njcn.migration.read.service; import com.njcn.param.LineCountEvaluateParam; diff --git a/migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/read/service/IDataFluc.java b/migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/migration/read/service/IDataFluc.java similarity index 90% rename from migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/read/service/IDataFluc.java rename to migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/migration/read/service/IDataFluc.java index 2f1a118..bcfd746 100644 --- a/migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/read/service/IDataFluc.java +++ b/migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/migration/read/service/IDataFluc.java @@ -1,4 +1,4 @@ -package com.njcn.read.service; +package com.njcn.migration.read.service; import com.njcn.param.LineCountEvaluateParam; diff --git a/migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/read/service/IDataHarmRateI.java b/migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/migration/read/service/IDataHarmRateI.java similarity index 89% rename from migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/read/service/IDataHarmRateI.java rename to migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/migration/read/service/IDataHarmRateI.java index 5eed601..1455356 100644 --- a/migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/read/service/IDataHarmRateI.java +++ b/migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/migration/read/service/IDataHarmRateI.java @@ -1,4 +1,4 @@ -package com.njcn.read.service; +package com.njcn.migration.read.service; import com.njcn.param.LineCountEvaluateParam; diff --git a/migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/read/service/IDataHarmRateV.java b/migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/migration/read/service/IDataHarmRateV.java similarity index 90% rename from migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/read/service/IDataHarmRateV.java rename to migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/migration/read/service/IDataHarmRateV.java index a941be6..99a4cf2 100644 --- a/migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/read/service/IDataHarmRateV.java +++ b/migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/migration/read/service/IDataHarmRateV.java @@ -1,4 +1,4 @@ -package com.njcn.read.service; +package com.njcn.migration.read.service; import com.njcn.param.LineCountEvaluateParam; diff --git a/migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/read/service/IDataHarmphasicI.java b/migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/migration/read/service/IDataHarmphasicI.java similarity index 91% rename from migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/read/service/IDataHarmphasicI.java rename to migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/migration/read/service/IDataHarmphasicI.java index b0d99a4..548690f 100644 --- a/migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/read/service/IDataHarmphasicI.java +++ b/migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/migration/read/service/IDataHarmphasicI.java @@ -1,4 +1,4 @@ -package com.njcn.read.service; +package com.njcn.migration.read.service; import com.njcn.param.LineCountEvaluateParam; diff --git a/migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/read/service/IDataHarmphasicV.java b/migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/migration/read/service/IDataHarmphasicV.java similarity index 92% rename from migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/read/service/IDataHarmphasicV.java rename to migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/migration/read/service/IDataHarmphasicV.java index 729d63d..adb36f2 100644 --- a/migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/read/service/IDataHarmphasicV.java +++ b/migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/migration/read/service/IDataHarmphasicV.java @@ -1,4 +1,4 @@ -package com.njcn.read.service; +package com.njcn.migration.read.service; import com.njcn.param.LineCountEvaluateParam; diff --git a/migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/read/service/IDataHarmpowerP.java b/migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/migration/read/service/IDataHarmpowerP.java similarity index 92% rename from migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/read/service/IDataHarmpowerP.java rename to migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/migration/read/service/IDataHarmpowerP.java index 8ee53e5..865e198 100644 --- a/migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/read/service/IDataHarmpowerP.java +++ b/migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/migration/read/service/IDataHarmpowerP.java @@ -1,4 +1,4 @@ -package com.njcn.read.service; +package com.njcn.migration.read.service; import com.njcn.param.LineCountEvaluateParam; diff --git a/migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/read/service/IDataHarmpowerQ.java b/migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/migration/read/service/IDataHarmpowerQ.java similarity index 92% rename from migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/read/service/IDataHarmpowerQ.java rename to migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/migration/read/service/IDataHarmpowerQ.java index c26c86d..97ecbb9 100644 --- a/migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/read/service/IDataHarmpowerQ.java +++ b/migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/migration/read/service/IDataHarmpowerQ.java @@ -1,4 +1,4 @@ -package com.njcn.read.service; +package com.njcn.migration.read.service; import com.njcn.param.LineCountEvaluateParam; diff --git a/migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/read/service/IDataHarmpowerS.java b/migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/migration/read/service/IDataHarmpowerS.java similarity index 92% rename from migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/read/service/IDataHarmpowerS.java rename to migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/migration/read/service/IDataHarmpowerS.java index 05e0865..6e25790 100644 --- a/migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/read/service/IDataHarmpowerS.java +++ b/migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/migration/read/service/IDataHarmpowerS.java @@ -1,4 +1,4 @@ -package com.njcn.read.service; +package com.njcn.migration.read.service; import com.njcn.param.LineCountEvaluateParam; diff --git a/migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/read/service/IDataI.java b/migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/migration/read/service/IDataI.java similarity index 93% rename from migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/read/service/IDataI.java rename to migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/migration/read/service/IDataI.java index b7cb7e4..d0d64ed 100644 --- a/migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/read/service/IDataI.java +++ b/migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/migration/read/service/IDataI.java @@ -1,4 +1,4 @@ -package com.njcn.read.service; +package com.njcn.migration.read.service; import com.njcn.param.LineCountEvaluateParam; diff --git a/migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/read/service/IDataInharmI.java b/migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/migration/read/service/IDataInharmI.java similarity index 91% rename from migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/read/service/IDataInharmI.java rename to migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/migration/read/service/IDataInharmI.java index bad4f5d..637fb70 100644 --- a/migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/read/service/IDataInharmI.java +++ b/migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/migration/read/service/IDataInharmI.java @@ -1,4 +1,4 @@ -package com.njcn.read.service; +package com.njcn.migration.read.service; import com.njcn.param.LineCountEvaluateParam; diff --git a/migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/read/service/IDataInharmV.java b/migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/migration/read/service/IDataInharmV.java similarity index 91% rename from migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/read/service/IDataInharmV.java rename to migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/migration/read/service/IDataInharmV.java index 27ca1a3..9230937 100644 --- a/migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/read/service/IDataInharmV.java +++ b/migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/migration/read/service/IDataInharmV.java @@ -1,4 +1,4 @@ -package com.njcn.read.service; +package com.njcn.migration.read.service; import com.njcn.param.LineCountEvaluateParam; diff --git a/migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/read/service/IDataPlt.java b/migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/migration/read/service/IDataPlt.java similarity index 90% rename from migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/read/service/IDataPlt.java rename to migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/migration/read/service/IDataPlt.java index 2ae9492..2ce34e7 100644 --- a/migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/read/service/IDataPlt.java +++ b/migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/migration/read/service/IDataPlt.java @@ -1,4 +1,4 @@ -package com.njcn.read.service; +package com.njcn.migration.read.service; import com.njcn.param.LineCountEvaluateParam; diff --git a/migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/read/service/IDataV.java b/migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/migration/read/service/IDataV.java similarity index 93% rename from migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/read/service/IDataV.java rename to migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/migration/read/service/IDataV.java index ed7074e..0a1d5c4 100644 --- a/migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/read/service/IDataV.java +++ b/migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/migration/read/service/IDataV.java @@ -1,4 +1,4 @@ -package com.njcn.read.service; +package com.njcn.migration.read.service; import com.njcn.param.LineCountEvaluateParam; diff --git a/migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/read/service/IPqsCommunicate.java b/migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/migration/read/service/IPqsCommunicate.java similarity index 76% rename from migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/read/service/IPqsCommunicate.java rename to migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/migration/read/service/IPqsCommunicate.java index b126cb9..8493700 100644 --- a/migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/read/service/IPqsCommunicate.java +++ b/migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/migration/read/service/IPqsCommunicate.java @@ -1,4 +1,4 @@ -package com.njcn.read.service; +package com.njcn.migration.read.service; import com.njcn.param.LineCountEvaluateParam; @@ -16,5 +16,7 @@ public interface IPqsCommunicate { List listPqsCommunicate(LineCountEvaluateParam lineParam); + List listPqsCommunicateDesc(LineCountEvaluateParam lineParam); + void insertPqsCommunicate(List list); } diff --git a/migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/migration/read/service/IRmpEventDetail.java b/migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/migration/read/service/IRmpEventDetail.java new file mode 100644 index 0000000..4a5de75 --- /dev/null +++ b/migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/migration/read/service/IRmpEventDetail.java @@ -0,0 +1,27 @@ +package com.njcn.migration.read.service; + + + + +import com.njcn.param.LineCountEvaluateParam; +import com.njcn.po.mysql.RmpEventDetail; + +import java.util.List; + +/** + * Description: + * Date: 2024/11/28 9:04【需求编号】 + * + * @author clam + * @version V1.0.0 + */ +public interface IRmpEventDetail { + + /** + * 获取时间范围数据 + * @param lineParam + * @return + */ + List getRawData(LineCountEvaluateParam lineParam); + +} diff --git a/migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/migration/read/service/MigrationService.java b/migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/migration/read/service/MigrationService.java new file mode 100644 index 0000000..45f18f7 --- /dev/null +++ b/migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/migration/read/service/MigrationService.java @@ -0,0 +1,21 @@ +package com.njcn.migration.read.service; + +import com.njcn.param.LineCountEvaluateParam; + +import java.io.IOException; + +/** + * @author wr + * @description + * @date 2025/4/23 16:19 + */ +public interface MigrationService { + + void hourseLineDataBacthSysc(LineCountEvaluateParam param); + + void hourseDevDataBacthSysc(LineCountEvaluateParam param); + + void initializeExcel() throws IOException; + + +} diff --git a/migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/read/service/impl/DataFlickerImpl.java b/migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/migration/read/service/impl/DataFlickerImpl.java similarity index 93% rename from migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/read/service/impl/DataFlickerImpl.java rename to migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/migration/read/service/impl/DataFlickerImpl.java index bd21d4b..4795ce6 100644 --- a/migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/read/service/impl/DataFlickerImpl.java +++ b/migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/migration/read/service/impl/DataFlickerImpl.java @@ -1,13 +1,12 @@ -package com.njcn.read.service.impl; +package com.njcn.migration.read.service.impl; import cn.hutool.core.collection.CollUtil; import com.njcn.influx.query.InfluxQueryWrapper; import com.njcn.param.LineCountEvaluateParam; import com.njcn.po.influx.DataFlicker; -import com.njcn.po.influx.DataV; -import com.njcn.read.imapper.DataFlickerMapper; -import com.njcn.read.service.IDataFlicker; +import com.njcn.migration.read.imapper.DataFlickerMapper; +import com.njcn.migration.read.service.IDataFlicker; import lombok.RequiredArgsConstructor; import org.apache.commons.collections4.ListUtils; import org.springframework.stereotype.Service; diff --git a/migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/read/service/impl/DataFlucImpl.java b/migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/migration/read/service/impl/DataFlucImpl.java similarity index 93% rename from migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/read/service/impl/DataFlucImpl.java rename to migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/migration/read/service/impl/DataFlucImpl.java index 7dd757c..30811e8 100644 --- a/migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/read/service/impl/DataFlucImpl.java +++ b/migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/migration/read/service/impl/DataFlucImpl.java @@ -1,13 +1,12 @@ -package com.njcn.read.service.impl; +package com.njcn.migration.read.service.impl; import cn.hutool.core.collection.CollUtil; import com.njcn.influx.query.InfluxQueryWrapper; +import com.njcn.migration.read.imapper.DataFlucMapper; +import com.njcn.migration.read.service.IDataFluc; import com.njcn.param.LineCountEvaluateParam; -import com.njcn.po.influx.DataFlicker; import com.njcn.po.influx.DataFluc; -import com.njcn.read.imapper.DataFlucMapper; -import com.njcn.read.service.IDataFluc; import lombok.RequiredArgsConstructor; import org.apache.commons.collections4.ListUtils; import org.springframework.stereotype.Service; diff --git a/migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/read/service/impl/DataHarmRateIImpl.java b/migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/migration/read/service/impl/DataHarmRateIImpl.java similarity index 93% rename from migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/read/service/impl/DataHarmRateIImpl.java rename to migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/migration/read/service/impl/DataHarmRateIImpl.java index a1bd63a..3992d3f 100644 --- a/migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/read/service/impl/DataHarmRateIImpl.java +++ b/migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/migration/read/service/impl/DataHarmRateIImpl.java @@ -1,15 +1,14 @@ -package com.njcn.read.service.impl; +package com.njcn.migration.read.service.impl; import cn.hutool.core.collection.CollUtil; import com.njcn.common.utils.HarmonicTimesUtil; import com.njcn.influx.constant.InfluxDbSqlConstant; import com.njcn.influx.query.InfluxQueryWrapper; +import com.njcn.migration.read.imapper.DataHarmRateIMapper; +import com.njcn.migration.read.service.IDataHarmRateI; import com.njcn.param.LineCountEvaluateParam; -import com.njcn.po.influx.DataHarmpowerS; import com.njcn.po.influx.DataHarmrateI; -import com.njcn.read.imapper.DataHarmRateIMapper; -import com.njcn.read.service.IDataHarmRateI; import lombok.RequiredArgsConstructor; import org.apache.commons.collections4.ListUtils; import org.springframework.stereotype.Service; diff --git a/migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/read/service/impl/DataHarmRateVImpl.java b/migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/migration/read/service/impl/DataHarmRateVImpl.java similarity index 93% rename from migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/read/service/impl/DataHarmRateVImpl.java rename to migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/migration/read/service/impl/DataHarmRateVImpl.java index d16f6a1..00f6e50 100644 --- a/migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/read/service/impl/DataHarmRateVImpl.java +++ b/migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/migration/read/service/impl/DataHarmRateVImpl.java @@ -1,4 +1,4 @@ -package com.njcn.read.service.impl; +package com.njcn.migration.read.service.impl; import cn.hutool.core.collection.CollUtil; @@ -6,10 +6,9 @@ import com.njcn.common.utils.HarmonicTimesUtil; import com.njcn.influx.constant.InfluxDbSqlConstant; import com.njcn.influx.query.InfluxQueryWrapper; import com.njcn.param.LineCountEvaluateParam; -import com.njcn.po.influx.DataHarmrateI; import com.njcn.po.influx.DataHarmrateV; -import com.njcn.read.imapper.DataHarmRateVMapper; -import com.njcn.read.service.IDataHarmRateV; +import com.njcn.migration.read.imapper.DataHarmRateVMapper; +import com.njcn.migration.read.service.IDataHarmRateV; import lombok.RequiredArgsConstructor; import org.apache.commons.collections4.ListUtils; import org.springframework.stereotype.Service; diff --git a/migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/read/service/impl/DataHarmphasicIImpl.java b/migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/migration/read/service/impl/DataHarmphasicIImpl.java similarity index 94% rename from migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/read/service/impl/DataHarmphasicIImpl.java rename to migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/migration/read/service/impl/DataHarmphasicIImpl.java index 373ae5d..7f4b1ef 100644 --- a/migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/read/service/impl/DataHarmphasicIImpl.java +++ b/migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/migration/read/service/impl/DataHarmphasicIImpl.java @@ -1,15 +1,14 @@ -package com.njcn.read.service.impl; +package com.njcn.migration.read.service.impl; import cn.hutool.core.collection.CollUtil; import com.njcn.common.utils.HarmonicTimesUtil; import com.njcn.influx.constant.InfluxDbSqlConstant; import com.njcn.influx.query.InfluxQueryWrapper; +import com.njcn.migration.read.imapper.DataHarmphasicIMapper; +import com.njcn.migration.read.service.IDataHarmphasicI; import com.njcn.param.LineCountEvaluateParam; -import com.njcn.po.influx.DataFluc; import com.njcn.po.influx.DataHarmphasicI; -import com.njcn.read.imapper.DataHarmphasicIMapper; -import com.njcn.read.service.IDataHarmphasicI; import lombok.RequiredArgsConstructor; import org.apache.commons.collections4.ListUtils; import org.springframework.stereotype.Service; diff --git a/migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/read/service/impl/DataHarmphasicVImpl.java b/migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/migration/read/service/impl/DataHarmphasicVImpl.java similarity index 93% rename from migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/read/service/impl/DataHarmphasicVImpl.java rename to migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/migration/read/service/impl/DataHarmphasicVImpl.java index 8bcdb24..aef2f96 100644 --- a/migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/read/service/impl/DataHarmphasicVImpl.java +++ b/migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/migration/read/service/impl/DataHarmphasicVImpl.java @@ -1,15 +1,14 @@ -package com.njcn.read.service.impl; +package com.njcn.migration.read.service.impl; import cn.hutool.core.collection.CollUtil; import com.njcn.common.utils.HarmonicTimesUtil; import com.njcn.influx.constant.InfluxDbSqlConstant; import com.njcn.influx.query.InfluxQueryWrapper; +import com.njcn.migration.read.imapper.DataHarmphasicVMapper; +import com.njcn.migration.read.service.IDataHarmphasicV; import com.njcn.param.LineCountEvaluateParam; -import com.njcn.po.influx.DataHarmphasicI; import com.njcn.po.influx.DataHarmphasicV; -import com.njcn.read.imapper.DataHarmphasicVMapper; -import com.njcn.read.service.IDataHarmphasicV; import lombok.RequiredArgsConstructor; import org.apache.commons.collections4.ListUtils; import org.springframework.stereotype.Service; diff --git a/migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/read/service/impl/DataHarmpowerPImpl.java b/migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/migration/read/service/impl/DataHarmpowerPImpl.java similarity index 93% rename from migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/read/service/impl/DataHarmpowerPImpl.java rename to migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/migration/read/service/impl/DataHarmpowerPImpl.java index e3fad18..51d3d39 100644 --- a/migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/read/service/impl/DataHarmpowerPImpl.java +++ b/migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/migration/read/service/impl/DataHarmpowerPImpl.java @@ -1,15 +1,14 @@ -package com.njcn.read.service.impl; +package com.njcn.migration.read.service.impl; import cn.hutool.core.collection.CollUtil; import com.njcn.common.utils.HarmonicTimesUtil; import com.njcn.influx.constant.InfluxDbSqlConstant; import com.njcn.influx.query.InfluxQueryWrapper; +import com.njcn.migration.read.imapper.DataHarmpowerPMapper; +import com.njcn.migration.read.service.IDataHarmpowerP; import com.njcn.param.LineCountEvaluateParam; -import com.njcn.po.influx.DataHarmphasicV; import com.njcn.po.influx.DataHarmpowerP; -import com.njcn.read.imapper.DataHarmpowerPMapper; -import com.njcn.read.service.IDataHarmpowerP; import lombok.RequiredArgsConstructor; import org.apache.commons.collections4.ListUtils; import org.springframework.stereotype.Service; diff --git a/migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/read/service/impl/DataHarmpowerQImpl.java b/migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/migration/read/service/impl/DataHarmpowerQImpl.java similarity index 94% rename from migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/read/service/impl/DataHarmpowerQImpl.java rename to migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/migration/read/service/impl/DataHarmpowerQImpl.java index e341b44..c2a3bb7 100644 --- a/migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/read/service/impl/DataHarmpowerQImpl.java +++ b/migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/migration/read/service/impl/DataHarmpowerQImpl.java @@ -1,15 +1,15 @@ -package com.njcn.read.service.impl; +package com.njcn.migration.read.service.impl; import cn.hutool.core.collection.CollUtil; import com.njcn.common.utils.HarmonicTimesUtil; import com.njcn.influx.constant.InfluxDbSqlConstant; import com.njcn.influx.query.InfluxQueryWrapper; +import com.njcn.migration.read.imapper.DataHarmpowerQMapper; +import com.njcn.migration.read.service.IDataHarmpowerQ; import com.njcn.param.LineCountEvaluateParam; import com.njcn.po.influx.DataHarmpowerP; import com.njcn.po.influx.DataHarmpowerQ; -import com.njcn.read.imapper.DataHarmpowerQMapper; -import com.njcn.read.service.IDataHarmpowerQ; import lombok.RequiredArgsConstructor; import org.apache.commons.collections4.ListUtils; import org.springframework.stereotype.Service; diff --git a/migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/read/service/impl/DataHarmpowerSImpl.java b/migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/migration/read/service/impl/DataHarmpowerSImpl.java similarity index 93% rename from migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/read/service/impl/DataHarmpowerSImpl.java rename to migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/migration/read/service/impl/DataHarmpowerSImpl.java index 62ee024..5e9be07 100644 --- a/migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/read/service/impl/DataHarmpowerSImpl.java +++ b/migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/migration/read/service/impl/DataHarmpowerSImpl.java @@ -1,15 +1,14 @@ -package com.njcn.read.service.impl; +package com.njcn.migration.read.service.impl; import cn.hutool.core.collection.CollUtil; import com.njcn.common.utils.HarmonicTimesUtil; import com.njcn.influx.constant.InfluxDbSqlConstant; import com.njcn.influx.query.InfluxQueryWrapper; +import com.njcn.migration.read.imapper.DataHarmpowerSMapper; +import com.njcn.migration.read.service.IDataHarmpowerS; import com.njcn.param.LineCountEvaluateParam; -import com.njcn.po.influx.DataHarmpowerQ; import com.njcn.po.influx.DataHarmpowerS; -import com.njcn.read.imapper.DataHarmpowerSMapper; -import com.njcn.read.service.IDataHarmpowerS; import lombok.RequiredArgsConstructor; import org.apache.commons.collections4.ListUtils; import org.springframework.stereotype.Service; diff --git a/migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/read/service/impl/DataIImpl.java b/migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/migration/read/service/impl/DataIImpl.java similarity index 94% rename from migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/read/service/impl/DataIImpl.java rename to migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/migration/read/service/impl/DataIImpl.java index 4bb311c..11c15f4 100644 --- a/migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/read/service/impl/DataIImpl.java +++ b/migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/migration/read/service/impl/DataIImpl.java @@ -1,4 +1,4 @@ -package com.njcn.read.service.impl; +package com.njcn.migration.read.service.impl; import cn.hutool.core.collection.CollUtil; @@ -6,10 +6,9 @@ import com.njcn.common.utils.HarmonicTimesUtil; import com.njcn.influx.constant.InfluxDbSqlConstant; import com.njcn.influx.query.InfluxQueryWrapper; import com.njcn.param.LineCountEvaluateParam; -import com.njcn.po.influx.DataHarmrateV; import com.njcn.po.influx.DataI; -import com.njcn.read.imapper.DataIMapper; -import com.njcn.read.service.IDataI; +import com.njcn.migration.read.imapper.DataIMapper; +import com.njcn.migration.read.service.IDataI; import lombok.RequiredArgsConstructor; import org.apache.commons.collections4.ListUtils; import org.springframework.stereotype.Service; diff --git a/migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/read/service/impl/DataInharmIImpl.java b/migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/migration/read/service/impl/DataInharmIImpl.java similarity index 94% rename from migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/read/service/impl/DataInharmIImpl.java rename to migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/migration/read/service/impl/DataInharmIImpl.java index 8e5a13c..1d38775 100644 --- a/migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/read/service/impl/DataInharmIImpl.java +++ b/migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/migration/read/service/impl/DataInharmIImpl.java @@ -1,15 +1,14 @@ -package com.njcn.read.service.impl; +package com.njcn.migration.read.service.impl; import cn.hutool.core.collection.CollUtil; import com.njcn.common.utils.HarmonicTimesUtil; import com.njcn.influx.constant.InfluxDbSqlConstant; import com.njcn.influx.query.InfluxQueryWrapper; +import com.njcn.migration.read.imapper.DataInharmIMapper; +import com.njcn.migration.read.service.IDataInharmI; import com.njcn.param.LineCountEvaluateParam; -import com.njcn.po.influx.DataI; import com.njcn.po.influx.DataInharmI; -import com.njcn.read.imapper.DataInharmIMapper; -import com.njcn.read.service.IDataInharmI; import lombok.RequiredArgsConstructor; import org.apache.commons.collections4.ListUtils; import org.springframework.stereotype.Service; diff --git a/migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/read/service/impl/DataInharmVImpl.java b/migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/migration/read/service/impl/DataInharmVImpl.java similarity index 94% rename from migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/read/service/impl/DataInharmVImpl.java rename to migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/migration/read/service/impl/DataInharmVImpl.java index e79319d..3b59d65 100644 --- a/migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/read/service/impl/DataInharmVImpl.java +++ b/migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/migration/read/service/impl/DataInharmVImpl.java @@ -1,15 +1,14 @@ -package com.njcn.read.service.impl; +package com.njcn.migration.read.service.impl; import cn.hutool.core.collection.CollUtil; import com.njcn.common.utils.HarmonicTimesUtil; import com.njcn.influx.constant.InfluxDbSqlConstant; import com.njcn.influx.query.InfluxQueryWrapper; +import com.njcn.migration.read.imapper.DataInharmVMapper; +import com.njcn.migration.read.service.IDataInharmV; import com.njcn.param.LineCountEvaluateParam; -import com.njcn.po.influx.DataInharmI; import com.njcn.po.influx.DataInharmV; -import com.njcn.read.imapper.DataInharmVMapper; -import com.njcn.read.service.IDataInharmV; import lombok.RequiredArgsConstructor; import org.apache.commons.collections4.ListUtils; import org.springframework.stereotype.Service; diff --git a/migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/read/service/impl/DataPltImpl.java b/migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/migration/read/service/impl/DataPltImpl.java similarity index 93% rename from migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/read/service/impl/DataPltImpl.java rename to migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/migration/read/service/impl/DataPltImpl.java index 97fc509..13c0edd 100644 --- a/migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/read/service/impl/DataPltImpl.java +++ b/migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/migration/read/service/impl/DataPltImpl.java @@ -1,13 +1,12 @@ -package com.njcn.read.service.impl; +package com.njcn.migration.read.service.impl; import cn.hutool.core.collection.CollUtil; import com.njcn.influx.query.InfluxQueryWrapper; +import com.njcn.migration.read.imapper.DataPltMapper; +import com.njcn.migration.read.service.IDataPlt; import com.njcn.param.LineCountEvaluateParam; -import com.njcn.po.influx.DataInharmV; import com.njcn.po.influx.DataPlt; -import com.njcn.read.imapper.DataPltMapper; -import com.njcn.read.service.IDataPlt; import lombok.RequiredArgsConstructor; import org.apache.commons.collections4.ListUtils; import org.springframework.stereotype.Service; diff --git a/migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/read/service/impl/DataVImpl.java b/migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/migration/read/service/impl/DataVImpl.java similarity index 90% rename from migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/read/service/impl/DataVImpl.java rename to migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/migration/read/service/impl/DataVImpl.java index 47a959c..85c51f8 100644 --- a/migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/read/service/impl/DataVImpl.java +++ b/migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/migration/read/service/impl/DataVImpl.java @@ -1,4 +1,4 @@ -package com.njcn.read.service.impl; +package com.njcn.migration.read.service.impl; import cn.hutool.core.collection.CollUtil; @@ -7,11 +7,10 @@ import com.njcn.influx.constant.InfluxDbSqlConstant; import com.njcn.influx.query.InfluxQueryWrapper; import com.njcn.param.LineCountEvaluateParam; import com.njcn.po.influx.DataV; -import com.njcn.read.imapper.DataVMapper; -import com.njcn.read.service.IDataV; +import com.njcn.migration.read.imapper.DataVMapper; +import com.njcn.migration.read.service.IDataV; import lombok.RequiredArgsConstructor; import org.apache.commons.collections4.ListUtils; -import org.checkerframework.checker.units.qual.C; import org.springframework.stereotype.Service; import java.time.ZoneId; @@ -98,7 +97,13 @@ public class DataVImpl implements IDataV { if (CollUtil.isNotEmpty(lineParam.getPhasicType())) { influxQueryWrapper.regular(DataV::getPhasicType, lineParam.getPhasicType()); } - return dataVMapper.selectByQueryWrapper(influxQueryWrapper); + List dataVS = dataVMapper.selectByQueryWrapper(influxQueryWrapper); + if(CollUtil.isNotEmpty(dataVS)){ + for (DataV dataV : dataVS) { + dataV.setTimeId(DATE_TIME_FORMATTER.format(dataV.getTime())); + } + } + return dataVS; } @Override diff --git a/migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/migration/read/service/impl/MigrationServiceImpl.java b/migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/migration/read/service/impl/MigrationServiceImpl.java new file mode 100644 index 0000000..c543efc --- /dev/null +++ b/migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/migration/read/service/impl/MigrationServiceImpl.java @@ -0,0 +1,164 @@ +package com.njcn.migration.read.service.impl; + +import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.util.StrUtil; +import com.alibaba.excel.EasyExcel; +import com.alibaba.excel.ExcelWriter; +import com.alibaba.excel.write.metadata.WriteSheet; +import com.alibaba.excel.write.style.column.LongestMatchColumnWidthStyleStrategy; +import com.njcn.api.MigrationInsertFeignClient; +import com.njcn.migration.read.service.*; +import com.njcn.param.LineCountEvaluateParam; +import com.njcn.po.influx.DataV; +import com.njcn.migration.read.util.TimeUtil; +import com.njcn.po.influx.PqsCommunicate; +import lombok.RequiredArgsConstructor; +import org.springframework.core.io.ClassPathResource; +import org.springframework.scheduling.annotation.Async; +import org.springframework.stereotype.Service; + +import java.io.IOException; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import java.util.Map; + +/** + * @author wr + * @description + * @date 2025/4/23 16:20 + */ +@Service +@RequiredArgsConstructor +public class MigrationServiceImpl implements MigrationService { + + private final IDataFlicker dataFlicker; + private final IDataFluc dataFluc; + private final IDataHarmphasicI dataHarmphasicI; + private final IDataHarmphasicV dataHarmphasicV; + private final IDataHarmpowerP dataHarmpowerP; + private final IDataHarmpowerQ dataHarmpowerQ; + private final IDataHarmpowerS dataHarmpowerS; + private final IDataHarmRateI dataHarmRateI; + private final IDataHarmRateV dataHarmRateV; + private final IDataI dataI; + private final IDataInharmI dataInharmI; + private final IDataInharmV dataInharmV; + private final IDataPlt dataPlt; + private final IDataV dataV; + private final IPqsCommunicate pqsCommunicate; + private final IRmpEventDetail eventDetail; + private final MigrationInsertFeignClient migrationInsertFeignClient; + + + @Override + @Async + public void hourseLineDataBacthSysc(LineCountEvaluateParam param) { + Map map = TimeUtil.getLineMap(); + int size = map.size(); + final Integer[] num = {0}; + map.forEach((lineId,time)->{ + num[0] = num[0] + 1; + System.out.println("当前总监测点数量"+size+"当前第"+num[0]+"：-》"+lineId+" "+param.getStartTime()+" "+param.getEndTime()+"剩余"+(size-num[0])); + String format=null; + if(!param.getIsManual()){ + if(StrUtil.isNotBlank(time)){ + param.setStartTime(time); + } + } + param.setLineId(Arrays.asList(lineId)); + List dataVS = dataV.listDataV(param); + if(CollUtil.isNotEmpty(dataVS)){ + if(!param.getIsManual()){ + format = dataVS.get(0).getTimeId(); + } + migrationInsertFeignClient.insertDataV(dataVS); + } + migrationInsertFeignClient.insertDataFlicker(dataFlicker.listDataFlicker(param)); + migrationInsertFeignClient.insertDataFluc(dataFluc.listDataFluc(param)); + migrationInsertFeignClient.insertDataHarmphasicI(dataHarmphasicI.listDataHarmphasicI(param)); + migrationInsertFeignClient.insertDataHarmphasicV(dataHarmphasicV.listDataHarmphasicV(param)); + migrationInsertFeignClient.insertDataHarmpowerP(dataHarmpowerP.listDataHarmpowerP(param)); + migrationInsertFeignClient.insertDataHarmpowerQ(dataHarmpowerQ.listDataHarmpowerQ(param)); + migrationInsertFeignClient.insertDataHarmpowerS(dataHarmpowerS.listDataHarmpowerS(param)); + migrationInsertFeignClient.insertDataHarmrateI(dataHarmRateI.listDataHarmrateI(param)); + migrationInsertFeignClient.insertDataHarmrateV(dataHarmRateV.listDataHarmrateV(param)); + migrationInsertFeignClient.insertDataI(dataI.listDataI(param)); + migrationInsertFeignClient.insertDataInharmI(dataInharmI.listDataInharmI(param)); + migrationInsertFeignClient.insertDataInharmV(dataInharmV.listDataInharmV(param)); + migrationInsertFeignClient.insertDataPlt(dataPlt.listDataPlt(param)); + migrationInsertFeignClient.batchInsertion(eventDetail.getRawData(param)); + + if(!param.getIsManual()&&StrUtil.isNotBlank(format)){ + TimeUtil.putLineTime(lineId,format); + } + }); + } + + @Override + @Async + public void hourseDevDataBacthSysc(LineCountEvaluateParam param) { + Map map = TimeUtil.getDevMap(); + int size = map.size(); + final Integer[] num = {0}; + map.forEach((lineId,time)->{ + num[0] = num[0] + 1; + System.out.println("当前总终端数量"+size+"当前第"+num[0]+"：-》"+lineId+" "+param.getStartTime()+" "+param.getEndTime()+"剩余"+(size-num[0])); + String format=null; + if(!param.getIsManual()){ + if(StrUtil.isNotBlank(time)){ + param.setStartTime(time); + } + } + param.setLineId(Arrays.asList(lineId)); + List pqsCommunicates = pqsCommunicate.listPqsCommunicate(param); + if(CollUtil.isNotEmpty(pqsCommunicates)){ + if(!param.getIsManual()){ + format = pqsCommunicates.get(0).getTimeId(); + } + migrationInsertFeignClient.insertPqsCommunicate(pqsCommunicates); + } + if(!param.getIsManual()&&StrUtil.isNotBlank(format)){ + TimeUtil.putDevTime(lineId,format); + } + }); + } + + @Override + public void initializeExcel() throws IOException { + ClassPathResource picPathResource = new ClassPathResource("file/sj.xlsx"); + Map map = TimeUtil.getLineMap(); + List lineExcel = new ArrayList<>(); + map.forEach((line,value)->{ + DataV data=new DataV(); + data.setLineId(line); + data.setTimeId(value); + lineExcel.add(data); + }); + + Map devmap = TimeUtil.getLineMap(); + List devExcel = new ArrayList<>(); + devmap.forEach((line,value)->{ + PqsCommunicate data=new PqsCommunicate(); + data.setDevId(line); + data.setTimeId(value); + devExcel.add(data); + }); + + ExcelWriter excelWriter = EasyExcel.write(picPathResource.getFile()).build(); + //模板1 + WriteSheet writeSheet = EasyExcel.writerSheet(0, "line" ).head(DataV.class) + .includeColumnFiledNames(Arrays.asList("lineId","timeId")) + .registerWriteHandler(new LongestMatchColumnWidthStyleStrategy()) + .build(); + excelWriter.write(lineExcel, writeSheet); + + //模板2 + WriteSheet writeSheet2 = EasyExcel.writerSheet(1, "dev" ).head(PqsCommunicate.class) + .includeColumnFiledNames(Arrays.asList("devId","timeId")) + .registerWriteHandler(new LongestMatchColumnWidthStyleStrategy()) + .build(); + excelWriter.write(devExcel, writeSheet2); + excelWriter.finish(); + } +} diff --git a/migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/read/service/impl/PqsCommunicateImpl.java b/migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/migration/read/service/impl/PqsCommunicateImpl.java similarity index 65% rename from migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/read/service/impl/PqsCommunicateImpl.java rename to migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/migration/read/service/impl/PqsCommunicateImpl.java index a0e2806..b17d4bf 100644 --- a/migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/read/service/impl/PqsCommunicateImpl.java +++ b/migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/migration/read/service/impl/PqsCommunicateImpl.java @@ -1,13 +1,13 @@ -package com.njcn.read.service.impl; +package com.njcn.migration.read.service.impl; import cn.hutool.core.collection.CollUtil; import com.njcn.influx.query.InfluxQueryWrapper; import com.njcn.param.LineCountEvaluateParam; -import com.njcn.po.influx.DataPlt; +import com.njcn.po.influx.DataV; import com.njcn.po.influx.PqsCommunicate; -import com.njcn.read.imapper.PqsCommunicateMapper; -import com.njcn.read.service.IPqsCommunicate; +import com.njcn.migration.read.imapper.PqsCommunicateMapper; +import com.njcn.migration.read.service.IPqsCommunicate; import lombok.RequiredArgsConstructor; import org.apache.commons.collections4.ListUtils; import org.springframework.stereotype.Service; @@ -15,6 +15,7 @@ import org.springframework.stereotype.Service; import java.time.ZoneId; import java.time.format.DateTimeFormatter; import java.util.ArrayList; +import java.util.Collections; import java.util.List; /** @@ -50,6 +51,30 @@ public class PqsCommunicateImpl implements IPqsCommunicate { return dataList; } + @Override + public List listPqsCommunicateDesc(LineCountEvaluateParam lineParam) { + InfluxQueryWrapper influxQueryWrapper = new InfluxQueryWrapper(PqsCommunicate.class); + influxQueryWrapper + .select(PqsCommunicate::getTime) + .select(PqsCommunicate::getDevId) + .select(PqsCommunicate::getDescription) + .select(PqsCommunicate::getType) + .groupBy(PqsCommunicate::getDevId) + .timeDesc() + .limit(1); + ; + if(CollUtil.isNotEmpty(lineParam.getLineId())){ + influxQueryWrapper.regular(PqsCommunicate::getDevId, lineParam.getLineId()); + } + List dataList= pqsCommunicateMapper.selectByQueryWrapper(influxQueryWrapper); + if(CollUtil.isNotEmpty(dataList)){ + for (PqsCommunicate data : dataList) { + data.setTimeId(DATE_TIME_FORMATTER.format(data.getTime())); + } + } + return dataList; + } + @Override public void insertPqsCommunicate(List list) { if(CollUtil.isNotEmpty(list)){ diff --git a/migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/migration/read/service/impl/RmpEventDetailImpl.java b/migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/migration/read/service/impl/RmpEventDetailImpl.java new file mode 100644 index 0000000..c30dae9 --- /dev/null +++ b/migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/migration/read/service/impl/RmpEventDetailImpl.java @@ -0,0 +1,38 @@ +package com.njcn.migration.read.service.impl; + + +import cn.hutool.core.collection.CollUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.njcn.migration.read.mapper.RmpEventDetailMapper; +import com.njcn.migration.read.service.IRmpEventDetail; +import com.njcn.param.LineCountEvaluateParam; +import com.njcn.po.mysql.RmpEventDetail; +import lombok.RequiredArgsConstructor; +import org.springframework.beans.BeanUtils; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; + +/** + * Description: + * Date: 2024/11/28 9:04【需求编号】 + * + * @author clam + * @version V1.0.0 + */ +@Service +@RequiredArgsConstructor +public class RmpEventDetailImpl implements IRmpEventDetail { + + private final RmpEventDetailMapper rmpEventDetailMapper; + + @Override + public List getRawData(LineCountEvaluateParam lineParam) { + LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); + lambdaQueryWrapper.in(CollUtil.isNotEmpty(lineParam.getLineId()),RmpEventDetail::getMeasurementPointId,lineParam.getLineId()) + .ge(RmpEventDetail::getStartTime,lineParam.getStartTime()) + .le(RmpEventDetail::getStartTime,lineParam.getEndTime()); + return rmpEventDetailMapper.selectList(lambdaQueryWrapper); + } +} diff --git a/migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/read/util/TableEnum.java b/migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/migration/read/util/TableEnum.java similarity index 98% rename from migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/read/util/TableEnum.java rename to migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/migration/read/util/TableEnum.java index 5a2e29f..24d57b7 100644 --- a/migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/read/util/TableEnum.java +++ b/migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/migration/read/util/TableEnum.java @@ -1,4 +1,4 @@ -package com.njcn.read.util; +package com.njcn.migration.read.util; import lombok.Getter; diff --git a/migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/migration/read/util/TimeUtil.java b/migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/migration/read/util/TimeUtil.java new file mode 100644 index 0000000..c09d88f --- /dev/null +++ b/migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/migration/read/util/TimeUtil.java @@ -0,0 +1,137 @@ +package com.njcn.migration.read.util; + + +import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.date.DatePattern; +import cn.hutool.core.date.DateUtil; +import cn.hutool.core.date.LocalDateTimeUtil; +import com.alibaba.excel.EasyExcel; +import com.alibaba.excel.ExcelWriter; +import com.alibaba.excel.write.metadata.WriteSheet; +import com.alibaba.excel.write.style.column.LongestMatchColumnWidthStyleStrategy; +import com.njcn.migration.read.service.IDataV; +import com.njcn.migration.read.service.IPqsCommunicate; +import com.njcn.param.LineCountEvaluateParam; +import com.njcn.po.influx.DataV; +import com.njcn.po.influx.PqsCommunicate; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.core.io.ClassPathResource; +import org.springframework.stereotype.Component; + +import javax.annotation.PostConstruct; +import java.io.IOException; +import java.util.*; +import java.util.concurrent.ConcurrentHashMap; +import java.util.stream.Collectors; + +/** + * @author wr + * @description + * @date 2025/4/23 16:11 + */ +@Component +public class TimeUtil { + @Autowired + private IDataV dataV; + @Autowired + private IPqsCommunicate communicate; + /** + * key:监测点id value:当前上次结束时间 + */ + private static final Map LINE_TIME_MAP = new ConcurrentHashMap<>(); + private static final Map DEV_TIME_MAP = new ConcurrentHashMap<>(); + + public static void putLineTime(String lineId, String time) { + LINE_TIME_MAP.put(lineId, time); + } + public static void putAllLineTime(Map limeMap) { + LINE_TIME_MAP.putAll(limeMap); + } + + public static String getLineTime(String lineId) { + if (LINE_TIME_MAP.containsKey(lineId)) { + return LINE_TIME_MAP.get(lineId); + } + return null; + } + + public static Map getLineMap() { + return LINE_TIME_MAP; + } + + + public static void putDevTime(String devId, String time) { + DEV_TIME_MAP.put(devId, time); + } + public static void putAllDevTime(Map devMap) { + DEV_TIME_MAP.putAll(devMap); + } + public static String getDevTime(String devId) { + if (DEV_TIME_MAP.containsKey(devId)) { + return DEV_TIME_MAP.get(devId); + } + return null; + } + + public static Map getDevMap() { + return DEV_TIME_MAP; + } + + @PostConstruct + public void init() throws IOException { + ClassPathResource picPathResource = new ClassPathResource("file/sj.xlsx"); + List excelDataV = EasyExcel.read(picPathResource.getFile()) + .head(DataV.class) + .sheet(0).doReadSync(); + List datav = dataV.listDataVDesc(new LineCountEvaluateParam()); + if(CollUtil.isNotEmpty(excelDataV)){ + //获取最新监测点最新数据集合 + List ids = excelDataV.stream().map(DataV::getLineId).collect(Collectors.toList()); + List notExcel = datav.stream().filter(x -> !ids.contains(x.getLineId())).collect(Collectors.toList()); + if(CollUtil.isNotEmpty(notExcel)){ + for (DataV v : notExcel) { + v.setTimeId(DateUtil.format(DateUtil.beginOfDay(DateUtil.parse(v.getTimeId(), DatePattern.NORM_DATETIME_FORMAT)),DatePattern.NORM_DATETIME_FORMAT)); + } + excelDataV.addAll(notExcel); + } + }else{ + excelDataV.addAll(datav); + } + + List excelCommunicates = EasyExcel.read(picPathResource.getFile()) + .head(PqsCommunicate.class) + .sheet(1).doReadSync(); + List communicates = communicate.listPqsCommunicateDesc(new LineCountEvaluateParam()); + if(CollUtil.isNotEmpty(excelCommunicates)){ + //获取最新监测点最新数据集合 + List ids = excelCommunicates.stream().map(PqsCommunicate::getDevId).collect(Collectors.toList()); + List notExcel = communicates.stream().filter(x -> !ids.contains(x.getDevId())).collect(Collectors.toList()); + if(CollUtil.isNotEmpty(notExcel)){ + for (PqsCommunicate v : notExcel) { + v.setTimeId(DateUtil.format(DateUtil.beginOfDay(DateUtil.parse(v.getTimeId(), DatePattern.NORM_DATETIME_FORMAT)),DatePattern.NORM_DATETIME_FORMAT)); + } + excelCommunicates.addAll(notExcel); + } + }else{ + excelCommunicates.addAll(communicates); + } + + ExcelWriter excelWriter = EasyExcel.write(picPathResource.getFile()).build(); + //模板1 + WriteSheet writeSheet = EasyExcel.writerSheet(0, "line" ).head(DataV.class) + .includeColumnFiledNames(Arrays.asList("lineId","timeId")) + .registerWriteHandler(new LongestMatchColumnWidthStyleStrategy()) + .build(); + excelWriter.write(excelDataV, writeSheet); + + //模板2 + WriteSheet writeSheet2 = EasyExcel.writerSheet(1, "dev" ).head(PqsCommunicate.class) + .includeColumnFiledNames(Arrays.asList("devId","timeId")) + .registerWriteHandler(new LongestMatchColumnWidthStyleStrategy()) + .build(); + excelWriter.write(excelCommunicates, writeSheet2); + excelWriter.finish(); + TimeUtil.putAllLineTime(excelDataV.stream().collect(Collectors.toMap(DataV::getLineId, DataV::getTimeId))); + TimeUtil.putAllDevTime(excelCommunicates.stream().collect(Collectors.toMap(PqsCommunicate::getDevId, PqsCommunicate::getTimeId))); + } +} diff --git a/migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/read/service/IRmpEventDetail.java b/migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/read/service/IRmpEventDetail.java deleted file mode 100644 index 277e640..0000000 --- a/migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/read/service/IRmpEventDetail.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.njcn.read.service; - - -/** - * Description: - * Date: 2024/11/28 9:04【需求编号】 - * - * @author clam - * @version V1.0.0 - */ -public interface IRmpEventDetail { - - -} diff --git a/migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/read/service/MigrationService.java b/migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/read/service/MigrationService.java deleted file mode 100644 index 71fbbb7..0000000 --- a/migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/read/service/MigrationService.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.njcn.read.service; - -import com.njcn.param.LineCountEvaluateParam; - -/** - * @author wr - * @description - * @date 2025/4/23 16:19 - */ -public interface MigrationService { - - void hourseDataBacthSysc(LineCountEvaluateParam param); -} diff --git a/migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/read/service/impl/MigrationServiceImpl.java b/migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/read/service/impl/MigrationServiceImpl.java deleted file mode 100644 index eb4cc2f..0000000 --- a/migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/read/service/impl/MigrationServiceImpl.java +++ /dev/null @@ -1,87 +0,0 @@ -package com.njcn.read.service.impl; - -import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.util.StrUtil; -import com.njcn.api.MigrationInsertFeignClient; -import com.njcn.param.LineCountEvaluateParam; -import com.njcn.po.influx.DataFlicker; -import com.njcn.po.influx.DataV; -import com.njcn.read.service.*; -import com.njcn.read.util.TimeUtil; -import lombok.RequiredArgsConstructor; -import org.springframework.stereotype.Service; - -import java.time.ZoneId; -import java.time.format.DateTimeFormatter; -import java.util.Arrays; -import java.util.List; -import java.util.Map; - -/** - * @author wr - * @description - * @date 2025/4/23 16:20 - */ -@Service -@RequiredArgsConstructor -public class MigrationServiceImpl implements MigrationService { - DateTimeFormatter DATE_TIME_FORMATTER = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss").withZone(ZoneId.systemDefault()); - - private final IDataFlicker dataFlicker; - private final IDataFluc dataFluc; - private final IDataHarmphasicI dataHarmphasicI; - private final IDataHarmphasicV dataHarmphasicV; - private final IDataHarmpowerP dataHarmpowerP; - private final IDataHarmpowerQ dataHarmpowerQ; - private final IDataHarmpowerS dataHarmpowerS; - private final IDataHarmRateI dataHarmRateI; - private final IDataHarmRateV dataHarmRateV; - private final IDataI dataI; - private final IDataInharmI dataInharmI; - private final IDataInharmV dataInharmV; - private final IDataPlt dataPlt; - private final IDataV dataV; - private final IPqsCommunicate pqsCommunicate; - private final MigrationInsertFeignClient migrationInsertFeignClient; - - - @Override - public void hourseDataBacthSysc(LineCountEvaluateParam param) { - Map map = TimeUtil.getMap(); - map.forEach((lineId,time)->{ - System.out.println("正在测试监测点：-》"+lineId); - String format=null; - if(!param.getIsManual()){ - if(StrUtil.isNotBlank(time)){ - param.setStartTime(time); - } - } - param.setLineId(Arrays.asList(lineId)); - List dataVS = dataV.listDataV(param); - if(CollUtil.isNotEmpty(dataVS)){ - if(!param.getIsManual()){ - format = dataVS.get(0).getTimeId(); - } - migrationInsertFeignClient.insertDataV(dataVS); - } - migrationInsertFeignClient.insertDataFlicker(dataFlicker.listDataFlicker(param)); - migrationInsertFeignClient.insertDataFluc(dataFluc.listDataFluc(param)); - migrationInsertFeignClient.insertDataHarmphasicI(dataHarmphasicI.listDataHarmphasicI(param)); - migrationInsertFeignClient.insertDataHarmphasicV(dataHarmphasicV.listDataHarmphasicV(param)); - migrationInsertFeignClient.insertDataHarmpowerP(dataHarmpowerP.listDataHarmpowerP(param)); - migrationInsertFeignClient.insertDataHarmpowerQ(dataHarmpowerQ.listDataHarmpowerQ(param)); - migrationInsertFeignClient.insertDataHarmpowerS(dataHarmpowerS.listDataHarmpowerS(param)); - migrationInsertFeignClient.insertDataHarmrateI(dataHarmRateI.listDataHarmrateI(param)); - migrationInsertFeignClient.insertDataHarmrateV(dataHarmRateV.listDataHarmrateV(param)); - migrationInsertFeignClient.insertDataI(dataI.listDataI(param)); - migrationInsertFeignClient.insertDataInharmI(dataInharmI.listDataInharmI(param)); - migrationInsertFeignClient.insertDataInharmV(dataInharmV.listDataInharmV(param)); - migrationInsertFeignClient.insertDataPlt(dataPlt.listDataPlt(param)); - //todo 终端需要特殊处理 -// migrationInsertFeignClient.insertPqsCommunicate(pqsCommunicate.listPqsCommunicate(param)); - - - - }); - } -} diff --git a/migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/read/service/impl/RmpEventDetailImpl.java b/migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/read/service/impl/RmpEventDetailImpl.java deleted file mode 100644 index 5a45742..0000000 --- a/migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/read/service/impl/RmpEventDetailImpl.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.njcn.read.service.impl; - - -import com.njcn.read.service.IRmpEventDetail; - -/** - * Description: - * Date: 2024/11/28 9:04【需求编号】 - * - * @author clam - * @version V1.0.0 - */ -public class RmpEventDetailImpl implements IRmpEventDetail { - - -} diff --git a/migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/read/util/TimeUtil.java b/migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/read/util/TimeUtil.java deleted file mode 100644 index a8457f9..0000000 --- a/migration-influxDB/migration-influxdb-read-boot/src/main/java/com/njcn/read/util/TimeUtil.java +++ /dev/null @@ -1,55 +0,0 @@ -package com.njcn.read.util; - - -import com.njcn.param.LineCountEvaluateParam; -import com.njcn.po.influx.DataV; -import com.njcn.read.service.IDataV; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Component; - -import javax.annotation.PostConstruct; -import java.time.ZoneId; -import java.time.format.DateTimeFormatter; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.concurrent.ConcurrentHashMap; -import java.util.stream.Collectors; - -/** - * @author wr - * @description - * @date 2025/4/23 16:11 - */ -@Component -public class TimeUtil { - DateTimeFormatter DATE_TIME_FORMATTER = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss").withZone(ZoneId.systemDefault()); - @Autowired - private IDataV dataV; - - /** - * key:监测点id value:当前上次结束时间 - */ - private static final Map TIME_MAP = new ConcurrentHashMap<>(); - - public static void putTime(String lineId, String time) { - TIME_MAP.put(lineId, time); - } - - public static String getTime(String lineId) { - if (TIME_MAP.containsKey(lineId)) { - return TIME_MAP.get(lineId); - } - return null; - } - - public static Map getMap() { - return TIME_MAP; - } - - @PostConstruct - public void init() { - List dataVS = dataV.listDataVDesc(new LineCountEvaluateParam()); - TIME_MAP.putAll(dataVS.stream().collect(Collectors.toMap(DataV::getLineId,x->DATE_TIME_FORMATTER.format(x.getTime())))); - } -} diff --git a/migration-influxDB/migration-influxdb-read-boot/src/main/resources/file/sj.xlsx b/migration-influxDB/migration-influxdb-read-boot/src/main/resources/file/sj.xlsx new file mode 100644 index 0000000000000000000000000000000000000000..37759ab457e1610784e443e61fbea018e584df1b GIT binary patch literal 3545 zcmaJ@c|4SB8^&Np3Q35vm6Qsh#?pc)+b~F$v1FNyFk=@p){%AW+lUm6w4rQc*PJ2y zzQ#Gqnk`$_BHv7X-!aE`>VALkJMSOw{mlK`_w`)Y1=RvDa?yc6Ai4?-yeS<`9HP9# zuAz|baHPBCO>bwoo4Le2C&yxgX5=4I99u~Z{o)r_poWJ7uL;(3KVJcup%aWZMDsHj z*Uf=)iTdIDT$XL_*xfN&vn_EcF}B0u4=?V&k+o_OEA|=yL?2oT0lo4Wj%~{0SBVRkIU3E{oH{d% zkZ43~7!`GtTn}WsJMk>|nqKeYS$r72Akeq1OncK%fs;!$<4{BpVN-NC^v$!_k7vm$ zl?_YJU^o`SI{_iZ<~J!UD`=e+ykF>m@e)n(z^!@0QqG?>DyDuR zuPZbBU3l00-?IxvSRD~`4I4r0*3d(>fFPg5CKp9|I=Z8bbac>P_MVl}drMciqno4z z^_d$_x=WVYA7WWIH7xh}HcpS2B0c4Vo2QqBX=qzF4-6((ZMR6kwD$4OojT#W1MKp= z8mdvHCz0_a(4#vj3-Nw)fdAf=%dh5@4wI&wN7b1{$bLlMES79!A}J?JT!b5dRWI)^ z9|&Yf4mngeI4uWEG@Y~%D>}YL06U>ye$i!4m+9?1(r|;w?D5B+3A}i*?KW?Wl|WiV zZd8nF4a-E{mt;0aOMse5Lp7eRYOY|@)5TFxrXQj`T?0pOM@0WA-pklD`rJ&W+(fD% zeHx|NACm=OQQ+FjvH(pN3J&-(P|BH4cfH}Dd|`{Sfx4oc-6XA?ovEON zM3eSWK&iSAw8PWbGy#?zx5T zR=5TI5I^U^EmkpjY&C3{6iRx)SD0?ic-`~@KJOj-=PQc!r&O&Hd2<8#_#?d_qQ_GD z$Rrr>3L6Ks3;#CzrHkN`v0%pcSZ-n6V2zQ;RnuDc)nhIy)e&s!%F{W*KKVTqxSIDcI7q`<-okA+`sN27o~^y93|ZlR<3Yc19w+@q@5eJ zjhAuCRAA681o?x|#Bc#sf<1eXWCt+V-HD;~>XZYdhg17C~Hf%A6Pnaxh&3jO5@1}^4>SMM;tJa$i#~a-vSz!Vp;XU`DO_T(H^~K z;^p@NSp>)D$GUgTxP)l?ZQoIE_Td0x;QDRHPx+w{K_3fBYA_$bWABgf z^kd`4Ghkv$DemYunZdJse3=#TewXGf&AVo2CL;gXEF33Z{*>`pr6PW9IPK+GH;?wi zZalY3-$|Y`uDc}Qlp=2vt| z5YsLk2mNq=@{ye{qW(dhE4(?)c>4$c@i-9%Rw*!7XZjt~*?;223+3uyjY2t4Q63fD zsza9I2wqUH#1?zq4HaS3OScdw49juN!|b|^S9QldU;=_-h5^TOdJ)yB5AS@LcvuRx z=EsKI%~pa+y(t`dHe$20w#bmS_C2rcox4KqJrZsLBxldR+$1^}mcm~Imu@B@nf$3mLBgPd1>AjMWzLVks`~Fr+D<^P^X!fFEzqSPLdXeJ^*gSiZ5L5K=18f%Sy5RNO zs+ZNSp3ekW4DnYKm105wig7)Zoy+`IGI@6) z3R$IJ8;!;JFG zHu%IhR3cC#8rN^AaezN>CSbOA+`4Q(X@ciC(~bHFn2uRD=99$x(uPg#I${nmj2O&Z zLt*w#HM7$7fTh#<2Zx-5F&5b5YCD)zk%4KBXuNyUVlKc$RUK?Suz&)cOBylJKXu@w zoHP*L3xe(Lgn^`w&9thENoeEs(orQA68p+?YN) z9emHR!WU{7)ibS7tO-T(3qI0*DMi;-R2i|LbJ#cs)59*)_(>qQ+W4$5pTzSK;Ds%A zQSRjPA2U=_b5FE+wlEpI_yYYLUlVis)C=h-Y3HEmlR06vbF1IiCYB~wznUBlSNdve z%PigY!(A3w5Ia+V{uc=oz@^c3n8FN2I#&f5yLfa;Vln z7oas#R4cg~7|LJL7|Xqhw1$Q1vvvbdsdKOE+M7)))l^fn8} dataVS = dataV.listDataVDesc(new LineCountEvaluateParam()); + + + + String filePath = "C:\\Users\\web2023\\Desktop\\sj.xlsx"; + // 使用 EasyExcel 写入数据到 Excel 文件 + ExcelWriter excelWriter = EasyExcel.write(filePath).build();; + //模板1 + WriteSheet writeSheet = EasyExcel.writerSheet(0, "line" ) + .head(DataV.class) + .registerWriteHandler(new LongestMatchColumnWidthStyleStrategy()) + .build(); + excelWriter.write(dataVS, writeSheet); + excelWriter.finish(); + + } + + public static void main(String[] args) { + String filePath = "C:\\Users\\web2023\\Desktop\\sj.xlsx"; + // 使用 EasyExcel 写入数据到 Excel 文件 + ExcelWriter excelWriter = EasyExcel.write(filePath).build();; + //模板1 + WriteSheet writeSheet = EasyExcel.writerSheet(0, "line" ).head(DataV.class) + .includeColumnFiledNames(Arrays.asList("lineId","timeId")) + .build(); + excelWriter.write(new ArrayList<>(), writeSheet); + excelWriter.finish(); + } }