From 8d6ba4afe3793ed6e9d5265bdd9a085b80a4111b Mon Sep 17 00:00:00 2001
From: hongawen <83944980@qq.com>
Date: Thu, 27 Jun 2024 13:27:02 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B0=86pqs-influx=E6=A8=A1=E5=9D=97=E7=8B=AC?=
=?UTF-8?q?=E7=AB=8B=E5=87=BA=E5=8E=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pom.xml | 4 +-
pqs-influx/pom.xml | 27 -
.../deprecated/InfluxDBPublicParam.java | 279 ---------
.../deprecated/InfluxDBSqlConstant.java | 111 ----
.../imapper/CldStatisticsFlowMapper.java | 19 -
.../com/njcn/influx/imapper/CommonMapper.java | 41 --
.../influx/imapper/DataFlickerMapper.java | 20 -
.../njcn/influx/imapper/DataFlucMapper.java | 17 -
.../influx/imapper/DataHarmPhasicIMapper.java | 17 -
.../influx/imapper/DataHarmPhasicVMapper.java | 17 -
.../influx/imapper/DataHarmPowerPMapper.java | 23 -
.../influx/imapper/DataHarmPowerQMapper.java | 22 -
.../influx/imapper/DataHarmPowerSMapper.java | 18 -
.../influx/imapper/DataHarmRateIMapper.java | 18 -
.../influx/imapper/DataHarmRateVMapper.java | 23 -
.../influx/imapper/DataInHarmIMapper.java | 18 -
.../influx/imapper/DataInHarmRateIMapper.java | 18 -
.../influx/imapper/DataInHarmRateVMapper.java | 18 -
.../influx/imapper/DataInHarmVMapper.java | 18 -
.../njcn/influx/imapper/DataPltMapper.java | 17 -
.../com/njcn/influx/imapper/DataVMapper.java | 27 -
.../njcn/influx/imapper/EvtDataMapper.java | 26 -
.../influx/imapper/HaronicRatioMapper.java | 23 -
.../com/njcn/influx/imapper/IDataIMapper.java | 30 -
.../influx/imapper/PowerQualityMapper.java | 22 -
.../influx/imapper/PqsCommunicateMapper.java | 13 -
.../influx/imapper/day/DayFlickerMapper.java | 18 -
.../influx/imapper/day/DayFlucMapper.java | 13 -
.../imapper/day/DayHarmPhasicIMapper.java | 13 -
.../imapper/day/DayHarmPhasicVMapper.java | 13 -
.../imapper/day/DayHarmPowerPMapper.java | 17 -
.../imapper/day/DayHarmPowerQMapper.java | 14 -
.../imapper/day/DayHarmPowerSMapper.java | 14 -
.../imapper/day/DayHarmRateIMapper.java | 14 -
.../imapper/day/DayHarmRateVMapper.java | 18 -
.../njcn/influx/imapper/day/DayIMapper.java | 19 -
.../influx/imapper/day/DayInHarmIMapper.java | 13 -
.../imapper/day/DayInHarmIRateMapper.java | 14 -
.../influx/imapper/day/DayInHarmVMapper.java | 13 -
.../imapper/day/DayInHarmVRateMapper.java | 14 -
.../njcn/influx/imapper/day/DayPltMapper.java | 13 -
.../njcn/influx/imapper/day/DayVMapper.java | 21 -
.../njcn/influx/pojo/bo/CarryCapcityData.java | 38 --
.../njcn/influx/pojo/bo/CommonQueryParam.java | 24 -
.../influx/pojo/bo/HarmonicHistoryData.java | 43 --
.../njcn/influx/pojo/bo/MeasurementCount.java | 33 --
.../njcn/influx/pojo/bo/StatisticsResult.java | 28 -
.../pojo/constant/InfluxDBTableConstant.java | 200 -------
.../njcn/influx/pojo/dto/DataFlickerDTO.java | 22 -
.../influx/pojo/dto/DeviceDayFlowDTO.java | 19 -
.../njcn/influx/pojo/dto/EventDataSetDTO.java | 23 -
.../njcn/influx/pojo/dto/EventQueryDTO.java | 20 -
.../com/njcn/influx/pojo/dto/HarmData.java | 33 --
.../influx/pojo/dto/HarmHistoryDataDTO.java | 24 -
.../influx/pojo/dto/StatisticalDataDTO.java | 70 ---
.../njcn/influx/pojo/po/CldStatisFlow.java | 29 -
.../com/njcn/influx/pojo/po/DataFlicker.java | 59 --
.../com/njcn/influx/pojo/po/DataFluc.java | 43 --
.../njcn/influx/pojo/po/DataHarmPhasicI.java | 187 -------
.../njcn/influx/pojo/po/DataHarmPhasicV.java | 190 -------
.../njcn/influx/pojo/po/DataHarmPowerP.java | 196 -------
.../njcn/influx/pojo/po/DataHarmPowerQ.java | 192 -------
.../njcn/influx/pojo/po/DataHarmPowerS.java | 191 -------
.../njcn/influx/pojo/po/DataHarmRateI.java | 18 -
.../njcn/influx/pojo/po/DataHarmRateV.java | 18 -
.../java/com/njcn/influx/pojo/po/DataI.java | 208 -------
.../com/njcn/influx/pojo/po/DataInHarmI.java | 20 -
.../njcn/influx/pojo/po/DataInHarmRateI.java | 185 ------
.../njcn/influx/pojo/po/DataInHarmRateV.java | 190 -------
.../com/njcn/influx/pojo/po/DataInHarmV.java | 190 -------
.../java/com/njcn/influx/pojo/po/DataPlt.java | 51 --
.../java/com/njcn/influx/pojo/po/DataV.java | 235 --------
.../influx/pojo/po/HarmonicRatioData.java | 529 ------------------
.../njcn/influx/pojo/po/PowerQualityData.java | 347 ------------
.../njcn/influx/pojo/po/PqsCommunicate.java | 40 --
.../influx/pojo/po/cs/CsDataHarmPowerP.java | 38 --
.../com/njcn/influx/pojo/po/cs/EntData.java | 48 --
.../njcn/influx/pojo/po/day/DayFlicker.java | 59 --
.../com/njcn/influx/pojo/po/day/DayFluc.java | 45 --
.../influx/pojo/po/day/DayHarmPhasicI.java | 189 -------
.../influx/pojo/po/day/DayHarmPhasicV.java | 190 -------
.../influx/pojo/po/day/DayHarmPowerP.java | 198 -------
.../influx/pojo/po/day/DayHarmPowerQ.java | 193 -------
.../influx/pojo/po/day/DayHarmPowerS.java | 193 -------
.../njcn/influx/pojo/po/day/DayHarmRateI.java | 18 -
.../njcn/influx/pojo/po/day/DayHarmRateV.java | 18 -
.../com/njcn/influx/pojo/po/day/DayI.java | 208 -------
.../njcn/influx/pojo/po/day/DayInHarmI.java | 20 -
.../influx/pojo/po/day/DayInHarmRateI.java | 187 -------
.../influx/pojo/po/day/DayInHarmRateV.java | 185 ------
.../njcn/influx/pojo/po/day/DayInHarmV.java | 187 -------
.../com/njcn/influx/pojo/po/day/DayPlt.java | 43 --
.../com/njcn/influx/pojo/po/day/DayV.java | 235 --------
.../service/CldStatisticsFlowService.java | 9 -
.../njcn/influx/service/CommonService.java | 71 ---
.../influx/service/DataFlickerService.java | 15 -
.../njcn/influx/service/DataFlucService.java | 9 -
.../service/DataHarmPhasicIService.java | 9 -
.../service/DataHarmPhasicVService.java | 9 -
.../influx/service/DataHarmPowerPService.java | 15 -
.../influx/service/DataHarmPowerQService.java | 15 -
.../influx/service/DataHarmRateVService.java | 13 -
.../njcn/influx/service/EvtDataService.java | 32 --
.../influx/service/HaronicRatioService.java | 25 -
.../njcn/influx/service/IDataIService.java | 24 -
.../njcn/influx/service/IDataVService.java | 12 -
.../influx/service/PowerQualityService.java | 25 -
.../influx/service/PqsCommunicateService.java | 9 -
.../impl/CldStatisticsFlowServiceImpl.java | 14 -
.../service/impl/CommonServiceImpl.java | 114 ----
.../service/impl/DataFlickerServiceImpl.java | 95 ----
.../service/impl/DataFlucServiceImpl.java | 12 -
.../impl/DataHarmPhasicIServiceImpl.java | 13 -
.../impl/DataHarmPhasicVServiceImpl.java | 13 -
.../impl/DataHarmPowerPServiceImpl.java | 32 --
.../impl/DataHarmPowerQServiceImpl.java | 35 --
.../impl/DataHarmRateVServiceImpl.java | 26 -
.../influx/service/impl/DataVServiceImpl.java | 80 ---
.../service/impl/EvtDataServiceImpl.java | 53 --
.../service/impl/HaronicRatioServiceImpl.java | 48 --
.../service/impl/IDataIServiceImpl.java | 40 --
.../service/impl/PowerQualityServiceImpl.java | 49 --
.../impl/PqsCommunicateServiceImpl.java | 13 -
.../com/njcn/influx/utils/ReflectUitl.java | 82 ---
.../njcn/user/controller/UserController.java | 2 +-
125 files changed, 3 insertions(+), 8086 deletions(-)
delete mode 100644 pqs-influx/pom.xml
delete mode 100644 pqs-influx/src/main/java/com/njcn/influx/deprecated/InfluxDBPublicParam.java
delete mode 100644 pqs-influx/src/main/java/com/njcn/influx/deprecated/InfluxDBSqlConstant.java
delete mode 100644 pqs-influx/src/main/java/com/njcn/influx/imapper/CldStatisticsFlowMapper.java
delete mode 100644 pqs-influx/src/main/java/com/njcn/influx/imapper/CommonMapper.java
delete mode 100644 pqs-influx/src/main/java/com/njcn/influx/imapper/DataFlickerMapper.java
delete mode 100644 pqs-influx/src/main/java/com/njcn/influx/imapper/DataFlucMapper.java
delete mode 100644 pqs-influx/src/main/java/com/njcn/influx/imapper/DataHarmPhasicIMapper.java
delete mode 100644 pqs-influx/src/main/java/com/njcn/influx/imapper/DataHarmPhasicVMapper.java
delete mode 100644 pqs-influx/src/main/java/com/njcn/influx/imapper/DataHarmPowerPMapper.java
delete mode 100644 pqs-influx/src/main/java/com/njcn/influx/imapper/DataHarmPowerQMapper.java
delete mode 100644 pqs-influx/src/main/java/com/njcn/influx/imapper/DataHarmPowerSMapper.java
delete mode 100644 pqs-influx/src/main/java/com/njcn/influx/imapper/DataHarmRateIMapper.java
delete mode 100644 pqs-influx/src/main/java/com/njcn/influx/imapper/DataHarmRateVMapper.java
delete mode 100644 pqs-influx/src/main/java/com/njcn/influx/imapper/DataInHarmIMapper.java
delete mode 100644 pqs-influx/src/main/java/com/njcn/influx/imapper/DataInHarmRateIMapper.java
delete mode 100644 pqs-influx/src/main/java/com/njcn/influx/imapper/DataInHarmRateVMapper.java
delete mode 100644 pqs-influx/src/main/java/com/njcn/influx/imapper/DataInHarmVMapper.java
delete mode 100644 pqs-influx/src/main/java/com/njcn/influx/imapper/DataPltMapper.java
delete mode 100644 pqs-influx/src/main/java/com/njcn/influx/imapper/DataVMapper.java
delete mode 100644 pqs-influx/src/main/java/com/njcn/influx/imapper/EvtDataMapper.java
delete mode 100644 pqs-influx/src/main/java/com/njcn/influx/imapper/HaronicRatioMapper.java
delete mode 100644 pqs-influx/src/main/java/com/njcn/influx/imapper/IDataIMapper.java
delete mode 100644 pqs-influx/src/main/java/com/njcn/influx/imapper/PowerQualityMapper.java
delete mode 100644 pqs-influx/src/main/java/com/njcn/influx/imapper/PqsCommunicateMapper.java
delete mode 100644 pqs-influx/src/main/java/com/njcn/influx/imapper/day/DayFlickerMapper.java
delete mode 100644 pqs-influx/src/main/java/com/njcn/influx/imapper/day/DayFlucMapper.java
delete mode 100644 pqs-influx/src/main/java/com/njcn/influx/imapper/day/DayHarmPhasicIMapper.java
delete mode 100644 pqs-influx/src/main/java/com/njcn/influx/imapper/day/DayHarmPhasicVMapper.java
delete mode 100644 pqs-influx/src/main/java/com/njcn/influx/imapper/day/DayHarmPowerPMapper.java
delete mode 100644 pqs-influx/src/main/java/com/njcn/influx/imapper/day/DayHarmPowerQMapper.java
delete mode 100644 pqs-influx/src/main/java/com/njcn/influx/imapper/day/DayHarmPowerSMapper.java
delete mode 100644 pqs-influx/src/main/java/com/njcn/influx/imapper/day/DayHarmRateIMapper.java
delete mode 100644 pqs-influx/src/main/java/com/njcn/influx/imapper/day/DayHarmRateVMapper.java
delete mode 100644 pqs-influx/src/main/java/com/njcn/influx/imapper/day/DayIMapper.java
delete mode 100644 pqs-influx/src/main/java/com/njcn/influx/imapper/day/DayInHarmIMapper.java
delete mode 100644 pqs-influx/src/main/java/com/njcn/influx/imapper/day/DayInHarmIRateMapper.java
delete mode 100644 pqs-influx/src/main/java/com/njcn/influx/imapper/day/DayInHarmVMapper.java
delete mode 100644 pqs-influx/src/main/java/com/njcn/influx/imapper/day/DayInHarmVRateMapper.java
delete mode 100644 pqs-influx/src/main/java/com/njcn/influx/imapper/day/DayPltMapper.java
delete mode 100644 pqs-influx/src/main/java/com/njcn/influx/imapper/day/DayVMapper.java
delete mode 100644 pqs-influx/src/main/java/com/njcn/influx/pojo/bo/CarryCapcityData.java
delete mode 100644 pqs-influx/src/main/java/com/njcn/influx/pojo/bo/CommonQueryParam.java
delete mode 100644 pqs-influx/src/main/java/com/njcn/influx/pojo/bo/HarmonicHistoryData.java
delete mode 100644 pqs-influx/src/main/java/com/njcn/influx/pojo/bo/MeasurementCount.java
delete mode 100644 pqs-influx/src/main/java/com/njcn/influx/pojo/bo/StatisticsResult.java
delete mode 100644 pqs-influx/src/main/java/com/njcn/influx/pojo/constant/InfluxDBTableConstant.java
delete mode 100644 pqs-influx/src/main/java/com/njcn/influx/pojo/dto/DataFlickerDTO.java
delete mode 100644 pqs-influx/src/main/java/com/njcn/influx/pojo/dto/DeviceDayFlowDTO.java
delete mode 100644 pqs-influx/src/main/java/com/njcn/influx/pojo/dto/EventDataSetDTO.java
delete mode 100644 pqs-influx/src/main/java/com/njcn/influx/pojo/dto/EventQueryDTO.java
delete mode 100644 pqs-influx/src/main/java/com/njcn/influx/pojo/dto/HarmData.java
delete mode 100644 pqs-influx/src/main/java/com/njcn/influx/pojo/dto/HarmHistoryDataDTO.java
delete mode 100644 pqs-influx/src/main/java/com/njcn/influx/pojo/dto/StatisticalDataDTO.java
delete mode 100644 pqs-influx/src/main/java/com/njcn/influx/pojo/po/CldStatisFlow.java
delete mode 100644 pqs-influx/src/main/java/com/njcn/influx/pojo/po/DataFlicker.java
delete mode 100644 pqs-influx/src/main/java/com/njcn/influx/pojo/po/DataFluc.java
delete mode 100644 pqs-influx/src/main/java/com/njcn/influx/pojo/po/DataHarmPhasicI.java
delete mode 100644 pqs-influx/src/main/java/com/njcn/influx/pojo/po/DataHarmPhasicV.java
delete mode 100644 pqs-influx/src/main/java/com/njcn/influx/pojo/po/DataHarmPowerP.java
delete mode 100644 pqs-influx/src/main/java/com/njcn/influx/pojo/po/DataHarmPowerQ.java
delete mode 100644 pqs-influx/src/main/java/com/njcn/influx/pojo/po/DataHarmPowerS.java
delete mode 100644 pqs-influx/src/main/java/com/njcn/influx/pojo/po/DataHarmRateI.java
delete mode 100644 pqs-influx/src/main/java/com/njcn/influx/pojo/po/DataHarmRateV.java
delete mode 100644 pqs-influx/src/main/java/com/njcn/influx/pojo/po/DataI.java
delete mode 100644 pqs-influx/src/main/java/com/njcn/influx/pojo/po/DataInHarmI.java
delete mode 100644 pqs-influx/src/main/java/com/njcn/influx/pojo/po/DataInHarmRateI.java
delete mode 100644 pqs-influx/src/main/java/com/njcn/influx/pojo/po/DataInHarmRateV.java
delete mode 100644 pqs-influx/src/main/java/com/njcn/influx/pojo/po/DataInHarmV.java
delete mode 100644 pqs-influx/src/main/java/com/njcn/influx/pojo/po/DataPlt.java
delete mode 100644 pqs-influx/src/main/java/com/njcn/influx/pojo/po/DataV.java
delete mode 100644 pqs-influx/src/main/java/com/njcn/influx/pojo/po/HarmonicRatioData.java
delete mode 100644 pqs-influx/src/main/java/com/njcn/influx/pojo/po/PowerQualityData.java
delete mode 100644 pqs-influx/src/main/java/com/njcn/influx/pojo/po/PqsCommunicate.java
delete mode 100644 pqs-influx/src/main/java/com/njcn/influx/pojo/po/cs/CsDataHarmPowerP.java
delete mode 100644 pqs-influx/src/main/java/com/njcn/influx/pojo/po/cs/EntData.java
delete mode 100644 pqs-influx/src/main/java/com/njcn/influx/pojo/po/day/DayFlicker.java
delete mode 100644 pqs-influx/src/main/java/com/njcn/influx/pojo/po/day/DayFluc.java
delete mode 100644 pqs-influx/src/main/java/com/njcn/influx/pojo/po/day/DayHarmPhasicI.java
delete mode 100644 pqs-influx/src/main/java/com/njcn/influx/pojo/po/day/DayHarmPhasicV.java
delete mode 100644 pqs-influx/src/main/java/com/njcn/influx/pojo/po/day/DayHarmPowerP.java
delete mode 100644 pqs-influx/src/main/java/com/njcn/influx/pojo/po/day/DayHarmPowerQ.java
delete mode 100644 pqs-influx/src/main/java/com/njcn/influx/pojo/po/day/DayHarmPowerS.java
delete mode 100644 pqs-influx/src/main/java/com/njcn/influx/pojo/po/day/DayHarmRateI.java
delete mode 100644 pqs-influx/src/main/java/com/njcn/influx/pojo/po/day/DayHarmRateV.java
delete mode 100644 pqs-influx/src/main/java/com/njcn/influx/pojo/po/day/DayI.java
delete mode 100644 pqs-influx/src/main/java/com/njcn/influx/pojo/po/day/DayInHarmI.java
delete mode 100644 pqs-influx/src/main/java/com/njcn/influx/pojo/po/day/DayInHarmRateI.java
delete mode 100644 pqs-influx/src/main/java/com/njcn/influx/pojo/po/day/DayInHarmRateV.java
delete mode 100644 pqs-influx/src/main/java/com/njcn/influx/pojo/po/day/DayInHarmV.java
delete mode 100644 pqs-influx/src/main/java/com/njcn/influx/pojo/po/day/DayPlt.java
delete mode 100644 pqs-influx/src/main/java/com/njcn/influx/pojo/po/day/DayV.java
delete mode 100644 pqs-influx/src/main/java/com/njcn/influx/service/CldStatisticsFlowService.java
delete mode 100644 pqs-influx/src/main/java/com/njcn/influx/service/CommonService.java
delete mode 100644 pqs-influx/src/main/java/com/njcn/influx/service/DataFlickerService.java
delete mode 100644 pqs-influx/src/main/java/com/njcn/influx/service/DataFlucService.java
delete mode 100644 pqs-influx/src/main/java/com/njcn/influx/service/DataHarmPhasicIService.java
delete mode 100644 pqs-influx/src/main/java/com/njcn/influx/service/DataHarmPhasicVService.java
delete mode 100644 pqs-influx/src/main/java/com/njcn/influx/service/DataHarmPowerPService.java
delete mode 100644 pqs-influx/src/main/java/com/njcn/influx/service/DataHarmPowerQService.java
delete mode 100644 pqs-influx/src/main/java/com/njcn/influx/service/DataHarmRateVService.java
delete mode 100644 pqs-influx/src/main/java/com/njcn/influx/service/EvtDataService.java
delete mode 100644 pqs-influx/src/main/java/com/njcn/influx/service/HaronicRatioService.java
delete mode 100644 pqs-influx/src/main/java/com/njcn/influx/service/IDataIService.java
delete mode 100644 pqs-influx/src/main/java/com/njcn/influx/service/IDataVService.java
delete mode 100644 pqs-influx/src/main/java/com/njcn/influx/service/PowerQualityService.java
delete mode 100644 pqs-influx/src/main/java/com/njcn/influx/service/PqsCommunicateService.java
delete mode 100644 pqs-influx/src/main/java/com/njcn/influx/service/impl/CldStatisticsFlowServiceImpl.java
delete mode 100644 pqs-influx/src/main/java/com/njcn/influx/service/impl/CommonServiceImpl.java
delete mode 100644 pqs-influx/src/main/java/com/njcn/influx/service/impl/DataFlickerServiceImpl.java
delete mode 100644 pqs-influx/src/main/java/com/njcn/influx/service/impl/DataFlucServiceImpl.java
delete mode 100644 pqs-influx/src/main/java/com/njcn/influx/service/impl/DataHarmPhasicIServiceImpl.java
delete mode 100644 pqs-influx/src/main/java/com/njcn/influx/service/impl/DataHarmPhasicVServiceImpl.java
delete mode 100644 pqs-influx/src/main/java/com/njcn/influx/service/impl/DataHarmPowerPServiceImpl.java
delete mode 100644 pqs-influx/src/main/java/com/njcn/influx/service/impl/DataHarmPowerQServiceImpl.java
delete mode 100644 pqs-influx/src/main/java/com/njcn/influx/service/impl/DataHarmRateVServiceImpl.java
delete mode 100644 pqs-influx/src/main/java/com/njcn/influx/service/impl/DataVServiceImpl.java
delete mode 100644 pqs-influx/src/main/java/com/njcn/influx/service/impl/EvtDataServiceImpl.java
delete mode 100644 pqs-influx/src/main/java/com/njcn/influx/service/impl/HaronicRatioServiceImpl.java
delete mode 100644 pqs-influx/src/main/java/com/njcn/influx/service/impl/IDataIServiceImpl.java
delete mode 100644 pqs-influx/src/main/java/com/njcn/influx/service/impl/PowerQualityServiceImpl.java
delete mode 100644 pqs-influx/src/main/java/com/njcn/influx/service/impl/PqsCommunicateServiceImpl.java
delete mode 100644 pqs-influx/src/main/java/com/njcn/influx/utils/ReflectUitl.java
diff --git a/pom.xml b/pom.xml
index acb276043..75b3bbe5d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,7 +20,6 @@
pqs-advance
pqs-prepare
pqs-process
- pqs-influx
pqs-bpm
pqs-supervision
@@ -52,7 +51,8 @@
- 6d75b5c3-cff9-4c4a-8e8b-ca2363753ecb
+
+ 910d0d69-2254-481b-b9f7-7ecf9cb881b0
${middle.server.url}:8080
diff --git a/pqs-influx/pom.xml b/pqs-influx/pom.xml
deleted file mode 100644
index d8ca3299a..000000000
--- a/pqs-influx/pom.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-
-
- 4.0.0
-
- pqs
- com.njcn
- 1.0.0
-
- pqs-influx
- influx公共模块
- pqs-influx
-
-
- 8
- 8
-
-
-
-
- com.njcn
- influxdb-springboot-starter
- 1.0.0
-
-
-
-
diff --git a/pqs-influx/src/main/java/com/njcn/influx/deprecated/InfluxDBPublicParam.java b/pqs-influx/src/main/java/com/njcn/influx/deprecated/InfluxDBPublicParam.java
deleted file mode 100644
index c9e1619ee..000000000
--- a/pqs-influx/src/main/java/com/njcn/influx/deprecated/InfluxDBPublicParam.java
+++ /dev/null
@@ -1,279 +0,0 @@
-package com.njcn.influx.deprecated;
-
-/**
- * 类的介绍:使用influxDB查询时的公共参数
- *
- * @author xuyang
- * @version 1.0.0
- * @createTime 2022/6/24 15:02
- */
-@Deprecated
-public interface InfluxDBPublicParam {
-
- /**
- * 暂态事件汇总表
- */
- String PQS_EVENT_DETAIL = " pqs_eventdetail";
-
- /**
- * 电压波动闪变表
- */
- String DATA_FLICKER = "data_flicker";
-
- /**
- * 电压波动表
- */
- String DATA_FLUC = "data_fluc";
-
- /**
- * 谐波电流角度表
- */
- String DATA_HARM_PHASIC_I = "data_harmphasic_i";
-
- /**
- * 谐波电压角度表
- */
- String DATA_HARM_PHASIC_V = "data_harmphasic_v";
-
- /**
- * 有功功率表
- */
- String DATA_HARM_POWER_P = "data_harmpower_p";
-
- /**
- * 无功功率表
- */
- String DATA_HARM_POWER_Q = "data_harmpower_q";
-
- /**
- * 视在功率表
- */
- String DATA_HARM_POWER_S = "data_harmpower_s";
-
- /**
- * 谐波电流含有率表
- */
- String DATA_HARM_RATE_I = "data_harmrate_i";
-
- /**
- * 谐波电压含有率表
- */
- String DATA_HARM_RATE_V = "data_harmrate_v";
-
- /**
- * 电流表
- */
- String DATA_I = "data_i";
-
- /**
- * 电流间谐波幅值表
- */
- String DATA_IN_HARM_I = "data_inharm_i";
-
- /**
- * 电压间谐波幅值表
- */
- String DATA_IN_HARM_V = "data_inharm_v";
-
- /**
- * 长时闪变表
- */
- String DATA_PLT = "data_plt";
-
- /**
- * 电压表
- */
- String DATA_V = "data_v";
-
- /**
- * 日统计-电压波动闪变表
- */
- String DAY_FLICKER = "day_flicker";
-
- /**
- * 日统计-电压波动表
- */
- String DAY_FLUC = "day_fluc";
-
- /**
- * 日统计-谐波电流角度表
- */
- String DAY_HARM_PHASIC_I = "day_harmphasic_i";
-
- /**
- * 日统计-谐波电压角度表
- */
- String DAY_HARM_PHASIC_V = "day_harmphasic_v";
-
- /**
- * 日统计-有功功率表
- */
- String DAY_HARM_POWER_P = "day_harmpower_p";
-
- /**
- * 日统计-无功功率表
- */
- String DAY_HARM_POWER_Q = "day_harmpower_q";
-
- /**
- * 日统计-视在功率表
- */
- String DAY_HARM_POWER_S = "day_harmpower_s";
-
- /**
- * 日统计-谐波电流含有率表
- */
- String DAY_HARM_RATE_I = "day_harmrate_i";
-
- /**
- * 日统计-谐波电压含有率表
- */
- String DAY_HARM_RATE_V = "day_harmrate_v";
-
- /**
- * 日统计-电流表
- */
- String DAY_I = "day_i";
-
- /**
- * 日统计-电流间谐波幅值表
- */
- String DAY_IN_HARM_I = "day_inharm_i";
-
- /**
- * 日统计-电压间谐波幅值表
- */
- String DAY_IN_HARM_V = "day_inharm_v";
-
- /**
- * 日统计-长时闪变表
- */
- String DAY_PLT = "day_plt";
-
- /**
- * 日统计-电压表
- */
- String DAY_V = "day_v";
-
- /**
- * 时区
- */
- String TIME_ZONE = " tz('Asia/Shanghai')";
-
- String TZ = "Asia/Shanghai";
-
-
- /**
- * 日起始时间
- */
- String START_TIME = " 00:00:00";
-
- /**
- * 日结束时间
- */
- String END_TIME = " 23:59:59";
-
- /**
- * 时间
- */
- String TIME = "time";
-
- /**
- * 数据线路号
- */
- String LINE_ID = "line_id";
-
- /**
- * 装置ID
- */
- String DEV_ID = "dev_id";
-
- /**
- * 数据类型
- */
- String PHASIC_TYPE = "phasic_type";
-
- /**
- * 指标类型
- */
- String VALUE_TYPE = "value_type";
-
- /**
- * 数据质量标志
- */
- String QUALITY_FLAG = "quality_flag";
-
- /**
- * limit_rate
- */
- String LIMIT_RATE = "limit_rate";
-
- /**
- * limit_target
- */
- String LIMIT_TARGET = "limit_target";
-
- /**
- * pqs_comasses
- */
- String PQS_COMASSES = "pqs_comasses";
-
- /**
- * 终端运维日志表
- */
- String PQS_TERMINAL_LOGS = "pqs_terminal_logs";
-
- /**
- * 监测点状态信息表
- */
- String PQS_COMMUNICATE = "pqs_communicate";
-
- String PQS_ACTUAL_FLOW = "pqs_actual_flow";
-
- String CLD_STATIS_FLOW = "cld_statis_flow";
-
- /**
- * 终端在线率表
- */
- String PQS_ONLINERATE = "pqs_onlinerate";
-
- /**
- * 数据完整性表
- */
- String PQS_INTEGRITY = "pqs_integrity";
-
- /**
- * 终端在线率表公共字段
- */
- String ONLINE_MIN = "online_min";
-
- String OFFLINE_MIN = "offline_min";
-
- String ONLINE_RATE = "online_rate";
-
- /**
- * data表中InfluxDBPublicParam
- */
- String VALUETYPE = "value_type";
-
-
- /**
- * 数据完整性表公共字段
- */
- String DUE = "due";
-
- String REAL = "real";
-
- String DEV_INDEX = "dev_id";
-
- /**
- * 稳态数据分析字段
- */
- String PHASIC_TYPET = "T";
-
- /**
- * 每天固定时间分钟
- */
- Integer DAY_MINUTE = 1440;
-
-}
diff --git a/pqs-influx/src/main/java/com/njcn/influx/deprecated/InfluxDBSqlConstant.java b/pqs-influx/src/main/java/com/njcn/influx/deprecated/InfluxDBSqlConstant.java
deleted file mode 100644
index 19f23de24..000000000
--- a/pqs-influx/src/main/java/com/njcn/influx/deprecated/InfluxDBSqlConstant.java
+++ /dev/null
@@ -1,111 +0,0 @@
-package com.njcn.influx.deprecated;
-
-import cn.hutool.core.text.StrPool;
-
-/**
- * 拼接influx查询语句相关常量
- *
- * @author hongawen
- * @version 1.0.0
- * @date 2022年10月14日 14:02
- */
-@Deprecated
-public interface InfluxDBSqlConstant {
-
- /**
- * "SELECT "
- */
- String SELECT = "SELECT" + StrPool.C_SPACE;
-
- /**
- * "* "
- */
- String ALL = "*" + StrPool.C_SPACE;
-
- /**
- * "FROM "
- */
- String FROM = "FROM" + StrPool.C_SPACE;
-
- /**
- * " WHERE "
- */
- String WHERE = StrPool.C_SPACE + "WHERE" + StrPool.C_SPACE;
-
- /**
- * " AND "
- */
- String AND = StrPool.C_SPACE + "AND" + StrPool.C_SPACE;
-
- /**
- * " OR "
- */
- String OR = StrPool.C_SPACE + "OR" + StrPool.C_SPACE;
-
- /**
- * " GROUP BY "
- */
- String GB = StrPool.C_SPACE + "GROUP BY" + StrPool.C_SPACE;
-
- /**
- * " ORDER BY "
- */
- String OB = StrPool.C_SPACE + "ORDER BY" + StrPool.C_SPACE;
-
- /**
- * “DESC ”
- */
- String DESC = "DESC" + StrPool.C_SPACE;
-
- /**
- * " as value "
- */
- String AS_VALUE = StrPool.C_SPACE + "as value" + StrPool.C_SPACE;
-
- String EQ = "=";
- String QM = "'";
- String LBK = "(";
- String RBK = ")";
- String GT = ">";
- String GE = ">=";
- String LT = "<";
- String LE = "<=";
-
- /**
- * influxDB函数拼接
- */
- String MAX = "MAX";
- String MIN = "MIN";
- String AVG = "MEAN";
- String NUM_95 = ",95";
- String CP95 = "PERCENTILE";
-
- /**
- * “ tz('Asia/Shanghai')”
- */
- String TZ = StrPool.C_SPACE + "tz('Asia/Shanghai')";
- String TIME_AREA = "Asia/Shanghai";
-
-
- /**
- * 日起始时间
- */
- String START_TIME = " 00:00:00";
-
- /**
- * 日结束时间
- */
- String END_TIME = " 23:59:59";
-
- /**
- * 时间
- */
- String TIME = "time" + StrPool.C_SPACE;
-
- /**
- * 每天固定时间分钟
- */
- Integer DAY_MINUTE = 1440;
-
-
-}
diff --git a/pqs-influx/src/main/java/com/njcn/influx/imapper/CldStatisticsFlowMapper.java b/pqs-influx/src/main/java/com/njcn/influx/imapper/CldStatisticsFlowMapper.java
deleted file mode 100644
index 0ac48c83a..000000000
--- a/pqs-influx/src/main/java/com/njcn/influx/imapper/CldStatisticsFlowMapper.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package com.njcn.influx.imapper;
-
-import com.njcn.influx.base.InfluxDbBaseMapper;
-import com.njcn.influx.pojo.dto.DeviceDayFlowDTO;
-import com.njcn.influx.pojo.po.CldStatisFlow;
-import com.njcn.influx.query.InfluxQueryWrapper;
-
-import java.util.List;
-
-/**
- * @author hongawen
- * @version 1.0.0
- * @date 2023年05月04日 20:50
- */
-public interface CldStatisticsFlowMapper extends InfluxDbBaseMapper{
-
-
- List selectDeviceDayFlowByQueryWrapper(InfluxQueryWrapper influxQueryWrapper);
-}
diff --git a/pqs-influx/src/main/java/com/njcn/influx/imapper/CommonMapper.java b/pqs-influx/src/main/java/com/njcn/influx/imapper/CommonMapper.java
deleted file mode 100644
index 696598b10..000000000
--- a/pqs-influx/src/main/java/com/njcn/influx/imapper/CommonMapper.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package com.njcn.influx.imapper;
-
-import com.njcn.influx.ano.Param;
-import com.njcn.influx.ano.Select;
-import com.njcn.influx.base.InfluxDbBaseMapper;
-import com.njcn.influx.pojo.bo.HarmonicHistoryData;
-import com.njcn.influx.pojo.dto.StatisticalDataDTO;
-import com.njcn.influx.pojo.po.PowerQualityData;
-import com.njcn.influx.query.InfluxQueryWrapper;
-
-import java.util.List;
-
-/**
- * 类的介绍:
- *
- * @author xuyang
- * @version 1.0.0
- * @createTime 2023/5/5 14:39
- */
-
-public interface CommonMapper extends InfluxDbBaseMapper {
-
- StatisticalDataDTO getLineRtData(InfluxQueryWrapper influxQueryWrapper);
-
- List getDeviceRtData(InfluxQueryWrapper influxQueryWrapper);
-
- List getDeviceRtDataByTime(InfluxQueryWrapper influxQueryWrapper);
-
- StatisticalDataDTO getLineHistoryData(InfluxQueryWrapper influxQueryWrapper);
-
- @Select(value = "#{sql}",resultType = StatisticalDataDTO.class)
- StatisticalDataDTO selectBySql(@Param("sql") StringBuilder sql);
-
- @Select(value = "#{sql}",resultType = StatisticalDataDTO.class)
- List> selectLimitTargetBySql(@Param("sql")String sql);
-
- @Select(value = "#{sql}",resultType = HarmonicHistoryData.class)
- List getHistoryResult(@Param("sql")String sql);
-
- List getTopTemperature(InfluxQueryWrapper influxQueryWrapper);
-}
diff --git a/pqs-influx/src/main/java/com/njcn/influx/imapper/DataFlickerMapper.java b/pqs-influx/src/main/java/com/njcn/influx/imapper/DataFlickerMapper.java
deleted file mode 100644
index bed547604..000000000
--- a/pqs-influx/src/main/java/com/njcn/influx/imapper/DataFlickerMapper.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.njcn.influx.imapper;
-
-import com.njcn.influx.base.InfluxDbBaseMapper;
-import com.njcn.influx.pojo.dto.DataFlickerDTO;
-import com.njcn.influx.pojo.po.DataFlicker;
-import com.njcn.influx.query.InfluxQueryWrapper;
-
-import java.util.List;
-
-/**
- * @author hongawen
- * @version 1.0.0
- * @date 2023年05月05日 08:55
- */
-public interface DataFlickerMapper extends InfluxDbBaseMapper {
-
- List getStatisticsByWraper(InfluxQueryWrapper influxQueryWrapper);
-
- List getStatisticsByWraper2(InfluxQueryWrapper influxQueryWrapper);
-}
diff --git a/pqs-influx/src/main/java/com/njcn/influx/imapper/DataFlucMapper.java b/pqs-influx/src/main/java/com/njcn/influx/imapper/DataFlucMapper.java
deleted file mode 100644
index 425783f0f..000000000
--- a/pqs-influx/src/main/java/com/njcn/influx/imapper/DataFlucMapper.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.njcn.influx.imapper;
-
-import com.njcn.influx.base.InfluxDbBaseMapper;
-import com.njcn.influx.pojo.po.DataFluc;
-import com.njcn.influx.query.InfluxQueryWrapper;
-
-import java.util.List;
-
-/**
- * @author hongawen
- * @version 1.0.0
- * @date 2023年05月05日 08:56
- */
-public interface DataFlucMapper extends InfluxDbBaseMapper {
-
- List getStatisticsByWraper(InfluxQueryWrapper influxQueryWrapper);
-}
diff --git a/pqs-influx/src/main/java/com/njcn/influx/imapper/DataHarmPhasicIMapper.java b/pqs-influx/src/main/java/com/njcn/influx/imapper/DataHarmPhasicIMapper.java
deleted file mode 100644
index 0cd975f0f..000000000
--- a/pqs-influx/src/main/java/com/njcn/influx/imapper/DataHarmPhasicIMapper.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.njcn.influx.imapper;
-
-import com.njcn.influx.base.InfluxDbBaseMapper;
-import com.njcn.influx.pojo.po.DataHarmPhasicI;
-import com.njcn.influx.query.InfluxQueryWrapper;
-
-import java.util.List;
-
-/**
- * @author hongawen
- * @version 1.0.0
- * @date 2023年05月05日 08:56
- */
-public interface DataHarmPhasicIMapper extends InfluxDbBaseMapper {
-
- List getStatisticsByWraper(InfluxQueryWrapper influxQueryWrapper);
-}
diff --git a/pqs-influx/src/main/java/com/njcn/influx/imapper/DataHarmPhasicVMapper.java b/pqs-influx/src/main/java/com/njcn/influx/imapper/DataHarmPhasicVMapper.java
deleted file mode 100644
index 5cd5b6230..000000000
--- a/pqs-influx/src/main/java/com/njcn/influx/imapper/DataHarmPhasicVMapper.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.njcn.influx.imapper;
-
-import com.njcn.influx.base.InfluxDbBaseMapper;
-import com.njcn.influx.pojo.po.DataHarmPhasicV;
-import com.njcn.influx.query.InfluxQueryWrapper;
-
-import java.util.List;
-
-/**
- * @author hongawen
- * @version 1.0.0
- * @date 2023年05月05日 08:56
- */
-public interface DataHarmPhasicVMapper extends InfluxDbBaseMapper {
-
- List getStatisticsByWraper(InfluxQueryWrapper influxQueryWrapper);
-}
diff --git a/pqs-influx/src/main/java/com/njcn/influx/imapper/DataHarmPowerPMapper.java b/pqs-influx/src/main/java/com/njcn/influx/imapper/DataHarmPowerPMapper.java
deleted file mode 100644
index 9317c98df..000000000
--- a/pqs-influx/src/main/java/com/njcn/influx/imapper/DataHarmPowerPMapper.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package com.njcn.influx.imapper;
-
-import com.njcn.influx.ano.Param;
-import com.njcn.influx.ano.Select;
-import com.njcn.influx.base.InfluxDbBaseMapper;
-import com.njcn.influx.pojo.bo.CarryCapcityData;
-import com.njcn.influx.pojo.po.DataHarmPowerP;
-import com.njcn.influx.query.InfluxQueryWrapper;
-
-import java.util.List;
-
-/**
- * @author hongawen
- * @version 1.0.0
- * @date 2023年05月05日 09:00
- */
-public interface DataHarmPowerPMapper extends InfluxDbBaseMapper {
-
- List getStatisticsByWraper(InfluxQueryWrapper influxQueryWrapper);
-
- @Select(value = "#{sql}",resultType = CarryCapcityData.class)
- List getSqlResult(@Param("sql")String sql);
-}
diff --git a/pqs-influx/src/main/java/com/njcn/influx/imapper/DataHarmPowerQMapper.java b/pqs-influx/src/main/java/com/njcn/influx/imapper/DataHarmPowerQMapper.java
deleted file mode 100644
index 29c2720d2..000000000
--- a/pqs-influx/src/main/java/com/njcn/influx/imapper/DataHarmPowerQMapper.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package com.njcn.influx.imapper;
-
-import com.njcn.influx.ano.Param;
-import com.njcn.influx.ano.Select;
-import com.njcn.influx.base.InfluxDbBaseMapper;
-import com.njcn.influx.pojo.bo.CarryCapcityData;
-import com.njcn.influx.pojo.po.DataHarmPowerQ;
-import com.njcn.influx.query.InfluxQueryWrapper;
-
-import java.util.List;
-
-/**
- * @author hongawen
- * @version 1.0.0
- * @date 2023年05月05日 09:00
- */
-public interface DataHarmPowerQMapper extends InfluxDbBaseMapper {
-
- List getStatisticsByWraper(InfluxQueryWrapper influxQueryWrapper);
- @Select(value = "#{sql}",resultType = CarryCapcityData.class)
- List getSqlResult(@Param("sql")String sql);
-}
diff --git a/pqs-influx/src/main/java/com/njcn/influx/imapper/DataHarmPowerSMapper.java b/pqs-influx/src/main/java/com/njcn/influx/imapper/DataHarmPowerSMapper.java
deleted file mode 100644
index 51aefc91e..000000000
--- a/pqs-influx/src/main/java/com/njcn/influx/imapper/DataHarmPowerSMapper.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.njcn.influx.imapper;
-
-import com.njcn.influx.base.InfluxDbBaseMapper;
-import com.njcn.influx.pojo.po.DataHarmPowerS;
-import com.njcn.influx.query.InfluxQueryWrapper;
-
-import java.util.List;
-
-/**
- * @author hongawen
- * @version 1.0.0
- * @date 2023年05月05日 09:00
- */
-public interface DataHarmPowerSMapper extends InfluxDbBaseMapper {
-
- List getStatisticsByWraper(InfluxQueryWrapper influxQueryWrapper);
-
-}
diff --git a/pqs-influx/src/main/java/com/njcn/influx/imapper/DataHarmRateIMapper.java b/pqs-influx/src/main/java/com/njcn/influx/imapper/DataHarmRateIMapper.java
deleted file mode 100644
index 16f4d646c..000000000
--- a/pqs-influx/src/main/java/com/njcn/influx/imapper/DataHarmRateIMapper.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.njcn.influx.imapper;
-
-import com.njcn.influx.base.InfluxDbBaseMapper;
-import com.njcn.influx.pojo.po.DataHarmRateI;
-import com.njcn.influx.query.InfluxQueryWrapper;
-
-import java.util.List;
-
-/**
- * @author hongawen
- * @version 1.0.0
- * @date 2023年07月17日 11:03
- */
-public interface DataHarmRateIMapper extends InfluxDbBaseMapper {
-
- List getStatisticsByWraper(InfluxQueryWrapper influxQueryWrapper);
-
-}
diff --git a/pqs-influx/src/main/java/com/njcn/influx/imapper/DataHarmRateVMapper.java b/pqs-influx/src/main/java/com/njcn/influx/imapper/DataHarmRateVMapper.java
deleted file mode 100644
index c6d029a66..000000000
--- a/pqs-influx/src/main/java/com/njcn/influx/imapper/DataHarmRateVMapper.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package com.njcn.influx.imapper;
-
-import com.njcn.influx.base.InfluxDbBaseMapper;
-import com.njcn.influx.pojo.dto.HarmData;
-import com.njcn.influx.pojo.po.DataHarmRateV;
-import com.njcn.influx.query.InfluxQueryWrapper;
-
-import java.util.List;
-
-/**
- * @author hongawen
- * @version 1.0.0
- * @date 2023年07月17日 11:03
- */
-public interface DataHarmRateVMapper extends InfluxDbBaseMapper {
-
- DataHarmRateV getMeanAllTimesData(InfluxQueryWrapper influxQueryWrapper);
-
- List getHarmRateVHistoryData(InfluxQueryWrapper influxQueryWrapper);
-
- List getStatisticsByWraper(InfluxQueryWrapper influxQueryWrapper);
-
-}
diff --git a/pqs-influx/src/main/java/com/njcn/influx/imapper/DataInHarmIMapper.java b/pqs-influx/src/main/java/com/njcn/influx/imapper/DataInHarmIMapper.java
deleted file mode 100644
index 5ebb418b9..000000000
--- a/pqs-influx/src/main/java/com/njcn/influx/imapper/DataInHarmIMapper.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.njcn.influx.imapper;
-
-import com.njcn.influx.base.InfluxDbBaseMapper;
-import com.njcn.influx.pojo.po.DataInHarmI;
-import com.njcn.influx.query.InfluxQueryWrapper;
-
-import java.util.List;
-
-/**
- * @author hongawen
- * @version 1.0.0
- * @date 2023年07月17日 11:03
- */
-public interface DataInHarmIMapper extends InfluxDbBaseMapper {
-
- List getStatisticsByWraper(InfluxQueryWrapper influxQueryWrapper);
-
-}
diff --git a/pqs-influx/src/main/java/com/njcn/influx/imapper/DataInHarmRateIMapper.java b/pqs-influx/src/main/java/com/njcn/influx/imapper/DataInHarmRateIMapper.java
deleted file mode 100644
index 10597da02..000000000
--- a/pqs-influx/src/main/java/com/njcn/influx/imapper/DataInHarmRateIMapper.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.njcn.influx.imapper;
-
-import com.njcn.influx.base.InfluxDbBaseMapper;
-import com.njcn.influx.pojo.po.DataInHarmRateI;
-import com.njcn.influx.query.InfluxQueryWrapper;
-
-import java.util.List;
-
-/**
- * @author hongawen
- * @version 1.0.0
- * @date 2023年07月17日 11:03
- */
-public interface DataInHarmRateIMapper extends InfluxDbBaseMapper {
-
- List getStatisticsByWraper(InfluxQueryWrapper influxQueryWrapper);
-
-}
diff --git a/pqs-influx/src/main/java/com/njcn/influx/imapper/DataInHarmRateVMapper.java b/pqs-influx/src/main/java/com/njcn/influx/imapper/DataInHarmRateVMapper.java
deleted file mode 100644
index c95893f8e..000000000
--- a/pqs-influx/src/main/java/com/njcn/influx/imapper/DataInHarmRateVMapper.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.njcn.influx.imapper;
-
-import com.njcn.influx.base.InfluxDbBaseMapper;
-import com.njcn.influx.pojo.po.DataInHarmRateV;
-import com.njcn.influx.query.InfluxQueryWrapper;
-
-import java.util.List;
-
-/**
- * @author hongawen
- * @version 1.0.0
- * @date 2023年05月05日 09:00
- */
-public interface DataInHarmRateVMapper extends InfluxDbBaseMapper {
-
- List getStatisticsByWraper(InfluxQueryWrapper influxQueryWrapper);
-
-}
diff --git a/pqs-influx/src/main/java/com/njcn/influx/imapper/DataInHarmVMapper.java b/pqs-influx/src/main/java/com/njcn/influx/imapper/DataInHarmVMapper.java
deleted file mode 100644
index 9ffba8cb9..000000000
--- a/pqs-influx/src/main/java/com/njcn/influx/imapper/DataInHarmVMapper.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.njcn.influx.imapper;
-
-import com.njcn.influx.base.InfluxDbBaseMapper;
-import com.njcn.influx.pojo.po.DataInHarmV;
-import com.njcn.influx.query.InfluxQueryWrapper;
-
-import java.util.List;
-
-/**
- * @author hongawen
- * @version 1.0.0
- * @date 2023年07月17日 11:03
- */
-public interface DataInHarmVMapper extends InfluxDbBaseMapper {
-
- List getStatisticsByWraper(InfluxQueryWrapper influxQueryWrapper);
-
-}
diff --git a/pqs-influx/src/main/java/com/njcn/influx/imapper/DataPltMapper.java b/pqs-influx/src/main/java/com/njcn/influx/imapper/DataPltMapper.java
deleted file mode 100644
index b3bca485e..000000000
--- a/pqs-influx/src/main/java/com/njcn/influx/imapper/DataPltMapper.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.njcn.influx.imapper;
-
-import com.njcn.influx.base.InfluxDbBaseMapper;
-import com.njcn.influx.pojo.po.DataPlt;
-import com.njcn.influx.query.InfluxQueryWrapper;
-
-import java.util.List;
-
-/**
- * @author hongawen
- * @version 1.0.0
- * @date 2023年05月05日 08:56
- */
-public interface DataPltMapper extends InfluxDbBaseMapper {
-
- List getStatisticsByWraper(InfluxQueryWrapper influxQueryWrapper);
-}
diff --git a/pqs-influx/src/main/java/com/njcn/influx/imapper/DataVMapper.java b/pqs-influx/src/main/java/com/njcn/influx/imapper/DataVMapper.java
deleted file mode 100644
index 7f473099b..000000000
--- a/pqs-influx/src/main/java/com/njcn/influx/imapper/DataVMapper.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.njcn.influx.imapper;
-
-import com.njcn.influx.ano.Param;
-import com.njcn.influx.ano.Select;
-import com.njcn.influx.base.InfluxDbBaseMapper;
-import com.njcn.influx.pojo.bo.CarryCapcityData;
-import com.njcn.influx.pojo.bo.MeasurementCount;
-import com.njcn.influx.pojo.po.DataV;
-import com.njcn.influx.query.InfluxQueryWrapper;
-
-import java.util.List;
-
-/**
- * 类的介绍:
- *
- * @author xuyang
- * @version 1.0.0
- * @createTime 2023/5/5 14:39
- */
-
-public interface DataVMapper extends InfluxDbBaseMapper {
-
- List getStatisticsByWraper(InfluxQueryWrapper influxQueryWrapper);
- List getMeasurementCount(InfluxQueryWrapper influxQueryWrapper);
- @Select(value = "#{sql}",resultType = CarryCapcityData.class)
- List getSqlResult(@Param("sql")String sql);
-}
diff --git a/pqs-influx/src/main/java/com/njcn/influx/imapper/EvtDataMapper.java b/pqs-influx/src/main/java/com/njcn/influx/imapper/EvtDataMapper.java
deleted file mode 100644
index b771613d3..000000000
--- a/pqs-influx/src/main/java/com/njcn/influx/imapper/EvtDataMapper.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.njcn.influx.imapper;
-
-
-import com.njcn.influx.base.InfluxDbBaseMapper;
-
-import com.njcn.influx.pojo.dto.EventDataSetDTO;
-import com.njcn.influx.pojo.po.cs.EntData;
-import com.njcn.influx.query.InfluxQueryWrapper;
-
-import java.util.List;
-
-/**
- * 类的介绍:
- *
- * @author xuyang
- * @version 1.0.0
- * @createTime 2023/5/5 14:39
- */
-
-public interface EvtDataMapper extends InfluxDbBaseMapper {
-
-
- List getEventData(InfluxQueryWrapper influxQueryWrapper);
-
- EventDataSetDTO getEventDataSet(InfluxQueryWrapper influxQueryWrapper);
-}
diff --git a/pqs-influx/src/main/java/com/njcn/influx/imapper/HaronicRatioMapper.java b/pqs-influx/src/main/java/com/njcn/influx/imapper/HaronicRatioMapper.java
deleted file mode 100644
index 4aa065b7a..000000000
--- a/pqs-influx/src/main/java/com/njcn/influx/imapper/HaronicRatioMapper.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package com.njcn.influx.imapper;
-
-import com.njcn.influx.base.InfluxDbBaseMapper;
-import com.njcn.influx.pojo.po.HarmonicRatioData;
-import com.njcn.influx.pojo.po.PowerQualityData;
-import com.njcn.influx.query.InfluxQueryWrapper;
-
-import java.util.List;
-
-/**
- * 类的介绍:
- *
- * @author xuyang
- * @version 1.0.0
- * @createTime 2023/5/5 14:39
- */
-
-public interface HaronicRatioMapper extends InfluxDbBaseMapper {
-
- List getFirstHaronicRatio(InfluxQueryWrapper influxQueryWrapper);
-
- List getHaronicRatio(InfluxQueryWrapper influxQueryWrapper);
-}
diff --git a/pqs-influx/src/main/java/com/njcn/influx/imapper/IDataIMapper.java b/pqs-influx/src/main/java/com/njcn/influx/imapper/IDataIMapper.java
deleted file mode 100644
index 45e9b9f85..000000000
--- a/pqs-influx/src/main/java/com/njcn/influx/imapper/IDataIMapper.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package com.njcn.influx.imapper;
-
-import com.njcn.influx.ano.Param;
-import com.njcn.influx.ano.Select;
-import com.njcn.influx.base.InfluxDbBaseMapper;
-import com.njcn.influx.pojo.dto.HarmData;
-import com.njcn.influx.pojo.po.DataI;
-import com.njcn.influx.query.InfluxQueryWrapper;
-
-import java.util.List;
-
-/**
- * @author hongawen
- * @version 1.0.0
- * @date 2023年07月17日 11:05
- */
-public interface IDataIMapper extends InfluxDbBaseMapper {
-
- DataI getMeanAllTimesData(InfluxQueryWrapper influxQueryWrapper);
-
-// List getIHistoryData(InfluxQueryWrapper influxQueryWrapper);
-
- @Select(value = "#{sql}",resultType = HarmData.class)
- List getIHistoryData(@Param("sql")String sql);
-
- List getStatisticsByWraper(InfluxQueryWrapper influxQueryWrapper);
-
- @Select(value = "#{sql}",resultType = DataI.class)
- List getSqlResult(@Param("sql")String sql);
-}
diff --git a/pqs-influx/src/main/java/com/njcn/influx/imapper/PowerQualityMapper.java b/pqs-influx/src/main/java/com/njcn/influx/imapper/PowerQualityMapper.java
deleted file mode 100644
index 02942ac40..000000000
--- a/pqs-influx/src/main/java/com/njcn/influx/imapper/PowerQualityMapper.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package com.njcn.influx.imapper;
-
-import com.njcn.influx.base.InfluxDbBaseMapper;
-import com.njcn.influx.pojo.po.PowerQualityData;
-import com.njcn.influx.query.InfluxQueryWrapper;
-
-import java.util.List;
-
-/**
- * 类的介绍:
- *
- * @author xuyang
- * @version 1.0.0
- * @createTime 2023/5/5 14:39
- */
-
-public interface PowerQualityMapper extends InfluxDbBaseMapper {
-
- List getFirstPowerQuality(InfluxQueryWrapper influxQueryWrapper);
-
- List getPowerQuality(InfluxQueryWrapper influxQueryWrapper);
-}
diff --git a/pqs-influx/src/main/java/com/njcn/influx/imapper/PqsCommunicateMapper.java b/pqs-influx/src/main/java/com/njcn/influx/imapper/PqsCommunicateMapper.java
deleted file mode 100644
index 511295a79..000000000
--- a/pqs-influx/src/main/java/com/njcn/influx/imapper/PqsCommunicateMapper.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.njcn.influx.imapper;
-
-import com.njcn.influx.base.InfluxDbBaseMapper;
-import com.njcn.influx.pojo.po.PqsCommunicate;
-
-/**
- * @author hongawen
- * @version 1.0.0
- * @date 2023年08月09日 09:29
- */
-public interface PqsCommunicateMapper extends InfluxDbBaseMapper {
-
-}
diff --git a/pqs-influx/src/main/java/com/njcn/influx/imapper/day/DayFlickerMapper.java b/pqs-influx/src/main/java/com/njcn/influx/imapper/day/DayFlickerMapper.java
deleted file mode 100644
index b5ca4193b..000000000
--- a/pqs-influx/src/main/java/com/njcn/influx/imapper/day/DayFlickerMapper.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.njcn.influx.imapper.day;
-
-import com.njcn.influx.base.InfluxDbBaseMapper;
-import com.njcn.influx.pojo.dto.DataFlickerDTO;
-import com.njcn.influx.pojo.po.DataFlicker;
-import com.njcn.influx.pojo.po.day.DayFlicker;
-import com.njcn.influx.query.InfluxQueryWrapper;
-
-import java.util.List;
-
-/**
- * @author hongawen
- * @version 1.0.0
- * @date 2023年05月05日 08:55
- */
-public interface DayFlickerMapper extends InfluxDbBaseMapper {
-
-}
diff --git a/pqs-influx/src/main/java/com/njcn/influx/imapper/day/DayFlucMapper.java b/pqs-influx/src/main/java/com/njcn/influx/imapper/day/DayFlucMapper.java
deleted file mode 100644
index 89c2995ce..000000000
--- a/pqs-influx/src/main/java/com/njcn/influx/imapper/day/DayFlucMapper.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.njcn.influx.imapper.day;
-
-import com.njcn.influx.base.InfluxDbBaseMapper;
-import com.njcn.influx.pojo.po.DataFluc;
-import com.njcn.influx.pojo.po.day.DayFluc;
-
-/**
- * @author hongawen
- * @version 1.0.0
- * @date 2023年05月05日 08:56
- */
-public interface DayFlucMapper extends InfluxDbBaseMapper {
-}
diff --git a/pqs-influx/src/main/java/com/njcn/influx/imapper/day/DayHarmPhasicIMapper.java b/pqs-influx/src/main/java/com/njcn/influx/imapper/day/DayHarmPhasicIMapper.java
deleted file mode 100644
index c55addc38..000000000
--- a/pqs-influx/src/main/java/com/njcn/influx/imapper/day/DayHarmPhasicIMapper.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.njcn.influx.imapper.day;
-
-import com.njcn.influx.base.InfluxDbBaseMapper;
-import com.njcn.influx.pojo.po.DataHarmPhasicI;
-import com.njcn.influx.pojo.po.day.DayHarmPhasicI;
-
-/**
- * @author hongawen
- * @version 1.0.0
- * @date 2023年05月05日 08:56
- */
-public interface DayHarmPhasicIMapper extends InfluxDbBaseMapper {
-}
diff --git a/pqs-influx/src/main/java/com/njcn/influx/imapper/day/DayHarmPhasicVMapper.java b/pqs-influx/src/main/java/com/njcn/influx/imapper/day/DayHarmPhasicVMapper.java
deleted file mode 100644
index 2577cf47a..000000000
--- a/pqs-influx/src/main/java/com/njcn/influx/imapper/day/DayHarmPhasicVMapper.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.njcn.influx.imapper.day;
-
-import com.njcn.influx.base.InfluxDbBaseMapper;
-import com.njcn.influx.pojo.po.DataHarmPhasicV;
-import com.njcn.influx.pojo.po.day.DayHarmPhasicV;
-
-/**
- * @author hongawen
- * @version 1.0.0
- * @date 2023年05月05日 08:56
- */
-public interface DayHarmPhasicVMapper extends InfluxDbBaseMapper {
-}
diff --git a/pqs-influx/src/main/java/com/njcn/influx/imapper/day/DayHarmPowerPMapper.java b/pqs-influx/src/main/java/com/njcn/influx/imapper/day/DayHarmPowerPMapper.java
deleted file mode 100644
index a8f937d65..000000000
--- a/pqs-influx/src/main/java/com/njcn/influx/imapper/day/DayHarmPowerPMapper.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.njcn.influx.imapper.day;
-
-import com.njcn.influx.base.InfluxDbBaseMapper;
-import com.njcn.influx.pojo.po.DataHarmPowerP;
-import com.njcn.influx.pojo.po.day.DayHarmPowerP;
-import com.njcn.influx.query.InfluxQueryWrapper;
-
-import java.util.List;
-
-/**
- * @author hongawen
- * @version 1.0.0
- * @date 2023年05月05日 09:00
- */
-public interface DayHarmPowerPMapper extends InfluxDbBaseMapper {
-
-}
diff --git a/pqs-influx/src/main/java/com/njcn/influx/imapper/day/DayHarmPowerQMapper.java b/pqs-influx/src/main/java/com/njcn/influx/imapper/day/DayHarmPowerQMapper.java
deleted file mode 100644
index e67750c4a..000000000
--- a/pqs-influx/src/main/java/com/njcn/influx/imapper/day/DayHarmPowerQMapper.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package com.njcn.influx.imapper.day;
-
-import com.njcn.influx.base.InfluxDbBaseMapper;
-import com.njcn.influx.pojo.po.DataHarmPowerQ;
-import com.njcn.influx.pojo.po.day.DayHarmPowerQ;
-
-/**
- * @author hongawen
- * @version 1.0.0
- * @date 2023年05月05日 09:00
- */
-public interface DayHarmPowerQMapper extends InfluxDbBaseMapper {
-
-}
diff --git a/pqs-influx/src/main/java/com/njcn/influx/imapper/day/DayHarmPowerSMapper.java b/pqs-influx/src/main/java/com/njcn/influx/imapper/day/DayHarmPowerSMapper.java
deleted file mode 100644
index 93a09d072..000000000
--- a/pqs-influx/src/main/java/com/njcn/influx/imapper/day/DayHarmPowerSMapper.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package com.njcn.influx.imapper.day;
-
-import com.njcn.influx.base.InfluxDbBaseMapper;
-import com.njcn.influx.pojo.po.DataHarmPowerS;
-import com.njcn.influx.pojo.po.day.DayHarmPowerS;
-
-/**
- * @author hongawen
- * @version 1.0.0
- * @date 2023年05月05日 09:00
- */
-public interface DayHarmPowerSMapper extends InfluxDbBaseMapper {
-
-}
diff --git a/pqs-influx/src/main/java/com/njcn/influx/imapper/day/DayHarmRateIMapper.java b/pqs-influx/src/main/java/com/njcn/influx/imapper/day/DayHarmRateIMapper.java
deleted file mode 100644
index b3b8d479b..000000000
--- a/pqs-influx/src/main/java/com/njcn/influx/imapper/day/DayHarmRateIMapper.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package com.njcn.influx.imapper.day;
-
-import com.njcn.influx.base.InfluxDbBaseMapper;
-import com.njcn.influx.pojo.po.day.DayHarmRateI;
-import com.njcn.influx.pojo.po.day.DayHarmRateV;
-
-/**
- * @author hongawen
- * @version 1.0.0
- * @date 2023年07月17日 11:03
- */
-public interface DayHarmRateIMapper extends InfluxDbBaseMapper {
-
-}
diff --git a/pqs-influx/src/main/java/com/njcn/influx/imapper/day/DayHarmRateVMapper.java b/pqs-influx/src/main/java/com/njcn/influx/imapper/day/DayHarmRateVMapper.java
deleted file mode 100644
index 3e2758807..000000000
--- a/pqs-influx/src/main/java/com/njcn/influx/imapper/day/DayHarmRateVMapper.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.njcn.influx.imapper.day;
-
-import com.njcn.influx.base.InfluxDbBaseMapper;
-import com.njcn.influx.pojo.dto.HarmData;
-import com.njcn.influx.pojo.po.DataHarmRateV;
-import com.njcn.influx.pojo.po.day.DayHarmRateV;
-import com.njcn.influx.query.InfluxQueryWrapper;
-
-import java.util.List;
-
-/**
- * @author hongawen
- * @version 1.0.0
- * @date 2023年07月17日 11:03
- */
-public interface DayHarmRateVMapper extends InfluxDbBaseMapper {
-
-}
diff --git a/pqs-influx/src/main/java/com/njcn/influx/imapper/day/DayIMapper.java b/pqs-influx/src/main/java/com/njcn/influx/imapper/day/DayIMapper.java
deleted file mode 100644
index 2ef3ebbce..000000000
--- a/pqs-influx/src/main/java/com/njcn/influx/imapper/day/DayIMapper.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package com.njcn.influx.imapper.day;
-
-import com.njcn.influx.base.InfluxDbBaseMapper;
-import com.njcn.influx.pojo.dto.HarmData;
-import com.njcn.influx.pojo.po.DataI;
-import com.njcn.influx.pojo.po.day.DayI;
-import com.njcn.influx.query.InfluxQueryWrapper;
-
-import java.util.List;
-
-/**
- * @author hongawen
- * @version 1.0.0
- * @date 2023年07月17日 11:05
- */
-public interface DayIMapper extends InfluxDbBaseMapper {
-
-
-}
diff --git a/pqs-influx/src/main/java/com/njcn/influx/imapper/day/DayInHarmIMapper.java b/pqs-influx/src/main/java/com/njcn/influx/imapper/day/DayInHarmIMapper.java
deleted file mode 100644
index acc2bca9f..000000000
--- a/pqs-influx/src/main/java/com/njcn/influx/imapper/day/DayInHarmIMapper.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.njcn.influx.imapper.day;
-
-import com.njcn.influx.base.InfluxDbBaseMapper;
-import com.njcn.influx.pojo.po.day.DayInHarmI;
-
-/**
- * @author hongawen
- * @version 1.0.0
- * @date 2023年05月05日 09:00
- */
-public interface DayInHarmIMapper extends InfluxDbBaseMapper {
-
-}
diff --git a/pqs-influx/src/main/java/com/njcn/influx/imapper/day/DayInHarmIRateMapper.java b/pqs-influx/src/main/java/com/njcn/influx/imapper/day/DayInHarmIRateMapper.java
deleted file mode 100644
index 7f76693db..000000000
--- a/pqs-influx/src/main/java/com/njcn/influx/imapper/day/DayInHarmIRateMapper.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package com.njcn.influx.imapper.day;
-
-import com.njcn.influx.base.InfluxDbBaseMapper;
-import com.njcn.influx.pojo.po.day.DayInHarmI;
-import com.njcn.influx.pojo.po.day.DayInHarmV;
-
-/**
- * @author hongawen
- * @version 1.0.0
- * @date 2023年05月05日 09:00
- */
-public interface DayInHarmIRateMapper extends InfluxDbBaseMapper {
-
-}
diff --git a/pqs-influx/src/main/java/com/njcn/influx/imapper/day/DayInHarmVMapper.java b/pqs-influx/src/main/java/com/njcn/influx/imapper/day/DayInHarmVMapper.java
deleted file mode 100644
index b523de709..000000000
--- a/pqs-influx/src/main/java/com/njcn/influx/imapper/day/DayInHarmVMapper.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.njcn.influx.imapper.day;
-
-import com.njcn.influx.base.InfluxDbBaseMapper;
-import com.njcn.influx.pojo.po.day.DayInHarmV;
-
-/**
- * @author hongawen
- * @version 1.0.0
- * @date 2023年05月05日 09:00
- */
-public interface DayInHarmVMapper extends InfluxDbBaseMapper {
-
-}
diff --git a/pqs-influx/src/main/java/com/njcn/influx/imapper/day/DayInHarmVRateMapper.java b/pqs-influx/src/main/java/com/njcn/influx/imapper/day/DayInHarmVRateMapper.java
deleted file mode 100644
index ffb580584..000000000
--- a/pqs-influx/src/main/java/com/njcn/influx/imapper/day/DayInHarmVRateMapper.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package com.njcn.influx.imapper.day;
-
-import com.njcn.influx.base.InfluxDbBaseMapper;
-import com.njcn.influx.pojo.po.DataInHarmV;
-import com.njcn.influx.pojo.po.day.DayInHarmV;
-
-/**
- * @author hongawen
- * @version 1.0.0
- * @date 2023年05月05日 09:00
- */
-public interface DayInHarmVRateMapper extends InfluxDbBaseMapper {
-
-}
diff --git a/pqs-influx/src/main/java/com/njcn/influx/imapper/day/DayPltMapper.java b/pqs-influx/src/main/java/com/njcn/influx/imapper/day/DayPltMapper.java
deleted file mode 100644
index 93cf6625f..000000000
--- a/pqs-influx/src/main/java/com/njcn/influx/imapper/day/DayPltMapper.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.njcn.influx.imapper.day;
-
-import com.njcn.influx.base.InfluxDbBaseMapper;
-import com.njcn.influx.pojo.po.day.DayFluc;
-import com.njcn.influx.pojo.po.day.DayPlt;
-
-/**
- * @author hongawen
- * @version 1.0.0
- * @date 2023年05月05日 08:56
- */
-public interface DayPltMapper extends InfluxDbBaseMapper {
-}
diff --git a/pqs-influx/src/main/java/com/njcn/influx/imapper/day/DayVMapper.java b/pqs-influx/src/main/java/com/njcn/influx/imapper/day/DayVMapper.java
deleted file mode 100644
index f9e99c1a4..000000000
--- a/pqs-influx/src/main/java/com/njcn/influx/imapper/day/DayVMapper.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.njcn.influx.imapper.day;
-
-import com.njcn.influx.base.InfluxDbBaseMapper;
-import com.njcn.influx.pojo.po.DataV;
-import com.njcn.influx.pojo.po.day.DayV;
-import com.njcn.influx.query.InfluxQueryWrapper;
-
-import java.util.List;
-
-/**
- * 类的介绍:
- *
- * @author xuyang
- * @version 1.0.0
- * @createTime 2023/5/5 14:39
- */
-
-public interface DayVMapper extends InfluxDbBaseMapper {
-
-
-}
diff --git a/pqs-influx/src/main/java/com/njcn/influx/pojo/bo/CarryCapcityData.java b/pqs-influx/src/main/java/com/njcn/influx/pojo/bo/CarryCapcityData.java
deleted file mode 100644
index 19e3dfce9..000000000
--- a/pqs-influx/src/main/java/com/njcn/influx/pojo/bo/CarryCapcityData.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package com.njcn.influx.pojo.bo;
-
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.njcn.influx.utils.InstantDateSerializer;
-import lombok.Data;
-import org.influxdb.annotation.Column;
-
-import java.time.Instant;
-
-/**
- * 类的介绍:
- *
- * @author xuyang
- * @version 1.0.0
- * @createTime 2022/5/12 9:13
- */
-@Data
-public class CarryCapcityData {
-
- @Column(name = "time")
- @JsonSerialize(using = InstantDateSerializer.class)
- private Instant time;
-
- @Column(name = "line_id")
- private String lineId;
-
- @Column(name = "phasic_type")
- private String phaseType;
-
- @Column(name = "quality_flag")
- private String qualityFlag;
-
- @Column(name = "value_type")
- private String valueType;
-
- private Double value;
-
-}
diff --git a/pqs-influx/src/main/java/com/njcn/influx/pojo/bo/CommonQueryParam.java b/pqs-influx/src/main/java/com/njcn/influx/pojo/bo/CommonQueryParam.java
deleted file mode 100644
index 59d6ede22..000000000
--- a/pqs-influx/src/main/java/com/njcn/influx/pojo/bo/CommonQueryParam.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.njcn.influx.pojo.bo;
-
-import lombok.Data;
-
-/**
- * Description:
- * Date: 2024/1/24 9:05【需求编号】
- *
- * @author clam
- * @version V1.0.0
- */
-@Data
-public class CommonQueryParam {
- private String lineId;
- private String tableName;
- private String columnName;
- private String phasic;
- private String startTime;
- private String endTime;
- private String dataType;
- private String process;
- private String clDid;
-
-}
diff --git a/pqs-influx/src/main/java/com/njcn/influx/pojo/bo/HarmonicHistoryData.java b/pqs-influx/src/main/java/com/njcn/influx/pojo/bo/HarmonicHistoryData.java
deleted file mode 100644
index e966233f1..000000000
--- a/pqs-influx/src/main/java/com/njcn/influx/pojo/bo/HarmonicHistoryData.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package com.njcn.influx.pojo.bo;
-
-import cn.hutool.core.util.ObjUtil;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.njcn.influx.utils.InstantDateSerializer;
-import lombok.Data;
-import org.influxdb.annotation.Column;
-
-import java.io.Serializable;
-import java.time.Instant;
-import java.util.concurrent.TimeUnit;
-
-/**
- * @author hongawen
- * @version 1.0.0
- * @date 2023年07月17日 16:25
- */
-@Data
-public class HarmonicHistoryData implements Serializable {
-
-
- @JsonSerialize(using = InstantDateSerializer.class)
- private Instant time;
-
- @Column(name = "phasic_type")
- private String phasicType;
-
- private Float aValue;
-
- private Float bValue;
-
- private Float cValue;
-
- private Instant timeId;
-
- public void setTimeId(Instant timeId) {
- if(ObjUtil.isNotNull(timeId)){
- Instant instant = timeId.plusMillis(TimeUnit.HOURS.toMillis(8));
- this.time = instant;
- }
-
- }
-}
diff --git a/pqs-influx/src/main/java/com/njcn/influx/pojo/bo/MeasurementCount.java b/pqs-influx/src/main/java/com/njcn/influx/pojo/bo/MeasurementCount.java
deleted file mode 100644
index 891fa18a4..000000000
--- a/pqs-influx/src/main/java/com/njcn/influx/pojo/bo/MeasurementCount.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.njcn.influx.pojo.bo;
-
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.njcn.influx.utils.InstantDateSerializer;
-import lombok.Data;
-import org.influxdb.annotation.Column;
-import org.influxdb.annotation.Measurement;
-
-import java.io.Serializable;
-import java.time.Instant;
-
-/**
- * 类的介绍:
- *
- * @author xuyang
- * @version 1.0.0
- * @createTime 2023/11/10 16:17
- */
-@Data
-@Measurement(name = "data_v")
-public class MeasurementCount implements Serializable {
-
- @Column(name = "time")
- @JsonSerialize(using = InstantDateSerializer.class)
- private Instant time;
-
- @Column(name = "line_id")
- private String lineId;
-
- @Column(name = "freq")
- private String freq;
-
-}
diff --git a/pqs-influx/src/main/java/com/njcn/influx/pojo/bo/StatisticsResult.java b/pqs-influx/src/main/java/com/njcn/influx/pojo/bo/StatisticsResult.java
deleted file mode 100644
index e9d1ffa66..000000000
--- a/pqs-influx/src/main/java/com/njcn/influx/pojo/bo/StatisticsResult.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package com.njcn.influx.pojo.bo;
-
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.njcn.influx.utils.InstantDateSerializer;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.time.Instant;
-
-/**
- * 用来收集统计结果,比如max min mean cp95等函数
- * @author hongawen
- * @version 1.0.0
- */
-@Data
-public class StatisticsResult implements Serializable {
-
- @JsonSerialize(using = InstantDateSerializer.class)
- private Instant time;
-
- /***
- * 统计值
- */
- private Double value;
-
-
-
-}
diff --git a/pqs-influx/src/main/java/com/njcn/influx/pojo/constant/InfluxDBTableConstant.java b/pqs-influx/src/main/java/com/njcn/influx/pojo/constant/InfluxDBTableConstant.java
deleted file mode 100644
index 21358dc9e..000000000
--- a/pqs-influx/src/main/java/com/njcn/influx/pojo/constant/InfluxDBTableConstant.java
+++ /dev/null
@@ -1,200 +0,0 @@
-package com.njcn.influx.pojo.constant;
-
-/**
- * 数据表相关常量
- * @author hongawen
- * @version 1.0.0
- * @date 2022年10月14日 14:02
- */
-public interface InfluxDBTableConstant {
-
- /**
- * 电压波动闪变表
- */
- String DATA_FLICKER = "data_flicker";
-
- /**
- * 电压波动表
- */
- String DATA_FLUC = "data_fluc";
-
- /**
- * 谐波电流角度表
- */
- String DATA_HARM_PHASIC_I = "data_harmphasic_i";
-
- /**
- * 谐波电压角度表
- */
- String DATA_HARM_PHASIC_V = "data_harmphasic_v";
-
- /**
- * 有功功率表
- */
- String DATA_HARM_POWER_P = "data_harmpower_p";
-
- /**
- * 无功功率表
- */
- String DATA_HARM_POWER_Q = "data_harmpower_q";
-
- /**
- * 视在功率表
- */
- String DATA_HARM_POWER_S = "data_harmpower_s";
-
- /**
- * 谐波电流含有率表
- */
- String DATA_HARM_RATE_I = "data_harmrate_i";
-
- /**
- * 谐波电压含有率表
- */
- String DATA_HARM_RATE_V = "data_harmrate_v";
-
- /**
- * 电流表
- */
- String DATA_I = "data_i";
-
- /**
- * 电流间谐波幅值表
- */
- String DATA_IN_HARM_I = "data_inharm_i";
-
- /**
- * 电压间谐波幅值表
- */
- String DATA_IN_HARM_V = "data_inharm_v";
-
- /**
- * 长时闪变表
- */
- String DATA_PLT = "data_plt";
-
- /**
- * 电压表
- */
- String DATA_V = "data_v";
-
-
- /**
- * 时间
- */
- String TIME = "time";
-
- /**
- * 数据线路号
- */
- String LINE_ID = "line_id";
- String PROCESS = "process";
-
- /**
- * 装置ID
- */
- String DEV_ID = "dev_id";
-
- /**
- * 数据类型
- */
- String PHASIC_TYPE = "phasic_type";
-
- /**
- * 指标类型
- */
- String VALUE_TYPE = "value_type";
-
- /**
- * 统计结果
- */
- String VALUE = "value";
-
- /**
- * 统计结果最大值
- */
- String MAX_VALUE = "maxValue";
-
- /**
- * 统计结果最小值
- */
- String MIN_VALUE = "minValue";
-
- /**
- * 统计结果平均值
- */
- String AVG_VALUE = "avgValue";
-
- /**
- * 数据质量标志
- */
- String QUALITY_FLAG = "quality_flag";
-
-
-
- /**
- * 相别
- */
- String NO_PHASE = "M";
- String PHASE_TYPE_A = "A";
- String PHASE_TYPE_AB = "AB";
- String PHASE_TYPE_B = "B";
- String PHASE_TYPE_BC = "BC";
- String PHASE_TYPE_C = "C";
- String PHASE_TYPE_C0 = "C0";
- String PHASE_TYPE_C1 = "C1";
- String PHASE_TYPE_C2 = "C2";
- String PHASE_TYPE_CA = "CA";
- String PHASE_TYPE_T = "T";
-
- /**
- * 日起始时间
- */
- String START_TIME = " 00:00:00";
-
- /**
- * 日结束时间
- */
- String END_TIME = " 23:59:59";
-
- /**
- * 数据是否异常
- */
- String IS_ABNORMAL = "is_abnormal";
-
- /**
- * 逻辑子设备id
- */
- String CL_DID = "cl_did";
-
- /**
- * 逻辑子设备id/暂态事件号
- */
- String UUID = "uuid";
-
- /**
- * 流程(1:设备登记,2:功能调试,3:出厂调试 4:设备投运)
- */
- String process = "process";
-
- /**
- * 报表业务计算方式
- */
- String MAX = "MAX";
- String MIN = "MIN";
- String AVG = "AVG";
- String CP95 = "CP95";
-
- /**
- * 每天固定时间分钟
- */
- Integer DAY_MINUTE = 1440;
-
- /**
- * 数据是否正常 0:正常 1:异常
- */
- String NORMAL = "0";
- String UN_NORMAL = "1";
-
-
-}
diff --git a/pqs-influx/src/main/java/com/njcn/influx/pojo/dto/DataFlickerDTO.java b/pqs-influx/src/main/java/com/njcn/influx/pojo/dto/DataFlickerDTO.java
deleted file mode 100644
index 5fd25443e..000000000
--- a/pqs-influx/src/main/java/com/njcn/influx/pojo/dto/DataFlickerDTO.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package com.njcn.influx.pojo.dto;
-
-import com.njcn.influx.pojo.po.DataFlicker;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import org.influxdb.annotation.Measurement;
-
-import java.io.Serializable;
-
-/**
- * @author hongawen
- * @version 1.0.0
- * @date 2023年05月05日 10:17
- */
-@Data
-@Measurement(name = "data_flicker")
-@EqualsAndHashCode(callSuper = true)
-public class DataFlickerDTO extends DataFlicker implements Serializable {
-
- private String valueType;
-
-}
diff --git a/pqs-influx/src/main/java/com/njcn/influx/pojo/dto/DeviceDayFlowDTO.java b/pqs-influx/src/main/java/com/njcn/influx/pojo/dto/DeviceDayFlowDTO.java
deleted file mode 100644
index 20ff1f140..000000000
--- a/pqs-influx/src/main/java/com/njcn/influx/pojo/dto/DeviceDayFlowDTO.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package com.njcn.influx.pojo.dto;
-
-import com.njcn.influx.pojo.po.CldStatisFlow;
-import lombok.Data;
-import org.influxdb.annotation.Column;
-import org.influxdb.annotation.Measurement;
-
-import java.time.Instant;
-
-@Data
-@Measurement(name = "cld_statis_flow")
-public class DeviceDayFlowDTO extends CldStatisFlow {
-
- private float dailyActualValue;
-
- private String date;
-
- private String month;
-}
diff --git a/pqs-influx/src/main/java/com/njcn/influx/pojo/dto/EventDataSetDTO.java b/pqs-influx/src/main/java/com/njcn/influx/pojo/dto/EventDataSetDTO.java
deleted file mode 100644
index 70de0e450..000000000
--- a/pqs-influx/src/main/java/com/njcn/influx/pojo/dto/EventDataSetDTO.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package com.njcn.influx.pojo.dto;
-
-import lombok.Data;
-
-import java.util.List;
-
-/**
- * Description:
- * Date: 2023/9/6 9:52【需求编号】
- *
- * @author clam
- * @version V1.0.0
- */
-@Data
-public class EventDataSetDTO {
- private String name;
- private String value;
- private String type;
-
- private String unit;
-
- private String showName;
-}
diff --git a/pqs-influx/src/main/java/com/njcn/influx/pojo/dto/EventQueryDTO.java b/pqs-influx/src/main/java/com/njcn/influx/pojo/dto/EventQueryDTO.java
deleted file mode 100644
index adfbc2fff..000000000
--- a/pqs-influx/src/main/java/com/njcn/influx/pojo/dto/EventQueryDTO.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.njcn.influx.pojo.dto;
-
-import lombok.Data;
-
-import java.util.List;
-
-/**
- * Description:
- * Date: 2023/8/30 18:38【需求编号】
- *
- * @author clam
- * @version V1.0.0
- */
-@Data
-@Deprecated
-public class EventQueryDTO {
- private String devId;
- private List lineIds;
- private List target;
-}
diff --git a/pqs-influx/src/main/java/com/njcn/influx/pojo/dto/HarmData.java b/pqs-influx/src/main/java/com/njcn/influx/pojo/dto/HarmData.java
deleted file mode 100644
index 309226edf..000000000
--- a/pqs-influx/src/main/java/com/njcn/influx/pojo/dto/HarmData.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.njcn.influx.pojo.dto;
-
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.njcn.influx.ano.IgnoreData;
-import com.njcn.influx.utils.InstantDateDeserializer;
-import com.njcn.influx.utils.InstantDateSerializer;
-import lombok.Data;
-import org.influxdb.annotation.Column;
-import org.influxdb.annotation.Measurement;
-
-import java.io.Serializable;
-import java.time.Instant;
-
-/**
- * @author hongawen
- * @version 1.0.0
- * @date 2023年07月19日 09:43
- */
-@Data
-public class HarmData implements Serializable{
-
-
- @Column(name = "time")
- @JsonSerialize(using = InstantDateSerializer.class)
- @JsonDeserialize(using = InstantDateDeserializer.class)
- private Instant time;
-
- @IgnoreData(value = true)
- private Float value;
-
-
-}
diff --git a/pqs-influx/src/main/java/com/njcn/influx/pojo/dto/HarmHistoryDataDTO.java b/pqs-influx/src/main/java/com/njcn/influx/pojo/dto/HarmHistoryDataDTO.java
deleted file mode 100644
index cc935fc67..000000000
--- a/pqs-influx/src/main/java/com/njcn/influx/pojo/dto/HarmHistoryDataDTO.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.njcn.influx.pojo.dto;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * @author hongawen
- * @version 1.0.0
- * @date 2023年07月19日 09:40
- */
-@Data
-@NoArgsConstructor
-@AllArgsConstructor
-public class HarmHistoryDataDTO implements Serializable {
-
- private List historyData = new ArrayList<>();
-
- private float overLimit;
-}
diff --git a/pqs-influx/src/main/java/com/njcn/influx/pojo/dto/StatisticalDataDTO.java b/pqs-influx/src/main/java/com/njcn/influx/pojo/dto/StatisticalDataDTO.java
deleted file mode 100644
index 066ae65cb..000000000
--- a/pqs-influx/src/main/java/com/njcn/influx/pojo/dto/StatisticalDataDTO.java
+++ /dev/null
@@ -1,70 +0,0 @@
-package com.njcn.influx.pojo.dto;
-
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.njcn.influx.utils.InstantDateSerializer;
-import lombok.Data;
-import org.influxdb.annotation.Column;
-
-import java.time.Instant;
-
-/**
- * Description:
- * Date: 2023/6/5 10:23【需求编号】
- *
- * @author clam
- * @version V1.0.0
- */
-
-
-@Data
-public class StatisticalDataDTO {
-
- @Column(name = "time")
- @JsonSerialize(using = InstantDateSerializer.class)
- private Instant time;
-
- @Column(name = "line_id")
- private String lineId;
-
- @Column(name = "phasic_type")
- private String phaseType;
-
- @Column(name = "value_type")
- private String valueType;
-
- @Column(name = "cl_did")
- private String clDid;
-
-
- /**
- * 指标值
- */
- private Double value;
-
- /**
- * 指标名称
- */
- private String statisticalName;
-
- /**
- * 指标
- */
- private String target;
-
- /**
- * 指标最大值
- */
- private Double maxValue;
-
- /**
- * 指标最小值
- */
- private Double minValue;
-
- /**
- * 指标平均值
- */
- private Double avgValue;
-
-
-}
diff --git a/pqs-influx/src/main/java/com/njcn/influx/pojo/po/CldStatisFlow.java b/pqs-influx/src/main/java/com/njcn/influx/pojo/po/CldStatisFlow.java
deleted file mode 100644
index 25903cf15..000000000
--- a/pqs-influx/src/main/java/com/njcn/influx/pojo/po/CldStatisFlow.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package com.njcn.influx.pojo.po;
-
-
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.njcn.influx.utils.InstantDateSerializer;
-import lombok.Data;
-import org.influxdb.annotation.Column;
-import org.influxdb.annotation.Measurement;
-
-import java.time.Instant;
-
-/**
- * @author hongawen
- */
-@Data
-@Measurement(name = "cld_statis_flow")
-public class CldStatisFlow {
-
- @Column(name="time")
- @JsonSerialize(using = InstantDateSerializer.class)
- private Instant time;
-
- @Column(name="actual_value")
- private Integer actualValue;
-
- @Column(name="dev_id")
- private String devId;
-
-}
diff --git a/pqs-influx/src/main/java/com/njcn/influx/pojo/po/DataFlicker.java b/pqs-influx/src/main/java/com/njcn/influx/pojo/po/DataFlicker.java
deleted file mode 100644
index f69ced884..000000000
--- a/pqs-influx/src/main/java/com/njcn/influx/pojo/po/DataFlicker.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package com.njcn.influx.pojo.po;
-
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.njcn.influx.utils.InstantDateSerializer;
-import lombok.Data;
-import org.influxdb.annotation.Column;
-import org.influxdb.annotation.Measurement;
-import org.influxdb.annotation.TimeColumn;
-
-import java.time.Instant;
-
-/**
- * 类的介绍:
- *
- * @author xuyang
- * @version 1.0.0
- */
-@Data
-@Measurement(name = "data_flicker")
-public class DataFlicker {
-
- @TimeColumn
- @Column(name = "time", tag = true)
- @JsonSerialize(using = InstantDateSerializer.class)
- private Instant time;
-
- @Column(name = "fluc")
- private Double fluc;
-
- @Column(name = "line_id", tag = true)
- private String lineId;
-
- @Column(name = "phasic_type", tag = true)
- private String phaseType;
-
- @Column(name = "plt")
- private Double plt;
-
- @Column(name = "pst")
- private Double pst;
-
- @Column(name = "quality_flag", tag = true)
- private String qualityFlag;
-
-
- //自定义字段
- @Column(name = "value_type")
- private String valueType;
-
- @Column(name = "count")
- private Integer count;
-
- @Column(name = "pst_count")
- private Integer pstCount;
-
- @Column(name = "plt_count")
- private Integer pltCount;
-
-}
diff --git a/pqs-influx/src/main/java/com/njcn/influx/pojo/po/DataFluc.java b/pqs-influx/src/main/java/com/njcn/influx/pojo/po/DataFluc.java
deleted file mode 100644
index 80cee12b9..000000000
--- a/pqs-influx/src/main/java/com/njcn/influx/pojo/po/DataFluc.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package com.njcn.influx.pojo.po;
-
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.njcn.influx.utils.InstantDateSerializer;
-import lombok.Data;
-import org.influxdb.annotation.Column;
-import org.influxdb.annotation.Measurement;
-
-import java.time.Instant;
-
-/**
- * 类的介绍:
- *
- * @author xuyang
- * @version 1.0.0
- */
-@Data
-@Measurement(name = "data_fluc")
-public class DataFluc {
-
- @Column(name = "time")
- @JsonSerialize(using = InstantDateSerializer.class)
- private Instant time;
-
- @Column(name = "fluc")
- private Double fluc;
-
- @Column(name = "fluccf")
- private Double fluccf;
-
- @Column(name = "line_id",tag = true)
- private String lineId;
-
- @Column(name = "phasic_type",tag = true)
- private String phaseType;
-
- @Column(name = "quality_flag",tag = true)
- private String qualityFlag;
-
- @Column(name = "value_type",tag = true)
- private String valueType;
-
-}
diff --git a/pqs-influx/src/main/java/com/njcn/influx/pojo/po/DataHarmPhasicI.java b/pqs-influx/src/main/java/com/njcn/influx/pojo/po/DataHarmPhasicI.java
deleted file mode 100644
index e602e87e0..000000000
--- a/pqs-influx/src/main/java/com/njcn/influx/pojo/po/DataHarmPhasicI.java
+++ /dev/null
@@ -1,187 +0,0 @@
-package com.njcn.influx.pojo.po;
-
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.njcn.influx.utils.InstantDateSerializer;
-import lombok.Data;
-import org.influxdb.annotation.Column;
-import org.influxdb.annotation.Measurement;
-
-import java.time.Instant;
-
-/**
- * 类的介绍:
- *
- * @author xuyang
- * @version 1.0.0
- */
-@Data
-@Measurement(name = "data_harmphasic_i")
-public class DataHarmPhasicI {
-
- @Column(name = "time")
- @JsonSerialize(using = InstantDateSerializer.class)
- private Instant time;
-
- @Column(name = "line_id",tag = true)
- private String lineId;
-
- @Column(name = "phasic_type",tag = true)
- private String phaseType;
-
- @Column(name = "quality_flag",tag = true)
- private String qualityFlag;
-
- @Column(name = "value_type",tag = true)
- private String valueType;
-
- @Column(name = "i_1")
- private Double i1;
-
- @Column(name = "i_2")
- private Double i2;
-
- @Column(name = "i_3")
- private Double i3;
-
- @Column(name = "i_4")
- private Double i4;
-
- @Column(name = "i_5")
- private Double i5;
-
- @Column(name = "i_6")
- private Double i6;
-
- @Column(name = "i_7")
- private Double i7;
-
- @Column(name = "i_8")
- private Double i8;
-
- @Column(name = "i_9")
- private Double i9;
-
- @Column(name = "i_10")
- private Double i10;
-
- @Column(name = "i_11")
- private Double i11;
-
- @Column(name = "i_12")
- private Double i12;
-
- @Column(name = "i_13")
- private Double i13;
-
- @Column(name = "i_14")
- private Double i14;
-
- @Column(name = "i_15")
- private Double i15;
-
- @Column(name = "i_16")
- private Double i16;
-
- @Column(name = "i_17")
- private Double i17;
-
- @Column(name = "i_18")
- private Double i18;
-
- @Column(name = "i_19")
- private Double i19;
-
- @Column(name = "i_20")
- private Double i20;
-
- @Column(name = "i_21")
- private Double i21;
-
- @Column(name = "i_22")
- private Double i22;
-
- @Column(name = "i_23")
- private Double i23;
-
- @Column(name = "i_24")
- private Double i24;
-
- @Column(name = "i_25")
- private Double i25;
-
- @Column(name = "i_26")
- private Double i26;
-
- @Column(name = "i_27")
- private Double i27;
-
- @Column(name = "i_28")
- private Double i28;
-
- @Column(name = "i_29")
- private Double i29;
-
- @Column(name = "i_30")
- private Double i30;
-
- @Column(name = "i_31")
- private Double i31;
-
- @Column(name = "i_32")
- private Double i32;
-
- @Column(name = "i_33")
- private Double i33;
-
- @Column(name = "i_34")
- private Double i34;
-
- @Column(name = "i_35")
- private Double i35;
-
- @Column(name = "i_36")
- private Double i36;
-
- @Column(name = "i_37")
- private Double i37;
-
- @Column(name = "i_38")
- private Double i38;
-
- @Column(name = "i_39")
- private Double i39;
-
- @Column(name = "i_40")
- private Double i40;
-
- @Column(name = "i_41")
- private Double i41;
-
- @Column(name = "i_42")
- private Double i42;
-
- @Column(name = "i_43")
- private Double i43;
-
- @Column(name = "i_44")
- private Double i44;
-
- @Column(name = "i_45")
- private Double i45;
-
- @Column(name = "i_46")
- private Double i46;
-
- @Column(name = "i_47")
- private Double i47;
-
- @Column(name = "i_48")
- private Double i48;
-
- @Column(name = "i_49")
- private Double i49;
-
- @Column(name = "i_50")
- private Double i50;
-
-}
diff --git a/pqs-influx/src/main/java/com/njcn/influx/pojo/po/DataHarmPhasicV.java b/pqs-influx/src/main/java/com/njcn/influx/pojo/po/DataHarmPhasicV.java
deleted file mode 100644
index ac9ac9262..000000000
--- a/pqs-influx/src/main/java/com/njcn/influx/pojo/po/DataHarmPhasicV.java
+++ /dev/null
@@ -1,190 +0,0 @@
-package com.njcn.influx.pojo.po;
-
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.njcn.influx.utils.InstantDateSerializer;
-import lombok.Data;
-import org.influxdb.annotation.Column;
-import org.influxdb.annotation.Measurement;
-import org.influxdb.annotation.TimeColumn;
-
-import java.time.Instant;
-
-/**
- * 类的介绍:
- *
- * @author xuyang
- * @version 1.0.0
- * @createTime 2022/5/12 9:13
- */
-@Data
-@Measurement(name = "data_harmphasic_v")
-public class DataHarmPhasicV {
-
- @TimeColumn
- @Column(name = "time", tag = true)
- @JsonSerialize(using = InstantDateSerializer.class)
- private Instant time;
-
- @Column(name = "line_id", tag = true)
- private String lineId;
-
- @Column(name = "phasic_type", tag = true)
- private String phaseType;
-
- @Column(name = "quality_flag", tag = true)
- private String qualityFlag;
-
- @Column(name = "value_type", tag = true)
- private String valueType;
-
- @Column(name = "v_1")
- private Double v1;
-
- @Column(name = "v_2")
- private Double v2;
-
- @Column(name = "v_3")
- private Double v3;
-
- @Column(name = "v_4")
- private Double v4;
-
- @Column(name = "v_5")
- private Double v5;
-
- @Column(name = "v_6")
- private Double v6;
-
- @Column(name = "v_7")
- private Double v7;
-
- @Column(name = "v_8")
- private Double v8;
-
- @Column(name = "v_9")
- private Double v9;
-
- @Column(name = "v_10")
- private Double v10;
-
- @Column(name = "v_11")
- private Double v11;
-
- @Column(name = "v_12")
- private Double v12;
-
- @Column(name = "v_13")
- private Double v13;
-
- @Column(name = "v_14")
- private Double v14;
-
- @Column(name = "v_15")
- private Double v15;
-
- @Column(name = "v_16")
- private Double v16;
-
- @Column(name = "v_17")
- private Double v17;
-
- @Column(name = "v_18")
- private Double v18;
-
- @Column(name = "v_19")
- private Double v19;
-
- @Column(name = "v_20")
- private Double v20;
-
- @Column(name = "v_21")
- private Double v21;
-
- @Column(name = "v_22")
- private Double v22;
-
- @Column(name = "v_23")
- private Double v23;
-
- @Column(name = "v_24")
- private Double v24;
-
- @Column(name = "v_25")
- private Double v25;
-
- @Column(name = "v_26")
- private Double v26;
-
- @Column(name = "v_27")
- private Double v27;
-
- @Column(name = "v_28")
- private Double v28;
-
- @Column(name = "v_29")
- private Double v29;
-
- @Column(name = "v_30")
- private Double v30;
-
- @Column(name = "v_31")
- private Double v31;
-
- @Column(name = "v_32")
- private Double v32;
-
- @Column(name = "v_33")
- private Double v33;
-
- @Column(name = "v_34")
- private Double v34;
-
- @Column(name = "v_35")
- private Double v35;
-
- @Column(name = "v_36")
- private Double v36;
-
- @Column(name = "v_37")
- private Double v37;
-
- @Column(name = "v_38")
- private Double v38;
-
- @Column(name = "v_39")
- private Double v39;
-
- @Column(name = "v_40")
- private Double v40;
-
- @Column(name = "v_41")
- private Double v41;
-
- @Column(name = "v_42")
- private Double v42;
-
- @Column(name = "v_43")
- private Double v43;
-
- @Column(name = "v_44")
- private Double v44;
-
- @Column(name = "v_45")
- private Double v45;
-
- @Column(name = "v_46")
- private Double v46;
-
- @Column(name = "v_47")
- private Double v47;
-
- @Column(name = "v_48")
- private Double v48;
-
- @Column(name = "v_49")
- private Double v49;
-
- @Column(name = "v_50")
- private Double v50;
-
-}
diff --git a/pqs-influx/src/main/java/com/njcn/influx/pojo/po/DataHarmPowerP.java b/pqs-influx/src/main/java/com/njcn/influx/pojo/po/DataHarmPowerP.java
deleted file mode 100644
index e1dbe5346..000000000
--- a/pqs-influx/src/main/java/com/njcn/influx/pojo/po/DataHarmPowerP.java
+++ /dev/null
@@ -1,196 +0,0 @@
-package com.njcn.influx.pojo.po;
-
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.njcn.influx.utils.InstantDateSerializer;
-import lombok.Data;
-import org.influxdb.annotation.Column;
-import org.influxdb.annotation.Measurement;
-
-import java.time.Instant;
-
-/**
- * 类的介绍:
- *
- * @author xuyang
- * @version 1.0.0
- * @createTime 2022/5/12 9:13
- */
-@Data
-@Measurement(name = "data_harmpower_p")
-public class DataHarmPowerP {
-
- @Column(name = "time")
- @JsonSerialize(using = InstantDateSerializer.class)
- private Instant time;
-
- @Column(name = "line_id",tag = true)
- private String lineId;
-
- @Column(name = "phasic_type",tag = true)
- private String phaseType;
-
- @Column(name = "quality_flag",tag = true)
- private String qualityFlag;
-
- @Column(name = "value_type",tag = true)
- private String valueType;
-
- @Column(name = "df")
- private Double df;
-
- @Column(name = "pf")
- private Double pf;
-
- @Column(name = "p")
- private Double p;
-
- @Column(name = "p_1")
- private Double p1;
-
- @Column(name = "p_2")
- private Double p2;
-
- @Column(name = "p_3")
- private Double p3;
-
- @Column(name = "p_4")
- private Double p4;
-
- @Column(name = "p_5")
- private Double p5;
-
- @Column(name = "p_6")
- private Double p6;
-
- @Column(name = "p_7")
- private Double p7;
-
- @Column(name = "p_8")
- private Double p8;
-
- @Column(name = "p_9")
- private Double p9;
-
- @Column(name = "p_10")
- private Double p10;
-
- @Column(name = "p_11")
- private Double p11;
-
- @Column(name = "p_12")
- private Double p12;
-
- @Column(name = "p_13")
- private Double p13;
-
- @Column(name = "p_14")
- private Double p14;
-
- @Column(name = "p_15")
- private Double p15;
-
- @Column(name = "p_16")
- private Double p16;
-
- @Column(name = "p_17")
- private Double p17;
-
- @Column(name = "p_18")
- private Double p18;
-
- @Column(name = "p_19")
- private Double p19;
-
- @Column(name = "p_20")
- private Double p20;
-
- @Column(name = "p_21")
- private Double p21;
-
- @Column(name = "p_22")
- private Double p22;
-
- @Column(name = "p_23")
- private Double p23;
-
- @Column(name = "p_24")
- private Double p24;
-
- @Column(name = "p_25")
- private Double p25;
-
- @Column(name = "p_26")
- private Double p26;
-
- @Column(name = "p_27")
- private Double p27;
-
- @Column(name = "p_28")
- private Double p28;
-
- @Column(name = "p_29")
- private Double p29;
-
- @Column(name = "p_30")
- private Double p30;
-
- @Column(name = "p_31")
- private Double p31;
-
- @Column(name = "p_32")
- private Double p32;
-
- @Column(name = "p_33")
- private Double p33;
-
- @Column(name = "p_34")
- private Double p34;
-
- @Column(name = "p_35")
- private Double p35;
-
- @Column(name = "p_36")
- private Double p36;
-
- @Column(name = "p_37")
- private Double p37;
-
- @Column(name = "p_38")
- private Double p38;
-
- @Column(name = "p_39")
- private Double p39;
-
- @Column(name = "p_40")
- private Double p40;
-
- @Column(name = "p_41")
- private Double p41;
-
- @Column(name = "p_42")
- private Double p42;
-
- @Column(name = "p_43")
- private Double p43;
-
- @Column(name = "p_44")
- private Double p44;
-
- @Column(name = "p_45")
- private Double p45;
-
- @Column(name = "p_46")
- private Double p46;
-
- @Column(name = "p_47")
- private Double p47;
-
- @Column(name = "p_48")
- private Double p48;
-
- @Column(name = "p_49")
- private Double p49;
-
- @Column(name = "p_50")
- private Double p50;
-}
diff --git a/pqs-influx/src/main/java/com/njcn/influx/pojo/po/DataHarmPowerQ.java b/pqs-influx/src/main/java/com/njcn/influx/pojo/po/DataHarmPowerQ.java
deleted file mode 100644
index 34b7103a2..000000000
--- a/pqs-influx/src/main/java/com/njcn/influx/pojo/po/DataHarmPowerQ.java
+++ /dev/null
@@ -1,192 +0,0 @@
-package com.njcn.influx.pojo.po;
-
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.njcn.influx.utils.InstantDateSerializer;
-import lombok.Data;
-import org.influxdb.annotation.Column;
-import org.influxdb.annotation.Measurement;
-
-import java.time.Instant;
-
-/**
- * 类的介绍:
- *
- * @author xuyang
- * @version 1.0.0
- * @createTime 2022/5/12 9:13
- */
-@Data
-@Measurement(name = "data_harmpower_q")
-public class DataHarmPowerQ {
-
- @Column(name = "time")
- @JsonSerialize(using = InstantDateSerializer.class)
- private Instant time;
-
- @Column(name = "line_id", tag = true)
- private String lineId;
-
- @Column(name = "phasic_type", tag = true)
- private String phaseType;
-
- @Column(name = "quality_flag", tag = true)
- private String qualityFlag;
-
- @Column(name = "value_type", tag = true)
- private String valueType;
-
-
- @Column(name = "q")
- private Double q;
-
- @Column(name = "q_1")
- private Double q1;
-
- @Column(name = "q_2")
- private Double q2;
-
- @Column(name = "q_3")
- private Double q3;
-
- @Column(name = "q_4")
- private Double q4;
-
- @Column(name = "q_5")
- private Double q5;
-
- @Column(name = "q_6")
- private Double q6;
-
- @Column(name = "q_7")
- private Double q7;
-
- @Column(name = "q_8")
- private Double q8;
-
- @Column(name = "q_9")
- private Double q9;
-
- @Column(name = "q_10")
- private Double q10;
-
- @Column(name = "q_11")
- private Double q11;
-
- @Column(name = "q_12")
- private Double q12;
-
- @Column(name = "q_13")
- private Double q13;
-
- @Column(name = "q_14")
- private Double q14;
-
- @Column(name = "q_15")
- private Double q15;
-
- @Column(name = "q_16")
- private Double q16;
-
- @Column(name = "q_17")
- private Double q17;
-
- @Column(name = "q_18")
- private Double q18;
-
- @Column(name = "q_19")
- private Double q19;
-
- @Column(name = "q_20")
- private Double q20;
-
- @Column(name = "q_21")
- private Double q21;
-
- @Column(name = "q_22")
- private Double q22;
-
- @Column(name = "q_23")
- private Double q23;
-
- @Column(name = "q_24")
- private Double q24;
-
- @Column(name = "q_25")
- private Double q25;
-
- @Column(name = "q_26")
- private Double q26;
-
- @Column(name = "q_27")
- private Double q27;
-
- @Column(name = "q_28")
- private Double q28;
-
- @Column(name = "q_29")
- private Double q29;
-
- @Column(name = "q_30")
- private Double q30;
-
- @Column(name = "q_31")
- private Double q31;
-
- @Column(name = "q_32")
- private Double q32;
-
- @Column(name = "q_33")
- private Double q33;
-
- @Column(name = "q_34")
- private Double q34;
-
- @Column(name = "q_35")
- private Double q35;
-
- @Column(name = "q_36")
- private Double q36;
-
- @Column(name = "q_37")
- private Double q37;
-
- @Column(name = "q_38")
- private Double q38;
-
- @Column(name = "q_39")
- private Double q39;
-
- @Column(name = "q_40")
- private Double q40;
-
- @Column(name = "q_41")
- private Double q41;
-
- @Column(name = "q_42")
- private Double q42;
-
- @Column(name = "q_43")
- private Double q43;
-
- @Column(name = "q_44")
- private Double q44;
-
- @Column(name = "q_45")
- private Double q45;
-
- @Column(name = "q_46")
- private Double q46;
-
- @Column(name = "q_47")
- private Double q47;
-
- @Column(name = "q_48")
- private Double q48;
-
- @Column(name = "q_49")
- private Double q49;
-
- @Column(name = "q_50")
- private Double q50;
-
-}
diff --git a/pqs-influx/src/main/java/com/njcn/influx/pojo/po/DataHarmPowerS.java b/pqs-influx/src/main/java/com/njcn/influx/pojo/po/DataHarmPowerS.java
deleted file mode 100644
index 2e0d210c3..000000000
--- a/pqs-influx/src/main/java/com/njcn/influx/pojo/po/DataHarmPowerS.java
+++ /dev/null
@@ -1,191 +0,0 @@
-package com.njcn.influx.pojo.po;
-
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.njcn.influx.utils.InstantDateSerializer;
-import lombok.Data;
-import org.influxdb.annotation.Column;
-import org.influxdb.annotation.Measurement;
-
-import java.time.Instant;
-
-/**
- * 类的介绍:
- *
- * @author xuyang
- * @version 1.0.0
- * @createTime 2022/5/12 9:13
- */
-@Data
-@Measurement(name = "data_harmpower_s")
-public class DataHarmPowerS {
-
- @Column(name = "time")
- @JsonSerialize(using = InstantDateSerializer.class)
- private Instant time;
-
- @Column(name = "line_id",tag = true)
- private String lineId;
-
- @Column(name = "phasic_type",tag = true)
- private String phaseType;
-
- @Column(name = "quality_flag",tag = true)
- private String qualityFlag;
-
- @Column(name = "value_type",tag = true)
- private String valueType;
-
- @Column(name = "s")
- private Double s;
-
- @Column(name = "s_1")
- private Double s1;
-
- @Column(name = "s_2")
- private Double s2;
-
- @Column(name = "s_3")
- private Double s3;
-
- @Column(name = "s_4")
- private Double s4;
-
- @Column(name = "s_5")
- private Double s5;
-
- @Column(name = "s_6")
- private Double s6;
-
- @Column(name = "s_7")
- private Double s7;
-
- @Column(name = "s_8")
- private Double s8;
-
- @Column(name = "s_9")
- private Double s9;
-
- @Column(name = "s_10")
- private Double s10;
-
- @Column(name = "s_11")
- private Double s11;
-
- @Column(name = "s_12")
- private Double s12;
-
- @Column(name = "s_13")
- private Double s13;
-
- @Column(name = "s_14")
- private Double s14;
-
- @Column(name = "s_15")
- private Double s15;
-
- @Column(name = "s_16")
- private Double s16;
-
- @Column(name = "s_17")
- private Double s17;
-
- @Column(name = "s_18")
- private Double s18;
-
- @Column(name = "s_19")
- private Double s19;
-
- @Column(name = "s_20")
- private Double s20;
-
- @Column(name = "s_21")
- private Double s21;
-
- @Column(name = "s_22")
- private Double s22;
-
- @Column(name = "s_23")
- private Double s23;
-
- @Column(name = "s_24")
- private Double s24;
-
- @Column(name = "s_25")
- private Double s25;
-
- @Column(name = "s_26")
- private Double s26;
-
- @Column(name = "s_27")
- private Double s27;
-
- @Column(name = "s_28")
- private Double s28;
-
- @Column(name = "s_29")
- private Double s29;
-
- @Column(name = "s_30")
- private Double s30;
-
- @Column(name = "s_31")
- private Double s31;
-
- @Column(name = "s_32")
- private Double s32;
-
- @Column(name = "s_33")
- private Double s33;
-
- @Column(name = "s_34")
- private Double s34;
-
- @Column(name = "s_35")
- private Double s35;
-
- @Column(name = "s_36")
- private Double s36;
-
- @Column(name = "s_37")
- private Double s37;
-
- @Column(name = "s_38")
- private Double s38;
-
- @Column(name = "s_39")
- private Double s39;
-
- @Column(name = "s_40")
- private Double s40;
-
- @Column(name = "s_41")
- private Double s41;
-
- @Column(name = "s_42")
- private Double s42;
-
- @Column(name = "s_43")
- private Double s43;
-
- @Column(name = "s_44")
- private Double s44;
-
- @Column(name = "s_45")
- private Double s45;
-
- @Column(name = "s_46")
- private Double s46;
-
- @Column(name = "s_47")
- private Double s47;
-
- @Column(name = "s_48")
- private Double s48;
-
- @Column(name = "s_49")
- private Double s49;
-
- @Column(name = "s_50")
- private Double s50;
-
-}
diff --git a/pqs-influx/src/main/java/com/njcn/influx/pojo/po/DataHarmRateI.java b/pqs-influx/src/main/java/com/njcn/influx/pojo/po/DataHarmRateI.java
deleted file mode 100644
index 737b11507..000000000
--- a/pqs-influx/src/main/java/com/njcn/influx/pojo/po/DataHarmRateI.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.njcn.influx.pojo.po;
-
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import org.influxdb.annotation.Measurement;
-
-/**
- * 类的介绍:
- *
- * @author xuyang
- * @version 1.0.0
- * @createTime 2022/5/12 11:27
- */
-@EqualsAndHashCode(callSuper = true)
-@Data
-@Measurement(name = "data_harmrate_i")
-public class DataHarmRateI extends DataHarmPhasicI{
-}
diff --git a/pqs-influx/src/main/java/com/njcn/influx/pojo/po/DataHarmRateV.java b/pqs-influx/src/main/java/com/njcn/influx/pojo/po/DataHarmRateV.java
deleted file mode 100644
index 799bec602..000000000
--- a/pqs-influx/src/main/java/com/njcn/influx/pojo/po/DataHarmRateV.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.njcn.influx.pojo.po;
-
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import org.influxdb.annotation.Measurement;
-
-/**
- * 类的介绍:
- *
- * @author xuyang
- * @version 1.0.0
- * @createTime 2022/5/12 11:27
- */
-@EqualsAndHashCode(callSuper = true)
-@Data
-@Measurement(name = "data_harmrate_v")
-public class DataHarmRateV extends DataHarmPhasicV{
-}
diff --git a/pqs-influx/src/main/java/com/njcn/influx/pojo/po/DataI.java b/pqs-influx/src/main/java/com/njcn/influx/pojo/po/DataI.java
deleted file mode 100644
index be313633d..000000000
--- a/pqs-influx/src/main/java/com/njcn/influx/pojo/po/DataI.java
+++ /dev/null
@@ -1,208 +0,0 @@
-package com.njcn.influx.pojo.po;
-
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.njcn.influx.utils.InstantDateSerializer;
-import lombok.Data;
-import org.influxdb.annotation.Column;
-import org.influxdb.annotation.Measurement;
-import org.influxdb.annotation.TimeColumn;
-
-import java.time.Instant;
-
-/**
- * 类的介绍:
- *
- * @author xuyang
- * @version 1.0.0
- * @createTime 2022/5/11 15:13
- */
-@Data
-@Measurement(name = "data_i")
-public class DataI {
-
- @TimeColumn
- @Column(name = "time", tag = true)
- @JsonSerialize(using = InstantDateSerializer.class)
- private Instant time;
-
- @Column(name = "line_id", tag = true)
- private String lineId;
-
- @Column(name = "phasic_type", tag = true)
- private String phaseType;
-
- @Column(name = "quality_flag", tag = true)
- private String qualityFlag;
-
- @Column(name = "value_type", tag = true)
- private String valueType;
-
- @Column(name = "i_neg")
- private Double iNeg;
-
- @Column(name = "i_pos")
- private Double iPos;
-
- @Column(name = "i_thd")
- private Double iThd;
-
- @Column(name = "i_unbalance")
- private Double iUnbalance;
-
- @Column(name = "i_zero")
- private Double iZero;
-
- @Column(name = "rms")
- private Double rms;
-
- @Column(name = "i_1")
- private Double i1;
-
- @Column(name = "i_2")
- private Double i2;
-
- @Column(name = "i_3")
- private Double i3;
-
- @Column(name = "i_4")
- private Double i4;
-
- @Column(name = "i_5")
- private Double i5;
-
- @Column(name = "i_6")
- private Double i6;
-
- @Column(name = "i_7")
- private Double i7;
-
- @Column(name = "i_8")
- private Double i8;
-
- @Column(name = "i_9")
- private Double i9;
-
- @Column(name = "i_10")
- private Double i10;
-
- @Column(name = "i_11")
- private Double i11;
-
- @Column(name = "i_12")
- private Double i12;
-
- @Column(name = "i_13")
- private Double i13;
-
- @Column(name = "i_14")
- private Double i14;
-
- @Column(name = "i_15")
- private Double i15;
-
- @Column(name = "i_16")
- private Double i16;
-
- @Column(name = "i_17")
- private Double i17;
-
- @Column(name = "i_18")
- private Double i18;
-
- @Column(name = "i_19")
- private Double i19;
-
- @Column(name = "i_20")
- private Double i20;
-
- @Column(name = "i_21")
- private Double i21;
-
- @Column(name = "i_22")
- private Double i22;
-
- @Column(name = "i_23")
- private Double i23;
-
- @Column(name = "i_24")
- private Double i24;
-
- @Column(name = "i_25")
- private Double i25;
-
- @Column(name = "i_26")
- private Double i26;
-
- @Column(name = "i_27")
- private Double i27;
-
- @Column(name = "i_28")
- private Double i28;
-
- @Column(name = "i_29")
- private Double i29;
-
- @Column(name = "i_30")
- private Double i30;
-
- @Column(name = "i_31")
- private Double i31;
-
- @Column(name = "i_32")
- private Double i32;
-
- @Column(name = "i_33")
- private Double i33;
-
- @Column(name = "i_34")
- private Double i34;
-
- @Column(name = "i_35")
- private Double i35;
-
- @Column(name = "i_36")
- private Double i36;
-
- @Column(name = "i_37")
- private Double i37;
-
- @Column(name = "i_38")
- private Double i38;
-
- @Column(name = "i_39")
- private Double i39;
-
- @Column(name = "i_40")
- private Double i40;
-
- @Column(name = "i_41")
- private Double i41;
-
- @Column(name = "i_42")
- private Double i42;
-
- @Column(name = "i_43")
- private Double i43;
-
- @Column(name = "i_44")
- private Double i44;
-
- @Column(name = "i_45")
- private Double i45;
-
- @Column(name = "i_46")
- private Double i46;
-
- @Column(name = "i_47")
- private Double i47;
-
- @Column(name = "i_48")
- private Double i48;
-
- @Column(name = "i_49")
- private Double i49;
-
- @Column(name = "i_50")
- private Double i50;
-
-}
diff --git a/pqs-influx/src/main/java/com/njcn/influx/pojo/po/DataInHarmI.java b/pqs-influx/src/main/java/com/njcn/influx/pojo/po/DataInHarmI.java
deleted file mode 100644
index f0783b664..000000000
--- a/pqs-influx/src/main/java/com/njcn/influx/pojo/po/DataInHarmI.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.njcn.influx.pojo.po;
-
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import org.influxdb.annotation.Measurement;
-
-/**
- * 类的介绍:
- *
- * @author xuyang
- * @version 1.0.0
- * @createTime 2022/5/12 11:27
- */
-@EqualsAndHashCode(callSuper = true)
-@Data
-@Measurement(name = "data_inharm_i")
-public class DataInHarmI extends DataHarmPhasicI{
-
-
-}
diff --git a/pqs-influx/src/main/java/com/njcn/influx/pojo/po/DataInHarmRateI.java b/pqs-influx/src/main/java/com/njcn/influx/pojo/po/DataInHarmRateI.java
deleted file mode 100644
index b901d714e..000000000
--- a/pqs-influx/src/main/java/com/njcn/influx/pojo/po/DataInHarmRateI.java
+++ /dev/null
@@ -1,185 +0,0 @@
-package com.njcn.influx.pojo.po;
-
-import lombok.Data;
-import org.influxdb.annotation.Column;
-import org.influxdb.annotation.Measurement;
-
-import java.time.Instant;
-
-/**
- * 类的介绍:
- *
- * @author xuyang
- * @version 1.0.0
- * @createTime 2022/5/12 9:13
- */
-@Data
-@Measurement(name = "data_inharmrate_i")
-public class DataInHarmRateI {
-
- @Column(name = "time")
- private Instant time;
-
- @Column(name = "line_id",tag = true)
- private String lineId;
-
- @Column(name = "phasic_type",tag = true)
- private String phaseType;
-
- @Column(name = "quality_flag",tag = true)
- private String qualityFlag;
-
- @Column(name = "value_type",tag = true)
- private String valueType;
-
- @Column(name = "i_1")
- private Double i1;
-
- @Column(name = "i_2")
- private Double i2;
-
- @Column(name = "i_3")
- private Double i3;
-
- @Column(name = "i_4")
- private Double i4;
-
- @Column(name = "i_5")
- private Double i5;
-
- @Column(name = "i_6")
- private Double i6;
-
- @Column(name = "i_7")
- private Double i7;
-
- @Column(name = "i_8")
- private Double i8;
-
- @Column(name = "i_9")
- private Double i9;
-
- @Column(name = "i_10")
- private Double i10;
-
- @Column(name = "i_11")
- private Double i11;
-
- @Column(name = "i_12")
- private Double i12;
-
- @Column(name = "i_13")
- private Double i13;
-
- @Column(name = "i_14")
- private Double i14;
-
- @Column(name = "i_15")
- private Double i15;
-
- @Column(name = "i_16")
- private Double i16;
-
- @Column(name = "i_17")
- private Double i17;
-
- @Column(name = "i_18")
- private Double i18;
-
- @Column(name = "i_19")
- private Double i19;
-
- @Column(name = "i_20")
- private Double i20;
-
- @Column(name = "i_21")
- private Double i21;
-
- @Column(name = "i_22")
- private Double i22;
-
- @Column(name = "i_23")
- private Double i23;
-
- @Column(name = "i_24")
- private Double i24;
-
- @Column(name = "i_25")
- private Double i25;
-
- @Column(name = "i_26")
- private Double i26;
-
- @Column(name = "i_27")
- private Double i27;
-
- @Column(name = "i_28")
- private Double i28;
-
- @Column(name = "i_29")
- private Double i29;
-
- @Column(name = "i_30")
- private Double i30;
-
- @Column(name = "i_31")
- private Double i31;
-
- @Column(name = "i_32")
- private Double i32;
-
- @Column(name = "i_33")
- private Double i33;
-
- @Column(name = "i_34")
- private Double i34;
-
- @Column(name = "i_35")
- private Double i35;
-
- @Column(name = "i_36")
- private Double i36;
-
- @Column(name = "i_37")
- private Double i37;
-
- @Column(name = "i_38")
- private Double i38;
-
- @Column(name = "i_39")
- private Double i39;
-
- @Column(name = "i_40")
- private Double i40;
-
- @Column(name = "i_41")
- private Double i41;
-
- @Column(name = "i_42")
- private Double i42;
-
- @Column(name = "i_43")
- private Double i43;
-
- @Column(name = "i_44")
- private Double i44;
-
- @Column(name = "i_45")
- private Double i45;
-
- @Column(name = "i_46")
- private Double i46;
-
- @Column(name = "i_47")
- private Double i47;
-
- @Column(name = "i_48")
- private Double i48;
-
- @Column(name = "i_49")
- private Double i49;
-
- @Column(name = "i_50")
- private Double i50;
-
-}
diff --git a/pqs-influx/src/main/java/com/njcn/influx/pojo/po/DataInHarmRateV.java b/pqs-influx/src/main/java/com/njcn/influx/pojo/po/DataInHarmRateV.java
deleted file mode 100644
index f1b033e11..000000000
--- a/pqs-influx/src/main/java/com/njcn/influx/pojo/po/DataInHarmRateV.java
+++ /dev/null
@@ -1,190 +0,0 @@
-package com.njcn.influx.pojo.po;
-
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.njcn.influx.utils.InstantDateSerializer;
-import lombok.Data;
-import org.influxdb.annotation.Column;
-import org.influxdb.annotation.Measurement;
-import org.influxdb.annotation.TimeColumn;
-
-import java.time.Instant;
-
-/**
- * 类的介绍:
- *
- * @author xuyang
- * @version 1.0.0
- * @createTime 2022/5/12 9:13
- */
-@Data
-@Measurement(name = "data_inharmrate_v")
-public class DataInHarmRateV {
-
- @Column(name = "time", tag = true)
- @TimeColumn
- @JsonSerialize(using = InstantDateSerializer.class)
- private Instant time;
-
- @Column(name = "line_id", tag = true)
- private String lineId;
-
- @Column(name = "phasic_type", tag = true)
- private String phaseType;
-
- @Column(name = "quality_flag", tag = true)
- private String qualityFlag;
-
- @Column(name = "value_type", tag = true)
- private String valueType;
-
- @Column(name = "v_1")
- private Double v1;
-
- @Column(name = "v_2")
- private Double v2;
-
- @Column(name = "v_3")
- private Double v3;
-
- @Column(name = "v_4")
- private Double v4;
-
- @Column(name = "v_5")
- private Double v5;
-
- @Column(name = "v_6")
- private Double v6;
-
- @Column(name = "v_7")
- private Double v7;
-
- @Column(name = "v_8")
- private Double v8;
-
- @Column(name = "v_9")
- private Double v9;
-
- @Column(name = "v_10")
- private Double v10;
-
- @Column(name = "v_11")
- private Double v11;
-
- @Column(name = "v_12")
- private Double v12;
-
- @Column(name = "v_13")
- private Double v13;
-
- @Column(name = "v_14")
- private Double v14;
-
- @Column(name = "v_15")
- private Double v15;
-
- @Column(name = "v_16")
- private Double v16;
-
- @Column(name = "v_17")
- private Double v17;
-
- @Column(name = "v_18")
- private Double v18;
-
- @Column(name = "v_19")
- private Double v19;
-
- @Column(name = "v_20")
- private Double v20;
-
- @Column(name = "v_21")
- private Double v21;
-
- @Column(name = "v_22")
- private Double v22;
-
- @Column(name = "v_23")
- private Double v23;
-
- @Column(name = "v_24")
- private Double v24;
-
- @Column(name = "v_25")
- private Double v25;
-
- @Column(name = "v_26")
- private Double v26;
-
- @Column(name = "v_27")
- private Double v27;
-
- @Column(name = "v_28")
- private Double v28;
-
- @Column(name = "v_29")
- private Double v29;
-
- @Column(name = "v_30")
- private Double v30;
-
- @Column(name = "v_31")
- private Double v31;
-
- @Column(name = "v_32")
- private Double v32;
-
- @Column(name = "v_33")
- private Double v33;
-
- @Column(name = "v_34")
- private Double v34;
-
- @Column(name = "v_35")
- private Double v35;
-
- @Column(name = "v_36")
- private Double v36;
-
- @Column(name = "v_37")
- private Double v37;
-
- @Column(name = "v_38")
- private Double v38;
-
- @Column(name = "v_39")
- private Double v39;
-
- @Column(name = "v_40")
- private Double v40;
-
- @Column(name = "v_41")
- private Double v41;
-
- @Column(name = "v_42")
- private Double v42;
-
- @Column(name = "v_43")
- private Double v43;
-
- @Column(name = "v_44")
- private Double v44;
-
- @Column(name = "v_45")
- private Double v45;
-
- @Column(name = "v_46")
- private Double v46;
-
- @Column(name = "v_47")
- private Double v47;
-
- @Column(name = "v_48")
- private Double v48;
-
- @Column(name = "v_49")
- private Double v49;
-
- @Column(name = "v_50")
- private Double v50;
-
-}
diff --git a/pqs-influx/src/main/java/com/njcn/influx/pojo/po/DataInHarmV.java b/pqs-influx/src/main/java/com/njcn/influx/pojo/po/DataInHarmV.java
deleted file mode 100644
index c2e2f391b..000000000
--- a/pqs-influx/src/main/java/com/njcn/influx/pojo/po/DataInHarmV.java
+++ /dev/null
@@ -1,190 +0,0 @@
-package com.njcn.influx.pojo.po;
-
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.njcn.influx.utils.InstantDateSerializer;
-import lombok.Data;
-import org.influxdb.annotation.Column;
-import org.influxdb.annotation.Measurement;
-import org.influxdb.annotation.TimeColumn;
-
-import java.time.Instant;
-
-/**
- * 类的介绍:
- *
- * @author xuyang
- * @version 1.0.0
- * @createTime 2022/5/12 11:27
- */
-@Data
-@Measurement(name = "data_inharm_v")
-public class DataInHarmV {
-
- @Column(name = "time", tag = true)
- @TimeColumn
- @JsonSerialize(using = InstantDateSerializer.class)
- private Instant time;
-
- @Column(name = "line_id", tag = true)
- private String lineId;
-
- @Column(name = "phasic_type", tag = true)
- private String phaseType;
-
- @Column(name = "quality_flag", tag = true)
- private String qualityFlag;
-
- @Column(name = "value_type", tag = true)
- private String valueType;
-
- @Column(name = "v_1")
- private Double v1;
-
- @Column(name = "v_2")
- private Double v2;
-
- @Column(name = "v_3")
- private Double v3;
-
- @Column(name = "v_4")
- private Double v4;
-
- @Column(name = "v_5")
- private Double v5;
-
- @Column(name = "v_6")
- private Double v6;
-
- @Column(name = "v_7")
- private Double v7;
-
- @Column(name = "v_8")
- private Double v8;
-
- @Column(name = "v_9")
- private Double v9;
-
- @Column(name = "v_10")
- private Double v10;
-
- @Column(name = "v_11")
- private Double v11;
-
- @Column(name = "v_12")
- private Double v12;
-
- @Column(name = "v_13")
- private Double v13;
-
- @Column(name = "v_14")
- private Double v14;
-
- @Column(name = "v_15")
- private Double v15;
-
- @Column(name = "v_16")
- private Double v16;
-
- @Column(name = "v_17")
- private Double v17;
-
- @Column(name = "v_18")
- private Double v18;
-
- @Column(name = "v_19")
- private Double v19;
-
- @Column(name = "v_20")
- private Double v20;
-
- @Column(name = "v_21")
- private Double v21;
-
- @Column(name = "v_22")
- private Double v22;
-
- @Column(name = "v_23")
- private Double v23;
-
- @Column(name = "v_24")
- private Double v24;
-
- @Column(name = "v_25")
- private Double v25;
-
- @Column(name = "v_26")
- private Double v26;
-
- @Column(name = "v_27")
- private Double v27;
-
- @Column(name = "v_28")
- private Double v28;
-
- @Column(name = "v_29")
- private Double v29;
-
- @Column(name = "v_30")
- private Double v30;
-
- @Column(name = "v_31")
- private Double v31;
-
- @Column(name = "v_32")
- private Double v32;
-
- @Column(name = "v_33")
- private Double v33;
-
- @Column(name = "v_34")
- private Double v34;
-
- @Column(name = "v_35")
- private Double v35;
-
- @Column(name = "v_36")
- private Double v36;
-
- @Column(name = "v_37")
- private Double v37;
-
- @Column(name = "v_38")
- private Double v38;
-
- @Column(name = "v_39")
- private Double v39;
-
- @Column(name = "v_40")
- private Double v40;
-
- @Column(name = "v_41")
- private Double v41;
-
- @Column(name = "v_42")
- private Double v42;
-
- @Column(name = "v_43")
- private Double v43;
-
- @Column(name = "v_44")
- private Double v44;
-
- @Column(name = "v_45")
- private Double v45;
-
- @Column(name = "v_46")
- private Double v46;
-
- @Column(name = "v_47")
- private Double v47;
-
- @Column(name = "v_48")
- private Double v48;
-
- @Column(name = "v_49")
- private Double v49;
-
- @Column(name = "v_50")
- private Double v50;
-
-}
diff --git a/pqs-influx/src/main/java/com/njcn/influx/pojo/po/DataPlt.java b/pqs-influx/src/main/java/com/njcn/influx/pojo/po/DataPlt.java
deleted file mode 100644
index d7f56a5d9..000000000
--- a/pqs-influx/src/main/java/com/njcn/influx/pojo/po/DataPlt.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package com.njcn.influx.pojo.po;
-
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.njcn.influx.utils.InstantDateSerializer;
-import lombok.Data;
-import org.influxdb.annotation.Column;
-import org.influxdb.annotation.Measurement;
-import org.influxdb.annotation.TimeColumn;
-
-import java.time.Instant;
-
-/**
- * 类的介绍:
- *
- * @author xuyang
- * @version 1.0.0
- * @createTime 2022/4/12 16:01
- */
-@Data
-@Measurement(name = "data_plt")
-public class DataPlt {
-
- @TimeColumn
- @Column(name = "time", tag = true)
- @JsonSerialize(using = InstantDateSerializer.class)
- private Instant time;
-
- @Column(name = "line_id", tag = true)
- private String lineId;
-
- @Column(name = "phasic_type", tag = true)
- private String phaseType;
-
- @Column(name = "value_type", tag = true)
- private String valueType;
-
- @Column(name = "quality_flag", tag = true)
- private String qualityFlag;
-
- @Column(name = "plt")
- private Double plt;
-
- //自定义字段-闪变总计算次数
- @Column(name = "flicker_all_time")
- private Integer flickerAllTime;
-
- //自定义字段
- @Column(name = "mean")
- private Double mean;
-
-}
diff --git a/pqs-influx/src/main/java/com/njcn/influx/pojo/po/DataV.java b/pqs-influx/src/main/java/com/njcn/influx/pojo/po/DataV.java
deleted file mode 100644
index 32edcfcdb..000000000
--- a/pqs-influx/src/main/java/com/njcn/influx/pojo/po/DataV.java
+++ /dev/null
@@ -1,235 +0,0 @@
-package com.njcn.influx.pojo.po;
-
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.njcn.influx.utils.InstantDateSerializer;
-import lombok.Data;
-import org.influxdb.annotation.Column;
-import org.influxdb.annotation.Measurement;
-import org.influxdb.annotation.TimeColumn;
-
-import java.time.Instant;
-
-/**
- * 类的介绍:
- *
- * @author xuyang
- * @version 1.0.0
- * @createTime 2022/4/7 10:00
- */
-@Data
-@Measurement(name = "data_v")
-public class DataV {
-
- @TimeColumn
- @Column(name = "time", tag = true)
- @JsonSerialize(using = InstantDateSerializer.class)
- private Instant time;
-
- @Column(name = "freq")
- private Double freq;
-
- @Column(name = "freq_dev")
- private Double freqDev;
-
- @Column(name = "quality_flag", tag = true)
- private String qualityFlag;
-
- @Column(name = "rms")
- private Double rms;
-
- @Column(name = "rms_lvr")
- private Double rmsLvr;
-
- @Column(name = "vl_dev")
- private Double vlDev;
-
- @Column(name = "vu_dev")
- private Double vuDev;
-
- @Column(name = "v_1")
- private Double v1;
-
- @Column(name = "v_2")
- private Double v2;
-
- @Column(name = "v_3")
- private Double v3;
-
- @Column(name = "v_4")
- private Double v4;
-
- @Column(name = "v_5")
- private Double v5;
-
- @Column(name = "v_6")
- private Double v6;
-
- @Column(name = "v_7")
- private Double v7;
-
- @Column(name = "v_8")
- private Double v8;
-
- @Column(name = "v_9")
- private Double v9;
-
- @Column(name = "v_10")
- private Double v10;
-
- @Column(name = "v_11")
- private Double v11;
-
- @Column(name = "v_12")
- private Double v12;
-
- @Column(name = "v_13")
- private Double v13;
-
- @Column(name = "v_14")
- private Double v14;
-
- @Column(name = "v_15")
- private Double v15;
-
- @Column(name = "v_16")
- private Double v16;
-
- @Column(name = "v_17")
- private Double v17;
-
- @Column(name = "v_18")
- private Double v18;
-
- @Column(name = "v_19")
- private Double v19;
-
- @Column(name = "v_20")
- private Double v20;
-
- @Column(name = "v_21")
- private Double v21;
-
- @Column(name = "v_22")
- private Double v22;
-
- @Column(name = "v_23")
- private Double v23;
-
- @Column(name = "v_24")
- private Double v24;
-
- @Column(name = "v_25")
- private Double v25;
-
- @Column(name = "v_26")
- private Double v26;
-
- @Column(name = "v_27")
- private Double v27;
-
- @Column(name = "v_28")
- private Double v28;
-
- @Column(name = "v_29")
- private Double v29;
-
- @Column(name = "v_30")
- private Double v30;
-
- @Column(name = "v_31")
- private Double v31;
-
- @Column(name = "v_32")
- private Double v32;
-
- @Column(name = "v_33")
- private Double v33;
-
- @Column(name = "v_34")
- private Double v34;
-
- @Column(name = "v_35")
- private Double v35;
-
- @Column(name = "v_36")
- private Double v36;
-
- @Column(name = "v_37")
- private Double v37;
-
- @Column(name = "v_38")
- private Double v38;
-
- @Column(name = "v_39")
- private Double v39;
-
- @Column(name = "v_40")
- private Double v40;
-
- @Column(name = "v_41")
- private Double v41;
-
- @Column(name = "v_42")
- private Double v42;
-
- @Column(name = "v_43")
- private Double v43;
-
- @Column(name = "v_44")
- private Double v44;
-
- @Column(name = "v_45")
- private Double v45;
-
- @Column(name = "v_46")
- private Double v46;
-
- @Column(name = "v_47")
- private Double v47;
-
- @Column(name = "v_48")
- private Double v48;
-
- @Column(name = "v_49")
- private Double v49;
-
- @Column(name = "v_50")
- private Double v50;
-
- @Column(name = "v_neg")
- private Double vNeg;
-
- @Column(name = "v_pos")
- private Double vPos;
-
- @Column(name = "v_thd")
- private Double vThd;
-
- @Column(name = "v_unbalance")
- private Double vUnbalance;
-
- @Column(name = "v_zero")
- private Double vZero;
-
- @Column(name = "line_id", tag = true)
- private String lineId;
-
- @Column(name = "phasic_type", tag = true)
- private String phasicType;
-
- @Column(name = "value_type", tag = true)
- private String valueType;
-
-
- //自定义字段-总计算次数
- @Column(name = "all_time")
- private Integer allTime;
-
- //自定义字段
- @Column(name = "mean")
- private Double mean;
-
- //自定义字段
- @Column(name = "count")
- private Integer count;
-}
diff --git a/pqs-influx/src/main/java/com/njcn/influx/pojo/po/HarmonicRatioData.java b/pqs-influx/src/main/java/com/njcn/influx/pojo/po/HarmonicRatioData.java
deleted file mode 100644
index f3cf9d448..000000000
--- a/pqs-influx/src/main/java/com/njcn/influx/pojo/po/HarmonicRatioData.java
+++ /dev/null
@@ -1,529 +0,0 @@
-package com.njcn.influx.pojo.po;
-
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.njcn.influx.utils.InstantDateSerializer;
-import lombok.Data;
-import org.influxdb.annotation.Column;
-import org.influxdb.annotation.Measurement;
-
-import java.time.Instant;
-
-/**
- * 类的介绍:
- *
- * @author xuyang
- * @version 1.0.0
- */
-@Data
-@Measurement(name = "harmonic_ratio_data")
-public class HarmonicRatioData {
-
- @Column(name = "time")
- @JsonSerialize(using = InstantDateSerializer.class)
- private Instant time;
-
- @Column(name = "LineId")
- private String lineId;
-
- @Column(name = "Phase")
- private String phase;
-
- @Column(name = "Stat_Method")
- private String statMethod;
- /**
- * 2次谐波电压含有率越限定值,单位:%
- */
- @Column(name = "H2VLmt")
- private Double H2VLmt;
- /**
- * 3次谐波电压含有率越限定值,单位:%
- */
- @Column(name = "H3VLmt")
- private Double H3VLmt;
- /**
- * 4次谐波电压含有率越限定值,单位:%
- */
- @Column(name = "H4VLmt")
- private Double H4VLmt;
- /**
- * 5次谐波电压含有率越限定值,单位:%
- */
- @Column(name = "H5VLmt")
- private Double H5VLmt;
- /**
- * 6次谐波电压含有率越限定值,单位:%
- */
- @Column(name = "H6VLmt")
- private Double H6VLmt;
- /**
- * 7次谐波电压含有率越限定值,单位:%
- */
- @Column(name = "H7VLmt")
- private Double H7VLmt;
- /**
- * 8次谐波电压含有率越限定值,单位:%
- */
- @Column(name = "H8VLmt")
- private Double H8VLmt;
- /**
- * 9次谐波电压含有率越限定值,单位:%
- */
- @Column(name = "H9VLmt")
- private Double H9VLmt;
- /**
- * 10次谐波电压含有率越限定值,单位:%
- */
- @Column(name = "H10VLmt")
- private Double H10VLmt;
- /**
- * 11次谐波电压含有率越限定值,单位:%
- */
- @Column(name = "H11VLmt")
- private Double H11VLmt;
- /**
- * 12次谐波电压含有率越限定值,单位:%
- */
- @Column(name = "H12VLmt")
- private Double H12VLmt;
- /**
- * 13次谐波电压含有率越限定值,单位:%
- */
- @Column(name = "H13VLmt")
- private Double H13VLmt;
- /**
- * 14次谐波电压含有率越限定值,单位:%
- */
- @Column(name = "H14VLmt")
- private Double H14VLmt;
- /**
- * 15次谐波电压含有率越限定值,单位:%
- */
- @Column(name = "H15VLmt")
- private Double H15VLmt;
- /**
- * 16次谐波电压含有率越限定值,单位:%
- */
- @Column(name = "H16VLmt")
- private Double H16VLmt;
- /**
- * 17次谐波电压含有率越限定值,单位:%
- */
- @Column(name = "H17VLmt")
- private Double H17VLmt;
- /**
- * 18次谐波电压含有率越限定值,单位:%
- */
- @Column(name = "H18VLmt")
- private Double H18VLmt;
- /**
- * 19次谐波电压含有率越限定值,单位:%
- */
- @Column(name = "H19VLmt")
- private Double H19VLmt;
- /**
- * 20次谐波电压含有率越限定值,单位:%
- */
- @Column(name = "H20VLmt")
- private Double H20VLmt;
- /**
- * 21次谐波电压含有率越限定值,单位:%
- */
- @Column(name = "H21VLmt")
- private Double H21VLmt;
- /**
- * 22次谐波电压含有率越限定值,单位:%
- */
- @Column(name = "H22VLmt")
- private Double H22VLmt;
- /**
- * 23次谐波电压含有率越限定值,单位:%
- */
- @Column(name = "H23VLmt")
- private Double H23VLmt;
- /**
- * 24次谐波电压含有率越限定值,单位:%
- */
- @Column(name = "H24VLmt")
- private Double H24VLmt;
- /**
- * 25次谐波电压含有率越限定值,单位:%
- */
- @Column(name = "H25VLmt")
- private Double H25VLmt;
- /**
- * 26次谐波电压含有率越限定值,单位:%
- */
- @Column(name = "H26VLmt")
- private Double H26VLmt;
- /**
- * 27次谐波电压含有率越限定值,单位:%
- */
- @Column(name = "H27VLmt")
- private Double H27VLmt;
- /**
- * 28次谐波电压含有率越限定值,单位:%
- */
- @Column(name = "H28VLmt")
- private Double H28VLmt;
- /**
- * 29次谐波电压含有率越限定值,单位:%
- */
- @Column(name = "H29VLmt")
- private Double H29VLmt;
- /**
- * 30次谐波电压含有率越限定值,单位:%
- */
- @Column(name = "H30VLmt")
- private Double H30VLmt;
- /**
- * 31次谐波电压含有率越限定值,单位:%
- */
- @Column(name = "H31VLmt")
- private Double H31VLmt;
- /**
- * 32次谐波电压含有率越限定值,单位:%
- */
- @Column(name = "H32VLmt")
- private Double H32VLmt;
- /**
- * 33次谐波电压含有率越限定值,单位:%
- */
- @Column(name = "H33VLmt")
- private Double H33VLmt;
- /**
- * 34次谐波电压含有率越限定值,单位:%
- */
- @Column(name = "H34VLmt")
- private Double H34VLmt;
- /**
- * 35次谐波电压含有率越限定值,单位:%
- */
- @Column(name = "H35VLmt")
- private Double H35VLmt;
- /**
- * 36次谐波电压含有率越限定值,单位:%
- */
- @Column(name = "H36VLmt")
- private Double H36VLmt;
- /**
- * 37次谐波电压含有率越限定值,单位:%
- */
- @Column(name = "H37VLmt")
- private Double H37VLmt;
- /**
- * 38次谐波电压含有率越限定值,单位:%
- */
- @Column(name = "H38VLmt")
- private Double H38VLmt;
- /**
- * 39次谐波电压含有率越限定值,单位:%
- */
- @Column(name = "H39VLmt")
- private Double H39VLmt;
- /**
- * 40次谐波电压含有率越限定值,单位:%
- */
- @Column(name = "H40VLmt")
- private Double H40VLmt;
- /**
- * 41次谐波电压含有率越限定值,单位:%
- */
- @Column(name = "H41VLmt")
- private Double H41VLmt;
- /**
- * 42次谐波电压含有率越限定值,单位:%
- */
- @Column(name = "H42VLmt")
- private Double H42VLmt;
- /**
- * 43次谐波电压含有率越限定值,单位:%
- */
- @Column(name = "H43VLmt")
- private Double H43VLmt;
- /**
- * 44次谐波电压含有率越限定值,单位:%
- */
- @Column(name = "H44VLmt")
- private Double H44VLmt;
- /**
- * 45次谐波电压含有率越限定值,单位:%
- */
- @Column(name = "H45VLmt")
- private Double H45VLmt;
- /**
- * 46次谐波电压含有率越限定值,单位:%
- */
- @Column(name = "H46VLmt")
- private Double H46VLmt;
- /**
- * 47次谐波电压含有率越限定值,单位:%
- */
- @Column(name = "H47VLmt")
- private Double H47VLmt;
- /**
- * 48次谐波电压含有率越限定值,单位:%
- */
- @Column(name = "H48VLmt")
- private Double H48VLmt;
- /**
- * 49次谐波电压含有率越限定值,单位:%
- */
- @Column(name = "H49VLmt")
- private Double H49VLmt;
- /**
- * 50次谐波电压含有率越限定值,单位:%
- */
- @Column(name = "H50VLmt")
- private Double H50VLmt;
- /**
- * 2次谐波电流越限定值,单位:A
- */
- @Column(name = "H2ALmt")
- private Double H2ALmt;
- /**
- * 3次谐波电流越限定值,单位:A
- */
- @Column(name = "H3ALmt")
- private Double H3ALmt;
- /**
- * 4次谐波电流越限定值,单位:A
- */
- @Column(name = "H4ALmt")
- private Double H4ALmt;
- /**
- * 5次谐波电流越限定值,单位:A
- */
- @Column(name = "H5ALmt")
- private Double H5ALmt;
- /**
- * 6次谐波电流越限定值,单位:A
- */
- @Column(name = "H6ALmt")
- private Double H6ALmt;
- /**
- * 7次谐波电流越限定值,单位:A
- */
- @Column(name = "H7ALmt")
- private Double H7ALmt;
- /**
- * 8次谐波电流越限定值,单位:A
- */
- @Column(name = "H8ALmt")
- private Double H8ALmt;
- /**
- * 9次谐波电流越限定值,单位:A
- */
- @Column(name = "H9ALmt")
- private Double H9ALmt;
- /**
- * 10次谐波电流越限定值,单位:A
- */
- @Column(name = "H10ALmt")
- private Double H10ALmt;
- /**
- * 11次谐波电流越限定值,单位:A
- */
- @Column(name = "H11ALmt")
- private Double H11ALmt;
- /**
- * 12次谐波电流越限定值,单位:A
- */
- @Column(name = "H12ALmt")
- private Double H12ALmt;
- /**
- * 13次谐波电流越限定值,单位:A
- */
- @Column(name = "H13ALmt")
- private Double H13ALmt;
- /**
- * 14次谐波电流越限定值,单位:A
- */
- @Column(name = "H14ALmt")
- private Double H14ALmt;
- /**
- * 15次谐波电流越限定值,单位:A
- */
- @Column(name = "H15ALmt")
- private Double H15ALmt;
- /**
- * 16次谐波电流越限定值,单位:A
- */
- @Column(name = "H16ALmt")
- private Double H16ALmt;
- /**
- * 17次谐波电流越限定值,单位:A
- */
- @Column(name = "H17ALmt")
- private Double H17ALmt;
- /**
- * 18次谐波电流越限定值,单位:A
- */
- @Column(name = "H18ALmt")
- private Double H18ALmt;
- /**
- * 19次谐波电流越限定值,单位:A
- */
- @Column(name = "H19ALmt")
- private Double H19ALmt;
- /**
- * 20次谐波电流越限定值,单位:A
- */
- @Column(name = "H20ALmt")
- private Double H20ALmt;
- /**
- * 21次谐波电流越限定值,单位:A
- */
- @Column(name = "H21ALmt")
- private Double H21ALmt;
- /**
- * 22次谐波电流越限定值,单位:A
- */
- @Column(name = "H22ALmt")
- private Double H22ALmt;
- /**
- * 23次谐波电流越限定值,单位:A
- */
- @Column(name = "H23ALmt")
- private Double H23ALmt;
- /**
- * 24次谐波电流越限定值,单位:A
- */
- @Column(name = "H24ALmt")
- private Double H24ALmt;
- /**
- * 25次谐波电流越限定值,单位:A
- */
- @Column(name = "H25ALmt")
- private Double H25ALmt;
- /**
- * 26次谐波电流越限定值,单位:A
- */
- @Column(name = "H26ALmt")
- private Double H26ALmt;
- /**
- * 27次谐波电流越限定值,单位:A
- */
- @Column(name = "H27ALmt")
- private Double H27ALmt;
- /**
- * 28次谐波电流越限定值,单位:A
- */
- @Column(name = "H28ALmt")
- private Double H28ALmt;
- /**
- * 29次谐波电流越限定值,单位:A
- */
- @Column(name = "H29ALmt")
- private Double H29ALmt;
- /**
- * 30次谐波电流越限定值,单位:A
- */
- @Column(name = "H30ALmt")
- private Double H30ALmt;
- /**
- * 31次谐波电流越限定值,单位:A
- */
- @Column(name = "H31ALmt")
- private Double H31ALmt;
- /**
- * 32次谐波电流越限定值,单位:A
- */
- @Column(name = "H32ALmt")
- private Double H32ALmt;
- /**
- * 33次谐波电流越限定值,单位:A
- */
- @Column(name = "H33ALmt")
- private Double H33ALmt;
- /**
- * 34次谐波电流越限定值,单位:A
- */
- @Column(name = "H34ALmt")
- private Double H34ALmt;
- /**
- * 35次谐波电流越限定值,单位:A
- */
- @Column(name = "H35ALmt")
- private Double H35ALmt;
- /**
- * 36次谐波电流越限定值,单位:A
- */
- @Column(name = "H36ALmt")
- private Double H36ALmt;
- /**
- * 37次谐波电流越限定值,单位:A
- */
- @Column(name = "H37ALmt")
- private Double H37ALmt;
- /**
- * 38次谐波电流越限定值,单位:A
- */
- @Column(name = "H38ALmt")
- private Double H38ALmt;
- /**
- * 39次谐波电流越限定值,单位:A
- */
- @Column(name = "H39ALmt")
- private Double H39ALmt;
- /**
- * 40次谐波电流越限定值,单位:A
- */
- @Column(name = "H40ALmt")
- private Double H40ALmt;
- /**
- * 41次谐波电流越限定值,单位:A
- */
- @Column(name = "H41ALmt")
- private Double H41ALmt;
- /**
- * 42次谐波电流越限定值,单位:A
- */
- @Column(name = "H42ALmt")
- private Double H42ALmt;
- /**
- * 43次谐波电流越限定值,单位:A
- */
- @Column(name = "H43ALmt")
- private Double H43ALmt;
- /**
- * 44次谐波电流越限定值,单位:A
- */
- @Column(name = "H44ALmt")
- private Double H44ALmt;
- /**
- * 45次谐波电流越限定值,单位:A
- */
- @Column(name = "H45ALmt")
- private Double H45ALmt;
- /**
- * 46次谐波电流越限定值,单位:A
- */
- @Column(name = "H46ALmt")
- private Double H46ALmt;
- /**
- * 47次谐波电流越限定值,单位:A
- */
- @Column(name = "H47ALmt")
- private Double H47ALmt;
- /**
- * 48次谐波电流越限定值,单位:A
- */
- @Column(name = "H48ALmt")
- private Double H48ALmt;
- /**
- * 49次谐波电流越限定值,单位:A
- */
- @Column(name = "H49ALmt")
- private Double H49ALmt;
- /**
- * 50次谐波电流越限定值,单位:A
- */
- @Column(name = "H50ALmt")
- private Double H50ALmt;
-
-
-
-
-
-
-}
diff --git a/pqs-influx/src/main/java/com/njcn/influx/pojo/po/PowerQualityData.java b/pqs-influx/src/main/java/com/njcn/influx/pojo/po/PowerQualityData.java
deleted file mode 100644
index fae85a1ef..000000000
--- a/pqs-influx/src/main/java/com/njcn/influx/pojo/po/PowerQualityData.java
+++ /dev/null
@@ -1,347 +0,0 @@
-package com.njcn.influx.pojo.po;
-
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.njcn.influx.utils.InstantDateSerializer;
-import lombok.Data;
-import org.influxdb.annotation.Column;
-import org.influxdb.annotation.Measurement;
-
-import java.time.Instant;
-
-/**
- * 类的介绍:
- *
- * @author xuyang
- * @version 1.0.0
- */
-@Data
-@Measurement(name = "power_quality_data")
-public class PowerQualityData {
-
- @Column(name = "time")
- @JsonSerialize(using = InstantDateSerializer.class)
- private Instant time;
-
- @Column(name = "LineId")
- private String lineId;
-
- @Column(name = "Phase")
- private String phase;
-
- @Column(name = "Stat_Method")
- private String statMethod;
-
- /**
- * 频率
- */
- @Column(name = "Hz")
- private Double Hz;
- /**
- * 相电压总有效值
- */
- @Column(name = "PhV")
- private Double PhV;
- /**
- * 线电压总有效值
- */
- @Column(name = "PPV")
- private Double PPV;
- /**
- * 电流总有效值
- */
- @Column(name = "A")
- private Double A;
- /**
- * 频率偏差
- */
- @Column(name = "HzDev")
- private Double HzDev;
- /**
- * 相电压偏差
- */
- @Column(name = "PhVDev")
- private Double PhVDev;
- /**
- * 线电压偏差
- */
- @Column(name = "PPVDev")
- private Double PPVDev;
- /**
- * 正序、负序、零序电压
- */
- @Column(name = "SeqV")
- private Double SeqV;
- /**
- * 电压负序不平衡度
- */
- @Column(name = "ImbNgV")
- private Double ImbNgV;
- /**
- * 电压零序不平衡度
- */
- @Column(name = "ImbZroV")
- private Double ImbZroV;
- /**
- * 正序、负序、零序电流
- */
- @Column(name = "SeqA")
- private Double SeqA;
- /**
- * 电流负序不平衡度
- */
- @Column(name = "ImbNgA")
- private Double ImbNgA;
- /**
- * 电流零序不平衡度
- */
- @Column(name = "ImbZroA")
- private Double ImbZroA;
- /**
- * 相电压基波有效值
- */
- @Column(name = "HFundPhV")
- private Double HFundPhV;
- /**
- * 线电压基波有效值
- */
- @Column(name = "HFundPPV")
- private Double HFundPPV;
- /**
- * 相电压基波有效值相角
- */
- @Column(name = "FundPhVAng")
- private Double FundPhVAng ;
- /**
- * 线电压基波有效值相角
- */
- @Column(name = "FundPPVAng")
- private Double FundPPVAng;
- /**
- * 电流基波有效值
- */
- @Column(name = "FundA")
- private Double FundA ;
- /**
- * 电流基波相角
- */
- @Column(name = "FundAAng")
- private Double FundAAng;
- /**
- * 相电压谐波总畸变率
- */
- @Column(name = "ThdPhV")
- private Double ThdPhV;
- /**
- * 线电压谐波总畸变率
- */
- @Column(name = "ThdPPV")
- private Double ThdPPV;
- /**
- * 相电压总偶次谐波畸变率
- */
- @Column(name = "ThdEvnPhV")
- private Double ThdEvnPhV;
- /**
- * 线电压总偶次谐波畸变率
- */
- @Column(name = "ThdEvnPPV")
- private Double ThdEvnPPV;
- /**
- * 相电压总奇次谐波畸变率
- */
- @Column(name = "ThdOddPhV")
- private Double ThdOddPhV;
- /**
- * 线电压总奇次谐波畸变率
- */
- @Column(name = "ThdOddPPV")
- private Double ThdOddPPV;
- /**
- * 相电压谐波(间谐波)含有率序列
- */
- @Column(name = "HRPhV")
- private Double HRPhV;
- /**
- * 相电压谐波(间谐波)相角序列
- */
- @Column(name = "HRPhVAng")
- private Double HRPhVAng;
- /**
- * 线电压谐波(间谐波)含有率序列
- */
- @Column(name = "HRPPV")
- private Double HRPPV;
- /**
- * 线电压谐波(间谐波)相角序列
- */
- @Column(name = "HRPPVAng")
- private Double HRPPVAng;
- /**
- * 电流总谐波畸变率
- */
- @Column(name = "ThdA")
- private Double ThdA;
- /**
- * 电流总偶次谐波畸变率
- */
- @Column(name = "ThdEvnA")
- private Double ThdEvnA;
- /**
- * 电流总奇次谐波畸变率
- */
- @Column(name = "ThdOddA")
- private Double ThdOddA;
- /**
- * 谐波(间谐波)电流有效值
- */
- @Column(name = "HA")
- private Double HA;
- /**
- * 谐波(间谐波)电流相角序列
- */
- @Column(name = "HAAng")
- private Double HAAng;
- /**
- * 相电压电压变动幅度
- */
- @Column(name = "PhFluc")
- private Double PhFluc;
- /**
- * 线电压电压变动幅度
- */
- @Column(name = "PPFluc")
- private Double PPFluc;
- /**
- * 相电压电压变动频度
- */
- @Column(name = "PhFlucf")
- private Double PhFlucf;
- /**
- * 线电压电压变动频度
- */
- @Column(name = "PPFlucf")
- private Double PPFlucf;
- /**
- * 有功功率
- */
- @Column(name = "W")
- private Double W;
- /**
- * 无功功率
- */
- @Column(name = "VAr")
- private Double VAr;
- /**
- * 视在功率
- */
- @Column(name = "VA")
- private Double VA;
- /**
- * 基波有功功率
- */
- @Column(name = "FundW")
- private Double FundW;
- /**
- * 基波无功功率
- */
- @Column(name = "FundVAr")
- private Double FundVAr;
- /**
- * 基波视在功率
- */
- @Column(name = "FundVA")
- private Double FundVA;
- /**
- * 功率因数
- */
- @Column(name = "PF")
- private Double PF;
- /**
- * 位移功率因数
- */
- @Column(name = "DF")
- private Double DF;
- /**
- * 三相总有功功率
- */
- @Column(name = "TotW")
- private Double TotW;
- /**
- * 三相总无功功率
- */
- @Column(name = "TotVAr")
- private Double TotVAr;
- /**
- * 三相总视在功率
- */
- @Column(name = "TotVA")
- private Double TotVA;
- /**
- * 三相功率因数
- */
- @Column(name = "TotPF")
- private Double TotPF;
- /**
- * 三相位移功率因数
- */
- @Column(name = "TotDF")
- private Double TotDF;
- /**
- * 谐波有功功率序列
- */
- @Column(name = "HW")
- private Double HW;
- /**
- * 谐波无功功率序列
- */
- @Column(name = "HVAr")
- private Double HVAr;
- /**
- * 谐波视在功率序列
- */
- @Column(name = "HVA")
- private Double HVA;
- /**
- * 三相总谐波有功功率
- */
- @Column(name = "TotHW")
- private Double TotHW;
- /**
- * 三相总谐波无功功率
- */
- @Column(name = "TotHVAr")
- private Double TotHVAr;
- /**
- * 三相总谐波视在功率
- */
- @Column(name = "TotHVA")
- private Double TotHVA;
- /**
- * 相电压短时闪变
- */
- @Column(name = "PhPst")
- private Double PhPst;
- /**
- * 线电压短时闪变
- */
- @Column(name = "PPPst")
- private Double PPPst;
- /**
- * 相电压长时闪变
- */
- @Column(name = "PhPlt")
- private Double PhPlt;
- /**
- * 线电压长时闪变
- */
- @Column(name = "PPPlt")
- private Double PPPlt;
- /**
- * 最大需量
- */
- @Column(name = "MaxDemand")
- private Double MaxDemand;
-
-
-
-}
diff --git a/pqs-influx/src/main/java/com/njcn/influx/pojo/po/PqsCommunicate.java b/pqs-influx/src/main/java/com/njcn/influx/pojo/po/PqsCommunicate.java
deleted file mode 100644
index a064f1d55..000000000
--- a/pqs-influx/src/main/java/com/njcn/influx/pojo/po/PqsCommunicate.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package com.njcn.influx.pojo.po;
-
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.njcn.influx.utils.InstantDateSerializer;
-import lombok.Data;
-import org.influxdb.annotation.Column;
-import org.influxdb.annotation.Measurement;
-
-import java.time.Instant;
-
-/**
- * 类的介绍:
- *
- * @author xuyang
- * @version 1.0.0
- * @createTime 2022/7/12 9:55
- */
-@Data
-@Measurement(name = "pqs_communicate")
-public class PqsCommunicate {
-
- @Column(name = "time")
- @JsonSerialize(using = InstantDateSerializer.class)
- private Instant time;
-
- @Column(name = "dev_id")
- private String devId;
-
- @Column(name = "description")
- private String description;
-
- @Column(name = "type")
- private Integer type;
-
- //自定义
- private int duration;
-
- private String desc;
-
-}
diff --git a/pqs-influx/src/main/java/com/njcn/influx/pojo/po/cs/CsDataHarmPowerP.java b/pqs-influx/src/main/java/com/njcn/influx/pojo/po/cs/CsDataHarmPowerP.java
deleted file mode 100644
index a5116fe57..000000000
--- a/pqs-influx/src/main/java/com/njcn/influx/pojo/po/cs/CsDataHarmPowerP.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package com.njcn.influx.pojo.po.cs;
-
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.njcn.influx.utils.InstantDateSerializer;
-import lombok.Data;
-import org.influxdb.annotation.Column;
-import org.influxdb.annotation.Measurement;
-
-import java.time.Instant;
-
-/**
- * 类的介绍:
- *
- * @author xuyang
- * @version 1.0.0
- * @createTime 2023/6/5 16:09
- */
-@Data
-@Measurement(name = "data_harmpower_p")
-public class CsDataHarmPowerP {
-
- @Column(name = "time")
- @JsonSerialize(using = InstantDateSerializer.class)
- private Instant time;
-
- @Column(name = "line_id")
- private String lineId;
-
- @Column(name = "phasic_type")
- private String phaseType;
-
- @Column(name = "value_type")
- private String valueType;
-
- @Column(name = "W")
- private Double w;
-
-}
diff --git a/pqs-influx/src/main/java/com/njcn/influx/pojo/po/cs/EntData.java b/pqs-influx/src/main/java/com/njcn/influx/pojo/po/cs/EntData.java
deleted file mode 100644
index abe41eee2..000000000
--- a/pqs-influx/src/main/java/com/njcn/influx/pojo/po/cs/EntData.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package com.njcn.influx.pojo.po.cs;
-
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.njcn.influx.utils.InstantDateSerializer;
-import lombok.Data;
-import org.influxdb.annotation.Column;
-import org.influxdb.annotation.Measurement;
-
-import java.time.Instant;
-
-/**
- * 类的介绍:
- *
- * @author xuyang
- * @version 1.0.0
- * @createTime 2022/4/7 10:00
- */
-@Data
-@Measurement(name = "evt_data")
-@Deprecated
-public class EntData {
-
- @Column(name = "time")
- @JsonSerialize(using = InstantDateSerializer.class)
- private Instant time;
-
- @Column(name = "line_id")
- private String lineId;
-
- @Column(name = "sec")
- private String sec;
-
- @Column(name = "target")
- private String target;
-
- @Column(name = "evt_vva")
- private Double evtVva;
-
- @Column(name = "evt_vvadepth")
- private Double evtVvadepth;
-
- @Column(name = "evt_vvaphase")
- private String evtVvaphase;
-
- @Column(name = "evt_vvatm")
- private Double evtVvatm;
-
-}
diff --git a/pqs-influx/src/main/java/com/njcn/influx/pojo/po/day/DayFlicker.java b/pqs-influx/src/main/java/com/njcn/influx/pojo/po/day/DayFlicker.java
deleted file mode 100644
index e2d682dd8..000000000
--- a/pqs-influx/src/main/java/com/njcn/influx/pojo/po/day/DayFlicker.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package com.njcn.influx.pojo.po.day;
-
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.njcn.influx.utils.InstantDateSerializer;
-import lombok.Data;
-import org.influxdb.annotation.Column;
-import org.influxdb.annotation.Measurement;
-import org.influxdb.annotation.TimeColumn;
-
-import java.time.Instant;
-
-/**
- * 类的介绍:
- *
- * @author xuyang
- * @version 1.0.0
- */
-@Data
-@Measurement(name = "day_flicker")
-public class DayFlicker {
-
- @TimeColumn
- @Column(name = "time")
- @JsonSerialize(using = InstantDateSerializer.class)
- private Instant time;
-
- @Column(name = "fluc")
- private Double fluc;
-
- @Column(name = "line_id",tag = true)
- private String lineId;
-
- @Column(name = "phasic_type",tag = true)
- private String phaseType;
-
- @Column(name = "plt")
- private Double plt;
-
- @Column(name = "pst")
- private Double pst;
-
- @Column(name = "quality_flag",tag = true)
- private String qualityFlag;
-
-
- //自定义字段
- @Column(name = "value_type",tag = true)
- private String valueType;
-
- @Column(name = "count")
- private Integer count;
-
- @Column(name = "pst_count")
- private Integer pstCount;
-
- @Column(name = "plt_count")
- private Integer pltCount;
-
-}
diff --git a/pqs-influx/src/main/java/com/njcn/influx/pojo/po/day/DayFluc.java b/pqs-influx/src/main/java/com/njcn/influx/pojo/po/day/DayFluc.java
deleted file mode 100644
index 4c92e8eeb..000000000
--- a/pqs-influx/src/main/java/com/njcn/influx/pojo/po/day/DayFluc.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package com.njcn.influx.pojo.po.day;
-
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.njcn.influx.utils.InstantDateSerializer;
-import lombok.Data;
-import org.influxdb.annotation.Column;
-import org.influxdb.annotation.Measurement;
-import org.influxdb.annotation.TimeColumn;
-
-import java.time.Instant;
-
-/**
- * 类的介绍:
- *
- * @author xuyang
- * @version 1.0.0
- */
-@Data
-@Measurement(name = "day_fluc")
-public class DayFluc {
-
- @Column(name = "time")
- @TimeColumn
- @JsonSerialize(using = InstantDateSerializer.class)
- private Instant time;
-
- @Column(name = "fluc")
- private Double fluc;
-
- @Column(name = "fluccf")
- private Double fluccf;
-
- @Column(name = "line_id",tag = true)
- private String lineId;
-
- @Column(name = "phasic_type",tag = true)
- private String phaseType;
-
- @Column(name = "quality_flag",tag = true)
- private String qualityFlag;
-
- @Column(name = "value_type",tag = true)
- private String valueType;
-
-}
diff --git a/pqs-influx/src/main/java/com/njcn/influx/pojo/po/day/DayHarmPhasicI.java b/pqs-influx/src/main/java/com/njcn/influx/pojo/po/day/DayHarmPhasicI.java
deleted file mode 100644
index de971cb32..000000000
--- a/pqs-influx/src/main/java/com/njcn/influx/pojo/po/day/DayHarmPhasicI.java
+++ /dev/null
@@ -1,189 +0,0 @@
-package com.njcn.influx.pojo.po.day;
-
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.njcn.influx.utils.InstantDateSerializer;
-import lombok.Data;
-import org.influxdb.annotation.Column;
-import org.influxdb.annotation.Measurement;
-import org.influxdb.annotation.TimeColumn;
-
-import java.time.Instant;
-
-/**
- * 类的介绍:
- *
- * @author xuyang
- * @version 1.0.0
- */
-@Data
-@Measurement(name = "day_harmphasic_i")
-public class DayHarmPhasicI {
-
- @Column(name = "time")
- @TimeColumn
- @JsonSerialize(using = InstantDateSerializer.class)
- private Instant time;
-
- @Column(name = "line_id",tag = true)
- private String lineId;
-
- @Column(name = "phasic_type",tag = true)
- private String phaseType;
-
- @Column(name = "quality_flag",tag = true)
- private String qualityFlag;
-
- @Column(name = "value_type",tag = true)
- private String valueType;
-
- @Column(name = "i_1")
- private Double i1;
-
- @Column(name = "i_2")
- private Double i2;
-
- @Column(name = "i_3")
- private Double i3;
-
- @Column(name = "i_4")
- private Double i4;
-
- @Column(name = "i_5")
- private Double i5;
-
- @Column(name = "i_6")
- private Double i6;
-
- @Column(name = "i_7")
- private Double i7;
-
- @Column(name = "i_8")
- private Double i8;
-
- @Column(name = "i_9")
- private Double i9;
-
- @Column(name = "i_10")
- private Double i10;
-
- @Column(name = "i_11")
- private Double i11;
-
- @Column(name = "i_12")
- private Double i12;
-
- @Column(name = "i_13")
- private Double i13;
-
- @Column(name = "i_14")
- private Double i14;
-
- @Column(name = "i_15")
- private Double i15;
-
- @Column(name = "i_16")
- private Double i16;
-
- @Column(name = "i_17")
- private Double i17;
-
- @Column(name = "i_18")
- private Double i18;
-
- @Column(name = "i_19")
- private Double i19;
-
- @Column(name = "i_20")
- private Double i20;
-
- @Column(name = "i_21")
- private Double i21;
-
- @Column(name = "i_22")
- private Double i22;
-
- @Column(name = "i_23")
- private Double i23;
-
- @Column(name = "i_24")
- private Double i24;
-
- @Column(name = "i_25")
- private Double i25;
-
- @Column(name = "i_26")
- private Double i26;
-
- @Column(name = "i_27")
- private Double i27;
-
- @Column(name = "i_28")
- private Double i28;
-
- @Column(name = "i_29")
- private Double i29;
-
- @Column(name = "i_30")
- private Double i30;
-
- @Column(name = "i_31")
- private Double i31;
-
- @Column(name = "i_32")
- private Double i32;
-
- @Column(name = "i_33")
- private Double i33;
-
- @Column(name = "i_34")
- private Double i34;
-
- @Column(name = "i_35")
- private Double i35;
-
- @Column(name = "i_36")
- private Double i36;
-
- @Column(name = "i_37")
- private Double i37;
-
- @Column(name = "i_38")
- private Double i38;
-
- @Column(name = "i_39")
- private Double i39;
-
- @Column(name = "i_40")
- private Double i40;
-
- @Column(name = "i_41")
- private Double i41;
-
- @Column(name = "i_42")
- private Double i42;
-
- @Column(name = "i_43")
- private Double i43;
-
- @Column(name = "i_44")
- private Double i44;
-
- @Column(name = "i_45")
- private Double i45;
-
- @Column(name = "i_46")
- private Double i46;
-
- @Column(name = "i_47")
- private Double i47;
-
- @Column(name = "i_48")
- private Double i48;
-
- @Column(name = "i_49")
- private Double i49;
-
- @Column(name = "i_50")
- private Double i50;
-
-}
diff --git a/pqs-influx/src/main/java/com/njcn/influx/pojo/po/day/DayHarmPhasicV.java b/pqs-influx/src/main/java/com/njcn/influx/pojo/po/day/DayHarmPhasicV.java
deleted file mode 100644
index c7eb5b46f..000000000
--- a/pqs-influx/src/main/java/com/njcn/influx/pojo/po/day/DayHarmPhasicV.java
+++ /dev/null
@@ -1,190 +0,0 @@
-package com.njcn.influx.pojo.po.day;
-
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.njcn.influx.utils.InstantDateSerializer;
-import lombok.Data;
-import org.influxdb.annotation.Column;
-import org.influxdb.annotation.Measurement;
-import org.influxdb.annotation.TimeColumn;
-
-import java.time.Instant;
-
-/**
- * 类的介绍:
- *
- * @author xuyang
- * @version 1.0.0
- * @createTime 2022/5/12 9:13
- */
-@Data
-@Measurement(name = "day_harmphasic_v")
-public class DayHarmPhasicV {
-
- @Column(name = "time")
- @TimeColumn
- @JsonSerialize(using = InstantDateSerializer.class)
- private Instant time;
-
- @Column(name = "line_id",tag = true)
- private String lineId;
-
- @Column(name = "phasic_type",tag = true)
- private String phaseType;
-
- @Column(name = "quality_flag",tag = true)
- private String qualityFlag;
-
- @Column(name = "value_type",tag = true)
- private String valueType;
-
- @Column(name = "v_1")
- private Double v1;
-
- @Column(name = "v_2")
- private Double v2;
-
- @Column(name = "v_3")
- private Double v3;
-
- @Column(name = "v_4")
- private Double v4;
-
- @Column(name = "v_5")
- private Double v5;
-
- @Column(name = "v_6")
- private Double v6;
-
- @Column(name = "v_7")
- private Double v7;
-
- @Column(name = "v_8")
- private Double v8;
-
- @Column(name = "v_9")
- private Double v9;
-
- @Column(name = "v_10")
- private Double v10;
-
- @Column(name = "v_11")
- private Double v11;
-
- @Column(name = "v_12")
- private Double v12;
-
- @Column(name = "v_13")
- private Double v13;
-
- @Column(name = "v_14")
- private Double v14;
-
- @Column(name = "v_15")
- private Double v15;
-
- @Column(name = "v_16")
- private Double v16;
-
- @Column(name = "v_17")
- private Double v17;
-
- @Column(name = "v_18")
- private Double v18;
-
- @Column(name = "v_19")
- private Double v19;
-
- @Column(name = "v_20")
- private Double v20;
-
- @Column(name = "v_21")
- private Double v21;
-
- @Column(name = "v_22")
- private Double v22;
-
- @Column(name = "v_23")
- private Double v23;
-
- @Column(name = "v_24")
- private Double v24;
-
- @Column(name = "v_25")
- private Double v25;
-
- @Column(name = "v_26")
- private Double v26;
-
- @Column(name = "v_27")
- private Double v27;
-
- @Column(name = "v_28")
- private Double v28;
-
- @Column(name = "v_29")
- private Double v29;
-
- @Column(name = "v_30")
- private Double v30;
-
- @Column(name = "v_31")
- private Double v31;
-
- @Column(name = "v_32")
- private Double v32;
-
- @Column(name = "v_33")
- private Double v33;
-
- @Column(name = "v_34")
- private Double v34;
-
- @Column(name = "v_35")
- private Double v35;
-
- @Column(name = "v_36")
- private Double v36;
-
- @Column(name = "v_37")
- private Double v37;
-
- @Column(name = "v_38")
- private Double v38;
-
- @Column(name = "v_39")
- private Double v39;
-
- @Column(name = "v_40")
- private Double v40;
-
- @Column(name = "v_41")
- private Double v41;
-
- @Column(name = "v_42")
- private Double v42;
-
- @Column(name = "v_43")
- private Double v43;
-
- @Column(name = "v_44")
- private Double v44;
-
- @Column(name = "v_45")
- private Double v45;
-
- @Column(name = "v_46")
- private Double v46;
-
- @Column(name = "v_47")
- private Double v47;
-
- @Column(name = "v_48")
- private Double v48;
-
- @Column(name = "v_49")
- private Double v49;
-
- @Column(name = "v_50")
- private Double v50;
-
-}
diff --git a/pqs-influx/src/main/java/com/njcn/influx/pojo/po/day/DayHarmPowerP.java b/pqs-influx/src/main/java/com/njcn/influx/pojo/po/day/DayHarmPowerP.java
deleted file mode 100644
index 36706a672..000000000
--- a/pqs-influx/src/main/java/com/njcn/influx/pojo/po/day/DayHarmPowerP.java
+++ /dev/null
@@ -1,198 +0,0 @@
-package com.njcn.influx.pojo.po.day;
-
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.njcn.influx.utils.InstantDateSerializer;
-import lombok.Data;
-import org.influxdb.annotation.Column;
-import org.influxdb.annotation.Measurement;
-import org.influxdb.annotation.TimeColumn;
-
-import java.time.Instant;
-
-/**
- * 类的介绍:
- *
- * @author xuyang
- * @version 1.0.0
- * @createTime 2022/5/12 9:13
- */
-@Data
-@Measurement(name = "day_harmpower_p")
-public class DayHarmPowerP {
-
- @Column(name = "time")
- @TimeColumn
- @JsonSerialize(using = InstantDateSerializer.class)
- private Instant time;
-
- @Column(name = "line_id",tag = true)
- private String lineId;
-
- @Column(name = "phasic_type",tag = true)
- private String phaseType;
-
- @Column(name = "quality_flag",tag = true)
- private String qualityFlag;
-
- @Column(name = "value_type",tag = true)
- private String valueType;
-
- @Column(name = "df")
- private Double df;
-
- @Column(name = "pf")
- private Double pf;
-
- @Column(name = "p")
- private Double p;
-
- @Column(name = "p_1")
- private Double p1;
-
- @Column(name = "p_2")
- private Double p2;
-
- @Column(name = "p_3")
- private Double p3;
-
- @Column(name = "p_4")
- private Double p4;
-
- @Column(name = "p_5")
- private Double p5;
-
- @Column(name = "p_6")
- private Double p6;
-
- @Column(name = "p_7")
- private Double p7;
-
- @Column(name = "p_8")
- private Double p8;
-
- @Column(name = "p_9")
- private Double p9;
-
- @Column(name = "p_10")
- private Double p10;
-
- @Column(name = "p_11")
- private Double p11;
-
- @Column(name = "p_12")
- private Double p12;
-
- @Column(name = "p_13")
- private Double p13;
-
- @Column(name = "p_14")
- private Double p14;
-
- @Column(name = "p_15")
- private Double p15;
-
- @Column(name = "p_16")
- private Double p16;
-
- @Column(name = "p_17")
- private Double p17;
-
- @Column(name = "p_18")
- private Double p18;
-
- @Column(name = "p_19")
- private Double p19;
-
- @Column(name = "p_20")
- private Double p20;
-
- @Column(name = "p_21")
- private Double p21;
-
- @Column(name = "p_22")
- private Double p22;
-
- @Column(name = "p_23")
- private Double p23;
-
- @Column(name = "p_24")
- private Double p24;
-
- @Column(name = "p_25")
- private Double p25;
-
- @Column(name = "p_26")
- private Double p26;
-
- @Column(name = "p_27")
- private Double p27;
-
- @Column(name = "p_28")
- private Double p28;
-
- @Column(name = "p_29")
- private Double p29;
-
- @Column(name = "p_30")
- private Double p30;
-
- @Column(name = "p_31")
- private Double p31;
-
- @Column(name = "p_32")
- private Double p32;
-
- @Column(name = "p_33")
- private Double p33;
-
- @Column(name = "p_34")
- private Double p34;
-
- @Column(name = "p_35")
- private Double p35;
-
- @Column(name = "p_36")
- private Double p36;
-
- @Column(name = "p_37")
- private Double p37;
-
- @Column(name = "p_38")
- private Double p38;
-
- @Column(name = "p_39")
- private Double p39;
-
- @Column(name = "p_40")
- private Double p40;
-
- @Column(name = "p_41")
- private Double p41;
-
- @Column(name = "p_42")
- private Double p42;
-
- @Column(name = "p_43")
- private Double p43;
-
- @Column(name = "p_44")
- private Double p44;
-
- @Column(name = "p_45")
- private Double p45;
-
- @Column(name = "p_46")
- private Double p46;
-
- @Column(name = "p_47")
- private Double p47;
-
- @Column(name = "p_48")
- private Double p48;
-
- @Column(name = "p_49")
- private Double p49;
-
- @Column(name = "p_50")
- private Double p50;
-}
diff --git a/pqs-influx/src/main/java/com/njcn/influx/pojo/po/day/DayHarmPowerQ.java b/pqs-influx/src/main/java/com/njcn/influx/pojo/po/day/DayHarmPowerQ.java
deleted file mode 100644
index e87f15dd5..000000000
--- a/pqs-influx/src/main/java/com/njcn/influx/pojo/po/day/DayHarmPowerQ.java
+++ /dev/null
@@ -1,193 +0,0 @@
-package com.njcn.influx.pojo.po.day;
-
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.njcn.influx.utils.InstantDateSerializer;
-import lombok.Data;
-import org.influxdb.annotation.Column;
-import org.influxdb.annotation.Measurement;
-import org.influxdb.annotation.TimeColumn;
-
-import java.time.Instant;
-
-/**
- * 类的介绍:
- *
- * @author xuyang
- * @version 1.0.0
- * @createTime 2022/5/12 9:13
- */
-@Data
-@Measurement(name = "day_harmpower_q")
-public class DayHarmPowerQ {
-
- @Column(name = "time")
- @TimeColumn
- @JsonSerialize(using = InstantDateSerializer.class)
- private Instant time;
-
- @Column(name = "line_id",tag = true)
- private String lineId;
-
- @Column(name = "phasic_type",tag = true)
- private String phaseType;
-
- @Column(name = "quality_flag",tag = true)
- private String qualityFlag;
-
- @Column(name = "value_type",tag = true)
- private String valueType;
-
- @Column(name = "q")
- private Double q;
-
- @Column(name = "q_1")
- private Double q1;
-
- @Column(name = "q_2")
- private Double q2;
-
- @Column(name = "q_3")
- private Double q3;
-
- @Column(name = "q_4")
- private Double q4;
-
- @Column(name = "q_5")
- private Double q5;
-
- @Column(name = "q_6")
- private Double q6;
-
- @Column(name = "q_7")
- private Double q7;
-
- @Column(name = "q_8")
- private Double q8;
-
- @Column(name = "q_9")
- private Double q9;
-
- @Column(name = "q_10")
- private Double q10;
-
- @Column(name = "q_11")
- private Double q11;
-
- @Column(name = "q_12")
- private Double q12;
-
- @Column(name = "q_13")
- private Double q13;
-
- @Column(name = "q_14")
- private Double q14;
-
- @Column(name = "q_15")
- private Double q15;
-
- @Column(name = "q_16")
- private Double q16;
-
- @Column(name = "q_17")
- private Double q17;
-
- @Column(name = "q_18")
- private Double q18;
-
- @Column(name = "q_19")
- private Double q19;
-
- @Column(name = "q_20")
- private Double q20;
-
- @Column(name = "q_21")
- private Double q21;
-
- @Column(name = "q_22")
- private Double q22;
-
- @Column(name = "q_23")
- private Double q23;
-
- @Column(name = "q_24")
- private Double q24;
-
- @Column(name = "q_25")
- private Double q25;
-
- @Column(name = "q_26")
- private Double q26;
-
- @Column(name = "q_27")
- private Double q27;
-
- @Column(name = "q_28")
- private Double q28;
-
- @Column(name = "q_29")
- private Double q29;
-
- @Column(name = "q_30")
- private Double q30;
-
- @Column(name = "q_31")
- private Double q31;
-
- @Column(name = "q_32")
- private Double q32;
-
- @Column(name = "q_33")
- private Double q33;
-
- @Column(name = "q_34")
- private Double q34;
-
- @Column(name = "q_35")
- private Double q35;
-
- @Column(name = "q_36")
- private Double q36;
-
- @Column(name = "q_37")
- private Double q37;
-
- @Column(name = "q_38")
- private Double q38;
-
- @Column(name = "q_39")
- private Double q39;
-
- @Column(name = "q_40")
- private Double q40;
-
- @Column(name = "q_41")
- private Double q41;
-
- @Column(name = "q_42")
- private Double q42;
-
- @Column(name = "q_43")
- private Double q43;
-
- @Column(name = "q_44")
- private Double q44;
-
- @Column(name = "q_45")
- private Double q45;
-
- @Column(name = "q_46")
- private Double q46;
-
- @Column(name = "q_47")
- private Double q47;
-
- @Column(name = "q_48")
- private Double q48;
-
- @Column(name = "q_49")
- private Double q49;
-
- @Column(name = "q_50")
- private Double q50;
-
-}
diff --git a/pqs-influx/src/main/java/com/njcn/influx/pojo/po/day/DayHarmPowerS.java b/pqs-influx/src/main/java/com/njcn/influx/pojo/po/day/DayHarmPowerS.java
deleted file mode 100644
index 2cf1878af..000000000
--- a/pqs-influx/src/main/java/com/njcn/influx/pojo/po/day/DayHarmPowerS.java
+++ /dev/null
@@ -1,193 +0,0 @@
-package com.njcn.influx.pojo.po.day;
-
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.njcn.influx.utils.InstantDateSerializer;
-import lombok.Data;
-import org.influxdb.annotation.Column;
-import org.influxdb.annotation.Measurement;
-import org.influxdb.annotation.TimeColumn;
-
-import java.time.Instant;
-
-/**
- * 类的介绍:
- *
- * @author xuyang
- * @version 1.0.0
- * @createTime 2022/5/12 9:13
- */
-@Data
-@Measurement(name = "day_harmpower_s")
-public class DayHarmPowerS {
-
- @Column(name = "time")
- @TimeColumn
- @JsonSerialize(using = InstantDateSerializer.class)
- private Instant time;
-
- @Column(name = "line_id",tag = true)
- private String lineId;
-
- @Column(name = "phasic_type",tag = true)
- private String phaseType;
-
- @Column(name = "quality_flag",tag = true)
- private String qualityFlag;
-
- @Column(name = "value_type",tag = true)
- private String valueType;
-
- @Column(name = "s")
- private Double s;
-
- @Column(name = "s_1")
- private Double s1;
-
- @Column(name = "s_2")
- private Double s2;
-
- @Column(name = "s_3")
- private Double s3;
-
- @Column(name = "s_4")
- private Double s4;
-
- @Column(name = "s_5")
- private Double s5;
-
- @Column(name = "s_6")
- private Double s6;
-
- @Column(name = "s_7")
- private Double s7;
-
- @Column(name = "s_8")
- private Double s8;
-
- @Column(name = "s_9")
- private Double s9;
-
- @Column(name = "s_10")
- private Double s10;
-
- @Column(name = "s_11")
- private Double s11;
-
- @Column(name = "s_12")
- private Double s12;
-
- @Column(name = "s_13")
- private Double s13;
-
- @Column(name = "s_14")
- private Double s14;
-
- @Column(name = "s_15")
- private Double s15;
-
- @Column(name = "s_16")
- private Double s16;
-
- @Column(name = "s_17")
- private Double s17;
-
- @Column(name = "s_18")
- private Double s18;
-
- @Column(name = "s_19")
- private Double s19;
-
- @Column(name = "s_20")
- private Double s20;
-
- @Column(name = "s_21")
- private Double s21;
-
- @Column(name = "s_22")
- private Double s22;
-
- @Column(name = "s_23")
- private Double s23;
-
- @Column(name = "s_24")
- private Double s24;
-
- @Column(name = "s_25")
- private Double s25;
-
- @Column(name = "s_26")
- private Double s26;
-
- @Column(name = "s_27")
- private Double s27;
-
- @Column(name = "s_28")
- private Double s28;
-
- @Column(name = "s_29")
- private Double s29;
-
- @Column(name = "s_30")
- private Double s30;
-
- @Column(name = "s_31")
- private Double s31;
-
- @Column(name = "s_32")
- private Double s32;
-
- @Column(name = "s_33")
- private Double s33;
-
- @Column(name = "s_34")
- private Double s34;
-
- @Column(name = "s_35")
- private Double s35;
-
- @Column(name = "s_36")
- private Double s36;
-
- @Column(name = "s_37")
- private Double s37;
-
- @Column(name = "s_38")
- private Double s38;
-
- @Column(name = "s_39")
- private Double s39;
-
- @Column(name = "s_40")
- private Double s40;
-
- @Column(name = "s_41")
- private Double s41;
-
- @Column(name = "s_42")
- private Double s42;
-
- @Column(name = "s_43")
- private Double s43;
-
- @Column(name = "s_44")
- private Double s44;
-
- @Column(name = "s_45")
- private Double s45;
-
- @Column(name = "s_46")
- private Double s46;
-
- @Column(name = "s_47")
- private Double s47;
-
- @Column(name = "s_48")
- private Double s48;
-
- @Column(name = "s_49")
- private Double s49;
-
- @Column(name = "s_50")
- private Double s50;
-
-}
diff --git a/pqs-influx/src/main/java/com/njcn/influx/pojo/po/day/DayHarmRateI.java b/pqs-influx/src/main/java/com/njcn/influx/pojo/po/day/DayHarmRateI.java
deleted file mode 100644
index d3598e66a..000000000
--- a/pqs-influx/src/main/java/com/njcn/influx/pojo/po/day/DayHarmRateI.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.njcn.influx.pojo.po.day;
-
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import org.influxdb.annotation.Measurement;
-
-/**
- * 类的介绍:
- *
- * @author xuyang
- * @version 1.0.0
- * @createTime 2022/5/12 11:27
- */
-@EqualsAndHashCode(callSuper = true)
-@Data
-@Measurement(name = "day_harmrate_i")
-public class DayHarmRateI extends DayHarmPhasicI {
-}
diff --git a/pqs-influx/src/main/java/com/njcn/influx/pojo/po/day/DayHarmRateV.java b/pqs-influx/src/main/java/com/njcn/influx/pojo/po/day/DayHarmRateV.java
deleted file mode 100644
index 7f2dfb699..000000000
--- a/pqs-influx/src/main/java/com/njcn/influx/pojo/po/day/DayHarmRateV.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.njcn.influx.pojo.po.day;
-
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import org.influxdb.annotation.Measurement;
-
-/**
- * 类的介绍:
- *
- * @author xuyang
- * @version 1.0.0
- * @createTime 2022/5/12 11:27
- */
-@EqualsAndHashCode(callSuper = true)
-@Data
-@Measurement(name = "day_harmrate_v")
-public class DayHarmRateV extends DayHarmPhasicV {
-}
diff --git a/pqs-influx/src/main/java/com/njcn/influx/pojo/po/day/DayI.java b/pqs-influx/src/main/java/com/njcn/influx/pojo/po/day/DayI.java
deleted file mode 100644
index 606ede879..000000000
--- a/pqs-influx/src/main/java/com/njcn/influx/pojo/po/day/DayI.java
+++ /dev/null
@@ -1,208 +0,0 @@
-package com.njcn.influx.pojo.po.day;
-
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.njcn.influx.utils.InstantDateSerializer;
-import lombok.Data;
-import org.influxdb.annotation.Column;
-import org.influxdb.annotation.Measurement;
-import org.influxdb.annotation.TimeColumn;
-
-import java.time.Instant;
-
-/**
- * 类的介绍:
- *
- * @author xuyang
- * @version 1.0.0
- * @createTime 2022/5/11 15:13
- */
-@Data
-@Measurement(name = "day_i")
-public class DayI {
-
- @Column(name = "time",tag = true)
- @TimeColumn
- @JsonSerialize(using = InstantDateSerializer.class)
- private Instant time;
-
- @Column(name = "line_id",tag = true)
- private String lineId;
-
- @Column(name = "phasic_type",tag = true)
- private String phaseType;
-
- @Column(name = "quality_flag",tag = true)
- private String qualityFlag;
-
- @Column(name = "value_type",tag = true)
- private String valueType;
-
- @Column(name = "i_neg")
- private Double iNeg;
-
- @Column(name = "i_pos")
- private Double iPos;
-
- @Column(name = "i_thd")
- private Double iThd;
-
- @Column(name = "i_unbalance")
- private Double iUnbalance;
-
- @Column(name = "i_zero")
- private Double iZero;
-
- @Column(name = "rms")
- private Double rms;
-
- @Column(name = "i_1")
- private Double i1;
-
- @Column(name = "i_2")
- private Double i2;
-
- @Column(name = "i_3")
- private Double i3;
-
- @Column(name = "i_4")
- private Double i4;
-
- @Column(name = "i_5")
- private Double i5;
-
- @Column(name = "i_6")
- private Double i6;
-
- @Column(name = "i_7")
- private Double i7;
-
- @Column(name = "i_8")
- private Double i8;
-
- @Column(name = "i_9")
- private Double i9;
-
- @Column(name = "i_10")
- private Double i10;
-
- @Column(name = "i_11")
- private Double i11;
-
- @Column(name = "i_12")
- private Double i12;
-
- @Column(name = "i_13")
- private Double i13;
-
- @Column(name = "i_14")
- private Double i14;
-
- @Column(name = "i_15")
- private Double i15;
-
- @Column(name = "i_16")
- private Double i16;
-
- @Column(name = "i_17")
- private Double i17;
-
- @Column(name = "i_18")
- private Double i18;
-
- @Column(name = "i_19")
- private Double i19;
-
- @Column(name = "i_20")
- private Double i20;
-
- @Column(name = "i_21")
- private Double i21;
-
- @Column(name = "i_22")
- private Double i22;
-
- @Column(name = "i_23")
- private Double i23;
-
- @Column(name = "i_24")
- private Double i24;
-
- @Column(name = "i_25")
- private Double i25;
-
- @Column(name = "i_26")
- private Double i26;
-
- @Column(name = "i_27")
- private Double i27;
-
- @Column(name = "i_28")
- private Double i28;
-
- @Column(name = "i_29")
- private Double i29;
-
- @Column(name = "i_30")
- private Double i30;
-
- @Column(name = "i_31")
- private Double i31;
-
- @Column(name = "i_32")
- private Double i32;
-
- @Column(name = "i_33")
- private Double i33;
-
- @Column(name = "i_34")
- private Double i34;
-
- @Column(name = "i_35")
- private Double i35;
-
- @Column(name = "i_36")
- private Double i36;
-
- @Column(name = "i_37")
- private Double i37;
-
- @Column(name = "i_38")
- private Double i38;
-
- @Column(name = "i_39")
- private Double i39;
-
- @Column(name = "i_40")
- private Double i40;
-
- @Column(name = "i_41")
- private Double i41;
-
- @Column(name = "i_42")
- private Double i42;
-
- @Column(name = "i_43")
- private Double i43;
-
- @Column(name = "i_44")
- private Double i44;
-
- @Column(name = "i_45")
- private Double i45;
-
- @Column(name = "i_46")
- private Double i46;
-
- @Column(name = "i_47")
- private Double i47;
-
- @Column(name = "i_48")
- private Double i48;
-
- @Column(name = "i_49")
- private Double i49;
-
- @Column(name = "i_50")
- private Double i50;
-
-}
diff --git a/pqs-influx/src/main/java/com/njcn/influx/pojo/po/day/DayInHarmI.java b/pqs-influx/src/main/java/com/njcn/influx/pojo/po/day/DayInHarmI.java
deleted file mode 100644
index e3992fb12..000000000
--- a/pqs-influx/src/main/java/com/njcn/influx/pojo/po/day/DayInHarmI.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.njcn.influx.pojo.po.day;
-
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import org.influxdb.annotation.Measurement;
-
-/**
- * 类的介绍:
- *
- * @author xuyang
- * @version 1.0.0
- * @createTime 2022/5/12 11:27
- */
-@EqualsAndHashCode(callSuper = true)
-@Data
-@Measurement(name = "day_inharm_i")
-public class DayInHarmI extends DayHarmPhasicI {
-
-
-}
diff --git a/pqs-influx/src/main/java/com/njcn/influx/pojo/po/day/DayInHarmRateI.java b/pqs-influx/src/main/java/com/njcn/influx/pojo/po/day/DayInHarmRateI.java
deleted file mode 100644
index 40993e1dc..000000000
--- a/pqs-influx/src/main/java/com/njcn/influx/pojo/po/day/DayInHarmRateI.java
+++ /dev/null
@@ -1,187 +0,0 @@
-package com.njcn.influx.pojo.po.day;
-
-import lombok.Data;
-import org.influxdb.annotation.Column;
-import org.influxdb.annotation.Measurement;
-import org.influxdb.annotation.TimeColumn;
-
-import java.time.Instant;
-
-/**
- * 类的介绍:
- *
- * @author xuyang
- * @version 1.0.0
- * @createTime 2022/5/12 9:13
- */
-@Data
-@Measurement(name = "day_inharmrate_i")
-public class DayInHarmRateI {
-
- @Column(name = "time")
- @TimeColumn
- private Instant time;
-
- @Column(name = "line_id",tag = true)
- private String lineId;
-
- @Column(name = "phasic_type",tag = true)
- private String phaseType;
-
- @Column(name = "quality_flag",tag = true)
- private String qualityFlag;
-
- @Column(name = "value_type",tag = true)
- private String valueType;
-
- @Column(name = "i_1")
- private Double i1;
-
- @Column(name = "i_2")
- private Double i2;
-
- @Column(name = "i_3")
- private Double i3;
-
- @Column(name = "i_4")
- private Double i4;
-
- @Column(name = "i_5")
- private Double i5;
-
- @Column(name = "i_6")
- private Double i6;
-
- @Column(name = "i_7")
- private Double i7;
-
- @Column(name = "i_8")
- private Double i8;
-
- @Column(name = "i_9")
- private Double i9;
-
- @Column(name = "i_10")
- private Double i10;
-
- @Column(name = "i_11")
- private Double i11;
-
- @Column(name = "i_12")
- private Double i12;
-
- @Column(name = "i_13")
- private Double i13;
-
- @Column(name = "i_14")
- private Double i14;
-
- @Column(name = "i_15")
- private Double i15;
-
- @Column(name = "i_16")
- private Double i16;
-
- @Column(name = "i_17")
- private Double i17;
-
- @Column(name = "i_18")
- private Double i18;
-
- @Column(name = "i_19")
- private Double i19;
-
- @Column(name = "i_20")
- private Double i20;
-
- @Column(name = "i_21")
- private Double i21;
-
- @Column(name = "i_22")
- private Double i22;
-
- @Column(name = "i_23")
- private Double i23;
-
- @Column(name = "i_24")
- private Double i24;
-
- @Column(name = "i_25")
- private Double i25;
-
- @Column(name = "i_26")
- private Double i26;
-
- @Column(name = "i_27")
- private Double i27;
-
- @Column(name = "i_28")
- private Double i28;
-
- @Column(name = "i_29")
- private Double i29;
-
- @Column(name = "i_30")
- private Double i30;
-
- @Column(name = "i_31")
- private Double i31;
-
- @Column(name = "i_32")
- private Double i32;
-
- @Column(name = "i_33")
- private Double i33;
-
- @Column(name = "i_34")
- private Double i34;
-
- @Column(name = "i_35")
- private Double i35;
-
- @Column(name = "i_36")
- private Double i36;
-
- @Column(name = "i_37")
- private Double i37;
-
- @Column(name = "i_38")
- private Double i38;
-
- @Column(name = "i_39")
- private Double i39;
-
- @Column(name = "i_40")
- private Double i40;
-
- @Column(name = "i_41")
- private Double i41;
-
- @Column(name = "i_42")
- private Double i42;
-
- @Column(name = "i_43")
- private Double i43;
-
- @Column(name = "i_44")
- private Double i44;
-
- @Column(name = "i_45")
- private Double i45;
-
- @Column(name = "i_46")
- private Double i46;
-
- @Column(name = "i_47")
- private Double i47;
-
- @Column(name = "i_48")
- private Double i48;
-
- @Column(name = "i_49")
- private Double i49;
-
- @Column(name = "i_50")
- private Double i50;
-
-}
diff --git a/pqs-influx/src/main/java/com/njcn/influx/pojo/po/day/DayInHarmRateV.java b/pqs-influx/src/main/java/com/njcn/influx/pojo/po/day/DayInHarmRateV.java
deleted file mode 100644
index 56dd0953b..000000000
--- a/pqs-influx/src/main/java/com/njcn/influx/pojo/po/day/DayInHarmRateV.java
+++ /dev/null
@@ -1,185 +0,0 @@
-package com.njcn.influx.pojo.po.day;
-
-import lombok.Data;
-import org.influxdb.annotation.Column;
-import org.influxdb.annotation.Measurement;
-
-import java.time.Instant;
-
-/**
- * 类的介绍:
- *
- * @author xuyang
- * @version 1.0.0
- * @createTime 2022/5/12 9:13
- */
-@Data
-@Measurement(name = "day_inharmrate_v")
-public class DayInHarmRateV {
-
- @Column(name = "time")
- private Instant time;
-
- @Column(name = "line_id",tag = true)
- private String lineId;
-
- @Column(name = "phasic_type",tag = true)
- private String phaseType;
-
- @Column(name = "quality_flag",tag = true)
- private String qualityFlag;
-
- @Column(name = "value_type",tag = true)
- private String valueType;
-
- @Column(name = "v_1")
- private Double v1;
-
- @Column(name = "v_2")
- private Double v2;
-
- @Column(name = "v_3")
- private Double v3;
-
- @Column(name = "v_4")
- private Double v4;
-
- @Column(name = "v_5")
- private Double v5;
-
- @Column(name = "v_6")
- private Double v6;
-
- @Column(name = "v_7")
- private Double v7;
-
- @Column(name = "v_8")
- private Double v8;
-
- @Column(name = "v_9")
- private Double v9;
-
- @Column(name = "v_10")
- private Double v10;
-
- @Column(name = "v_11")
- private Double v11;
-
- @Column(name = "v_12")
- private Double v12;
-
- @Column(name = "v_13")
- private Double v13;
-
- @Column(name = "v_14")
- private Double v14;
-
- @Column(name = "v_15")
- private Double v15;
-
- @Column(name = "v_16")
- private Double v16;
-
- @Column(name = "v_17")
- private Double v17;
-
- @Column(name = "v_18")
- private Double v18;
-
- @Column(name = "v_19")
- private Double v19;
-
- @Column(name = "v_20")
- private Double v20;
-
- @Column(name = "v_21")
- private Double v21;
-
- @Column(name = "v_22")
- private Double v22;
-
- @Column(name = "v_23")
- private Double v23;
-
- @Column(name = "v_24")
- private Double v24;
-
- @Column(name = "v_25")
- private Double v25;
-
- @Column(name = "v_26")
- private Double v26;
-
- @Column(name = "v_27")
- private Double v27;
-
- @Column(name = "v_28")
- private Double v28;
-
- @Column(name = "v_29")
- private Double v29;
-
- @Column(name = "v_30")
- private Double v30;
-
- @Column(name = "v_31")
- private Double v31;
-
- @Column(name = "v_32")
- private Double v32;
-
- @Column(name = "v_33")
- private Double v33;
-
- @Column(name = "v_34")
- private Double v34;
-
- @Column(name = "v_35")
- private Double v35;
-
- @Column(name = "v_36")
- private Double v36;
-
- @Column(name = "v_37")
- private Double v37;
-
- @Column(name = "v_38")
- private Double v38;
-
- @Column(name = "v_39")
- private Double v39;
-
- @Column(name = "v_40")
- private Double v40;
-
- @Column(name = "v_41")
- private Double v41;
-
- @Column(name = "v_42")
- private Double v42;
-
- @Column(name = "v_43")
- private Double v43;
-
- @Column(name = "v_44")
- private Double v44;
-
- @Column(name = "v_45")
- private Double v45;
-
- @Column(name = "v_46")
- private Double v46;
-
- @Column(name = "v_47")
- private Double v47;
-
- @Column(name = "v_48")
- private Double v48;
-
- @Column(name = "v_49")
- private Double v49;
-
- @Column(name = "v_50")
- private Double v50;
-
-}
diff --git a/pqs-influx/src/main/java/com/njcn/influx/pojo/po/day/DayInHarmV.java b/pqs-influx/src/main/java/com/njcn/influx/pojo/po/day/DayInHarmV.java
deleted file mode 100644
index 10410a24f..000000000
--- a/pqs-influx/src/main/java/com/njcn/influx/pojo/po/day/DayInHarmV.java
+++ /dev/null
@@ -1,187 +0,0 @@
-package com.njcn.influx.pojo.po.day;
-
-import lombok.Data;
-import org.influxdb.annotation.Column;
-import org.influxdb.annotation.Measurement;
-import org.influxdb.annotation.TimeColumn;
-
-import java.time.Instant;
-
-/**
- * 类的介绍:
- *
- * @author xuyang
- * @version 1.0.0
- * @createTime 2022/5/12 11:27
- */
-@Data
-@Measurement(name = "day_inharm_v")
-public class DayInHarmV {
-
- @Column(name = "time")
- @TimeColumn
- private Instant time;
-
- @Column(name = "line_id",tag = true)
- private String lineId;
-
- @Column(name = "phasic_type",tag = true)
- private String phaseType;
-
- @Column(name = "quality_flag",tag = true)
- private String qualityFlag;
-
- @Column(name = "value_type",tag = true)
- private String valueType;
-
- @Column(name = "v_1")
- private Double v1;
-
- @Column(name = "v_2")
- private Double v2;
-
- @Column(name = "v_3")
- private Double v3;
-
- @Column(name = "v_4")
- private Double v4;
-
- @Column(name = "v_5")
- private Double v5;
-
- @Column(name = "v_6")
- private Double v6;
-
- @Column(name = "v_7")
- private Double v7;
-
- @Column(name = "v_8")
- private Double v8;
-
- @Column(name = "v_9")
- private Double v9;
-
- @Column(name = "v_10")
- private Double v10;
-
- @Column(name = "v_11")
- private Double v11;
-
- @Column(name = "v_12")
- private Double v12;
-
- @Column(name = "v_13")
- private Double v13;
-
- @Column(name = "v_14")
- private Double v14;
-
- @Column(name = "v_15")
- private Double v15;
-
- @Column(name = "v_16")
- private Double v16;
-
- @Column(name = "v_17")
- private Double v17;
-
- @Column(name = "v_18")
- private Double v18;
-
- @Column(name = "v_19")
- private Double v19;
-
- @Column(name = "v_20")
- private Double v20;
-
- @Column(name = "v_21")
- private Double v21;
-
- @Column(name = "v_22")
- private Double v22;
-
- @Column(name = "v_23")
- private Double v23;
-
- @Column(name = "v_24")
- private Double v24;
-
- @Column(name = "v_25")
- private Double v25;
-
- @Column(name = "v_26")
- private Double v26;
-
- @Column(name = "v_27")
- private Double v27;
-
- @Column(name = "v_28")
- private Double v28;
-
- @Column(name = "v_29")
- private Double v29;
-
- @Column(name = "v_30")
- private Double v30;
-
- @Column(name = "v_31")
- private Double v31;
-
- @Column(name = "v_32")
- private Double v32;
-
- @Column(name = "v_33")
- private Double v33;
-
- @Column(name = "v_34")
- private Double v34;
-
- @Column(name = "v_35")
- private Double v35;
-
- @Column(name = "v_36")
- private Double v36;
-
- @Column(name = "v_37")
- private Double v37;
-
- @Column(name = "v_38")
- private Double v38;
-
- @Column(name = "v_39")
- private Double v39;
-
- @Column(name = "v_40")
- private Double v40;
-
- @Column(name = "v_41")
- private Double v41;
-
- @Column(name = "v_42")
- private Double v42;
-
- @Column(name = "v_43")
- private Double v43;
-
- @Column(name = "v_44")
- private Double v44;
-
- @Column(name = "v_45")
- private Double v45;
-
- @Column(name = "v_46")
- private Double v46;
-
- @Column(name = "v_47")
- private Double v47;
-
- @Column(name = "v_48")
- private Double v48;
-
- @Column(name = "v_49")
- private Double v49;
-
- @Column(name = "v_50")
- private Double v50;
-
-}
diff --git a/pqs-influx/src/main/java/com/njcn/influx/pojo/po/day/DayPlt.java b/pqs-influx/src/main/java/com/njcn/influx/pojo/po/day/DayPlt.java
deleted file mode 100644
index b07834fc6..000000000
--- a/pqs-influx/src/main/java/com/njcn/influx/pojo/po/day/DayPlt.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package com.njcn.influx.pojo.po.day;
-
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.njcn.influx.utils.InstantDateSerializer;
-import lombok.Data;
-import org.influxdb.annotation.Column;
-import org.influxdb.annotation.Measurement;
-import org.influxdb.annotation.TimeColumn;
-
-import java.time.Instant;
-
-/**
- * 类的介绍:
- *
- * @author xuyang
- * @version 1.0.0
- * @createTime 2022/4/12 16:01
- */
-@Data
-@Measurement(name = "day_plt")
-public class DayPlt {
-
- @Column(name = "time")
- @TimeColumn
- @JsonSerialize(using = InstantDateSerializer.class)
- private Instant time;
-
- @Column(name = "line_id",tag = true)
- private String lineId;
-
- @Column(name = "phasic_type",tag = true)
- private String phaseType;
-
- @Column(name = "value_type",tag = true)
- private String valueType;
-
- @Column(name = "quality_flag",tag = true)
- private String qualityFlag;
-
- @Column(name = "plt")
- private Double plt;
-
-}
diff --git a/pqs-influx/src/main/java/com/njcn/influx/pojo/po/day/DayV.java b/pqs-influx/src/main/java/com/njcn/influx/pojo/po/day/DayV.java
deleted file mode 100644
index 646652908..000000000
--- a/pqs-influx/src/main/java/com/njcn/influx/pojo/po/day/DayV.java
+++ /dev/null
@@ -1,235 +0,0 @@
-package com.njcn.influx.pojo.po.day;
-
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.njcn.influx.utils.InstantDateSerializer;
-import lombok.Data;
-import org.influxdb.annotation.Column;
-import org.influxdb.annotation.Measurement;
-import org.influxdb.annotation.TimeColumn;
-
-import java.time.Instant;
-
-/**
- * 类的介绍:
- *
- * @author xuyang
- * @version 1.0.0
- * @createTime 2022/4/7 10:00
- */
-@Data
-@Measurement(name = "day_v")
-public class DayV {
-
- @Column(name = "time",tag = true)
- @TimeColumn
- @JsonSerialize(using = InstantDateSerializer.class)
- private Instant time;
-
- @Column(name = "freq")
- private Double freq;
-
- @Column(name = "freq_dev")
- private Double freqDev;
-
- @Column(name = "quality_flag",tag = true)
- private String qualityFlag;
-
- @Column(name = "rms")
- private Double rms;
-
- @Column(name = "rms_lvr")
- private Double rmsLvr;
-
- @Column(name = "vl_dev")
- private Double vlDev;
-
- @Column(name = "vu_dev")
- private Double vuDev;
-
- @Column(name = "v_1")
- private Double v1;
-
- @Column(name = "v_2")
- private Double v2;
-
- @Column(name = "v_3")
- private Double v3;
-
- @Column(name = "v_4")
- private Double v4;
-
- @Column(name = "v_5")
- private Double v5;
-
- @Column(name = "v_6")
- private Double v6;
-
- @Column(name = "v_7")
- private Double v7;
-
- @Column(name = "v_8")
- private Double v8;
-
- @Column(name = "v_9")
- private Double v9;
-
- @Column(name = "v_10")
- private Double v10;
-
- @Column(name = "v_11")
- private Double v11;
-
- @Column(name = "v_12")
- private Double v12;
-
- @Column(name = "v_13")
- private Double v13;
-
- @Column(name = "v_14")
- private Double v14;
-
- @Column(name = "v_15")
- private Double v15;
-
- @Column(name = "v_16")
- private Double v16;
-
- @Column(name = "v_17")
- private Double v17;
-
- @Column(name = "v_18")
- private Double v18;
-
- @Column(name = "v_19")
- private Double v19;
-
- @Column(name = "v_20")
- private Double v20;
-
- @Column(name = "v_21")
- private Double v21;
-
- @Column(name = "v_22")
- private Double v22;
-
- @Column(name = "v_23")
- private Double v23;
-
- @Column(name = "v_24")
- private Double v24;
-
- @Column(name = "v_25")
- private Double v25;
-
- @Column(name = "v_26")
- private Double v26;
-
- @Column(name = "v_27")
- private Double v27;
-
- @Column(name = "v_28")
- private Double v28;
-
- @Column(name = "v_29")
- private Double v29;
-
- @Column(name = "v_30")
- private Double v30;
-
- @Column(name = "v_31")
- private Double v31;
-
- @Column(name = "v_32")
- private Double v32;
-
- @Column(name = "v_33")
- private Double v33;
-
- @Column(name = "v_34")
- private Double v34;
-
- @Column(name = "v_35")
- private Double v35;
-
- @Column(name = "v_36")
- private Double v36;
-
- @Column(name = "v_37")
- private Double v37;
-
- @Column(name = "v_38")
- private Double v38;
-
- @Column(name = "v_39")
- private Double v39;
-
- @Column(name = "v_40")
- private Double v40;
-
- @Column(name = "v_41")
- private Double v41;
-
- @Column(name = "v_42")
- private Double v42;
-
- @Column(name = "v_43")
- private Double v43;
-
- @Column(name = "v_44")
- private Double v44;
-
- @Column(name = "v_45")
- private Double v45;
-
- @Column(name = "v_46")
- private Double v46;
-
- @Column(name = "v_47")
- private Double v47;
-
- @Column(name = "v_48")
- private Double v48;
-
- @Column(name = "v_49")
- private Double v49;
-
- @Column(name = "v_50")
- private Double v50;
-
- @Column(name = "v_neg")
- private Double vNeg;
-
- @Column(name = "v_pos")
- private Double vPos;
-
- @Column(name = "v_thd")
- private Double vThd;
-
- @Column(name = "v_unbalance")
- private Double vUnbalance;
-
- @Column(name = "v_zero")
- private Double vZero;
-
- @Column(name = "line_id",tag = true)
- private String lineId;
-
- @Column(name = "phasic_type",tag = true)
- private String phasicType;
-
- @Column(name = "value_type",tag = true)
- private String valueType;
-
-
- //自定义字段-总计算次数
- @Column(name = "all_time")
- private Integer allTime;
-
- //自定义字段
- @Column(name = "mean")
- private Double mean;
-
- //自定义字段
- @Column(name = "count")
- private Integer count;
-}
diff --git a/pqs-influx/src/main/java/com/njcn/influx/service/CldStatisticsFlowService.java b/pqs-influx/src/main/java/com/njcn/influx/service/CldStatisticsFlowService.java
deleted file mode 100644
index 6c17008e8..000000000
--- a/pqs-influx/src/main/java/com/njcn/influx/service/CldStatisticsFlowService.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package com.njcn.influx.service;
-
-/**
- * @author hongawen
- * @version 1.0.0
- * @date 2023年05月05日 09:00
- */
-public interface CldStatisticsFlowService {
-}
diff --git a/pqs-influx/src/main/java/com/njcn/influx/service/CommonService.java b/pqs-influx/src/main/java/com/njcn/influx/service/CommonService.java
deleted file mode 100644
index 4a170651f..000000000
--- a/pqs-influx/src/main/java/com/njcn/influx/service/CommonService.java
+++ /dev/null
@@ -1,71 +0,0 @@
-package com.njcn.influx.service;
-
-import com.njcn.influx.pojo.bo.CommonQueryParam;
-import com.njcn.influx.pojo.dto.StatisticalDataDTO;
-
-import java.util.List;
-
-/**
- * Description:
- * Date: 2023/6/2 16:00【需求编号】
- *
- * @author clam
- * @version V1.0.0
- */
-public interface CommonService {
-
- /**
- * 根据条件获取监测点数据
- *
- * @param lineId 监测点Id
- * @param tableName 表名
- * @param columnName 字段名
- * @param phasic 相别
- * @param dataType 数据类型
- * @return
- */
- StatisticalDataDTO getLineRtData(String lineId, String tableName, String columnName, String phasic, String dataType, String clDId);
-
- /**
- * 根据条件获取监测点数据
- *
- */
- List getDeviceRtData(List commonQueryParams);
-
- /**
-
- * @Description: getDeviceRtDataByTime
- * @return: java.util.List
- * @Author: clam
- * @Date: 2023/6/13
- */
- List getDeviceRtDataByTime(List commonQueryParams);
-
- /**
- * 根据条件获取监测点时间范围内的最大最小值
- *
- * @param lineId 监测点Id
- * @param tableName 表名
- * @param columnName 字段名
- */
- StatisticalDataDTO getLineHistoryData(String lineId, String tableName, String columnName, String startTime, String endTime, String clDId);
-
- /***
- * 当表名、字段、统计方式均不确定时,代码拼接好sql
- * @author hongawen
- * @date 2023/7/14 15:23
- * @param sql influx-sql语句
- * @return StatisticalDataDTO
- */
- StatisticalDataDTO selectBySql(StringBuilder sql);
- /*获取各个模块温度数据*/
-
- /**
- *
- * @param lineId
- * @param tableName apf_data
- * @param columnName Apf_Temp_Env
- * @return
- */
- List getTopTemperature(String lineId,String tableName, String columnName,String process);
-}
diff --git a/pqs-influx/src/main/java/com/njcn/influx/service/DataFlickerService.java b/pqs-influx/src/main/java/com/njcn/influx/service/DataFlickerService.java
deleted file mode 100644
index 9b18d10d0..000000000
--- a/pqs-influx/src/main/java/com/njcn/influx/service/DataFlickerService.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package com.njcn.influx.service;
-
-import com.njcn.influx.pojo.dto.DataFlickerDTO;
-
-import java.util.List;
-
-/**
- * @author hongawen
- * @version 1.0.0
- * @date 2023年05月05日 09:04
- */
-public interface DataFlickerService {
-
- List getDataFlicker(String lineIndex, String startTime, String endTime);
-}
diff --git a/pqs-influx/src/main/java/com/njcn/influx/service/DataFlucService.java b/pqs-influx/src/main/java/com/njcn/influx/service/DataFlucService.java
deleted file mode 100644
index fd6d64155..000000000
--- a/pqs-influx/src/main/java/com/njcn/influx/service/DataFlucService.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package com.njcn.influx.service;
-
-/**
- * @author hongawen
- * @version 1.0.0
- * @date 2023年05月05日 09:10
- */
-public interface DataFlucService {
-}
diff --git a/pqs-influx/src/main/java/com/njcn/influx/service/DataHarmPhasicIService.java b/pqs-influx/src/main/java/com/njcn/influx/service/DataHarmPhasicIService.java
deleted file mode 100644
index 56a0879e9..000000000
--- a/pqs-influx/src/main/java/com/njcn/influx/service/DataHarmPhasicIService.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package com.njcn.influx.service;
-
-/**
- * @author hongawen
- * @version 1.0.0
- * @date 2023年05月05日 09:46
- */
-public interface DataHarmPhasicIService {
-}
diff --git a/pqs-influx/src/main/java/com/njcn/influx/service/DataHarmPhasicVService.java b/pqs-influx/src/main/java/com/njcn/influx/service/DataHarmPhasicVService.java
deleted file mode 100644
index d4c458be7..000000000
--- a/pqs-influx/src/main/java/com/njcn/influx/service/DataHarmPhasicVService.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package com.njcn.influx.service;
-
-/**
- * @author hongawen
- * @version 1.0.0
- * @date 2023年05月05日 09:50
- */
-public interface DataHarmPhasicVService {
-}
diff --git a/pqs-influx/src/main/java/com/njcn/influx/service/DataHarmPowerPService.java b/pqs-influx/src/main/java/com/njcn/influx/service/DataHarmPowerPService.java
deleted file mode 100644
index 0285d79ec..000000000
--- a/pqs-influx/src/main/java/com/njcn/influx/service/DataHarmPowerPService.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package com.njcn.influx.service;
-
-
-import com.njcn.influx.pojo.po.DataHarmPowerP;
-
-import java.util.List;
-
-/**
- * @author hongawen
- * @version 1.0.0
- * @date 2023年05月05日 09:51
- */
-public interface DataHarmPowerPService {
- List getHarmonicPowerP(String lineIndex, String startTime, String endTime);
-}
diff --git a/pqs-influx/src/main/java/com/njcn/influx/service/DataHarmPowerQService.java b/pqs-influx/src/main/java/com/njcn/influx/service/DataHarmPowerQService.java
deleted file mode 100644
index 2f6fe2eba..000000000
--- a/pqs-influx/src/main/java/com/njcn/influx/service/DataHarmPowerQService.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package com.njcn.influx.service;
-
-
-import com.njcn.influx.pojo.po.DataHarmPowerQ;
-
-import java.util.List;
-
-/**
- * @author hongawen
- * @version 1.0.0
- * @date 2023年05月05日 09:51
- */
-public interface DataHarmPowerQService {
- List getHarmonicPowerQ(String lineIndex, String startTime, String endTime);
-}
diff --git a/pqs-influx/src/main/java/com/njcn/influx/service/DataHarmRateVService.java b/pqs-influx/src/main/java/com/njcn/influx/service/DataHarmRateVService.java
deleted file mode 100644
index f0c39fd6e..000000000
--- a/pqs-influx/src/main/java/com/njcn/influx/service/DataHarmRateVService.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.njcn.influx.service;
-
-import com.njcn.influx.pojo.po.DataHarmRateV;
-import com.njcn.influx.query.InfluxQueryWrapper;
-
-/**
- * @author hongawen
- * @version 1.0.0
- * @date 2023年07月17日 11:01
- */
-public interface DataHarmRateVService {
- DataHarmRateV getMeanAllTimesData(InfluxQueryWrapper influxQueryWrapper);
-}
diff --git a/pqs-influx/src/main/java/com/njcn/influx/service/EvtDataService.java b/pqs-influx/src/main/java/com/njcn/influx/service/EvtDataService.java
deleted file mode 100644
index 75ac5b605..000000000
--- a/pqs-influx/src/main/java/com/njcn/influx/service/EvtDataService.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package com.njcn.influx.service;
-
-import com.njcn.influx.pojo.dto.EventDataSetDTO;
-import com.njcn.influx.pojo.dto.EventQueryDTO;
-import com.njcn.influx.pojo.dto.StatisticalDataDTO;
-import com.njcn.influx.pojo.po.cs.EntData;
-
-import java.util.List;
-
-/**
- * Description:
- * Date: 2023/6/2 16:00【需求编号】
- *
- * @author clam
- * @version V1.0.0
- */
-public interface EvtDataService {
-
-
-
- /**
- * @Description: getEventData
- * @Param:
- * @return: java.util.List
- * @Author: clam
- * @Date: 2023/8/30
- */
- @Deprecated
- List getEventData(EventQueryDTO eventQueryDTO);
-
- EventDataSetDTO getEventDataSet(String tableName,String uuid,String columnName );
-}
diff --git a/pqs-influx/src/main/java/com/njcn/influx/service/HaronicRatioService.java b/pqs-influx/src/main/java/com/njcn/influx/service/HaronicRatioService.java
deleted file mode 100644
index 2c7c7d809..000000000
--- a/pqs-influx/src/main/java/com/njcn/influx/service/HaronicRatioService.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.njcn.influx.service;
-
-import com.njcn.influx.pojo.po.HarmonicRatioData;
-
-import java.util.List;
-
-public interface HaronicRatioService {
- /**
- * @Description: 获取指标最新数据
- * @Param:
- * @return: java.util.List
- * @Author: clam
- * @Date: 2023/5/23
- */
- List getFirstHaronicRatio(List lineIds,String columnName);
- /**
- * @Description: 获取指标时间断内数据
- * @Param:
- * @return: java.util.List
- * @Author: clam
- * @Date: 2023/5/23
- */
- List getHaronicRatio(List lineIds, String columnName, String startTime, String endTime);
-
-}
diff --git a/pqs-influx/src/main/java/com/njcn/influx/service/IDataIService.java b/pqs-influx/src/main/java/com/njcn/influx/service/IDataIService.java
deleted file mode 100644
index d908f12ff..000000000
--- a/pqs-influx/src/main/java/com/njcn/influx/service/IDataIService.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.njcn.influx.service;
-
-import com.njcn.influx.pojo.po.DataI;
-import com.njcn.influx.query.InfluxQueryWrapper;
-
-import java.util.List;
-
-/**
- * @author hongawen
- * @version 1.0.0
- * @date 2023年07月17日 11:04
- */
-public interface IDataIService {
-
- DataI getMeanAllTimesData(InfluxQueryWrapper influxQueryWrapper);
- /**
- * @Description: getWeekDataI 承载能力评估获取一周数据
- * @Param:
- * @return: java.util.List
- * @Author: clam
- * @Date: 2024/2/27
- */
- List getWeekDataI(String lineIndex, String startTime, String endTime);
-}
diff --git a/pqs-influx/src/main/java/com/njcn/influx/service/IDataVService.java b/pqs-influx/src/main/java/com/njcn/influx/service/IDataVService.java
deleted file mode 100644
index 0876dc3f6..000000000
--- a/pqs-influx/src/main/java/com/njcn/influx/service/IDataVService.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.njcn.influx.service;
-
-import com.njcn.influx.pojo.po.DataV;
-
-import java.util.List;
-
-public interface IDataVService {
-
- List getDataV(String lineIndex, String startTime, String endTime);
- List getHarmonicDataV(String lineIndex, String startTime, String endTime);
-
-}
diff --git a/pqs-influx/src/main/java/com/njcn/influx/service/PowerQualityService.java b/pqs-influx/src/main/java/com/njcn/influx/service/PowerQualityService.java
deleted file mode 100644
index 3022c1d4a..000000000
--- a/pqs-influx/src/main/java/com/njcn/influx/service/PowerQualityService.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.njcn.influx.service;
-
-import com.njcn.influx.pojo.po.PowerQualityData;
-
-import java.util.List;
-
-public interface PowerQualityService {
- /**
- * @Description: 获取指标最新数据
- * @Param:
- * @return: java.util.List
- * @Author: clam
- * @Date: 2023/5/23
- */
- List getFirstPowerQuality(List lineIds,String columnName);
- /**
- * @Description: 获取指标时间断内数据
- * @Param:
- * @return: java.util.List
- * @Author: clam
- * @Date: 2023/5/23
- */
- List getPowerQuality(List lineIds,String columnName, String startTime, String endTime);
-
-}
diff --git a/pqs-influx/src/main/java/com/njcn/influx/service/PqsCommunicateService.java b/pqs-influx/src/main/java/com/njcn/influx/service/PqsCommunicateService.java
deleted file mode 100644
index 4eab844c6..000000000
--- a/pqs-influx/src/main/java/com/njcn/influx/service/PqsCommunicateService.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package com.njcn.influx.service;
-
-/**
- * @author hongawen
- * @version 1.0.0
- * @date 2023年08月09日 09:28
- */
-public interface PqsCommunicateService {
-}
diff --git a/pqs-influx/src/main/java/com/njcn/influx/service/impl/CldStatisticsFlowServiceImpl.java b/pqs-influx/src/main/java/com/njcn/influx/service/impl/CldStatisticsFlowServiceImpl.java
deleted file mode 100644
index 6ee060267..000000000
--- a/pqs-influx/src/main/java/com/njcn/influx/service/impl/CldStatisticsFlowServiceImpl.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package com.njcn.influx.service.impl;
-
-import com.njcn.influx.service.CldStatisticsFlowService;
-import org.springframework.stereotype.Service;
-
-/**
- * @author hongawen
- * @version 1.0.0
- * @date 2023年05月05日 09:00
- */
-@Service
-public class CldStatisticsFlowServiceImpl implements CldStatisticsFlowService {
-
-}
diff --git a/pqs-influx/src/main/java/com/njcn/influx/service/impl/CommonServiceImpl.java b/pqs-influx/src/main/java/com/njcn/influx/service/impl/CommonServiceImpl.java
deleted file mode 100644
index a2bb79458..000000000
--- a/pqs-influx/src/main/java/com/njcn/influx/service/impl/CommonServiceImpl.java
+++ /dev/null
@@ -1,114 +0,0 @@
-package com.njcn.influx.service.impl;
-
-import com.njcn.influx.imapper.CommonMapper;
-import com.njcn.influx.pojo.bo.CommonQueryParam;
-import com.njcn.influx.pojo.constant.InfluxDBTableConstant;
-import com.njcn.influx.pojo.dto.StatisticalDataDTO;
-import com.njcn.influx.query.InfluxQueryWrapper;
-import com.njcn.influx.service.CommonService;
-import lombok.RequiredArgsConstructor;
-import org.springframework.stereotype.Service;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Description:
- * Date: 2023/6/2 16:04【需求编号】
- *
- * @author clam
- * @version V1.0.0
- */
-@Service
-@RequiredArgsConstructor
-public class CommonServiceImpl implements CommonService {
-
- private final CommonMapper commonMapper;
-
- @Override
- public StatisticalDataDTO getLineRtData(String lineId, String tableName, String columnName, String phasic, String dataType, String clDid) {
- InfluxQueryWrapper influxQueryWrapper = new InfluxQueryWrapper(tableName,StatisticalDataDTO.class);
- influxQueryWrapper.select(StatisticalDataDTO::getLineId)
- .select(StatisticalDataDTO::getPhaseType)
- .select(StatisticalDataDTO::getValueType)
- .last(columnName)
- .eq(InfluxDBTableConstant.LINE_ID,lineId)
- .eq(InfluxDBTableConstant.PHASIC_TYPE,phasic)
- .eq(InfluxDBTableConstant.VALUE_TYPE,dataType)
- .eq(InfluxDBTableConstant.CL_DID,clDid);
- return commonMapper.getLineRtData(influxQueryWrapper);
- }
-
- @Override
- public List getDeviceRtData(List commonQueryParams) {
- List resultList = new ArrayList<>();
- for (CommonQueryParam commonQueryParam: commonQueryParams) {
- InfluxQueryWrapper influxQueryWrapper = new InfluxQueryWrapper(commonQueryParam.getTableName(),StatisticalDataDTO.class);
- influxQueryWrapper.select(StatisticalDataDTO::getLineId)
- .select(StatisticalDataDTO::getPhaseType)
- .select(StatisticalDataDTO::getValueType)
- .last(commonQueryParam.getColumnName(),InfluxDBTableConstant.VALUE)
- .eq(InfluxDBTableConstant.LINE_ID,commonQueryParam.getLineId())
- .eq(InfluxDBTableConstant.PROCESS,commonQueryParam.getProcess())
- .eq(InfluxDBTableConstant.PHASIC_TYPE,commonQueryParam.getPhasic())
- .eq(InfluxDBTableConstant.VALUE_TYPE,commonQueryParam.getDataType()).eq(InfluxDBTableConstant.CL_DID,commonQueryParam.getClDid());
- List deviceRtData = commonMapper.getDeviceRtData(influxQueryWrapper);
- resultList.addAll(deviceRtData);
- }
-
- return resultList;
- }
-
- @Override
- public List getDeviceRtDataByTime(List commonQueryParams) {
- List resultList = new ArrayList<>();
- for (CommonQueryParam commonQueryParam: commonQueryParams) {
- InfluxQueryWrapper influxQueryWrapper = new InfluxQueryWrapper(commonQueryParam.getTableName(), StatisticalDataDTO.class);
- influxQueryWrapper.select(StatisticalDataDTO::getLineId)
- .select(StatisticalDataDTO::getPhaseType)
- .select(StatisticalDataDTO::getValueType)
- .select(commonQueryParam.getColumnName(), InfluxDBTableConstant.VALUE)
- .eq(InfluxDBTableConstant.LINE_ID, commonQueryParam.getLineId())
- .eq(InfluxDBTableConstant.PHASIC_TYPE, commonQueryParam.getPhasic())
- .eq(InfluxDBTableConstant.PROCESS, commonQueryParam.getProcess())
- .between(InfluxDBTableConstant.TIME, commonQueryParam.getStartTime(), commonQueryParam.getEndTime())
- .eq(InfluxDBTableConstant.VALUE_TYPE, commonQueryParam.getDataType()).eq(InfluxDBTableConstant.CL_DID, commonQueryParam.getClDid());
- List deviceRtData = commonMapper.getDeviceRtDataByTime(influxQueryWrapper);
- resultList.addAll(deviceRtData);
- }
-
- return resultList;
- }
-
- @Override
- public StatisticalDataDTO getLineHistoryData(String lineId, String tableName, String columnName, String startTime, String endTime, String clDid) {
- InfluxQueryWrapper influxQueryWrapper = new InfluxQueryWrapper(tableName,StatisticalDataDTO.class);
- influxQueryWrapper.max(columnName,InfluxDBTableConstant.MAX_VALUE)
- .min(columnName,InfluxDBTableConstant.MIN_VALUE)
- .mean(columnName,InfluxDBTableConstant.AVG_VALUE)
- .eq(InfluxDBTableConstant.LINE_ID,lineId)
- .eq(InfluxDBTableConstant.CL_DID,clDid)
- .between(InfluxDBTableConstant.TIME, startTime, endTime);
- return commonMapper.getLineHistoryData(influxQueryWrapper);
- }
-
- @Override
- public StatisticalDataDTO selectBySql(StringBuilder sql) {
- return commonMapper.selectBySql(sql);
- }
-
- @Override
- public List getTopTemperature(String lineId, String tableName, String columnName,String process) {
- InfluxQueryWrapper influxQueryWrapper = new InfluxQueryWrapper(tableName,StatisticalDataDTO.class);
- influxQueryWrapper.select(StatisticalDataDTO::getLineId)
- .select(StatisticalDataDTO::getClDid)
- .last(columnName,InfluxDBTableConstant.VALUE)
- .eq(InfluxDBTableConstant.LINE_ID,lineId)
- .eq(InfluxDBTableConstant.PROCESS,process)
- .groupBy(InfluxDBTableConstant.CL_DID);
- return commonMapper.getTopTemperature(influxQueryWrapper);
- }
-
-
-
-}
diff --git a/pqs-influx/src/main/java/com/njcn/influx/service/impl/DataFlickerServiceImpl.java b/pqs-influx/src/main/java/com/njcn/influx/service/impl/DataFlickerServiceImpl.java
deleted file mode 100644
index 148f49ce4..000000000
--- a/pqs-influx/src/main/java/com/njcn/influx/service/impl/DataFlickerServiceImpl.java
+++ /dev/null
@@ -1,95 +0,0 @@
-package com.njcn.influx.service.impl;
-
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.njcn.influx.imapper.DataFlickerMapper;
-import com.njcn.influx.pojo.dto.DataFlickerDTO;
-import com.njcn.influx.pojo.po.DataFlicker;
-import com.njcn.influx.query.InfluxQueryWrapper;
-import com.njcn.influx.service.DataFlickerService;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * @author hongawen
- * @version 1.0.0
- * @date 2023年05月05日 09:05
- */
-@Service
-public class DataFlickerServiceImpl implements DataFlickerService {
-
- @Resource
- private DataFlickerMapper dataFlickerMapper;
-
-
- @Override
- public List getDataFlicker(String lineIndex, String startTime, String endTime) {
- //最小值
- List result1 ;
- InfluxQueryWrapper influxQueryWrapper = new InfluxQueryWrapper(DataFlicker.class, DataFlickerDTO.class);
- influxQueryWrapper.eq(DataFlicker::getLineId, lineIndex)
- .min(DataFlicker::getFluc)
- .min(DataFlicker::getPlt)
- .min(DataFlicker::getPst)
- .groupBy(DataFlicker::getLineId,DataFlicker::getPhaseType,DataFlicker::getQualityFlag)
- .between(DataFlicker::getTime, startTime, endTime);
- result1 = dataFlickerMapper.getStatisticsByWraper(influxQueryWrapper);
- result1.forEach(item -> {
- item.setValueType("MIN");
- });
- //最大值
- List result2 ;
- influxQueryWrapper.initSql();
- influxQueryWrapper.eq(DataFlicker::getLineId, lineIndex)
- .max(DataFlicker::getFluc)
- .max(DataFlicker::getPlt)
- .max(DataFlicker::getPst)
- .groupBy(DataFlicker::getLineId,DataFlicker::getPhaseType,DataFlicker::getQualityFlag)
- .between(DataFlicker::getTime, startTime, endTime);
- result2 = dataFlickerMapper.getStatisticsByWraper(influxQueryWrapper);
- result2.forEach(item -> {
- item.setValueType("MAX");
- });
- //平均值
- List result3 ;
- influxQueryWrapper.initSql();
- influxQueryWrapper.eq(DataFlicker::getLineId, lineIndex)
- .mean(DataFlicker::getFluc)
- .mean(DataFlicker::getPlt)
- .mean(DataFlicker::getPst)
- .groupBy(DataFlicker::getLineId,DataFlicker::getPhaseType,DataFlicker::getQualityFlag)
- .between(DataFlicker::getTime, startTime, endTime);
- result3 = dataFlickerMapper.getStatisticsByWraper(influxQueryWrapper);
- result3.forEach(item -> {
- item.setValueType("AVG");
- });
- List result4 ;
- influxQueryWrapper.initSql();
- influxQueryWrapper.eq(DataFlicker::getLineId, lineIndex)
- .percentile(DataFlicker::getFluc, 95)
- .percentile(DataFlicker::getPlt, 95)
- .percentile(DataFlicker::getPst, 95)
- .groupBy(DataFlicker::getLineId,DataFlicker::getPhaseType,DataFlicker::getQualityFlag)
- .between(DataFlicker::getTime, startTime, endTime);
- //CP95值
- result4 = dataFlickerMapper.getStatisticsByWraper(influxQueryWrapper);
- result4.forEach(item -> {
- item.setValueType("CP95");
- });
- List result = new ArrayList<>();
- result.addAll(result1);
- result.addAll(result2);
- result.addAll(result3);
- result.addAll(result4);
- ObjectMapper objectMapper = new ObjectMapper();
- try {
- System.out.println(objectMapper.writeValueAsString(result));
- } catch (JsonProcessingException e) {
- throw new RuntimeException(e);
- }
- return result;
- }
-}
diff --git a/pqs-influx/src/main/java/com/njcn/influx/service/impl/DataFlucServiceImpl.java b/pqs-influx/src/main/java/com/njcn/influx/service/impl/DataFlucServiceImpl.java
deleted file mode 100644
index 7f793deb4..000000000
--- a/pqs-influx/src/main/java/com/njcn/influx/service/impl/DataFlucServiceImpl.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.njcn.influx.service.impl;
-
-import org.springframework.stereotype.Service;
-
-/**
- * @author hongawen
- * @version 1.0.0
- * @date 2023年05月05日 09:10
- */
-@Service
-public class DataFlucServiceImpl {
-}
diff --git a/pqs-influx/src/main/java/com/njcn/influx/service/impl/DataHarmPhasicIServiceImpl.java b/pqs-influx/src/main/java/com/njcn/influx/service/impl/DataHarmPhasicIServiceImpl.java
deleted file mode 100644
index f9edccec3..000000000
--- a/pqs-influx/src/main/java/com/njcn/influx/service/impl/DataHarmPhasicIServiceImpl.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.njcn.influx.service.impl;
-
-import com.njcn.influx.service.DataHarmPhasicIService;
-import org.springframework.stereotype.Service;
-
-/**
- * @author hongawen
- * @version 1.0.0
- * @date 2023年05月05日 09:46
- */
-@Service
-public class DataHarmPhasicIServiceImpl implements DataHarmPhasicIService {
-}
diff --git a/pqs-influx/src/main/java/com/njcn/influx/service/impl/DataHarmPhasicVServiceImpl.java b/pqs-influx/src/main/java/com/njcn/influx/service/impl/DataHarmPhasicVServiceImpl.java
deleted file mode 100644
index 7300a2b9d..000000000
--- a/pqs-influx/src/main/java/com/njcn/influx/service/impl/DataHarmPhasicVServiceImpl.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.njcn.influx.service.impl;
-
-import com.njcn.influx.service.DataHarmPhasicVService;
-import org.springframework.stereotype.Service;
-
-/**
- * @author hongawen
- * @version 1.0.0
- * @date 2023年05月05日 09:50
- */
-@Service
-public class DataHarmPhasicVServiceImpl implements DataHarmPhasicVService {
-}
diff --git a/pqs-influx/src/main/java/com/njcn/influx/service/impl/DataHarmPowerPServiceImpl.java b/pqs-influx/src/main/java/com/njcn/influx/service/impl/DataHarmPowerPServiceImpl.java
deleted file mode 100644
index d0f9b7447..000000000
--- a/pqs-influx/src/main/java/com/njcn/influx/service/impl/DataHarmPowerPServiceImpl.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package com.njcn.influx.service.impl;
-
-import com.njcn.influx.imapper.DataHarmPowerPMapper;
-import com.njcn.influx.pojo.po.DataHarmPowerP;
-import com.njcn.influx.query.InfluxQueryWrapper;
-import com.njcn.influx.service.DataHarmPowerPService;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-/**
- * @author hongawen
- * @version 1.0.0
- * @date 2023年05月05日 09:51
- */
-@Service
-public class DataHarmPowerPServiceImpl implements DataHarmPowerPService {
- @Resource
- private DataHarmPowerPMapper dataHarmPowerPMapper;
- @Override
- public List getHarmonicPowerP(String lineIndex, String startTime, String endTime) {
- List result1 ;
- InfluxQueryWrapper influxQueryWrapper = new InfluxQueryWrapper(DataHarmPowerP.class);
- influxQueryWrapper.eq(DataHarmPowerP::getLineId, lineIndex)
- .eq(DataHarmPowerP::getValueType, "AVG")
- .eq(DataHarmPowerP::getPhaseType, "T")
- .between(DataHarmPowerP::getTime, startTime, endTime);
- result1 = dataHarmPowerPMapper.getStatisticsByWraper(influxQueryWrapper);
- return result1;
- }
-}
diff --git a/pqs-influx/src/main/java/com/njcn/influx/service/impl/DataHarmPowerQServiceImpl.java b/pqs-influx/src/main/java/com/njcn/influx/service/impl/DataHarmPowerQServiceImpl.java
deleted file mode 100644
index d98f09f49..000000000
--- a/pqs-influx/src/main/java/com/njcn/influx/service/impl/DataHarmPowerQServiceImpl.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package com.njcn.influx.service.impl;
-
-import com.njcn.influx.imapper.DataHarmPowerQMapper;
-import com.njcn.influx.pojo.po.DataHarmPowerP;
-import com.njcn.influx.pojo.po.DataHarmPowerQ;
-import com.njcn.influx.query.InfluxQueryWrapper;
-import com.njcn.influx.service.DataHarmPowerQService;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-/**
- * Description:
- * Date: 2024/2/27 14:50【需求编号】
- *
- * @author clam
- * @version V1.0.0
- */
-@Service
-public class DataHarmPowerQServiceImpl implements DataHarmPowerQService {
- @Resource
- private DataHarmPowerQMapper dataHarmPowerQMapper;
- @Override
- public List getHarmonicPowerQ(String lineIndex, String startTime, String endTime) {
- List result1 ;
- InfluxQueryWrapper influxQueryWrapper = new InfluxQueryWrapper(DataHarmPowerP.class);
- influxQueryWrapper.eq(DataHarmPowerQ::getLineId, lineIndex)
- .eq(DataHarmPowerQ::getValueType, "AVG")
- .eq(DataHarmPowerQ::getPhaseType, "T")
- .between(DataHarmPowerQ::getTime, startTime, endTime);
- result1 = dataHarmPowerQMapper.getStatisticsByWraper(influxQueryWrapper);
- return result1;
- }
-}
diff --git a/pqs-influx/src/main/java/com/njcn/influx/service/impl/DataHarmRateVServiceImpl.java b/pqs-influx/src/main/java/com/njcn/influx/service/impl/DataHarmRateVServiceImpl.java
deleted file mode 100644
index 77757f383..000000000
--- a/pqs-influx/src/main/java/com/njcn/influx/service/impl/DataHarmRateVServiceImpl.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.njcn.influx.service.impl;
-
-import com.njcn.influx.imapper.DataHarmRateVMapper;
-import com.njcn.influx.pojo.po.DataHarmRateV;
-import com.njcn.influx.query.InfluxQueryWrapper;
-import com.njcn.influx.service.DataHarmRateVService;
-import lombok.RequiredArgsConstructor;
-import org.springframework.stereotype.Service;
-
-/**
- * @author hongawen
- * @version 1.0.0
- * @date 2023年07月17日 11:02
- */
-@Service
-@RequiredArgsConstructor
-public class DataHarmRateVServiceImpl implements DataHarmRateVService {
-
- private final DataHarmRateVMapper dataHarmRateVMapper;
-
-
- @Override
- public DataHarmRateV getMeanAllTimesData(InfluxQueryWrapper influxQueryWrapper) {
- return dataHarmRateVMapper.getMeanAllTimesData(influxQueryWrapper);
- }
-}
diff --git a/pqs-influx/src/main/java/com/njcn/influx/service/impl/DataVServiceImpl.java b/pqs-influx/src/main/java/com/njcn/influx/service/impl/DataVServiceImpl.java
deleted file mode 100644
index 35ec33f2d..000000000
--- a/pqs-influx/src/main/java/com/njcn/influx/service/impl/DataVServiceImpl.java
+++ /dev/null
@@ -1,80 +0,0 @@
-package com.njcn.influx.service.impl;
-
-import com.njcn.influx.imapper.DataVMapper;
-import com.njcn.influx.pojo.po.DataV;
-import com.njcn.influx.query.InfluxQueryWrapper;
-import com.njcn.influx.service.IDataVService;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * 类的介绍:
- *
- * @author xuyang
- * @version 1.0.0
- * @createTime 2023/5/5 14:38
- */
-@Service
-public class DataVServiceImpl implements IDataVService {
-
- @Resource
- private DataVMapper dataVMapper;
-
- @Override
- public List getDataV(String lineIndex, String startTime, String endTime) {
- //最小值
- List result1 ;
- InfluxQueryWrapper influxQueryWrapper = new InfluxQueryWrapper(DataV.class);
- influxQueryWrapper.minSamePrefixAndSuffix("v_","", this.harmonicTimesList(1,50,1));
- influxQueryWrapper.eq(DataV::getLineId, lineIndex)
- .eq(DataV::getValueType, "MIN")
- .min(DataV::getFreq)
- .min(DataV::getFreqDev)
- .min(DataV::getRms)
- .min(DataV::getRmsLvr)
- .min(DataV::getVNeg)
- .min(DataV::getVPos)
- .min(DataV::getVThd)
- .min(DataV::getVUnbalance)
- .min(DataV::getVZero)
- .min(DataV::getVlDev)
- .min(DataV::getVuDev)
- .groupBy(DataV::getLineId,DataV::getPhasicType,DataV::getQualityFlag,DataV::getValueType)
- .between(DataV::getTime, startTime, endTime);
- result1 = dataVMapper.getStatisticsByWraper(influxQueryWrapper);
- System.out.println("result1==:" + result1);
- return result1;
- }
-
- @Override
- public List getHarmonicDataV(String lineIndex, String startTime, String endTime) {
- List result1 ;
- InfluxQueryWrapper influxQueryWrapper = new InfluxQueryWrapper(DataV.class);
- influxQueryWrapper.eq(DataV::getLineId, lineIndex)
- .eq(DataV::getValueType, "CP95")
- .ne(DataV::getPhasicType, "T")
- .between(DataV::getTime, startTime, endTime);;
- result1 = dataVMapper.getStatisticsByWraper(influxQueryWrapper);
- return result1;
- }
-
-
- /***
- * 自定义需要查询的谐波次数
- * @author xuyang
- * @param start 起始次数@Min(value = 1) @Max(value = 100)
- * @param end 结束次数 @Min(value = 1) @Max(value = 100)
- * @param interval 间隔
- * @return List