From 33c9d309c705a024a0d89e129ee35393f3ab3cc3 Mon Sep 17 00:00:00 2001
From: hongawen <83944980@qq.com>
Date: Tue, 1 Nov 2022 20:14:55 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                       |   11 +-
 pqs-common/common-db/pom.xml                  |    5 +
 .../swagger/config/Knife4jSwaggerConfig.java  |    2 +
 pqs-device/pms-device/pms-device-api/pom.xml  |    6 +
 .../njcn/device/pms/api/MonitorClient.java    |   69 +
 .../pms/api/PmsGeneralDeviceInfoClient.java   |   42 +
 .../device/pms/api/PmsGeneratrixClient.java   |   33 +
 .../njcn/device/pms/api/PwMonitorClient.java  |   34 +
 .../device/pms/api/StatationStatClient.java   |   34 +
 .../MonitorClientFallbackFactory.java         |   64 +
 ...eneralDeviceInfoClientFallbackFactory.java |   51 +
 .../PmsGeneratrixClientFallbackFactory.java   |   43 +
 .../PwMonitorClientFallbackFactory.java       |   43 +
 .../StatationStatClientFallbackFactory.java   |   42 +
 .../pms/enums/PmsDeviceResponseEnum.java      |   33 +
 .../device/pms/pojo/bo/DeviceRunExBO.java     |   47 -
 .../device/pms/pojo/bo/DeviceRunExVO.java     |    4 +
 .../pms/pojo/dto/PmsGeneralDeviceDTO.java     |   63 +
 .../device/pms/pojo/dto/PmsGeneratrixDTO.java |   63 +
 .../pms/pojo/dto/PmsMonitorBaseDTO.java       |   50 +
 .../device/pms/pojo/dto/PmsMonitorDTO.java    |  199 +
 .../pms/pojo/dto/PmsMonitorInfoDTO.java       |   71 +
 .../pms/pojo/dto/PmsStatationStatInfoDTO.java |   66 +
 .../device/pms/pojo/dto/PwPmsMonitorDTO.java  |  104 +
 .../pms/pojo/param/DeviceQueryParam.java      |   26 -
 .../pms/pojo/param/DistributedQueryParam.java |   25 -
 .../pojo/param/DistributionMonitorParam.java  |   50 +
 .../pms/pojo/param/GeneratrixParam.java       |   37 +
 .../pms/pojo/param/GeneratrixWireParam.java   |   36 +
 .../pms/pojo/param/LineDetailQueryParam.java  |   23 -
 .../pms/pojo/param/LvUserQueryParam.java      |   28 -
 .../device/pms/pojo/param/MonitorParam.java   |  218 +
 .../pms/pojo/param/PmsDeviceInfoParam.java    |  114 +
 .../pms/pojo/param/PmsGeneratrixParam.java    |   40 +
 .../pms/pojo/param/PmsMonitorInfoParam.java   |   60 +
 .../pms/pojo/param/PmsMonitorParam.java       |   40 +
 .../pojo/param/PmsStatationStatInfoParam.java |   39 +
 .../pms/pojo/param/PmsTerminalParam.java      |   78 +
 .../pms/pojo/param/PowerClientParam.java      |  200 +
 .../param/PowerDistributionareaParam.java     |   90 +
 .../pojo/param/PowerGenerationUserParam.java  |  143 +
 .../device/pms/pojo/param/PvDeviceParam.java  |  143 -
 .../pms/pojo/param/PvDispatchParam.java       |   35 -
 .../pms/pojo/param/PvDistributedParam.java    |  108 -
 .../pms/pojo/param/PvLineDetailParam.java     |  276 -
 .../device/pms/pojo/param/PvLvUserParam.java  |  105 -
 .../device/pms/pojo/param/PvSubAreaParam.java |  145 -
 .../pms/pojo/param/PvSubstationParam.java     |   82 -
 .../pms/pojo/param/PvTenVoltageParam.java     |  179 -
 .../pms/pojo/param/PvTerminalBaseQuery.java   |   37 -
 .../device/pms/pojo/param/PvUnitParam.java    |   63 -
 .../device/pms/pojo/param/PvVoltageParam.java |   67 -
 .../pms/pojo/param/PwPmsMonitorParam.java     |   36 +
 .../param/RMpMonitorAlarmCountMParam.java     |   26 +
 .../pojo/param/RStatAreaAlarmCountMParam.java |   15 +
 .../pojo/param/RStatZwAlarmCountWParam.java   |   23 +
 .../pms/pojo/param/StatationStatParam.java    |   51 +
 .../pms/pojo/param/SubAreaQueryParam.java     |   33 -
 .../pms/pojo/param/SubstationQueryParam.java  |   25 -
 .../pms/pojo/param/TenVoltageQueryParam.java  |   28 -
 .../pms/pojo/param/TractionStationParam.java  |   74 +
 .../pojo/param/UniversalFrontEndParam.java    |   58 +
 .../pms/pojo/param/VoltageQueryParam.java     |   23 -
 .../pms/pojo/po/DistributionMonitor.java      |   65 +
 .../njcn/device/pms/pojo/po/Generatrix.java   |   33 +
 .../device/pms/pojo/po/GeneratrixWire.java    |   27 +
 .../pojo/po/HarmonicGeneralManagement.java    |  104 +
 .../po/HarmonicGeneralManagementData.java     |  876 ++
 .../com/njcn/device/pms/pojo/po/Monitor.java  |  187 +
 .../njcn/device/pms/pojo/po/PmsMonitorPO.java |   58 +
 .../njcn/device/pms/pojo/po/PowerClient.java  |  172 +
 .../pms/pojo/po/PowerDistributionarea.java    |  164 +
 .../pms/pojo/po/PowerGenerationUser.java      |  132 +
 .../pms/pojo/po/PowerQualityMatter.java       |  142 +
 .../com/njcn/device/pms/pojo/po/PvDevice.java |  109 -
 .../njcn/device/pms/pojo/po/PvDispatch.java   |   34 -
 .../device/pms/pojo/po/PvDistributed.java     |   92 -
 .../njcn/device/pms/pojo/po/PvLineDetail.java |  209 -
 .../com/njcn/device/pms/pojo/po/PvLvUser.java |   86 -
 .../njcn/device/pms/pojo/po/PvSubArea.java    |  114 -
 .../njcn/device/pms/pojo/po/PvSubstation.java |   56 -
 .../njcn/device/pms/pojo/po/PvTenVoltage.java |  142 -
 .../com/njcn/device/pms/pojo/po/PvUnit.java   |   45 -
 .../njcn/device/pms/pojo/po/PvVoltage.java    |   44 -
 .../device/pms/pojo/po/PwPmsMonitorPO.java    |   16 +
 .../pms/pojo/po/RMpMonitorAlarmCountM.java    |  120 +
 .../device/pms/pojo/po/RMpPwAlarmDetailD.java |   49 +
 .../device/pms/pojo/po/RMpTargetWarnD.java    |   82 +
 .../pms/pojo/po/RStatAreaAlarmCountM.java     |  115 +
 .../pms/pojo/po/RStatBusbarHarmonicPO.java    |   92 +
 .../device/pms/pojo/po/RStatEventOrgPO.java   |   82 +
 .../njcn/device/pms/pojo/po/RStatOrgPO.java   |  104 +
 .../device/pms/pojo/po/RStatSubstationPO.java |  103 +
 .../pms/pojo/po/RStatZwAlarmCountW.java       |   45 +
 .../device/pms/pojo/po/RmpEventDetailPO.java  |   55 +
 .../device/pms/pojo/po/SourceManagement.java  |  141 +
 .../device/pms/pojo/po/StatationStat.java     |   60 +
 .../pms/pojo/po/StatisticsRunMonitor.java     |  119 +
 .../com/njcn/device/pms/pojo/po/Terminal.java |  145 +
 .../pms/pojo/po/TerminalEliminateData.java    |   57 +
 .../device/pms/pojo/po/TractionStation.java   |  144 +
 .../pms/pojo/po/TransientStasticData.java     |   62 +
 .../pms/pojo/po/TreatTransientDetailData.java |   67 +
 .../device/pms/pojo/vo/DeviceRunExVO.java     |   71 -
 .../njcn/device/pms/pojo/vo/DisOrLvVO.java    |  124 -
 .../njcn/device/pms/pojo/vo/PmsMonitorVO.java |  234 +
 .../device/pms/pojo/vo/PmsTerminalVO.java     |   94 +
 .../pms/pojo/vo/PowerDistributionareaVO.java  |  108 +
 .../pms/pojo/vo/ProblemMonitorDetailVO.java   |   41 +
 .../njcn/device/pms/pojo/vo/PvDeviceVO.java   |   29 -
 .../device/pms/pojo/vo/PvDistributedVO.java   |   17 -
 .../device/pms/pojo/vo/PvLineAllDetailVO.java |  242 -
 .../njcn/device/pms/pojo/vo/PvLvUserVO.java   |   17 -
 .../njcn/device/pms/pojo/vo/PvSubAreaVO.java  |   26 -
 .../device/pms/pojo/vo/PvSubstationVO.java    |   60 -
 .../device/pms/pojo/vo/PvTenVoltageVO.java    |   24 -
 .../pms/pojo/vo/RMpMonitorAlarmCountMVO.java  |  147 +
 .../pms/pojo/vo/RStatAreaAlarmCountMVO.java   |  140 +
 .../pms/pojo/vo/RStatBusbarHarmonicVO.java    |  186 +
 .../device/pms/pojo/vo/RStatEventOrgVO.java   |  157 +
 .../njcn/device/pms/pojo/vo/RStatOrgVO.java   |   87 +
 .../device/pms/pojo/vo/RStatSubstationVO.java |  116 +
 .../pms/pojo/vo/RStatZwAlarmCountWVO.java     |   46 +
 .../device/pms/pojo/vo/RmpEventDetailVO.java  |   94 +
 .../device/pms/pojo/vo/StatationStatVO.java   |   55 +
 .../device/pms/pojo/vo/TractionStationVO.java |   94 +
 .../njcn/device/pms/pojo/vo/UnitTreeVO.java   |   25 -
 .../njcn/device/pms/utils/ExcelUtilXlsx.java  |  230 +
 .../device/pms/utils/PmsDeviceEnumUtil.java   |   50 +
 .../DistributionMonitorController.java        |   55 +
 .../controller/GeneratrixWireController.java  |  105 +
 ... HarmonicGeneralManagementController.java} |   15 +-
 ...rmonicGeneralManagementDataController.java |   22 +
 .../pms/controller/MonitorController.java     |  170 +
 .../PmsGeneralDeviceController.java           |  107 +
 .../controller/PmsGeneratrixController.java   |  128 +
 .../pms/controller/PowerClientController.java |  109 +
 .../PowerDistributionareaController.java      |  133 +
 .../PowerGenerationUserController.java        |  109 +
 .../PowerQualityMatterController.java         |   22 +
 .../pms/controller/PvDeviceController.java    |  160 -
 .../controller/PvDeviceRunExController.java   |   48 -
 .../controller/PvDistributedController.java   |  159 -
 .../controller/PvLineDetailController.java    |  160 -
 .../pms/controller/PvLvUserController.java    |  160 -
 .../pms/controller/PvSubAreaController.java   |  160 -
 .../controller/PvSubstationController.java    |  150 -
 .../controller/PvTenVoltageController.java    |  157 -
 .../controller/PvTerminalBaseController.java  |   92 -
 .../pms/controller/PvUnitController.java      |  119 -
 .../pms/controller/PvVoltageController.java   |  144 -
 .../pms/controller/PwMonitorController.java   |   62 +
 .../RMpMonitorAlarmCountMController.java      |   48 +
 .../RStatAreaAlarmCountMController.java       |   48 +
 .../RStatBusbarHarmonicController.java        |   55 +
 .../RStatZwAlarmCountWController.java         |   71 +
 .../controller/RmpEventDetailController.java  |   53 +
 .../SourceManagementController.java           |   22 +
 .../controller/StatationStatController.java   |  136 +
 .../StatisticsRunMonitorController.java       |   22 +
 .../pms/controller/TerminalController.java    |  132 +
 .../TerminalEliminateDataController.java      |   22 +
 .../controller/TractionStationController.java |  128 +
 .../TransientStasticDataController.java       |   22 +
 .../TreatTransientDetailDataController.java   |   22 +
 .../pms/mapper/DistributionMonitorMapper.java |   29 +
 .../pms/mapper/GeneratrixWireMapper.java      |   16 +
 .../HarmonicGeneralManagementDataMapper.java  |   17 +
 .../HarmonicGeneralManagementMapper.java      |   16 +
 .../njcn/device/pms/mapper/MonitorMapper.java |   59 +
 ...oltageMapper.java => OverlimitMapper.java} |    8 +-
 .../pms/mapper/PmsGeneratrixMapper.java       |   26 +
 .../device/pms/mapper/PowerClientMapper.java  |   16 +
 .../mapper/PowerDistributionareaMapper.java   |   23 +
 .../pms/mapper/PowerGenerationUserMapper.java |   16 +
 .../pms/mapper/PowerQualityMatterMapper.java  |   16 +
 .../device/pms/mapper/PvDeviceMapper.java     |   36 -
 .../pms/mapper/PvDeviceRunExMapper.java       |   22 -
 .../device/pms/mapper/PvDispatchMapper.java   |   16 -
 .../pms/mapper/PvDistributedMapper.java       |   28 -
 .../device/pms/mapper/PvLineDetailMapper.java |   33 -
 .../device/pms/mapper/PvLvUserMapper.java     |   27 -
 .../device/pms/mapper/PvSubAreaMapper.java    |   41 -
 .../device/pms/mapper/PvSubstationMapper.java |   31 -
 .../device/pms/mapper/PvTenVoltageMapper.java |   27 -
 .../njcn/device/pms/mapper/PvUnitMapper.java  |   32 -
 .../device/pms/mapper/PwMonitorMapper.java    |   26 +
 .../mapper/RMpMonitorAlarmCountMMapper.java   |   15 +
 .../pms/mapper/RMpPwAlarmDetailDMapper.java   |   15 +
 .../pms/mapper/RMpTargetWarnDMapper.java      |   15 +
 .../mapper/RStatAreaAlarmCountMMapper.java    |   15 +
 .../pms/mapper/RStatBusbarHarmonicMapper.java |   42 +
 .../pms/mapper/RStatEventOrgMapper.java       |   55 +
 .../device/pms/mapper/RStatOrgMapper.java     |   56 +
 .../pms/mapper/RStatSubstationMapper.java     |   57 +
 .../pms/mapper/RStatZwAlarmCountWMapper.java  |   19 +
 .../pms/mapper/RmpEventDetailMapper.java      |   15 +
 .../pms/mapper/SourceManagementMapper.java    |   17 +
 .../pms/mapper/StatationStatMapper.java       |   29 +
 .../mapper/StatisticsRunMonitorMapper.java    |   16 +
 .../mapper/TerminalEliminateDataMapper.java   |   16 +
 .../device/pms/mapper/TerminalMapper.java     |   21 +
 .../pms/mapper/TractionStationMapper.java     |   16 +
 .../mapper/TransientStasticDataMapper.java    |   16 +
 .../TreatTransientDetailDataMapper.java       |   16 +
 .../mapping/DistributionMonitorMapper.xml     |   34 +
 .../HarmonicGeneralManagementDataMapper.xml   |    5 +
 .../HarmonicGeneralManagementMapper.xml       |    5 +
 .../pms/mapper/mapping/MonitorMapper.xml      |  137 +
 .../mapper/mapping/PmsGeneratrixMapper.xml    |   36 +
 ...spatchMapper.xml => PowerClientMapper.xml} |    3 +-
 .../mapping/PowerDistributionareaMapper.xml   |   10 +
 .../mapping/PowerGenerationUserMapper.xml     |    5 +
 .../mapping/PowerQualityMatterMapper.xml      |    5 +
 .../pms/mapper/mapping/PvDeviceMapper.xml     |   86 -
 .../mapper/mapping/PvDeviceRunExMapper.xml    |   32 -
 .../mapper/mapping/PvDistributedMapper.xml    |   39 -
 .../pms/mapper/mapping/PvLineDetailMapper.xml |  179 -
 .../pms/mapper/mapping/PvLvUserMapper.xml     |   37 -
 .../pms/mapper/mapping/PvSubAreaMapper.xml    |   61 -
 .../pms/mapper/mapping/PvSubstationMapper.xml |   47 -
 .../pms/mapper/mapping/PvTenVoltageMapper.xml |   61 -
 .../pms/mapper/mapping/PvUnitMapper.xml       |   15 -
 .../pms/mapper/mapping/PwMonitorMapper.xml    |   67 +
 .../mapping/RMpMonitorAlarmCountMMapper.xml   |   39 +
 .../mapping/RMpPwAlarmDetailDMapper.xml       |   20 +
 .../mapper/mapping/RMpTargetWarnDMapper.xml   |   30 +
 .../mapping/RStatAreaAlarmCountMMapper.xml    |   38 +
 .../mapping/RStatBusbarHarmonicMapper.xml     |   50 +
 .../mapper/mapping/RStatEventOrgMapper.xml    |   70 +
 .../pms/mapper/mapping/RStatOrgMapper.xml     |   60 +
 .../mapper/mapping/RStatSubstationMapper.xml  |   84 +
 .../mapping/RStatZwAlarmCountWMapper.xml      |   38 +
 .../mapper/mapping/RmpEventDetailMapper.xml   |    4 +
 .../mapper/mapping/SourceManagementMapper.xml |    5 +
 .../mapper/mapping/StatationStatMapper.xml    |   38 +
 .../mapping/StatisticsRunMonitorMapper.xml    |    5 +
 .../mapping/TerminalEliminateDataMapper.xml   |    5 +
 .../pms/mapper/mapping/TerminalMapper.xml     |   10 +
 ...geMapper.xml => TractionStationMapper.xml} |    2 +-
 .../mapping/TransientStasticDataMapper.xml    |    5 +
 .../TreatTransientDetailDataMapper.xml        |    5 +
 .../service/IDistributionMonitorService.java  |   29 +
 .../pms/service/IGeneratrixWireService.java   |   63 +
 ...IHarmonicGeneralManagementDataService.java |   16 +
 .../IHarmonicGeneralManagementService.java    |   16 +
 .../device/pms/service/IMonitorService.java   |  110 +
 .../pms/service/IPmsGeneralDeviceService.java |   35 +
 .../pms/service/IPmsGeneratrixService.java    |   72 +
 .../pms/service/IPowerClientService.java      |   66 +
 .../IPowerDistributionareaService.java        |   53 +
 .../service/IPowerGenerationUserService.java  |   65 +
 .../service/IPowerQualityMatterService.java   |   16 +
 .../pms/service/IPvDeviceRunExService.java    |   24 -
 .../device/pms/service/IPvDeviceService.java  |   72 -
 .../pms/service/IPvDispatchService.java       |   16 -
 .../pms/service/IPvDistributedService.java    |   74 -
 .../pms/service/IPvLineDetailService.java     |   85 -
 .../device/pms/service/IPvLvUserService.java  |   71 -
 .../device/pms/service/IPvSubAreaService.java |   71 -
 .../pms/service/IPvSubstationService.java     |   71 -
 .../pms/service/IPvTenVoltageService.java     |   78 -
 .../device/pms/service/IPvUnitService.java    |   70 -
 .../device/pms/service/IPvVoltageService.java |   70 -
 .../device/pms/service/IPwMonitorService.java |   22 +
 .../pms/service/ISourceManagementService.java |   16 +
 .../pms/service/IStatationStatService.java    |   77 +
 .../service/IStatisticsRunMonitorService.java |   16 +
 .../ITerminalEliminateDataService.java        |   16 +
 .../device/pms/service/ITerminalService.java  |   50 +
 .../pms/service/ITractionStationService.java  |   49 +
 .../service/ITransientStasticDataService.java |   16 +
 .../ITreatTransientDetailDataService.java     |   16 +
 .../pms/service/PvTerminalBaseService.java    |   41 -
 .../service/RMpMonitorAlarmCountMService.java |   18 +
 .../pms/service/RMpPwAlarmDetailDService.java |   13 +
 .../pms/service/RMpTargetWarnDService.java    |   13 +
 .../service/RStatAreaAlarmCountMService.java  |   25 +
 .../service/RStatBusbarHarmonicService.java   |   27 +
 .../service/RStatZwAlarmCountWService.java    |   36 +
 .../pms/service/RmpEventDetailService.java    |   24 +
 .../impl/DistributionMonitorServiceImpl.java  |   33 +
 .../pms/service/impl/GeneratrixWireImpl.java  |   53 +
 ...monicGeneralManagementDataServiceImpl.java |   20 +
 .../HarmonicGeneralManagementServiceImpl.java |   20 +
 .../service/impl/IPwMonitorServiceImpl.java   |   88 +
 .../pms/service/impl/MonitorServiceImpl.java  |  259 +
 .../impl/PmsGeneralDeviceServiceImpl.java     |  154 +
 .../impl/PmsGeneratrixServiceImpl.java        |   72 +
 .../service/impl/PowerClientServiceImpl.java  |   55 +
 .../PowerDistributionareaServiceImpl.java     |  113 +
 .../impl/PowerGenerationUserServiceImpl.java  |   54 +
 .../impl/PowerQualityMatterServiceImpl.java   |   20 +
 .../impl/PvDeviceRunExServiceImpl.java        |  106 -
 .../pms/service/impl/PvDeviceServiceImpl.java |  143 -
 .../service/impl/PvDispatchServiceImpl.java   |   20 -
 .../impl/PvDistributedServiceImpl.java        |  121 -
 .../service/impl/PvLineDetailServiceImpl.java |  271 -
 .../pms/service/impl/PvLvUserServiceImpl.java |  122 -
 .../service/impl/PvSubAreaServiceImpl.java    |  115 -
 .../service/impl/PvSubstationServiceImpl.java |  138 -
 .../service/impl/PvTenVoltageServiceImpl.java |  120 -
 .../impl/PvTerminalBaseServiceImpl.java       |  139 -
 .../pms/service/impl/PvUnitServiceImpl.java   |  108 -
 .../service/impl/PvVoltageServiceImpl.java    |  121 -
 .../RMpMonitorAlarmCountMServiceImpl.java     |  127 +
 .../impl/RMpPwAlarmDetailDServiceImpl.java    |   18 +
 .../impl/RMpTargetWarnDServiceImpl.java       |   18 +
 .../impl/RStatAreaAlarmCountMServiceImpl.java |   91 +
 .../impl/RStatBusbarHarmonicServiceImpl.java  |  122 +
 .../impl/RStatZwAlarmCountWServiceImpl.java   |  233 +
 .../impl/RmpEventDetailServiceImpl.java       |   37 +
 .../impl/SourceManagementServiceImpl.java     |   20 +
 .../impl/StatationStatServiceImpl.java        |   72 +
 .../impl/StatisticsRunMonitorServiceImpl.java |   20 +
 .../TerminalEliminateDataServiceImpl.java     |   20 +
 .../pms/service/impl/TerminalServiceImpl.java |  109 +
 .../impl/TractionStationServiceImpl.java      |  106 +
 .../impl/TransientStasticDataServiceImpl.java |   20 +
 .../TreatTransientDetailDataServiceImpl.java  |   20 +
 .../device/pq/api/DeptLineFeignClient.java    |   10 +
 .../njcn/device/pq/api/LineFeignClient.java   |   23 +
 .../DeptLineFeignClientFallbackFactory.java   |    7 +
 .../LineFeignClientFallbackFactory.java       |   15 +
 .../device/pq/pojo/vo/LineDetailDataVO.java   |    6 +
 .../pq/controller/DeptLineController.java     |   10 +
 .../device/pq/controller/LineController.java  |   27 +-
 .../njcn/device/pq/mapper/DeptLineMapper.java |   23 +
 .../device/pq/mapper/LineDetailMapper.java    |    9 +
 .../com/njcn/device/pq/mapper/LineMapper.java |   28 +
 .../pq/mapper/mapping/LineDetailMapper.xml    |   16 +
 .../device/pq/service/DeptLineService.java    |    9 +
 .../njcn/device/pq/service/LineService.java   |   21 +
 .../pq/service/impl/DeptLineServiceImpl.java  |   23 +
 .../pq/service/impl/LineServiceImpl.java      |   25 +
 .../event/service/Impl/ReportController.java  | 1939 +++++
 pqs-harmonic/harmonic-api/pom.xml             |   12 +
 .../com/njcn/harmonic/constant/Param.java     |    9 +
 .../harmonic/enums/HarmonicResponseEnum.java  |    8 +
 .../pojo/param/AlgorithmSearchParam.java      |   25 +
 .../pojo/param/RMpBenchmarkLevelParam.java    |   24 +
 .../pojo/param/RMpHarmonicReportDParam.java   |   24 +
 .../pojo/param/RStatHarmonicMParam.java       |   28 +
 .../harmonic/pojo/param/RStatOrgParam.java    |   28 +
 .../param/StatSubstationBizBaseParam.java     |   21 +
 .../java/com/njcn/harmonic/pojo/po/DataV.java |   56 +
 .../njcn/harmonic/pojo/po/LimitRatePO.java    |   84 +
 .../harmonic/pojo/po/PmsAbnormalRules.java    |   44 +
 .../harmonic/pojo/po/RMpBenchmarkLevelM.java  |   69 +
 .../harmonic/pojo/po/RMpBenchmarkLevelQ.java  |   70 +
 .../harmonic/pojo/po/RMpBenchmarkLevelY.java  |   69 +
 .../pojo/po/RMpHarmonicIMagReportD.java       | 1074 +++
 .../pojo/po/RMpHarmonicIRateReportD.java      | 1029 +++
 .../pojo/po/RMpHarmonicVRateReportD.java      | 1075 +++
 .../pojo/po/RMpInharmonicIRateReportD.java    | 1030 +++
 .../pojo/po/RMpInharmonicVRateReportD.java    | 1050 +++
 .../njcn/harmonic/pojo/po/RMpIntegrityD.java  |   61 +
 .../pojo/po/RMpMeasurePhaseReportD.java       |  252 +
 .../harmonic/pojo/po/RMpMeasureReportD.java   |  425 +
 .../pojo/po/RMpPartHarmonicDetailD.java       |  379 +
 .../pojo/po/RMpPartHarmonicDetailM.java       |  361 +
 .../njcn/harmonic/pojo/po/RMpPassRateM.java   |   46 +
 .../njcn/harmonic/pojo/po/RMpPassRateQ.java   |   46 +
 .../njcn/harmonic/pojo/po/RMpPassRateY.java   |   46 +
 .../pojo/po/RMpSurplusHarmonicDetailD.java    |  199 +
 .../pojo/po/RMpSurplusHarmonicDetailM.java    |  193 +
 .../njcn/harmonic/pojo/po/RStatAbnormalD.java |   33 +
 .../njcn/harmonic/pojo/po/RStatHarmonicD.java |   53 +
 .../njcn/harmonic/pojo/po/RStatHarmonicM.java |   59 +
 .../njcn/harmonic/pojo/po/RStatHarmonicQ.java |   62 +
 .../pojo/po/RStatHarmonicVoltageD.java        |   53 +
 .../pojo/po/RStatHarmonicVoltageM.java        |   62 +
 .../njcn/harmonic/pojo/po/RStatHarmonicY.java |   62 +
 .../njcn/harmonic/pojo/po/RStatLoadTypeM.java |   73 +
 .../njcn/harmonic/pojo/po/RStatLoadTypeQ.java |   73 +
 .../njcn/harmonic/pojo/po/RStatLoadTypeY.java |   73 +
 .../pojo/po/RStatOrgBusbarVoltageM.java       |   61 +
 .../pojo/po/RStatOrgBusbarVoltageQ.java       |   61 +
 .../pojo/po/RStatOrgBusbarVoltageY.java       |   61 +
 .../com/njcn/harmonic/pojo/po/RStatOrgM.java  |   94 +
 .../com/njcn/harmonic/pojo/po/RStatOrgQ.java  |   94 +
 .../com/njcn/harmonic/pojo/po/RStatOrgY.java  |   94 +
 .../harmonic/pojo/po/RStatSubstationM.java    |  121 +
 .../harmonic/pojo/po/RStatSubstationQ.java    |   94 +
 .../pojo/po/RStatSubstationVoltageM.java      |   49 +
 .../harmonic/pojo/po/RStatSubstationY.java    |   94 +
 .../com/njcn/harmonic/pojo/vo/RArrayVO.java   |   27 +
 .../harmonic/pojo/vo/RHarmonicPolylineVO.java |   30 +
 .../com/njcn/harmonic/pojo/vo/RIconVO.java    |   36 +
 .../harmonic/pojo/vo/RMpBenchmarkLevelVO.java |   71 +
 .../pojo/vo/RMpHarmonicReportDVO.java         |  129 +
 .../pojo/vo/RMpHarmonicReportMVO.java         |   15 +
 .../pojo/vo/RMpPartHarmonicDetailIconVO.java  |   47 +
 .../pojo/vo/RMpPartHarmonicDetailVO.java      |  218 +
 .../harmonic/pojo/vo/RStatHarmonicMVO.java    |   42 +
 .../harmonic/pojo/vo/RStatLoadTypeVO.java     |   72 +
 .../pojo/vo/RStatOrgBusbarVoltageVO.java      |   64 +
 .../harmonic/pojo/vo/RStatOrgIndexVO.java     |   68 +
 .../com/njcn/harmonic/pojo/vo/RStatOrgVO.java |   47 +
 .../pojo/vo/RStatSubstationOrg2VO.java        |  212 +
 .../pojo/vo/RStatSubstationOrgVO.java         |  121 +
 .../harmonic/pojo/vo/RSubstationIcon2VO.java  |   65 +
 .../harmonic/pojo/vo/RSubstationIconVO.java   |   42 +
 .../njcn/harmonic/pojo/vo/RVoltageIconVO.java |   26 +
 .../controller/DataExceptionController.java   |   51 +
 .../DataIntegrityRateController.java          |   51 +
 .../RMpBenchmarkLevelController.java          |   72 +
 .../RMpHarmonicReportDController.java         |   45 +
 .../controller/RStatHarmonicMController.java  |   97 +
 .../RStatHarmonicOrgMController.java          |  104 +
 .../controller/RStatOrgController.java        |  188 +
 .../RStatSubstationMController.java           |   81 +
 .../mapper/PmsAbnormalRulesMapper.java        |   14 +
 .../mapper/RMpBenchmarkLevelMMapper.java      |   15 +
 .../mapper/RMpBenchmarkLevelQMapper.java      |   15 +
 .../mapper/RMpBenchmarkLevelYMapper.java      |   15 +
 .../mapper/RMpHarmonicIMagReportDMapper.java  |   22 +
 .../mapper/RMpHarmonicIRateReportDMapper.java |   22 +
 .../mapper/RMpHarmonicVRateReportDMapper.java |   22 +
 .../RMpInharmonicIRateReportDMapper.java      |   22 +
 .../RMpInharmonicVRateReportDMapper.java      |   22 +
 .../harmonic/mapper/RMpIntegrityDMapper.java  |   14 +
 .../mapper/RMpMeasurePhaseReportDMapper.java  |   23 +
 .../mapper/RMpMeasureReportDMapper.java       |   19 +
 .../mapper/RMpPartHarmonicDetailDMapper.java  |   27 +
 .../mapper/RMpPartHarmonicDetailMMapper.java  |   16 +
 .../harmonic/mapper/RMpPassRateMMapper.java   |   27 +
 .../harmonic/mapper/RMpPassRateQMapper.java   |   27 +
 .../harmonic/mapper/RMpPassRateYMapper.java   |   27 +
 .../RMpSurplusHarmonicDetailDMapper.java      |   16 +
 .../RMpSurplusHarmonicDetailMMapper.java      |   27 +
 .../harmonic/mapper/RStatAbnormalDMapper.java |   14 +
 .../harmonic/mapper/RStatHarmonicDMapper.java |   16 +
 .../harmonic/mapper/RStatHarmonicMMapper.java |   17 +
 .../harmonic/mapper/RStatHarmonicQMapper.java |   16 +
 .../mapper/RStatHarmonicVoltageDMapper.java   |   16 +
 .../mapper/RStatHarmonicVoltageMMapper.java   |   16 +
 .../harmonic/mapper/RStatHarmonicYMapper.java |   16 +
 .../harmonic/mapper/RStatLoadTypeMMapper.java |   27 +
 .../harmonic/mapper/RStatLoadTypeQMapper.java |   27 +
 .../harmonic/mapper/RStatLoadTypeYMapper.java |   26 +
 .../mapper/RStatOrgBusbarVoltageMMapper.java  |   16 +
 .../mapper/RStatOrgBusbarVoltageQMapper.java  |   16 +
 .../mapper/RStatOrgBusbarVoltageYMapper.java  |   16 +
 .../njcn/harmonic/mapper/RStatOrgMMapper.java |   39 +
 .../njcn/harmonic/mapper/RStatOrgQMapper.java |   39 +
 .../njcn/harmonic/mapper/RStatOrgYMapper.java |   39 +
 .../mapper/RStatSubstationMMapper.java        |   35 +
 .../mapper/RStatSubstationQMapper.java        |   35 +
 .../mapper/RStatSubstationVoltageMMapper.java |   30 +
 .../mapper/RStatSubstationYMapper.java        |   36 +
 .../mapping/RMpBenchmarkLevelMMapper.xml      |   26 +
 .../mapping/RMpBenchmarkLevelQMapper.xml      |   26 +
 .../mapping/RMpBenchmarkLevelYMapper.xml      |   26 +
 .../mapping/RMpHarmonicIMagReportDMapper.xml  |  303 +
 .../mapping/RMpHarmonicIRateReportDMapper.xml |  294 +
 .../mapping/RMpHarmonicVRateReportDMapper.xml |  303 +
 .../RMpInharmonicIRateReportDMapper.xml       |  293 +
 .../RMpInharmonicVRateReportDMapper.xml       |  298 +
 .../mapping/RMpMeasurePhaseReportDMapper.xml  |   85 +
 .../mapping/RMpMeasureReportDMapper.xml       |  153 +
 .../mapping/RMpPartHarmonicDetailDMapper.xml  |  154 +
 .../mapping/RMpPartHarmonicDetailMMapper.xml  |  122 +
 .../mapper/mapping/RMpPassRateMMapper.xml     |   38 +
 .../mapper/mapping/RMpPassRateQMapper.xml     |   38 +
 .../mapper/mapping/RMpPassRateYMapper.xml     |   38 +
 .../RMpSurplusHarmonicDetailDMapper.xml       |   65 +
 .../RMpSurplusHarmonicDetailMMapper.xml       |  170 +
 .../mapper/mapping/RStatHarmonicDMapper.xml   |   16 +
 .../mapper/mapping/RStatHarmonicMMapper.xml   |   19 +
 .../mapper/mapping/RStatHarmonicQMapper.xml   |   19 +
 .../mapping/RStatHarmonicVoltageDMapper.xml   |   17 +
 .../mapping/RStatHarmonicVoltageMMapper.xml   |   20 +
 .../mapper/mapping/RStatHarmonicYMapper.xml   |   19 +
 .../mapper/mapping/RStatLoadTypeMMapper.xml   |   54 +
 .../mapper/mapping/RStatLoadTypeQMapper.xml   |   54 +
 .../mapper/mapping/RStatLoadTypeYMapper.xml   |   54 +
 .../mapping/RStatOrgBusbarVoltageMMapper.xml  |   19 +
 .../mapping/RStatOrgBusbarVoltageQMapper.xml  |   19 +
 .../mapping/RStatOrgBusbarVoltageYMapper.xml  |   19 +
 .../mapper/mapping/RStatOrgMMapper.xml        |  164 +
 .../mapper/mapping/RStatOrgQMapper.xml        |  164 +
 .../mapper/mapping/RStatOrgYMapper.xml        |  164 +
 .../mapper/mapping/RStatSubstationMMapper.xml |  113 +
 .../mapper/mapping/RStatSubstationQMapper.xml |  106 +
 .../mapping/RStatSubstationVoltageMMapper.xml |   39 +
 .../mapper/mapping/RStatSubstationYMapper.xml |  106 +
 .../service/DataExceptionService.java         |   20 +
 .../service/DataIntegrityRateService.java     |   20 +
 .../service/RMpBenchmarkLevelMService.java    |   25 +
 .../service/RMpBenchmarkLevelQService.java    |   18 +
 .../service/RMpBenchmarkLevelYService.java    |   18 +
 .../RMpHarmonicIMagReportDService.java        |   17 +
 .../RMpHarmonicIRateReportDService.java       |   18 +
 .../service/RMpHarmonicReportDService.java    |   18 +
 .../RMpHarmonicVRateReportDService.java       |   17 +
 .../RMpInharmonicIRateReportDService.java     |   18 +
 .../RMpInharmonicVRateReportDService.java     |   18 +
 .../RMpMeasurePhaseReportDService.java        |   17 +
 .../service/RMpMeasureReportDService.java     |   17 +
 .../RMpPartHarmonicDetailDService.java        |   26 +
 .../RMpPartHarmonicDetailMService.java        |   28 +
 .../harmonic/service/RMpPassRateService.java  |   28 +
 .../service/RStatHarmonicMService.java        |   42 +
 .../service/RStatHarmonicOrgMService.java     |   35 +
 .../service/RStatHarmonicOrgQService.java     |   35 +
 .../service/RStatHarmonicOrgYService.java     |   35 +
 .../service/RStatHarmonicQService.java        |   27 +
 .../service/RStatHarmonicYService.java        |   26 +
 .../service/RStatLoadTypeService.java         |   26 +
 .../service/RStatOrgBusbarVoltageService.java |   26 +
 .../harmonic/service/RStatOrgMService.java    |   26 +
 .../harmonic/service/RStatOrgQService.java    |   26 +
 .../harmonic/service/RStatOrgYService.java    |   50 +
 .../service/RStatSubstationMService.java      |   34 +
 .../RStatSubstationVoltageMService.java       |   28 +
 .../service/impl/CustomReportServiceImpl.java |   15 +-
 .../impl/DataExceptionServiceImpl.java        |  182 +
 .../impl/DataIntegrityRateServiceImpl.java    |  192 +
 .../impl/HistoryResultServiceImpl.java        |    2 +-
 .../impl/PollutionSubstationServiceImpl.java  |   76 +-
 .../impl/RMpBenchmarkLevelMServiceImpl.java   |  129 +
 .../impl/RMpBenchmarkLevelQServiceImpl.java   |  129 +
 .../impl/RMpBenchmarkLevelYServiceImpl.java   |  129 +
 .../RMpHarmonicIMagReportDServiceImpl.java    |   29 +
 .../RMpHarmonicIRateReportDServiceImpl.java   |   29 +
 .../impl/RMpHarmonicReportDServiceImpl.java   |  241 +
 .../RMpHarmonicVRateReportDServiceImpl.java   |   30 +
 .../RMpInharmonicIRateReportDServiceImpl.java |   29 +
 .../RMpInharmonicVRateReportDServiceImpl.java |   29 +
 .../RMpMeasurePhaseReportDServiceImpl.java    |   29 +
 .../impl/RMpMeasureReportDServiceImpl.java    |   25 +
 .../RMpPartHarmonicDetailDServiceImpl.java    |   33 +
 .../RMpPartHarmonicDetailMServiceImpl.java    |  106 +
 .../service/impl/RMpPassRateServiceImpl.java  |  131 +
 .../impl/RStatHarmonicMServiceImpl.java       |  427 +
 .../impl/RStatHarmonicOrgMServiceImpl.java    |  202 +
 .../impl/RStatHarmonicOrgQServiceImpl.java    |  194 +
 .../impl/RStatHarmonicOrgYServiceImpl.java    |  197 +
 .../impl/RStatHarmonicQServiceImpl.java       |  122 +
 .../impl/RStatHarmonicYServiceImpl.java       |  120 +
 .../impl/RStatLoadTypeServiceImpl.java        |  136 +
 .../RStatOrgBusbarVoltageServiceImpl.java     |  100 +
 .../service/impl/RStatOrgMServiceImpl.java    |   87 +
 .../service/impl/RStatOrgQServiceImpl.java    |   86 +
 .../service/impl/RStatOrgYServiceImpl.java    |  387 +
 .../impl/RStatSubstationMServiceImpl.java     |  131 +
 .../RStatSubstationVoltageMServiceImpl.java   |   56 +
 pqs-job/job-executor.zip                      |  Bin 0 -> 73767 bytes
 pqs-prepare/harmonic-prepare/pom.xml          |   39 +
 .../harmonic/PrepareHarmonicApplication.java  |    3 +
 .../api/line/CoustmReportFeignClient.java     |   31 +
 .../harmonic/api/line/DayDataFeignClient.java |   33 +
 .../api/line/IntegrityFeignClient.java        |   32 +
 .../api/line/LimitTargetFeignClient.java      |   32 +
 .../api/line/LimitrateFeignClient.java        |   32 +
 .../api/line/NormalLimitFeignClient.java      |   31 +
 .../api/line/OnlineRateFeignClient.java       |   30 +
 .../api/line/PollutionFeignClient.java        |   30 +
 ...ustomReportFeignClientFallbackFactory.java |   44 +
 .../DayDataFeignClientFallbackFactory.java    |   43 +
 .../IntegrityFeignClientFallbackFactory.java  |   39 +
 ...LimitTargetFeignClientFallbackFactory.java |   43 +
 .../LimitrateFeignClientFallbackFactory.java  |   43 +
 .../NormalFeignClientFallbackFactory.java     |   36 +
 .../OnlineRateFeignClientFallbackFactory.java |   39 +
 .../PollutionFeignClientFallbackFactory.java  |   40 +
 .../api/voltage/VoltageFeignClient.java       |   10 +
 .../constant/InfluxdbPOConverter.java         | 1558 ++++
 .../njcn/prepare/harmonic/constant/Param.java |   15 +
 .../controller/LimitRateServiceTest.java      |   71 +
 .../controller/area/AreaController.java       |    9 +
 .../controller/device/DeviceController.java   |    9 +
 .../controller/line/DayDataController.java    |   68 +
 .../controller/line/IntegrityController.java  |   46 +
 .../line/LimitTargetController.java           |   46 +
 .../controller/line/LimitrateController.java  |   69 +
 .../line/NormalLimitController.java           |   40 +
 .../controller/line/OnlineRateController.java |   49 +
 .../controller/line/PollutionController.java  |   54 +
 .../controller/line/ReportController.java     |   57 +
 .../substion/SubstionController.java          |    9 +
 .../controller/voltage/VoltageController.java |    9 +
 .../harmonic/mapper/area/AreaMapper.java      |    9 +
 .../harmonic/mapper/device/DeviceMapper.java  |    5 +
 .../harmonic/mapper/line/AbnormalMapper.java  |   12 +
 .../harmonic/mapper/line/ExcelRptMapper.java  |   14 +
 .../mapper/line/ExcelRptTempMapper.java       |   16 +
 .../mapper/line/LimitRatePOMapper.java        |   18 +
 .../mapper/line/LimitTargetPOMapper.java      |   20 +
 .../harmonic/mapper/line/NormLimitMapper.java |    9 +
 .../line/RMpFlickerReportDPOMapper.java       |   16 +
 .../line/RMpHarmonicIMagReportDPOMapper.java  |   16 +
 .../line/RMpHarmonicIRateReportDPOMapper.java |   16 +
 .../line/RMpHarmonicPReportDPOMapper.java     |   15 +
 .../line/RMpHarmonicVRateReportDPOMapper.java |   16 +
 .../RMpInharmonicIMagReportDPOMapper.java     |   15 +
 .../RMpInharmonicIRateReportDPOMapper.java    |   16 +
 .../RMpInharmonicVRateReportDPOMapper.java    |   15 +
 .../line/RMpMeasurePhaseReportDPOMapper.java  |   16 +
 .../line/RMpMeasureReportDPOMapper.java       |   16 +
 .../mapper/line/RMpPltReportDPOMapper.java    |   16 +
 .../mapper/line/RMpPollutionDMapper.java      |   21 +
 .../mapper/line/RStatPollutionOrgDMapper.java |   22 +
 .../mapper/line/RStatPollutionOrgMMapper.java |   20 +
 .../mapper/line/RStatPollutionOrgQMapper.java |   20 +
 .../mapper/line/RStatPollutionOrgYMapper.java |   20 +
 .../line/RStatPollutionSubstationDMapper.java |   22 +
 .../line/RStatPollutionSubstationMMapper.java |   20 +
 .../line/RStatPollutionSubstationQMapper.java |   20 +
 .../line/RStatPollutionSubstationYMapper.java |   20 +
 .../line/mapping/ExcelRptTempMapper.xml       |   14 +
 .../mapper/line/mapping/LimitRatePOMapper.xml |  514 ++
 .../line/mapping/LimitTargetPOMapper.xml      | 1028 +++
 .../mapping/RMpFlickerReportDPOMapper.xml     |   25 +
 .../RMpHarmonicIMagReportDPOMapper.xml        |  286 +
 .../RMpHarmonicIRateReportDPOMapper.xml       |  235 +
 .../mapping/RMpHarmonicPReportDPOMapper.xml   |  287 +
 .../RMpHarmonicVRateReportDPOMapper.xml       |  286 +
 .../RMpInharmonicIMagReportDPOMapper.xml      |  315 +
 .../RMpInharmonicIRateReportDPOMapper.xml     |  250 +
 .../RMpInharmonicVRateReportDPOMapper.xml     |  281 +
 .../RMpMeasurePhaseReportDPOMapper.xml        |   65 +
 .../mapping/RMpMeasureReportDPOMapper.xml     |  135 +
 .../line/mapping/RMpPltReportDPOMapper.xml    |   20 +
 .../line/mapping/RMpPollutionDMapper.xml      |   13 +
 .../line/mapping/RStatPollutionOrgDMapper.xml |   11 +
 .../line/mapping/RStatPollutionOrgMMapper.xml |   11 +
 .../line/mapping/RStatPollutionOrgQMapper.xml |   10 +
 .../line/mapping/RStatPollutionOrgYMapper.xml |   10 +
 .../RStatPollutionSubstationDMapper.xml       |   11 +
 .../RStatPollutionSubstationMMapper.xml       |   10 +
 .../RStatPollutionSubstationQMapper.xml       |   10 +
 .../RStatPollutionSubstationYMapper.xml       |   10 +
 .../harmonic/mapper/substion/subMapper.java   |    9 +
 .../mapper/voltage/VoltageMapper.java         |    9 +
 .../prepare/harmonic/pojo/dto/LineDTO.java    |    9 +
 .../harmonic/pojo/dto/OnLineRateDTO.java      |   18 +
 .../harmonic/pojo/dto/PollutionDTO.java       |   54 +
 .../pojo/param/LimitRateHanlderParam.java     |   30 +
 .../harmonic/pojo/param/LineParam.java        |   29 +
 .../prepare/harmonic/pojo/po/AbnormalPO.java  |  245 +
 .../harmonic/pojo/po/DataFlickerPO.java       |   43 +
 .../prepare/harmonic/pojo/po/DataFlucPO.java  |   41 +
 .../harmonic/pojo/po/DataHarmPhasicIPO.java   |  185 +
 .../harmonic/pojo/po/DataHarmPhasicVPO.java   |  185 +
 .../harmonic/pojo/po/DataHarmPowerPPO.java    |  193 +
 .../harmonic/pojo/po/DataHarmPowerQPO.java    |  188 +
 .../harmonic/pojo/po/DataHarmPowerSPO.java    |  188 +
 .../harmonic/pojo/po/DataHarmRateIPO.java     |  185 +
 .../harmonic/pojo/po/DataHarmRateVPO.java     |  186 +
 .../prepare/harmonic/pojo/po/DataIPO.java     |  196 +
 .../harmonic/pojo/po/DataInHarmIPO.java       |  185 +
 .../harmonic/pojo/po/DataInHarmRateIPO.java   |  185 +
 .../harmonic/pojo/po/DataInHarmRateVPO.java   |  185 +
 .../harmonic/pojo/po/DataInHarmVPO.java       |  186 +
 .../prepare/harmonic/pojo/po/DataPltPO.java   |   35 +
 .../harmonic/pojo/po/DataPolluctionPO.java    |   48 +
 .../prepare/harmonic/pojo/po/DataVPO.java     |  214 +
 .../harmonic/pojo/po/DayHarmrateVPO.java      |  177 +
 .../njcn/prepare/harmonic/pojo/po/DayIPO.java |   13 +
 .../harmonic/pojo/po/DayInharmVPO.java        |  178 +
 .../prepare/harmonic/pojo/po/DayPltPO.java    |   13 +
 .../njcn/prepare/harmonic/pojo/po/DayVPO.java |   12 +
 .../prepare/harmonic/pojo/po/ExcelRpt.java    |   55 +
 .../harmonic/pojo/po/ExcelRptTemp.java        |   29 +
 .../njcn/prepare/harmonic/pojo/po/LinePO.java |    9 +
 .../harmonic/pojo/po/PqsCommunicatePO.java    |   30 +
 .../harmonic/pojo/po/RMpPollutionD.java       |  159 +
 .../harmonic/pojo/po/RStatPollutionOrgD.java  |   81 +
 .../harmonic/pojo/po/RStatPollutionOrgM.java  |   81 +
 .../harmonic/pojo/po/RStatPollutionOrgQ.java  |   81 +
 .../harmonic/pojo/po/RStatPollutionOrgY.java  |   81 +
 .../pojo/po/RStatPollutionSubstationD.java    |   81 +
 .../pojo/po/RStatPollutionSubstationM.java    |   81 +
 .../pojo/po/RStatPollutionSubstationQ.java    |   81 +
 .../pojo/po/RStatPollutionSubstationY.java    |   81 +
 .../harmonic/pojo/po/line/LimitTargetPO.java  |  478 +
 .../pojo/po/line/RMpFlickerReportDPO.java     |  101 +
 .../po/line/RMpHarmonicIMagReportDPO.java     | 1476 ++++
 .../po/line/RMpHarmonicIRateReportDPO.java    | 1420 +++
 .../pojo/po/line/RMpHarmonicPReportDPO.java   | 5198 +++++++++++
 .../po/line/RMpHarmonicVRateReportDPO.java    | 5200 +++++++++++
 .../po/line/RMpInharmonicIMagReportDPO.java   | 1444 +++
 .../po/line/RMpInharmonicIRateReportDPO.java  | 1420 +++
 .../po/line/RMpInharmonicVRateReportDPO.java  | 1444 +++
 .../po/line/RMpMeasurePhaseReportDPO.java     |  325 +
 .../pojo/po/line/RMpMeasureReportDPO.java     |  682 ++
 .../pojo/po/line/RMpPltReportDPO.java         |   73 +
 .../prepare/harmonic/pojo/vo/AbnormalVO.java  |   19 +
 .../njcn/prepare/harmonic/pojo/vo/LineVO.java |    9 +
 .../harmonic/pojo/vo/ReportTemplateVO.java    |   29 +
 .../service/Impl/area/AreaServiceImpl.java    |    9 +
 .../Impl/device/DeviceServiceImpl.java        |    9 +
 .../service/Impl/line/DayDataServiceImpl.java | 3402 ++++++++
 .../Impl/line/IntegrityServiceImpl.java       |   86 +
 .../service/Impl/line/LimitRateService.java   | 1307 +++
 .../Impl/line/LimitTargetServiceImpl.java     |  163 +
 .../Impl/line/NormalLimitServiceImpl.java     |  755 ++
 .../Impl/line/OnlineRateServiceImpl.java      |  162 +
 .../Impl/line/PollutionServiceImpl.java       |  745 ++
 .../line/RMpFlickerReportDPOServiceImpl.java  |   20 +
 .../RMpHarmonicIMagReportDPOServiceImpl.java  |   20 +
 .../RMpHarmonicIRateReportDPOServiceImpl.java |   20 +
 .../RMpHarmonicPReportDPOServiceImpl.java     |   25 +
 .../RMpHarmonicVRateReportDPOServiceImpl.java |   25 +
 ...RMpInharmonicIMagReportDPOServiceImpl.java |   21 +
 ...MpInharmonicIRateReportDPOServiceImpl.java |   20 +
 ...MpInharmonicVRateReportDPOServiceImpl.java |   21 +
 .../RMpMeasurePhaseReportDPOServiceImpl.java  |   20 +
 .../line/RMpMeasureReportDPOServiceImpl.java  |   20 +
 .../Impl/line/RMpPltReportDPOServiceImpl.java |   20 +
 .../service/Impl/line/ReportServiceImpl.java  |  302 +
 .../Impl/substion/SubstionServiceImpl.java    |    9 +
 .../Impl/voltage/VoltageServiceImpl.java      |    9 +
 .../service/RMpFlickerReportDPOService.java   |   17 +
 .../RMpHarmonicIMagReportDPOService.java      |   17 +
 .../RMpHarmonicIRateReportDPOService.java     |   17 +
 .../RMpInharmonicIMagReportDPOService.java    |   18 +
 .../RMpInharmonicIRateReportDPOService.java   |   17 +
 .../RMpInharmonicVRateReportDPOService.java   |   18 +
 .../RMpMeasurePhaseReportDPOService.java      |   17 +
 .../service/RMpMeasureReportDPOService.java   |   17 +
 .../service/RMpPltReportDPOService.java       |   17 +
 .../harmonic/service/area/AreaService.java    |    9 +
 .../service/device/DeviceService.java         |    9 +
 .../harmonic/service/line/DayDataService.java |   22 +
 .../service/line/IntegrityService.java        |   13 +
 .../service/line/LimitTargetService.java      |   13 +
 .../service/line/NormalLimitService.java      |   11 +
 .../service/line/OnlineRateService.java       |   13 +
 .../service/line/PollutionService.java        |   19 +
 .../line/RMpHarmonicPReportDPOService.java    |   18 +
 .../RMpHarmonicVRateReportDPOService.java     |   18 +
 .../harmonic/service/line/ReportService.java  |   17 +
 .../service/substion/SubstionService.java     |    9 +
 .../service/voltage/VoltageService.java       |    9 +
 pqs.ipr                                       | 7723 +++++++++--------
 738 files changed, 78923 insertions(+), 11607 deletions(-)
 create mode 100644 pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/api/MonitorClient.java
 create mode 100644 pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/api/PmsGeneralDeviceInfoClient.java
 create mode 100644 pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/api/PmsGeneratrixClient.java
 create mode 100644 pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/api/PwMonitorClient.java
 create mode 100644 pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/api/StatationStatClient.java
 create mode 100644 pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/api/fallback/MonitorClientFallbackFactory.java
 create mode 100644 pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/api/fallback/PmsGeneralDeviceInfoClientFallbackFactory.java
 create mode 100644 pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/api/fallback/PmsGeneratrixClientFallbackFactory.java
 create mode 100644 pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/api/fallback/PwMonitorClientFallbackFactory.java
 create mode 100644 pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/api/fallback/StatationStatClientFallbackFactory.java
 create mode 100644 pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/enums/PmsDeviceResponseEnum.java
 delete mode 100644 pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/bo/DeviceRunExBO.java
 create mode 100644 pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/bo/DeviceRunExVO.java
 create mode 100644 pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/dto/PmsGeneralDeviceDTO.java
 create mode 100644 pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/dto/PmsGeneratrixDTO.java
 create mode 100644 pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/dto/PmsMonitorBaseDTO.java
 create mode 100644 pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/dto/PmsMonitorDTO.java
 create mode 100644 pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/dto/PmsMonitorInfoDTO.java
 create mode 100644 pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/dto/PmsStatationStatInfoDTO.java
 create mode 100644 pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/dto/PwPmsMonitorDTO.java
 delete mode 100644 pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/DeviceQueryParam.java
 delete mode 100644 pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/DistributedQueryParam.java
 create mode 100644 pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/DistributionMonitorParam.java
 create mode 100644 pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/GeneratrixParam.java
 create mode 100644 pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/GeneratrixWireParam.java
 delete mode 100644 pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/LineDetailQueryParam.java
 delete mode 100644 pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/LvUserQueryParam.java
 create mode 100644 pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/MonitorParam.java
 create mode 100644 pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PmsDeviceInfoParam.java
 create mode 100644 pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PmsGeneratrixParam.java
 create mode 100644 pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PmsMonitorInfoParam.java
 create mode 100644 pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PmsMonitorParam.java
 create mode 100644 pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PmsStatationStatInfoParam.java
 create mode 100644 pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PmsTerminalParam.java
 create mode 100644 pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PowerClientParam.java
 create mode 100644 pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PowerDistributionareaParam.java
 create mode 100644 pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PowerGenerationUserParam.java
 delete mode 100644 pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PvDeviceParam.java
 delete mode 100644 pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PvDispatchParam.java
 delete mode 100644 pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PvDistributedParam.java
 delete mode 100644 pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PvLineDetailParam.java
 delete mode 100644 pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PvLvUserParam.java
 delete mode 100644 pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PvSubAreaParam.java
 delete mode 100644 pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PvSubstationParam.java
 delete mode 100644 pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PvTenVoltageParam.java
 delete mode 100644 pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PvTerminalBaseQuery.java
 delete mode 100644 pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PvUnitParam.java
 delete mode 100644 pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PvVoltageParam.java
 create mode 100644 pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PwPmsMonitorParam.java
 create mode 100644 pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/RMpMonitorAlarmCountMParam.java
 create mode 100644 pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/RStatAreaAlarmCountMParam.java
 create mode 100644 pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/RStatZwAlarmCountWParam.java
 create mode 100644 pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/StatationStatParam.java
 delete mode 100644 pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/SubAreaQueryParam.java
 delete mode 100644 pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/SubstationQueryParam.java
 delete mode 100644 pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/TenVoltageQueryParam.java
 create mode 100644 pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/TractionStationParam.java
 create mode 100644 pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/UniversalFrontEndParam.java
 delete mode 100644 pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/VoltageQueryParam.java
 create mode 100644 pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/DistributionMonitor.java
 create mode 100644 pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/Generatrix.java
 create mode 100644 pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/GeneratrixWire.java
 create mode 100644 pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/HarmonicGeneralManagement.java
 create mode 100644 pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/HarmonicGeneralManagementData.java
 create mode 100644 pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/Monitor.java
 create mode 100644 pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/PmsMonitorPO.java
 create mode 100644 pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/PowerClient.java
 create mode 100644 pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/PowerDistributionarea.java
 create mode 100644 pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/PowerGenerationUser.java
 create mode 100644 pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/PowerQualityMatter.java
 delete mode 100644 pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/PvDevice.java
 delete mode 100644 pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/PvDispatch.java
 delete mode 100644 pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/PvDistributed.java
 delete mode 100644 pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/PvLineDetail.java
 delete mode 100644 pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/PvLvUser.java
 delete mode 100644 pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/PvSubArea.java
 delete mode 100644 pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/PvSubstation.java
 delete mode 100644 pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/PvTenVoltage.java
 delete mode 100644 pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/PvUnit.java
 delete mode 100644 pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/PvVoltage.java
 create mode 100644 pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/PwPmsMonitorPO.java
 create mode 100644 pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RMpMonitorAlarmCountM.java
 create mode 100644 pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RMpPwAlarmDetailD.java
 create mode 100644 pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RMpTargetWarnD.java
 create mode 100644 pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RStatAreaAlarmCountM.java
 create mode 100644 pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RStatBusbarHarmonicPO.java
 create mode 100644 pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RStatEventOrgPO.java
 create mode 100644 pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RStatOrgPO.java
 create mode 100644 pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RStatSubstationPO.java
 create mode 100644 pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RStatZwAlarmCountW.java
 create mode 100644 pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RmpEventDetailPO.java
 create mode 100644 pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/SourceManagement.java
 create mode 100644 pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/StatationStat.java
 create mode 100644 pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/StatisticsRunMonitor.java
 create mode 100644 pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/Terminal.java
 create mode 100644 pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/TerminalEliminateData.java
 create mode 100644 pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/TractionStation.java
 create mode 100644 pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/TransientStasticData.java
 create mode 100644 pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/TreatTransientDetailData.java
 delete mode 100644 pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/DeviceRunExVO.java
 delete mode 100644 pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/DisOrLvVO.java
 create mode 100644 pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/PmsMonitorVO.java
 create mode 100644 pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/PmsTerminalVO.java
 create mode 100644 pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/PowerDistributionareaVO.java
 create mode 100644 pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/ProblemMonitorDetailVO.java
 delete mode 100644 pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/PvDeviceVO.java
 delete mode 100644 pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/PvDistributedVO.java
 delete mode 100644 pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/PvLineAllDetailVO.java
 delete mode 100644 pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/PvLvUserVO.java
 delete mode 100644 pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/PvSubAreaVO.java
 delete mode 100644 pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/PvSubstationVO.java
 delete mode 100644 pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/PvTenVoltageVO.java
 create mode 100644 pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/RMpMonitorAlarmCountMVO.java
 create mode 100644 pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/RStatAreaAlarmCountMVO.java
 create mode 100644 pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/RStatBusbarHarmonicVO.java
 create mode 100644 pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/RStatEventOrgVO.java
 create mode 100644 pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/RStatOrgVO.java
 create mode 100644 pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/RStatSubstationVO.java
 create mode 100644 pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/RStatZwAlarmCountWVO.java
 create mode 100644 pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/RmpEventDetailVO.java
 create mode 100644 pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/StatationStatVO.java
 create mode 100644 pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/TractionStationVO.java
 delete mode 100644 pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/UnitTreeVO.java
 create mode 100644 pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/utils/ExcelUtilXlsx.java
 create mode 100644 pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/utils/PmsDeviceEnumUtil.java
 create mode 100644 pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/DistributionMonitorController.java
 create mode 100644 pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/GeneratrixWireController.java
 rename pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/{PvDispatchController.java => HarmonicGeneralManagementController.java} (52%)
 create mode 100644 pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/HarmonicGeneralManagementDataController.java
 create mode 100644 pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/MonitorController.java
 create mode 100644 pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/PmsGeneralDeviceController.java
 create mode 100644 pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/PmsGeneratrixController.java
 create mode 100644 pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/PowerClientController.java
 create mode 100644 pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/PowerDistributionareaController.java
 create mode 100644 pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/PowerGenerationUserController.java
 create mode 100644 pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/PowerQualityMatterController.java
 delete mode 100644 pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/PvDeviceController.java
 delete mode 100644 pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/PvDeviceRunExController.java
 delete mode 100644 pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/PvDistributedController.java
 delete mode 100644 pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/PvLineDetailController.java
 delete mode 100644 pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/PvLvUserController.java
 delete mode 100644 pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/PvSubAreaController.java
 delete mode 100644 pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/PvSubstationController.java
 delete mode 100644 pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/PvTenVoltageController.java
 delete mode 100644 pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/PvTerminalBaseController.java
 delete mode 100644 pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/PvUnitController.java
 delete mode 100644 pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/PvVoltageController.java
 create mode 100644 pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/PwMonitorController.java
 create mode 100644 pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/RMpMonitorAlarmCountMController.java
 create mode 100644 pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/RStatAreaAlarmCountMController.java
 create mode 100644 pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/RStatBusbarHarmonicController.java
 create mode 100644 pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/RStatZwAlarmCountWController.java
 create mode 100644 pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/RmpEventDetailController.java
 create mode 100644 pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/SourceManagementController.java
 create mode 100644 pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/StatationStatController.java
 create mode 100644 pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/StatisticsRunMonitorController.java
 create mode 100644 pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/TerminalController.java
 create mode 100644 pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/TerminalEliminateDataController.java
 create mode 100644 pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/TractionStationController.java
 create mode 100644 pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/TransientStasticDataController.java
 create mode 100644 pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/TreatTransientDetailDataController.java
 create mode 100644 pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/DistributionMonitorMapper.java
 create mode 100644 pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/GeneratrixWireMapper.java
 create mode 100644 pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/HarmonicGeneralManagementDataMapper.java
 create mode 100644 pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/HarmonicGeneralManagementMapper.java
 create mode 100644 pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/MonitorMapper.java
 rename pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/{PvVoltageMapper.java => OverlimitMapper.java} (54%)
 create mode 100644 pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/PmsGeneratrixMapper.java
 create mode 100644 pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/PowerClientMapper.java
 create mode 100644 pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/PowerDistributionareaMapper.java
 create mode 100644 pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/PowerGenerationUserMapper.java
 create mode 100644 pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/PowerQualityMatterMapper.java
 delete mode 100644 pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/PvDeviceMapper.java
 delete mode 100644 pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/PvDeviceRunExMapper.java
 delete mode 100644 pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/PvDispatchMapper.java
 delete mode 100644 pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/PvDistributedMapper.java
 delete mode 100644 pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/PvLineDetailMapper.java
 delete mode 100644 pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/PvLvUserMapper.java
 delete mode 100644 pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/PvSubAreaMapper.java
 delete mode 100644 pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/PvSubstationMapper.java
 delete mode 100644 pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/PvTenVoltageMapper.java
 delete mode 100644 pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/PvUnitMapper.java
 create mode 100644 pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/PwMonitorMapper.java
 create mode 100644 pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/RMpMonitorAlarmCountMMapper.java
 create mode 100644 pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/RMpPwAlarmDetailDMapper.java
 create mode 100644 pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/RMpTargetWarnDMapper.java
 create mode 100644 pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/RStatAreaAlarmCountMMapper.java
 create mode 100644 pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/RStatBusbarHarmonicMapper.java
 create mode 100644 pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/RStatEventOrgMapper.java
 create mode 100644 pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/RStatOrgMapper.java
 create mode 100644 pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/RStatSubstationMapper.java
 create mode 100644 pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/RStatZwAlarmCountWMapper.java
 create mode 100644 pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/RmpEventDetailMapper.java
 create mode 100644 pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/SourceManagementMapper.java
 create mode 100644 pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/StatationStatMapper.java
 create mode 100644 pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/StatisticsRunMonitorMapper.java
 create mode 100644 pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/TerminalEliminateDataMapper.java
 create mode 100644 pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/TerminalMapper.java
 create mode 100644 pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/TractionStationMapper.java
 create mode 100644 pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/TransientStasticDataMapper.java
 create mode 100644 pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/TreatTransientDetailDataMapper.java
 create mode 100644 pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/DistributionMonitorMapper.xml
 create mode 100644 pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/HarmonicGeneralManagementDataMapper.xml
 create mode 100644 pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/HarmonicGeneralManagementMapper.xml
 create mode 100644 pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/MonitorMapper.xml
 create mode 100644 pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/PmsGeneratrixMapper.xml
 rename pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/{PvDispatchMapper.xml => PowerClientMapper.xml} (70%)
 create mode 100644 pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/PowerDistributionareaMapper.xml
 create mode 100644 pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/PowerGenerationUserMapper.xml
 create mode 100644 pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/PowerQualityMatterMapper.xml
 delete mode 100644 pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/PvDeviceMapper.xml
 delete mode 100644 pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/PvDeviceRunExMapper.xml
 delete mode 100644 pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/PvDistributedMapper.xml
 delete mode 100644 pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/PvLineDetailMapper.xml
 delete mode 100644 pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/PvLvUserMapper.xml
 delete mode 100644 pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/PvSubAreaMapper.xml
 delete mode 100644 pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/PvSubstationMapper.xml
 delete mode 100644 pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/PvTenVoltageMapper.xml
 delete mode 100644 pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/PvUnitMapper.xml
 create mode 100644 pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/PwMonitorMapper.xml
 create mode 100644 pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/RMpMonitorAlarmCountMMapper.xml
 create mode 100644 pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/RMpPwAlarmDetailDMapper.xml
 create mode 100644 pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/RMpTargetWarnDMapper.xml
 create mode 100644 pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/RStatAreaAlarmCountMMapper.xml
 create mode 100644 pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/RStatBusbarHarmonicMapper.xml
 create mode 100644 pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/RStatEventOrgMapper.xml
 create mode 100644 pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/RStatOrgMapper.xml
 create mode 100644 pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/RStatSubstationMapper.xml
 create mode 100644 pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/RStatZwAlarmCountWMapper.xml
 create mode 100644 pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/RmpEventDetailMapper.xml
 create mode 100644 pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/SourceManagementMapper.xml
 create mode 100644 pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/StatationStatMapper.xml
 create mode 100644 pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/StatisticsRunMonitorMapper.xml
 create mode 100644 pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/TerminalEliminateDataMapper.xml
 create mode 100644 pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/TerminalMapper.xml
 rename pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/{PvVoltageMapper.xml => TractionStationMapper.xml} (69%)
 create mode 100644 pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/TransientStasticDataMapper.xml
 create mode 100644 pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/TreatTransientDetailDataMapper.xml
 create mode 100644 pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/IDistributionMonitorService.java
 create mode 100644 pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/IGeneratrixWireService.java
 create mode 100644 pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/IHarmonicGeneralManagementDataService.java
 create mode 100644 pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/IHarmonicGeneralManagementService.java
 create mode 100644 pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/IMonitorService.java
 create mode 100644 pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/IPmsGeneralDeviceService.java
 create mode 100644 pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/IPmsGeneratrixService.java
 create mode 100644 pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/IPowerClientService.java
 create mode 100644 pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/IPowerDistributionareaService.java
 create mode 100644 pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/IPowerGenerationUserService.java
 create mode 100644 pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/IPowerQualityMatterService.java
 delete mode 100644 pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/IPvDeviceRunExService.java
 delete mode 100644 pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/IPvDeviceService.java
 delete mode 100644 pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/IPvDispatchService.java
 delete mode 100644 pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/IPvDistributedService.java
 delete mode 100644 pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/IPvLineDetailService.java
 delete mode 100644 pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/IPvLvUserService.java
 delete mode 100644 pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/IPvSubAreaService.java
 delete mode 100644 pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/IPvSubstationService.java
 delete mode 100644 pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/IPvTenVoltageService.java
 delete mode 100644 pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/IPvUnitService.java
 delete mode 100644 pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/IPvVoltageService.java
 create mode 100644 pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/IPwMonitorService.java
 create mode 100644 pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/ISourceManagementService.java
 create mode 100644 pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/IStatationStatService.java
 create mode 100644 pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/IStatisticsRunMonitorService.java
 create mode 100644 pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/ITerminalEliminateDataService.java
 create mode 100644 pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/ITerminalService.java
 create mode 100644 pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/ITractionStationService.java
 create mode 100644 pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/ITransientStasticDataService.java
 create mode 100644 pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/ITreatTransientDetailDataService.java
 delete mode 100644 pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/PvTerminalBaseService.java
 create mode 100644 pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/RMpMonitorAlarmCountMService.java
 create mode 100644 pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/RMpPwAlarmDetailDService.java
 create mode 100644 pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/RMpTargetWarnDService.java
 create mode 100644 pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/RStatAreaAlarmCountMService.java
 create mode 100644 pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/RStatBusbarHarmonicService.java
 create mode 100644 pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/RStatZwAlarmCountWService.java
 create mode 100644 pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/RmpEventDetailService.java
 create mode 100644 pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/impl/DistributionMonitorServiceImpl.java
 create mode 100644 pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/impl/GeneratrixWireImpl.java
 create mode 100644 pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/impl/HarmonicGeneralManagementDataServiceImpl.java
 create mode 100644 pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/impl/HarmonicGeneralManagementServiceImpl.java
 create mode 100644 pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/impl/IPwMonitorServiceImpl.java
 create mode 100644 pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/impl/MonitorServiceImpl.java
 create mode 100644 pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/impl/PmsGeneralDeviceServiceImpl.java
 create mode 100644 pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/impl/PmsGeneratrixServiceImpl.java
 create mode 100644 pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/impl/PowerClientServiceImpl.java
 create mode 100644 pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/impl/PowerDistributionareaServiceImpl.java
 create mode 100644 pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/impl/PowerGenerationUserServiceImpl.java
 create mode 100644 pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/impl/PowerQualityMatterServiceImpl.java
 delete mode 100644 pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/impl/PvDeviceRunExServiceImpl.java
 delete mode 100644 pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/impl/PvDeviceServiceImpl.java
 delete mode 100644 pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/impl/PvDispatchServiceImpl.java
 delete mode 100644 pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/impl/PvDistributedServiceImpl.java
 delete mode 100644 pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/impl/PvLineDetailServiceImpl.java
 delete mode 100644 pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/impl/PvLvUserServiceImpl.java
 delete mode 100644 pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/impl/PvSubAreaServiceImpl.java
 delete mode 100644 pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/impl/PvSubstationServiceImpl.java
 delete mode 100644 pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/impl/PvTenVoltageServiceImpl.java
 delete mode 100644 pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/impl/PvTerminalBaseServiceImpl.java
 delete mode 100644 pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/impl/PvUnitServiceImpl.java
 delete mode 100644 pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/impl/PvVoltageServiceImpl.java
 create mode 100644 pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/impl/RMpMonitorAlarmCountMServiceImpl.java
 create mode 100644 pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/impl/RMpPwAlarmDetailDServiceImpl.java
 create mode 100644 pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/impl/RMpTargetWarnDServiceImpl.java
 create mode 100644 pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/impl/RStatAreaAlarmCountMServiceImpl.java
 create mode 100644 pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/impl/RStatBusbarHarmonicServiceImpl.java
 create mode 100644 pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/impl/RStatZwAlarmCountWServiceImpl.java
 create mode 100644 pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/impl/RmpEventDetailServiceImpl.java
 create mode 100644 pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/impl/SourceManagementServiceImpl.java
 create mode 100644 pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/impl/StatationStatServiceImpl.java
 create mode 100644 pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/impl/StatisticsRunMonitorServiceImpl.java
 create mode 100644 pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/impl/TerminalEliminateDataServiceImpl.java
 create mode 100644 pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/impl/TerminalServiceImpl.java
 create mode 100644 pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/impl/TractionStationServiceImpl.java
 create mode 100644 pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/impl/TransientStasticDataServiceImpl.java
 create mode 100644 pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/impl/TreatTransientDetailDataServiceImpl.java
 create mode 100644 pqs-event/event-boot/src/main/java/com/njcn/event/service/Impl/ReportController.java
 create mode 100644 pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/param/AlgorithmSearchParam.java
 create mode 100644 pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/param/RMpBenchmarkLevelParam.java
 create mode 100644 pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/param/RMpHarmonicReportDParam.java
 create mode 100644 pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/param/RStatHarmonicMParam.java
 create mode 100644 pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/param/RStatOrgParam.java
 create mode 100644 pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/param/StatSubstationBizBaseParam.java
 create mode 100644 pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/DataV.java
 create mode 100644 pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/PmsAbnormalRules.java
 create mode 100644 pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpBenchmarkLevelM.java
 create mode 100644 pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpBenchmarkLevelQ.java
 create mode 100644 pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpBenchmarkLevelY.java
 create mode 100644 pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpHarmonicIMagReportD.java
 create mode 100644 pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpHarmonicIRateReportD.java
 create mode 100644 pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpHarmonicVRateReportD.java
 create mode 100644 pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpInharmonicIRateReportD.java
 create mode 100644 pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpInharmonicVRateReportD.java
 create mode 100644 pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpIntegrityD.java
 create mode 100644 pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpMeasurePhaseReportD.java
 create mode 100644 pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpMeasureReportD.java
 create mode 100644 pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpPartHarmonicDetailD.java
 create mode 100644 pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpPartHarmonicDetailM.java
 create mode 100644 pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpPassRateM.java
 create mode 100644 pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpPassRateQ.java
 create mode 100644 pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpPassRateY.java
 create mode 100644 pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpSurplusHarmonicDetailD.java
 create mode 100644 pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpSurplusHarmonicDetailM.java
 create mode 100644 pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatAbnormalD.java
 create mode 100644 pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatHarmonicD.java
 create mode 100644 pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatHarmonicM.java
 create mode 100644 pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatHarmonicQ.java
 create mode 100644 pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatHarmonicVoltageD.java
 create mode 100644 pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatHarmonicVoltageM.java
 create mode 100644 pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatHarmonicY.java
 create mode 100644 pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatLoadTypeM.java
 create mode 100644 pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatLoadTypeQ.java
 create mode 100644 pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatLoadTypeY.java
 create mode 100644 pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatOrgBusbarVoltageM.java
 create mode 100644 pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatOrgBusbarVoltageQ.java
 create mode 100644 pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatOrgBusbarVoltageY.java
 create mode 100644 pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatOrgM.java
 create mode 100644 pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatOrgQ.java
 create mode 100644 pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatOrgY.java
 create mode 100644 pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatSubstationM.java
 create mode 100644 pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatSubstationQ.java
 create mode 100644 pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatSubstationVoltageM.java
 create mode 100644 pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatSubstationY.java
 create mode 100644 pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RArrayVO.java
 create mode 100644 pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RHarmonicPolylineVO.java
 create mode 100644 pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RIconVO.java
 create mode 100644 pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RMpBenchmarkLevelVO.java
 create mode 100644 pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RMpHarmonicReportDVO.java
 create mode 100644 pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RMpHarmonicReportMVO.java
 create mode 100644 pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RMpPartHarmonicDetailIconVO.java
 create mode 100644 pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RMpPartHarmonicDetailVO.java
 create mode 100644 pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RStatHarmonicMVO.java
 create mode 100644 pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RStatLoadTypeVO.java
 create mode 100644 pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RStatOrgBusbarVoltageVO.java
 create mode 100644 pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RStatOrgIndexVO.java
 create mode 100644 pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RStatOrgVO.java
 create mode 100644 pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RStatSubstationOrg2VO.java
 create mode 100644 pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RStatSubstationOrgVO.java
 create mode 100644 pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RSubstationIcon2VO.java
 create mode 100644 pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RSubstationIconVO.java
 create mode 100644 pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RVoltageIconVO.java
 create mode 100644 pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/DataExceptionController.java
 create mode 100644 pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/DataIntegrityRateController.java
 create mode 100644 pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/RMpBenchmarkLevelController.java
 create mode 100644 pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/RMpHarmonicReportDController.java
 create mode 100644 pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/RStatHarmonicMController.java
 create mode 100644 pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/RStatHarmonicOrgMController.java
 create mode 100644 pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/RStatOrgController.java
 create mode 100644 pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/RStatSubstationMController.java
 create mode 100644 pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/PmsAbnormalRulesMapper.java
 create mode 100644 pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RMpBenchmarkLevelMMapper.java
 create mode 100644 pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RMpBenchmarkLevelQMapper.java
 create mode 100644 pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RMpBenchmarkLevelYMapper.java
 create mode 100644 pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RMpHarmonicIMagReportDMapper.java
 create mode 100644 pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RMpHarmonicIRateReportDMapper.java
 create mode 100644 pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RMpHarmonicVRateReportDMapper.java
 create mode 100644 pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RMpInharmonicIRateReportDMapper.java
 create mode 100644 pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RMpInharmonicVRateReportDMapper.java
 create mode 100644 pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RMpIntegrityDMapper.java
 create mode 100644 pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RMpMeasurePhaseReportDMapper.java
 create mode 100644 pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RMpMeasureReportDMapper.java
 create mode 100644 pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RMpPartHarmonicDetailDMapper.java
 create mode 100644 pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RMpPartHarmonicDetailMMapper.java
 create mode 100644 pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RMpPassRateMMapper.java
 create mode 100644 pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RMpPassRateQMapper.java
 create mode 100644 pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RMpPassRateYMapper.java
 create mode 100644 pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RMpSurplusHarmonicDetailDMapper.java
 create mode 100644 pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RMpSurplusHarmonicDetailMMapper.java
 create mode 100644 pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RStatAbnormalDMapper.java
 create mode 100644 pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RStatHarmonicDMapper.java
 create mode 100644 pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RStatHarmonicMMapper.java
 create mode 100644 pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RStatHarmonicQMapper.java
 create mode 100644 pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RStatHarmonicVoltageDMapper.java
 create mode 100644 pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RStatHarmonicVoltageMMapper.java
 create mode 100644 pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RStatHarmonicYMapper.java
 create mode 100644 pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RStatLoadTypeMMapper.java
 create mode 100644 pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RStatLoadTypeQMapper.java
 create mode 100644 pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RStatLoadTypeYMapper.java
 create mode 100644 pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RStatOrgBusbarVoltageMMapper.java
 create mode 100644 pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RStatOrgBusbarVoltageQMapper.java
 create mode 100644 pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RStatOrgBusbarVoltageYMapper.java
 create mode 100644 pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RStatOrgMMapper.java
 create mode 100644 pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RStatOrgQMapper.java
 create mode 100644 pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RStatOrgYMapper.java
 create mode 100644 pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RStatSubstationMMapper.java
 create mode 100644 pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RStatSubstationQMapper.java
 create mode 100644 pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RStatSubstationVoltageMMapper.java
 create mode 100644 pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RStatSubstationYMapper.java
 create mode 100644 pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RMpBenchmarkLevelMMapper.xml
 create mode 100644 pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RMpBenchmarkLevelQMapper.xml
 create mode 100644 pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RMpBenchmarkLevelYMapper.xml
 create mode 100644 pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RMpHarmonicIMagReportDMapper.xml
 create mode 100644 pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RMpHarmonicIRateReportDMapper.xml
 create mode 100644 pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RMpHarmonicVRateReportDMapper.xml
 create mode 100644 pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RMpInharmonicIRateReportDMapper.xml
 create mode 100644 pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RMpInharmonicVRateReportDMapper.xml
 create mode 100644 pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RMpMeasurePhaseReportDMapper.xml
 create mode 100644 pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RMpMeasureReportDMapper.xml
 create mode 100644 pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RMpPartHarmonicDetailDMapper.xml
 create mode 100644 pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RMpPartHarmonicDetailMMapper.xml
 create mode 100644 pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RMpPassRateMMapper.xml
 create mode 100644 pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RMpPassRateQMapper.xml
 create mode 100644 pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RMpPassRateYMapper.xml
 create mode 100644 pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RMpSurplusHarmonicDetailDMapper.xml
 create mode 100644 pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RMpSurplusHarmonicDetailMMapper.xml
 create mode 100644 pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RStatHarmonicDMapper.xml
 create mode 100644 pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RStatHarmonicMMapper.xml
 create mode 100644 pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RStatHarmonicQMapper.xml
 create mode 100644 pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RStatHarmonicVoltageDMapper.xml
 create mode 100644 pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RStatHarmonicVoltageMMapper.xml
 create mode 100644 pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RStatHarmonicYMapper.xml
 create mode 100644 pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RStatLoadTypeMMapper.xml
 create mode 100644 pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RStatLoadTypeQMapper.xml
 create mode 100644 pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RStatLoadTypeYMapper.xml
 create mode 100644 pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RStatOrgBusbarVoltageMMapper.xml
 create mode 100644 pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RStatOrgBusbarVoltageQMapper.xml
 create mode 100644 pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RStatOrgBusbarVoltageYMapper.xml
 create mode 100644 pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RStatOrgMMapper.xml
 create mode 100644 pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RStatOrgQMapper.xml
 create mode 100644 pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RStatOrgYMapper.xml
 create mode 100644 pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RStatSubstationMMapper.xml
 create mode 100644 pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RStatSubstationQMapper.xml
 create mode 100644 pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RStatSubstationVoltageMMapper.xml
 create mode 100644 pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RStatSubstationYMapper.xml
 create mode 100644 pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/DataExceptionService.java
 create mode 100644 pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/DataIntegrityRateService.java
 create mode 100644 pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/RMpBenchmarkLevelMService.java
 create mode 100644 pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/RMpBenchmarkLevelQService.java
 create mode 100644 pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/RMpBenchmarkLevelYService.java
 create mode 100644 pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/RMpHarmonicIMagReportDService.java
 create mode 100644 pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/RMpHarmonicIRateReportDService.java
 create mode 100644 pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/RMpHarmonicReportDService.java
 create mode 100644 pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/RMpHarmonicVRateReportDService.java
 create mode 100644 pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/RMpInharmonicIRateReportDService.java
 create mode 100644 pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/RMpInharmonicVRateReportDService.java
 create mode 100644 pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/RMpMeasurePhaseReportDService.java
 create mode 100644 pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/RMpMeasureReportDService.java
 create mode 100644 pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/RMpPartHarmonicDetailDService.java
 create mode 100644 pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/RMpPartHarmonicDetailMService.java
 create mode 100644 pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/RMpPassRateService.java
 create mode 100644 pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/RStatHarmonicMService.java
 create mode 100644 pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/RStatHarmonicOrgMService.java
 create mode 100644 pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/RStatHarmonicOrgQService.java
 create mode 100644 pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/RStatHarmonicOrgYService.java
 create mode 100644 pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/RStatHarmonicQService.java
 create mode 100644 pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/RStatHarmonicYService.java
 create mode 100644 pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/RStatLoadTypeService.java
 create mode 100644 pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/RStatOrgBusbarVoltageService.java
 create mode 100644 pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/RStatOrgMService.java
 create mode 100644 pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/RStatOrgQService.java
 create mode 100644 pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/RStatOrgYService.java
 create mode 100644 pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/RStatSubstationMService.java
 create mode 100644 pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/RStatSubstationVoltageMService.java
 create mode 100644 pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/DataExceptionServiceImpl.java
 create mode 100644 pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/DataIntegrityRateServiceImpl.java
 create mode 100644 pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/RMpBenchmarkLevelMServiceImpl.java
 create mode 100644 pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/RMpBenchmarkLevelQServiceImpl.java
 create mode 100644 pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/RMpBenchmarkLevelYServiceImpl.java
 create mode 100644 pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/RMpHarmonicIMagReportDServiceImpl.java
 create mode 100644 pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/RMpHarmonicIRateReportDServiceImpl.java
 create mode 100644 pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/RMpHarmonicReportDServiceImpl.java
 create mode 100644 pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/RMpHarmonicVRateReportDServiceImpl.java
 create mode 100644 pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/RMpInharmonicIRateReportDServiceImpl.java
 create mode 100644 pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/RMpInharmonicVRateReportDServiceImpl.java
 create mode 100644 pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/RMpMeasurePhaseReportDServiceImpl.java
 create mode 100644 pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/RMpMeasureReportDServiceImpl.java
 create mode 100644 pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/RMpPartHarmonicDetailDServiceImpl.java
 create mode 100644 pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/RMpPartHarmonicDetailMServiceImpl.java
 create mode 100644 pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/RMpPassRateServiceImpl.java
 create mode 100644 pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/RStatHarmonicMServiceImpl.java
 create mode 100644 pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/RStatHarmonicOrgMServiceImpl.java
 create mode 100644 pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/RStatHarmonicOrgQServiceImpl.java
 create mode 100644 pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/RStatHarmonicOrgYServiceImpl.java
 create mode 100644 pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/RStatHarmonicQServiceImpl.java
 create mode 100644 pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/RStatHarmonicYServiceImpl.java
 create mode 100644 pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/RStatLoadTypeServiceImpl.java
 create mode 100644 pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/RStatOrgBusbarVoltageServiceImpl.java
 create mode 100644 pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/RStatOrgMServiceImpl.java
 create mode 100644 pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/RStatOrgQServiceImpl.java
 create mode 100644 pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/RStatOrgYServiceImpl.java
 create mode 100644 pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/RStatSubstationMServiceImpl.java
 create mode 100644 pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/RStatSubstationVoltageMServiceImpl.java
 create mode 100644 pqs-job/job-executor.zip
 create mode 100644 pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/CoustmReportFeignClient.java
 create mode 100644 pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/DayDataFeignClient.java
 create mode 100644 pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/IntegrityFeignClient.java
 create mode 100644 pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/LimitTargetFeignClient.java
 create mode 100644 pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/LimitrateFeignClient.java
 create mode 100644 pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/NormalLimitFeignClient.java
 create mode 100644 pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/OnlineRateFeignClient.java
 create mode 100644 pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/PollutionFeignClient.java
 create mode 100644 pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/fallback/CoustomReportFeignClientFallbackFactory.java
 create mode 100644 pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/fallback/DayDataFeignClientFallbackFactory.java
 create mode 100644 pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/fallback/IntegrityFeignClientFallbackFactory.java
 create mode 100644 pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/fallback/LimitTargetFeignClientFallbackFactory.java
 create mode 100644 pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/fallback/LimitrateFeignClientFallbackFactory.java
 create mode 100644 pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/fallback/NormalFeignClientFallbackFactory.java
 create mode 100644 pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/fallback/OnlineRateFeignClientFallbackFactory.java
 create mode 100644 pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/fallback/PollutionFeignClientFallbackFactory.java
 create mode 100644 pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/voltage/VoltageFeignClient.java
 create mode 100644 pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/constant/InfluxdbPOConverter.java
 create mode 100644 pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/constant/Param.java
 create mode 100644 pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/controller/LimitRateServiceTest.java
 create mode 100644 pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/controller/area/AreaController.java
 create mode 100644 pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/controller/device/DeviceController.java
 create mode 100644 pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/controller/line/DayDataController.java
 create mode 100644 pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/controller/line/IntegrityController.java
 create mode 100644 pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/controller/line/LimitTargetController.java
 create mode 100644 pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/controller/line/LimitrateController.java
 create mode 100644 pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/controller/line/NormalLimitController.java
 create mode 100644 pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/controller/line/OnlineRateController.java
 create mode 100644 pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/controller/line/PollutionController.java
 create mode 100644 pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/controller/line/ReportController.java
 create mode 100644 pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/controller/substion/SubstionController.java
 create mode 100644 pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/controller/voltage/VoltageController.java
 create mode 100644 pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/area/AreaMapper.java
 create mode 100644 pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/device/DeviceMapper.java
 create mode 100644 pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/AbnormalMapper.java
 create mode 100644 pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/ExcelRptMapper.java
 create mode 100644 pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/ExcelRptTempMapper.java
 create mode 100644 pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/LimitRatePOMapper.java
 create mode 100644 pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/LimitTargetPOMapper.java
 create mode 100644 pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/NormLimitMapper.java
 create mode 100644 pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/RMpFlickerReportDPOMapper.java
 create mode 100644 pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/RMpHarmonicIMagReportDPOMapper.java
 create mode 100644 pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/RMpHarmonicIRateReportDPOMapper.java
 create mode 100644 pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/RMpHarmonicPReportDPOMapper.java
 create mode 100644 pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/RMpHarmonicVRateReportDPOMapper.java
 create mode 100644 pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/RMpInharmonicIMagReportDPOMapper.java
 create mode 100644 pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/RMpInharmonicIRateReportDPOMapper.java
 create mode 100644 pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/RMpInharmonicVRateReportDPOMapper.java
 create mode 100644 pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/RMpMeasurePhaseReportDPOMapper.java
 create mode 100644 pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/RMpMeasureReportDPOMapper.java
 create mode 100644 pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/RMpPltReportDPOMapper.java
 create mode 100644 pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/RMpPollutionDMapper.java
 create mode 100644 pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/RStatPollutionOrgDMapper.java
 create mode 100644 pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/RStatPollutionOrgMMapper.java
 create mode 100644 pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/RStatPollutionOrgQMapper.java
 create mode 100644 pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/RStatPollutionOrgYMapper.java
 create mode 100644 pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/RStatPollutionSubstationDMapper.java
 create mode 100644 pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/RStatPollutionSubstationMMapper.java
 create mode 100644 pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/RStatPollutionSubstationQMapper.java
 create mode 100644 pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/RStatPollutionSubstationYMapper.java
 create mode 100644 pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/mapping/ExcelRptTempMapper.xml
 create mode 100644 pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/mapping/LimitRatePOMapper.xml
 create mode 100644 pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/mapping/LimitTargetPOMapper.xml
 create mode 100644 pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/mapping/RMpFlickerReportDPOMapper.xml
 create mode 100644 pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/mapping/RMpHarmonicIMagReportDPOMapper.xml
 create mode 100644 pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/mapping/RMpHarmonicIRateReportDPOMapper.xml
 create mode 100644 pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/mapping/RMpHarmonicPReportDPOMapper.xml
 create mode 100644 pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/mapping/RMpHarmonicVRateReportDPOMapper.xml
 create mode 100644 pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/mapping/RMpInharmonicIMagReportDPOMapper.xml
 create mode 100644 pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/mapping/RMpInharmonicIRateReportDPOMapper.xml
 create mode 100644 pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/mapping/RMpInharmonicVRateReportDPOMapper.xml
 create mode 100644 pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/mapping/RMpMeasurePhaseReportDPOMapper.xml
 create mode 100644 pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/mapping/RMpMeasureReportDPOMapper.xml
 create mode 100644 pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/mapping/RMpPltReportDPOMapper.xml
 create mode 100644 pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/mapping/RMpPollutionDMapper.xml
 create mode 100644 pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/mapping/RStatPollutionOrgDMapper.xml
 create mode 100644 pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/mapping/RStatPollutionOrgMMapper.xml
 create mode 100644 pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/mapping/RStatPollutionOrgQMapper.xml
 create mode 100644 pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/mapping/RStatPollutionOrgYMapper.xml
 create mode 100644 pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/mapping/RStatPollutionSubstationDMapper.xml
 create mode 100644 pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/mapping/RStatPollutionSubstationMMapper.xml
 create mode 100644 pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/mapping/RStatPollutionSubstationQMapper.xml
 create mode 100644 pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/mapping/RStatPollutionSubstationYMapper.xml
 create mode 100644 pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/substion/subMapper.java
 create mode 100644 pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/voltage/VoltageMapper.java
 create mode 100644 pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/pojo/dto/LineDTO.java
 create mode 100644 pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/pojo/dto/OnLineRateDTO.java
 create mode 100644 pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/pojo/dto/PollutionDTO.java
 create mode 100644 pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/pojo/param/LimitRateHanlderParam.java
 create mode 100644 pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/pojo/param/LineParam.java
 create mode 100644 pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/pojo/po/AbnormalPO.java
 create mode 100644 pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/pojo/po/DataFlickerPO.java
 create mode 100644 pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/pojo/po/DataFlucPO.java
 create mode 100644 pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/pojo/po/DataHarmPhasicIPO.java
 create mode 100644 pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/pojo/po/DataHarmPhasicVPO.java
 create mode 100644 pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/pojo/po/DataHarmPowerPPO.java
 create mode 100644 pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/pojo/po/DataHarmPowerQPO.java
 create mode 100644 pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/pojo/po/DataHarmPowerSPO.java
 create mode 100644 pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/pojo/po/DataHarmRateIPO.java
 create mode 100644 pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/pojo/po/DataHarmRateVPO.java
 create mode 100644 pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/pojo/po/DataIPO.java
 create mode 100644 pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/pojo/po/DataInHarmIPO.java
 create mode 100644 pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/pojo/po/DataInHarmRateIPO.java
 create mode 100644 pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/pojo/po/DataInHarmRateVPO.java
 create mode 100644 pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/pojo/po/DataInHarmVPO.java
 create mode 100644 pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/pojo/po/DataPltPO.java
 create mode 100644 pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/pojo/po/DataPolluctionPO.java
 create mode 100644 pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/pojo/po/DataVPO.java
 create mode 100644 pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/pojo/po/DayHarmrateVPO.java
 create mode 100644 pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/pojo/po/DayIPO.java
 create mode 100644 pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/pojo/po/DayInharmVPO.java
 create mode 100644 pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/pojo/po/DayPltPO.java
 create mode 100644 pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/pojo/po/DayVPO.java
 create mode 100644 pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/pojo/po/ExcelRpt.java
 create mode 100644 pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/pojo/po/ExcelRptTemp.java
 create mode 100644 pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/pojo/po/LinePO.java
 create mode 100644 pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/pojo/po/PqsCommunicatePO.java
 create mode 100644 pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/pojo/po/RMpPollutionD.java
 create mode 100644 pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/pojo/po/RStatPollutionOrgD.java
 create mode 100644 pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/pojo/po/RStatPollutionOrgM.java
 create mode 100644 pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/pojo/po/RStatPollutionOrgQ.java
 create mode 100644 pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/pojo/po/RStatPollutionOrgY.java
 create mode 100644 pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/pojo/po/RStatPollutionSubstationD.java
 create mode 100644 pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/pojo/po/RStatPollutionSubstationM.java
 create mode 100644 pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/pojo/po/RStatPollutionSubstationQ.java
 create mode 100644 pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/pojo/po/RStatPollutionSubstationY.java
 create mode 100644 pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/pojo/po/line/LimitTargetPO.java
 create mode 100644 pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/pojo/po/line/RMpFlickerReportDPO.java
 create mode 100644 pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/pojo/po/line/RMpHarmonicIMagReportDPO.java
 create mode 100644 pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/pojo/po/line/RMpHarmonicIRateReportDPO.java
 create mode 100644 pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/pojo/po/line/RMpHarmonicPReportDPO.java
 create mode 100644 pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/pojo/po/line/RMpHarmonicVRateReportDPO.java
 create mode 100644 pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/pojo/po/line/RMpInharmonicIMagReportDPO.java
 create mode 100644 pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/pojo/po/line/RMpInharmonicIRateReportDPO.java
 create mode 100644 pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/pojo/po/line/RMpInharmonicVRateReportDPO.java
 create mode 100644 pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/pojo/po/line/RMpMeasurePhaseReportDPO.java
 create mode 100644 pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/pojo/po/line/RMpMeasureReportDPO.java
 create mode 100644 pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/pojo/po/line/RMpPltReportDPO.java
 create mode 100644 pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/pojo/vo/AbnormalVO.java
 create mode 100644 pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/pojo/vo/LineVO.java
 create mode 100644 pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/pojo/vo/ReportTemplateVO.java
 create mode 100644 pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/Impl/area/AreaServiceImpl.java
 create mode 100644 pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/Impl/device/DeviceServiceImpl.java
 create mode 100644 pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/Impl/line/DayDataServiceImpl.java
 create mode 100644 pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/Impl/line/IntegrityServiceImpl.java
 create mode 100644 pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/Impl/line/LimitRateService.java
 create mode 100644 pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/Impl/line/LimitTargetServiceImpl.java
 create mode 100644 pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/Impl/line/NormalLimitServiceImpl.java
 create mode 100644 pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/Impl/line/OnlineRateServiceImpl.java
 create mode 100644 pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/Impl/line/PollutionServiceImpl.java
 create mode 100644 pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/Impl/line/RMpFlickerReportDPOServiceImpl.java
 create mode 100644 pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/Impl/line/RMpHarmonicIMagReportDPOServiceImpl.java
 create mode 100644 pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/Impl/line/RMpHarmonicIRateReportDPOServiceImpl.java
 create mode 100644 pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/Impl/line/RMpHarmonicPReportDPOServiceImpl.java
 create mode 100644 pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/Impl/line/RMpHarmonicVRateReportDPOServiceImpl.java
 create mode 100644 pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/Impl/line/RMpInharmonicIMagReportDPOServiceImpl.java
 create mode 100644 pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/Impl/line/RMpInharmonicIRateReportDPOServiceImpl.java
 create mode 100644 pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/Impl/line/RMpInharmonicVRateReportDPOServiceImpl.java
 create mode 100644 pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/Impl/line/RMpMeasurePhaseReportDPOServiceImpl.java
 create mode 100644 pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/Impl/line/RMpMeasureReportDPOServiceImpl.java
 create mode 100644 pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/Impl/line/RMpPltReportDPOServiceImpl.java
 create mode 100644 pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/Impl/line/ReportServiceImpl.java
 create mode 100644 pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/Impl/substion/SubstionServiceImpl.java
 create mode 100644 pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/Impl/voltage/VoltageServiceImpl.java
 create mode 100644 pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/RMpFlickerReportDPOService.java
 create mode 100644 pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/RMpHarmonicIMagReportDPOService.java
 create mode 100644 pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/RMpHarmonicIRateReportDPOService.java
 create mode 100644 pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/RMpInharmonicIMagReportDPOService.java
 create mode 100644 pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/RMpInharmonicIRateReportDPOService.java
 create mode 100644 pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/RMpInharmonicVRateReportDPOService.java
 create mode 100644 pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/RMpMeasurePhaseReportDPOService.java
 create mode 100644 pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/RMpMeasureReportDPOService.java
 create mode 100644 pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/RMpPltReportDPOService.java
 create mode 100644 pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/area/AreaService.java
 create mode 100644 pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/device/DeviceService.java
 create mode 100644 pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/line/DayDataService.java
 create mode 100644 pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/line/IntegrityService.java
 create mode 100644 pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/line/LimitTargetService.java
 create mode 100644 pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/line/NormalLimitService.java
 create mode 100644 pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/line/OnlineRateService.java
 create mode 100644 pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/line/PollutionService.java
 create mode 100644 pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/line/RMpHarmonicPReportDPOService.java
 create mode 100644 pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/line/RMpHarmonicVRateReportDPOService.java
 create mode 100644 pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/line/ReportService.java
 create mode 100644 pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/substion/SubstionService.java
 create mode 100644 pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/voltage/VoltageService.java

diff --git a/pom.xml b/pom.xml
index adff767d3..72634fdfa 100644
--- a/pom.xml
+++ b/pom.xml
@@ -47,7 +47,8 @@
         <!--nacos的ip:port-->
         <nacos.url>${middle.server.url}:18848</nacos.url>
         <!--服务器发布内容为空-->
-        <!--                <nacos.namespace></nacos.namespace>-->
+<!--                        <nacos.namespace></nacos.namespace>-->
+<!--        <nacos.namespace>ba3ba5d1-3480-4755-8b87-6b1fce16201c</nacos.namespace>-->
         <nacos.namespace>f6df4a49-39cb-4355-a8fd-8aeb0c537eb1</nacos.namespace>
         <!--sentinel:port-->
         <!--        <sentinel.url>192.168.1.14:8080</sentinel.url>-->
@@ -60,7 +61,7 @@
         <docker.repostory>${docker.server.url}:8090</docker.repostory>
         <!--docker远程项目仓库名-->
         <docker.registry.name>njcn</docker.registry.name>
-        <docker.operate>site</docker.operate>
+        <docker.operate>deploy</docker.operate>
         <java.version>1.8</java.version>
         <maven.compiler.source>8</maven.compiler.source>
         <maven.compiler.target>8</maven.compiler.target>
@@ -76,6 +77,7 @@
         <druid.version>1.2.5</druid.version>
         <mysql.version>8.0.19</mysql.version>
         <mybatis-plus.version>3.4.2</mybatis-plus.version>
+        <mybatis-plus.jeffreyning.version>1.5.1-RELEASE</mybatis-plus.jeffreyning.version>
         <mybatis-plus-generator.version>3.5.1</mybatis-plus-generator.version>
         <velocity.version>2.3</velocity.version>
         <jjwt.version>0.9.1</jjwt.version>
@@ -197,6 +199,11 @@
                 <artifactId>mybatis-plus-generator</artifactId>
                 <version>${mybatis-plus-generator.version}</version>
             </dependency>
+            <dependency>
+                <groupId>com.github.jeffreyning</groupId>
+                <artifactId>mybatisplus-plus</artifactId>
+                <version>${mybatis-plus.jeffreyning.version}</version>
+            </dependency>
             <dependency>
                 <groupId>org.apache.velocity</groupId>
                 <artifactId>velocity-engine-core</artifactId>
diff --git a/pqs-common/common-db/pom.xml b/pqs-common/common-db/pom.xml
index 55e7a2db8..c160a2fd6 100644
--- a/pqs-common/common-db/pom.xml
+++ b/pqs-common/common-db/pom.xml
@@ -53,6 +53,11 @@
             <groupId>com.baomidou</groupId>
             <artifactId>mybatis-plus-boot-starter</artifactId>
         </dependency>
+<!--        <dependency>-->
+<!--            <groupId>com.github.jeffreyning</groupId>-->
+<!--            <artifactId>mybatisplus-plus</artifactId>-->
+<!--            <scope>compile</scope>-->
+<!--        </dependency>-->
         <!--数据库相关********end-->
     </dependencies>
 
diff --git a/pqs-common/common-swagger/src/main/java/com/njcn/swagger/config/Knife4jSwaggerConfig.java b/pqs-common/common-swagger/src/main/java/com/njcn/swagger/config/Knife4jSwaggerConfig.java
index 7b68ff6af..e138686e5 100644
--- a/pqs-common/common-swagger/src/main/java/com/njcn/swagger/config/Knife4jSwaggerConfig.java
+++ b/pqs-common/common-swagger/src/main/java/com/njcn/swagger/config/Knife4jSwaggerConfig.java
@@ -53,6 +53,8 @@ public class Knife4jSwaggerConfig {
     public Docket defaultApi() {
         List<String> controllerPath = Stream.of(
                 "com.njcn.user.controller",
+                "com.njcn.prepare.harmonic.controller",
+                "com.njcn.prepare.event.controller",
                 "com.njcn.device.pq.controller",
                 "com.njcn.device.pms.controller",
                 "com.njcn.auth.controller",
diff --git a/pqs-device/pms-device/pms-device-api/pom.xml b/pqs-device/pms-device/pms-device-api/pom.xml
index 18864dfb5..7ffaf2a15 100644
--- a/pqs-device/pms-device/pms-device-api/pom.xml
+++ b/pqs-device/pms-device/pms-device-api/pom.xml
@@ -22,5 +22,11 @@
             <artifactId>common-device-biz</artifactId>
             <version>${project.version}</version>
         </dependency>
+        <dependency>
+            <groupId>com.njcn</groupId>
+            <artifactId>pq-device-api</artifactId>
+            <version>1.0.0</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 </project>
\ No newline at end of file
diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/api/MonitorClient.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/api/MonitorClient.java
new file mode 100644
index 000000000..ac99e4e09
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/api/MonitorClient.java
@@ -0,0 +1,69 @@
+package com.njcn.device.pms.api;
+
+import com.njcn.common.pojo.constant.ServerInfo;
+import com.njcn.common.pojo.response.HttpResult;
+import com.njcn.device.pms.api.fallback.MonitorClientFallbackFactory;
+import com.njcn.device.pms.pojo.dto.PmsMonitorDTO;
+import com.njcn.device.pms.pojo.dto.PmsMonitorInfoDTO;
+import com.njcn.device.pms.pojo.dto.PwPmsMonitorDTO;
+import com.njcn.device.pms.pojo.param.PmsMonitorInfoParam;
+import com.njcn.device.pms.pojo.param.PmsMonitorParam;
+import com.njcn.device.pms.pojo.param.PwPmsMonitorParam;
+import com.njcn.device.pq.pojo.po.Overlimit;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import java.util.List;
+
+/**
+ * @author yzh
+ * @date 2022/10/18
+ */
+@FeignClient(
+        value = ServerInfo.DEVICE,
+        path = "/pms/monitor",
+        fallbackFactory = MonitorClientFallbackFactory.class)
+public interface MonitorClient {
+
+    /**
+     * 获取指定的监测点信息
+     *
+     * @param pmsMonitorInfoParam 获取监测点详情数据入参
+     * @return 指定的监测点信息
+     */
+    @PostMapping("/getMonitorInfo")
+    HttpResult<List<PmsMonitorInfoDTO>> getMonitorInfo(@RequestBody PmsMonitorInfoParam pmsMonitorInfoParam);
+
+    /***
+     * 根据条件获取监测点信息列表
+     * @author jianghaifei
+     * @date 2022-10-20 22:53
+     * @param pmsMonitorParam
+     * @return com.njcn.common.pojo.response.HttpResult<java.util.List < com.njcn.device.pms.pojo.dto.PmsMonitorDTO>>
+     */
+    @PostMapping("/getMonitorInfoListByCond")
+    public HttpResult<List<PmsMonitorDTO>> getMonitorInfoListByCond(@RequestBody PmsMonitorParam pmsMonitorParam);
+
+
+    /**
+     * 根据监测点id获取限值
+     *
+     * @param id 监测点id
+     * @return 获取限值
+     */
+    @PostMapping("getOverLimitData")
+    HttpResult<Overlimit> getOverLimitData(@RequestParam("id") String id);
+
+    /**
+     * 获取配网所有监测点信息
+     *
+     * @param pwPmsMonitorParam 参数条件
+     * @return 配网所有监测点信息
+     */
+    @PostMapping("/getPwMonitorList")
+    HttpResult<List<PwPmsMonitorDTO>> getPwMonitorList(@RequestBody PwPmsMonitorParam pwPmsMonitorParam);
+
+}
diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/api/PmsGeneralDeviceInfoClient.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/api/PmsGeneralDeviceInfoClient.java
new file mode 100644
index 000000000..a761a681c
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/api/PmsGeneralDeviceInfoClient.java
@@ -0,0 +1,42 @@
+package com.njcn.device.pms.api;
+
+import com.njcn.common.pojo.constant.ServerInfo;
+import com.njcn.common.pojo.response.HttpResult;
+import com.njcn.device.pms.api.fallback.PmsGeneralDeviceInfoClientFallbackFactory;
+import com.njcn.device.pms.pojo.dto.PmsGeneralDeviceDTO;
+import com.njcn.device.pms.pojo.param.PmsDeviceInfoParam;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+import java.util.List;
+
+/**
+ * @author hongawen
+ * @version 1.0.0
+ * @date 2022年02月14日 14:02
+ */
+@FeignClient(value = ServerInfo.DEVICE, path = "/pmsDeviceInfo", fallbackFactory = PmsGeneralDeviceInfoClientFallbackFactory.class)
+public interface PmsGeneralDeviceInfoClient {
+
+
+    /***
+     * 获取指定组织下台账综合信息
+     * @author hongawen
+     * @date 2022/10/18 10:12
+     * @param pmsDeviceInfoParam 查询条件
+     * @return HttpResult<List<PmsGeneralDeviceDTO>> 统计结果
+     */
+    @PostMapping("/getPmsDeviceInfoWithInOrg")
+    HttpResult<List<PmsGeneralDeviceDTO>> getPmsDeviceInfoWithInOrg(@RequestBody PmsDeviceInfoParam pmsDeviceInfoParam);
+
+    /***
+     * 获取指定组织下台账综合信息
+     * @author cdf
+     * @date 2022/10/18 10:12
+     * @param pmsDeviceInfoParam 查询条件
+     * @return HttpResult<List<PmsGeneralDeviceDTO>> 统计结果
+     */
+    @PostMapping("/getPwPmsDeviceInfoWithOrgId")
+    HttpResult<List<PmsGeneralDeviceDTO>> getPwPmsDeviceInfoWithOrgId(@RequestBody PmsDeviceInfoParam pmsDeviceInfoParam);
+}
diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/api/PmsGeneratrixClient.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/api/PmsGeneratrixClient.java
new file mode 100644
index 000000000..2c07625b9
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/api/PmsGeneratrixClient.java
@@ -0,0 +1,33 @@
+package com.njcn.device.pms.api;
+
+import com.njcn.common.pojo.constant.ServerInfo;
+import com.njcn.common.pojo.response.HttpResult;
+import com.njcn.device.pms.api.fallback.PmsGeneratrixClientFallbackFactory;
+import com.njcn.device.pms.api.fallback.StatationStatClientFallbackFactory;
+import com.njcn.device.pms.pojo.dto.PmsGeneratrixDTO;
+import com.njcn.device.pms.pojo.param.PmsGeneratrixParam;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+import java.util.List;
+
+/**
+ * @author yzh
+ * @date 2022/10/18
+ */
+@FeignClient(value = ServerInfo.DEVICE,
+        path = "/pmsGeneratrix",
+        fallbackFactory = PmsGeneratrixClientFallbackFactory.class)
+public interface PmsGeneratrixClient {
+
+    /**
+     * 获取母线信息
+     *
+     * @param pmsGeneratrixParam 入参
+     * @return 母线信息
+     */
+    @PostMapping("/getGeneratrixInfo")
+    HttpResult<List<PmsGeneratrixDTO>> getGeneratrixInfo(@RequestBody PmsGeneratrixParam pmsGeneratrixParam);
+}
diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/api/PwMonitorClient.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/api/PwMonitorClient.java
new file mode 100644
index 000000000..1e67fd790
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/api/PwMonitorClient.java
@@ -0,0 +1,34 @@
+package com.njcn.device.pms.api;
+
+import com.njcn.common.pojo.constant.ServerInfo;
+import com.njcn.common.pojo.response.HttpResult;
+import com.njcn.device.pms.api.fallback.MonitorClientFallbackFactory;
+import com.njcn.device.pms.api.fallback.PwMonitorClientFallbackFactory;
+import com.njcn.device.pms.pojo.dto.PwPmsMonitorDTO;
+import com.njcn.device.pms.pojo.param.PwPmsMonitorParam;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+import java.util.List;
+
+/**
+ * @author yzh
+ * @date 2022/10/28
+ */
+
+@FeignClient(
+        value = ServerInfo.DEVICE,
+        path = "/pms/pwMonitor",
+        fallbackFactory = PwMonitorClientFallbackFactory.class)
+public interface PwMonitorClient {
+
+    /**
+     * 获取配网所有监测点信息
+     * @param pwPmsMonitorParam 参数条件
+     * @return 配网所有监测点信息
+     */
+    @PostMapping("/getPwMonitorList")
+    HttpResult<List<PwPmsMonitorDTO>> getPwMonitorList(@RequestBody PwPmsMonitorParam pwPmsMonitorParam);
+}
diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/api/StatationStatClient.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/api/StatationStatClient.java
new file mode 100644
index 000000000..e372fa81a
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/api/StatationStatClient.java
@@ -0,0 +1,34 @@
+package com.njcn.device.pms.api;
+
+import com.njcn.common.pojo.constant.ServerInfo;
+import com.njcn.common.pojo.response.HttpResult;
+import com.njcn.device.pms.api.fallback.StatationStatClientFallbackFactory;
+import com.njcn.device.pms.pojo.dto.PmsStatationStatInfoDTO;
+
+import com.njcn.device.pms.pojo.param.PmsStatationStatInfoParam;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+import java.util.List;
+
+/**
+ * @author yzh
+ * @date 2022/10/18
+ */
+@FeignClient(value = ServerInfo.DEVICE,
+        path = "/pms/statationStat",
+        fallbackFactory = StatationStatClientFallbackFactory.class)
+public interface StatationStatClient {
+
+    /**
+     * 获取指定的变电站信息
+     *
+     * @param pmsStatationStatInfoParam 变电站详情数据入参
+     * @return 指定的变电站信息
+     */
+    @PostMapping("/getStatationStat")
+    HttpResult<List<PmsStatationStatInfoDTO>> getStatationStatInfo(@RequestBody PmsStatationStatInfoParam pmsStatationStatInfoParam);
+
+}
diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/api/fallback/MonitorClientFallbackFactory.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/api/fallback/MonitorClientFallbackFactory.java
new file mode 100644
index 000000000..dca7c1cac
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/api/fallback/MonitorClientFallbackFactory.java
@@ -0,0 +1,64 @@
+package com.njcn.device.pms.api.fallback;
+
+import com.njcn.common.pojo.enums.response.CommonResponseEnum;
+import com.njcn.common.pojo.exception.BusinessException;
+import com.njcn.common.pojo.response.HttpResult;
+import com.njcn.device.pms.api.MonitorClient;
+import com.njcn.device.pms.pojo.dto.PmsMonitorDTO;
+import com.njcn.device.pms.pojo.dto.PmsMonitorInfoDTO;
+import com.njcn.device.pms.pojo.dto.PwPmsMonitorDTO;
+import com.njcn.device.pms.pojo.param.PmsMonitorInfoParam;
+import com.njcn.device.pms.pojo.param.PmsMonitorParam;
+import com.njcn.device.pms.pojo.param.PwPmsMonitorParam;
+import com.njcn.device.pms.utils.PmsDeviceEnumUtil;
+import com.njcn.device.pq.pojo.po.Overlimit;
+import feign.hystrix.FallbackFactory;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * @author yzh
+ * @date 2022/10/18
+ */
+@Slf4j
+@Component
+public class MonitorClientFallbackFactory implements FallbackFactory<MonitorClient> {
+
+    @Override
+    public MonitorClient create(Throwable throwable) {
+        //判断抛出异常是否为解码器抛出的业务异常
+        Enum<?> exceptionEnum = CommonResponseEnum.SERVICE_FALLBACK;
+        if (throwable.getCause() instanceof BusinessException) {
+            BusinessException businessException = (BusinessException) throwable.getCause();
+            exceptionEnum = PmsDeviceEnumUtil.getExceptionEnum(businessException.getResult());
+        }
+        Enum<?> finalExceptionEnum = exceptionEnum;
+        return new MonitorClient()
+        {
+            @Override
+            public HttpResult<List<PmsMonitorInfoDTO>> getMonitorInfo(PmsMonitorInfoParam pmsMonitorInfoParam) {
+                log.error("{}异常，降级处理，异常为：{}", "获取指定的监测点信息", throwable.toString());
+                throw new BusinessException(finalExceptionEnum);
+            }
+
+            @Override
+            public HttpResult<List<PmsMonitorDTO>> getMonitorInfoListByCond(PmsMonitorParam pmsMonitorParam) {
+                log.error("{}异常，降级处理，异常为：{}", "根据条件获取监测点信息列表", throwable.toString());
+                throw new BusinessException(finalExceptionEnum);
+            }
+            @Override
+            public HttpResult<List<PwPmsMonitorDTO>> getPwMonitorList(PwPmsMonitorParam pwPmsMonitorParam) {
+                log.error("{}异常，降级处理，异常为：{}", "获取配网所有监测点信息", throwable.toString());
+                throw new BusinessException(finalExceptionEnum);
+            }
+
+            @Override
+            public HttpResult<Overlimit> getOverLimitData(String id) {
+                log.error("{}异常，降级处理，异常为：{}", "根据监测点Id获取限值  ", throwable.toString());
+                throw new BusinessException(finalExceptionEnum);
+            }
+        };
+    }
+}
diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/api/fallback/PmsGeneralDeviceInfoClientFallbackFactory.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/api/fallback/PmsGeneralDeviceInfoClientFallbackFactory.java
new file mode 100644
index 000000000..33ee43349
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/api/fallback/PmsGeneralDeviceInfoClientFallbackFactory.java
@@ -0,0 +1,51 @@
+package com.njcn.device.pms.api.fallback;
+
+
+import com.njcn.common.pojo.enums.response.CommonResponseEnum;
+import com.njcn.common.pojo.exception.BusinessException;
+import com.njcn.common.pojo.response.HttpResult;
+import com.njcn.device.pms.api.PmsGeneralDeviceInfoClient;
+import com.njcn.device.pms.pojo.dto.PmsGeneralDeviceDTO;
+import com.njcn.device.pms.pojo.param.PmsDeviceInfoParam;
+import com.njcn.device.pms.utils.PmsDeviceEnumUtil;
+import feign.hystrix.FallbackFactory;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * @author hongawen
+ * @version 1.0.0
+ * @date 2022年10月18日 10:09
+ */
+@Slf4j
+@Component
+public class PmsGeneralDeviceInfoClientFallbackFactory implements FallbackFactory<PmsGeneralDeviceInfoClient> {
+
+
+    @Override
+    public PmsGeneralDeviceInfoClient create(Throwable throwable) {
+        //判断抛出异常是否为解码器抛出的业务异常
+        Enum<?> exceptionEnum = CommonResponseEnum.SERVICE_FALLBACK;
+        if (throwable.getCause() instanceof BusinessException) {
+            BusinessException businessException = (BusinessException) throwable.getCause();
+            exceptionEnum = PmsDeviceEnumUtil.getExceptionEnum(businessException.getResult());
+        }
+        Enum<?> finalExceptionEnum = exceptionEnum;
+        return new PmsGeneralDeviceInfoClient()
+        {
+            @Override
+            public HttpResult<List<PmsGeneralDeviceDTO>> getPmsDeviceInfoWithInOrg(PmsDeviceInfoParam pmsDeviceInfoParam) {
+                log.error("{}异常，降级处理，异常为：{}", "获取指定组织下台账综合信息", throwable.toString());
+                throw new BusinessException(finalExceptionEnum);
+            }
+
+            @Override
+            public HttpResult<List<PmsGeneralDeviceDTO>> getPwPmsDeviceInfoWithOrgId(PmsDeviceInfoParam pmsDeviceInfoParam) {
+                log.error("{}异常，降级处理，异常为：{}", "获取指定组织下配网台账综合信息", throwable.toString());
+                throw new BusinessException(finalExceptionEnum);
+            }
+        };
+    }
+}
diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/api/fallback/PmsGeneratrixClientFallbackFactory.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/api/fallback/PmsGeneratrixClientFallbackFactory.java
new file mode 100644
index 000000000..851ae2fbc
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/api/fallback/PmsGeneratrixClientFallbackFactory.java
@@ -0,0 +1,43 @@
+package com.njcn.device.pms.api.fallback;
+
+import com.njcn.common.pojo.enums.response.CommonResponseEnum;
+import com.njcn.common.pojo.exception.BusinessException;
+import com.njcn.common.pojo.response.HttpResult;
+import com.njcn.device.pms.api.PmsGeneralDeviceInfoClient;
+import com.njcn.device.pms.api.PmsGeneratrixClient;
+import com.njcn.device.pms.pojo.dto.PmsGeneralDeviceDTO;
+import com.njcn.device.pms.pojo.dto.PmsGeneratrixDTO;
+import com.njcn.device.pms.pojo.param.PmsDeviceInfoParam;
+import com.njcn.device.pms.pojo.param.PmsGeneratrixParam;
+import com.njcn.device.pms.utils.PmsDeviceEnumUtil;
+import feign.hystrix.FallbackFactory;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * @author yzh
+ * @date 2022/10/18
+ */
+@Slf4j
+@Component
+public class PmsGeneratrixClientFallbackFactory implements FallbackFactory<PmsGeneratrixClient> {
+    @Override
+    public PmsGeneratrixClient create(Throwable throwable) {
+        //判断抛出异常是否为解码器抛出的业务异常
+        Enum<?> exceptionEnum = CommonResponseEnum.SERVICE_FALLBACK;
+        if (throwable.getCause() instanceof BusinessException) {
+            BusinessException businessException = (BusinessException) throwable.getCause();
+            exceptionEnum = PmsDeviceEnumUtil.getExceptionEnum(businessException.getResult());
+        }
+        Enum<?> finalExceptionEnum = exceptionEnum;
+        return new PmsGeneratrixClient() {
+            @Override
+            public HttpResult<List<PmsGeneratrixDTO>> getGeneratrixInfo(PmsGeneratrixParam pmsGeneratrixParam) {
+                log.error("{}异常，降级处理，异常为：{}", "获取母线信息", throwable.toString());
+                throw new BusinessException(finalExceptionEnum);
+            }
+        };
+    }
+}
diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/api/fallback/PwMonitorClientFallbackFactory.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/api/fallback/PwMonitorClientFallbackFactory.java
new file mode 100644
index 000000000..786d59feb
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/api/fallback/PwMonitorClientFallbackFactory.java
@@ -0,0 +1,43 @@
+package com.njcn.device.pms.api.fallback;
+
+import com.njcn.common.pojo.enums.response.CommonResponseEnum;
+import com.njcn.common.pojo.exception.BusinessException;
+import com.njcn.common.pojo.response.HttpResult;
+import com.njcn.device.pms.api.MonitorClient;
+import com.njcn.device.pms.api.PwMonitorClient;
+import com.njcn.device.pms.pojo.dto.PwPmsMonitorDTO;
+import com.njcn.device.pms.pojo.param.PwPmsMonitorParam;
+import com.njcn.device.pms.utils.PmsDeviceEnumUtil;
+import feign.hystrix.FallbackFactory;
+import lombok.extern.slf4j.Slf4j;
+import org.checkerframework.checker.units.qual.C;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * @author yzh
+ * @date 2022/10/28
+ */
+
+@Slf4j
+@Component
+public class PwMonitorClientFallbackFactory implements FallbackFactory<PwMonitorClient> {
+    @Override
+    public PwMonitorClient create(Throwable throwable) {
+        //判断抛出异常是否为解码器抛出的业务异常
+        Enum<?> exceptionEnum = CommonResponseEnum.SERVICE_FALLBACK;
+        if (throwable.getCause() instanceof BusinessException) {
+            BusinessException businessException = (BusinessException) throwable.getCause();
+            exceptionEnum = PmsDeviceEnumUtil.getExceptionEnum(businessException.getResult());
+        }
+        Enum<?> finalExceptionEnum = exceptionEnum;
+        return new PwMonitorClient() {
+            @Override
+            public HttpResult<List<PwPmsMonitorDTO>> getPwMonitorList(PwPmsMonitorParam pwPmsMonitorParam) {
+                log.error("{}异常，降级处理，异常为：{}", "获取配网所有监测点信息", throwable.toString());
+                throw new BusinessException(finalExceptionEnum);
+            }
+        };
+    }
+}
diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/api/fallback/StatationStatClientFallbackFactory.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/api/fallback/StatationStatClientFallbackFactory.java
new file mode 100644
index 000000000..57ca95961
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/api/fallback/StatationStatClientFallbackFactory.java
@@ -0,0 +1,42 @@
+package com.njcn.device.pms.api.fallback;
+
+import com.njcn.common.pojo.enums.response.CommonResponseEnum;
+import com.njcn.common.pojo.exception.BusinessException;
+import com.njcn.common.pojo.response.HttpResult;
+import com.njcn.device.pms.api.StatationStatClient;
+import com.njcn.device.pms.pojo.dto.PmsStatationStatInfoDTO;
+import com.njcn.device.pms.pojo.param.PmsStatationStatInfoParam;
+import com.njcn.device.pms.utils.PmsDeviceEnumUtil;
+import feign.hystrix.FallbackFactory;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * @author yzh
+ * @date 2022/10/18
+ */
+
+@Slf4j
+@Component
+public class StatationStatClientFallbackFactory implements FallbackFactory<StatationStatClient> {
+
+    @Override
+    public StatationStatClient create(Throwable throwable) {
+        //判断抛出异常是否为解码器抛出的业务异常
+        Enum<?> exceptionEnum = CommonResponseEnum.SERVICE_FALLBACK;
+        if (throwable.getCause() instanceof BusinessException) {
+            BusinessException businessException = (BusinessException) throwable.getCause();
+            exceptionEnum = PmsDeviceEnumUtil.getExceptionEnum(businessException.getResult());
+        }
+        Enum<?> finalExceptionEnum = exceptionEnum;
+        return new StatationStatClient() {
+            @Override
+            public HttpResult<List<PmsStatationStatInfoDTO>> getStatationStatInfo(PmsStatationStatInfoParam pmsStatationStatInfoParam) {
+                log.error("{}异常，降级处理，异常为：{}", "获取指定的变电站信息", throwable.toString());
+                throw new BusinessException(finalExceptionEnum);
+            }
+        };
+    }
+}
diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/enums/PmsDeviceResponseEnum.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/enums/PmsDeviceResponseEnum.java
new file mode 100644
index 000000000..79f82a374
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/enums/PmsDeviceResponseEnum.java
@@ -0,0 +1,33 @@
+package com.njcn.device.pms.enums;
+
+import lombok.Getter;
+
+/**
+ * pqs
+ * 终端枚举
+ * @author cdf
+ * @date 2021/6/21
+ */
+@Getter
+public enum PmsDeviceResponseEnum {
+
+    /**
+     * A0250 ~ A0349 用于终端模块的枚举
+      */
+    DEVICE_COMMON_ERROR("A00349","终端模块异常"),
+    ORG_ITEM_EMPTY("A00360","未查询到指定组织机构"),
+    Operation_ITEM_EMPTY("A00361","未查询到指定运维单位"),
+    VOLTAGE_EMPTY("A00362","未查询到指定母线"),
+    LINE_EMPTY("A00363","未查询到指定线路"),
+    MODEL_NAME_REPEAT("A00350","名称不可重复");
+
+
+    private final String code;
+
+    private final String message;
+
+    PmsDeviceResponseEnum(String code, String message) {
+        this.code = code;
+        this.message = message;
+    }
+}
diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/bo/DeviceRunExBO.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/bo/DeviceRunExBO.java
deleted file mode 100644
index b5dfa5b8b..000000000
--- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/bo/DeviceRunExBO.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.njcn.device.pms.pojo.bo;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.njcn.device.pms.pojo.vo.DeviceRunExVO;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.util.Date;
-import java.util.List;
-
-/**
- * 终端异常信息类
- * @author yangj
- * @date 2022/09/14
- */
-@Data
-public class DeviceRunExBO extends DeviceRunExVO implements Serializable {
-
-    private String id;
-
-    private String pid;
-
-    private String pidS;
-
-    private String name;
-
-    private Integer level;
-
-    private Integer sort;
-
-    private String remark;
-
-    private Integer state;
-
-    private String createBy;
-
-    @JsonFormat(shape = JsonFormat.Shape.STRING,pattern = "yyyy-MM-dd",timezone = "GMT+8")
-    private Date createTime;
-
-    private String updateBy;
-
-    @JsonFormat(shape = JsonFormat.Shape.STRING,pattern = "yyyy-MM-dd",timezone = "GMT+8")
-    private Date updateTime;
-
-    private List<DeviceRunExBO> children;
-
-}
diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/bo/DeviceRunExVO.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/bo/DeviceRunExVO.java
new file mode 100644
index 000000000..215febdc0
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/bo/DeviceRunExVO.java
@@ -0,0 +1,4 @@
+package com.njcn.device.pms.pojo.bo;
+
+public class DeviceRunExVO {
+}
diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/dto/PmsGeneralDeviceDTO.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/dto/PmsGeneralDeviceDTO.java
new file mode 100644
index 000000000..b95ca6310
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/dto/PmsGeneralDeviceDTO.java
@@ -0,0 +1,63 @@
+package com.njcn.device.pms.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 2021年09月07日 10:48
+ * name对应统计名称：如 区域：南京市、苏州市；电压等级：10kV、220kV...
+ * index对应统计索引：如 区域：南京市索引、苏州市索引；电压等级：10kV索引、220kV索引...
+ * gdIndexes：供电公司索引集合
+ * subIndexes：变电站索引集合
+ * deviceIndexes：终端索引集合
+ * voltageIndexes：母线索引集合
+ * lineIndexes：监测点索引集合
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class PmsGeneralDeviceDTO implements Serializable {
+
+    /**
+     * name对应统计名称：如 区域：南京市、苏州市；电压等级：10kV、220kV...
+     */
+    private String name;
+
+    /**
+     * index对应统计索引：如 区域：南京市索引、苏州市索引；电压等级：10kV索引、220kV索引...
+     */
+    private String index;
+
+    /**
+     * subIndexes：变电站索引集合
+     */
+    private List<String> powerrIdList = new ArrayList<>();
+
+    /**
+     * deviceIndexes：终端索引集合
+     */
+    private List<String> terminalIdList = new ArrayList<>();
+
+    /**
+     * voltageIndexes：母线索引集合
+     */
+    private List<String> generatrixIdList = new ArrayList<>();
+
+    /**
+     * lineIndexes：监测点索引集合
+     */
+    private List<String> monitorIdList = new ArrayList<>();
+
+    /**
+     * lineIndexes：监测线路集合
+     */
+    private List<String> lineIdList = new ArrayList<>();
+
+}
diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/dto/PmsGeneratrixDTO.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/dto/PmsGeneratrixDTO.java
new file mode 100644
index 000000000..af5e41e32
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/dto/PmsGeneratrixDTO.java
@@ -0,0 +1,63 @@
+package com.njcn.device.pms.pojo.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 母线信息
+ *
+ * @author yzh
+ * @date 2022/10/18
+ */
+
+@Data
+public class PmsGeneratrixDTO implements Serializable {
+
+    /**
+     * 单位id
+     */
+    private String orgId;
+
+    /**
+     * 单位名称
+     */
+    private String orgName;
+
+    /**
+     * 电站编号
+     */
+    private String powerId;
+    /**
+     * 电站名称
+     */
+    private String powerName;
+
+    /**
+     * 母线id
+     */
+    private String generatrixId;
+
+    /**
+     * 母线名称
+     */
+    private String generatrixName;
+
+    /**
+     * 监测点id
+     */
+    private String monitorId;
+
+    /**
+     * 监测点名称
+     */
+    private String monitorName;
+
+    /**
+     * 母线电压等级
+     */
+    private String generatrixVoltageLevel;
+}
diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/dto/PmsMonitorBaseDTO.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/dto/PmsMonitorBaseDTO.java
new file mode 100644
index 000000000..0d810d7a6
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/dto/PmsMonitorBaseDTO.java
@@ -0,0 +1,50 @@
+package com.njcn.device.pms.pojo.dto;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @author hongawen
+ * @version 1.0.0
+ * @date 2022年10月17日 16:44
+ */
+@Data
+public class PmsMonitorBaseDTO implements Serializable {
+
+    /***
+     * 监测点ID
+     */
+    private String monitorId;
+
+    /***
+     * 运维单位ID
+     */
+    private String operationId;
+
+    /***
+     * 电站ID
+     */
+    private String powerrId;
+
+    /***
+     * 终端ID
+     */
+    private String terminalId;
+
+    /***
+     * 母线ID
+     */
+    private String generatrixId;
+
+    /***
+     * 监测线路名称
+     */
+    private String lineName;
+
+    /***
+     * 监测线路ID
+     */
+    private String lineId;
+
+}
diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/dto/PmsMonitorDTO.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/dto/PmsMonitorDTO.java
new file mode 100644
index 000000000..f518376f2
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/dto/PmsMonitorDTO.java
@@ -0,0 +1,199 @@
+package com.njcn.device.pms.pojo.dto;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * @Title PmsMonitorDTO
+ * @Package com.njcn.device.pms.pojo.dto
+ * @Author jianghaifei
+ * @Date 2022-10-20 20:14
+ * @Version V1.0
+ */
+@Data
+public class PmsMonitorDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 监测点ID
+     */
+    private String id;
+
+    /**
+     * 监测点名称
+     */
+    private String name;
+
+    /**
+     * 组织机构名称
+     */
+    private String orgName;
+
+    /**
+     * 组织机构ID(外键)
+     */
+    private String orgId;
+
+    /**
+     * 运维单位名称
+     */
+    private String operationName;
+
+    /**
+     * 运维单位ID(外键)
+     */
+    private String operationId;
+
+    /**
+     * 变电站名称
+     */
+    private String powerrName;
+
+    /**
+     * 电站ID(外键)
+     */
+    private String powerrId;
+
+    /**
+     * 母线名称
+     */
+    private String generatrixName;
+
+    /**
+     * 母线ID(外键)
+     */
+    private String generatrixId;
+
+    /**
+     * 监测线路名称
+     */
+    private String lineName;
+
+    /**
+     * 监测线路ID
+     */
+    private String lineId;
+
+    /**
+     * 电压等级(字典)
+     */
+    private String voltageLevel;
+
+    /**
+     * 监测点状态(字典)
+     */
+    private String monitorState;
+
+    /**
+     * 监测点类型(字典)
+     */
+    private String monitorType;
+
+    /**
+     * 最小短路容量
+     */
+    private Float minShortCircuitCapacity;
+
+    /**
+     * 供电设备容量
+     */
+    private Float powerSupplyEqCapacity;
+
+    /**
+     * 用户协议容量
+     */
+    private Float userAgreementCapacity;
+
+    /**
+     * 电压偏差限值（上）
+     */
+    private Float voltageDeviationUpperLimit;
+
+    /**
+     * 电压偏差限值（下）
+     */
+    private Float voltageDeviationLowerLimit;
+
+    /**
+     * 电压互感器类型(字典)
+     */
+    private String potentialTransFormerType;
+
+    /**
+     * 中性点接地方式(字典)
+     */
+    private String neutralGroundingMode;
+
+    /**
+     * 是否用户专线(字典)
+     */
+    private String isSpecialSupplyElectricity;
+
+    /**
+     * 监测点标签
+     */
+    private String monitorTag;
+
+    /**
+     * 监测对象类型(字典)
+     */
+    private String monitorObjectType;
+
+    /**
+     * 监测对象编号
+     */
+    private String monitorObjectId;
+
+    /**
+     * 监测对象名称
+     */
+    private String monitorObjectName;
+
+    /**
+     * 统计间隔
+     */
+    private Integer statisticalInterval;
+
+    /**
+     * 关联的监测终端编号(外键)
+     */
+    private String terminalId;
+
+    /**
+     * 监测终端接线方式(字典)
+     */
+    private String terminalWiringMethod;
+
+    /**
+     * 是否是上送国网监测点,0-否 1-是
+     */
+    private Boolean isUpToGrid;
+
+    /**
+     * 数据状态：0-删除；1-正常；
+     */
+    private Boolean status;
+
+    /**
+     * 创建用户
+     */
+    private String createBy;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createTime;
+
+    /**
+     * 更新用户
+     */
+    private String updateBy;
+
+    /**
+     * 更新时间
+     */
+    private LocalDateTime updateTime;
+}
diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/dto/PmsMonitorInfoDTO.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/dto/PmsMonitorInfoDTO.java
new file mode 100644
index 000000000..e53e87314
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/dto/PmsMonitorInfoDTO.java
@@ -0,0 +1,71 @@
+package com.njcn.device.pms.pojo.dto;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 监测点详情数据dto
+ *
+ * @author yzh
+ * @date 2022/10/18
+ */
+
+@Data
+public class PmsMonitorInfoDTO implements Serializable {
+
+    /**
+     * 单位id
+     */
+    private String orgId;
+
+    /**
+     * 单位名称
+     */
+    private String orgName;
+
+    /**
+     * 电站编号
+     */
+    private String powerId;
+    /**
+     * 电站名称
+     */
+    private String powerName;
+
+    /**
+     * 母线id
+     */
+    private String generatrixId;
+
+    /**
+     * 母线名称
+     */
+    private String generatrixName;
+
+    /**
+     * 监测点id
+     */
+    private String monitorId;
+
+    /**
+     * 监测点名称
+     */
+    private String monitorName;
+
+    /**
+     * 监测点电压等级
+     */
+    private String monitorVoltageLevel;
+
+    /**
+     * 监测点类型
+     */
+    private String monitorType;
+
+    /**
+     * 监测点状态
+     */
+    private String monitorState;
+
+}
diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/dto/PmsStatationStatInfoDTO.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/dto/PmsStatationStatInfoDTO.java
new file mode 100644
index 000000000..cc2490942
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/dto/PmsStatationStatInfoDTO.java
@@ -0,0 +1,66 @@
+package com.njcn.device.pms.pojo.dto;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.apache.commons.lang3.builder.HashCodeExclude;
+
+import java.util.Date;
+import java.io.Serializable;
+
+/**
+ * 变电站详情数据dto
+ *
+ * @author yzh
+ * @since 2022-10-18 14:58:24
+ */
+@Data
+public class PmsStatationStatInfoDTO implements Serializable {
+    private static final long serialVersionUID = 852679416130821111L;
+
+
+    /**
+     * 单位id
+     */
+    private String orgId;
+
+    /**
+     * 单位名称
+     */
+    private String orgName;
+
+    /**
+     * 母线id
+     */
+    private String generatrixId;
+
+    /**
+     * 母线名称
+     */
+    private String generatrixName;
+
+    /**
+     * 监测点id
+     */
+    private String monitorId;
+
+    /**
+     * 监测点名称
+     */
+    private String monitorName;
+
+    /**
+     * 电站编号
+     */
+    private String powerId;
+    /**
+     * 电站名称
+     */
+    private String powerName;
+
+    /**
+     * 变电站电压等级
+     */
+    private String powerVoltageLevel;
+
+}
+
diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/dto/PwPmsMonitorDTO.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/dto/PwPmsMonitorDTO.java
new file mode 100644
index 000000000..b6f59b631
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/dto/PwPmsMonitorDTO.java
@@ -0,0 +1,104 @@
+package com.njcn.device.pms.pojo.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 配网监测点信息
+ *
+ * @author yzh
+ * @date 2022/10/27
+ */
+
+@Data
+public class PwPmsMonitorDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 单位id
+     */
+    @ApiModelProperty(name = "orgId",value = "单位id")
+    private String orgId;
+
+    /**
+     * 单位名称
+     */
+    @ApiModelProperty(name = "orgName",value = "单位名称")
+    private String orgName;
+
+    /**
+     * 监测点类别(字典)
+     */
+    @ApiModelProperty(name = "monitorSort", value = "监测点类别(字典)")
+    private String monitorSort;
+
+    /**
+     * 监测点id
+     */
+    @ApiModelProperty(name = "monitorId", value = "监测点id")
+    private String monitorId;
+
+    /**
+     * 监测点名称
+     */
+    @ApiModelProperty(name = "monitorName", value = "监测点名称")
+    private String monitorName;
+
+    /**
+     * 电压等级(字典)
+     */
+    @ApiModelProperty(name = "voltageLevel", value = "电压等级(字典)")
+    private String voltageLevel;
+
+    /**
+     * 是否发电用户：0-否；1-是
+     */
+    @ApiModelProperty(name = "ifPowerUser", value = "是否发电用户：0-否；1-是")
+    private String ifPowerUser;
+
+    /**
+     * 监测点状态(字典)
+     */
+    @ApiModelProperty(name = "monitorState", value = "监测点状态(字典)")
+    private String monitorState;
+
+    /**
+     * 创建日期
+     */
+    @ApiModelProperty(name = "createdDate", value = "创建日期")
+    private String createdDate;
+
+    /**
+     * 数据状态：0-删除；1-正常
+     */
+    @ApiModelProperty(name = "status", value = "数据状态：0-删除；1-正常")
+    private String status;
+
+    /**
+     * 创建用户
+     */
+    @ApiModelProperty(name = "createBy", value = "创建用户")
+    private String createBy;
+
+    /**
+     * 创建时间
+     */
+    @ApiModelProperty(name = "createTime", value = "创建时间")
+    private String createTime;
+
+    /**
+     * 更新用户
+     */
+    @ApiModelProperty(name = "updateBy", value = "更新用户")
+    private String updateBy;
+
+    /**
+     * 更新时间
+     */
+    @ApiModelProperty(name = "updateTime", value = "更新时间")
+    private String updateTime;
+
+}
diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/DeviceQueryParam.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/DeviceQueryParam.java
deleted file mode 100644
index 79e6ec3c7..000000000
--- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/DeviceQueryParam.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.njcn.device.pms.pojo.param;
-
-import com.njcn.web.pojo.param.BaseParam;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.util.List;
-
-/**
- * pqs
- *
- * @author cdf
- * @date 2022/7/6
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-public class DeviceQueryParam extends BaseParam {
-
-
-    @ApiModelProperty(value = "manufacturer",name = "制造厂商")
-    private List<String> manufacturer;
-
-    @ApiModelProperty(value = "type",name = "设备类型")
-    private List<String> type;
-}
diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/DistributedQueryParam.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/DistributedQueryParam.java
deleted file mode 100644
index 81f08676c..000000000
--- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/DistributedQueryParam.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.njcn.device.pms.pojo.param;
-
-import com.njcn.web.pojo.param.BaseParam;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.util.List;
-
-/**
- * pqs
- *
- * @author cdf
- * @date 2022/7/6
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-public class DistributedQueryParam extends BaseParam {
-
-    @ApiModelProperty(value = "name",name = "分布式光伏台账名称")
-    private String name;
-
-    @ApiModelProperty(value = "scale",name = "电压等级")
-    private List<String> scale;
-}
diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/DistributionMonitorParam.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/DistributionMonitorParam.java
new file mode 100644
index 000000000..6ee6e28a3
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/DistributionMonitorParam.java
@@ -0,0 +1,50 @@
+package com.njcn.device.pms.pojo.param;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.time.LocalDateTime;
+
+/**
+ * pms-device
+ *
+ * @author cdf
+ * @date 2022/10/26
+ */
+@Data
+public class DistributionMonitorParam {
+
+    /**
+     * 监测点类别(字典)
+     */
+    @ApiModelProperty(value = "监测点类别(字典)")
+    @NotBlank(message = "监测点类别不能为空")
+    private String monitorSort;
+
+    /**
+     * 监测点ID
+     */
+
+    private String monitorId;
+
+    /**
+     * 电压等级(字典)
+     */
+    private String voltageLevel;
+
+    /**
+     * 是否发电用户：0-否；1-是；
+     */
+    private Boolean ifPowerUser;
+
+    /**
+     * 监测点状态(字典)
+     */
+    private String monitorState;
+
+    /**
+     * 创建日期
+     */
+    private LocalDateTime createdDate;
+}
diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/GeneratrixParam.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/GeneratrixParam.java
new file mode 100644
index 000000000..808bae39d
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/GeneratrixParam.java
@@ -0,0 +1,37 @@
+package com.njcn.device.pms.pojo.param;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import javax.validation.constraints.NotBlank;
+
+/**
+ * pms-device
+ *
+ * @author cdf
+ * @date 2022/10/26
+ */
+@Data
+public class GeneratrixParam {
+    @ApiModelProperty(value = "母线名称",required = true)
+    @NotBlank(message = "母线名称不可为空")
+    private String generatrixName;
+
+    @ApiModelProperty(value = "电站id",required = true)
+    @NotBlank(message = "电站id不可为空")
+    private String statationId;
+
+    @ApiModelProperty(value = "母线电压等级",required = true)
+    @NotBlank(message = "母线电压等级不可为空")
+    private String scale;
+
+    @Data
+    @EqualsAndHashCode(callSuper = true)
+    public static class UpdateGeneratrixParam extends GeneratrixParam {
+
+        @ApiModelProperty(value = "母线id",required = true)
+        @NotBlank(message = "母线id不可为空")
+        private String generatrixId;
+    }
+}
diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/GeneratrixWireParam.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/GeneratrixWireParam.java
new file mode 100644
index 000000000..42ffa2966
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/GeneratrixWireParam.java
@@ -0,0 +1,36 @@
+package com.njcn.device.pms.pojo.param;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import javax.validation.constraints.NotBlank;
+
+/**
+ * pms-device
+ *
+ * @author cdf
+ * @date 2022/10/26
+ */
+@Data
+public class GeneratrixWireParam {
+
+    @ApiModelProperty(value = "线路名称",required = true)
+    @NotBlank(message = "线路名称不可为空")
+    private String wireName;
+
+    @ApiModelProperty(value = "母线id",required = true)
+    @NotBlank(message = "母线id不可为空")
+    private String generatrixId;
+
+
+
+    @Data
+    @EqualsAndHashCode(callSuper = true)
+    public static class UpdateGeneratrixWireParam extends GeneratrixWireParam {
+
+        @ApiModelProperty(value = "线路id",required = true)
+        @NotBlank(message = "线路id不可为空")
+        private String wireId;
+    }
+}
diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/LineDetailQueryParam.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/LineDetailQueryParam.java
deleted file mode 100644
index 7e13ef521..000000000
--- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/LineDetailQueryParam.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package com.njcn.device.pms.pojo.param;
-
-import com.njcn.web.pojo.param.BaseParam;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * pqs
- *
- * @author cdf
- * @date 2022/7/6
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-public class LineDetailQueryParam extends BaseParam {
-
-    @ApiModelProperty(value = "scale",name = "分布式光伏台账名称",required = true)
-    private String name;
-
-    @ApiModelProperty(value = "scale",name = "电压等级")
-    private String scale;
-}
diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/LvUserQueryParam.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/LvUserQueryParam.java
deleted file mode 100644
index db7aa986e..000000000
--- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/LvUserQueryParam.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package com.njcn.device.pms.pojo.param;
-
-import com.njcn.web.pojo.param.BaseParam;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.util.List;
-
-/**
- * pqs
- *
- * @author cdf
- * @date 2022/7/6
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-public class LvUserQueryParam extends BaseParam {
-
-    @ApiModelProperty(value = "scale",name = "低压侧台账名称")
-    private String name;
-
-    @ApiModelProperty(value = "userCode",name = "用户编号")
-    private String userCode;
-
-    @ApiModelProperty(value = "scale",name = "电压等级")
-    private List<String> scale;
-}
diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/MonitorParam.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/MonitorParam.java
new file mode 100644
index 000000000..e3e17c1d8
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/MonitorParam.java
@@ -0,0 +1,218 @@
+package com.njcn.device.pms.pojo.param;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.time.LocalDateTime;
+
+/**
+ * pms-device
+ *
+ * @author cdf
+ * @date 2022/10/25
+ */
+@Data
+public class MonitorParam {
+
+    /**
+     * 监测点名称
+     */
+    @ApiModelProperty(value = "监测点名称")
+    @NotBlank(message = "监测点名称不能为空")
+    private String name;
+
+
+    /**
+     * 组织机构ID(外键)
+     */
+    @ApiModelProperty(value = "组织机构ID(外键)")
+    @NotBlank(message = "组织机构ID不能为空")
+    private String orgId;
+
+
+    /**
+     * 运维单位ID(外键)
+     */
+    @ApiModelProperty(value = "运维单位ID")
+    @NotBlank(message = "运维单位ID不能为空")
+    private String operationId;
+
+
+    /**
+     * 电站ID(外键)
+     */
+    @ApiModelProperty(value = "电站ID(外键)")
+    @NotBlank(message = "电站ID不能为空")
+    private String powerrId;
+
+    /**
+     * 母线ID(外键)
+     */
+    @ApiModelProperty(value = "母线ID(外键)")
+    @NotBlank(message = "母线ID不能为空")
+    private String generatrixId;
+
+    /**
+     * 监测线路名称
+     */
+    @ApiModelProperty(value = "监测点名称")
+    @NotBlank(message = "监测线路名称不能为空")
+    private String lineName;
+
+    /**
+     * 监测线路ID
+     */
+    @ApiModelProperty(value = "监测线路ID")
+    @NotBlank(message = "监测线路ID不可为空")
+    private String lineId;
+
+    /**
+     * 电压等级(字典)
+     */
+    @ApiModelProperty(value = "电压等级(字典)")
+    @NotBlank(message = "电压等级不能为空")
+    private String voltageLevel;
+
+    /**
+     * 监测点状态(字典)
+     */
+    @ApiModelProperty(value = "监测点状态(字典)")
+    @NotBlank(message = "监测点状态不能为空")
+    private String monitorState;
+
+    /**
+     * 监测点类型(字典)
+     */
+    @ApiModelProperty(value = "监测点类型(字典)")
+    @NotBlank(message = "监测点类型不能为空")
+    private String monitorType;
+
+    /**
+     * 最小短路容量
+     */
+    @ApiModelProperty(value = "最小短路容量")
+    @NotNull(message = "最小短路容量不可为空")
+    private Float minShortCircuitCapacity;
+
+    /**
+     * 供电设备容量
+     */
+    @ApiModelProperty(value = "供电设备容量")
+    @NotNull(message = "供电设备容量不可为空")
+    private Float powerSupplyEqCapacity;
+
+    /**
+     * 用户协议容量
+     */
+    @ApiModelProperty(value = "用户协议容量")
+    @NotNull(message = "用户协议容量不可为空")
+    private Float userAgreementCapacity;
+
+    /**
+     * 电压偏差限值（上）
+     */
+    @ApiModelProperty(value = "电压偏差限值（上）")
+    @NotNull(message = "电压偏差限值（上）不可为空")
+    private Float voltageDeviationUpperLimit;
+
+    /**
+     * 电压偏差限值（下）
+     */
+    @ApiModelProperty(value = "电压偏差限值（下）")
+    @NotNull(message = "电压偏差限值（下）不可为空")
+    private Float voltageDeviationLowerLimit;
+
+    /**
+     * 电压互感器类型(字典)
+     */
+    @ApiModelProperty(value = "电压互感器类型(字典)")
+    @NotBlank(message = "电压互感器类型不可为空")
+    private String potentialTransFormerType;
+
+    /**
+     * 中性点接地方式(字典)
+     */
+    @ApiModelProperty(value = "中性点接地方式(字典)")
+    @NotBlank(message = "中性点接地方式不可为空")
+    private String neutralGroundingMode;
+
+    /**
+     * 是否用户专线(字典)
+     */
+    @ApiModelProperty(value = "是否用户专线(字典)")
+    @NotBlank(message = "是否用户专线不可为空")
+    private String isSpecialSupplyElectricity;
+
+    /**
+     * 监测点标签
+     */
+    @ApiModelProperty(value = "监测点标签")
+    @NotBlank(message = "监测点标签不可为空")
+    private String monitorTag;
+
+    /**
+     * 监测对象类型(字典)
+     */
+    @ApiModelProperty(value = "监测对象类型(字典)")
+    @NotBlank(message = "监测对象类型不可为空")
+    private String monitorObjectType;
+
+    /**
+     * 监测对象编号
+     */
+    @ApiModelProperty(value = "监测对象编号")
+    @NotBlank(message = "监测对象编号不可为空")
+    private String monitorObjectId;
+
+    /**
+     * 监测对象名称
+     */
+    @ApiModelProperty(value = "监测对象名称")
+    @NotBlank(message = "监测对象名称不可为空")
+    private String monitorObjectName;
+
+    /**
+     * 统计间隔
+     */
+    @ApiModelProperty(value = "统计间隔")
+    @NotNull(message = "统计间隔不可为空")
+    private Integer statisticalInterval;
+
+    /**
+     * 关联的监测终端编号(外键)
+     */
+    @ApiModelProperty(value = "关联的监测终端编号(外键)")
+    @NotBlank(message = "关联的监测终端编号不可为空")
+    private String terminalId;
+
+    /**
+     * 监测终端接线方式(字典)
+     */
+    @ApiModelProperty(value = "监测终端接线方式(字典)")
+    @NotBlank(message = "监测终端接线方式不可为空")
+    private String terminalWiringMethod;
+
+    /**
+     * 是否是上送国网监测点,0-否 1-是
+     */
+    @ApiModelProperty(value = "是否是上送国网监测点,0-否 1-是")
+    @NotNull(message = "是否是上送国网监测点不可为空")
+    private Integer isUpToGrid;
+
+
+    @Data
+    @EqualsAndHashCode(callSuper = true)
+    public static class UpdateMonitorParam extends MonitorParam{
+
+        /**
+         * 监测线路ID
+         */
+        @ApiModelProperty(value = "监测点ID")
+        @NotBlank(message = "监测点ID不可为空")
+        private String id;
+    }
+
+}
diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PmsDeviceInfoParam.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PmsDeviceInfoParam.java
new file mode 100644
index 000000000..193e8d693
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PmsDeviceInfoParam.java
@@ -0,0 +1,114 @@
+package com.njcn.device.pms.pojo.param;
+
+import com.njcn.common.pojo.constant.PatternRegex;
+import com.njcn.common.pojo.dto.SimpleDTO;
+import com.njcn.device.biz.enums.LineFlagEnum;
+import com.njcn.web.constant.ValidMessage;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import org.hibernate.validator.constraints.Range;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Pattern;
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @author hongawen
+ * @version 1.0.0
+ * @date 2022年02月23日 19:04
+ */
+@Data
+@ApiModel
+@NoArgsConstructor
+public class PmsDeviceInfoParam implements Serializable {
+
+    /**
+     * 统计类型
+     */
+    @ApiModelProperty(name = "statisticalType", value = "统计类型",required = true)
+    @NotNull(message = "统计类型不可为空")
+    private SimpleDTO statisticalType;
+
+    @ApiModelProperty(name = "deptIndex", value = "部门索引",required = true)
+    @NotBlank(message = "部门索引不可为空")
+    private String deptIndex;
+
+
+    @ApiModelProperty(name = "voltageLevel", value = "电压等级")
+    private List<SimpleDTO> voltageLevel;
+
+
+    @ApiModelProperty(name = "manufacturer", value = "终端厂家")
+    private List<SimpleDTO> manufacturer;
+
+
+    @ApiModelProperty(name = "monitorObjectType", value = "监测点对象类型")
+    private List<SimpleDTO> monitorObjectType;
+
+
+    @ApiModelProperty(name = "monitorState", value = "监测点状态")
+    private List<SimpleDTO> monitorState;
+
+
+    @ApiModelProperty(name = "upToGrid", value = "是否上送国网0-否 1-是")
+    private Integer upToGrid;
+
+    /**
+     * 默认全部监测点
+     * @param deptIndex 部门索引
+     */
+    public PmsDeviceInfoParam(String deptIndex) {
+        this.deptIndex = deptIndex;
+    }
+
+
+    /**
+     * 自定义上报方式、电网侧方式的统计
+     */
+    public PmsDeviceInfoParam(SimpleDTO statisticalType, String deptIndex,  List<SimpleDTO> voltageLevel, List<SimpleDTO> manufacturer, List<SimpleDTO> monitorObjectType, List<SimpleDTO> monitorState) {
+        this.statisticalType = statisticalType;
+        this.deptIndex = deptIndex;
+        this.voltageLevel = voltageLevel;
+        this.manufacturer = manufacturer;
+        this.monitorObjectType = monitorObjectType;
+        this.monitorState = monitorState;
+    }
+
+    @Data
+    @EqualsAndHashCode(callSuper = true)
+    public static class BusinessParam extends PmsDeviceInfoParam{
+
+        @ApiModelProperty("开始时间")
+        @Pattern(regexp = PatternRegex.TIME_FORMAT, message = "时间格式错误")
+        private String searchBeginTime;
+
+        @ApiModelProperty("结束时间")
+        @Pattern(regexp = PatternRegex.TIME_FORMAT, message = "时间格式错误")
+        private String searchEndTime;
+
+        @ApiModelProperty("时间范围标志 0.查询展示天 1.查询展示月")
+        private Integer timeFlag;
+
+    }
+
+    @Data
+    @EqualsAndHashCode(callSuper = true)
+    public static class CompareBusinessParam extends BusinessParam{
+
+        @ApiModelProperty("比较开始时间")
+        @Pattern(regexp = PatternRegex.TIME_FORMAT, message = "时间格式错误")
+        private String periodBeginTime;
+
+        @ApiModelProperty("比较结束时间")
+        @Pattern(regexp = PatternRegex.TIME_FORMAT, message = "时间格式错误")
+        private String periodEndTime;
+
+    }
+
+
+}
diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PmsGeneratrixParam.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PmsGeneratrixParam.java
new file mode 100644
index 000000000..cd2d62604
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PmsGeneratrixParam.java
@@ -0,0 +1,40 @@
+package com.njcn.device.pms.pojo.param;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 母线信息入参
+ *
+ * @author yzh
+ * @date 2022/10/18
+ */
+
+@Data
+@ApiModel("母线信息入参")
+public class PmsGeneratrixParam implements Serializable {
+
+    /**
+     * 母线id集合
+     */
+    @ApiModelProperty(name = "generatrixIds", value = "母线id集合")
+    @NotNull(message = "母线id集合不可为空")
+    private List<String> generatrixIds;
+
+    /**
+     * 母线名称
+     */
+    @ApiModelProperty(name = "generatrixName", value = "母线名称")
+    private String generatrixName;
+
+    /**
+     * 母线电压等级
+     */
+    @ApiModelProperty(name = "generatrixVoltageLevel", value = "母线电压等级")
+    private List<String> generatrixVoltageLevel;
+}
diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PmsMonitorInfoParam.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PmsMonitorInfoParam.java
new file mode 100644
index 000000000..1b4a84318
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PmsMonitorInfoParam.java
@@ -0,0 +1,60 @@
+package com.njcn.device.pms.pojo.param;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 获取监测点详情数据入参
+ *
+ * @author yzh
+ * @date 2022/10/18
+ */
+
+@Data
+@ApiModel(value = "获取监测点详情数据入参")
+@NoArgsConstructor
+public class PmsMonitorInfoParam implements Serializable {
+
+    /**
+     * 监测点id集合
+     */
+    @ApiModelProperty(name = "monitorIds",value = "监测点id集合")
+    @NotNull(message = "监测点id集合不可为空")
+    private List<String> monitorIds;
+
+    /**
+     * 监测点名称
+     */
+    @ApiModelProperty(name = "monitorName",value = "监测点名称")
+    private String monitorName;
+
+    /**
+     * 电压等级
+     */
+    @ApiModelProperty(name = "monitorVoltageLevel",value = "电压等级")
+    private List<String> monitorVoltageLevel;
+
+    /**
+     * 监测点类型
+     */
+    @ApiModelProperty(name = "monitorType",value = "监测点类型")
+    private List<String> monitorType;
+
+    /**
+     * 监测点类别
+     */
+    @ApiModelProperty(name = "monitorSort",value = "监测点类别")
+    private List<String> monitorSort;
+
+    /**
+     * 监测点状态
+     */
+    @ApiModelProperty(name = "monitorState",value = "监测点状态")
+    private List<String> monitorState;
+}
diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PmsMonitorParam.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PmsMonitorParam.java
new file mode 100644
index 000000000..1c0431f96
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PmsMonitorParam.java
@@ -0,0 +1,40 @@
+package com.njcn.device.pms.pojo.param;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @Title PmsMonitorParam
+ * @Package com.njcn.device.pms.pojo.param
+ * @Author jianghaifei
+ * @Date 2022-10-20 20:17
+ * @Version V1.0
+ */
+@Data
+@ApiModel
+public class PmsMonitorParam {
+
+    @ApiModelProperty(name = "orgIds", value = "部门id")
+    private List<String> orgIds;
+
+    @ApiModelProperty(name = "monitorIds", value = "监测点id")
+    private List<String> monitorIds;
+
+    @ApiModelProperty(name = "monitorName", value = "监测点名称")
+    private String monitorName;
+
+    @ApiModelProperty(name = "voltageLevel", value = "电压等级")
+    private List<String> voltageLevels;
+
+    @ApiModelProperty(name = "monitorType",value = "监测点类型")
+    private String monitorType;
+
+    @ApiModelProperty(name = "monitorState",value = "监测点状态")
+    private String monitorState;
+
+    @ApiModelProperty(name = "powerrIds",value = "变电站id")
+    private List<String> powerrIds;
+}
diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PmsStatationStatInfoParam.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PmsStatationStatInfoParam.java
new file mode 100644
index 000000000..f48003883
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PmsStatationStatInfoParam.java
@@ -0,0 +1,39 @@
+package com.njcn.device.pms.pojo.param;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.validation.constraints.NotNull;
+import java.util.List;
+
+/**
+ * 变电站详情数据入参
+ * @author yzh
+ * @date 2022/10/18
+ */
+@Data
+@ApiModel(value = "变电站详情数据入参")
+@NoArgsConstructor
+public class PmsStatationStatInfoParam {
+
+    /**
+     * 变电站id集合
+     */
+    @ApiModelProperty(name = "powerIds",value = "变电站id集合")
+    @NotNull(message = "变电站id集合不可为空")
+    private List<String> powerIds;
+
+    /**
+     * 变电站名称
+     */
+    @ApiModelProperty(name = "powerName",value = "变电站名称")
+    private String powerName;
+
+    /**
+     * 变电站电压等级
+     */
+    @ApiModelProperty(name = "powerVoltageLevel",value = "变电站电压等级")
+    private List<String> powerVoltageLevel;
+}
diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PmsTerminalParam.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PmsTerminalParam.java
new file mode 100644
index 000000000..a49232c48
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PmsTerminalParam.java
@@ -0,0 +1,78 @@
+package com.njcn.device.pms.pojo.param;
+
+import com.njcn.web.pojo.param.BaseParam;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * @author hany
+ * @since 2022-10-27
+ */
+@Data
+public class PmsTerminalParam {
+
+    @ApiModelProperty(name = "id",value = "终端编号")
+    private String id;
+
+    @ApiModelProperty(name = "Name", value = "终端名称")
+    private String Name;
+
+    @ApiModelProperty(name = "OrgName", value = "组织机构名称")
+    private String OrgName;
+
+    @ApiModelProperty(name = "OrgId", value = "组织机构ID")
+    private String OrgId;
+
+    @ApiModelProperty(name = "OperationName", value = "运维单位名称")
+    private String OperationName;
+
+    @ApiModelProperty(name = "OperationId", value = "运维单位ID")
+    private String OperationId;
+
+    @ApiModelProperty(name = "PowerrName", value = "变电站名称")
+    private String PowerrName;
+
+    @ApiModelProperty(name = "PowerStationId", value = "所属电站ID")
+    private String PowerStationId;
+
+    @ApiModelProperty(name = "TerminalState", value = "终端状态")
+    private String TerminalState;
+
+    @ApiModelProperty(name = "TerminalLevel", value = "终端级别")
+    private String TerminalLevel;
+
+    @ApiModelProperty(name = "DeviceModel", value = "装置型号")
+    private String DeviceModel;
+
+    @ApiModelProperty(name = "Manufacture", value = "生产厂家")
+    private String Manufacture;
+
+    @ApiModelProperty(name = "VerificationDate", value = "检定日期")
+    private String VerificationDate;
+
+    @ApiModelProperty(name = "UseDate", value = "投用日期")
+    private String UseDate;
+
+    @ApiModelProperty(name = "InputType", value = "测量信号输入形式")
+    private String InputType;
+
+    @ApiModelProperty(name = "Ip", value = "IP地址")
+    private String Ip;
+
+    @ApiModelProperty(name = "Port", value = "通信端口")
+    private String Port;
+
+    @ApiModelProperty(name = "IsUpToGrid", value = "是否是上送国网监测点,0-否 1-是")
+    private Integer IsUpToGrid;
+
+    /**
+     * 查询数据实体
+     */
+    @Data
+    @EqualsAndHashCode(callSuper = true)
+    public static class QueryParam extends BaseParam {
+
+        private Integer Status;
+    }
+}
diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PowerClientParam.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PowerClientParam.java
new file mode 100644
index 000000000..61eb8f73d
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PowerClientParam.java
@@ -0,0 +1,200 @@
+package com.njcn.device.pms.pojo.param;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.time.LocalDate;
+
+/**
+ * pms-device
+ *
+ * @author cdf
+ * @date 2022/10/27
+ */
+@Data
+public class PowerClientParam {
+
+    /**
+     * 用户编号
+     */
+    @ApiModelProperty(value = "用户编号",required = true)
+    @NotBlank(message = "用户编号不可为空")
+    private String id;
+
+    /**
+     * 用户名称
+     */
+    @ApiModelProperty(value = "用户名称",required = true)
+    @NotBlank(message = "用户名称不可为空")
+    private String name;
+
+
+    /**
+     * 组织机构ID(外键)
+     */
+    @ApiModelProperty(value = " 组织机构ID(外键)",required = true)
+    @NotBlank(message = "组织机构ID不可为空")
+    private String orgId;
+
+
+
+    /**
+     * 运维单位ID(外键)
+     */
+    @ApiModelProperty(value = "运维单位ID(外键)",required = true)
+    @NotBlank(message = "运维单位ID不可为空")
+    private String operationId;
+
+    /**
+     * 用户分类(字典)
+     */
+    @ApiModelProperty(value = "用户分类(字典)",required = true)
+    @NotBlank(message = "用户分类不可为空")
+    private String userType;
+
+    /**
+     * 行业分类(字典)
+     */
+    @ApiModelProperty(value = "行业分类(字典)",required = true)
+    @NotBlank(message = "行业分类不可为空")
+    private String industryType;
+
+    /**
+     * 用电类别(字典)
+     */
+    @ApiModelProperty(value = "用电类别(字典)",required = true)
+    @NotBlank(message = "用电类别不可为空")
+    private String electricityType;
+
+    /**
+     * 合同容量
+     */
+    @ApiModelProperty(value = "合同容量",required = true)
+    @NotBlank(message = "合同容量不可为空")
+    private Float contractCapacity;
+
+    /**
+     * 运行容量
+     */
+    @ApiModelProperty(value = "运行容量",required = true)
+    @NotBlank(message = "运行容量不可为空")
+    private Float operatingCapacity;
+
+    /**
+     * 生产班次(字典)
+     */
+    @ApiModelProperty(value = "生产班次(字典)",required = true)
+    @NotBlank(message = "生产班次不可为空")
+    private String productionShift;
+
+    /**
+     * 负荷性质(字典)
+     */
+    @ApiModelProperty(value = "负荷性质(字典)",required = true)
+    @NotBlank(message = "负荷性质不可为空")
+    private String loadNature;
+
+    /**
+     * 供电电压(字典)
+     */
+    @ApiModelProperty(value = "供电电压(字典)",required = true)
+    @NotBlank(message = "供电电压不可为空")
+    private String voltageLevel;
+
+    /**
+     * 高耗能行业类别(字典)
+     */
+    @ApiModelProperty(value = "高耗能行业类别(字典)",required = true)
+    @NotBlank(message = "高耗能行业类别不可为空")
+    private String highIndustryType;
+
+    /**
+     * 送电日期
+     */
+    @ApiModelProperty(value = "送电日期",required = true)
+    @NotNull(message = "送电日期不可为空")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDate powerTransmissionDate;
+
+    /**
+     * 重要性等级(字典)
+     */
+    @ApiModelProperty(value = "重要性等级",required = true)
+    @NotBlank(message = "重要性等级不可为空")
+    private String importanceLevel;
+
+    /**
+     * 用电客户状态(字典)
+     */
+    @ApiModelProperty(value = "用电客户状态",required = true)
+    @NotBlank(message = "用电客户状态不可为空")
+    private String eccStat;
+
+    /**
+     * 是否敏感用户：0-否；1：是；
+     */
+    @ApiModelProperty(value = "是否敏感用户",required = true)
+    @NotNull(message = "用户编号不可为空")
+    private Integer ifSensitiveUser;
+
+    /**
+     * 是否影响电能质量：0-否；1：是；
+     */
+    @ApiModelProperty(value = "是否影响电能质量：0-否；1：是；",required = true)
+    @NotBlank(message = "是否影响电能质量不可为空")
+    private Integer ifPowerQuality;
+
+    /**
+     * 是否重要客户：0-否；1：是；
+     */
+    @ApiModelProperty(value = "是否重要客户：0-否；1：是；",required = true)
+    @NotBlank(message = "是否重要客户不可为空")
+    private Integer ifKeyCustomers;
+
+    /**
+     * 敏感用户类别(字典)
+     */
+    @ApiModelProperty(value = "敏感用户类别",required = true)
+    @NotBlank(message = "敏感用户类别不可为空")
+    private String sensitiveType;
+
+    /**
+     * 供电变电站(外键)
+     */
+    @ApiModelProperty(value = "供电变电站",required = true)
+    @NotBlank(message = "供电变电站不可为空")
+    private String powerStationId;
+
+    /**
+     * 供电线路(外键)
+     */
+    @ApiModelProperty(value = "供电线路",required = true)
+    @NotBlank(message = "供电线路不可为空")
+    private String lineId;
+
+    /**
+     * 供电台区(外键)
+     */
+    @ApiModelProperty(value = "供电台区",required = true)
+    @NotBlank(message = "供电台区不可为空")
+    private String platformId;
+
+    /**
+     * 用户标签
+     */
+    @ApiModelProperty(value = "用户标签",required = true)
+    @NotBlank(message = "用户标签不可为空")
+    private String userTag;
+
+    /**
+     * 是否是上送国网监测点,0-否 1-是
+     */
+    @ApiModelProperty(value = "是否是上送国网监测点,0-否 1-是",required = true)
+    @NotNull(message = "是否是上送国网监测点不可为空")
+    private Integer isUpToGrid;
+
+
+}
diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PowerDistributionareaParam.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PowerDistributionareaParam.java
new file mode 100644
index 000000000..ca4db1313
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PowerDistributionareaParam.java
@@ -0,0 +1,90 @@
+package com.njcn.device.pms.pojo.param;
+
+import com.njcn.web.pojo.param.BaseParam;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * @author hany
+ * @since 2022-10-26
+ */
+@Data
+public class PowerDistributionareaParam {
+
+    @ApiModelProperty("id")
+    private String id;
+
+    @ApiModelProperty(name = "Name", value = "台区名称")
+    private String Name;
+
+    @ApiModelProperty(name = "OrgName", value = "组织机构名称")
+    private String OrgName;
+
+    @ApiModelProperty(name = "OrgId", value = "组织机构ID")
+    private String OrgId;
+
+    @ApiModelProperty(name = "OperationName", value = "运维单位名称")
+    private String OperationName;
+
+    @ApiModelProperty(name = "OperationId", value = "运维单位ID")
+    private String OperationId;
+
+    @ApiModelProperty(name = "PowerrName", value = "变电站名称")
+    private String PowerrName;
+
+    @ApiModelProperty(name = "PowerStationId", value = "电站ID")
+    private String PowerStationId;
+
+    @ApiModelProperty(name = "LineName", value = "监测线路名称")
+    private String LineName;
+
+    @ApiModelProperty(name = "LineId", value = "所属线路ID")
+    private String LineId;
+
+    @ApiModelProperty(name = "PCapacity", value = "配变容量")
+    private Float PCapacity;
+
+    @ApiModelProperty(name = "Regionalism", value = "地区特征")
+    private String Regionalism;
+
+    @ApiModelProperty(name = "IfRuralPowerGrid", value = "是否农网：0-否；1：是")
+    private Integer IfRuralPowerGrid;
+
+    @ApiModelProperty(name = "NatureOfUse", value = "使用性质")
+    private String NatureOfUse;
+
+    @ApiModelProperty(name = "PowerSupplyRadius", value = "供电半径")
+    private Float PowerSupplyRadius;
+
+    @ApiModelProperty(name = "LineLength", value = "供电线路总长度")
+    private Float LineLength;
+
+    @ApiModelProperty(name = "State", value = "运行状态")
+    private String State;
+
+    @ApiModelProperty(name = "DistributedPhotovoltaicNum", value = "分布式光伏用户数")
+    private Integer DistributedPhotovoltaicNum;
+
+    @ApiModelProperty(name = "PhotovoltaicCapacity", value = "分布式光伏总装机容量")
+    private Float PhotovoltaicCapacity;
+
+    @ApiModelProperty(name = "IfBevAp", value = "是否有电动汽车接入：0-否；1：是")
+    private Integer IfBevAp;
+
+    @ApiModelProperty(name = "ApLoadType", value = "接入负荷类型")
+    private String ApLoadType;
+
+    @ApiModelProperty(name = "IsUpToGrid", value = "是否是上送国网监测点,0-否 1-是")
+    private Integer IsUpToGrid;
+
+    /**
+     * 查询数据实体
+     */
+    @Data
+    @EqualsAndHashCode(callSuper = true)
+    public static class QueryParam extends BaseParam {
+
+        private Integer Status;
+    }
+}
diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PowerGenerationUserParam.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PowerGenerationUserParam.java
new file mode 100644
index 000000000..890742447
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PowerGenerationUserParam.java
@@ -0,0 +1,143 @@
+package com.njcn.device.pms.pojo.param;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.time.LocalDate;
+
+/**
+ * pms-device
+ *
+ * @author cdf
+ * @date 2022/10/27
+ */
+@Data
+public class PowerGenerationUserParam {
+
+    /**
+     * 用户编号
+     */
+    @ApiModelProperty(value = "用户编号",required = true)
+    @NotBlank(message = "用户编号不可为空")
+    private String id;
+
+    /**
+     * 用户名称
+     */
+    @ApiModelProperty(value = "用户名称",required = true)
+    @NotBlank(message = "用户名称不可为空")
+    private String name;
+
+
+
+    /**
+     * 组织机构ID(外键)
+     */
+    @ApiModelProperty(value = "组织机构ID(外键)",required = true)
+    @NotBlank(message = "组织机构ID不可为空")
+    private String orgId;
+
+
+    /**
+     * 运维单位ID(外键)
+     */
+    @ApiModelProperty(value = "运维单位ID(外键)",required = true)
+    @NotBlank(message = "运维单位ID不可为空")
+    private String operationId;
+
+    /**
+     * 电源类别(字典)
+     */
+    @ApiModelProperty(value = "电源类别(字典)",required = true)
+    @NotBlank(message = "电源类别不可为空")
+    private String powerCategory;
+
+    /**
+     * 电站类型(字典)
+     */
+    @ApiModelProperty(value = "电站类型(字典)",required = true)
+    @NotBlank(message = "电站类型不可为空")
+    private String powerStationType;
+
+    /**
+     * 发电方式(字典)
+     */
+    @ApiModelProperty(value = "发电方式(字典)",required = true)
+    @NotBlank(message = "发电方式不可为空")
+    private String powerGenerationMode;
+
+    /**
+     * 并网电压等级(字典)
+     */
+    @ApiModelProperty(value = "并网电压等级(字典)",required = true)
+    @NotBlank(message = "并网电压等级不可为空")
+    private String voltageLevel;
+
+    /**
+     * 总装机容量
+     */
+    @ApiModelProperty(value = "总装机容量",required = true)
+    @NotBlank(message = "总装机容量不可为空")
+    private Float sourceCapacity;
+
+    /**
+     * 并网日期
+     */
+    @ApiModelProperty(value = "并网日期",required = true)
+    @NotBlank(message = "并网日期不可为空")
+    private LocalDate connectionDate;
+
+    /**
+     * 能源消纳方式(字典)
+     */
+    @ApiModelProperty(value = "能源消纳方式(字典)",required = true)
+    @NotBlank(message = "能源消纳方式不可为空")
+    private String connectionMode;
+
+    /**
+     * 客户状态(字典)
+     */
+    @ApiModelProperty(value = "客户状态(字典)",required = true)
+    @NotBlank(message = "客户状态不可为空")
+    private String gcStat;
+
+    /**
+     * 供电变电站(外键)
+     */
+    @ApiModelProperty(value = "供电变电站(外键)",required = true)
+    @NotBlank(message = "供电变电站不可为空")
+    private String powerStationId;
+
+    /**
+     * 供电线路(外键)
+     */
+    @ApiModelProperty(value = "供电线路(外键)",required = true)
+    @NotBlank(message = "供电线路不可为空")
+    private String lineId;
+
+    /**
+     * 供电台区(外键)
+     */
+    @ApiModelProperty(value = "供电台区(外键)",required = true)
+    @NotBlank(message = "供电台区不可为空")
+    private String platformId;
+
+    /**
+     * 用户标签
+     */
+    @ApiModelProperty(value = "用户标签",required = true)
+    @NotBlank(message = "用户标签不可为空")
+    private String userTag;
+
+    /**
+     * 是否是上送国网监测点,0-否 1-是
+     */
+    @ApiModelProperty(value = "是否是上送国网监测点,0-否 1-是",required = true)
+    @NotNull(message = "是否是上送国网监测点不可为空")
+    private Integer isUpToGrid;
+
+
+
+}
diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PvDeviceParam.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PvDeviceParam.java
deleted file mode 100644
index 5149d5ff2..000000000
--- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PvDeviceParam.java
+++ /dev/null
@@ -1,143 +0,0 @@
-package com.njcn.device.pms.pojo.param;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.njcn.common.pojo.constant.PatternRegex;
-import com.njcn.web.constant.ValidMessage;
-import com.njcn.web.pojo.annotation.DateTimeStrValid;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import org.hibernate.validator.constraints.Range;
-
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Pattern;
-import java.io.Serializable;
-import java.time.LocalDate;
-
-/**
- * <p>
- *
- * </p>
- *
- * @author cdf
- * @since 2022-07-05
- */
-@Data
-@TableName("pv_device")
-public class PvDeviceParam implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-
-    /**
-     * 终端类型（电能质量监测终端、智能电表、智能融合终端），字典表
-     */
-    @ApiModelProperty(name = "type",value = "终端类型（电能质量监测终端、智能电表、智能融合终端），字典表",required = true)
-    @NotBlank(message = "终端类型不可为空")
-    private String type;
-
-    @ApiModelProperty(name = "name",value = "装置名称",required = true)
-    @NotBlank(message = "装置名称")
-    private String name;
-
-    /**
-     * 用于保存PMS中电能质量监测终端Id、智能融合终端Id，智能电表Id
-     */
-    @ApiModelProperty(name = "devCode",value = "用于保存PMS中电能质量监测终端Id、智能融合终端Id，智能电表Id",required = true)
-    @NotBlank(message = "终端Id不能为空")
-    private String devCode;
-
-    /**
-     * 终端Ip
-     */
-    @ApiModelProperty(name = "ip",value = "终端Ip",required = true)
-    @NotBlank(message = "终端Ip不能为空")
-    private String ip;
-
-    /**
-     * 端口
-     */
-    @ApiModelProperty(name = "port",value = "端口",required = true)
-    @NotNull(message = "端口不能为空")
-    private Integer port;
-
-    /**
-     * 终端型号（570、580……）字典表
-     */
-    @ApiModelProperty(name = "devType",value = "终端型号（570、580……）字典表")
-    private String devType;
-
-    /**
-     * 设备制造商，字典表
-     */
-    @ApiModelProperty(name = "manufacturer",value = "设备制造商，字典表",required = true)
-    @NotBlank(message = "设备制造商不能为空")
-    private String manufacturer;
-
-    /**
-     * 装置识别码（3ds加密）
-     */
-    @ApiModelProperty(name = "series",value = "装置识别码（3ds加密）")
-    private String series;
-
-    /**
-     * 装置秘钥（3ds加密）
-     */
-    @ApiModelProperty(name = "devKey",value = "装置秘钥（3ds加密）")
-    private String devKey;
-
-
-    /**
-     * 投运时间
-     */
-    @ApiModelProperty(name = "loadTime",value = "投运时间")
-    @DateTimeStrValid(message = "投运时间格式错误")
-    private LocalDate loadTime;
-
-    /**
-     * 装置通讯状态
-     */
-    @ApiModelProperty(name = "devStatus",value = "装置通讯状态")
-    @NotNull(message = "装置通讯状态不能为空")
-    @Range(min = 0,max = 1)
-    private Integer devStatus;
-
-
-    /**
-     * 信号传输方式
-     */
-    @ApiModelProperty(name = "communicateType",value = "信号传输方式")
-    private String communicateType;
-
-    /**
-     * 本次定检时间，默认等于投运时间
-     */
-    @ApiModelProperty(name = "thisTimeCheck",value = "本次定检时间，默认等于投运时间",required = true)
-    @NotBlank(message = "本次定检时间不能为空")
-    @DateTimeStrValid(message = "本次定检时间格式错误")
-    private String thisTimeCheck;
-
-    /**
-     * 下次定检时间,默认为投运时间后推3年，假如时间小于3个月则为待检
-     */
-    @ApiModelProperty(name = "nextTimeCheck",value = "下次定检时间,默认为投运时间后推3年，假如时间小于3个月则为待检",required = true)
-    @NotBlank(message = "下次定检时间不能为空")
-    @DateTimeStrValid(message = "下次定检时间格式错误")
-    private String nextTimeCheck;
-
-
-
-    @Data
-    @EqualsAndHashCode(callSuper = true)
-    public static class UpdatePvDeviceParam extends PvDeviceParam{
-        /**
-         * id
-         */
-        @ApiModelProperty("id")
-        @NotBlank(message = ValidMessage.ID_NOT_BLANK)
-        @Pattern(regexp = PatternRegex.SYSTEM_ID, message = ValidMessage.ID_FORMAT_ERROR)
-        private String id;
-    }
-
-}
diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PvDispatchParam.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PvDispatchParam.java
deleted file mode 100644
index 70b6b9b0e..000000000
--- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PvDispatchParam.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package com.njcn.device.pms.pojo.param;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Getter;
-import lombok.Setter;
-
-import java.io.Serializable;
-
-/**
- * <p>
- *
- * </p>
- *
- * @author cdf
- * @since 2022-07-05
- */
-@Getter
-@Setter
-@TableName("pv_dispatch")
-public class PvDispatchParam implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 调度表Id
-     */
-    private String id;
-
-    /**
-     * 调度名称
-     */
-    private String name;
-
-
-}
diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PvDistributedParam.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PvDistributedParam.java
deleted file mode 100644
index e50136835..000000000
--- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PvDistributedParam.java
+++ /dev/null
@@ -1,108 +0,0 @@
-package com.njcn.device.pms.pojo.param;
-
-import com.njcn.common.pojo.constant.PatternRegex;
-import com.njcn.web.constant.ValidMessage;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.Pattern;
-import java.io.Serializable;
-
-/**
- * <p>
- *
- * </p>
- *
- * @author cdf
- * @since 2022-07-06
- */
-@Data
-public class PvDistributedParam implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-
-    /**
-     * 分布式光伏名称
-     */
-    @ApiModelProperty(name = "name",value = "分布式光伏名称",required = true)
-    @NotBlank(message = "分布式光伏名称不可为空")
-    private String name;
-
-    /**
-     * 分布式光伏编号
-     */
-    @ApiModelProperty(name = "code",value = "分布式光伏编号",required = true)
-    @NotBlank(message = "分布式光伏编号不可为空")
-    private String code;
-
-    /**
-     * 用户编号（与低压用户台账表低压用户编号字段一致）
-     */
-    @ApiModelProperty(name = "userCode",value = "用户编号",required = true)
-    @NotBlank(message = "用户编号不可为空")
-    private String userCode;
-
-    /**
-     * 终端编号
-     */
-    @ApiModelProperty(name = "devCode",value = "终端编号")
-    private String devCode;
-
-    /**
-     * 并网电压等级Id，字典表
-     */
-    @ApiModelProperty(name = "scale",value = "并网电压等级Id，字典表")
-    private String scale;
-
-    /**
-     * 装机容量（KVA）
-     */
-    @ApiModelProperty(name = "machineCapacity",value = "装机容量（KVA）")
-    private Float machineCapacity;
-
-    /**
-     * 上网方式
-     */
-    @ApiModelProperty(name = "inteType",value = "上网方式")
-    private String inteType;
-
-    /**
-     * 接入相别
-     */
-    @ApiModelProperty(name = "phase",value = "接入相别")
-    private String phase;
-
-    /**
-     * 储能配置容量（KVA）
-     */
-    @ApiModelProperty(name = "energyCapacity",value = "储能配置容量（KVA）")
-    private Float energyCapacity;
-
-    @ApiModelProperty(name = "smartSwitch",value = "智能开关编号")
-    private String smartSwitch;
-
-    @ApiModelProperty(name = "installTime",value = "安装时间")
-    private String installTime;
-
-    @ApiModelProperty(name = "runTime",value = "投运时间")
-    private String runTime;
-
-
-
-    @Data
-    @EqualsAndHashCode(callSuper = true)
-    public static class UpdatePvDistributedParam extends PvDistributedParam{
-        /**
-         * id
-         */
-        @ApiModelProperty("id")
-        @NotBlank(message = ValidMessage.ID_NOT_BLANK)
-        @Pattern(regexp = PatternRegex.SYSTEM_ID, message = ValidMessage.ID_FORMAT_ERROR)
-        private String id;
-    }
-
-
-}
diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PvLineDetailParam.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PvLineDetailParam.java
deleted file mode 100644
index 1c2c0e8f7..000000000
--- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PvLineDetailParam.java
+++ /dev/null
@@ -1,276 +0,0 @@
-package com.njcn.device.pms.pojo.param;
-
-import com.njcn.common.pojo.constant.PatternRegex;
-import com.njcn.web.constant.ValidMessage;
-import com.njcn.web.pojo.annotation.DateTimeStrValid;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Pattern;
-import java.io.Serializable;
-
-/**
- * <p>
- *
- * </p>
- *
- * @author cdf
- * @since 2022-07-05
- */
-@Data
-public class PvLineDetailParam implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-
-    /**
-     * 监测点名称
-     */
-    @ApiModelProperty(name = "name",value = "监测点名称",required = true)
-    @NotBlank(message = "监测点名称不能为空")
-    private String name;
-
-    /**
-     * 监测点编号
-     */
-    @ApiModelProperty(name = "code",value = "监测点编号",required = true)
-    @NotBlank(message = "监测点编号不能为空")
-    private String code;
-
-    /**
-     * 所属终端
-     */
-    @ApiModelProperty(name = "devId",value = "所属终端",required = true)
-    @NotBlank(message = "所属终端id不能为空")
-    @Pattern(regexp = PatternRegex.SYSTEM_ID, message = "所属终端id违规")
-    private String devId;
-
-    /**
-     * 监测点类型（I类监测点、II类监测点、III类监测点），字典表
-     */
-    @ApiModelProperty(name = "type",value = "监测点类型（I类监测点、II类监测点、III类监测点），字典表",required = true)
-    @NotBlank(message = "监测点类型不能为空")
-    @Pattern(regexp = PatternRegex.SYSTEM_ID, message = "监测点类型违规")
-    private String type;
-
-    /**
-     * 所属变电站（I类监测点）
-     */
-    @ApiModelProperty(name = "substationId",value = "所属变电站（I类监测点）")
-    private String substationId;
-
-    /**
-     * 所属母线名称（I类监测点）
-     */
-    @ApiModelProperty(name = "voltageId",value = "所属母线名称（I类监测点）")
-    private String voltageId;
-
-    /**
-     * 所属台区ID（II类监测点）
-     */
-    @ApiModelProperty(name = "subAreaId",value = "所属台区ID（II类监测点）")
-    private String subAreaId;
-
-    /**
-     * 用户编号
-     */
-    @ApiModelProperty(name = "userCode",value = "用户编号")
-    @NotBlank(message = "用户编号不能为空")
-    private String userCode;
-
-    @ApiModelProperty(name = "userCodeType",value = "用户编号区分 0.分布式 1.低压用户")
-    @NotNull(message = "用户编号标识")
-    private Integer userCodeType;
-
-
-    /**
-     * 电压等级
-     */
-    @ApiModelProperty(name = "scale",value = "电压等级")
-    private String scale;
-
-    /**
-     * 线路号（在同一台设备中的监测点号）
-     */
-    @ApiModelProperty(name = "num",value = "线路号（在同一台设备中的监测点号）")
-    private Integer num;
-
-    /**
-     * PT一次变比
-     */
-    @ApiModelProperty(name = "pt1",value = "PT一次变比")
-    private Float pt1;
-
-    /**
-     * PT二次变比
-     */
-    @ApiModelProperty(name = "pt2",value = "PT二次变比")
-    private Float pt2;
-
-    /**
-     * CT一次变比
-     */
-    @ApiModelProperty(name = "ct1",value = "CT一次变比")
-    private Float ct1;
-
-    /**
-     * CT二次变比
-     */
-    @ApiModelProperty(name = "ct2",value = "CT二次变比")
-    private Float ct2;
-
-    /**
-     * 设备容量
-     */
-    @ApiModelProperty(name = "devCapacity",value = "设备容量")
-    private Float devCapacity;
-
-    /**
-     * 短路容量
-     */
-    @ApiModelProperty(name = "shortCapacity",value = "短路容量")
-    private Float shortCapacity;
-
-    /**
-     * 基准容量
-     */
-    @ApiModelProperty(name = "standardCapacity",value = "基准容量")
-    private Float standardCapacity;
-
-    /**
-     * 协议容量
-     */
-    @ApiModelProperty(name = "dealCapacity",value = "协议容量")
-    private Float dealCapacity;
-
-    /**
-     * 接线类型字典表
-     */
-    @ApiModelProperty(name = "ptType",value = "接线类型字典表")
-    private String ptType;
-
-    /**
-     * 测量间隔（1-10分钟）
-     */
-    @ApiModelProperty(name = "timeInterval",value = "测量间隔（1-10分钟）")
-    private Integer timeInterval;
-
-    /**
-     * 干扰源类型,字典表
-     */
-    @ApiModelProperty(name = "loadType",value = "干扰源类型,字典表")
-    private String loadType;
-
-    /**
-     * 行业类型，字典表
-     */
-
-    @ApiModelProperty(name = "businessType",value = "行业类型，字典表")
-    private String businessType;
-
-    /**
-     * 网公司谐波监测平台标志(0-否;1-是)，默认否
-     */
-    @ApiModelProperty(name = "monitorFlag",value = "网公司谐波监测平台标志(0-否;1-是)，默认否")
-    private Integer monitorFlag;
-
-    /**
-     * 电网标志（0-电网侧；1-非电网侧）
-     */
-    @ApiModelProperty(name = "powerFlag",value = "电网标志（0-电网侧；1-非电网侧）")
-    private Integer powerFlag;
-
-    /**
-     * 国网谐波监测平台监测点号
-     */
-    @ApiModelProperty(name = "monitorId",value = "国网谐波监测平台监测点号")
-    private String monitorId;
-
-    /**
-     * 监测点对象名称
-     */
-    @ApiModelProperty(name = "objName",value = "监测点对象名称")
-    private String objName;
-
-    /**
-     * 监测点对象大类
-     */
-    @ApiModelProperty(name = "smallName",value = "监测点对象大类")
-    private String smallName;
-
-    /**
-     * 监测点对象小类
-     */
-    @ApiModelProperty(name = "bigName",value = "监测点对象小类")
-    private String bigName;
-
-    /**
-     * 人为干预是否参与统计（0：不参与，1：参与）默认参与统计
-     */
-    @ApiModelProperty(name = "statFlag",value = "人为干预是否参与统计（0：不参与，1：参与）默认参与统计")
-    private Integer statFlag = 1;
-
-    /**
-     * 备注
-     */
-    @ApiModelProperty(name = "remark",value = "备注")
-    private String remark;
-
-    /**
-     * 电压互感器类型，字典表
-     */
-    @ApiModelProperty(name = "tfType",value = "电压互感器类型，字典表")
-    private String tfType;
-
-    /**
-     * 所属变压器编号
-     */
-    @ApiModelProperty(name = "tfCode",value = "所属变压器编号")
-    private String tfCode;
-
-    /**
-     * 中性点接地方式，字典表
-     */
-    @ApiModelProperty(name = "groundType",value = "中性点接地方式，字典表")
-    private String groundType;
-
-    /**
-     * 投运日期
-     */
-    @ApiModelProperty(name = "putIn",value = "投运日期")
-    @DateTimeStrValid(message = "投运日期格式有误")
-    private String putIn;
-
-    /**
-     * 接入日期
-     */
-    @ApiModelProperty(name = "access",value = "接入日期")
-    @DateTimeStrValid(message = "接入日期格式有误")
-    private String access;
-
-    /**
-     * 是否专项供电（0：否，1：是）默认参与统计
-     */
-    @ApiModelProperty(name = "powerSupply",value = "是否专项供电（0：否，1：是）默认参与统计")
-    private Integer powerSupply;
-
-
-
-    @Data
-    @EqualsAndHashCode(callSuper = true)
-    public static class UpdatePvLineDetailParam extends PvLineDetailParam{
-        /**
-         * id
-         */
-        @ApiModelProperty("id")
-        @NotBlank(message = ValidMessage.ID_NOT_BLANK)
-        @Pattern(regexp = PatternRegex.SYSTEM_ID, message = ValidMessage.ID_FORMAT_ERROR)
-        private String id;
-    }
-
-
-
-}
diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PvLvUserParam.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PvLvUserParam.java
deleted file mode 100644
index 7acb323a5..000000000
--- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PvLvUserParam.java
+++ /dev/null
@@ -1,105 +0,0 @@
-package com.njcn.device.pms.pojo.param;
-
-import com.njcn.common.pojo.constant.PatternRegex;
-import com.njcn.web.constant.ValidMessage;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.Pattern;
-import java.io.Serializable;
-
-/**
- * <p>
- *
- * </p>
- *
- * @author cdf
- * @since 2022-07-05
- */
-@Data
-public class PvLvUserParam implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-
-    /**
-     * 低压用户编号（营销系统中查出）
-     */
-    @ApiModelProperty(name = "userCode",value = "低压用户编号")
-    @NotBlank(message = "低压用户编号不为空")
-    private String userCode;
-
-    /**
-     * 低压用户名称
-     */
-    @ApiModelProperty(name = "name",value = "低压用户名称")
-    @NotBlank(message = "低压用户名称不为空")
-    private String name;
-
-    /**
-     * 用户协议容量（kVA）
-     */
-    @ApiModelProperty(name = "userCapacity",value = "用户协议容量")
-    private Float userCapacity;
-
-    /**
-     * 是否发生过投诉
-     */
-    @ApiModelProperty(name = "complain",value = "是否发生过投诉")
-    private Integer complain;
-
-    /**
-     * 投诉内容
-     */
-    @ApiModelProperty(name = "complainPart",value = "投诉内容")
-    private String complainPart;
-
-    /**
-     * 整改措施
-     */
-    @ApiModelProperty(name = "corrective",value = "整改措施")
-    private String corrective;
-
-    /**
-     * 是否有治理装置
-     */
-    @ApiModelProperty(name = "devGovern",value = "是否有治理装置")
-    private Integer devGovern;
-
-    /**
-     * 治理装置类型
-     */
-    @ApiModelProperty(name = "governType",value = "治理装置类型")
-    private String governType;
-
-    /**
-     * 治理装置电压等级
-     */
-    @ApiModelProperty(name = "scale",value = "治理装置电压等级")
-    private String scale;
-
-    /**
-     * 治理装置容量
-     */
-    @ApiModelProperty(name = "governCapacity",value = "治理装置容量")
-    private Float governCapacity;
-
-
-
-    @Data
-    @EqualsAndHashCode(callSuper = true)
-    public static class UpdatePvLvUserParam extends PvLvUserParam{
-        /**
-         * id
-         */
-        @ApiModelProperty("id")
-        @NotBlank(message = ValidMessage.ID_NOT_BLANK)
-        @Pattern(regexp = PatternRegex.SYSTEM_ID, message = ValidMessage.ID_FORMAT_ERROR)
-        private String id;
-    }
-
-
-
-}
diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PvSubAreaParam.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PvSubAreaParam.java
deleted file mode 100644
index 9d01e45cc..000000000
--- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PvSubAreaParam.java
+++ /dev/null
@@ -1,145 +0,0 @@
-package com.njcn.device.pms.pojo.param;
-
-import com.njcn.common.pojo.constant.PatternRegex;
-import com.njcn.web.constant.ValidMessage;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.Pattern;
-import java.io.Serializable;
-
-/**
- * <p>
- *
- * </p>
- *
- * @author cdf
- * @since 2022-07-05
- */
-@Data
-public class PvSubAreaParam implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-
-
-    /**
-     * 所属10kV线路表Id（外键）
-     */
-    @ApiModelProperty(name = "tenVoltageId",value = "所属10kV线路表Id",required = true)
-    @NotBlank(message = "所属10kV线路表Id不可为空")
-    @Pattern(regexp = PatternRegex.SYSTEM_ID, message = "所属10kV线路表Id格式有误")
-    private String tenVoltageId;
-
-    /**
-     * 所属单位Id（台区所属的单位和变电站所属单位可能不是一个单位）
-     */
-    @ApiModelProperty(name = "unitId",value = "所属单位Id",required = true)
-    @NotBlank(message = "所属单位Id不可为空")
-    private String unitId;
-
-    /**
-     * 台区名称
-     */
-    @ApiModelProperty(name = "name",value = "台区名称",required = true)
-    @NotBlank(message = "台区名称不可为空")
-    private String name;
-
-    /**
-     * 台区编号
-     */
-    @ApiModelProperty(name = "code",value = "台区编号",required = true)
-    @NotBlank(message = "台区编号不可为空")
-    private String code;
-
-    /**
-     * 电缆长度字段
-     */
-    @ApiModelProperty(name = "cableLength",value = "电缆长度字段")
-    private Double cableLength;
-
-    /**
-     * 电阻
-     */
-    @ApiModelProperty(name = "resistance",value = "电阻")
-    private Double resistance;
-
-    /**
-     * 电抗
-     */
-    @ApiModelProperty(name = "reactance",value = "电抗")
-    private Double reactance;
-
-    /**
-     * 变压器型号
-     */
-    @ApiModelProperty(name = "type",value = "变压器型号")
-    private String type;
-
-    /**
-     * 变压器容量
-     */
-    @ApiModelProperty(name = "capacity",value = "变压器容量")
-    private Float capacity;
-
-    /**
-     * 变压器调压方式
-     */
-    @ApiModelProperty(name = "regulationMode",value = "变压器调压方式")
-    private Integer regulationMode;
-
-    /**
-     * 台区无功补偿容量（KVA）
-     */
-    @ApiModelProperty(name = "reactCapacity",value = "台区无功补偿容量（KVA）")
-    private Float reactCapacity;
-
-    /**
-     * 是否安装智能融合终端
-     */
-    @ApiModelProperty(name = "devFusion",value = "是否安装智能融合终端")
-    private Integer devFusion;
-
-    /**
-     * 是否有分布式光伏接入
-     */
-    @ApiModelProperty(name = "pv",value = "是否有分布式光伏接入")
-    private Integer pv;
-
-    /**
-     * 分布式光伏总装机容量（KVA）
-     */
-    @ApiModelProperty(name = "totalC",value = "分布式光伏总装机容量（KVA）")
-    private Float totalC;
-
-    /**
-     * 分布式光伏用户数量
-     */
-    @ApiModelProperty(name = "pvUsers",value = "分布式光伏用户数量")
-    private Integer pvUsers;
-
-    /**
-     * 其他分布式电源装置容量
-     */
-    @ApiModelProperty(name = "powerPower",value = "其他分布式电源装置容量")
-    private Float powerPower;
-
-
-
-
-    @Data
-    @EqualsAndHashCode(callSuper = true)
-    public static class UpdatePvSubAreaParam extends PvSubAreaParam{
-        /**
-         * id
-         */
-        @ApiModelProperty("id")
-        @NotBlank(message = ValidMessage.ID_NOT_BLANK)
-        @Pattern(regexp = PatternRegex.SYSTEM_ID, message = ValidMessage.ID_FORMAT_ERROR)
-        private String id;
-    }
-
-
-}
diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PvSubstationParam.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PvSubstationParam.java
deleted file mode 100644
index 6d6cfee88..000000000
--- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PvSubstationParam.java
+++ /dev/null
@@ -1,82 +0,0 @@
-package com.njcn.device.pms.pojo.param;
-
-import com.njcn.common.pojo.constant.PatternRegex;
-import com.njcn.web.constant.ValidMessage;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Pattern;
-import java.io.Serializable;
-
-/**
- * <p>
- *
- * </p>
- *
- * @author cdf
- * @since 2022-07-05
- */
-@Data
-public class PvSubstationParam implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-
-
-    /**
-     * 所属单位Id
-     */
-    @ApiModelProperty(name = "unitId",value = "所属单位Id",required = true)
-    @NotBlank(message = "所属单位Id不能为空")
-    private String unitId;
-
-    /**
-     * 变电站名称
-     */
-    @ApiModelProperty(name = "name",value = "变电站名称",required = true)
-    @NotBlank(message = "变电站名称不能为空")
-    private String name;
-
-    @ApiModelProperty(name = "subCode",value = "变电站编号",required = true)
-    @NotBlank(message = "变电站编号不能为空")
-    private String subCode;
-
-    /**
-     * 电压等级Id，字典表
-     */
-    @ApiModelProperty(name = "scale",value = "电压等级Id",required = true)
-    @NotBlank(message = "电压等级不能为空")
-    private String scale;
-
-    /**
-     * 变电站总容量（MVA）(手动填写)
-     */
-    @ApiModelProperty(name = "totalCapacity",value = "变电站总容量",required = true)
-    @NotNull(message = "变电站总容量不能为空")
-    private Double totalCapacity;
-
-    /**
-     * 运维班组Code
-     */
-    @ApiModelProperty(name = "teamCode",value = "运维班组Code",required = true)
-    @NotBlank(message = "运维班组Code不能为空")
-    private String teamCode;
-
-
-    @Data
-    @EqualsAndHashCode(callSuper = true)
-    public static class UpdatePvSubstationParam extends PvSubstationParam{
-        /**
-         * id
-         */
-        @ApiModelProperty("id")
-        @NotBlank(message = ValidMessage.ID_NOT_BLANK)
-        @Pattern(regexp = PatternRegex.SYSTEM_ID, message = ValidMessage.ID_FORMAT_ERROR)
-        private String id;
-    }
-
-
-}
diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PvTenVoltageParam.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PvTenVoltageParam.java
deleted file mode 100644
index 2b7d592c4..000000000
--- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PvTenVoltageParam.java
+++ /dev/null
@@ -1,179 +0,0 @@
-package com.njcn.device.pms.pojo.param;
-
-import com.njcn.common.pojo.constant.PatternRegex;
-import com.njcn.web.constant.ValidMessage;
-import com.njcn.web.pojo.annotation.DateTimeStrValid;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.Pattern;
-import java.io.Serializable;
-
-/**
- * <p>
- *
- * </p>
- *
- * @author cdf
- * @since 2022-07-05
- */
-@Data
-public class PvTenVoltageParam implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-
-
-    /**
-     * 调度表Id（外键）
-     */
-    @ApiModelProperty(name = "dispatchId",value = "调度表Id",required = true)
-    @NotBlank(message = "调度表Id不能为空")
-    @Pattern(regexp = PatternRegex.SYSTEM_ID, message = "id格式违规")
-    private String dispatchId;
-
-
-    /**
-     * 线路名称
-     */
-    @ApiModelProperty(name = "name",value = "线路名称",required = true)
-    @NotBlank(message = "线路名称不能为空")
-    private String name;
-
-    /**
-     * 线路编号
-     */
-    @ApiModelProperty(name = "code",value = "线路编号",required = true)
-    @NotBlank(message = "线路编号不能为空")
-    private String code;
-
-    /**
-     * 跨区域类型
-     */
-    @ApiModelProperty(name = "crType",value = "跨区域类型")
-    private String crType;
-
-    /**
-     * 电压等级Id，字典表
-     */
-    @ApiModelProperty(name = "scale",value = "电压等级Id，字典表")
-    private String scale;
-
-    /**
-     * 设计电压等级Id，字典表
-     */
-    @ApiModelProperty(name = "designScale",value = "设计电压等级Id，字典表")
-    private String designScale;
-
-    /**
-     * 设备状态
-     */
-    @ApiModelProperty(name = "devStatus",value = "设备状态")
-    private Integer devStatus;
-
-    /**
-     * 是否接地极(0:false;1:true)
-     */
-    @ApiModelProperty(name = "earthing",value = "是否接地极(0:false;1:true)")
-    private Boolean earthing;
-
-    /**
-     * 线路性质
-     */
-    @ApiModelProperty(name = "quality",value = "线路性质")
-    private String quality;
-
-    /**
-     * 所属主线
-     */
-    @ApiModelProperty(name = "masterStroke",value = "所属主线")
-    private String masterStroke;
-
-    /**
-     * 专业分类
-     */
-    @ApiModelProperty(name = "major",value = "专业分类")
-    private String major;
-
-    /**
-     * 设备主人
-     */
-    @ApiModelProperty(name = "master",value = "设备主人")
-    private String master;
-
-    /**
-     * 起点电站
-     */
-    @ApiModelProperty(name = "startStation",value = "起点电站")
-    private String startStation;
-
-    /**
-     * 终点电站
-     */
-    @ApiModelProperty(name = "endStation",value = "终点电站")
-    private String endStation;
-
-    /**
-     * 运行负载限额
-     */
-    @ApiModelProperty(name = "runLoad",value = "运行负载限额")
-    private Float runLoad;
-
-    /**
-     * 额定输出功率
-     */
-    @ApiModelProperty(name = "outputPower",value = "额定输出功率")
-    private Float outputPower;
-
-    /**
-     * 最大允许电流
-     */
-    @ApiModelProperty(name = "maxCurrent",value = "最大允许电流")
-    private Float maxCurrent;
-
-    /**
-     * 投运日期
-     */
-    @ApiModelProperty(name = "putIntoDate",value = "投运日期")
-    @DateTimeStrValid(message = "投运时间格式错误",format = "yyyy-MM-dd HH:mm:ss")
-    private String putIntoDate;
-
-
-    /**
-     * 是否有分布式光伏接入
-     */
-    @ApiModelProperty(name = "pvStatus",value = "是否有分布式光伏接入 0.否 1.是")
-    private Integer pvStatus;
-
-
-    /**
-     * 分布式光伏接入容量
-     */
-    @ApiModelProperty(name = "pvCapacity",value = "分布式光伏接入容量")
-    private Integer pvCapacity;
-
-
-    /**
-     * 分布式光伏接入数量
-     */
-    @ApiModelProperty(name = "pvNum",value = "分布式光伏接入数量")
-    private Integer pvNum;
-
-
-
-    @Data
-    @EqualsAndHashCode(callSuper = true)
-    public static class UpdatePvTenVoltageParam extends PvTenVoltageParam{
-        /**
-         * id
-         */
-        @ApiModelProperty("id")
-        @NotBlank(message = ValidMessage.ID_NOT_BLANK)
-        @Pattern(regexp = PatternRegex.SYSTEM_ID, message = ValidMessage.ID_FORMAT_ERROR)
-        private String id;
-    }
-
-
-}
diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PvTerminalBaseQuery.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PvTerminalBaseQuery.java
deleted file mode 100644
index bff311a16..000000000
--- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PvTerminalBaseQuery.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.njcn.device.pms.pojo.param;
-
-import com.njcn.web.pojo.param.BaseParam;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import javax.validation.constraints.NotEmpty;
-import javax.validation.constraints.NotNull;
-
-/**
- * pqs
- *
- * @author cdf
- * @date 2022/7/12
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-public class PvTerminalBaseQuery extends BaseParam {
-
-    @ApiModelProperty(name = "id",value = "单位变电站台区索引",required = true)
-    @NotEmpty(message = "单位变电站台区索引不能为空")
-    private String id;
-
-    @ApiModelProperty(name = "level",value = "0.单位 1.变电站 2.台区",required = true)
-    @NotNull(message = "树层级不可为空")
-    private Integer level;
-
-    @ApiModelProperty(name = "type",value = "字典类型 I II III类监测点类型id")
-    private String type;
-
-    @ApiModelProperty(name = "lineStatus",value = "监测点状态")
-    private Integer lineStatus;
-
-    @ApiModelProperty(name = "runTime",value = "投运时间")
-    private Integer runTime;
-}
diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PvUnitParam.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PvUnitParam.java
deleted file mode 100644
index be7da54b8..000000000
--- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PvUnitParam.java
+++ /dev/null
@@ -1,63 +0,0 @@
-package com.njcn.device.pms.pojo.param;
-
-import com.njcn.common.pojo.constant.PatternRegex;
-import com.njcn.web.constant.ValidMessage;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.Pattern;
-import java.io.Serializable;
-
-/**
- * <p>
- *
- * </p>
- *
- * @author cdf
- * @since 2022-07-05
- */
-@Data
-public class PvUnitParam implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-
-
-    /**
-     * 父节点（0为根节点）
-     */
-    @ApiModelProperty(name = "pid",value = "父节点（0为根节点）")
-    @NotBlank(message = "父节点id不能为空")
-    private String pid;
-
-    /**
-     * 单位名称
-     */
-    @ApiModelProperty(name = "name",value = "单位名称")
-    @NotBlank(message = "单位名称不能为空")
-    private String name;
-
-    /**
-     * 单位编码
-     */
-    @ApiModelProperty(name = "code",value = "单位编码")
-    @NotBlank(message = "单位编码不能为空")
-    private String code;
-
-
-    @Data
-    @EqualsAndHashCode(callSuper = true)
-    public static class UpdatePvUnitParam extends PvUnitParam{
-        /**
-         * id
-         */
-        @ApiModelProperty("id")
-        @NotBlank(message = ValidMessage.ID_NOT_BLANK)
-        @Pattern(regexp = PatternRegex.SYSTEM_ID, message = ValidMessage.ID_FORMAT_ERROR)
-        private String id;
-    }
-
-
-}
diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PvVoltageParam.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PvVoltageParam.java
deleted file mode 100644
index 83149e73c..000000000
--- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PvVoltageParam.java
+++ /dev/null
@@ -1,67 +0,0 @@
-package com.njcn.device.pms.pojo.param;
-
-import com.njcn.common.pojo.constant.PatternRegex;
-import com.njcn.web.constant.ValidMessage;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import org.hibernate.validator.constraints.Range;
-
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Pattern;
-import java.io.Serializable;
-
-/**
- * <p>
- *
- * </p>
- *
- * @author cdf
- * @since 2022-07-05
- */
-@Data
-public class PvVoltageParam implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-
-    /**
-     * 母线名称
-     */
-    @ApiModelProperty(value = "母线名称",required = true)
-    @NotBlank(message = "母线名称不可为空")
-    private String name;
-
-    /**
-     * 母线号（在同一台设备中的电压通道号）
-     */
-    @ApiModelProperty(value = "母线号（在同一台设备中的电压通道号）",required = true)
-    @NotNull(message = "母线号不可为空")
-    @Range(min = 1,max = 6,message = "选择1-6路母线号线路")
-    private Integer num;
-
-    /**
-     * 电压等级Id，字典表
-     */
-    @ApiModelProperty(value = "电压等级Id，字典表",required = true)
-    @NotBlank(message = "电压等级不可为空")
-    private String scale;
-
-
-
-    @Data
-    @EqualsAndHashCode(callSuper = true)
-    public static class UpdatePvVoltageParam extends PvVoltageParam{
-        /**
-         * id
-         */
-        @ApiModelProperty("id")
-        @NotBlank(message = ValidMessage.ID_NOT_BLANK)
-        @Pattern(regexp = PatternRegex.SYSTEM_ID, message = ValidMessage.ID_FORMAT_ERROR)
-        private String id;
-    }
-
-
-
-}
diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PwPmsMonitorParam.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PwPmsMonitorParam.java
new file mode 100644
index 000000000..4450cf1df
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PwPmsMonitorParam.java
@@ -0,0 +1,36 @@
+package com.njcn.device.pms.pojo.param;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @author yzh
+ * @date 2022/10/27
+ */
+
+@Data
+public class PwPmsMonitorParam {
+
+    @ApiModelProperty(name = "orgIds", value = "部门id",required = true)
+    @NotBlank(message = "部门索引不可为空")
+    private String orgId;
+
+    @ApiModelProperty(name = "monitorName",value = "监测点名称")
+    private String monitorName;
+
+    @ApiModelProperty(name = "voltageLevel", value = "电压等级")
+    private List<String> voltageLevels;
+
+    @ApiModelProperty(name = "monitorSort",value = "监测点类别(字典)")
+    private List<String> monitorSort;
+
+    @ApiModelProperty(name = "monitorState",value = "监测点状态")
+    private List<String> monitorState;
+
+    @ApiModelProperty(name = "ifPowerUser",value = "是否发电用户：0-否；1-是")
+    private String ifPowerUser;
+}
diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/RMpMonitorAlarmCountMParam.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/RMpMonitorAlarmCountMParam.java
new file mode 100644
index 000000000..abb98fd91
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/RMpMonitorAlarmCountMParam.java
@@ -0,0 +1,26 @@
+package com.njcn.device.pms.pojo.param;
+
+import com.njcn.common.pojo.param.StatisticsBizBaseParam;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Title RMpMonitorAlarmCountMParam
+ * @Package com.njcn.device.pms.pojo.param
+ * @Author jianghaifei
+ * @Date 2022-10-13 08:58
+ * @Version V1.0
+ */
+@Data
+public class RMpMonitorAlarmCountMParam extends StatisticsBizBaseParam {
+
+    @ApiModelProperty(name = "voltage_Level", value = "电压等级id")
+    private String voltageLevel; //电压等级
+
+    @ApiModelProperty(name = "monitorObjectType", value = "监测点对象类型id")
+    private String monitorObjectType;
+
+    @ApiModelProperty(name = "measurementPointName", value = "监测点名称")
+    private String measurementPointName;
+
+}
diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/RStatAreaAlarmCountMParam.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/RStatAreaAlarmCountMParam.java
new file mode 100644
index 000000000..1938bffb8
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/RStatAreaAlarmCountMParam.java
@@ -0,0 +1,15 @@
+package com.njcn.device.pms.pojo.param;
+
+import com.njcn.common.pojo.param.StatisticsBizBaseParam;
+import lombok.Data;
+
+/**
+ * @Title RStatAreaAlarmCountMParam
+ * @Package com.njcn.device.pms.pojo.param
+ * @Author jianghaifei
+ * @Date 2022-10-10 15:17
+ * @Version V1.0
+ */
+@Data
+public class RStatAreaAlarmCountMParam extends StatisticsBizBaseParam {
+}
diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/RStatZwAlarmCountWParam.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/RStatZwAlarmCountWParam.java
new file mode 100644
index 000000000..9ad46c990
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/RStatZwAlarmCountWParam.java
@@ -0,0 +1,23 @@
+package com.njcn.device.pms.pojo.param;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.njcn.common.pojo.param.StatisticsBizBaseParam;
+import com.njcn.web.pojo.annotation.DateTimeStrValid;
+import com.njcn.web.pojo.param.BaseParam;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 告警统计(周)查询参数实体
+ * @TableName r_stat_zw_alarm_count_w
+ */
+@Data
+public class RStatZwAlarmCountWParam extends StatisticsBizBaseParam {
+
+}
\ No newline at end of file
diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/StatationStatParam.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/StatationStatParam.java
new file mode 100644
index 000000000..d4eec4cb2
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/StatationStatParam.java
@@ -0,0 +1,51 @@
+package com.njcn.device.pms.pojo.param;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
+/**
+ * pms-device
+ *
+ * @author cdf
+ * @date 2022/10/26
+ */
+@Data
+public class StatationStatParam {
+
+    /**
+     * 电站编号
+     */
+    @ApiModelProperty(value = "电站编号",required = true)
+    @NotBlank(message = "电站编号不可为空")
+    private String powerId;
+
+    /**
+     * 电站编号
+     */
+    @ApiModelProperty(value = "电站名称",required = true)
+    @NotBlank(message = "电站名称不可为空")
+    private String powerName;
+
+
+    @ApiModelProperty(value = "单位组织id",required = true)
+    @NotBlank(message = "单位组织id不可为空")
+    private String orgId;
+
+    /**
+     * 应设点数量
+     */
+    @ApiModelProperty(value = "应设点数量",required = true)
+    @NotNull(message = "应设点数量不可为空")
+    private Integer shouldBeNum;
+
+    /**
+     * 电压等级(字典)
+     */
+    @ApiModelProperty(value = "电压等级",required = true)
+    @NotBlank(message = "电压等级不可为空")
+    private String voltageLevel;
+
+}
diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/SubAreaQueryParam.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/SubAreaQueryParam.java
deleted file mode 100644
index c0660c536..000000000
--- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/SubAreaQueryParam.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.njcn.device.pms.pojo.param;
-
-import com.njcn.web.pojo.param.BaseParam;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.util.List;
-
-/**
- * pqs
- *
- * @author cdf
- * @date 2022/7/6
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-public class SubAreaQueryParam extends BaseParam {
-
-    @ApiModelProperty("所属10kV线路id")
-    private List<String> tenVoltageId;
-
-    @ApiModelProperty("所属单位id")
-    private List<String> unitId;
-
-    @ApiModelProperty("台区名称")
-    private String name;
-
-    @ApiModelProperty("是否接入")
-    private Boolean isJoin;
-
-
-}
diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/SubstationQueryParam.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/SubstationQueryParam.java
deleted file mode 100644
index 5933d9ecd..000000000
--- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/SubstationQueryParam.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.njcn.device.pms.pojo.param;
-
-import com.njcn.web.pojo.param.BaseParam;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.util.List;
-
-/**
- * pqs
- *
- * @author cdf
- * @date 2022/7/5
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-public class SubstationQueryParam extends BaseParam {
-
-    @ApiModelProperty(value = "单位id",name = "unitId")
-    private List<String> unitId;
-
-    @ApiModelProperty(value = "电压等级",name = "scale")
-    private List<String> scale;
-}
diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/TenVoltageQueryParam.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/TenVoltageQueryParam.java
deleted file mode 100644
index 683023820..000000000
--- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/TenVoltageQueryParam.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package com.njcn.device.pms.pojo.param;
-
-import com.njcn.web.pojo.param.BaseParam;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.util.List;
-
-/**
- * pqs
- *
- * @author cdf
- * @date 2022/7/5
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-public class TenVoltageQueryParam extends BaseParam {
-
-    @ApiModelProperty(name = "scale",value = "电压等级")
-    private List<String> scale;
-
-    @ApiModelProperty(name = "designScale",value = "电压等级")
-    private List<String> designScale;
-
-    @ApiModelProperty(name = "pvStatus",value = "是否有光伏接入")
-    private Integer pvStatus;
-}
diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/TractionStationParam.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/TractionStationParam.java
new file mode 100644
index 000000000..b2db6bd16
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/TractionStationParam.java
@@ -0,0 +1,74 @@
+package com.njcn.device.pms.pojo.param;
+
+import com.njcn.web.pojo.param.BaseParam;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+@Data
+public class TractionStationParam {
+
+    @ApiModelProperty(name = "id",value = "牵引站编号")
+    private String id;
+
+    @ApiModelProperty(name = "Name", value = "牵引站名称")
+    private String Name;
+
+    @ApiModelProperty(name = "OrgName", value = "组织机构名称")
+    private String OrgName;
+
+    @ApiModelProperty(name = "OrgId", value = "组织机构ID")
+    private String OrgId;
+
+    @ApiModelProperty(name = "OperationName", value = "运维单位名称")
+    private String OperationName;
+
+    @ApiModelProperty(name = "OperationId", value = "运维单位ID")
+    private String OperationId;
+
+    @ApiModelProperty(name = "VoltageLevel", value = "供电电压等级")
+    private String VoltageLevel;
+
+    @ApiModelProperty(name = "RailwayLineId", value = "铁路线路编号")
+    private String RailwayLineId;
+
+    @ApiModelProperty(name = "RailwayLineName", value = "铁路线路名称")
+    private String RailwayLineName;
+
+    @ApiModelProperty(name = "ConnetGroupWay", value = "牵引站变压器接线方式")
+    private String ConnetGroupWay;
+
+    @ApiModelProperty(name = "RatedCapacity", value = "牵引站变电容量")
+    private Float RatedCapacity;
+
+    @ApiModelProperty(name = "PowerId", value = "供电变电站编号")
+    private String PowerId;
+
+    @ApiModelProperty(name = "PowerName", value = "供电变电站名称")
+    private String PowerName;
+
+    @ApiModelProperty(name = "PowerVoltageLevel", value = "供电变电站电压等级")
+    private String PowerVoltageLevel;
+
+    @ApiModelProperty(name = "IfSpecial", value = "是否专线供电：0-否;1-是;")
+    private Integer IfSpecial;
+
+    @ApiModelProperty(name = "CreatedDate", value = "创建日期")
+    private String CreatedDate;
+
+    @ApiModelProperty(name = "UserTag", value = "用户标签")
+    private String UserTag;
+
+    @ApiModelProperty(name = "IsUpToGrid", value = "是否是上送国网监测点,0-否 1-是")
+    private Integer IsUpToGrid;
+
+    /**
+     * 查询数据实体
+     */
+    @Data
+    @EqualsAndHashCode(callSuper = true)
+    public static class QueryParam extends BaseParam {
+
+        private Integer Status;
+    }
+}
diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/UniversalFrontEndParam.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/UniversalFrontEndParam.java
new file mode 100644
index 000000000..381d8cc89
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/UniversalFrontEndParam.java
@@ -0,0 +1,58 @@
+package com.njcn.device.pms.pojo.param;
+
+import com.njcn.common.pojo.param.StatisticsBizBaseParam;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.validator.constraints.Range;
+
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 拓展前端参数
+ *
+ * @author yzh
+ * @date 2022/10/8
+ */
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class UniversalFrontEndParam extends StatisticsBizBaseParam implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 电压等级
+     */
+    @ApiModelProperty(name = "voltageLevel", value = "电压等级", required = true)
+    private List<String> voltageLevel;
+
+    /**
+     * 监测点名称
+     */
+    @ApiModelProperty(name = "measurementPointId",value = "监测点名称")
+    private String measurementPointId;
+
+    /**
+     * 暂态指标类型
+     */
+    @ApiModelProperty(name = "typeOfTransientIndicators",value = "暂态指标类型")
+    private String typeOfTransientIndicators;
+
+    /**
+     * 监测点类别
+     */
+    @ApiModelProperty(name = "measurementPointCategory",value = "监测点类别")
+    private String measurementPointCategory;
+
+    /**
+     * 变电站名称
+     */
+    @ApiModelProperty(name = "subName",value = "变电站名称")
+    private String subName;
+
+
+
+}
diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/VoltageQueryParam.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/VoltageQueryParam.java
deleted file mode 100644
index e89491200..000000000
--- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/VoltageQueryParam.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package com.njcn.device.pms.pojo.param;
-
-import com.njcn.web.pojo.param.BaseParam;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * pqs
- *
- * @author cdf
- * @date 2022/7/6
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-public class VoltageQueryParam extends BaseParam {
-
-    @ApiModelProperty(value = "scale",name = "母线名称",required = true)
-    private String name;
-
-    @ApiModelProperty(value = "scale",name = "电压等级")
-    private String scale;
-}
diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/DistributionMonitor.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/DistributionMonitor.java
new file mode 100644
index 000000000..187c122b1
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/DistributionMonitor.java
@@ -0,0 +1,65 @@
+package com.njcn.device.pms.pojo.po;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.njcn.db.bo.BaseEntity;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 配网监测点
+ * </p>
+ *
+ * @author hongawen
+ * @since 2022-10-14
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("pms_distribution_monitor")
+public class DistributionMonitor extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 监测点类别(字典)
+     */
+    private String monitorSort;
+
+    /**
+     * 监测点ID
+     */
+    private String monitorId;
+
+    /**
+     * 电压等级(字典)
+     */
+    private String voltageLevel;
+
+    /**
+     * 是否发电用户：0-否；1-是；
+     */
+    private Boolean ifPowerUser;
+
+    /**
+     * 监测点状态(字典)
+     */
+    private String monitorState;
+
+    /**
+     * 创建日期
+     */
+    private LocalDateTime createdDate;
+
+    /**
+     * 数据状态：0-删除；1-正常；
+     */
+    private Boolean status;
+
+
+
+}
diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/Generatrix.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/Generatrix.java
new file mode 100644
index 000000000..49ae2a8f6
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/Generatrix.java
@@ -0,0 +1,33 @@
+package com.njcn.device.pms.pojo.po;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.njcn.db.bo.BaseEntity;
+import jdk.nashorn.internal.ir.IdentNode;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * pms-device
+ * 母线
+ * @author cdf
+ * @date 2022/10/26
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("pms_generatrix")
+public class Generatrix extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    private String generatrixId;
+
+    private String generatrixName;
+
+    private String statationId;
+
+    private String scale;
+
+    private Integer status;
+
+
+}
diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/GeneratrixWire.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/GeneratrixWire.java
new file mode 100644
index 000000000..c1c0861d1
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/GeneratrixWire.java
@@ -0,0 +1,27 @@
+package com.njcn.device.pms.pojo.po;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.njcn.db.bo.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * pms-device
+ * 线路
+ * @author cdf
+ * @date 2022/10/26
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("pms_generatrix_wire")
+public class GeneratrixWire extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+    private String wireId;
+
+    private String wireName;
+
+    private String generatrixId;
+
+    private Integer status;
+}
diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/HarmonicGeneralManagement.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/HarmonicGeneralManagement.java
new file mode 100644
index 000000000..511cf31c4
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/HarmonicGeneralManagement.java
@@ -0,0 +1,104 @@
+package com.njcn.device.pms.pojo.po;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.njcn.db.bo.BaseEntity;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author hongawen
+ * @since 2022-10-14
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("pms_harmonic_general_management")
+public class HarmonicGeneralManagement extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 普测计划编号
+     */
+    private String id;
+
+    /**
+     * 组织机构名称
+     */
+    private String orgName;
+
+    /**
+     * 组织机构ID(外键)
+     */
+    private String orgId;
+
+    /**
+     * 计划名称
+     */
+    private String plannedName;
+
+    /**
+     * 计划生成时间
+     */
+    private LocalDateTime plannedGenerationTime;
+
+    /**
+     * 计划开始时间
+     */
+    private LocalDateTime plannedStartTime;
+
+    /**
+     * 计划结束时间
+     */
+    private LocalDateTime plannedEndTime;
+
+    /**
+     * 实际完成时间
+     */
+    private LocalDateTime actualFinishTime;
+
+    /**
+     * 计划负责人(外键)
+     */
+    private String plannedUser;
+
+    /**
+     * 计划状态
+     */
+    private String plannedState;
+
+    /**
+     * 数据状态：0-删除；1-正常； 
+     */
+    private Boolean status;
+
+    /**
+     * 创建用户
+     */
+    private String createBy;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createTime;
+
+    /**
+     * 更新用户
+     */
+    private String updateBy;
+
+    /**
+     * 更新时间
+     */
+    private LocalDateTime updateTime;
+
+
+}
diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/HarmonicGeneralManagementData.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/HarmonicGeneralManagementData.java
new file mode 100644
index 000000000..804166464
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/HarmonicGeneralManagementData.java
@@ -0,0 +1,876 @@
+package com.njcn.device.pms.pojo.po;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.njcn.db.bo.BaseEntity;
+import java.io.Serializable;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+
+import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author hongawen
+ * @since 2022-10-14
+ */
+@Data
+@TableName("pms_harmonic_general_management_data")
+public class HarmonicGeneralManagementData {
+
+    private static final long serialVersionUID = 1L;
+
+    private String plannedId;
+
+    private String powerStationId;
+
+    private String powerStationName;
+
+    private String orgId;
+
+    private String devopsId;
+
+    private String powerrId;
+
+    private String monitorMxId;
+
+    private String intervalName;
+
+    private LocalDateTime generalStartTime;
+
+    private LocalDateTime generalEndTime;
+
+    private LocalDate monitorDataDate;
+
+    private LocalDate monitorDataUploadDate;
+
+    private String monitorFunctionary;
+
+    private Float frequencyMax;
+
+    private Float frequencyMin;
+
+    private Float frequencyAvg;
+
+    private Float frequency95;
+
+    private Float frequencyDeviationMax;
+
+    private Float frequencyDeviationMin;
+
+    private Float frequencyDeviationAvg;
+
+    private Float frequencyDeviation95;
+
+    private Float frequencyDeviationOverrunDuration;
+
+    private Float phaseVoltageEffectiveAMax;
+
+    private Float phaseVoltageEffectiveAMin;
+
+    private Float phaseVoltageEffectiveAAvg;
+
+    private Float phaseVoltageEffectiveA95;
+
+    private Float phaseVoltageEffectiveBMax;
+
+    private Float phaseVoltageEffectiveBMin;
+
+    private Float phaseVoltageEffectiveBAvg;
+
+    private Float phaseVoltageEffectiveB95;
+
+    private Float phaseVoltageEffectiveCMax;
+
+    private Float phaseVoltageEffectiveCMin;
+
+    private Float phaseVoltageEffectiveCAvg;
+
+    private Float phaseVoltageEffectiveC95;
+
+    private Float lineVoltageEffectiveAbMax;
+
+    private Float lineVoltageEffectiveAbMin;
+
+    private Float lineVoltageEffectiveAbAvg;
+
+    private Float lineVoltageEffectiveAb95;
+
+    private Float lineVoltageEffectiveBcMax;
+
+    private Float lineVoltageEffectiveBcMin;
+
+    private Float lineVoltageEffectiveBcAvg;
+
+    private Float lineVoltageEffectiveBc95;
+
+    private Float lineVoltageEffectiveAcMax;
+
+    private Float lineVoltageEffectiveAcMin;
+
+    private Float lineVoltageEffectiveAcAvg;
+
+    private Float lineVoltageEffectiveAc95;
+
+    private Float vDeUpAMax;
+
+    private Float vDeUpAMin;
+
+    private Float vDeUpAAvg;
+
+    private Float vDeUpA95;
+
+    private Float vDeUpBMax;
+
+    private Float vDeUpBMin;
+
+    private Float vDeUpBAvg;
+
+    private Float vDeUpB95;
+
+    private Float vDeUpCMax;
+
+    private Float vDeUpCMin;
+
+    private Float vDeUpCAvg;
+
+    private Float vDeUpC95;
+
+    private Float vDeLowAMax;
+
+    private Float vDeLowAMin;
+
+    private Float vDeLowAAvg;
+
+    private Float vDeLowA95;
+
+    private Float vDeLowBMax;
+
+    private Float vDeLowBMin;
+
+    private Float vDeLowBAvg;
+
+    private Float vDeLowB95;
+
+    private Float vDeLowCMax;
+
+    private Float vDeLowCMin;
+
+    private Float vDeLowCAvg;
+
+    private Float vDeLowC95;
+
+    private Float vDeOverrunDuration;
+
+    private Float currentEffectiveAMax;
+
+    private Float currentEffectiveAMin;
+
+    private Float currentEffectiveAAvg;
+
+    private Float currentEffectiveA95;
+
+    private Float currentEffectiveBMax;
+
+    private Float currentEffectiveBMin;
+
+    private Float currentEffectiveBAvg;
+
+    private Float currentEffectiveB95;
+
+    private Float currentEffectiveCMax;
+
+    private Float currentEffectiveCMin;
+
+    private Float currentEffectiveCAvg;
+
+    private Float currentEffectiveC95;
+
+    private Float spActivePowerAMax;
+
+    private Float spActivePowerAMin;
+
+    private Float spActivePowerAAvg;
+
+    private Float spActivePowerA95;
+
+    private Float spActivePowerBMax;
+
+    private Float spActivePowerBMin;
+
+    private Float spActivePowerBAvg;
+
+    private Float spActivePowerB95;
+
+    private Float spActivePowerCMax;
+
+    private Float spActivePowerCMin;
+
+    private Float spActivePowerCAvg;
+
+    private Float spActivePowerC95;
+
+    private Float spReactivePowerAMax;
+
+    private Float spReactivePowerAMin;
+
+    private Float spReactivePowerAAvg;
+
+    private Float spReactivePowerA95;
+
+    private Float spReactivePowerBMax;
+
+    private Float spReactivePowerBMin;
+
+    private Float spReactivePowerBAvg;
+
+    private Float spReactivePowerB95;
+
+    private Float spReactivePowerCMax;
+
+    private Float spReactivePowerCMin;
+
+    private Float spReactivePowerCAvg;
+
+    private Float spReactivePowerC95;
+
+    private Float spApparentPowerAMax;
+
+    private Float spApparentPowerAMin;
+
+    private Float spApparentPowerAAvg;
+
+    private Float spApparentPowerA95;
+
+    private Float spApparentPowerBMax;
+
+    private Float spApparentPowerBMin;
+
+    private Float spApparentPowerBAvg;
+
+    private Float spApparentPowerB95;
+
+    private Float spApparentPowerCMax;
+
+    private Float spApparentPowerCMin;
+
+    private Float spApparentPowerCAvg;
+
+    private Float spApparentPowerC95;
+
+    private Float spPowerFactorAMax;
+
+    private Float spPowerFactorAMin;
+
+    private Float spPowerFactorAAvg;
+
+    private Float spPowerFactorA95;
+
+    private Float spPowerFactorBMax;
+
+    private Float spPowerFactorBMin;
+
+    private Float spPowerFactorBAvg;
+
+    private Float spPowerFactorB95;
+
+    private Float spPowerFactorCMax;
+
+    private Float spPowerFactorCMin;
+
+    private Float spPowerFactorCAvg;
+
+    private Float spPowerFactorC95;
+
+    private Float spFundamentalPowerFactorAMax;
+
+    private Float spFundamentalPowerFactorAMin;
+
+    private Float spFundamentalPowerFactorAAvg;
+
+    private Float spFundamentalPowerFactorA95;
+
+    private Float spFundamentalPowerFactorBMax;
+
+    private Float spFundamentalPowerFactorBMin;
+
+    private Float spFundamentalPowerFactorBAvg;
+
+    private Float spFundamentalPowerFactorB95;
+
+    private Float spFundamentalPowerFactorCMax;
+
+    private Float spFundamentalPowerFactorCMin;
+
+    private Float spFundamentalPowerFactorCAvg;
+
+    private Float spFundamentalPowerFactorC95;
+
+    private Float totalActivePowerMax;
+
+    private Float totalActivePowerMin;
+
+    private Float totalActivePowerAvg;
+
+    private Float totalActivePower95;
+
+    private Float totalReactivePowerMax;
+
+    private Float totalReactivePowerMin;
+
+    private Float totalReactivePowerAvg;
+
+    private Float totalReactivePower95;
+
+    private Float totalApparentPowerMax;
+
+    private Float totalApparentPowerMin;
+
+    private Float totalApparentPowerAvg;
+
+    private Float totalApparentPower95;
+
+    private Float tpPowerFactorMax;
+
+    private Float tpPowerFactorMin;
+
+    private Float tpPowerFactorAvg;
+
+    private Float tpPowerFactor95;
+
+    private Float fundamentalPowerFactorMax;
+
+    private Float fundamentalPowerFactorMin;
+
+    private Float fundamentalPowerFactorAvg;
+
+    private Float fundamentalPowerFactor95;
+
+    private Float voltageHarmonicWaveAMax;
+
+    private Float voltageHarmonicWaveAMin;
+
+    private Float voltageHarmonicWaveAAvg;
+
+    private Float voltageHarmonicWaveA95;
+
+    private Float voltageHarmonicWaveBMax;
+
+    private Float voltageHarmonicWaveBMin;
+
+    private Float voltageHarmonicWaveBAvg;
+
+    private Float voltageHarmonicWaveB95;
+
+    private Float voltageHarmonicWaveCMax;
+
+    private Float voltageHarmonicWaveCMin;
+
+    private Float voltageHarmonicWaveCAvg;
+
+    private Float voltageHarmonicWaveC95;
+
+    private Float fundamentalVoltageAMax;
+
+    private Float fundamentalVoltageAMin;
+
+    private Float fundamentalVoltageAAvg;
+
+    private Float fundamentalVoltageA95;
+
+    private Float fundamentalVoltageBMax;
+
+    private Float fundamentalVoltageBMin;
+
+    private Float fundamentalVoltageBAvg;
+
+    private Float fundamentalVoltageB95;
+
+    private Float fundamentalVoltageCMax;
+
+    private Float fundamentalVoltageCMin;
+
+    private Float fundamentalVoltageCAvg;
+
+    private Float fundamentalVoltageC95;
+
+    private Float harmonicVoltageContent2_50AMax;
+
+    private Float harmonicVoltageContent2_50AMin;
+
+    private Float harmonicVoltageContent2_50AAvg;
+
+    private Float harmonicVoltageContent2_50A95;
+
+    private Float harmonicVoltageContent2_50BMax;
+
+    private Float harmonicVoltageContent2_50BMin;
+
+    private Float harmonicVoltageContent2_50BAvg;
+
+    private Float harmonicVoltageContent2_50B95;
+
+    private Float harmonicVoltageContent2_50CMax;
+
+    private Float harmonicVoltageContent2_50CMin;
+
+    private Float harmonicVoltageContent2_50CAvg;
+
+    private Float harmonicVoltageContent2_50C95;
+
+    private Float centreHarmonicVoltageContent1_50AMax;
+
+    private Float centreHarmonicVoltageContent1_50AMin;
+
+    private Float centreHarmonicVoltageContent1_50AAvg;
+
+    private Float centreHarmonicVoltageContent1_50A95;
+
+    private Float centreHarmonicVoltageContent1_50BMax;
+
+    private Float centreHarmonicVoltageContent1_50BMin;
+
+    private Float centreHarmonicVoltageContent1_50BAvg;
+
+    private Float centreHarmonicVoltageContent1_50B95;
+
+    private Float centreHarmonicVoltageContent1_50CMax;
+
+    private Float centreHarmonicVoltageContent1_50CMin;
+
+    private Float centreHarmonicVoltageContent1_50CAvg;
+
+    private Float centreHarmonicVoltageContent1_50C95;
+
+    private Float fundamentalCurrentAMax;
+
+    private Float fundamentalCurrentAMin;
+
+    private Float fundamentalCurrentAAvg;
+
+    private Float fundamentalCurrentA95;
+
+    private Float fundamentalCurrentBMax;
+
+    private Float fundamentalCurrentBMin;
+
+    private Float fundamentalCurrentBAvg;
+
+    private Float fundamentalCurrentB95;
+
+    private Float fundamentalCurrentCMax;
+
+    private Float fundamentalCurrentCMin;
+
+    private Float fundamentalCurrentCAvg;
+
+    private Float fundamentalCurrentC95;
+
+    private Float harmonicCurrentEffective2_50AMax;
+
+    private Float harmonicCurrentEffective2_50AMin;
+
+    private Float harmonicCurrentEffective2_50AAvg;
+
+    private Float harmonicCurrentEffective2_50A95;
+
+    private Float harmonicCurrentEffective2_50BMax;
+
+    private Float harmonicCurrentEffective2_50BMin;
+
+    private Float harmonicCurrentEffective2_50BAvg;
+
+    private Float harmonicCurrentEffective2_50B95;
+
+    private Float harmonicCurrentEffective2_50CMax;
+
+    private Float harmonicCurrentEffective2_50CMin;
+
+    private Float harmonicCurrentEffective2_50CAvg;
+
+    private Float harmonicCurrentEffective2_50C95;
+
+    private Float simpleHarmonicCurrentEffective2_50AMax;
+
+    private Float simpleHarmonicCurrentEffective2_50AMin;
+
+    private Float simpleHarmonicCurrentEffective2_50AAvg;
+
+    private Float simpleHarmonicCurrentEffective2_50A95;
+
+    private Float simpleHarmonicCurrentEffective2_50BMax;
+
+    private Float simpleHarmonicCurrentEffective2_50BMin;
+
+    private Float simpleHarmonicCurrentEffective2_50BAvg;
+
+    private Float simpleHarmonicCurrentEffective2_50B95;
+
+    private Float simpleHarmonicCurrentEffective2_50CMax;
+
+    private Float simpleHarmonicCurrentEffective2_50CMin;
+
+    private Float simpleHarmonicCurrentEffective2_50CAvg;
+
+    private Float simpleHarmonicCurrentEffective2_50C95;
+
+    private Float harmonicActivePower2_50AMax;
+
+    private Float harmonicActivePower2_50AMin;
+
+    private Float harmonicActivePower2_50AAvg;
+
+    private Float harmonicActivePower2_50A95;
+
+    private Float harmonicActivePower2_50BMax;
+
+    private Float harmonicActivePower2_50BMin;
+
+    private Float harmonicActivePower2_50BAvg;
+
+    private Float harmonicActivePower2_50B95;
+
+    private Float harmonicActivePower2_50CMax;
+
+    private Float harmonicActivePower2_50CMin;
+
+    private Float harmonicActivePower2_50CAvg;
+
+    private Float harmonicActivePower2_50C95;
+
+    private Float positiveSequenceVoltageMax;
+
+    private Float positiveSequenceVoltageMin;
+
+    private Float positiveSequenceVoltageAvg;
+
+    private Float positiveSequenceVoltage95;
+
+    private Float negativeSequenceVoltageMax;
+
+    private Float negativeSequenceVoltageMin;
+
+    private Float negativeSequenceVoltageAvg;
+
+    private Float negativeSequenceVoltage95;
+
+    private Float zeroSequenceVoltageMax;
+
+    private Float zeroSequenceVoltageMin;
+
+    private Float zeroSequenceVoltageAvg;
+
+    private Float zeroSequenceVoltage95;
+
+    private Float negativeSequenceVoltageUnbalanceMax;
+
+    private Float negativeSequenceVoltageUnbalanceMin;
+
+    private Float negativeSequenceVoltageUnbalanceAvg;
+
+    private Float negativeSequenceVoltageUnbalance95;
+
+    private Float zeroSequenceVoltageUnbalanceMax;
+
+    private Float zeroSequenceVoltageUnbalanceMin;
+
+    private Float zeroSequenceVoltageUnbalanceAvg;
+
+    private Float zeroSequenceVoltageUnbalance95;
+
+    private Float positiveSequenceCurrentMax;
+
+    private Float positiveSequenceCurrentMin;
+
+    private Float positiveSequenceCurrentAvg;
+
+    private Float positiveSequenceCurrent95;
+
+    private Float negativeSequenceCurrentMax;
+
+    private Float negativeSequenceCurrentMin;
+
+    private Float negativeSequenceCurrentAvg;
+
+    private Float negativeSequenceCurrent95;
+
+    private Float zeroSequenceCurrentMax;
+
+    private Float zeroSequenceCurrentMin;
+
+    private Float zeroSequenceCurrentAvg;
+
+    private Float zeroSequenceCurrent95;
+
+    private Float negativeSequenceCurrentUnbalanceMax;
+
+    private Float negativeSequenceCurrentUnbalanceMin;
+
+    private Float negativeSequenceCurrentUnbalanceAvg;
+
+    private Float negativeSequenceCurrentUnbalance95;
+
+    private Float zeroSequenceCurrentImbalanceMax;
+
+    private Float zeroSequenceCurrentImbalanceMin;
+
+    private Float zeroSequenceCurrentImbalanceAvg;
+
+    private Float zeroSequenceCurrentImbalance95;
+
+    private Float voltageFluctuationAMax;
+
+    private Float voltageFluctuationAMin;
+
+    private Float voltageFluctuationAAvg;
+
+    private Float voltageFluctuationA95;
+
+    private Float voltageFluctuationBMax;
+
+    private Float voltageFluctuationBMin;
+
+    private Float voltageFluctuationBAvg;
+
+    private Float voltageFluctuationB95;
+
+    private Float voltageFluctuationCMax;
+
+    private Float voltageFluctuationCMin;
+
+    private Float voltageFluctuationCAvg;
+
+    private Float voltageFluctuationC95;
+
+    private Float shortTermSeverityAMax;
+
+    private Float shortTermSeverityAMin;
+
+    private Float shortTermSeverityAAvg;
+
+    private Float shortTermSeverityA95;
+
+    private Float shortTermSeverityBMax;
+
+    private Float shortTermSeverityBMin;
+
+    private Float shortTermSeverityBAvg;
+
+    private Float shortTermSeverityB95;
+
+    private Float shortTermSeverityCMax;
+
+    private Float shortTermSeverityCMin;
+
+    private Float shortTermSeverityCAvg;
+
+    private Float shortTermSeverityC95;
+
+    private Float longTimeFlashingAMax;
+
+    private Float longTimeFlashingAMin;
+
+    private Float longTimeFlashingAAvg;
+
+    private Float longTimeFlashingA95;
+
+    private Float longTimeFlashingBMax;
+
+    private Float longTimeFlashingBMin;
+
+    private Float longTimeFlashingBAvg;
+
+    private Float longTimeFlashingB95;
+
+    private Float longTimeFlashingCMax;
+
+    private Float longTimeFlashingCMin;
+
+    private Float longTimeFlashingCAvg;
+
+    private Float longTimeFlashingC95;
+
+    private Float longTimeFlashingOverrunDuration;
+
+    private Float equivalentApparentPowerMax;
+
+    private Float equivalentApparentPowerMin;
+
+    private Float equivalentApparentPowerAvg;
+
+    private Float equivalentApparentPower95;
+
+    private Float equivalentPowerFactorMax;
+
+    private Float equivalentPowerFactorMin;
+
+    private Float equivalentPowerFactorAvg;
+
+    private Float equivalentPowerFactor95;
+
+    private Float fundamentalWaveApparentMax;
+
+    private Float fundamentalWaveApparentMin;
+
+    private Float fundamentalWaveApparentAvg;
+
+    private Float fundamentalWaveApparent95;
+
+    private Float nonfundamentalWaveApparentMax;
+
+    private Float nonfundamentalWaveApparentMin;
+
+    private Float nonfundamentalWaveApparentAvg;
+
+    private Float nonfundamentalWaveApparent95;
+
+    private Float unbalancedApparentPowerMax;
+
+    private Float unbalancedApparentPowerMin;
+
+    private Float unbalancedApparentPowerAvg;
+
+    private Float unbalancedApparentPower95;
+
+    private Float subharmonicCurrentContent2_50AMax;
+
+    private Float subharmonicCurrentContent2_50AMin;
+
+    private Float subharmonicCurrentContent2_50AAvg;
+
+    private Float subharmonicCurrentContent2_50A95;
+
+    private Float subharmonicCurrentContent2_50BMax;
+
+    private Float subharmonicCurrentContent2_50BMin;
+
+    private Float subharmonicCurrentContent2_50BAvg;
+
+    private Float subharmonicCurrentContent2_50B95;
+
+    private Float subharmonicCurrentContent2_50CMax;
+
+    private Float subharmonicCurrentContent2_50CMin;
+
+    private Float subharmonicCurrentContent2_50CAvg;
+
+    private Float subharmonicCurrentContent2_50C95;
+
+    private Float interHarmonicCurrent1_50AMax;
+
+    private Float interHarmonicCurrent1_50AMin;
+
+    private Float interHarmonicCurrent1_50AAvg;
+
+    private Float interHarmonicCurrent1_50A95;
+
+    private Float interHarmonicCurrent1_50BMax;
+
+    private Float interHarmonicCurrent1_50BMin;
+
+    private Float interHarmonicCurrent1_50BAvg;
+
+    private Float interHarmonicCurrent1_50B95;
+
+    private Float interHarmonicCurrent1_50CMax;
+
+    private Float interHarmonicCurrent1_50CMin;
+
+    private Float interHarmonicCurrent1_50CAvg;
+
+    private Float interHarmonicCurrent1_50C95;
+
+    private Float simpleHarmonicCurrentRate1_50AMax;
+
+    private Float simpleHarmonicCurrentRate1_50AMin;
+
+    private Float simpleHarmonicCurrentRate1_50AAvg;
+
+    private Float simpleHarmonicCurrentRate1_50A95;
+
+    private Float simpleHarmonicCurrentRate1_50BMax;
+
+    private Float simpleHarmonicCurrentRate1_50BMin;
+
+    private Float simpleHarmonicCurrentRate1_50BAvg;
+
+    private Float simpleHarmonicCurrentRate1_50B95;
+
+    private Float simpleHarmonicCurrentRate1_50CMax;
+
+    private Float simpleHarmonicCurrentRate1_50CMin;
+
+    private Float simpleHarmonicCurrentRate1_50CAvg;
+
+    private Float simpleHarmonicCurrentRate1_50C95;
+
+    private Float fundamentalRateofworkAMax;
+
+    private Float fundamentalRateofworkAMin;
+
+    private Float fundamentalRateofworkAAvg;
+
+    private Float fundamentalRateofworkA95;
+
+    private Float fundamentalRateofworkBMax;
+
+    private Float fundamentalRateofworkBMin;
+
+    private Float fundamentalRateofworkBAvg;
+
+    private Float fundamentalRateofworkB95;
+
+    private Float fundamentalRateofworkCMax;
+
+    private Float fundamentalRateofworkCMin;
+
+    private Float fundamentalRateofworkCAvg;
+
+    private Float fundamentalRateofworkC95;
+
+    private Float fundamentalActivePowerAMax;
+
+    private Float fundamentalActivePowerAMin;
+
+    private Float fundamentalActivePowerAAvg;
+
+    private Float fundamentalActivePowerA95;
+
+    private Float fundamentalActivePowerBMax;
+
+    private Float fundamentalActivePowerBMin;
+
+    private Float fundamentalActivePowerBAvg;
+
+    private Float fundamentalActivePowerB95;
+
+    private Float fundamentalActivePowerCMax;
+
+    private Float fundamentalActivePowerCMin;
+
+    private Float fundamentalActivePowerCAvg;
+
+    private Float fundamentalActivePowerC95;
+
+    private Float fundamentalWavePositiveMax;
+
+    private Float fundamentalWavePositiveMin;
+
+    private Float fundamentalWavePositiveAvg;
+
+    private Float fundamentalWavePositive95;
+
+    private Float harmonicVoltageOverrunDuration;
+
+    private Float tpVoltageUnbalanceOverrunDuration;
+
+    private Float receivableTargetNum;
+
+    private Float practicalTargetNum;
+
+
+}
diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/Monitor.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/Monitor.java
new file mode 100644
index 000000000..e4b9a102c
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/Monitor.java
@@ -0,0 +1,187 @@
+package com.njcn.device.pms.pojo.po;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.njcn.db.bo.BaseEntity;
+import java.time.LocalDateTime;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author hongawen
+ * @since 2022-10-14
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("pms_monitor")
+public class Monitor extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 监测点ID
+     */
+    private String id;
+
+    /**
+     * 监测点名称
+     */
+    private String name;
+
+    /**
+     * 组织机构名称
+     */
+    private String orgName;
+
+    /**
+     * 组织机构ID(外键)
+     */
+    private String orgId;
+
+    /**
+     * 运维单位名称
+     */
+    private String operationName;
+
+    /**
+     * 运维单位ID(外键)
+     */
+    private String operationId;
+
+    /**
+     * 变电站名称
+     */
+    private String powerrName;
+
+    /**
+     * 电站ID(外键)
+     */
+    private String powerrId;
+
+    /**
+     * 母线名称
+     */
+    private String generatrixName;
+
+    /**
+     * 母线ID(外键)
+     */
+    private String generatrixId;
+
+    /**
+     * 监测线路名称
+     */
+    private String lineName;
+
+    /**
+     * 监测线路ID
+     */
+    private String lineId;
+
+    /**
+     * 电压等级(字典)
+     */
+    private String voltageLevel;
+
+    /**
+     * 监测点状态(字典)
+     */
+    private String monitorState;
+
+    /**
+     * 监测点类型(字典)
+     */
+    private String monitorType;
+
+    /**
+     * 最小短路容量
+     */
+    private Float minShortCircuitCapacity;
+
+    /**
+     * 供电设备容量
+     */
+    private Float powerSupplyEqCapacity;
+
+    /**
+     * 用户协议容量
+     */
+    private Float userAgreementCapacity;
+
+    /**
+     * 电压偏差限值（上）
+     */
+    private Float voltageDeviationUpperLimit;
+
+    /**
+     * 电压偏差限值（下）
+     */
+    private Float voltageDeviationLowerLimit;
+
+    /**
+     * 电压互感器类型(字典)
+     */
+    private String potentialTransFormerType;
+
+    /**
+     * 中性点接地方式(字典)
+     */
+    private String neutralGroundingMode;
+
+    /**
+     * 是否用户专线(字典)
+     */
+    private String isSpecialSupplyElectricity;
+
+    /**
+     * 监测点标签
+     */
+    private String monitorTag;
+
+    /**
+     * 监测对象类型(字典)
+     */
+    private String monitorObjectType;
+
+    /**
+     * 监测对象编号
+     */
+    private String monitorObjectId;
+
+    /**
+     * 监测对象名称
+     */
+    private String monitorObjectName;
+
+    /**
+     * 统计间隔
+     */
+    private Integer statisticalInterval;
+
+    /**
+     * 关联的监测终端编号(外键)
+     */
+    private String terminalId;
+
+    /**
+     * 监测终端接线方式(字典)
+     */
+    private String terminalWiringMethod;
+
+    /**
+     * 是否是上送国网监测点,0-否 1-是
+     */
+    private Integer isUpToGrid;
+
+    /**
+     * 数据状态：0-删除；1-正常；
+     */
+    private Integer status;
+
+
+
+}
diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/PmsMonitorPO.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/PmsMonitorPO.java
new file mode 100644
index 000000000..cb74beb47
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/PmsMonitorPO.java
@@ -0,0 +1,58 @@
+package com.njcn.device.pms.pojo.po;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * (PmsMonitor)实体类
+ *
+ * @author yzh
+ * @since 2022-10-14 10:23:20
+ */
+@Data
+public class PmsMonitorPO implements Serializable {
+    private static final long serialVersionUID = -72537315596058339L;
+    /**
+     * 监测点ID
+     */
+    private String id;
+    /**
+     * 监测点名称
+     */
+    private String name;
+    /**
+     * 组织机构名称
+     */
+    private String orgName;
+    /**
+     * 组织机构ID(外键)
+     */
+    private String orgId;
+    /**
+     * 运维单位名称
+     */
+    private String operationName;
+    /**
+     * 运维单位ID(外键)
+     */
+    private String operationId;
+    /**
+     * 变电站名称
+     */
+    private String powerrName;
+    /**
+     * 电站ID(外键)
+     */
+    private String powerrId;
+    /**
+     * 母线名称
+     */
+    private String generatrixName;
+    /**
+     * 母线ID(外键)
+     */
+    private String generatrixId;
+
+}
+
diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/PowerClient.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/PowerClient.java
new file mode 100644
index 000000000..5effdd223
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/PowerClient.java
@@ -0,0 +1,172 @@
+package com.njcn.device.pms.pojo.po;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.njcn.db.bo.BaseEntity;
+import java.io.Serializable;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 发电用户
+ * </p>
+ *
+ * @author hongawen
+ * @since 2022-10-14
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("pms_power_client")
+public class PowerClient extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 用户编号
+     */
+    private String id;
+
+    /**
+     * 用户名称
+     */
+    private String name;
+
+    /**
+     * 组织机构名称
+     */
+    private String orgName;
+
+    /**
+     * 组织机构ID(外键)
+     */
+    private String orgId;
+
+    /**
+     * 运维单位名称
+     */
+    private String operationName;
+
+    /**
+     * 运维单位ID(外键)
+     */
+    private String operationId;
+
+    /**
+     * 用户分类(字典)
+     */
+    private String userType;
+
+    /**
+     * 行业分类(字典)
+     */
+    private String industryType;
+
+    /**
+     * 用电类别(字典)
+     */
+    private String electricityType;
+
+    /**
+     * 合同容量
+     */
+    private Float contractCapacity;
+
+    /**
+     * 运行容量
+     */
+    private Float operatingCapacity;
+
+    /**
+     * 生产班次(字典)
+     */
+    private String productionShift;
+
+    /**
+     * 负荷性质(字典)
+     */
+    private String loadNature;
+
+    /**
+     * 供电电压(字典)
+     */
+    private String voltageLevel;
+
+    /**
+     * 高耗能行业类别(字典)
+     */
+    private String highIndustryType;
+
+    /**
+     * 送电日期
+     */
+    private LocalDate powerTransmissionDate;
+
+    /**
+     * 重要性等级(字典)
+     */
+    private String importanceLevel;
+
+    /**
+     * 用电客户状态(字典)
+     */
+    private String eccStat;
+
+    /**
+     * 是否敏感用户：0-否；1：是；
+     */
+    private Integer ifSensitiveUser;
+
+    /**
+     * 是否影响电能质量：0-否；1：是；
+     */
+    private Integer ifPowerQuality;
+
+    /**
+     * 是否重要客户：0-否；1：是；
+     */
+    private Integer ifKeyCustomers;
+
+    /**
+     * 敏感用户类别(字典)
+     */
+    private String sensitiveType;
+
+    /**
+     * 供电变电站(外键)
+     */
+    private String powerStationId;
+
+    /**
+     * 供电线路(外键)
+     */
+    private String lineId;
+
+    /**
+     * 供电台区(外键)
+     */
+    private String platformId;
+
+    /**
+     * 用户标签
+     */
+    private String userTag;
+
+    /**
+     * 是否是上送国网监测点,0-否 1-是
+     */
+    private Integer isUpToGrid;
+
+    /**
+     * 数据状态：0-删除；1-正常；
+     */
+    private Integer status;
+
+
+
+
+}
diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/PowerDistributionarea.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/PowerDistributionarea.java
new file mode 100644
index 000000000..cd4aaaca4
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/PowerDistributionarea.java
@@ -0,0 +1,164 @@
+package com.njcn.device.pms.pojo.po;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.njcn.db.bo.BaseEntity;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author hongawen
+ * @since 2022-10-14
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("pms_power_distributionarea")
+public class PowerDistributionarea extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 台区编号
+     */
+    private String id;
+
+    /**
+     * 台区名称
+     */
+    private String name;
+
+    /**
+     * 组织机构名称
+     */
+    private String orgName;
+
+    /**
+     * 组织机构ID(外键)
+     */
+    private String orgId;
+
+    /**
+     * 运维单位名称
+     */
+    private String operationName;
+
+    /**
+     * 运维单位ID(外键)
+     */
+    private String operationId;
+
+    /**
+     * 变电站名称
+     */
+    private String powerrName;
+
+    /**
+     * 电站ID(外键)
+     */
+    private String powerStationId;
+
+    /**
+     * 监测线路名称
+     */
+    private String lineName;
+
+    /**
+     * 所属线路ID(外键)
+     */
+    private String lineId;
+
+    /**
+     * 配变容量
+     */
+    private Float pCapacity;
+
+    /**
+     * 地区特征(字典)
+     */
+    private String regionalism;
+
+    /**
+     * 是否农网：0-否；1：是；
+     */
+    private Integer ifRuralPowerGrid;
+
+    /**
+     * 使用性质
+     */
+    private String natureOfUse;
+
+    /**
+     * 供电半径
+     */
+    private Float powerSupplyRadius;
+
+    /**
+     * 供电线路总长度
+     */
+    private Float lineLength;
+
+    /**
+     * 运行状态(字典)
+     */
+    private String state;
+
+    /**
+     * 分布式光伏用户数
+     */
+    private Integer distributedPhotovoltaicNum;
+
+    /**
+     * 分布式光伏总装机容量
+     */
+    private Float photovoltaicCapacity;
+
+    /**
+     * 是否有电动汽车接入：0-否；1：是；
+     */
+    private Integer ifBevAp;
+
+    /**
+     * 接入负荷类型(字典)
+     */
+    private String apLoadType;
+
+    /**
+     * 是否是上送国网监测点,0-否 1-是
+     */
+    private Integer isUpToGrid;
+
+    /**
+     * 数据状态：0-删除；1-正常； 
+     */
+    private Integer status;
+
+    /**
+     * 创建用户
+     */
+    private String createBy;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createTime;
+
+    /**
+     * 更新用户
+     */
+    private String updateBy;
+
+    /**
+     * 更新时间
+     */
+    private LocalDateTime updateTime;
+
+
+}
diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/PowerGenerationUser.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/PowerGenerationUser.java
new file mode 100644
index 000000000..877285b55
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/PowerGenerationUser.java
@@ -0,0 +1,132 @@
+package com.njcn.device.pms.pojo.po;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.njcn.db.bo.BaseEntity;
+import java.io.Serializable;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 发电用户
+ * </p>
+ *
+ * @author hongawen
+ * @since 2022-10-14
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("pms_power_generation_user")
+public class PowerGenerationUser extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 用户编号
+     */
+    private String id;
+
+    /**
+     * 用户名称
+     */
+    private String name;
+
+    /**
+     * 组织机构名称
+     */
+    private String orgName;
+
+    /**
+     * 组织机构ID(外键)
+     */
+    private String orgId;
+
+    /**
+     * 运维单位名称
+     */
+    private String operationName;
+
+    /**
+     * 运维单位ID(外键)
+     */
+    private String operationId;
+
+    /**
+     * 电源类别(字典)
+     */
+    private String powerCategory;
+
+    /**
+     * 电站类型(字典)
+     */
+    private String powerStationType;
+
+    /**
+     * 发电方式(字典)
+     */
+    private String powerGenerationMode;
+
+    /**
+     * 并网电压等级(字典)
+     */
+    private String voltageLevel;
+
+    /**
+     * 总装机容量
+     */
+    private Float sourceCapacity;
+
+    /**
+     * 并网日期
+     */
+    private LocalDate connectionDate;
+
+    /**
+     * 能源消纳方式(字典)
+     */
+    private String connectionMode;
+
+    /**
+     * 客户状态(字典)
+     */
+    private String gcStat;
+
+    /**
+     * 供电变电站(外键)
+     */
+    private String powerStationId;
+
+    /**
+     * 供电线路(外键)
+     */
+    private String lineId;
+
+    /**
+     * 供电台区(外键)
+     */
+    private String platformId;
+
+    /**
+     * 用户标签
+     */
+    private String userTag;
+
+    /**
+     * 是否是上送国网监测点,0-否 1-是
+     */
+    private Integer isUpToGrid;
+
+    /**
+     * 数据状态：0-删除；1-正常；
+     */
+    private Integer status;
+
+
+
+
+}
diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/PowerQualityMatter.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/PowerQualityMatter.java
new file mode 100644
index 000000000..34ec6e99c
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/PowerQualityMatter.java
@@ -0,0 +1,142 @@
+package com.njcn.device.pms.pojo.po;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.njcn.db.bo.BaseEntity;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author hongawen
+ * @since 2022-10-14
+ */
+@Data
+@TableName("pms_power_quality_matter")
+public class PowerQualityMatter {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 电能质量问题编号
+     */
+    private String powerQualityProblem;
+
+    /**
+     * 组织机构名称
+     */
+    private String orgName;
+
+    /**
+     * 组织机构ID
+     */
+    private String orgId;
+
+    /**
+     * 问题来源(字典)
+     */
+    private String problemSources;
+
+    /**
+     * 变电站编号(外键)
+     */
+    private String checkPowerId;
+
+    /**
+     * 问题指标(字典)
+     */
+    private String problemIndicators;
+
+    /**
+     * 问题发生时间
+     */
+    private LocalDateTime problemOccurrenceDate;
+
+    /**
+     * 问题发生天数
+     */
+    private Integer problemOccurrenceDays;
+
+    /**
+     * 用户编号(外键)
+     */
+    private String customerId;
+
+    /**
+     * 用户名称
+     */
+    private String customerName;
+
+    /**
+     * 用户类别(字典)
+     */
+    private String sensitiveType;
+
+    /**
+     * 是否实现监测：0-否；1-是；
+     */
+    private Boolean ifOnlineMonitor;
+
+    /**
+     * 监测点编号(外键)
+     */
+    private String monitorId;
+
+    /**
+     * 投诉时间
+     */
+    private LocalDateTime complaintsDate;
+
+    /**
+     * 投诉内容
+     */
+    private String complaintContent;
+
+    /**
+     * 电网-受影响设备(字典)
+     */
+    private String gridAffectedUnit;
+
+    /**
+     * 用户-受影响设备(字典)
+     */
+    private String customerAffectedUnit;
+
+    /**
+     * 事件描述（投诉内容）
+     */
+    private String incidentDescription;
+
+    /**
+     * 原因分析结果
+     */
+    private String problemAnaly;
+
+    /**
+     * 计划整改措施
+     */
+    private String plannedCorrectiveAction;
+
+    /**
+     * 实际采取措施
+     */
+    private String actualMeasuresTaken;
+
+    /**
+     * 治理效果评价
+     */
+    private String governanceMode;
+
+    /**
+     * 报告
+     */
+    private String governanceReport;
+
+
+}
diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/PvDevice.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/PvDevice.java
deleted file mode 100644
index 9aff0d271..000000000
--- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/PvDevice.java
+++ /dev/null
@@ -1,109 +0,0 @@
-package com.njcn.device.pms.pojo.po;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.njcn.db.bo.BaseEntity;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.time.LocalDate;
-
-/**
- * <p>
- *
- * </p>
- *
- * @author cdf
- * @since 2022-07-05
- */
-@Data
-@TableName("pv_device")
-@EqualsAndHashCode(callSuper = true)
-public class PvDevice extends BaseEntity {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 终端台账表Id
-     */
-    private String id;
-
-    private String name;
-
-    /**
-     * 终端类型（电能质量监测终端、智能电表、智能融合终端），字典表
-     */
-    private String type;
-
-    /**
-     * 用于保存PMS中电能质量监测终端Id、智能融合终端Id，智能电表Id
-     */
-    private String devCode;
-
-    /**
-     * 终端Ip
-     */
-    private String ip;
-
-    /**
-     * 端口
-     */
-    private Integer port;
-
-    /**
-     * 终端型号（570、580……）字典表
-     */
-    private String devType;
-
-    /**
-     * 设备制造商，字典表
-     */
-    private String manufacturer;
-
-    /**
-     * 装置识别码（3ds加密）
-     */
-    private String series;
-
-    /**
-     * 装置秘钥（3ds加密）
-     */
-    private String devKey;
-
-    /**
-     * 投运时间
-     */
-    private LocalDate loadTime;
-
-    /**
-     * 装置通讯状态
-     */
-    private Integer devStatus;
-
-
-    /**
-     * 信号传输方式
-     */
-    private String communicateType;
-
-    /**
-     * 本次定检时间，默认等于投运时间
-     */
-    private LocalDate thisTimeCheck;
-
-    /**
-     * 下次定检时间,默认为投运时间后推3年，假如时间小于3个月则为待检
-     */
-    private LocalDate nextTimeCheck;
-
-    /**
-     * 终端级别
-     */
-    private String devGrade;
-    /**
-     * 状态
-     */
-    private Integer state;
-
-
-
-}
diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/PvDispatch.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/PvDispatch.java
deleted file mode 100644
index f286e3147..000000000
--- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/PvDispatch.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package com.njcn.device.pms.pojo.po;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.njcn.db.bo.BaseEntity;
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * <p>
- *
- * </p>
- *
- * @author cdf
- * @since 2022-07-05
- */
-@Getter
-@Setter
-@TableName("pv_dispatch")
-public class PvDispatch extends BaseEntity {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 调度表Id
-     */
-    private String id;
-
-    /**
-     * 调度名称
-     */
-    private String name;
-
-
-}
diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/PvDistributed.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/PvDistributed.java
deleted file mode 100644
index 6faecb87f..000000000
--- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/PvDistributed.java
+++ /dev/null
@@ -1,92 +0,0 @@
-package com.njcn.device.pms.pojo.po;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.njcn.db.bo.BaseEntity;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.time.LocalDate;
-
-/**
- * <p>
- *
- * </p>
- *
- * @author cdf
- * @since 2022-07-06
- */
-@Data
-@TableName("pv_distributed")
-@EqualsAndHashCode(callSuper = true)
-public class PvDistributed extends BaseEntity {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 分布式光伏台账表Id
-     */
-    private String id;
-
-
-    /**
-     * 分布式光伏名称
-     */
-    private String name;
-
-
-    private String code;
-
-    /**
-     * 用户编号（与低压用户台账表低压用户编号字段一致）
-     */
-    private String userCode;
-
-    /**
-     * 终端编号
-     */
-    private String devCode;
-
-    /**
-     * 并网电压等级Id，字典表
-     */
-    private String scale;
-
-    /**
-     * 装机容量（KVA）
-     */
-    private Float machineCapacity;
-
-    /**
-     * 上网方式
-     */
-    private String inteType;
-
-    /**
-     * 接入相别
-     */
-    private String phase;
-
-    /**
-     * 储能配置容量（KVA）
-     */
-    private Float energyCapacity;
-
-
-    private String smartSwitch;
-
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    private LocalDate installTime;
-
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    private LocalDate runTime;
-
-    /**
-     * 状态
-     */
-    private Integer state;
-
-
-
-
-}
diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/PvLineDetail.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/PvLineDetail.java
deleted file mode 100644
index 4b06b345c..000000000
--- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/PvLineDetail.java
+++ /dev/null
@@ -1,209 +0,0 @@
-package com.njcn.device.pms.pojo.po;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.njcn.db.bo.BaseEntity;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.time.LocalDate;
-
-/**
- * <p>
- *
- * </p>
- *
- * @author cdf
- * @since 2022-07-05
- */
-@Data
-@TableName("pv_line_detail")
-@EqualsAndHashCode(callSuper = true)
-public class PvLineDetail extends BaseEntity {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 监测点序号
-     */
-    private String id;
-
-    private String name;
-
-    private String code;
-
-    /**
-     * 所属终端
-     */
-    private String devId;
-
-    /**
-     * 监测点类型（I类监测点、II类监测点、III类监测点），字典表
-     */
-    private String type;
-
-    /**
-     * 所属变电站（I类监测点）
-     */
-    private String substationId;
-
-    /**
-     * 所属母线名称（I类监测点）
-     */
-    private String voltageId;
-
-    /**
-     * 所属台区ID（II类监测点）
-     */
-    private String subAreaId;
-
-    private String userCode;
-
-    private Integer userCodeType;
-
-    /**
-     * 电压等级
-     */
-    private String scale;
-
-    /**
-     * 线路号（在同一台设备中的监测点号）
-     */
-    private Integer num;
-
-    /**
-     * PT一次变比
-     */
-    private Float pt1;
-
-    /**
-     * PT二次变比
-     */
-    private Float pt2;
-
-    /**
-     * CT一次变比
-     */
-    private Float ct1;
-
-    /**
-     * CT二次变比
-     */
-    private Float ct2;
-
-    /**
-     * 设备容量
-     */
-    private Float devCapacity;
-
-    /**
-     * 短路容量
-     */
-    private Float shortCapacity;
-
-    /**
-     * 基准容量
-     */
-    private Float standardCapacity;
-
-    /**
-     * 协议容量
-     */
-    private Float dealCapacity;
-
-    /**
-     * 接线类型(0:星型接法;1:三角型接法;2:开口三角型接法)
-     */
-    private String ptType;
-
-    /**
-     * 测量间隔（1-10分钟）
-     */
-    private Integer timeInterval;
-
-    /**
-     * 干扰源类型,字典表
-     */
-    private String loadType;
-
-    /**
-     * 行业类型，字典表
-     */
-    private String businessType;
-
-    /**
-     * 网公司谐波监测平台标志(0-否;1-是)，默认否
-     */
-    private Integer monitorFlag;
-
-    /**
-     * 电网标志（0-电网侧；1-非电网侧）
-     */
-    private Integer powerFlag;
-
-    /**
-     * 国网谐波监测平台监测点号
-     */
-    private String monitorId;
-
-    /**
-     * 监测点对象名称
-     */
-    private String objName;
-
-
-    private String smallName;
-
-    /**
-     * 监测点对象小类
-     */
-    private String bigName;
-
-    /**
-     * 人为干预是否参与统计（0：不参与，1：参与）默认参与统计
-     */
-    private Integer statFlag;
-
-    /**
-     * 备注
-     */
-    private String remark;
-
-    /**
-     * 电压互感器类型，字典表
-     */
-    private String tfType;
-
-    /**
-     * 所属变压器编号
-     */
-    private String tfCode;
-
-    /**
-     * 中性点接地方式，字典表
-     */
-    private String groundType;
-
-    /**
-     * 投运日期
-     */
-    private LocalDate putIn;
-
-    /**
-     * 接入日期
-     */
-    private LocalDate access;
-
-    /**
-     * 是否专项供电（0：否，1：是）默认参与统计
-     */
-    private Integer powerSupply;
-
-    /**
-     * 状态
-     */
-    private Integer state;
-
-
-
-
-}
diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/PvLvUser.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/PvLvUser.java
deleted file mode 100644
index 07e703c2a..000000000
--- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/PvLvUser.java
+++ /dev/null
@@ -1,86 +0,0 @@
-package com.njcn.device.pms.pojo.po;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.njcn.db.bo.BaseEntity;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * <p>
- *
- * </p>
- *
- * @author cdf
- * @since 2022-07-05
- */
-@Data
-@TableName("pv_lv_user")
-@EqualsAndHashCode(callSuper = true)
-public class PvLvUser extends BaseEntity {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 低压用户台账表Id
-     */
-    private String id;
-
-
-    /**
-     * 低压用户编号（营销系统中查出）
-     */
-    private String userCode;
-
-    /**
-     * 低压用户名称
-     */
-    private String name;
-
-    /**
-     * 用户协议容量（kVA）
-     */
-    private Float userCapacity;
-
-    /**
-     * 是否发生过投诉
-     */
-    private Integer complain;
-
-    /**
-     * 投诉内容
-     */
-    private String complainPart;
-
-    /**
-     * 整改措施
-     */
-    private String corrective;
-
-    /**
-     * 是否有治理装置
-     */
-    private Integer devGovern;
-
-    /**
-     * 治理装置类型
-     */
-    private String governType;
-
-    /**
-     * 治理装置电压等级
-     */
-    private String scale;
-
-    /**
-     * 治理装置容量
-     */
-    private Float governCapacity;
-
-    /**
-     * 状态
-     */
-    private Integer state;
-
-
-
-}
diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/PvSubArea.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/PvSubArea.java
deleted file mode 100644
index 5f0a96066..000000000
--- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/PvSubArea.java
+++ /dev/null
@@ -1,114 +0,0 @@
-package com.njcn.device.pms.pojo.po;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.njcn.db.bo.BaseEntity;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * <p>
- *
- * </p>
- *
- * @author cdf
- * @since 2022-07-05
- */
-@Data
-@TableName("pv_sub_area")
-@EqualsAndHashCode(callSuper = true)
-public class PvSubArea extends BaseEntity {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 台区表Id
-     */
-    private String id;
-
-    /**
-     * 所属10kV线路表Id（外键）
-     */
-    private String tenVoltageId;
-
-    /**
-     * 所属单位Id（台区所属的单位和变电站所属单位可能不是一个单位）
-     */
-    private String unitId;
-
-    /**
-     * 台区名称
-     */
-    private String name;
-
-    /**
-     * 台区编号
-     */
-    private String code;
-
-    /**
-     * 电缆长度字段
-     */
-    private Double cableLength;
-
-    /**
-     * 电阻
-     */
-    private Double resistance;
-
-    /**
-     * 电抗
-     */
-    private Double reactance;
-
-    /**
-     * 变压器型号
-     */
-    private String type;
-
-    /**
-     * 变压器容量
-     */
-    private Float capacity;
-
-    /**
-     * 变压器调压方式
-     */
-    private Integer regulationMode;
-
-    /**
-     * 台区无功补偿容量（KVA）
-     */
-    private Float reactCapacity;
-
-    /**
-     * 是否安装智能融合终端
-     */
-    private Integer devFusion;
-
-    /**
-     * 是否有分布式光伏接入
-     */
-    private Integer pv;
-
-    /**
-     * 分布式光伏总装机容量（KVA）
-     */
-    private Float totalC;
-
-    /**
-     * 分布式光伏用户数量
-     */
-    private Integer pvUsers;
-
-    /**
-     * 其他分布式电源装置容量
-     */
-    private Float powerPower;
-
-    /**
-     * 状态
-     */
-    private Integer state;
-
-
-}
diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/PvSubstation.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/PvSubstation.java
deleted file mode 100644
index 430d0230f..000000000
--- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/PvSubstation.java
+++ /dev/null
@@ -1,56 +0,0 @@
-package com.njcn.device.pms.pojo.po;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-
-/**
- * <p>
- *
- * </p>
- *
- * @author cdf
- * @since 2022-07-05
- */
-@Data
-@TableName("pv_substation")
-public class PvSubstation {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 变电站表Id
-     */
-    private String id;
-
-    /**
-     * 所属单位Id
-     */
-    private String unitId;
-
-    /**
-     * 变电站名称
-     */
-    private String name;
-
-    /**
-     * 变电站编号
-     */
-    private String subCode;
-
-    /**
-     * 电压等级Id，字典表
-     */
-    private String scale;
-
-    /**
-     * 变电站总容量（MVA）(手动填写)
-     */
-    private Double totalCapacity;
-
-    /**
-     * 运维班组Code
-     */
-    private String teamCode;
-
-
-}
diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/PvTenVoltage.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/PvTenVoltage.java
deleted file mode 100644
index a2f79afc6..000000000
--- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/PvTenVoltage.java
+++ /dev/null
@@ -1,142 +0,0 @@
-package com.njcn.device.pms.pojo.po;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.njcn.db.bo.BaseEntity;
-import lombok.Data;
-
-import java.time.LocalDateTime;
-
-/**
- * <p>
- *
- * </p>
- *
- * @author cdf
- * @since 2022-07-05
- */
-@Data
-@TableName("pv_ten_voltage")
-public class PvTenVoltage extends BaseEntity {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 线路表Id
-     */
-    private String id;
-
-    /**
-     * 调度表Id（外键）
-     */
-    private String dispatchId;
-
-
-    /**
-     * 线路名称
-     */
-    private String name;
-
-    /**
-     * 线路编号
-     */
-    private String code;
-
-    /**
-     * 跨区域类型
-     */
-    private String crType;
-
-    /**
-     * 电压等级Id，字典表
-     */
-    private String scale;
-
-    /**
-     * 设计电压等级Id，字典表
-     */
-    private String designScale;
-
-    /**
-     * 设备状态
-     */
-    private Integer devStatus;
-
-    /**
-     * 是否接地极(0:false;1:true)
-     */
-    private Boolean earthing;
-
-    /**
-     * 线路性质
-     */
-    private String quality;
-
-    /**
-     * 所属主线
-     */
-    private String masterStroke;
-
-    /**
-     * 专业分类
-     */
-    private String major;
-
-    /**
-     * 设备主人
-     */
-    private String master;
-
-    /**
-     * 起点电站
-     */
-    private String startStation;
-
-    /**
-     * 终点电站
-     */
-    private String endStation;
-
-    /**
-     * 运行负载限额
-     */
-    private Float runLoad;
-
-    /**
-     * 额定输出功率
-     */
-    private Float outputPower;
-
-    /**
-     * 最大允许电流
-     */
-    private Float maxCurrent;
-
-    /**
-     * 投运日期
-     */
-    private LocalDateTime putIntoDate;
-
-    /**
-     * 状态
-     */
-    private Integer state;
-
-    /**
-     * 是否有分布式光伏接入
-     */
-    private Integer pvStatus;
-
-
-    /**
-     * 分布式光伏接入容量
-     */
-    private Integer pvCapacity;
-
-
-    /**
-     * 分布式光伏接入数量
-     */
-    private Integer pvNum;
-
-
-}
diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/PvUnit.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/PvUnit.java
deleted file mode 100644
index c60908558..000000000
--- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/PvUnit.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package com.njcn.device.pms.pojo.po;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Getter;
-import lombok.Setter;
-
-import java.io.Serializable;
-
-/**
- * <p>
- *
- * </p>
- *
- * @author cdf
- * @since 2022-07-05
- */
-@Getter
-@Setter
-@TableName("pv_unit")
-public class PvUnit implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 单位表Id
-     */
-    private String id;
-
-    /**
-     * 父节点（0为根节点）
-     */
-    private String pid;
-
-    /**
-     * 单位名称
-     */
-    private String name;
-
-    /**
-     * 单位编码
-     */
-    private String code;
-
-
-}
diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/PvVoltage.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/PvVoltage.java
deleted file mode 100644
index 1198190a8..000000000
--- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/PvVoltage.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package com.njcn.device.pms.pojo.po;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-
-/**
- * <p>
- *
- * </p>
- *
- * @author cdf
- * @since 2022-07-05
- */
-@Data
-@TableName("pv_voltage")
-public class PvVoltage {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 母线序号
-     */
-    private String id;
-
-
-    /**
-     * 母线名称
-     */
-    private String name;
-
-    /**
-     * 母线号（在同一台设备中的电压通道号）
-     */
-    private Integer num;
-
-    /**
-     * 电压等级Id，字典表
-     */
-    private String scale;
-
-
-
-
-}
diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/PwPmsMonitorPO.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/PwPmsMonitorPO.java
new file mode 100644
index 000000000..e53371d64
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/PwPmsMonitorPO.java
@@ -0,0 +1,16 @@
+package com.njcn.device.pms.pojo.po;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @author yzh
+ * @date 2022/10/27
+ */
+
+@Data
+public class PwPmsMonitorPO implements Serializable {
+
+
+}
diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RMpMonitorAlarmCountM.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RMpMonitorAlarmCountM.java
new file mode 100644
index 000000000..7b69e19ca
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RMpMonitorAlarmCountM.java
@@ -0,0 +1,120 @@
+package com.njcn.device.pms.pojo.po;
+
+import java.io.Serializable;
+import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+/**
+ * @author jianghf
+ * 监测点告警统计-月表
+ * @TableName r_mp_monitor_alarm_count_m
+ */
+@Data
+@TableName("r_mp_monitor_alarm_count_m")
+public class RMpMonitorAlarmCountM implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 单位ID
+     */
+    private String orgNo;
+
+    /**
+     * 生成数据的时间,每月统计一次
+     */
+    private Date dataDate;
+
+    /**
+     * 数据类型(0:主网 1:配网)
+     */
+    private String dataType;
+
+    /**
+     * 监测点ID
+     */
+    private String measurementPointId;
+
+    /**
+     * 电压偏差告警情况(0:否 1:是)
+     */
+    private Integer vdevAlarmInfo;
+
+    /**
+     * 电压偏差严重度
+     */
+    private Integer vdevSeverity;
+
+    /**
+     * 频率偏差告警情况(0:否 1:是)
+     */
+    private Integer freqAlarmInfo;
+
+    /**
+     * 频率偏差严重度
+     */
+    private Integer freqSeverity;
+
+    /**
+     * 三相电压不平衡度告警情况(0:否 1:是)
+     */
+    private Integer unbalanceAlarmInfo;
+
+    /**
+     * 三相电压不平衡严重度
+     */
+    private Integer unbalanceSeverity;
+
+    /**
+     * 谐波电压告警情况(0:否 1:是)
+     */
+    private Integer vAlarmInfo;
+
+    /**
+     * 谐波电压严重度
+     */
+    private Integer vSeverity;
+
+    /**
+     * 闪变告警情况(0:否 1:是)
+     */
+    private Integer flickerAlarmInfo;
+
+    /**
+     * 闪变严重度
+     */
+    private Integer flickerSeverity;
+
+    /**
+     * 电压暂降告警情况(0:否 1:是)
+     */
+    private Integer sagAlarmInfo;
+
+    /**
+     * 电压暂降严重度
+     */
+    private Integer sagSeverity;
+
+    /**
+     * 短时中断告警情况(0:否 1:是)
+     */
+    private Integer interruptAlarmInfo;
+
+    /**
+     * 短时中断严重度
+     */
+    private Integer interruptSeverity;
+
+    /**
+     * 稳态指标评级结果（0 较差 1中等 2较好）
+     */
+    private Integer harmonicTypeGrade;
+
+    /**
+     * 暂态指标评级结果（0 较差 1中等 2较好）
+     */
+    private Integer eventTypeGrade;
+
+}
\ No newline at end of file
diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RMpPwAlarmDetailD.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RMpPwAlarmDetailD.java
new file mode 100644
index 000000000..daa9286ff
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RMpPwAlarmDetailD.java
@@ -0,0 +1,49 @@
+package com.njcn.device.pms.pojo.po;
+
+import java.io.Serializable;
+import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+/**
+ * 告警明细-日表
+ * @TableName r_mp_pw_alarm_detail_d
+ */
+@Data
+@TableName("r_mp_pw_alarm_detail_d")
+public class RMpPwAlarmDetailD implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 生成数据的时间,每日统计一次
+     */
+    private Date dataDate;
+
+    /**
+     * 监测点ID
+     */
+    private String measurementPointId;
+
+    /**
+     * 告警类型
+     */
+    private String alarmType;
+
+    /**
+     * 告警描述
+     */
+    private String alarmInfo;
+
+    /**
+     * 告警持续时间
+     */
+    private Double alarmLastTime;
+
+    /**
+     * 是否已经生成在线监测超标问题(0:否 1:是 默认为否)
+     */
+    private Integer isCreateProblem;
+
+}
\ No newline at end of file
diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RMpTargetWarnD.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RMpTargetWarnD.java
new file mode 100644
index 000000000..ac0c53e18
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RMpTargetWarnD.java
@@ -0,0 +1,82 @@
+package com.njcn.device.pms.pojo.po;
+
+import java.io.Serializable;
+import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+/**
+ * 监测点指标告警明细日表
+ * @TableName r_mp_target_warn_d
+ */
+@Data
+@TableName("r_mp_target_warn_d")
+public class RMpTargetWarnD implements Serializable {
+    /**
+     * 监测点ID
+     */
+    private String measurementPointId;
+
+    /**
+     * 生成数据的时间,每日统计一次
+     */
+    private Date dataDate;
+
+    /**
+     * 是否是有效接入监测点(0:否 1:是)
+     */
+    private Integer isEffective;
+
+    /**
+     * 是否是稳态超标监测点(0:否 1:是)
+     */
+    private Integer isHarmonic;
+
+    /**
+     * 是否是发生暂态的监测点(0:否 1:是)
+     */
+    private Integer isEvent;
+
+    /**
+     * 是否是告警监测点数(0:否 1:是)
+     */
+    private Integer isWarn;
+
+    /**
+     * 电压偏差是否告警(0:否 1:是)
+     */
+    private Integer isVDevWarn;
+
+    /**
+     * 频率偏差是否告警(0:否 1:是)
+     */
+    private Integer isFreqWarn;
+
+    /**
+     * 三相电压不平衡度是否告警(0:否 1:是)
+     */
+    private Integer isUnbalanceWarn;
+
+    /**
+     * 谐波电压是否告警(0:否 1:是)
+     */
+    private Integer isVWarn;
+
+    /**
+     * 闪变是否告警(0:否 1:是)
+     */
+    private Integer isFlickerWarn;
+
+    /**
+     * 电压暂降是否告警(0:否 1:是)
+     */
+    private Integer isSagWarn;
+
+    /**
+     * 短时中断是否告警(0:否 1:是)
+     */
+    private Integer isInterruptWarn;
+
+    private static final long serialVersionUID = 1L;
+}
\ No newline at end of file
diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RStatAreaAlarmCountM.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RStatAreaAlarmCountM.java
new file mode 100644
index 000000000..5ca6f4f6b
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RStatAreaAlarmCountM.java
@@ -0,0 +1,115 @@
+package com.njcn.device.pms.pojo.po;
+
+import java.io.Serializable;
+import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+/**
+ * 区域告警统计(月)
+ * @TableName r_stat_area_alarm_count_m
+ */
+@Data
+@TableName("r_stat_area_alarm_count_m")
+public class RStatAreaAlarmCountM implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 单位ID
+     */
+    private String orgNo;
+
+    /**
+     * 生成数据的时间,每月统计一次
+     */
+    private Date dataDate;
+
+    /**
+     * 数据类型(0:主网 1:配网)
+     */
+    private String dataType;
+
+    /**
+     * 电压偏差告警情况(0:否 1:是)
+     */
+    private Integer vdevAlarmInfo;
+
+    /**
+     * 电压偏差告警超标占比
+     */
+    private Integer vdevAlarmRatio;
+
+    /**
+     * 频率偏差告警情况(0:否 1:是)
+     */
+    private Integer freqAlarmInfo;
+
+    /**
+     * 频率偏差告警超标占比
+     */
+    private Integer freqAlarmRatio;
+
+    /**
+     * 三相电压不平衡度告警情况(0:否 1:是)
+     */
+    private Integer unbalanceAlarmInfo;
+
+    /**
+     * 三相电压不平衡度告警超标占比
+     */
+    private Integer unbalanceAlarmRatio;
+
+    /**
+     * 谐波电压告警情况(0:否 1:是)
+     */
+    private Integer vAlarmInfo;
+
+    /**
+     * 谐波电压告警超标占比
+     */
+    private Integer vAlarmRatio;
+
+    /**
+     * 闪变告警情况(0:否 1:是)
+     */
+    private Integer flickerAlarmInfo;
+
+    /**
+     * 闪变告警超标占比
+     */
+    private Integer flickerAlarmRatio;
+
+    /**
+     * 电压暂降告警情况(0:否 1:是)
+     */
+    private Integer sagAlarmInfo;
+
+    /**
+     * 电压暂降告警平均发生次数
+     */
+    private Integer sagAlarmAvgCount;
+
+    /**
+     * 短时中断告警情况(0:否 1:是)
+     */
+    private Integer interruptAlarmInfo;
+
+    /**
+     * 短时中断告警平均发生次数
+     */
+    private Integer interruptAlarmAvgCount;
+
+    /**
+     * 稳态指标评级结果（0 较差 1中等 2较好）
+     */
+    private Integer harmonicTypeGrade;
+
+    /**
+     * 暂态指标评级结果（0 较差 1中等 2较好）
+     */
+    private Integer eventTypeGrade;
+
+
+}
\ No newline at end of file
diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RStatBusbarHarmonicPO.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RStatBusbarHarmonicPO.java
new file mode 100644
index 000000000..6ed24f82d
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RStatBusbarHarmonicPO.java
@@ -0,0 +1,92 @@
+package com.njcn.device.pms.pojo.po;
+
+import lombok.Data;
+
+import java.util.Date;
+import java.io.Serializable;
+
+/**
+ * (RStatBusbarHarmonicY)实体类
+ *
+ * @author yzh
+ * @since 2022-10-12 18:38:16
+ */
+@Data
+public class RStatBusbarHarmonicPO implements Serializable {
+    private static final long serialVersionUID = 398744755685851294L;
+    /**
+     * 母线ID
+     */
+    private String busbarId;
+    /**
+     * 生成数据的时间,每年统计一次
+     */
+    private Date dataDate;
+    /**
+     * 电压有效值最大
+     */
+    private Double vEffectiveMax;
+    /**
+     * 电压有效值最小
+     */
+    private Double vEffectiveMin;
+    /**
+     * 电压有效值平均
+     */
+    private Double vEffectiveAvg;
+    /**
+     * 电压有效值95概率大值
+     */
+    private Double vEffective95;
+    /**
+     * 电压总谐波畸变率最大
+     */
+    private Double vThdMax;
+    /**
+     * 电压总谐波畸变率最小
+     */
+    private Double vThdMin;
+    /**
+     * 电压总谐波畸变率平均
+     */
+    private Double vThdAvg;
+    /**
+     * 电压总谐波畸变率95概率大值
+     */
+    private Double vThd95;
+    /**
+     * 三相电压不平衡最大
+     */
+    private Double unbalanceMax;
+    /**
+     * 三相电压不平衡最小
+     */
+    private Double unbalanceMin;
+    /**
+     * 三相电压不平衡平均
+     */
+    private Double unbalanceAvg;
+    /**
+     * 三相电压不平衡95概率大值
+     */
+    private Double unbalance95;
+    /**
+     * 闪变最大
+     */
+    private Double flickerMax;
+    /**
+     * 闪变最小
+     */
+    private Double flickerMin;
+    /**
+     * 闪变平均
+     */
+    private Double flickerAvg;
+    /**
+     * 闪变95概率大值
+     */
+    private Double flicker95;
+
+
+}
+
diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RStatEventOrgPO.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RStatEventOrgPO.java
new file mode 100644
index 000000000..690681743
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RStatEventOrgPO.java
@@ -0,0 +1,82 @@
+package com.njcn.device.pms.pojo.po;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 监测点暂态指标数据统计表(RStatEventOrg)实体类
+ *
+ * @author yzh
+ * @since 2022-10-12 18:15:26
+ */
+
+@Data
+@ApiModel("监测点暂态指标数据统计表")
+public class RStatEventOrgPO implements Serializable {
+    private static final long serialVersionUID = -15971491825708754L;
+    /**
+     * 单位ID
+     */
+    @ApiModelProperty(name = "orgNo",value = "单位ID")
+    private String orgNo;
+
+    /**
+     * 生成数据的时间,每年统计一次
+     */
+    @ApiModelProperty(name = "dataDate",value = "生成数据的时间,每年统计一次")
+    private Date dataDate;
+
+    /**
+     * 稳态指标类型Id，字典表ID
+     */
+    @ApiModelProperty(name = "eventType",value = "稳态指标类型Id，字典表ID")
+    private String eventType;
+
+    /**
+     * 日均发生暂态监测点数（根据 发生暂态监测点数 取平均值)
+     */
+    @ApiModelProperty(name = "eventMeasurementAverage",value = "日均发生暂态监测点数（根据 发生暂态监测点数 取平均值)")
+    private Integer eventMeasurementAverage;
+
+    /**
+     * 累计发生暂态监测点数（监测点暂态指标超标明细日表
+     */
+    @ApiModelProperty(name = "eventMeasurementAccrued",value = "累计发生暂态监测点数（监测点暂态指标超标明细日表)")
+    private Integer eventMeasurementAccrued;
+
+    /**
+     * 暂态指标发生频次（日表的暂态指标发生次数之和/日表的发生暂态监测点数之和）
+     */
+    @ApiModelProperty(name = "eventFreq",value = "暂态指标发生频次（日表的暂态指标发生次数之和/日表的发生暂态监测点数之和）")
+    private Double eventFreq;
+
+    /**
+     * 暂态指标发生次数（日表的暂态指标发生次数之和）
+     */
+    @ApiModelProperty(name = "eventCount",value = "暂态指标发生次数（日表的暂态指标发生次数之和）")
+    private Integer eventCount;
+
+    /**
+     * 日均发生暂态监测点数占比（根据 日均发生暂态监测点数占比 取平均值）
+     */
+    @ApiModelProperty(name = "eventMeasurementRatioAverage",value = "日均发生暂态监测点数占比（根据 日均发生暂态监测点数占比 取平均值）")
+    private Double eventMeasurementRatioAverage;
+
+    /**
+     * 累计发生暂态监测点数占比（此表的累计发生暂态监测点数/区域统计表中的区域分类统计月表中的发生暂态的监测点数）
+     */
+    @ApiModelProperty(name = "eventMeasurementRatioAccrued",value = "累计发生暂态监测点数占比（此表的累计发生暂态监测点数/区域统计表中的区域分类统计月表中的发生暂态的监测点数）")
+    private Double eventMeasurementRatioAccrued;
+
+    /**
+     * 数据类型,字典表（01：主网测点  02：配网测点）
+     */
+    @ApiModelProperty(name = "dataType",value = "数据类型,字典表（01：主网测点  02：配网测点）")
+    private String dataType;
+
+}
+
diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RStatOrgPO.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RStatOrgPO.java
new file mode 100644
index 000000000..0766b6d80
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RStatOrgPO.java
@@ -0,0 +1,104 @@
+package com.njcn.device.pms.pojo.po;
+
+import lombok.Data;
+
+import java.util.Date;
+import java.io.Serializable;
+
+/**
+ * 区域分类统计年表(RStatOrgY)实体类
+ *
+ * @author yzh
+ * @since 2022-10-12 18:37:24
+ */
+@Data
+public class RStatOrgPO implements Serializable {
+    private static final long serialVersionUID = -49993470994002009L;
+    /**
+     * 单位ID
+     */
+    private String orgNo;
+    /**
+     * 生成数据的时间,每年统计一次
+     */
+    private Date dataDate;
+    /**
+     * 监测点类别ID、监测对象类型ID
+     */
+    private String measurementTypeClass;
+    /**
+     * 总监测点数
+     */
+    private Integer allCount;
+    /**
+     * 日均有效接入监测点数
+     */
+    private Integer effectiveMeasurementAverage;
+    /**
+     * 累计有效接入监测点数
+     */
+    private Integer effectiveMeasurementAccrued;
+    /**
+     * 日均稳态超标监测点数
+     */
+    private Integer overLimitMeasurementAverage;
+    /**
+     * 累计稳态超标监测点数
+     */
+    private Integer overLimitMeasurementAccrued;
+    /**
+     * 日均稳态超标监测点数占比
+     */
+    private Integer harmonicMeasurementRatioAverage;
+    /**
+     * 稳态指标平均超标天数
+     */
+    private Double averageOverDay;
+    /**
+     * 频率偏差合格率
+     */
+    private Double freqPassRate;
+    /**
+     * 电压偏差合格率
+     */
+    private Double vDevPassRate;
+    /**
+     * 闪变合格率
+     */
+    private Double flickerPassRate;
+    /**
+     * 日均监测到暂态指标的监测点数
+     */
+    private Integer eventMeasurementAverage;
+    /**
+     * 累计监测到暂态指标的监测点数
+     */
+    private Integer eventMeasurementAccrued;
+    /**
+     * 日均暂态超标监测点数占比
+     */
+    private Integer eventMeasurementRatioAverage;
+    /**
+     * 暂态指标发生频次
+     */
+    private Double eventFreq;
+    /**
+     * 暂态指标发生次数
+     */
+    private Integer eventCount;
+    /**
+     * 应设点数
+     */
+    private Integer shouldCount;
+    /**
+     * 告警监测点数
+     */
+    private Integer warnCount;
+    /**
+     * 数据类型,字典表（01：主网测点  02：配网测点）
+     */
+    private String dataType;
+
+
+}
+
diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RStatSubstationPO.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RStatSubstationPO.java
new file mode 100644
index 000000000..7b9790247
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RStatSubstationPO.java
@@ -0,0 +1,103 @@
+package com.njcn.device.pms.pojo.po;
+
+import lombok.Data;
+
+import java.util.Date;
+import java.io.Serializable;
+
+/**
+ * (RStatSubstationY)实体类
+ *
+ * @author yzh
+ * @since 2022-10-12 18:39:03
+ */
+@Data
+public class RStatSubstationPO implements Serializable {
+    private static final long serialVersionUID = -98896978437277100L;
+    /**
+     * 生成数据的时间,每年统计一次
+     */
+    private Date dataDate;
+    /**
+     * 变电站id
+     */
+    private Integer substationId;
+    /**
+     * 日均有效接入监测点数
+     */
+    private Integer effectiveMeasurementAverage;
+    /**
+     * 累计有效接入监测点数
+     */
+    private Integer effectiveMeasurementAccrued;
+    /**
+     * 稳态平均超标天数
+     */
+    private Double harmonicOverDay;
+    /**
+     * 频率偏差平均超标天数
+     */
+    private Double freqAverageOverDay;
+    /**
+     * 电压偏差平均超标天数
+     */
+    private Double vDevAverageOverDay;
+    /**
+     * 谐波电压平均超标天数
+     */
+    private Double vAverageOverDay;
+    /**
+     * 谐波电流平均超标天数
+     */
+    private Double iAverageOverDay;
+    /**
+     * 三相电压不平衡平均超标天数
+     */
+    private Double unbalanceAverageOverDay;
+    /**
+     * 负序电流平均超标天数
+     */
+    private Double iNegAverageOverDay;
+    /**
+     * 闪变平均超标天数
+     */
+    private Double flickerAverageOverDay;
+    /**
+     * 间谐波电压平均超标天数
+     */
+    private Double inuharmAverageOverDay;
+    /**
+     * 暂态指标发生次数
+     */
+    private Integer eventCount;
+    /**
+     * 暂态指标发生频次
+     */
+    private Double eventFreq;
+    /**
+     * 电压暂降发生次数
+     */
+    private Integer sagCount;
+    /**
+     * 电压暂降发生频次
+     */
+    private Double sagFreq;
+    /**
+     * 电压暂升发生次数
+     */
+    private Integer swellCount;
+    /**
+     * 电压暂升发生频次
+     */
+    private Double swellFreq;
+    /**
+     * 短时中断发生次数
+     */
+    private Integer interruptCount;
+    /**
+     * 短时中断发生频次
+     */
+    private Double interruptFreq;
+
+}
+
diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RStatZwAlarmCountW.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RStatZwAlarmCountW.java
new file mode 100644
index 000000000..87230c2b7
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RStatZwAlarmCountW.java
@@ -0,0 +1,45 @@
+package com.njcn.device.pms.pojo.po;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 
+ * @TableName r_stat_zw_alarm_count_w
+ */
+@Data
+@TableName("r_stat_zw_alarm_count_w")
+public class RStatZwAlarmCountW implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 单位ID
+     */
+    private String orgNo;
+
+    /**
+     * 生成数据的时间,每周统计一次
+     */
+    private Date dataDate;
+
+    /**
+     * 有效监测点数量
+     */
+    private Integer monitorEffectiveCount;
+
+    /**
+     * 告警4次及以上监测点数量
+     */
+    private Integer warnMonitorCount;
+
+    /**
+     * 级别较差监测点数量
+     */
+    private Integer monitorGradeCount;
+
+}
\ No newline at end of file
diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RmpEventDetailPO.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RmpEventDetailPO.java
new file mode 100644
index 000000000..1f9cb91bb
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RmpEventDetailPO.java
@@ -0,0 +1,55 @@
+package com.njcn.device.pms.pojo.po;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * (RMpEventDetail)实体类
+ *
+ * @author yzh
+ * @since 2022-10-12 18:34:55
+ */
+@Data
+public class RmpEventDetailPO implements Serializable {
+    private static final long serialVersionUID = 717547299960041571L;
+    /**
+     * 暂时事件ID
+     */
+    private String eventId;
+    /**
+     * 监测点ID
+     */
+    private String measurementPointId;
+    /**
+     * 事件类型
+     */
+    private String eventType;
+    /**
+     * 开始时间
+     */
+    private Long startTime;
+    /**
+     * 持续时间
+     */
+    private Double duration;
+    /**
+     * 特征幅值
+     */
+    private Double featureAmplitude;
+    /**
+     * 相别
+     */
+    private String phase;
+    /**
+     * 事件描述
+     */
+    private String eventDescribe;
+    /**
+     * 波形路径
+     */
+    private String wavePath;
+
+
+}
+
diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/SourceManagement.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/SourceManagement.java
new file mode 100644
index 000000000..b936bb6bf
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/SourceManagement.java
@@ -0,0 +1,141 @@
+package com.njcn.device.pms.pojo.po;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.njcn.db.bo.BaseEntity;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author hongawen
+ * @since 2022-10-14
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("pms_source_management")
+public class SourceManagement extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 用户台帐编号
+     */
+    private String sourceId;
+
+    /**
+     * 用户名称
+     */
+    private String sourceName;
+
+    /**
+     * 组织机构名称
+     */
+    private String orgName;
+
+    /**
+     * 组织机构ID
+     */
+    private String orgId;
+
+    /**
+     * 干扰源类型(字典)
+     */
+    private String sourceType;
+
+    /**
+     * 送电日期（并网日期）
+     */
+    private LocalDate powerTransmissionDate;
+
+    /**
+     * 合同容量（总装机容量）
+     */
+    private BigDecimal userAgreementCapacity;
+
+    /**
+     * 入网评估是否超标：0-否；1-是；
+     */
+    private String ifOverproof;
+
+    /**
+     * 超标指标(字典)
+     */
+    private String overproofTarget;
+
+    /**
+     * 计划采取措施
+     */
+    private String planningDiscipline;
+
+    /**
+     * 入网评估报告
+     */
+    private String networkAccessEvaluationId;
+
+    /**
+     * 入网评估报告上传时间
+     */
+    private LocalDateTime networkAccessEvaluationDate;
+
+    /**
+     * 实测报告
+     */
+    private String testReportId;
+
+    /**
+     * 测试报告是否超标：0-否；1-是；
+     */
+    private String ifTestReportProof;
+
+    /**
+     * 实测超标指标
+     */
+    private String testTarget;
+
+    /**
+     * 测试报告上传时间
+     */
+    private LocalDateTime testReportDate;
+
+    /**
+     * 建档时间
+     */
+    private LocalDate filingDate;
+
+    /**
+     * 数据状态：0-删除；1-正常； 
+     */
+    private Boolean status;
+
+    /**
+     * 创建用户
+     */
+    private String createBy;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createTime;
+
+    /**
+     * 更新用户
+     */
+    private String updateBy;
+
+    /**
+     * 更新时间
+     */
+    private LocalDateTime updateTime;
+
+
+}
diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/StatationStat.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/StatationStat.java
new file mode 100644
index 000000000..366cc73bc
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/StatationStat.java
@@ -0,0 +1,60 @@
+package com.njcn.device.pms.pojo.po;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.njcn.db.bo.BaseEntity;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author hongawen
+ * @since 2022-10-14
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("pms_statation_stat")
+public class StatationStat extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 电站编号
+     */
+    private String powerId;
+
+    /**
+     * 电站名称
+     */
+    private String powerName;
+
+    /**
+     * 机构组织id
+     */
+    private String orgId;
+
+    /**
+     * 应设点数量
+     */
+    private Integer shouldBeNum;
+
+    /**
+     * 电压等级(字典)
+     */
+    private String voltageLevel;
+
+    /**
+     * 数据状态：0-删除；1-正常；
+     */
+    private Boolean status;
+
+
+
+}
diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/StatisticsRunMonitor.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/StatisticsRunMonitor.java
new file mode 100644
index 000000000..6254db509
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/StatisticsRunMonitor.java
@@ -0,0 +1,119 @@
+package com.njcn.device.pms.pojo.po;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.njcn.db.bo.BaseEntity;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author hongawen
+ * @since 2022-10-14
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("pms_statistics_run_monitor")
+public class StatisticsRunMonitor extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 组织机构名称
+     */
+    private String orgName;
+
+    /**
+     * 组织机构ID(外键)
+     */
+    private String orgId;
+
+    /**
+     * 电压等级(字典)
+     */
+    private String voltageLevel;
+
+    /**
+     * 母线数量
+     */
+    private Integer generatrixSum;
+
+    /**
+     * 线路总数
+     */
+    private Integer lineNum;
+
+    /**
+     * 接入分布式光伏的线路总数
+     */
+    private Integer photovoltaicLineNum;
+
+    /**
+     * 台区总数
+     */
+    private Integer platformNum;
+
+    /**
+     * 光伏台区总数
+     */
+    private Integer photovoltaicCourtsNum;
+
+    /**
+     * 光伏容量超过台区容量25%的台区总数
+     */
+    private Integer exceedCourtscapNum;
+
+    /**
+     * 风电用户总数
+     */
+    private Integer windPowerNum;
+
+    /**
+     * 光伏用户总数
+     */
+    private Integer pvNum;
+
+    /**
+     * 冶炼负荷用户总数
+     */
+    private Integer smeltingLoadNum;
+
+    /**
+     * 日期
+     */
+    private LocalDateTime dataDate;
+
+    /**
+     * 数据状态：0-删除；1-正常； 
+     */
+    private Boolean status;
+
+    /**
+     * 创建用户
+     */
+    private String createBy;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createTime;
+
+    /**
+     * 更新用户
+     */
+    private String updateBy;
+
+    /**
+     * 更新时间
+     */
+    private LocalDateTime updateTime;
+
+
+}
diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/Terminal.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/Terminal.java
new file mode 100644
index 000000000..755078490
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/Terminal.java
@@ -0,0 +1,145 @@
+package com.njcn.device.pms.pojo.po;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.njcn.db.bo.BaseEntity;
+import java.io.Serializable;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author hongawen
+ * @since 2022-10-14
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("pms_terminal")
+public class Terminal extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 终端编号
+     */
+    private String id;
+
+    /**
+     * 终端名称
+     */
+    private String name;
+
+    /**
+     * 组织机构名称
+     */
+    private String orgName;
+
+    /**
+     * 组织机构ID(外键)
+     */
+    private String orgId;
+
+    /**
+     * 运维单位名称
+     */
+    private String operationName;
+
+    /**
+     * 运维单位ID(外键)
+     */
+    private String operationId;
+
+    /**
+     * 变电站名称
+     */
+    private String powerrName;
+
+    /**
+     * 所属电站ID(外键)
+     */
+    private String powerStationId;
+
+    /**
+     * 终端状态(字典)
+     */
+    private String terminalState;
+
+    /**
+     * 终端级别(字典)
+     */
+    private String terminalLevel;
+
+    /**
+     * 装置型号(字典)
+     */
+    private String deviceModel;
+
+    /**
+     * 生产厂家(字典)
+     */
+    private String manufacture;
+
+    /**
+     * 检定日期
+     */
+    private LocalDate verificationDate;
+
+    /**
+     * 投运日期
+     */
+    private LocalDate useDate;
+
+    /**
+     * 测量信号输入形式(字典)
+     */
+    private String inputType;
+
+    /**
+     * IP地址
+     */
+    private String ip;
+
+    /**
+     * 通信端口
+     */
+    private String port;
+
+    /**
+     * 是否是上送国网监测点,0-否 1-是
+     */
+    private Integer isUpToGrid;
+
+    /**
+     * 数据状态：0-删除；1-正常； 
+     */
+    private Integer status;
+
+    /**
+     * 创建用户
+     */
+    private String createBy;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createTime;
+
+    /**
+     * 更新用户
+     */
+    private String updateBy;
+
+    /**
+     * 更新时间
+     */
+    private LocalDateTime updateTime;
+
+
+}
diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/TerminalEliminateData.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/TerminalEliminateData.java
new file mode 100644
index 000000000..9c107414e
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/TerminalEliminateData.java
@@ -0,0 +1,57 @@
+package com.njcn.device.pms.pojo.po;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.njcn.db.bo.BaseEntity;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author hongawen
+ * @since 2022-10-14
+ */
+@Data
+@TableName("pms_terminal_eliminate_data")
+public class TerminalEliminateData {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 监测终端编号
+     */
+    private String terminalId;
+
+    /**
+     * 故障时间
+     */
+    private LocalDateTime defectTime;
+
+    /**
+     * 故障类型(字典)
+     */
+    private String defectType;
+
+    /**
+     * 是否消缺：0-否；1-是；
+     */
+    private Boolean ifDefectRectify;
+
+    /**
+     * 消缺时间
+     */
+    private LocalDateTime defectHandlingTime;
+
+    /**
+     * 消缺措施
+     */
+    private String defectTreatment;
+
+
+}
diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/TractionStation.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/TractionStation.java
new file mode 100644
index 000000000..5ccdb1ce6
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/TractionStation.java
@@ -0,0 +1,144 @@
+package com.njcn.device.pms.pojo.po;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.njcn.db.bo.BaseEntity;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author hongawen
+ * @since 2022-10-14
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("pms_traction_station")
+public class TractionStation extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 牵引站编号
+     */
+    private String id;
+
+    /**
+     * 牵引站名称
+     */
+    private String name;
+
+    /**
+     * 组织机构名称
+     */
+    private String orgName;
+
+    /**
+     * 组织机构ID(外键)
+     */
+    private String orgId;
+
+    /**
+     * 运维单位名称
+     */
+    private String operationName;
+
+    /**
+     * 运维单位ID(外键)
+     */
+    private String operationId;
+
+    /**
+     * 供电电压等级(字典)
+     */
+    private String voltageLevel;
+
+    /**
+     * 铁路线路编号
+     */
+    private String railwayLineId;
+
+    /**
+     * 铁路线路名称
+     */
+    private String railwayLineName;
+
+    /**
+     * 牵引站变压器接线方式(字典)
+     */
+    private String connetGroupWay;
+
+    /**
+     * 牵引站变电容量
+     */
+    private Float ratedCapacity;
+
+    /**
+     * 供电变电站编号
+     */
+    private String powerId;
+
+    /**
+     * 供电变电站名称
+     */
+    private String powerName;
+
+    /**
+     * 供电变电站电压等级(字典)
+     */
+    private String powerVoltageLevel;
+
+    /**
+     * 是否专线供电：0-否；1-是；
+     */
+    private Integer ifSpecial;
+
+    /**
+     * 创建日期
+     */
+    private LocalDateTime createdDate;
+
+    /**
+     * 用户标签
+     */
+    private String userTag;
+
+    /**
+     * 是否是上送国网监测点,0-否 1-是
+     */
+    private Integer isUpToGrid;
+
+    /**
+     * 数据状态：0-删除；1-正常； 
+     */
+    private Integer status;
+
+    /**
+     * 创建用户
+     */
+    private String createBy;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createTime;
+
+    /**
+     * 更新用户
+     */
+    private String updateBy;
+
+    /**
+     * 更新时间
+     */
+    private LocalDateTime updateTime;
+
+
+}
diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/TransientStasticData.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/TransientStasticData.java
new file mode 100644
index 000000000..99178f0ca
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/TransientStasticData.java
@@ -0,0 +1,62 @@
+package com.njcn.device.pms.pojo.po;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.njcn.db.bo.BaseEntity;
+import java.io.Serializable;
+import java.time.LocalDate;
+
+import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author hongawen
+ * @since 2022-10-14
+ */
+@Data
+@TableName("pms_transient_stastic_data")
+public class TransientStasticData {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 组织机构名称
+     */
+    private String orgName;
+
+    /**
+     * 组织机构ID(外键)
+     */
+    private String orgId;
+
+    /**
+     * 监测点编号(外键)
+     */
+    private String monitorId;
+
+    /**
+     * 持续时间
+     */
+    private Float durationTag;
+
+    /**
+     * 特征幅值
+     */
+    private Float featureAmplitudeTag;
+
+    /**
+     * 发生次数
+     */
+    private Integer frequency;
+
+    /**
+     * 日期
+     */
+    private LocalDate dataDate;
+
+
+}
diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/TreatTransientDetailData.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/TreatTransientDetailData.java
new file mode 100644
index 000000000..e1a63f5a0
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/TreatTransientDetailData.java
@@ -0,0 +1,67 @@
+package com.njcn.device.pms.pojo.po;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.njcn.db.bo.BaseEntity;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author hongawen
+ * @since 2022-10-14
+ */
+@Data
+@TableName("pms_treat_transient_detail_data")
+public class TreatTransientDetailData {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 监测点编号
+     */
+    private String monitorId;
+
+    /**
+     * 组织机构名称
+     */
+    private String orgName;
+
+    /**
+     * 组织机构ID(外键)
+     */
+    private String orgId;
+
+    /**
+     * 事件类型(字典)
+     */
+    private String eventType;
+
+    /**
+     * 开始时间
+     */
+    private LocalDateTime startTime;
+
+    /**
+     * 持续时间
+     */
+    private Float duration;
+
+    /**
+     * 特征幅值
+     */
+    private Float featureAmplitude;
+
+    /**
+     * 相别(字典)
+     */
+    private String phase;
+
+
+}
diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/DeviceRunExVO.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/DeviceRunExVO.java
deleted file mode 100644
index a814cb385..000000000
--- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/DeviceRunExVO.java
+++ /dev/null
@@ -1,71 +0,0 @@
-package com.njcn.device.pms.pojo.vo;
-
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * 终端运行异常列表信息
- *
- * @author yangj
- * @date 2022/09/08
- */
-@Data
-public class DeviceRunExVO implements Serializable {
-
-
-
-    /**
-     * 日期
-     */
-    @ApiModelProperty("日期")
-    @JsonFormat(shape = JsonFormat.Shape.STRING,pattern = "yyyy-MM-dd",timezone = "GMT+8")
-    private String time;
-
-
-    /**
-     * 告警描述
-     */
-    @ApiModelProperty("告警描述")
-    private String alarmDesc;
-
-    /**
-     * 告警统计
-     */
-    @ApiModelProperty("告警统计")
-    private Long alarmNum;
-
-    /**
-     * 中断描述
-     */
-    @ApiModelProperty("中断描述")
-    private String comOutDesc;
-
-    /**
-     * 中断统计
-     */
-    @ApiModelProperty("中断统计")
-    private Long comOutNum;
-
-    /**
-     * 终端id
-     */
-    @ApiModelProperty("终端id")
-    private String devId;
-
-    /**
-     * 终端流量
-     */
-    @ApiModelProperty("终端流量")
-    private Long flowNum;
-
-    private Long flowStand;
-
-    private Long overLimit;
-
-    private Integer state;
-
-}
diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/DisOrLvVO.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/DisOrLvVO.java
deleted file mode 100644
index d6d31b015..000000000
--- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/DisOrLvVO.java
+++ /dev/null
@@ -1,124 +0,0 @@
-package com.njcn.device.pms.pojo.vo;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
-
-import java.time.LocalDate;
-
-/**
- * pqs
- *
- * @author cdf
- * @date 2022/7/28
- */
-@Data
-public class DisOrLvVO {
-    /**
-     * 低压用户台账表Id
-     */
-    private String id;
-
-
-    /**
-     * 低压用户编号（营销系统中查出）
-     */
-    private String userCode;
-
-    /**
-     * 低压用户名称
-     */
-    private String name;
-
-    /**
-     * 用户协议容量（kVA）
-     */
-    private Float userCapacity;
-
-    /**
-     * 是否发生过投诉
-     */
-    private Integer complain;
-
-    /**
-     * 投诉内容
-     */
-    private String complainPart;
-
-    /**
-     * 整改措施
-     */
-    private String corrective;
-
-    /**
-     * 是否有治理装置
-     */
-    private Integer devGovern;
-
-    /**
-     * 治理装置类型
-     */
-    private String governType;
-
-    /**
-     * 治理装置电压等级
-     */
-    private String scale;
-
-    private String scaleName;
-
-    /**
-     * 治理装置容量
-     */
-    private Float governCapacity;
-
-    /**
-     * 状态
-     */
-    private Integer state;
-
-
-
-
-
-
-
-
-    private String code;
-
-    /**
-     * 终端编号
-     */
-    private String devCode;
-
-
-    /**
-     * 装机容量（KVA）
-     */
-    private Float machineCapacity;
-
-    /**
-     * 上网方式
-     */
-    private String inteType;
-
-    /**
-     * 接入相别
-     */
-    private String phase;
-
-    /**
-     * 储能配置容量（KVA）
-     */
-    private Float energyCapacity;
-
-
-    private String smartSwitch;
-
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    private LocalDate installTime;
-
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    private LocalDate runTime;
-
-
-}
diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/PmsMonitorVO.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/PmsMonitorVO.java
new file mode 100644
index 000000000..e7f7184ff
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/PmsMonitorVO.java
@@ -0,0 +1,234 @@
+package com.njcn.device.pms.pojo.vo;
+
+import java.io.Serializable;
+import java.util.Date;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 
+ * @TableName pms_monitor
+ */
+@Data
+public class PmsMonitorVO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 监测点ID
+     */
+    @ApiModelProperty(name = "id", value = "监测点ID")
+    private String id;
+
+    /**
+     * 监测点名称
+     */
+    @ApiModelProperty(name = "name", value = "监测点名称")
+    private String name;
+
+    /**
+     * 组织机构名称
+     */
+    @ApiModelProperty(name = "orgName", value = "组织机构名称")
+    private String orgName;
+
+    /**
+     * 组织机构ID(外键)
+     */
+    @ApiModelProperty(name = "orgId", value = "组织机构ID(外键)")
+    private String orgId;
+
+    /**
+     * 运维单位名称
+     */
+    @ApiModelProperty(name = "operationName", value = "运维单位名称")
+    private String operationName;
+
+    /**
+     * 运维单位ID(外键)
+     */
+    @ApiModelProperty(name = "operationId", value = "运维单位ID(外键)")
+    private String operationId;
+
+    /**
+     * 变电站名称
+     */
+    @ApiModelProperty(name = "powerrName", value = "变电站名称")
+    private String powerrName;
+
+    /**
+     * 电站ID(外键)
+     */
+    @ApiModelProperty(name = "powerrId", value = "电站ID(外键)")
+    private String powerrId;
+
+    /**
+     * 母线名称
+     */
+    @ApiModelProperty(name = "generatrixName", value = "母线名称")
+    private String generatrixName;
+
+    /**
+     * 母线ID(外键)
+     */
+    @ApiModelProperty(name = "generatrixId", value = "母线ID(外键)")
+    private String generatrixId;
+
+    /**
+     * 监测线路名称
+     */
+    @ApiModelProperty(name = "lineName", value = "监测线路名称")
+    private String lineName;
+
+    /**
+     * 监测线路ID
+     */
+    @ApiModelProperty(name = "lineId", value = "监测线路ID")
+    private String lineId;
+
+    /**
+     * 电压等级(字典)
+     */
+    @ApiModelProperty(name = "voltageLevel", value = "电压等级(字典)")
+    private String voltageLevel;
+
+    /**
+     * 监测点状态(字典)
+     */
+    @ApiModelProperty(name = "monitorState", value = "监测点状态(字典)")
+    private String monitorState;
+
+    /**
+     * 监测点类型
+     */
+    @ApiModelProperty(name = "monitorType", value = "监测点类型")
+    private String monitorType;
+
+    /**
+     * 最小短路容量
+     */
+    @ApiModelProperty(name = "minShortCircuitCapacity", value = "最小短路容量")
+    private Double minShortCircuitCapacity;
+
+    /**
+     * 供电设备容量
+     */
+    @ApiModelProperty(name = "powerSupplyEqCapacity", value = "供电设备容量")
+    private Double powerSupplyEqCapacity;
+
+    /**
+     * 用户协议容量
+     */
+    @ApiModelProperty(name = "userAgreementCapacity", value = "用户协议容量")
+    private Double userAgreementCapacity;
+
+    /**
+     * 电压偏差限值（上）
+     */
+    @ApiModelProperty(name = "voltageDeviationUpperLimit", value = "电压偏差限值（上）")
+    private Double voltageDeviationUpperLimit;
+
+    /**
+     * 电压偏差限值（下）
+     */
+    @ApiModelProperty(name = "voltageDeviationLowerLimit", value = "电压偏差限值（下）")
+    private Double voltageDeviationLowerLimit;
+
+    /**
+     * 电压互感器类型(字典)
+     */
+    @ApiModelProperty(name = "potentialTransFormerType", value = "电压互感器类型(字典)")
+    private String potentialTransFormerType;
+
+    /**
+     * 中性点接地方式(字典)
+     */
+    @ApiModelProperty(name = "neutralGroundingMode", value = "中性点接地方式(字典)")
+    private String neutralGroundingMode;
+
+    /**
+     * 是否用户专线(字典)
+     */
+    @ApiModelProperty(name = "isSpecialSupplyElectricity", value = "是否用户专线(字典)")
+    private String isSpecialSupplyElectricity;
+
+    /**
+     * 监测点标签
+     */
+    @ApiModelProperty(name = "monitorTag", value = "监测点标签")
+    private String monitorTag;
+
+    /**
+     * 监测对象类型(字典)
+     */
+    @ApiModelProperty(name = "monitorObjectType", value = "监测对象类型(字典)")
+    private String monitorObjectType;
+
+    /**
+     * 监测对象编号
+     */
+    @ApiModelProperty(name = "monitorObjectId", value = "监测对象编号")
+    private String monitorObjectId;
+
+    /**
+     * 监测对象名称
+     */
+    @ApiModelProperty(name = "monitorObjectName", value = "监测对象名称")
+    private String monitorObjectName;
+
+    /**
+     * 统计间隔
+     */
+    @ApiModelProperty(name = "statisticalInterval", value = "统计间隔")
+    private Integer statisticalInterval;
+
+    /**
+     * 关联的监测终端编号(外键)
+     */
+    @ApiModelProperty(name = "terminalId", value = "关联的监测终端编号(外键)")
+    private String terminalId;
+
+    /**
+     * 监测终端接线方式(字典)
+     */
+    @ApiModelProperty(name = "terminalWiringMethod", value = "监测终端接线方式(字典)")
+    private String terminalWiringMethod;
+
+    /**
+     * 是否是上送国网监测点,0-否 1-是
+     */
+    @ApiModelProperty(name = "isUpToGrid", value = "是否是上送国网监测点,0-否 1-是")
+    private Integer isUpToGrid;
+
+    /**
+     * 数据状态：0-删除；1-正常；
+     */
+    @ApiModelProperty(name = "status", value = "数据状态：0-删除；1-正常；")
+    private Integer status;
+
+    /**
+     * 创建用户
+     */
+    @ApiModelProperty(name = "createBy", value = "创建用户")
+    private String createBy;
+
+    /**
+     * 创建时间
+     */
+    @ApiModelProperty(name = "createTime", value = "创建时间")
+    private Date createTime;
+
+    /**
+     * 更新用户
+     */
+    @ApiModelProperty(name = "updateBy", value = "更新用户")
+    private String updateBy;
+
+    /**
+     * 更新时间
+     */
+    @ApiModelProperty(name = "updateTime", value = "更新时间")
+    private Date updateTime;
+
+}
diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/PmsTerminalVO.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/PmsTerminalVO.java
new file mode 100644
index 000000000..55dc2f321
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/PmsTerminalVO.java
@@ -0,0 +1,94 @@
+package com.njcn.device.pms.pojo.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+@Data
+public class PmsTerminalVO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(name = "Id", value = "终端编号")
+    private String Id;
+
+    @ApiModelProperty(name = "Name", value = "终端名称")
+    private String Name;
+
+    @ApiModelProperty(name = "OrgName", value = "组织机构名称")
+    private String OrgName;
+
+    @ApiModelProperty(name = "OrgId", value = "组织机构ID")
+    private String OrgId;
+
+    @ApiModelProperty(name = "OperationName", value = "运维单位名称")
+    private String OperationName;
+
+    @ApiModelProperty(name = "OperationId", value = "运维单位ID")
+    private String OperationId;
+
+    @ApiModelProperty(name = "PowerrName", value = "变电站名称")
+    private String PowerrName;
+
+    @ApiModelProperty(name = "PowerStationId", value = "所属电站ID")
+    private String PowerStationId;
+
+    @ApiModelProperty(name = "TerminalState", value = "终端状态")
+    private String TerminalState;
+
+    @ApiModelProperty(name = "TerminalLevel", value = "终端级别")
+    private String TerminalLevel;
+
+    @ApiModelProperty(name = "DeviceModel", value = "装置型号")
+    private String DeviceModel;
+
+    @ApiModelProperty(name = "Manufacture", value = "生产厂家")
+    private String Manufacture;
+
+    @ApiModelProperty(name = "VerificationDate", value = "检定日期")
+    private String VerificationDate;
+
+    @ApiModelProperty(name = "UseDate", value = "投用日期")
+    private String UseDate;
+
+    @ApiModelProperty(name = "InputType", value = "测量信号输入形式")
+    private String InputType;
+
+    @ApiModelProperty(name = "Ip", value = "IP地址")
+    private String Ip;
+
+    @ApiModelProperty(name = "Port", value = "通信端口")
+    private String Port;
+
+    @ApiModelProperty(name = "IsUpToGrid", value = "是否是上送国网监测点,0-否 1-是")
+    private Integer IsUpToGrid;
+
+    @ApiModelProperty(name = "Status", value = "数据状态：0-删除；1-正常")
+    private Integer Status;
+
+    /**
+     * 创建用户
+     */
+    @ApiModelProperty(name = "createBy", value = "创建用户")
+    private String createBy;
+
+    /**
+     * 创建时间
+     */
+    @ApiModelProperty(name = "createTime", value = "创建时间")
+    private Date createTime;
+
+    /**
+     * 更新用户
+     */
+    @ApiModelProperty(name = "updateBy", value = "更新用户")
+    private String updateBy;
+
+    /**
+     * 更新时间
+     */
+    @ApiModelProperty(name = "updateTime", value = "更新时间")
+    private Date updateTime;
+}
diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/PowerDistributionareaVO.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/PowerDistributionareaVO.java
new file mode 100644
index 000000000..aef636acf
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/PowerDistributionareaVO.java
@@ -0,0 +1,108 @@
+package com.njcn.device.pms.pojo.vo;
+
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+@Data
+public class PowerDistributionareaVO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(name = "Id", value = "台区编号")
+    private String Id;
+
+    @ApiModelProperty(name = "Name", value = "台区名称")
+    private String Name;
+
+    @ApiModelProperty(name = "OrgName", value = "组织机构名称")
+    private String OrgName;
+
+    @ApiModelProperty(name = "OrgId", value = "组织机构ID")
+    private String OrgId;
+
+    @ApiModelProperty(name = "OperationName", value = "运维单位名称")
+    private String OperationName;
+
+    @ApiModelProperty(name = "OperationId", value = "运维单位ID")
+    private String OperationId;
+
+    @ApiModelProperty(name = "PowerrName", value = "变电站名称")
+    private String PowerrName;
+
+    @ApiModelProperty(name = "PowerStationId", value = "电站ID")
+    private String PowerStationId;
+
+    @ApiModelProperty(name = "LineName", value = "监测线路名称")
+    private String LineName;
+
+    @ApiModelProperty(name = "LineId", value = "所属线路ID")
+    private String LineId;
+
+    @ApiModelProperty(name = "PCapacity", value = "配变容量")
+    private Float PCapacity;
+
+    @ApiModelProperty(name = "Regionalism", value = "地区特征")
+    private String Regionalism;
+
+    @ApiModelProperty(name = "IfRuralPowerGrid", value = "是否农网：0-否；1：是")
+    private Integer IfRuralPowerGrid;
+
+    @ApiModelProperty(name = "NatureOfUse", value = "使用性质")
+    private String NatureOfUse;
+
+    @ApiModelProperty(name = "PowerSupplyRadius", value = "供电半径")
+    private Float PowerSupplyRadius;
+
+    @ApiModelProperty(name = "LineLength", value = "供电线路总长度")
+    private Float LineLength;
+
+    @ApiModelProperty(name = "State", value = "运行状态")
+    private String State;
+
+    @ApiModelProperty(name = "DistributedPhotovoltaicNum", value = "分布式光伏用户数")
+    private Integer DistributedPhotovoltaicNum;
+
+    @ApiModelProperty(name = "PhotovoltaicCapacity", value = "分布式光伏总装机容量")
+    private Float PhotovoltaicCapacity;
+
+    @ApiModelProperty(name = "IfBevAp", value = "是否有电动汽车接入：0-否；1：是")
+    private Integer IfBevAp;
+
+    @ApiModelProperty(name = "ApLoadType", value = "接入负荷类型")
+    private String ApLoadType;
+
+    @ApiModelProperty(name = "IsUpToGrid", value = "是否是上送国网监测点,0-否 1-是")
+    private Integer IsUpToGrid;
+
+    @ApiModelProperty(name = "Status", value = "数据状态：0-删除；1-正常")
+    private Integer Status;
+
+    /**
+     * 创建用户
+     */
+    @ApiModelProperty(name = "createBy", value = "创建用户")
+    private String createBy;
+
+    /**
+     * 创建时间
+     */
+    @ApiModelProperty(name = "createTime", value = "创建时间")
+    private Date createTime;
+
+    /**
+     * 更新用户
+     */
+    @ApiModelProperty(name = "updateBy", value = "更新用户")
+    private String updateBy;
+
+    /**
+     * 更新时间
+     */
+    @ApiModelProperty(name = "updateTime", value = "更新时间")
+    private Date updateTime;
+
+}
diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/ProblemMonitorDetailVO.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/ProblemMonitorDetailVO.java
new file mode 100644
index 000000000..5e4287ba7
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/ProblemMonitorDetailVO.java
@@ -0,0 +1,41 @@
+package com.njcn.device.pms.pojo.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 告警统计-监测点详情
+ * @Title ProblemMonitorDetailVO
+ * @Package com.njcn.device.pms.pojo.vo
+ * @Author jianghaifei
+ * @Date 2022-10-13 19:35
+ * @Version V1.0
+ */
+@Data
+public class ProblemMonitorDetailVO  implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(name = "orgNo", value = "单位id")
+    private String orgNo;
+
+    @ApiModelProperty(name = "orgName", value = "单位名称")
+    private String orgName;
+
+    @ApiModelProperty(name = "monitorId", value = "监测点id")
+    private String monitorId;
+
+    @ApiModelProperty(name = "monitorName", value = "监测点名称")
+    private String monitorName;
+
+    @ApiModelProperty(name = "powerName", value = "变电站名称")
+    private String powerName;
+
+    @ApiModelProperty(name = "voltageLevel", value = "变电站电压等级id")
+    private String voltageLevel;
+
+    @ApiModelProperty(name = "voltageLevelName", value = "变电站电压等级")
+    private String voltageLevelName;
+
+}
diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/PvDeviceVO.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/PvDeviceVO.java
deleted file mode 100644
index b41d40886..000000000
--- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/PvDeviceVO.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package com.njcn.device.pms.pojo.vo;
-
-import com.njcn.device.pms.pojo.po.PvDevice;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * pqs
- *
- * @author cdf
- * @date 2022/7/26
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-public class PvDeviceVO extends PvDevice {
-
-    private String devTypeName;
-
-    private String typeName;
-
-    private String typeCode;
-
-    private String manufacturerName;
-
-    /**
-     * 终端级别中文名称
-     */
-    private String devGradeName;
-}
diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/PvDistributedVO.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/PvDistributedVO.java
deleted file mode 100644
index cfac09819..000000000
--- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/PvDistributedVO.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.njcn.device.pms.pojo.vo;
-
-import com.njcn.device.pms.pojo.po.PvDistributed;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * pqs
- *
- * @author cdf
- * @date 2022/7/26
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-public class PvDistributedVO extends PvDistributed {
-    private String scaleName;
-}
diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/PvLineAllDetailVO.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/PvLineAllDetailVO.java
deleted file mode 100644
index b6af81f64..000000000
--- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/PvLineAllDetailVO.java
+++ /dev/null
@@ -1,242 +0,0 @@
-package com.njcn.device.pms.pojo.vo;
-
-import lombok.Data;
-
-import java.time.LocalDate;
-
-/**
- * pqs
- *
- * @author cdf
- * @date 2022/7/12
- */
-@Data
-public class PvLineAllDetailVO {
-
-
-        /**
-         * 监测点序号
-         */
-        private String id;
-
-        private String name;
-
-        private String code;
-
-        /**
-         * 所属终端
-         */
-        private String devName;
-
-        private String devId;
-
-        /**
-         * 监测点类型（I类监测点、II类监测点、III类监测点），字典表
-         */
-        private String type;
-
-        /**
-         * 监测点类型（I类监测点、II类监测点、III类监测点），字典表
-         */
-        private String typeName;
-
-        private String substationId;
-        /**
-         * 所属变电站（I类监测点）
-         */
-        private String substationName;
-
-        /**
-         * 所属母线名称（I类监测点）
-         */
-        private String voltageName;
-
-        private String voltageId;
-
-        /**
-         * 所属台区ID（II类监测点）
-         */
-        private String subAreaName;
-        private String subAreaId;
-
-        private String userCode;
-
-        private String userCodeType;
-
-        /**
-         * 分布式光伏名称
-         */
-        private String distributeName;
-        private String distributeId;
-
-        /**
-         * 低压用户名称
-         */
-        private String lvUserName;
-        private String lvUserId;
-
-        /**
-         * 电压等级
-         */
-        private String scale;
-
-        private String scaleName;
-
-        /**
-         * 线路号（在同一台设备中的监测点号）
-         */
-        private Integer num;
-
-        /**
-         * PT一次变比
-         */
-        private Float pt1;
-
-        /**
-         * PT二次变比
-         */
-        private Float pt2;
-
-        /**
-         * CT一次变比
-         */
-        private Float ct1;
-
-        /**
-         * CT二次变比
-         */
-        private Float ct2;
-
-        /**
-         * 设备容量
-         */
-        private Float devCapacity;
-
-        /**
-         * 短路容量
-         */
-        private Float shortCapacity;
-
-        /**
-         * 基准容量
-         */
-        private Float standardCapacity;
-
-        /**
-         * 协议容量
-         */
-        private Float dealCapacity;
-
-        /**
-         * 接线类型
-         */
-        private String ptType;
-
-        private String ptTypeName;
-
-        /**
-         * 测量间隔（1-10分钟）
-         */
-        private Integer timeInterval;
-
-        /**
-         * 干扰源类型,字典表
-         */
-        private String loadType;
-        private String loadTypeName;
-
-        /**
-         * 行业类型，字典表
-         */
-        private String businessType;
-
-        /**
-         * 网公司谐波监测平台标志(0-否;1-是)，默认否
-         */
-        private Integer monitorFlag;
-
-        /**
-         * 电网标志（0-电网侧；1-非电网侧）
-         */
-        private Integer powerFlag;
-
-        /**
-         * 国网谐波监测平台监测点号
-         */
-        private String monitorId;
-
-        /**
-         * 监测点对象名称
-         */
-        private String objName;
-
-        /**
-         * 监测点对象小类
-         */
-        private String smallName;
-
-        /**
-         * 监测点对象大类
-         */
-        private String bigName;
-
-        /**
-         * 人为干预是否参与统计（0：不参与，1：参与）默认参与统计
-         */
-        private Integer statFlag;
-
-        /**
-         * 备注
-         */
-        private String remark;
-
-        /**
-         * 电压互感器类型，字典表
-         */
-        private String tfType;
-
-        private String tfTypeName;
-
-        /**
-         * 所属变压器编号
-         */
-        private String tfCode;
-
-        /**
-         * 中性点接地方式，字典表
-         */
-        private String groundType;
-
-        private String groundTypeName;
-
-        /**
-         * 投运日期
-         */
-        private LocalDate putIn;
-
-        /**
-         * 接入日期
-         */
-        private LocalDate access;
-
-        /**
-         * 是否专项供电（0：否，1：是）默认参与统计
-         */
-        private Integer powerSupply;
-
-        /**
-         * 状态
-         */
-        private Integer state;
-
-
-        /**
-         * 监测点状态
-         * @author cdf
-         * @date 2022/7/27
-         */
-        private Integer lineStatus;
-
-}
-
-
diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/PvLvUserVO.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/PvLvUserVO.java
deleted file mode 100644
index 6feb82941..000000000
--- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/PvLvUserVO.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.njcn.device.pms.pojo.vo;
-
-import com.njcn.device.pms.pojo.po.PvLvUser;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * pqs
- *
- * @author cdf
- * @date 2022/7/26
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-public class PvLvUserVO extends PvLvUser {
-    private String scaleName;
-}
diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/PvSubAreaVO.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/PvSubAreaVO.java
deleted file mode 100644
index dc5e66e95..000000000
--- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/PvSubAreaVO.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.njcn.device.pms.pojo.vo;
-
-import com.njcn.device.pms.pojo.po.PvSubArea;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * pqs
- *
- * @author cdf
- * @date 2022/7/26
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-public class PvSubAreaVO extends PvSubArea {
-
-    @ApiModelProperty(name = "scaleName",value = "电压等级")
-    private String scaleName;
-
-    @ApiModelProperty(name = "unitName",value = "单位名称")
-    private String unitName;
-
-    @ApiModelProperty(name = "tenVoltageName",value = "10kv线路表")
-    private String tenVoltageName;
-}
diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/PvSubstationVO.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/PvSubstationVO.java
deleted file mode 100644
index ced9c0b3a..000000000
--- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/PvSubstationVO.java
+++ /dev/null
@@ -1,60 +0,0 @@
-package com.njcn.device.pms.pojo.vo;
-
-import lombok.Data;
-
-/**
- * pqs
- *
- * @author cdf
- * @date 2022/7/25
- */
-@Data
-public class PvSubstationVO {
-
-    /**
-     * 变电站表Id
-     */
-    private String id;
-
-    /**
-     * 所属单位Id
-     */
-    private String unitId;
-
-
-    /**
-     * 所属单位名称
-     */
-    private String unitName;
-
-    /**
-     * 变电站名称
-     */
-    private String name;
-
-    /**
-     * 变电站编号
-     */
-    private String subCode;
-
-    /**
-     * 电压等级Id，字典表
-     */
-    private String scale;
-
-    /**
-     * 电压等级名称
-     */
-    private String scaleName;
-
-    /**
-     * 变电站总容量（MVA）(手动填写)
-     */
-    private Double totalCapacity;
-
-    /**
-     * 运维班组Code
-     */
-    private String teamCode;
-
-}
diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/PvTenVoltageVO.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/PvTenVoltageVO.java
deleted file mode 100644
index 8309c1bc9..000000000
--- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/PvTenVoltageVO.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.njcn.device.pms.pojo.vo;
-
-import com.njcn.device.pms.pojo.po.PvTenVoltage;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * pqs
- *
- * @author cdf
- * @date 2022/7/26
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-public class PvTenVoltageVO extends PvTenVoltage {
-
-
-    private String scaleName;
-
-    @ApiModelProperty(name = "designScaleName",value = "设计电压",required = true)
-    private String designScaleName;
-
-}
diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/RMpMonitorAlarmCountMVO.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/RMpMonitorAlarmCountMVO.java
new file mode 100644
index 000000000..75e347be1
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/RMpMonitorAlarmCountMVO.java
@@ -0,0 +1,147 @@
+package com.njcn.device.pms.pojo.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @author jianghf
+ * 监测点告警统计-月表
+ * @TableName r_mp_monitor_alarm_count_m
+ */
+@Data
+public class RMpMonitorAlarmCountMVO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+
+    @ApiModelProperty(name = "orgNo", value = "所属单位id")
+    private String orgNo;
+
+    @ApiModelProperty(name = "orgName", value = "所属单位名称")
+    private String orgName;
+
+    @ApiModelProperty(name = "measurementPointId", value = "监测点ID")
+    private String measurementPointId;
+
+    @ApiModelProperty(name = "measurementPointName", value = "监测点名称")
+    private String measurementPointName;
+
+    @ApiModelProperty(name = "monitorType", value = "监测点类型id")
+    private String monitorType;
+
+    @ApiModelProperty(name = "monitorTypeName", value = "监测点类型名称")
+    private String monitorTypeName;
+
+    @ApiModelProperty(name = "voltage_Level", value = "电压等级id")
+    private String voltageLevel;
+
+    @ApiModelProperty(name = "voltageLevelName", value = "电压等级名称")
+    private String voltageLevelName;
+
+    /**
+     * 生成数据的时间,每月统计一次
+     */
+    @ApiModelProperty(name = "dataDate", value = "生成数据的时间,每月统计一次")
+    private Date dataDate;
+
+    /**
+     * 电压偏差告警情况(0:否 1:是)
+     */
+    @ApiModelProperty(name = "vdevAlarmInfo", value = "电压偏差告警情况(0:否 1:是)")
+    private Integer vdevAlarmInfo;
+
+    /**
+     * 电压偏差严重度
+     */
+    @ApiModelProperty(name = "vdevSeverity", value = "电压偏差严重度")
+    private Integer vdevSeverity;
+
+    /**
+     * 频率偏差告警情况(0:否 1:是)
+     */
+    @ApiModelProperty(name = "freqAlarmInfo", value = "频率偏差告警情况(0:否 1:是)")
+    private Integer freqAlarmInfo;
+
+    /**
+     * 频率偏差严重度
+     */
+    @ApiModelProperty(name = "freqSeverity", value = "频率偏差严重度")
+    private Integer freqSeverity;
+
+    /**
+     * 三相电压不平衡度告警情况(0:否 1:是)
+     */
+    @ApiModelProperty(name = "unbalanceAlarmInfo", value = "三相电压不平衡度告警情况(0:否 1:是)")
+    private Integer unbalanceAlarmInfo;
+
+    /**
+     * 三相电压不平衡度严重度
+     */
+    @ApiModelProperty(name = "unbalanceSeverity", value = "三相电压不平衡度严重度")
+    private Integer unbalanceSeverity;
+
+    /**
+     * 谐波电压告警情况(0:否 1:是)
+     */
+    @ApiModelProperty(name = "vAlarmInfo", value = "谐波电压告警情况(0:否 1:是)")
+    private Integer vAlarmInfo;
+
+    /**
+     * 谐波电压严重度
+     */
+    @ApiModelProperty(name = "vSeverity", value = "谐波电压严重度")
+    private Integer vSeverity;
+
+    /**
+     * 闪变告警情况(0:否 1:是)
+     */
+    @ApiModelProperty(name = "flickerAlarmInfo", value = "闪变告警情况(0:否 1:是)")
+    private Integer flickerAlarmInfo;
+
+    /**
+     * 闪变严重度
+     */
+    @ApiModelProperty(name = "flickerSeverity", value = "闪变严重度")
+    private Integer flickerSeverity;
+
+    /**
+     * 电压暂降告警情况(0:否 1:是)
+     */
+    @ApiModelProperty(name = "sagAlarmInfo", value = "电压暂降告警情况(0:否 1:是)")
+    private Integer sagAlarmInfo;
+
+    /**
+     * 电压暂降告严重度
+     */
+    @ApiModelProperty(name = "sagSeverity", value = "电压暂降严重度")
+    private Integer sagSeverity;
+
+    /**
+     * 短时中断告警情况(0:否 1:是)
+     */
+
+    @ApiModelProperty(name = "interruptAlarmInfo", value = "短时中断告警情况(0:否 1:是)")
+    private Integer interruptAlarmInfo;
+
+    /**
+     * 短时中断严重度
+     */
+    @ApiModelProperty(name = "interruptSeverity", value = "短时中断告严重度")
+    private Integer interruptSeverity;
+
+    /**
+     * 稳态指标评级结果（0 较差 1中等 2较好）
+     */
+    @ApiModelProperty(name = "harmonicTypeGrade", value = "稳态指标评级结果（0 较差 1中等 2较好）")
+    private Integer harmonicTypeGrade;
+
+    /**
+     * 暂态指标评级结果（0 较差 1中等 2较好）
+     */
+    @ApiModelProperty(name = "eventTypeGrade", value = "暂态指标评级结果（0 较差 1中等 2较好）")
+    private Integer eventTypeGrade;
+
+}
\ No newline at end of file
diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/RStatAreaAlarmCountMVO.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/RStatAreaAlarmCountMVO.java
new file mode 100644
index 000000000..86ef168ca
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/RStatAreaAlarmCountMVO.java
@@ -0,0 +1,140 @@
+package com.njcn.device.pms.pojo.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @author jianghf
+ * 区域告警统计(月)
+ * @TableName r_stat_area_alarm_count_m
+ */
+@Data
+public class RStatAreaAlarmCountMVO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 单位ID
+     */
+    @ApiModelProperty(name = "orgNo", value = "单位ID")
+    private String orgNo;
+
+    /**
+     * 单位名称
+     */
+    @ApiModelProperty(name = "orgName", value = "单位名称")
+    private String orgName;
+    /**
+     * 生成数据的时间,每月统计一次
+     */
+    @ApiModelProperty(name = "dataDate", value = "生成数据的时间,每月统计一次")
+    private Date dataDate;
+
+    /**
+     * 数据类型(0:主网 1:配网)
+     */
+    @ApiModelProperty(name = "dataType", value = "数据类型(0:主网 1:配网)")
+    private Integer dataType;
+
+    /**
+     * 电压偏差告警情况(0:否 1:是)
+     */
+    @ApiModelProperty(name = "vdevAlarmInfo", value = "电压偏差告警情况(0:否 1:是)")
+    private Integer vdevAlarmInfo;
+
+    /**
+     * 电压偏差告警超标占比
+     */
+    @ApiModelProperty(name = "vdevAlarmRatio", value = "电压偏差告警超标占比")
+    private Integer vdevAlarmRatio;
+
+    /**
+     * 频率偏差告警情况(0:否 1:是)
+     */
+    @ApiModelProperty(name = "freqAlarmInfo", value = "频率偏差告警情况(0:否 1:是)")
+    private Integer freqAlarmInfo;
+
+    /**
+     * 频率偏差告警超标占比
+     */
+    @ApiModelProperty(name = "freqAlarmRatio", value = "频率偏差告警超标占比")
+    private Integer freqAlarmRatio;
+
+    /**
+     * 三相电压不平衡度告警情况(0:否 1:是)
+     */
+    @ApiModelProperty(name = "unbalanceAlarmInfo", value = "三相电压不平衡度告警情况(0:否 1:是)")
+    private Integer unbalanceAlarmInfo;
+
+    /**
+     * 三相电压不平衡度告警超标占比
+     */
+    @ApiModelProperty(name = "unbalanceAlarmRatio", value = "三相电压不平衡度告警超标占比")
+    private Integer unbalanceAlarmRatio;
+
+    /**
+     * 谐波电压告警情况(0:否 1:是)
+     */
+    @ApiModelProperty(name = "vAlarmInfo", value = "谐波电压告警情况(0:否 1:是)")
+    private Integer vAlarmInfo;
+
+    /**
+     * 谐波电压告警超标占比
+     */
+    @ApiModelProperty(name = "vAlarmRatio", value = "谐波电压告警超标占比")
+    private Integer vAlarmRatio;
+
+    /**
+     * 闪变告警情况(0:否 1:是)
+     */
+    @ApiModelProperty(name = "flickerAlarmInfo", value = "闪变告警情况(0:否 1:是)")
+    private Integer flickerAlarmInfo;
+
+    /**
+     * 闪变告警超标占比
+     */
+    @ApiModelProperty(name = "flickerAlarmRatio", value = "闪变告警超标占比")
+    private Integer flickerAlarmRatio;
+
+    /**
+     * 电压暂降告警情况(0:否 1:是)
+     */
+    @ApiModelProperty(name = "sagAlarmInfo", value = "电压暂降告警情况(0:否 1:是)")
+    private Integer sagAlarmInfo;
+
+    /**
+     * 电压暂降告警平均发生次数
+     */
+    @ApiModelProperty(name = "sagAlarmAvgCount", value = "电压暂降告警平均发生次数")
+    private Integer sagAlarmAvgCount;
+
+    /**
+     * 短时中断告警情况(0:否 1:是)
+     */
+
+    @ApiModelProperty(name = "interruptAlarmInfo", value = "短时中断告警情况(0:否 1:是)")
+    private Integer interruptAlarmInfo;
+
+    /**
+     * 短时中断告警平均发生次数
+     */
+    @ApiModelProperty(name = "interruptAlarmAvgCount", value = "短时中断告警平均发生次数")
+    private Integer interruptAlarmAvgCount;
+
+    /**
+     * 稳态指标评级结果（0 较差 1中等 2较好）
+     */
+    @ApiModelProperty(name = "harmonicTypeGrade", value = "稳态指标评级结果（0 较差 1中等 2较好）")
+    private Integer harmonicTypeGrade;
+
+    /**
+     * 暂态指标评级结果（0 较差 1中等 2较好）
+     */
+    @ApiModelProperty(name = "eventTypeGrade", value = "暂态指标评级结果（0 较差 1中等 2较好）")
+    private Integer eventTypeGrade;
+
+
+}
\ No newline at end of file
diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/RStatBusbarHarmonicVO.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/RStatBusbarHarmonicVO.java
new file mode 100644
index 000000000..8795cac7f
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/RStatBusbarHarmonicVO.java
@@ -0,0 +1,186 @@
+package com.njcn.device.pms.pojo.vo;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 变电站母线电压指标年报返回前端实体类
+ *
+ * @author yzh
+ * @date 2022/10/8
+ */
+
+@Data
+@ApiModel(value = "变电站母线电压指标年报返回前端实体类")
+public class RStatBusbarHarmonicVO implements Serializable {
+
+    private static final long serialVersionUID = 835979721790264805L;
+    /**
+     * 部门id
+     */
+    @ApiModelProperty(name = "deptId", value = "部门id")
+    private String deptId;
+
+    /**
+     * 所属单位
+     */
+    @ApiModelProperty(name = "company", value = "单位")
+    private String company;
+
+    /**
+     * 变电站id
+     */
+    @ApiModelProperty(name = "subId", value = "变电站id")
+    private String subId;
+
+    /**
+     * 变电站名称
+     */
+    @ApiModelProperty(name = "subName", value = "变电站名称")
+    private String subName;
+
+    /**
+     * 变电站电压等级
+     */
+    @ApiModelProperty(name = "subVoltageLevel", value = "变电站电压等级")
+    private String subVoltageLevel;
+
+    /**
+     * 母线名称
+     */
+    @ApiModelProperty(name = "busbarName", value = "母线名称")
+    private String busbarName;
+
+    /**
+     * 母线id
+     */
+    @ApiModelProperty(name = "busbarId", value = "母线id")
+    @TableField(value = "busbar_id")
+    private String busbarId;
+
+
+    /**
+     * 生成数据的时间,每年统计一次
+     */
+    @ApiModelProperty(name = "dataDate", value = "生成数据的时间,每年统计一次")
+    @TableField(value = "data_date")
+    private String dataDate;
+
+    /**
+     * 电压有效最大值
+     */
+    @ApiModelProperty(name = "vEffectiveMax", value = "电压有效最大值")
+    @TableField(value = "v_effective_max")
+    private Double vEffectiveMax;
+
+    /**
+     * 电压有效最小值
+     */
+    @ApiModelProperty(name = "vEffectiveMin", value = "电压有效最小值")
+    @TableField(value = "v_effective_min")
+    private Double vEffectiveMin;
+
+    /**
+     * 电压有效平均值
+     */
+    @ApiModelProperty(name = "vEffectiveAvg", value = "电压有效平均值")
+    @TableField(value = "v_effective_avg")
+    private Double vEffectiveAvg;
+
+    /**
+     * 电压有效值95概率大值
+     */
+    @ApiModelProperty(name = "vEffective95", value = "电压有效值95概率大值")
+    @TableField(value = "v_effective_95")
+    private Double vEffective95;
+
+    /**
+     * 电压总谐波畸变率最大值
+     */
+    @ApiModelProperty(name = "vThdMax", value = "电压总谐波畸变率最大值")
+    @TableField(value = "v_thd_max")
+    private Double vThdMax;
+
+    /**
+     * 电压总谐波畸变率最小值
+     */
+    @ApiModelProperty(name = "vThdMin", value = "电压总谐波畸变率最小值")
+    @TableField(value = "v_thd_min")
+    private Double vThdMin;
+
+    /**
+     * 电压总谐波畸变率平均值
+     */
+    @ApiModelProperty(name = "vThdAvg", value = "电压总谐波畸变率平均值")
+    @TableField(value = "v_thd_avg")
+    private Double vThdAvg;
+
+    /**
+     * 电压总谐波畸变率95概率大值
+     */
+    @ApiModelProperty(name = "vThd95", value = "电压总谐波畸变率95概率大值")
+    @TableField(value = "v_thd_95")
+    private Double vThd95;
+
+    /**
+     * 三相电压不平衡最大值
+     */
+    @ApiModelProperty(name = "unbalanceMax", value = "三相电压不平衡最大值")
+    @TableField(value = "unbalance_max")
+    private Double unbalanceMax;
+
+    /**
+     * 三相电压不平衡最小值
+     */
+    @ApiModelProperty(name = "unbalanceMin", value = "三相电压不平衡最小值")
+    @TableField(value = "unbalance_min")
+    private Double unbalanceMin;
+
+    /**
+     * 三相电压不平衡平均值
+     */
+    @ApiModelProperty(name = "unbalanceAvg", value = "三相电压不平衡平均值")
+    @TableField(value = "unbalance_avg")
+    private Double unbalanceAvg;
+
+    /**
+     * 三相电压不平衡95概率大值
+     */
+    @ApiModelProperty(name = "unbalance95", value = "三相电压不平衡95概率大值")
+    @TableField(value = "unbalance_95")
+    private Double unbalance95;
+
+    /**
+     * 闪变最大值
+     */
+    @ApiModelProperty(name = "flickerMax", value = "闪变最大值")
+    @TableField(value = "flicker_max")
+    private Double flickerMax;
+
+    /**
+     * 闪变最小值
+     */
+    @ApiModelProperty(name = "flickerMin", value = "闪变最小值")
+    @TableField(value = "flicker_min")
+    private Double flickerMin;
+
+    /**
+     * 闪变平均值
+     */
+    @ApiModelProperty(name = "flickerAvg", value = "闪变平均值")
+    @TableField(value = "flicker_avg")
+    private Double flickerAvg;
+
+    /**
+     * 闪变95概率大值
+     */
+    @ApiModelProperty(name = "flicker95", value = "闪变95概率大值")
+    @TableField(value = "flicker_95")
+    private Double flicker95;
+
+
+}
diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/RStatEventOrgVO.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/RStatEventOrgVO.java
new file mode 100644
index 000000000..558939945
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/RStatEventOrgVO.java
@@ -0,0 +1,157 @@
+package com.njcn.device.pms.pojo.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 监测点暂态指标数据统计表(RStatEventOrg)实体类
+ *
+ * @author yzh
+ * @since 2022-10-12 18:15:26
+ */
+
+@Data
+@ApiModel("监测点暂态指标数据统计表")
+public class RStatEventOrgVO implements Serializable {
+    private static final long serialVersionUID = -15971491825708754L;
+    /**
+     * 单位ID
+     */
+    @ApiModelProperty(name = "orgNo", value = "单位ID")
+    private String orgNo;
+
+    /**
+     * 单位名称
+     */
+    @ApiModelProperty(name = "orgName", value = "单位名称")
+    private String orgName;
+
+    /**
+     * 生成数据的时间,每年统计一次
+     */
+    @ApiModelProperty(name = "dataDate", value = "生成数据的时间,每年统计一次")
+    private Date dataDate;
+
+    /**
+     * 日均有效接入监测点数
+     */
+    @ApiModelProperty(name = "effectiveMeasurementAverage", value = "日均有效接入监测点数")
+    private Integer effectiveMeasurementAverage;
+
+    /**
+     * 累计有效接入监测点数
+     */
+    @ApiModelProperty(name = "effectiveMeasurementAccrued", value = "累计有效接入监测点数")
+    private Integer effectiveMeasurementAccrued;
+
+    /**
+     * 日均监测到暂态指标的监测点数
+     */
+    @ApiModelProperty(name = "eventMeasurementAverage", value = "日均监测到暂态指标的监测点数")
+    private Integer eventMeasurementAverage;
+
+    /**
+     * 累计监测到暂态指标的监测点数
+     */
+    @ApiModelProperty(name = "eventMeasurementAccrued", value = "累计监测到暂态指标的监测点数")
+    private Integer eventMeasurementAccrued;
+
+    /**
+     * 日均暂态超标监测点数占比
+     */
+    @ApiModelProperty(name = "eventMeasurementRatioAverage", value = "日均暂态超标监测点数占比")
+    private Integer eventMeasurementRatioAverage;
+
+    /**
+     * 累计暂态超标监测点数占比
+     */
+    @ApiModelProperty(name = "eventMeasurementRatioAccrued", value = "累计暂态超标监测点数占比")
+    private Integer eventMeasurementRatioAccrued;
+
+    /**
+     * 暂态指标类型Id，字典表ID
+     */
+    @ApiModelProperty(name = "eventType", value = "暂态指标类型Id，字典表ID")
+    private String eventType;
+
+    /**
+     * 日均短时中断
+     */
+    @ApiModelProperty(name = "eEventMeasurementAverage", value = "日均暂态指标")
+    private Integer eEventMeasurementAverage;
+
+    /**
+     * 累计短时中断
+     */
+    @ApiModelProperty(name = "eEventMeasurementAccrued", value = "累计暂态指标")
+    private Integer eEventMeasurementAccrued;
+
+    /**
+     * 日均短时中断占比
+     */
+    @ApiModelProperty(name = "eEventMeasurementRatioAverage", value = "日均暂态指标占比")
+    private Double eEventMeasurementRatioAverage;
+
+    /**
+     * 累计短时中断占比
+     */
+    @ApiModelProperty(name = "eEventMeasurementRatioAccrued", value = "累计暂态指标占比")
+    private Double eEventMeasurementRatioAccrued;
+
+
+
+    /**
+     * 暂态指标
+     */
+    @ApiModelProperty(name = "shortInterruptions", value = "短时中断")
+    private List<EventStatis> eventStatis;
+
+
+    /**
+     * 暂态指标
+     */
+    @Data
+    public static class EventStatis {
+
+        /**
+         * 字典名称
+         */
+        private String dictDataName;
+
+        /**
+         * 暂态指标类型Id，字典表ID
+         */
+        @ApiModelProperty(name = "eventType", value = "暂态指标类型Id，字典表ID")
+        private String eventType;
+
+        /**
+         * 日均短时中断
+         */
+        @ApiModelProperty(name = "eEventMeasurementAverage", value = "日均暂态指标")
+        private Integer eEventMeasurementAverage;
+
+        /**
+         * 累计短时中断
+         */
+        @ApiModelProperty(name = "eEventMeasurementAccrued", value = "累计暂态指标")
+        private Integer eEventMeasurementAccrued;
+
+        /**
+         * 日均短时中断占比
+         */
+        @ApiModelProperty(name = "eEventMeasurementRatioAverage", value = "日均暂态指标占比")
+        private Double eEventMeasurementRatioAverage;
+
+        /**
+         * 累计短时中断占比
+         */
+        @ApiModelProperty(name = "eEventMeasurementRatioAccrued", value = "累计暂态指标占比")
+        private Double eEventMeasurementRatioAccrued;
+    }
+}
+
diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/RStatOrgVO.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/RStatOrgVO.java
new file mode 100644
index 000000000..cd89d5074
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/RStatOrgVO.java
@@ -0,0 +1,87 @@
+package com.njcn.device.pms.pojo.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 区域分类统计表(RStatOrgY)实体类
+ *
+ * @author yzh
+ * @date 2022/10/10
+ */
+
+@Data
+@ApiModel(value = "区域分类统计表(RStatOrgY)实体类")
+public class RStatOrgVO implements Serializable {
+    private static final long serialVersionUID = 642166320324597986L;
+    /**
+     * 单位ID
+     */
+    @ApiModelProperty(name = "orgNo", value = "单位ID")
+    private String orgNo;
+
+    /**
+     * 单位名称
+     */
+    @ApiModelProperty(name = "orgName", value = "单位名称")
+    private String orgName;
+
+    /**
+     * 生成数据的时间
+     */
+    @ApiModelProperty(name = "dataDate", value = "生成数据的时间")
+    private String dataDate;
+
+    /**
+     * 日均有效接入监测点数
+     */
+    @ApiModelProperty(name = "effectiveMeasurementAverage", value = "日均有效接入监测点数")
+    private Integer effectiveMeasurementAverage;
+
+    /**
+     * 累计有效接入监测点数
+     */
+    @ApiModelProperty(name = "effectiveMeasurementAccrued", value = "累计有效接入监测点数")
+    private Integer effectiveMeasurementAccrued;
+
+    /**
+     * 日均监测到暂态指标的监测点数
+     */
+    @ApiModelProperty(name = "eventMeasurementAverage", value = "日均监测到暂态指标的监测点数")
+    private Integer eventMeasurementAverage;
+
+    /**
+     * 累计监测到暂态指标的监测点数
+     */
+    @ApiModelProperty(name = "eventMeasurementAccrued", value = "累计监测到暂态指标的监测点数")
+    private Integer eventMeasurementAccrued;
+
+    /**
+     * 日均暂态超标监测点数占比
+     */
+    @ApiModelProperty(name = "eventMeasurementRatioAverage", value = "日均暂态超标监测点数占比")
+    private Integer eventMeasurementRatioAverage;
+
+    /**
+     * 累计暂态超标监测点数占比
+     */
+    @ApiModelProperty(name = "eventMeasurementRatioAccrued", value = "累计暂态超标监测点数占比")
+    private Integer eventMeasurementRatioAccrued;
+
+    /**
+     * 暂态指标发生频次
+     */
+    @ApiModelProperty(name = "eventFreq", value = "暂态指标发生频次")
+    private Double eventFreq;
+
+    /**
+     * 暂态指标发生次数
+     */
+    @ApiModelProperty(name = "eventCount", value = "暂态指标发生次数")
+    private Integer eventCount;
+
+}
\ No newline at end of file
diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/RStatSubstationVO.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/RStatSubstationVO.java
new file mode 100644
index 000000000..76e6ed277
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/RStatSubstationVO.java
@@ -0,0 +1,116 @@
+package com.njcn.device.pms.pojo.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 变电站指标统计表实体类
+ *
+ * @author yzh
+ * @since 2022-10-11 16:15:48
+ */
+@Data
+@ApiModel(value = "变电站指标统计表实体类")
+public class RStatSubstationVO implements Serializable {
+    private static final long serialVersionUID = 117875946877905400L;
+
+    /**
+     * 单位id
+     */
+    @ApiModelProperty(name = "deptId",value = "单位id")
+    private String deptId;
+
+    /**
+     * 单位名称
+     */
+    @ApiModelProperty(name = "deptName",value = "单位名称")
+    private String deptName;
+
+    /**
+     * 变电站id
+     */
+    @ApiModelProperty(name = "substationId",value = "变电站id")
+    private String substationId;
+
+    /**
+     * 变电站名称
+     */
+    @ApiModelProperty(name = "substationName",value = "变电站名称")
+    private String substationName;
+
+    /**
+     * 生成数据的时间
+     */
+    @ApiModelProperty(name = "dataDate",value = "生成数据的时间")
+    private String dataDate;
+
+    /**
+     * 日均有效接入监测点数
+     */
+    @ApiModelProperty(name = "effectiveMeasurementAverage",value = "日均有效接入监测点数")
+    private Integer effectiveMeasurementAverage;
+
+    /**
+     * 累计有效接入监测点数
+     */
+    @ApiModelProperty(name = "effectiveMeasurementAccrued",value = "累计有效接入监测点数")
+    private Integer effectiveMeasurementAccrued;
+
+
+    /**
+     * 暂态指标发生次数
+     */
+    @ApiModelProperty(name = "eventCount",value = "暂态指标发生次数")
+    private Integer eventCount;
+
+    /**
+     * 暂态指标发生频次
+     */
+    @ApiModelProperty(name = "eventFreq",value = "暂态指标发生频次")
+    private Double eventFreq;
+
+    /**
+     * 短时中断发生次数
+     */
+    @ApiModelProperty(name = "interruptCount",value = "短时中断发生次数")
+    private Integer interruptCount;
+
+    /**
+     * 短时中断发生频次
+     */
+    @ApiModelProperty(name = "interruptFreq",value = "短时中断发生频次")
+    private Double interruptFreq;
+
+
+
+    /**
+     * 电压暂升发生次数
+     */
+    @ApiModelProperty(name = "swellCount",value = "电压暂升发生次数")
+    private Integer swellCount;
+
+    /**
+     * 电压暂升发生频次
+     */
+    @ApiModelProperty(name = "swellFreq",value = "电压暂升发生频次")
+    private Double swellFreq;
+
+    /**
+     * 电压暂降发生次数
+     */
+    @ApiModelProperty(name = "sagCount",value = "电压暂降发生次数")
+    private Integer sagCount;
+
+    /**
+     * 电压暂降发生频次
+     */
+    @ApiModelProperty(name = "sagFreq",value = "电压暂降发生频次")
+    private Double sagFreq;
+
+
+}
+
diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/RStatZwAlarmCountWVO.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/RStatZwAlarmCountWVO.java
new file mode 100644
index 000000000..5bffbf679
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/RStatZwAlarmCountWVO.java
@@ -0,0 +1,46 @@
+package com.njcn.device.pms.pojo.vo;
+
+import com.njcn.device.pms.pojo.po.RStatZwAlarmCountW;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @author jianghf
+ * @TableName r_stat_zw_alarm_count_w
+ */
+@Data
+public class RStatZwAlarmCountWVO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(name = "orgNo", value = "单位id")
+    private String orgNo;
+
+    @ApiModelProperty(name = "orgName", value = "单位名称")
+    private String orgName;
+
+    @ApiModelProperty(name = "dataDate", value = "生成数据的时间,每周统计一次")
+    private Date dataDate;
+
+    @ApiModelProperty(name = "monitorEffectiveCount", value = "有效监测点数量")
+    private Integer monitorEffectiveCount;
+
+    @ApiModelProperty(name = "warnMonitorCount", value = "告警4次及以上监测点数量")
+    private Integer warnMonitorCount;
+
+    @ApiModelProperty(name = "monitorGradeCount", value = "级别较差监测点数量")
+    private Integer monitorGradeCount;
+
+    @ApiModelProperty(name = "warnMonitorRate", value = "告警四次及以上监测点占比")
+    private Double warnMonitorRate;
+
+    @ApiModelProperty(name = "monitorGradeRate", value = "级别'较差'监测点占比")
+    private Double monitorGradeRate;
+
+
+
+}
\ No newline at end of file
diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/RmpEventDetailVO.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/RmpEventDetailVO.java
new file mode 100644
index 000000000..9d0d46605
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/RmpEventDetailVO.java
@@ -0,0 +1,94 @@
+package com.njcn.device.pms.pojo.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 监测点暂态事件明细数据(RMpEventDetail)实体类
+ *
+ * @author yzh
+ * @since 2022-10-12 10:30:03
+ */
+
+@Data
+@ApiModel("监测点暂态事件明细数据")
+public class RmpEventDetailVO implements Serializable {
+    private static final long serialVersionUID = 544141879378917668L;
+
+    /**
+     * 单位id
+     */
+    @ApiModelProperty(name = "deptId",value = "单位id")
+    private String deptId;
+
+    /**
+     * 单位名称
+     */
+    @ApiModelProperty(name = "deptName",value = "单位名称")
+    private String deptName;
+
+    /**
+     * 暂时事件ID
+     */
+    @ApiModelProperty(name = "eventId",value = "暂时事件ID")
+    private String eventId;
+
+    /**
+     * 监测点ID
+     */
+    @ApiModelProperty(name = "measurementPointId",value = "监测点ID")
+    private String measurementPointId;
+
+    /**
+     * 监测点名称
+     */
+    @ApiModelProperty(name = "measurementPointName",value = "监测点名称")
+    private String measurementPointName;
+
+    /**
+     * 事件类型
+     */
+    @ApiModelProperty(name = "eventType",value = "事件类型")
+    private String eventType;
+
+    /**
+     * 开始时间
+     */
+    @ApiModelProperty(name = "startTime",value = "开始时间")
+    private Long startTime;
+
+    /**
+     * 持续时间
+     */
+    @ApiModelProperty(name = "duration",value = "持续时间")
+    private Double duration;
+
+    /**
+     * 特征幅值
+     */
+    @ApiModelProperty(name = "featureAmplitude",value = "特征幅值")
+    private Double featureAmplitude;
+
+    /**
+     * 相别
+     */
+    @ApiModelProperty(name = "phase",value = "相别")
+    private String phase;
+
+    /**
+     * 事件描述
+     */
+    @ApiModelProperty(name = "eventDescribe",value = "事件描述")
+    private String eventDescribe;
+
+    /**
+     * 波形路径
+     */
+    @ApiModelProperty(name = "wavePath",value = "波形路径")
+    private String wavePath;
+
+}
+
diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/StatationStatVO.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/StatationStatVO.java
new file mode 100644
index 000000000..1a5ee7b5e
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/StatationStatVO.java
@@ -0,0 +1,55 @@
+package com.njcn.device.pms.pojo.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+@Data
+public class StatationStatVO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(name = "PowerId", value = "电站编号")
+    private String PowerId;
+
+    @ApiModelProperty(name = "PowerName", value = "电站名称")
+    private String PowerName;
+
+    @ApiModelProperty(name = "OrgId", value = "单位id")
+    private String OrgId;
+
+    @ApiModelProperty(name = "ShouldBeNum", value = "应设点数量")
+    private Integer ShouldBeNum;
+
+    @ApiModelProperty(name = "VoltageLevel", value = "电压等级")
+    private String VoltageLevel;
+
+    @ApiModelProperty(name = "status", value = "数据状态：0-删除；1-正常；")
+    private Integer status;
+
+    /**
+     * 创建用户
+     */
+    @ApiModelProperty(name = "createBy", value = "创建用户")
+    private String createBy;
+
+    /**
+     * 创建时间
+     */
+    @ApiModelProperty(name = "createTime", value = "创建时间")
+    private Date createTime;
+
+    /**
+     * 更新用户
+     */
+    @ApiModelProperty(name = "updateBy", value = "更新用户")
+    private String updateBy;
+
+    /**
+     * 更新时间
+     */
+    @ApiModelProperty(name = "updateTime", value = "更新时间")
+    private Date updateTime;
+}
diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/TractionStationVO.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/TractionStationVO.java
new file mode 100644
index 000000000..10d8a3062
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/TractionStationVO.java
@@ -0,0 +1,94 @@
+package com.njcn.device.pms.pojo.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+@Data
+public class TractionStationVO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(name = "id",value = "牵引站编号")
+    private String id;
+
+    @ApiModelProperty(name = "Name", value = "牵引站名称")
+    private String Name;
+
+    @ApiModelProperty(name = "OrgName", value = "组织机构名称")
+    private String OrgName;
+
+    @ApiModelProperty(name = "OrgId", value = "组织机构ID")
+    private String OrgId;
+
+    @ApiModelProperty(name = "OperationName", value = "运维单位名称")
+    private String OperationName;
+
+    @ApiModelProperty(name = "OperationId", value = "运维单位ID")
+    private String OperationId;
+
+    @ApiModelProperty(name = "VoltageLevel", value = "供电电压等级")
+    private String VoltageLevel;
+
+    @ApiModelProperty(name = "RailwayLineId", value = "铁路线路编号")
+    private String RailwayLineId;
+
+    @ApiModelProperty(name = "RailwayLineName", value = "铁路线路名称")
+    private String RailwayLineName;
+
+    @ApiModelProperty(name = "ConnetGroupWay", value = "牵引站变压器接线方式")
+    private String ConnetGroupWay;
+
+    @ApiModelProperty(name = "RatedCapacity", value = "牵引站变电容量")
+    private Float RatedCapacity;
+
+    @ApiModelProperty(name = "PowerId", value = "供电变电站编号")
+    private String PowerId;
+
+    @ApiModelProperty(name = "PowerName", value = "供电变电站名称")
+    private String PowerName;
+
+    @ApiModelProperty(name = "PowerVoltageLevel", value = "供电变电站电压等级")
+    private String PowerVoltageLevel;
+
+    @ApiModelProperty(name = "IfSpecial", value = "是否专线供电：0-否;1-是;")
+    private Integer IfSpecial;
+
+    @ApiModelProperty(name = "CreatedDate", value = "创建日期")
+    private String CreatedDate;
+
+    @ApiModelProperty(name = "UserTag", value = "用户标签")
+    private String UserTag;
+
+    @ApiModelProperty(name = "IsUpToGrid", value = "是否是上送国网监测点,0-否 1-是")
+    private Integer IsUpToGrid;
+
+    @ApiModelProperty(name = "Status", value = "数据状态：0-删除；1-正常")
+    private Integer Status;
+
+    /**
+     * 创建用户
+     */
+    @ApiModelProperty(name = "createBy", value = "创建用户")
+    private String createBy;
+
+    /**
+     * 创建时间
+     */
+    @ApiModelProperty(name = "createTime", value = "创建时间")
+    private Date createTime;
+
+    /**
+     * 更新用户
+     */
+    @ApiModelProperty(name = "updateBy", value = "更新用户")
+    private String updateBy;
+
+    /**
+     * 更新时间
+     */
+    @ApiModelProperty(name = "updateTime", value = "更新时间")
+    private Date updateTime;
+}
diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/UnitTreeVO.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/UnitTreeVO.java
deleted file mode 100644
index b420847b2..000000000
--- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/UnitTreeVO.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.njcn.device.pms.pojo.vo;
-
-import lombok.Data;
-
-import java.util.List;
-
-/**
- * pqs
- *
- * @author cdf
- * @date 2022/7/7
- */
-@Data
-public class UnitTreeVO {
-
-    private String id;
-
-    private String pid;
-
-    private String name;
-
-    private String code;
-
-    private List<UnitTreeVO> children;
-}
diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/utils/ExcelUtilXlsx.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/utils/ExcelUtilXlsx.java
new file mode 100644
index 000000000..5828ef8b5
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/utils/ExcelUtilXlsx.java
@@ -0,0 +1,230 @@
+package com.njcn.device.pms.utils;
+
+import lombok.extern.slf4j.Slf4j;
+import org.apache.poi.ss.usermodel.BorderStyle;
+import org.apache.poi.ss.usermodel.HorizontalAlignment;
+import org.apache.poi.ss.usermodel.IndexedColors;
+import org.apache.poi.ss.usermodel.VerticalAlignment;
+import org.apache.poi.ss.util.CellRangeAddress;
+import org.apache.poi.ss.util.RegionUtil;
+import org.apache.poi.xssf.usermodel.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.io.UnsupportedEncodingException;
+import java.util.List;
+
+/**
+ * Excel工具类
+ *
+ * @since 2022/7/22 17:06
+ **/
+@Slf4j
+public class ExcelUtilXlsx {
+    /**
+     * 数据写入
+     *
+     * @param title    表格标题
+     * @param colHead  列头（表头）
+     * @param dataList 数据列表
+     * @return 返回表格
+     */
+    public <T> XSSFWorkbook createExcel(String title, String[] colHead, List<Object[]> dataList) {
+        // 创建一个表格
+        XSSFWorkbook wb = new XSSFWorkbook();
+        // 创建工作页并赋名
+        XSSFSheet sheet = wb.createSheet("Sheet1");
+        // 创建标题
+        XSSFRow titleRow = sheet.createRow(0);
+        XSSFCell titleCell = titleRow.createCell(0);
+        // 设置标题高度
+        titleRow.setHeight((short) (20 * 25));
+        // 给标题设置样式
+        XSSFCellStyle titleStyle = this.getTitleStyle(wb);
+        // 给列头（表头）设置样式
+        XSSFCellStyle colHeadStyle = this.getColHeadStyle(wb);
+        // 给数据列表设置样式
+        XSSFCellStyle dataListStyle = this.getDataListStyle(wb);
+        // 合并单元格 起始行 截至列 起始列 截至行
+//        sheet.addMergedRegion(new CellRangeAddress(0, 0, 0, dataList.get(0).length - 1));
+        CellRangeAddress titleMerge = new CellRangeAddress(0, 0, 0, dataList.get(0).length - 1);
+        sheet.addMergedRegion(titleMerge);
+        RegionUtil.setBorderTop(BorderStyle.THIN, titleMerge, sheet);
+        RegionUtil.setBorderRight(BorderStyle.THIN, titleMerge, sheet);
+        // 给标题样式附上
+        titleCell.setCellStyle(titleStyle);
+        // 给标题赋值
+        titleCell.setCellValue(title);
+        // 创建表头行
+        XSSFRow colHeadRow = sheet.createRow(1);
+        // 设置表头行高度
+        colHeadRow.setHeight((short) (15 * 20));
+        // 给表头设置样式并赋值
+        for (int i = 0; i < colHead.length; i++) {
+            XSSFCell colHeadCell = colHeadRow.createCell(i);
+            colHeadCell.setCellStyle(colHeadStyle);
+            colHeadCell.setCellValue(colHead[i]);
+        }
+        // 将查询到的数据赋到列表
+        for (int i = 0; i < dataList.size(); i++) {
+            // 获取每一行的元素
+            Object[] data = dataList.get(i);
+            // 创建行
+            XSSFRow dataRow = sheet.createRow(i + 2);
+            // 循环当前行的列元素设置样式并赋值
+            for (int j = 0; j < data.length; j++) {
+                XSSFCell dataRowCell = dataRow.createCell(j);
+                dataRowCell.setCellStyle(dataListStyle);
+                dataRowCell.setCellValue(data[j].toString());
+                // 自适应列宽
+                sheet.autoSizeColumn(j);
+                sheet.setColumnWidth(j, sheet.getColumnWidth(j));
+            }
+        }
+        return wb;
+    }
+ 
+    /**
+     * 外部接口调用出口
+     *
+     * @param response 响应头
+     * @param title    表格标题
+     * @param colHead  列头（表头）
+     * @param dataList 数据列表
+     */
+    public void exportExcel(HttpServletResponse response, String title, String[] colHead, List<Object[]> dataList) {
+        try {
+            XSSFWorkbook result = createExcel(title, colHead, dataList);
+            String fileName = title + System.currentTimeMillis() + ".xlsx";
+            setResponseHeader(response, fileName);
+            OutputStream os = response.getOutputStream();
+            result.write(os);
+            os.close();
+        } catch (IOException e) {
+            log.error(e.getMessage());
+        }
+    }
+ 
+    /**
+     * 发送响应流方法
+     *
+     * @param response HttpServletResponse
+     * @param fileName String
+     */
+    public static void setResponseHeader(HttpServletResponse response, String fileName) {
+        try {
+            String fileName1 = new String(fileName.getBytes("UTF-8"), "UTF-8");
+            response.setContentType("application/octet-stream;charset=UTF-8");
+            response.setHeader("Content-Disposition", "attachment;filename=" + fileName1);
+            response.addHeader("Pargam", "no-cache");
+            response.addHeader("Cache-Control", "no-cache");
+        } catch (UnsupportedEncodingException e) {
+            log.error(e.getMessage());
+        }
+    }
+ 
+    /**
+     * 设置标题样式
+     *
+     * @param workbook 表格
+     * @return 样式
+     */
+    public XSSFCellStyle getTitleStyle(XSSFWorkbook workbook) {
+        // 设置字体
+        XSSFFont font = workbook.createFont();
+        // 设置字体大小
+        font.setFontHeightInPoints((short) 15);
+        // 设置字体加粗
+        font.setBold(true);
+        // 设置字体样式
+        font.setFontName("Courier New");
+        // 设置样式;
+        XSSFCellStyle style = workbook.createCellStyle();
+        // 在样式用应用设置的字体;
+        style.setFont(font);
+        // 设置自动换行;
+        style.setWrapText(false);
+        // 设置水平居中
+        style.setAlignment(HorizontalAlignment.CENTER);
+        // 设置垂直居中
+        style.setVerticalAlignment(VerticalAlignment.CENTER);
+        // 设置单元格背景颜色
+        style.setFillForegroundColor(IndexedColors.BLACK.getIndex());
+        return style;
+    }
+ 
+    /**
+     * 给列头设置样式
+     *
+     * @param workbook 表格
+     * @return 样式
+     */
+    public XSSFCellStyle getColHeadStyle(XSSFWorkbook workbook) {
+        // 设置字体
+        XSSFFont font = workbook.createFont();
+        // 设置字体大小
+        font.setFontHeightInPoints((short) 12);
+        // 设置字体样式
+        font.setFontName("Courier New");
+        // 设置字体加粗
+        font.setBold(true);
+        // 设置样式;
+        XSSFCellStyle style = workbook.createCellStyle();
+        // 在样式用应用设置的字体;
+        style.setFont(font);
+        // 设置水平居中
+        style.setAlignment(HorizontalAlignment.CENTER);
+        // 设置垂直居中
+        style.setVerticalAlignment(VerticalAlignment.CENTER);
+        // 上边框
+        style.setBorderTop(BorderStyle.THIN);
+        // 下边框
+        style.setBorderBottom(BorderStyle.THIN);
+        // 左边框
+        style.setBorderLeft(BorderStyle.THIN);
+        // 右边框
+        style.setBorderRight(BorderStyle.THIN);
+        // 设置自动换行;
+        style.setWrapText(false);
+        // 设置单元格背景颜色
+        style.setFillForegroundColor(IndexedColors.BLACK.getIndex());
+        return style;
+    }
+ 
+    /**
+     * 给数据列表设置样式
+     *
+     * @param workbook 表格
+     * @return 样式
+     */
+    public XSSFCellStyle getDataListStyle(XSSFWorkbook workbook) {
+        // 设置字体
+        XSSFFont font = workbook.createFont();
+        // 设置字体大小
+        font.setFontHeightInPoints((short) 13);
+        // 设置字体样式
+        font.setFontName("Courier New");
+        // 设置样式;
+        XSSFCellStyle style = workbook.createCellStyle();
+        // 在样式用应用设置的字体;
+        style.setFont(font);
+        // 设置水平居中
+        style.setAlignment(HorizontalAlignment.CENTER);
+        // 设置垂直居中
+        style.setVerticalAlignment(VerticalAlignment.CENTER);
+        // 上边框
+        style.setBorderTop(BorderStyle.THIN);
+        // 下边框
+        style.setBorderBottom(BorderStyle.THIN);
+        // 左边框
+        style.setBorderLeft(BorderStyle.THIN);
+        // 右边框
+        style.setBorderRight(BorderStyle.THIN);
+        // 设置自动换行;
+        style.setWrapText(false);
+        // 设置单元格背景颜色
+        style.setFillForegroundColor(IndexedColors.BLACK.getIndex());
+        return style;
+    }
+}
\ No newline at end of file
diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/utils/PmsDeviceEnumUtil.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/utils/PmsDeviceEnumUtil.java
new file mode 100644
index 000000000..455a33799
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/utils/PmsDeviceEnumUtil.java
@@ -0,0 +1,50 @@
+package com.njcn.device.pms.utils;
+
+import cn.hutool.core.util.StrUtil;
+import com.njcn.common.pojo.enums.response.CommonResponseEnum;
+import com.njcn.common.pojo.exception.BusinessException;
+import com.njcn.common.pojo.response.HttpResult;
+import com.njcn.common.utils.EnumUtils;
+import com.njcn.device.pms.enums.PmsDeviceResponseEnum;
+
+import javax.validation.constraints.NotNull;
+import java.util.Objects;
+
+/**
+ * @author hongawen
+ * @version 1.0.0
+ * @date 2021年12月20日 10:03
+ */
+public class PmsDeviceEnumUtil {
+
+
+    /**
+     * 获取PmsDeviceResponseEnum实例
+     */
+    public static PmsDeviceResponseEnum getDeviceEnumResponseEnumByMessage(@NotNull Object value) {
+        PmsDeviceResponseEnum deviceResponseEnum;
+        try {
+            String message = value.toString();
+            if(message.indexOf(StrUtil.C_COMMA)>0){
+                value = message.substring(message.indexOf(StrUtil.C_COMMA)+1);
+            }
+            deviceResponseEnum = EnumUtils.valueOf(PmsDeviceResponseEnum.class, value, PmsDeviceResponseEnum.class.getMethod(BusinessException.GET_MESSAGE_METHOD));
+            return Objects.isNull(deviceResponseEnum) ? PmsDeviceResponseEnum.DEVICE_COMMON_ERROR : deviceResponseEnum;
+        } catch (NoSuchMethodException e) {
+            throw new BusinessException(CommonResponseEnum.INTERNAL_ERROR);
+        }
+    }
+
+    public static Enum<?> getExceptionEnum(HttpResult<Object> result){
+        //如果返回错误，且为内部错误，则直接抛出异常
+        CommonResponseEnum commonResponseEnum = EnumUtils.getCommonResponseEnumByCode(result.getCode());
+        if (commonResponseEnum == CommonResponseEnum.DEVICE_RESPONSE_ENUM) {
+            return getDeviceEnumResponseEnumByMessage(result.getMessage());
+        }
+        return commonResponseEnum;
+    }
+
+
+
+
+}
diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/DistributionMonitorController.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/DistributionMonitorController.java
new file mode 100644
index 000000000..85f74c5c0
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/DistributionMonitorController.java
@@ -0,0 +1,55 @@
+package com.njcn.device.pms.controller;
+
+
+import com.njcn.common.pojo.enums.response.CommonResponseEnum;
+import com.njcn.common.pojo.response.HttpResult;
+import com.njcn.common.utils.HttpResultUtil;
+import com.njcn.device.pms.pojo.dto.PmsMonitorBaseDTO;
+import com.njcn.device.pms.pojo.param.DistributionMonitorParam;
+import com.njcn.device.pms.pojo.param.PmsDeviceInfoParam;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+import com.njcn.web.controller.BaseController;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  配网监测点台账
+ * </p>
+ *
+ * @author hongawen
+ * @since 2022-10-14
+ */
+@RestController
+@RequestMapping("/pms/distributionMonitor")
+@Slf4j
+@RequiredArgsConstructor
+@Api(tags = "台账-配网监测点")
+public class DistributionMonitorController extends BaseController {
+
+    /**
+     * 新增配网监测点表
+     * @author cdf
+     * @date 2022/10/26
+     */
+    @PostMapping
+    @ApiImplicitParam(name = "distributionMonitorParam",value = "配网监测点实体",required = true)
+    public HttpResult<Boolean> addDistributionMonitor(@RequestBody DistributionMonitorParam distributionMonitorParam){
+        String methodDescribe = getMethodDescribe("addDistributionMonitor");
+
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
+    }
+
+
+
+
+}
+
diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/GeneratrixWireController.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/GeneratrixWireController.java
new file mode 100644
index 000000000..941cb8a7a
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/GeneratrixWireController.java
@@ -0,0 +1,105 @@
+package com.njcn.device.pms.controller;
+
+import com.njcn.common.pojo.annotation.OperateInfo;
+import com.njcn.common.pojo.constant.OperateType;
+import com.njcn.common.pojo.enums.common.LogEnum;
+import com.njcn.common.pojo.enums.response.CommonResponseEnum;
+import com.njcn.common.pojo.response.HttpResult;
+import com.njcn.common.utils.HttpResultUtil;
+import com.njcn.device.pms.pojo.param.GeneratrixWireParam;
+import com.njcn.device.pms.pojo.po.GeneratrixWire;
+import com.njcn.device.pms.service.IGeneratrixWireService;
+import com.njcn.web.controller.BaseController;
+import com.njcn.web.pojo.param.BaseParam;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.constraints.NotEmpty;
+import java.util.List;
+import java.util.Objects;
+
+/**
+ * pms-device
+ *
+ * @author cdf
+ * @date 2022/10/26
+ */
+@RestController
+@RequestMapping("/pms/GeneratrixWireWire")
+@Slf4j
+@Api(tags = "台账-线路")
+@RequiredArgsConstructor
+public class GeneratrixWireController extends BaseController {
+
+    private final IGeneratrixWireService iGeneratrixWireService;
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON,operateType = OperateType.ADD)
+    @PostMapping("/addGeneratrixWire")
+    @ApiOperation("新增线路")
+    @ApiImplicitParam(name = "generatrixWireParam", value = "线路实体", required = true)
+    public HttpResult<Boolean> addGeneratrixWire(@RequestBody GeneratrixWireParam generatrixWireParam) {
+        String methodDescribe = getMethodDescribe("addGeneratrixWire");
+        boolean result = iGeneratrixWireService.addGeneratrixWire(generatrixWireParam);
+        if(result){
+            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
+        }
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, null, methodDescribe);
+
+    }
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON,operateType = OperateType.UPDATE)
+    @PostMapping("/updateGeneratrixWire")
+    @ApiOperation("修改线路")
+    @ApiImplicitParam(name = "generatrixWireParam", value = "线路实体", required = true)
+    public HttpResult<Boolean> updateGeneratrixWire(@RequestBody GeneratrixWireParam.UpdateGeneratrixWireParam generatrixWireParam) {
+        String methodDescribe = getMethodDescribe("updateGeneratrixWire");
+        boolean result = iGeneratrixWireService.updateGeneratrixWire(generatrixWireParam);
+        if(result){
+            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
+        }
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, null, methodDescribe);
+
+    }
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON,operateType = OperateType.DELETE)
+    @DeleteMapping("/delGeneratrixWire")
+    @ApiOperation("删除线路")
+    @ApiImplicitParam(name = "generatrixWireIds", value = "线路ids", required = true)
+    public HttpResult<Boolean> delGeneratrixWire(@RequestBody @NotEmpty(message = "线路id不可为空") List<String> generatrixWireIds) {
+        String methodDescribe = getMethodDescribe("delGeneratrixWire");
+        boolean result = iGeneratrixWireService.delGeneratrixWire(generatrixWireIds);
+        if(result){
+            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
+        }
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, null, methodDescribe);
+
+    }
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @GetMapping("/getGeneratrixWireById")
+    @ApiOperation("根据线路id获取线路")
+    @ApiImplicitParam(name = "generatrixWireId", value = "线路id", required = true)
+    public HttpResult<GeneratrixWire> getGeneratrixWireById(@RequestParam("generatrixWireId") String generatrixWireId) {
+        String methodDescribe = getMethodDescribe("getGeneratrixWireById");
+        GeneratrixWire result = iGeneratrixWireService.getGeneratrixWireById(generatrixWireId);
+        if(Objects.nonNull(result)){
+            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
+        }
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, null, methodDescribe);
+
+    }
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/getGeneratrixWireList")
+    @ApiOperation("获取线路列表")
+    @ApiImplicitParam(name = "baseParam", value = "基本查询体", required = true)
+    public HttpResult<List<GeneratrixWire>> getGeneratrixWireList(@RequestBody BaseParam baseParam) {
+        String methodDescribe = getMethodDescribe("getGeneratrixWireList");
+        List<GeneratrixWire> result = iGeneratrixWireService.getGeneratrixWireList(baseParam);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
+    }
+}
diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/PvDispatchController.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/HarmonicGeneralManagementController.java
similarity index 52%
rename from pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/PvDispatchController.java
rename to pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/HarmonicGeneralManagementController.java
index e16b87467..97feb0056 100644
--- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/PvDispatchController.java
+++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/HarmonicGeneralManagementController.java
@@ -1,25 +1,22 @@
 package com.njcn.device.pms.controller;
 
 
-import com.njcn.web.controller.BaseController;
-import io.swagger.annotations.Api;
-import lombok.RequiredArgsConstructor;
 import org.springframework.web.bind.annotation.RequestMapping;
+
 import org.springframework.web.bind.annotation.RestController;
+import com.njcn.web.controller.BaseController;
 
 /**
  * <p>
  *  前端控制器
  * </p>
  *
- * @author cdf
- * @since 2022-07-05
+ * @author hongawen
+ * @since 2022-10-14
  */
 @RestController
-@RequestMapping("/pvDispatch")
-@Api(tags = "设备控制器")
-@RequiredArgsConstructor
-public class PvDispatchController extends BaseController {
+@RequestMapping("/pms/harmonicGeneralManagement")
+public class HarmonicGeneralManagementController extends BaseController {
 
 }
 
diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/HarmonicGeneralManagementDataController.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/HarmonicGeneralManagementDataController.java
new file mode 100644
index 000000000..1f2ab32b5
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/HarmonicGeneralManagementDataController.java
@@ -0,0 +1,22 @@
+package com.njcn.device.pms.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+import com.njcn.web.controller.BaseController;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author hongawen
+ * @since 2022-10-14
+ */
+@RestController
+@RequestMapping("/pms/harmonicGeneralManagementData")
+public class HarmonicGeneralManagementDataController extends BaseController {
+
+}
+
diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/MonitorController.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/MonitorController.java
new file mode 100644
index 000000000..7e8fd15ea
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/MonitorController.java
@@ -0,0 +1,170 @@
+package com.njcn.device.pms.controller;
+
+import cn.hutool.core.collection.CollectionUtil;
+import com.njcn.common.pojo.annotation.OperateInfo;
+import com.njcn.common.pojo.constant.OperateType;
+import com.njcn.common.pojo.enums.common.LogEnum;
+import com.njcn.common.pojo.enums.response.CommonResponseEnum;
+import com.njcn.common.pojo.response.HttpResult;
+import com.njcn.common.utils.HttpResultUtil;
+import com.njcn.device.pms.pojo.dto.PmsMonitorDTO;
+import com.njcn.device.pms.pojo.dto.PmsMonitorInfoDTO;
+import com.njcn.device.pms.pojo.dto.PwPmsMonitorDTO;
+import com.njcn.device.pms.pojo.param.MonitorParam;
+import com.njcn.device.pms.pojo.param.PmsMonitorInfoParam;
+import com.njcn.device.pms.pojo.param.PmsMonitorParam;
+import com.njcn.device.pms.pojo.param.PwPmsMonitorParam;
+import com.njcn.device.pms.pojo.vo.PmsMonitorVO;
+import com.njcn.device.pms.service.IMonitorService;
+
+import com.njcn.device.pq.pojo.po.Overlimit;
+import com.njcn.web.controller.BaseController;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.constraints.NotEmpty;
+import java.util.List;
+
+/**
+ * <p>
+ * 前端控制器
+ * </p>
+ *
+ * @author hongawen
+ * @since 2022-10-14
+ */
+@RestController
+@RequestMapping("/pms/monitor")
+@Slf4j
+@Api(tags = "主网监测点信息")
+@RequiredArgsConstructor
+public class MonitorController extends BaseController {
+
+    private final IMonitorService monitorService;
+
+    /**
+     * 获取监测点信息
+     */
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/getMonitorInfo")
+    @ApiOperation("获取指定的监测点信息")
+//    @ApiImplicitParams({
+//            @ApiImplicitParam(name = "pmsMonitorInfoParam", value = "获取指定的监测点信息条件", required = true)
+//    })
+    public HttpResult<List<PmsMonitorInfoDTO>> getMonitorInfo(@RequestBody @Validated PmsMonitorInfoParam pmsMonitorInfoParam) {
+        String methodDescribe = getMethodDescribe("getMonitorInfo");
+        List<PmsMonitorInfoDTO> monitorInfo = monitorService.getMonitorInfo(pmsMonitorInfoParam);
+        if (CollectionUtil.isEmpty(monitorInfo)) {
+            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.NO_DATA, null, methodDescribe);
+        } else {
+            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, monitorInfo, methodDescribe);
+        }
+    }
+
+    /***
+     * 根据条件获取监测点信息列表
+     * @author jianghaifei
+     * @date 2022-10-20 20:12
+     * @param pmsMonitorParam
+     */
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/getMonitorInfoListByCond")
+    @ApiOperation("根据条件获取监测点信息列表")
+    public HttpResult<List<PmsMonitorDTO>> getMonitorInfoListByCond(@RequestBody PmsMonitorParam pmsMonitorParam) {
+        String methodDescribe = getMethodDescribe("getMonitorInfoListByCond");
+        List<PmsMonitorDTO> list = monitorService.getMonitorInfoListByCond(pmsMonitorParam);
+        if (CollectionUtil.isEmpty(list)) {
+            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.NO_DATA, null, methodDescribe);
+        } else {
+            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);
+        }
+    }
+
+    /***
+     * 获取所有监测点信息
+     * @author jianghaifei
+     * @date 2022-10-24 20:01
+     * @param
+     * @return com.njcn.common.pojo.response.HttpResult<java.util.List<com.njcn.device.pms.pojo.vo.PmsMonitorVO>>
+     */
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/getAllMonitorList")
+    @ApiOperation("获取所有监测点信息")
+    public HttpResult<List<PmsMonitorVO>> getAllMonitorList() {
+        String methodDescribe = getMethodDescribe("getAllMonitorList");
+        List<PmsMonitorVO> monitorList = monitorService.getAllMonitorList();
+        if (CollectionUtil.isEmpty(monitorList)) {
+            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.NO_DATA, null, methodDescribe);
+        } else {
+            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, monitorList, methodDescribe);
+        }
+    }
+
+
+
+
+
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON,operateType = OperateType.ADD)
+    @PostMapping("/addMonitor")
+    @ApiOperation("新增主网监测点")
+    @ApiImplicitParam(name = "monitorParam", value = "主网监测点实体", required = true)
+    public HttpResult<Boolean> addMonitor(@RequestBody MonitorParam monitorParam) {
+        String methodDescribe = getMethodDescribe("addMonitor");
+        boolean result = monitorService.addMonitor(monitorParam);
+        if(result){
+            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
+        }
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, null, methodDescribe);
+
+    }
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON,operateType = OperateType.UPDATE)
+    @PostMapping("/updateMonitor")
+    @ApiOperation("修改主网监测点")
+    @ApiImplicitParam(name = "monitorParam", value = "主网监测点实体", required = true)
+    public HttpResult<Boolean> updateMonitor(@RequestBody MonitorParam.UpdateMonitorParam monitorParam) {
+        String methodDescribe = getMethodDescribe("updateMonitor");
+        boolean result = monitorService.updateMonitor(monitorParam);
+        if(result){
+            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
+        }
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, null, methodDescribe);
+
+    }
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON,operateType = OperateType.UPDATE)
+    @DeleteMapping("/delMonitor")
+    @ApiOperation("删除主网监测点")
+    @ApiImplicitParam(name = "monitorIds", value = "主网监测点ids", required = true)
+    public HttpResult<Boolean> delMonitor(@RequestBody @NotEmpty(message = "主网监测点id不可为空") List<String> monitorIds) {
+        String methodDescribe = getMethodDescribe("delMonitor");
+        boolean result = monitorService.delMonitor(monitorIds);
+        if(result){
+            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
+        }
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, null, methodDescribe);
+
+    }
+
+
+
+
+    /**分割线-----------------------------------------------------------*/
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/getOverLimitData")
+    @ApiOperation("根据监测点id获取越限数值")
+    @ApiImplicitParam(name = "id", value = "监测点id", required = true)
+    public HttpResult<Overlimit> getOverLimitData(@RequestParam("id") String id) {
+        String methodDescribe = getMethodDescribe("getOverLimitData");
+        Overlimit result = monitorService.getOverLimitData(id);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
+    }
+
+}
+
diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/PmsGeneralDeviceController.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/PmsGeneralDeviceController.java
new file mode 100644
index 000000000..dc7beccad
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/PmsGeneralDeviceController.java
@@ -0,0 +1,107 @@
+package com.njcn.device.pms.controller;
+
+import cn.hutool.core.collection.CollectionUtil;
+import com.njcn.common.pojo.annotation.OperateInfo;
+import com.njcn.common.pojo.dto.SimpleDTO;
+import com.njcn.common.pojo.enums.common.LogEnum;
+import com.njcn.common.pojo.enums.response.CommonResponseEnum;
+import com.njcn.common.pojo.response.HttpResult;
+import com.njcn.common.utils.HttpResultUtil;
+import com.njcn.device.pms.pojo.dto.PmsGeneralDeviceDTO;
+import com.njcn.device.pms.pojo.param.PmsDeviceInfoParam;
+import com.njcn.device.pms.service.IPmsGeneralDeviceService;
+import com.njcn.device.pq.pojo.dto.GeneralDeviceDTO;
+import com.njcn.device.pq.pojo.param.DeviceInfoParam;
+import com.njcn.web.controller.BaseController;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * @author hongawen
+ * @version 1.0.0
+ * @date 2022年10月14日 09:19
+ */
+@Slf4j
+@Api(tags = "获取终端信息")
+@RestController
+@RequestMapping("/pmsDeviceInfo")
+@RequiredArgsConstructor
+public class PmsGeneralDeviceController extends BaseController {
+
+    private final IPmsGeneralDeviceService generalPmsDeviceService;
+
+
+    /**
+     * 获取指定组织下台账综合信息
+     */
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/getPmsDeviceInfoWithInOrg")
+    @ApiOperation("获取指定组织下台账综合信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pmsDeviceInfoParam", value = "查询台账条件", required = true)
+    })
+    public HttpResult<List<PmsGeneralDeviceDTO>> getPmsDeviceInfoWithInOrg(@RequestBody @Validated PmsDeviceInfoParam pmsDeviceInfoParam) {
+        String methodDescribe = getMethodDescribe("getPmsDeviceInfoWithInOrg");
+        List<PmsGeneralDeviceDTO> deptDeviceInfos = generalPmsDeviceService.getPmsDeviceInfoWithInOrg(pmsDeviceInfoParam);
+        if (CollectionUtil.isEmpty(deptDeviceInfos)) {
+            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.NO_DATA, null, methodDescribe);
+        } else {
+            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, deptDeviceInfos, methodDescribe);
+        }
+    }
+
+    /**
+     * 主网获取指定组织下变电站
+     */
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/getPmsPowerrInfoWithInOrg")
+    @ApiOperation("主网获取指定组织下变电站")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pmsDeviceInfoParam", value = "查询变电站条件", required = true)
+    })
+    public HttpResult<List<SimpleDTO>> getPmsPowerrInfoWithInOrg(@RequestBody @Validated PmsDeviceInfoParam pmsDeviceInfoParam) {
+        String methodDescribe = getMethodDescribe("getPmsPowerrInfoWithInOrg");
+        List<SimpleDTO> pmsPowerrInfoList = generalPmsDeviceService.getPmsPowerrInfoWithInOrg(pmsDeviceInfoParam);
+        if (CollectionUtil.isEmpty(pmsPowerrInfoList)) {
+            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.NO_DATA, null, methodDescribe);
+        } else {
+            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, pmsPowerrInfoList, methodDescribe);
+        }
+    }
+
+
+    /**
+     * 获取指定组织下台账综合信息
+     */
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/getPwPmsDeviceInfoWithOrgId")
+    @ApiOperation("获取指定组织下配网信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pmsDeviceInfoParam", value = "查询台账条件", required = true)
+    })
+    public HttpResult<List<PmsGeneralDeviceDTO>> getPwPmsDeviceInfoWithOrgId(@RequestBody @Validated PmsDeviceInfoParam pmsDeviceInfoParam) {
+        String methodDescribe = getMethodDescribe("getPmsDeviceInfoByOrgId");
+        List<PmsGeneralDeviceDTO> deptDeviceInfos = generalPmsDeviceService.getPmsDeviceInfoByOrgId(pmsDeviceInfoParam);
+        if (CollectionUtil.isEmpty(deptDeviceInfos)) {
+            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.NO_DATA, null, methodDescribe);
+        } else {
+            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, deptDeviceInfos, methodDescribe);
+        }
+    }
+
+
+
+
+
+}
diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/PmsGeneratrixController.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/PmsGeneratrixController.java
new file mode 100644
index 000000000..8377db7ff
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/PmsGeneratrixController.java
@@ -0,0 +1,128 @@
+package com.njcn.device.pms.controller;
+
+import cn.hutool.core.collection.CollectionUtil;
+import com.njcn.common.pojo.annotation.OperateInfo;
+import com.njcn.common.pojo.constant.OperateType;
+import com.njcn.common.pojo.enums.common.LogEnum;
+import com.njcn.common.pojo.enums.response.CommonResponseEnum;
+import com.njcn.common.pojo.response.HttpResult;
+import com.njcn.common.utils.HttpResultUtil;
+import com.njcn.device.pms.pojo.dto.PmsGeneratrixDTO;
+import com.njcn.device.pms.pojo.param.GeneratrixParam;
+import com.njcn.device.pms.pojo.param.PmsGeneratrixParam;
+import com.njcn.device.pms.pojo.po.Generatrix;
+import com.njcn.device.pms.service.IPmsGeneratrixService;
+import com.njcn.web.controller.BaseController;
+import com.njcn.web.pojo.param.BaseParam;
+import io.swagger.annotations.*;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.constraints.NotEmpty;
+import java.util.List;
+import java.util.Objects;
+
+/**
+ * 母线信息
+ *
+ * @author yzh
+ * @date 2022/10/18
+ */
+
+@RestController
+@RequestMapping("/pmsGeneratrix")
+@Slf4j
+@Api(tags = "获取母线信息")
+@RequiredArgsConstructor
+public class PmsGeneratrixController extends BaseController {
+
+    private final IPmsGeneratrixService pmsGeneratrixService;
+
+    /**
+     * 获取指定母线信息
+     *
+     * @param pmsGeneratrixParam 获取指定的监测点信息条件
+     * @return 指定母线信息
+     */
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/getGeneratrixInfo")
+    @ApiOperation("获取指定母线信息")
+    @ApiImplicitParam(name = "pmsGeneratrixParam", value = "获取指定母线信息条件", required = true)
+    public HttpResult<List<PmsGeneratrixDTO>> getGeneratrixInfo(@RequestBody @Validated PmsGeneratrixParam pmsGeneratrixParam) {
+        String methodDescribe = getMethodDescribe("getGeneratrixInfo");
+        List<PmsGeneratrixDTO> monitorInfo = pmsGeneratrixService.getGeneratrixInfo(pmsGeneratrixParam);
+        if (CollectionUtil.isEmpty(monitorInfo)) {
+            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.NO_DATA, null, methodDescribe);
+        } else {
+            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, monitorInfo, methodDescribe);
+        }
+    }
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON, operateType = OperateType.ADD)
+    @PostMapping("/addGeneratrix")
+    @ApiOperation("新增母线")
+    @ApiImplicitParam(name = "generatrixParam", value = "母线实体", required = true)
+    public HttpResult<Boolean> addGeneratrix(@RequestBody GeneratrixParam generatrixParam) {
+        String methodDescribe = getMethodDescribe("addGeneratrix");
+        boolean result = pmsGeneratrixService.addGeneratrix(generatrixParam);
+        if (result) {
+            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
+        }
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, null, methodDescribe);
+
+    }
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON, operateType = OperateType.UPDATE)
+    @PostMapping("/updateGeneratrix")
+    @ApiOperation("修改母线")
+    @ApiImplicitParam(name = "generatrixParam", value = "母线实体", required = true)
+    public HttpResult<Boolean> updateGeneratrix(@RequestBody GeneratrixParam.UpdateGeneratrixParam generatrixParam) {
+        String methodDescribe = getMethodDescribe("updateGeneratrix");
+        boolean result = pmsGeneratrixService.updateGeneratrix(generatrixParam);
+        if (result) {
+            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
+        }
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, null, methodDescribe);
+
+    }
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON, operateType = OperateType.DELETE)
+    @DeleteMapping("/delGeneratrix")
+    @ApiOperation("删除母线")
+    @ApiImplicitParam(name = "generatrixIds", value = "母线ids", required = true)
+    public HttpResult<Boolean> delGeneratrix(@RequestBody @NotEmpty(message = "母线id不可为空") List<String> generatrixIds) {
+        String methodDescribe = getMethodDescribe("delGeneratrix");
+        boolean result = pmsGeneratrixService.delGeneratrix(generatrixIds);
+        if (result) {
+            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
+        }
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, null, methodDescribe);
+
+    }
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @GetMapping("/getGeneratrixById")
+    @ApiOperation("根据母线id获取母线")
+    @ApiImplicitParam(name = "generatrixId", value = "母线id", required = true)
+    public HttpResult<Generatrix> getGeneratrixById(@RequestParam("generatrixId") String generatrixId) {
+        String methodDescribe = getMethodDescribe("getGeneratrixById");
+        Generatrix result = pmsGeneratrixService.getGeneratrixById(generatrixId);
+        if (Objects.nonNull(result)) {
+            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
+        }
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, null, methodDescribe);
+
+    }
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/getGeneratrixList")
+    @ApiOperation("获取母线列表")
+    @ApiImplicitParam(name = "baseParam", value = "基本查询体", required = true)
+    public HttpResult<List<Generatrix>> getGeneratrixList(@RequestBody BaseParam baseParam) {
+        String methodDescribe = getMethodDescribe("getGeneratrixList");
+        List<Generatrix> result = pmsGeneratrixService.getGeneratrixList(baseParam);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
+    }
+}
diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/PowerClientController.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/PowerClientController.java
new file mode 100644
index 000000000..e29c2e09b
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/PowerClientController.java
@@ -0,0 +1,109 @@
+package com.njcn.device.pms.controller;
+
+
+import com.njcn.common.pojo.annotation.OperateInfo;
+import com.njcn.common.pojo.constant.OperateType;
+import com.njcn.common.pojo.enums.common.LogEnum;
+import com.njcn.common.pojo.enums.response.CommonResponseEnum;
+import com.njcn.common.pojo.response.HttpResult;
+import com.njcn.common.utils.HttpResultUtil;
+import com.njcn.device.pms.pojo.param.PowerClientParam;
+import com.njcn.device.pms.pojo.po.PowerClient;
+import com.njcn.device.pms.service.IPowerClientService;
+import com.njcn.web.pojo.param.BaseParam;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+import com.njcn.web.controller.BaseController;
+
+import javax.validation.constraints.NotEmpty;
+import java.util.List;
+import java.util.Objects;
+
+/**
+ * <p>
+ *  用电用户控制器
+ * </p>
+ *
+ * @author hongawen
+ * @since 2022-10-14
+ */
+@RestController
+@RequestMapping("/pms/powerClient")
+@RequiredArgsConstructor
+@Api(tags = "台账-用电用户")
+public class PowerClientController extends BaseController {
+
+    private final IPowerClientService iPowerClientService;
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON,operateType = OperateType.ADD)
+    @PostMapping("/addPowerClient")
+    @ApiOperation("新增用电用户")
+    @ApiImplicitParam(name = "powerClientParam", value = "用电用户实体", required = true)
+    public HttpResult<Boolean> addPowerClient(@RequestBody PowerClientParam powerClientParam) {
+        String methodDescribe = getMethodDescribe("addPowerClient");
+        boolean result = iPowerClientService.addPowerClient(powerClientParam);
+        if(result){
+            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
+        }
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, null, methodDescribe);
+
+    }
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON,operateType = OperateType.UPDATE)
+    @PostMapping("/updatePowerClient")
+    @ApiOperation("修改用电用户")
+    @ApiImplicitParam(name = "powerClientParam", value = "用电用户实体", required = true)
+    public HttpResult<Boolean> updatePowerClient(@RequestBody PowerClientParam powerClientParam) {
+        String methodDescribe = getMethodDescribe("updatePowerClient");
+        boolean result = iPowerClientService.updatePowerClient(powerClientParam);
+        if(result){
+            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
+        }
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, null, methodDescribe);
+
+    }
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON,operateType = OperateType.DELETE)
+    @DeleteMapping("/delPowerClient")
+    @ApiOperation("删除用电用户")
+    @ApiImplicitParam(name = "powerClientIds", value = "用电用户ids", required = true)
+    public HttpResult<Boolean> delPowerClient(@RequestBody @NotEmpty(message = "用电用户id不可为空") List<String> powerClientIds) {
+        String methodDescribe = getMethodDescribe("delPowerClient");
+        boolean result = iPowerClientService.delPowerClient(powerClientIds);
+        if(result){
+            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
+        }
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, null, methodDescribe);
+
+    }
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @GetMapping("/getPowerClientById")
+    @ApiOperation("根据用电用户id获取用电用户")
+    @ApiImplicitParam(name = "powerClientId", value = "用电用户id", required = true)
+    public HttpResult<PowerClient> getPowerClientById(@RequestParam("powerClientId") String powerClientId) {
+        String methodDescribe = getMethodDescribe("getPowerClientById");
+        PowerClient result = iPowerClientService.getPowerClientById(powerClientId);
+        if(Objects.nonNull(result)){
+            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
+        }
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, null, methodDescribe);
+
+    }
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/getPowerClientList")
+    @ApiOperation("获取用电用户列表")
+    @ApiImplicitParam(name = "baseParam", value = "基本查询体", required = true)
+    public HttpResult<List<PowerClient>> getPowerClientList(@RequestBody BaseParam baseParam) {
+        String methodDescribe = getMethodDescribe("getPowerClientList");
+        List<PowerClient> result = iPowerClientService.getPowerClientList(baseParam);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
+    }
+
+}
+
diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/PowerDistributionareaController.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/PowerDistributionareaController.java
new file mode 100644
index 000000000..a5ac06387
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/PowerDistributionareaController.java
@@ -0,0 +1,133 @@
+package com.njcn.device.pms.controller;
+
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.njcn.common.pojo.annotation.OperateInfo;
+import com.njcn.common.pojo.constant.OperateType;
+import com.njcn.common.pojo.enums.common.LogEnum;
+import com.njcn.common.pojo.enums.response.CommonResponseEnum;
+import com.njcn.common.pojo.response.HttpResult;
+import com.njcn.common.utils.HttpResultUtil;
+import com.njcn.common.utils.LogUtil;
+import com.njcn.device.pms.pojo.param.PowerDistributionareaParam;
+import com.njcn.device.pms.pojo.po.PowerDistributionarea;
+import com.njcn.device.pms.pojo.vo.PowerDistributionareaVO;
+import com.njcn.device.pms.service.IPowerDistributionareaService;
+import com.njcn.system.pojo.param.EventTemplateParam;
+import com.njcn.system.pojo.po.EventTemplate;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import com.njcn.web.controller.BaseController;
+
+import java.util.List;
+import java.util.Objects;
+
+/**
+ * <p>
+ *  台区信息增删改查
+ * </p>
+ *
+ * @author hongawen
+ * @since 2022-10-14
+ */
+@Slf4j
+@RestController
+@RequestMapping("/pms/powerDistributionarea")
+@Api(tags = "台区信息")
+@RequiredArgsConstructor
+@Validated
+public class PowerDistributionareaController extends BaseController {
+
+    private final IPowerDistributionareaService iPowerDistributionareaService;
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("getPowerDistributionAreaList")
+    @ApiOperation("查询台区所有信息")
+    @ApiImplicitParam(name = "queryParam",value = "查询台区信息",required = true)
+    public HttpResult<Page<PowerDistributionareaVO>> getList(@RequestBody @Validated PowerDistributionareaParam.QueryParam queryParam){
+        String methodDescribe = getMethodDescribe("getList");
+        LogUtil.njcnDebug(log, "{}，查询数据为：{}", methodDescribe, queryParam);
+        Page<PowerDistributionareaVO> res = iPowerDistributionareaService.getList(queryParam);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS,res,methodDescribe);
+    }
+
+    @OperateInfo(info = LogEnum.SYSTEM_COMMON)
+    @GetMapping("/getPowerDistributionAreaById")
+    @ApiOperation("根据ID查询台区数据")
+    @ApiImplicitParam(name = "id",value = "id",required = true)
+    public HttpResult<PowerDistributionarea> getDistrictById(@RequestParam("id") String id){
+        String methodDescribe = getMethodDescribe("getDistrictById");
+        PowerDistributionarea powerDistributionarea = iPowerDistributionareaService.getDistrictById(id);
+        if (Objects.nonNull(powerDistributionarea)){
+            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, powerDistributionarea, methodDescribe);
+        }
+        else {
+            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
+        }
+    }
+
+    /**
+     * 新增台区信息
+     * @author hany
+     * @date 2022/10/26
+     */
+    @PostMapping("/addPowerDistributionArea")
+    @OperateInfo(info = LogEnum.SYSTEM_COMMON,operateType=OperateType.ADD)
+    @ApiOperation("新增台区信息")
+    @ApiImplicitParam(name = "newParam", value = "模板实体", required = true)
+    public HttpResult<Object> add(@RequestBody @Validated PowerDistributionareaParam newParam){
+        String methodDescribe = getMethodDescribe("add");
+        boolean result = iPowerDistributionareaService.add(newParam);
+        if (result) {
+            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
+        } else {
+            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, null, methodDescribe);
+        }
+    }
+
+    /**
+     * 修改台区信息
+     * @author hany
+     * @date 2022/10/26
+     */
+    @PostMapping("/updatePowerDistributionArea")
+    @OperateInfo(info = LogEnum.SYSTEM_COMMON,operateType = OperateType.UPDATE)
+    @ApiOperation("修改台区信息")
+    @ApiImplicitParam(name = "UpdateParam", value = "更新实体", required = true)
+    public HttpResult<Object> update(@RequestBody @Validated PowerDistributionareaParam UpdateParam){
+        String methodDescribe = getMethodDescribe("update");
+        boolean result = iPowerDistributionareaService.update(UpdateParam);
+        if (result) {
+            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
+        } else {
+            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, null, methodDescribe);
+        }
+    }
+
+    /**
+     * 删除台区信息
+     * @param ids id
+     * @author hany
+     * @date 2022/10/26
+     */
+    @PostMapping("/deletePowerDistributionArea")
+    @OperateInfo(info = LogEnum.SYSTEM_COMMON, operateType = OperateType.DELETE)
+    @ApiOperation("删除台区信息")
+    @ApiImplicitParam(name = "ids", value = "ID索引", required = true)
+    public HttpResult<Object> delete(@RequestBody List<String> ids){
+        String methodDescribe = getMethodDescribe("delete");
+        boolean result = iPowerDistributionareaService.delete(ids);
+        if(result){
+            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
+        }else {
+            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, null, methodDescribe);
+        }
+    }
+}
+
diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/PowerGenerationUserController.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/PowerGenerationUserController.java
new file mode 100644
index 000000000..04c1d9345
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/PowerGenerationUserController.java
@@ -0,0 +1,109 @@
+package com.njcn.device.pms.controller;
+
+
+import com.njcn.common.pojo.annotation.OperateInfo;
+import com.njcn.common.pojo.constant.OperateType;
+import com.njcn.common.pojo.enums.common.LogEnum;
+import com.njcn.common.pojo.enums.response.CommonResponseEnum;
+import com.njcn.common.pojo.response.HttpResult;
+import com.njcn.common.utils.HttpResultUtil;
+import com.njcn.device.pms.pojo.param.PowerGenerationUserParam;
+import com.njcn.device.pms.pojo.po.PowerGenerationUser;
+import com.njcn.device.pms.service.IPowerGenerationUserService;
+import com.njcn.web.pojo.param.BaseParam;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+import com.njcn.web.controller.BaseController;
+
+import javax.validation.constraints.NotEmpty;
+import java.util.List;
+import java.util.Objects;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author hongawen
+ * @since 2022-10-14
+ */
+@RestController
+@RequestMapping("/pms/powerGenerationUser")
+@Api(tags = "发电用户")
+@RequiredArgsConstructor
+public class PowerGenerationUserController extends BaseController {
+
+    private final IPowerGenerationUserService iPowerGenerationUserService;
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON,operateType = OperateType.ADD)
+    @PostMapping("/addPowerGenerationUser")
+    @ApiOperation("新增母线")
+    @ApiImplicitParam(name = "powerGenerationUserParam", value = "母线实体", required = true)
+    public HttpResult<Boolean> addPowerGenerationUser(@RequestBody PowerGenerationUserParam powerGenerationUserParam) {
+        String methodDescribe = getMethodDescribe("addPowerGenerationUser");
+        boolean result = iPowerGenerationUserService.addPowerGenerationUser(powerGenerationUserParam);
+        if(result){
+            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
+        }
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, null, methodDescribe);
+
+    }
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON,operateType = OperateType.UPDATE)
+    @PostMapping("/updatePowerGenerationUser")
+    @ApiOperation("修改母线")
+    @ApiImplicitParam(name = "powerGenerationUserParam", value = "母线实体", required = true)
+    public HttpResult<Boolean> updatePowerGenerationUser(@RequestBody PowerGenerationUserParam powerGenerationUserParam) {
+        String methodDescribe = getMethodDescribe("updatePowerGenerationUser");
+        boolean result = iPowerGenerationUserService.updatePowerGenerationUser(powerGenerationUserParam);
+        if(result){
+            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
+        }
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, null, methodDescribe);
+
+    }
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON,operateType = OperateType.DELETE)
+    @DeleteMapping("/delPowerGenerationUser")
+    @ApiOperation("删除母线")
+    @ApiImplicitParam(name = "powerGenerationUserIds", value = "母线ids", required = true)
+    public HttpResult<Boolean> delPowerGenerationUser(@RequestBody @NotEmpty(message = "母线id不可为空") List<String> powerGenerationUserIds) {
+        String methodDescribe = getMethodDescribe("delPowerGenerationUser");
+        boolean result = iPowerGenerationUserService.delPowerGenerationUser(powerGenerationUserIds);
+        if(result){
+            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
+        }
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, null, methodDescribe);
+
+    }
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @GetMapping("/getPowerGenerationUserById")
+    @ApiOperation("根据母线id获取母线")
+    @ApiImplicitParam(name = "powerGenerationUserId", value = "母线id", required = true)
+    public HttpResult<PowerGenerationUser> getPowerGenerationUserById(@RequestParam("powerGenerationUserId") String powerGenerationUserId) {
+        String methodDescribe = getMethodDescribe("getPowerGenerationUserById");
+        PowerGenerationUser result = iPowerGenerationUserService.getPowerGenerationUserById(powerGenerationUserId);
+        if(Objects.nonNull(result)){
+            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
+        }
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, null, methodDescribe);
+
+    }
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/getPowerGenerationUserList")
+    @ApiOperation("获取母线列表")
+    @ApiImplicitParam(name = "baseParam", value = "基本查询体", required = true)
+    public HttpResult<List<PowerGenerationUser>> getPowerGenerationUserList(@RequestBody BaseParam baseParam) {
+        String methodDescribe = getMethodDescribe("getPowerGenerationUserList");
+        List<PowerGenerationUser> result = iPowerGenerationUserService.getPowerGenerationUserList(baseParam);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
+    }
+
+}
+
diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/PowerQualityMatterController.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/PowerQualityMatterController.java
new file mode 100644
index 000000000..dfeb8c1be
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/PowerQualityMatterController.java
@@ -0,0 +1,22 @@
+package com.njcn.device.pms.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+import com.njcn.web.controller.BaseController;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author hongawen
+ * @since 2022-10-14
+ */
+@RestController
+@RequestMapping("/pms/powerQualityMatter")
+public class PowerQualityMatterController extends BaseController {
+
+}
+
diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/PvDeviceController.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/PvDeviceController.java
deleted file mode 100644
index 19509ae1f..000000000
--- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/PvDeviceController.java
+++ /dev/null
@@ -1,160 +0,0 @@
-package com.njcn.device.pms.controller;
-
-
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.njcn.common.pojo.annotation.OperateInfo;
-import com.njcn.common.pojo.constant.OperateType;
-import com.njcn.common.pojo.enums.common.LogEnum;
-import com.njcn.common.pojo.enums.response.CommonResponseEnum;
-import com.njcn.common.pojo.response.HttpResult;
-import com.njcn.common.utils.HttpResultUtil;
-import com.njcn.device.pms.pojo.param.DeviceQueryParam;
-import com.njcn.device.pms.pojo.param.PvDeviceParam;
-import com.njcn.device.pms.pojo.po.PvDevice;
-import com.njcn.device.pms.pojo.vo.PvDeviceVO;
-import com.njcn.device.pms.service.IPvDeviceService;
-import com.njcn.web.controller.BaseController;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiOperation;
-import lombok.RequiredArgsConstructor;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
-import java.util.Objects;
-
-/**
- * <p>
- *  终端控制器
- * </p>
- *
- * @author cdf
- * @since 2022-07-05
- */
-@RestController
-@RequestMapping("/pvDevice")
-@Api(tags = "pv终端控制器")
-@RequiredArgsConstructor
-public class PvDeviceController extends BaseController {
-
-    private final IPvDeviceService iPvDeviceService;
-
-
-    /**
-     * 新增终端
-     * @param pvDeviceParam 终端实体
-     * @author cdf
-     * @date 2022/7/5
-     */
-    @PostMapping("addDevice")
-    @OperateInfo(info = LogEnum.SYSTEM_COMMON,operateType = OperateType.ADD)
-    @ApiOperation("新增终端")
-    @ApiImplicitParam(name = "pvDeviceParam",value = "终端实体",required = true)
-    public HttpResult<Object> addDevice(@RequestBody @Validated PvDeviceParam pvDeviceParam){
-        String methodDescribe = getMethodDescribe("addDevice");
-        boolean res = iPvDeviceService.addDevice(pvDeviceParam);
-        if(res){
-            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
-        }
-        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, null, methodDescribe);
-    }
-
-
-    /**
-     * 修改终端
-     * @author cdf
-     * @date 2022/7/5
-     */
-    @PostMapping("updateDevice")
-    @OperateInfo(info = LogEnum.SYSTEM_COMMON,operateType = OperateType.UPDATE)
-    @ApiOperation("修改终端")
-    @ApiImplicitParam(name = "updatePvDeviceParam",value = "终端实体",required = true)
-    public HttpResult<Object> updateDevice(@RequestBody @Validated PvDeviceParam.UpdatePvDeviceParam updatePvDeviceParam){
-        String methodDescribe = getMethodDescribe("updateDevice");
-        boolean res = iPvDeviceService.updateDevice(updatePvDeviceParam);
-        if(res){
-            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
-        }
-        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, null, methodDescribe);
-    }
-
-
-    /**
-     * 分页查询终端
-     * @param deviceQueryParam 查询实体
-     * @author cdf
-     * @date 2022/7/5
-     * @return Page<PvDevice>
-     */
-    @PostMapping("getPvDeviceList")
-    @OperateInfo(info = LogEnum.SYSTEM_COMMON)
-    @ApiOperation("分页查询终端")
-    @ApiImplicitParam(name = "deviceQueryParam",value = "终端实体",required = true)
-    public HttpResult<Page<PvDeviceVO>> getPvDeviceList(@RequestBody DeviceQueryParam deviceQueryParam){
-        String methodDescribe = getMethodDescribe("getPvDeviceList");
-        Page<PvDeviceVO> page = iPvDeviceService.getPvDeviceList(deviceQueryParam);
-        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, page, methodDescribe);
-    }
-
-    /**
-     * 查询所有终端
-     * @author cdf
-     * @date 2022/7/5
-     * @return Page<PvDevice>
-     */
-    @PostMapping("getAllPvDeviceList")
-    @OperateInfo(info = LogEnum.SYSTEM_COMMON)
-    @ApiOperation("查询所有终端")
-    public HttpResult<List<PvDeviceVO>> getAllPvDeviceList(){
-        String methodDescribe = getMethodDescribe("getAllPvDeviceList");
-        List<PvDeviceVO> list = iPvDeviceService.getAllPvDeviceList();
-        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);
-    }
-
-
-    /**
-     * 根据终端id查询终端
-     * @param id 终端id
-     * @author cdf
-     * @date 2022/7/5
-     * @return PvDevice
-     */
-    @GetMapping("getPvDeviceById")
-    @OperateInfo(info = LogEnum.SYSTEM_COMMON)
-    @ApiOperation("根据终端id查询终端")
-    @ApiImplicitParam(name = "id",value = "终端id",required = true)
-    public HttpResult<PvDevice> getPvDeviceById(@RequestParam("id") String id){
-        String methodDescribe = getMethodDescribe("getPvDeviceById");
-        PvDevice pvDevice = iPvDeviceService.getPvDeviceById(id);
-        if(Objects.nonNull(pvDevice)){
-            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, pvDevice, methodDescribe);
-        }
-        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
-
-    }
-
-
-    /**
-     * 删除终端
-     * @param ids 终端id
-     * @author cdf
-     * @date 2022/7/5
-     * @return boolean
-     */
-    @PostMapping("delPvDevice")
-    @OperateInfo(info = LogEnum.SYSTEM_COMMON,operateType = OperateType.DELETE)
-    @ApiOperation("删除终端")
-    @ApiImplicitParam(name = "ids",value = "终端id",required = true)
-    public HttpResult<PvDevice> delPvDevice(@RequestBody List<String> ids){
-        String methodDescribe = getMethodDescribe("delPvDevice");
-        boolean res = iPvDeviceService.delPvDevice(ids);
-        if(res){
-            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
-        }
-        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, null, methodDescribe);
-    }
-
-
-}
-
diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/PvDeviceRunExController.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/PvDeviceRunExController.java
deleted file mode 100644
index 06fc08461..000000000
--- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/PvDeviceRunExController.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package com.njcn.device.pms.controller;
-
-import com.njcn.common.pojo.annotation.OperateInfo;
-import com.njcn.common.pojo.enums.common.LogEnum;
-import com.njcn.common.pojo.enums.response.CommonResponseEnum;
-import com.njcn.common.pojo.response.HttpResult;
-import com.njcn.common.utils.HttpResultUtil;
-import com.njcn.device.pms.pojo.bo.DeviceRunExBO;
-import com.njcn.device.pms.pojo.dto.DeviceRunExDTO;
-import com.njcn.device.pms.service.IPvDeviceRunExService;
-import com.njcn.web.controller.BaseController;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiOperation;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.List;
-
-
-/**
- * pv终端运行异常
- *
- * @author yangj
- * @date 2022/09/08
- */
-@RestController
-@RequestMapping("/pvDeviceEx")
-@Api(tags = "pv终端运行异常")
-@RequiredArgsConstructor
-public class PvDeviceRunExController extends BaseController {
-
-
-    private final IPvDeviceRunExService pvDeviceRunExService;
-
-    @PostMapping("getPvDeviceExList")
-    @OperateInfo(info = LogEnum.SYSTEM_COMMON)
-    @ApiOperation("分页条件查询终端异常")
-    @ApiImplicitParam(name = "deviceRunExDTO",value = "终端异常",required = true)
-    public HttpResult<List<DeviceRunExBO>> getPvDeviceExList(@RequestBody DeviceRunExDTO deviceRunExDTO) {
-        String methodDescribe = getMethodDescribe("getPvDeviceExList");
-        List<DeviceRunExBO> pvDeviceExList = pvDeviceRunExService.getPvDeviceExList(deviceRunExDTO);
-        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, pvDeviceExList, methodDescribe);
-    }
-}
diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/PvDistributedController.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/PvDistributedController.java
deleted file mode 100644
index 199d7ace8..000000000
--- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/PvDistributedController.java
+++ /dev/null
@@ -1,159 +0,0 @@
-package com.njcn.device.pms.controller;
-
-
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.njcn.common.pojo.annotation.OperateInfo;
-import com.njcn.common.pojo.constant.OperateType;
-import com.njcn.common.pojo.enums.common.LogEnum;
-import com.njcn.common.pojo.enums.response.CommonResponseEnum;
-import com.njcn.common.pojo.response.HttpResult;
-import com.njcn.common.utils.HttpResultUtil;
-import com.njcn.device.pms.pojo.param.DistributedQueryParam;
-import com.njcn.device.pms.pojo.param.PvDistributedParam;
-import com.njcn.device.pms.pojo.po.PvDistributed;
-import com.njcn.device.pms.pojo.vo.PvDistributedVO;
-import com.njcn.device.pms.service.IPvDistributedService;
-import com.njcn.web.controller.BaseController;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiOperation;
-import lombok.RequiredArgsConstructor;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
-import java.util.Objects;
-
-/**
- * <p>
- *  分布式光伏控制器
- * </p>
- *
- * @author cdf
- * @since 2022-07-06
- */
-@RestController
-@RequestMapping("/pvDistributed")
-@Api(tags = "pv分布式光伏控制器")
-@RequiredArgsConstructor
-public class PvDistributedController extends BaseController {
-
-    private final IPvDistributedService iPvDistributedService;
-
-
-    /**
-     * 新增分布式光伏台账
-     * @param pvDistributedParam 分布式光伏台账实体
-     * @author cdf
-     * @date 2022/7/5
-     */
-    @PostMapping("addDistributed")
-    @OperateInfo(info = LogEnum.SYSTEM_COMMON,operateType = OperateType.ADD)
-    @ApiOperation("新增分布式光伏台账")
-    @ApiImplicitParam(name = "pvDistributedParam",value = "分布式光伏台账实体",required = true)
-    public HttpResult<Object> addDistributed(@RequestBody @Validated PvDistributedParam pvDistributedParam){
-        String methodDescribe = getMethodDescribe("addDistributed");
-        boolean res = iPvDistributedService.addDistributed(pvDistributedParam);
-        if(res){
-            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
-        }
-        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, null, methodDescribe);
-    }
-
-
-    /**
-     * 修改分布式光伏台账
-     * @author cdf
-     * @date 2022/7/5
-     */
-    @PostMapping("updateDistributed")
-    @OperateInfo(info = LogEnum.SYSTEM_COMMON,operateType = OperateType.UPDATE)
-    @ApiOperation("修改分布式光伏台账")
-    @ApiImplicitParam(name = "updatePvDistributedParam",value = "分布式光伏台账实体",required = true)
-    public HttpResult<Object> updateDistributed(@RequestBody @Validated PvDistributedParam.UpdatePvDistributedParam updatePvDistributedParam){
-        String methodDescribe = getMethodDescribe("updateDistributed");
-        boolean res = iPvDistributedService.updateDistributed(updatePvDistributedParam);
-        if(res){
-            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
-        }
-        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, null, methodDescribe);
-    }
-
-
-    /**
-     * 分页查询分布式光伏台账
-     * @param distributedQueryParam 查询实体
-     * @author cdf
-     * @date 2022/7/5
-     * @return Page<PvDistributed>
-     */
-    @PostMapping("getPvDistributedList")
-    @OperateInfo(info = LogEnum.SYSTEM_COMMON)
-    @ApiOperation("分页查询分布式光伏台账")
-    @ApiImplicitParam(name = "distributedQueryParam",value = "分布式光伏台账实体",required = true)
-    public HttpResult<Page<PvDistributedVO>> getPvDistributedList(@RequestBody DistributedQueryParam distributedQueryParam){
-        String methodDescribe = getMethodDescribe("getPvDistributedList");
-        Page<PvDistributedVO> page = iPvDistributedService.getPvDistributedList(distributedQueryParam);
-        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, page, methodDescribe);
-    }
-
-    /**
-     * 查询所有分布式光伏台账
-     * @author cdf
-     * @date 2022/7/5
-     * @return Page<PvDistributed>
-     */
-    @PostMapping("getAllPvDistributedList")
-    @OperateInfo(info = LogEnum.SYSTEM_COMMON)
-    @ApiOperation("查询所有分布式光伏台账")
-    public HttpResult<List<PvDistributed>> getAllPvDistributedList(){
-        String methodDescribe = getMethodDescribe("getAllPvDistributedList");
-        List<PvDistributed> list = iPvDistributedService.getAllPvDistributedList();
-        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);
-    }
-
-
-    /**
-     * 根据分布式光伏台账id查询分布式光伏台账
-     * @param id 分布式光伏台账id
-     * @author cdf
-     * @date 2022/7/5
-     * @return PvDistributed
-     */
-    @GetMapping("getPvDistributedById")
-    @OperateInfo(info = LogEnum.SYSTEM_COMMON)
-    @ApiOperation("根据分布式光伏台账id查询分布式光伏台账")
-    @ApiImplicitParam(name = "id",value = "分布式光伏台账id",required = true)
-    public HttpResult<PvDistributed> getPvDistributedById(@RequestParam("id") String id){
-        String methodDescribe = getMethodDescribe("getPvDistributedById");
-        PvDistributed pvDistributed = iPvDistributedService.getPvDistributedById(id);
-        if(Objects.nonNull(pvDistributed)){
-            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, pvDistributed, methodDescribe);
-        }
-        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
-
-    }
-
-
-    /**
-     * 删除分布式光伏台账
-     * @param ids 分布式光伏台账id
-     * @author cdf
-     * @date 2022/7/5
-     * @return boolean
-     */
-    @PostMapping("delPvDistributed")
-    @OperateInfo(info = LogEnum.SYSTEM_COMMON)
-    @ApiOperation("删除分布式光伏台账")
-    @ApiImplicitParam(name = "ids",value = "分布式光伏台账ids",required = true)
-    public HttpResult<PvDistributed> delPvDistributed(@RequestBody List<String> ids){
-        String methodDescribe = getMethodDescribe("delPvDistributed");
-        boolean res = iPvDistributedService.delPvDistributed(ids);
-        if(res){
-            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
-        }
-        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, null, methodDescribe);
-    }
-
-}
-
diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/PvLineDetailController.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/PvLineDetailController.java
deleted file mode 100644
index d15adac84..000000000
--- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/PvLineDetailController.java
+++ /dev/null
@@ -1,160 +0,0 @@
-package com.njcn.device.pms.controller;
-
-
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.njcn.common.pojo.annotation.OperateInfo;
-import com.njcn.common.pojo.constant.OperateType;
-import com.njcn.common.pojo.enums.common.LogEnum;
-import com.njcn.common.pojo.enums.response.CommonResponseEnum;
-import com.njcn.common.pojo.response.HttpResult;
-import com.njcn.common.utils.HttpResultUtil;
-import com.njcn.device.pms.pojo.param.LineDetailQueryParam;
-import com.njcn.device.pms.pojo.param.PvLineDetailParam;
-import com.njcn.device.pms.pojo.po.PvLineDetail;
-import com.njcn.device.pms.service.IPvLineDetailService;
-import com.njcn.web.controller.BaseController;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiOperation;
-import lombok.RequiredArgsConstructor;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
-import java.util.Objects;
-
-/**
- * <p>
- *  监测点控制器
- * </p>
- *
- * @author cdf
- * @since 2022-07-05
- */
-@RestController
-@RequestMapping("/pvLineDetail")
-@Api(tags = "pv监测点控制器")
-@RequiredArgsConstructor
-public class PvLineDetailController extends BaseController {
-
-    private final IPvLineDetailService iPvLineDetailService;
-
-
-
-    /**
-     * 新增监测点
-     * @param pvLineDetailParam 监测点实体
-     * @author cdf
-     * @date 2022/7/5
-     */
-    @PostMapping("addLineDetail")
-    @OperateInfo(info = LogEnum.SYSTEM_COMMON,operateType = OperateType.ADD)
-    @ApiOperation("新增监测点")
-    @ApiImplicitParam(name = "pvLineDetailParam",value = "监测点实体",required = true)
-    public HttpResult<Object> addLineDetail(@RequestBody @Validated PvLineDetailParam pvLineDetailParam){
-        String methodDescribe = getMethodDescribe("addLineDetail");
-        boolean res = iPvLineDetailService.addLineDetail(pvLineDetailParam);
-        if(res){
-            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
-        }
-        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, null, methodDescribe);
-    }
-
-
-    /**
-     * 修改监测点
-     * @author cdf
-     * @date 2022/7/5
-     */
-    @PostMapping("updateLineDetail")
-    @OperateInfo(info = LogEnum.SYSTEM_COMMON,operateType = OperateType.UPDATE)
-    @ApiOperation("修改监测点")
-    @ApiImplicitParam(name = "updatePvLineDetailParam",value = "监测点实体",required = true)
-    public HttpResult<Object> updateLineDetail(@RequestBody @Validated PvLineDetailParam.UpdatePvLineDetailParam updatePvLineDetailParam){
-        String methodDescribe = getMethodDescribe("updateLineDetail");
-        boolean res = iPvLineDetailService.updateLineDetail(updatePvLineDetailParam);
-        if(res){
-            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
-        }
-        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, null, methodDescribe);
-    }
-
-
-    /**
-     * 分页查询监测点
-     * @param lineDetailQueryParam 查询实体
-     * @author cdf
-     * @date 2022/7/5
-     * @return Page<PvLineDetail>
-     */
-    @PostMapping("getPvLineDetailList")
-    @OperateInfo(info = LogEnum.SYSTEM_COMMON)
-    @ApiOperation("分页查询监测点")
-    @ApiImplicitParam(name = "lineDetailQueryParam",value = "监测点实体",required = true)
-    public HttpResult<Page<PvLineDetail>> getPvLineDetailList(@RequestBody LineDetailQueryParam lineDetailQueryParam){
-        String methodDescribe = getMethodDescribe("getPvLineDetailList");
-        Page<PvLineDetail> page = iPvLineDetailService.getPvLineDetailList(lineDetailQueryParam);
-        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, page, methodDescribe);
-    }
-
-    /**
-     * 查询所有监测点
-     * @author cdf
-     * @date 2022/7/5
-     * @return Page<PvLineDetail>
-     */
-    @PostMapping("getAllPvLineDetailList")
-    @OperateInfo(info = LogEnum.SYSTEM_COMMON)
-    @ApiOperation("查询所有监测点")
-    public HttpResult<List<PvLineDetail>> getAllPvLineDetailList(){
-        String methodDescribe = getMethodDescribe("getAllPvLineDetailList");
-        List<PvLineDetail> list = iPvLineDetailService.getAllPvLineDetailList();
-        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);
-    }
-
-
-    /**
-     * 根据监测点id查询监测点
-     * @param id 监测点id
-     * @author cdf
-     * @date 2022/7/5
-     * @return PvLineDetail
-     */
-    @GetMapping("getPvLineDetailById")
-    @OperateInfo(info = LogEnum.SYSTEM_COMMON)
-    @ApiOperation("根据监测点id查询监测点")
-    @ApiImplicitParam(name = "id",value = "监测点id",required = true)
-    public HttpResult<PvLineDetail> getPvLineDetailById(@RequestParam("id") String id){
-        String methodDescribe = getMethodDescribe("getPvLineDetailById");
-        PvLineDetail pvLineDetail = iPvLineDetailService.getPvLineDetailById(id);
-        if(Objects.nonNull(pvLineDetail)){
-            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, pvLineDetail, methodDescribe);
-        }
-        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
-
-    }
-
-
-    /**
-     * 删除监测点
-     * @param ids 监测点id
-     * @author cdf
-     * @date 2022/7/5
-     * @return boolean
-     */
-    @PostMapping("delPvLineDetail")
-    @OperateInfo(info = LogEnum.SYSTEM_COMMON)
-    @ApiOperation("删除监测点")
-    @ApiImplicitParam(name = "ids",value = "监测点id",required = true)
-    public HttpResult<PvLineDetail> delPvLineDetail(@RequestBody List<String> ids){
-        String methodDescribe = getMethodDescribe("delPvLineDetail");
-        boolean res = iPvLineDetailService.delPvLineDetail(ids);
-        if(res){
-            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
-        }
-        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, null, methodDescribe);
-    }
-
-
-}
-
diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/PvLvUserController.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/PvLvUserController.java
deleted file mode 100644
index 4d6bab0d6..000000000
--- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/PvLvUserController.java
+++ /dev/null
@@ -1,160 +0,0 @@
-package com.njcn.device.pms.controller;
-
-
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.njcn.common.pojo.annotation.OperateInfo;
-import com.njcn.common.pojo.constant.OperateType;
-import com.njcn.common.pojo.enums.common.LogEnum;
-import com.njcn.common.pojo.enums.response.CommonResponseEnum;
-import com.njcn.common.pojo.response.HttpResult;
-import com.njcn.common.utils.HttpResultUtil;
-import com.njcn.device.pms.pojo.param.LvUserQueryParam;
-import com.njcn.device.pms.pojo.param.PvLvUserParam;
-import com.njcn.device.pms.pojo.po.PvLvUser;
-import com.njcn.device.pms.pojo.vo.PvLvUserVO;
-import com.njcn.device.pms.service.IPvLvUserService;
-import com.njcn.web.controller.BaseController;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiOperation;
-import lombok.RequiredArgsConstructor;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
-import java.util.Objects;
-
-/**
- * <p>
- *  低压用户台账控制器
- * </p>
- *
- * @author cdf
- * @since 2022-07-05
- */
-@RestController
-@RequestMapping("/pvLvUser")
-@Api(tags = "pv低压用户台账控制器")
-@RequiredArgsConstructor
-public class PvLvUserController extends BaseController {
-
-    private final IPvLvUserService iPvLvUserService;
-
-
-    /**
-     * 新增低压用户台账
-     * @param pvLvUserParam 低压用户台账实体
-     * @author cdf
-     * @date 2022/7/5
-     */
-    @PostMapping("addLvUser")
-    @OperateInfo(info = LogEnum.SYSTEM_COMMON,operateType = OperateType.ADD)
-    @ApiOperation("新增低压用户台账")
-    @ApiImplicitParam(name = "pvLvUserParam",value = "低压用户台账实体",required = true)
-    public HttpResult<Object> addLvUser(@RequestBody @Validated PvLvUserParam pvLvUserParam){
-        String methodDescribe = getMethodDescribe("addLvUser");
-        boolean res = iPvLvUserService.addLvUser(pvLvUserParam);
-        if(res){
-            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
-        }
-        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, null, methodDescribe);
-    }
-
-
-    /**
-     * 修改低压用户台账
-     * @author cdf
-     * @date 2022/7/5
-     */
-    @PostMapping("updateLvUser")
-    @OperateInfo(info = LogEnum.SYSTEM_COMMON,operateType = OperateType.UPDATE)
-    @ApiOperation("修改低压用户台账")
-    @ApiImplicitParam(name = "updatePvLvUserParam",value = "低压用户台账实体",required = true)
-    public HttpResult<Object> updateLvUser(@RequestBody @Validated PvLvUserParam.UpdatePvLvUserParam updatePvLvUserParam){
-        String methodDescribe = getMethodDescribe("updateLvUser");
-        boolean res = iPvLvUserService.updateLvUser(updatePvLvUserParam);
-        if(res){
-            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
-        }
-        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, null, methodDescribe);
-    }
-
-
-    /**
-     * 分页查询低压用户台账
-     * @param lvUserQueryParam 查询实体
-     * @author cdf
-     * @date 2022/7/5
-     * @return Page<PvLvUser>
-     */
-    @PostMapping("getPvLvUserList")
-    @OperateInfo(info = LogEnum.SYSTEM_COMMON)
-    @ApiOperation("分页查询低压用户台账")
-    @ApiImplicitParam(name = "lvUserQueryParam",value = "低压用户台账实体",required = true)
-    public HttpResult<Page<PvLvUserVO>> getPvLvUserList(@RequestBody LvUserQueryParam lvUserQueryParam){
-        String methodDescribe = getMethodDescribe("getPvLvUserList");
-        Page<PvLvUserVO> page = iPvLvUserService.getPvLvUserList(lvUserQueryParam);
-        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, page, methodDescribe);
-    }
-
-    /**
-     * 查询所有低压用户台账
-     * @author cdf
-     * @date 2022/7/5
-     * @return Page<PvLvUser>
-     */
-    @PostMapping("getAllPvLvUserList")
-    @OperateInfo(info = LogEnum.SYSTEM_COMMON)
-    @ApiOperation("查询所有低压用户台账")
-    public HttpResult<List<PvLvUser>> getAllPvLvUserList(){
-        String methodDescribe = getMethodDescribe("getAllPvLvUserList");
-        List<PvLvUser> list = iPvLvUserService.getAllPvLvUserList();
-        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);
-    }
-
-
-    /**
-     * 根据低压用户台账id查询低压用户台账
-     * @param id 低压用户台账id
-     * @author cdf
-     * @date 2022/7/5
-     * @return PvLvUser
-     */
-    @GetMapping("getPvLvUserById")
-    @OperateInfo(info = LogEnum.SYSTEM_COMMON)
-    @ApiOperation("根据低压用户台账id查询低压用户台账")
-    @ApiImplicitParam(name = "id",value = "低压用户台账id",required = true)
-    public HttpResult<PvLvUser> getPvLvUserById(@RequestParam("id") String id){
-        String methodDescribe = getMethodDescribe("getPvLvUserById");
-        PvLvUser pvLvUser = iPvLvUserService.getPvLvUserById(id);
-        if(Objects.nonNull(pvLvUser)){
-            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, pvLvUser, methodDescribe);
-        }
-        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
-
-    }
-
-
-    /**
-     * 删除低压用户台账
-     * @param ids 低压用户台账id
-     * @author cdf
-     * @date 2022/7/5
-     * @return boolean
-     */
-    @PostMapping("delPvLvUser")
-    @OperateInfo(info = LogEnum.SYSTEM_COMMON,operateType = OperateType.DELETE)
-    @ApiOperation("删除低压用户台账")
-    @ApiImplicitParam(name = "ids",value = "低压用户台账id",required = true)
-    public HttpResult<PvLvUser> delPvLvUser(@RequestBody List<String> ids){
-        String methodDescribe = getMethodDescribe("delPvLvUser");
-        boolean res = iPvLvUserService.delPvLvUser(ids);
-        if(res){
-            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
-        }
-        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, null, methodDescribe);
-    }
-
-
-}
-
diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/PvSubAreaController.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/PvSubAreaController.java
deleted file mode 100644
index 3df74c4f3..000000000
--- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/PvSubAreaController.java
+++ /dev/null
@@ -1,160 +0,0 @@
-package com.njcn.device.pms.controller;
-
-
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.njcn.common.pojo.annotation.OperateInfo;
-import com.njcn.common.pojo.constant.OperateType;
-import com.njcn.common.pojo.enums.common.LogEnum;
-import com.njcn.common.pojo.enums.response.CommonResponseEnum;
-import com.njcn.common.pojo.response.HttpResult;
-import com.njcn.common.utils.HttpResultUtil;
-import com.njcn.device.pms.pojo.param.PvSubAreaParam;
-import com.njcn.device.pms.pojo.param.SubAreaQueryParam;
-import com.njcn.device.pms.pojo.po.PvSubArea;
-import com.njcn.device.pms.pojo.vo.PvSubAreaVO;
-import com.njcn.device.pms.service.IPvSubAreaService;
-import com.njcn.web.controller.BaseController;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiOperation;
-import lombok.RequiredArgsConstructor;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
-import java.util.Objects;
-
-/**
- * <p>
- *  台区控制器
- * </p>
- *
- * @author cdf
- * @since 2022-07-05
- */
-@RestController
-@RequestMapping("/pvSubArea")
-@Api(tags = "pv台区控制器")
-@RequiredArgsConstructor
-public class PvSubAreaController extends BaseController {
-
-    private final IPvSubAreaService iPvSubAreaService;
-
-
-
-    /**
-     * 新增台区
-     * @param pvSubAreaParam 台区实体
-     * @author cdf
-     * @date 2022/7/5
-     */
-    @PostMapping("addSubArea")
-    @OperateInfo(info = LogEnum.SYSTEM_COMMON,operateType = OperateType.ADD)
-    @ApiOperation("新增台区")
-    @ApiImplicitParam(name = "pvSubAreaParam",value = "台区实体",required = true)
-    public HttpResult<Object> addSubArea(@RequestBody @Validated PvSubAreaParam pvSubAreaParam){
-        String methodDescribe = getMethodDescribe("addSubArea");
-        boolean res = iPvSubAreaService.addSubArea(pvSubAreaParam);
-        if(res){
-            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
-        }
-        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, null, methodDescribe);
-    }
-
-
-    /**
-     * 修改台区
-     * @author cdf
-     * @date 2022/7/5
-     */
-    @PostMapping("updateSubArea")
-    @OperateInfo(info = LogEnum.SYSTEM_COMMON,operateType = OperateType.UPDATE)
-    @ApiOperation("修改台区")
-    @ApiImplicitParam(name = "updatePvSubAreaParam",value = "台区实体",required = true)
-    public HttpResult<Object> updateSubArea(@RequestBody @Validated PvSubAreaParam.UpdatePvSubAreaParam updatePvSubAreaParam){
-        String methodDescribe = getMethodDescribe("updateSubArea");
-        boolean res = iPvSubAreaService.updateSubArea(updatePvSubAreaParam);
-        if(res){
-            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
-        }
-        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, null, methodDescribe);
-    }
-
-
-    /**
-     * 分页查询台区
-     * @param subAreaQueryParam 查询实体
-     * @author cdf
-     * @date 2022/7/5
-     * @return Page<PvSubArea>
-     */
-    @PostMapping("getPvSubAreaList")
-    @OperateInfo(info = LogEnum.SYSTEM_COMMON)
-    @ApiOperation("分页查询台区")
-    @ApiImplicitParam(name = "subAreaQueryParam",value = "台区实体",required = true)
-    public HttpResult<Page<PvSubAreaVO>> getPvSubAreaList(@RequestBody SubAreaQueryParam subAreaQueryParam){
-        String methodDescribe = getMethodDescribe("getPvSubAreaList");
-        Page<PvSubAreaVO> page = iPvSubAreaService.getPvSubAreaList(subAreaQueryParam);
-        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, page, methodDescribe);
-    }
-
-    /**
-     * 查询所有台区
-     * @author cdf
-     * @date 2022/7/5
-     * @return Page<PvSubArea>
-     */
-    @PostMapping("getAllPvSubAreaList")
-    @OperateInfo(info = LogEnum.SYSTEM_COMMON)
-    @ApiOperation("查询所有台区")
-    public HttpResult<List<PvSubArea>> getAllPvSubAreaList(){
-        String methodDescribe = getMethodDescribe("getAllPvSubAreaList");
-        List<PvSubArea> list = iPvSubAreaService.getAllPvSubAreaList();
-        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);
-    }
-
-
-    /**
-     * 根据台区id查询台区
-     * @param id 台区id
-     * @author cdf
-     * @date 2022/7/5
-     * @return PvSubArea
-     */
-    @GetMapping("getPvSubAreaById")
-    @OperateInfo(info = LogEnum.SYSTEM_COMMON)
-    @ApiOperation("根据台区id查询台区")
-    @ApiImplicitParam(name = "id",value = "台区id",required = true)
-    public HttpResult<PvSubArea> getPvSubAreaById(@RequestParam("id") String id){
-        String methodDescribe = getMethodDescribe("getPvSubAreaById");
-        PvSubArea pvSubArea = iPvSubAreaService.getPvSubAreaById(id);
-        if(Objects.nonNull(pvSubArea)){
-            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, pvSubArea, methodDescribe);
-        }
-        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
-
-    }
-
-
-    /**
-     * 删除台区
-     * @param ids 台区ids
-     * @author cdf
-     * @date 2022/7/5
-     * @return boolean
-     */
-    @PostMapping("delPvSubArea")
-    @OperateInfo(info = LogEnum.SYSTEM_COMMON)
-    @ApiOperation("删除台区")
-    @ApiImplicitParam(name = "ids",value = "台区ids",required = true)
-    public HttpResult<PvSubArea> delPvSubArea(@RequestBody List<String> ids){
-        String methodDescribe = getMethodDescribe("delPvSubArea");
-        boolean res = iPvSubAreaService.delPvSubArea(ids);
-        if(res){
-            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
-        }
-        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, null, methodDescribe);
-    }
-
-}
-
diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/PvSubstationController.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/PvSubstationController.java
deleted file mode 100644
index d83cf9803..000000000
--- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/PvSubstationController.java
+++ /dev/null
@@ -1,150 +0,0 @@
-package com.njcn.device.pms.controller;
-
-
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.njcn.common.pojo.annotation.OperateInfo;
-import com.njcn.common.pojo.constant.OperateType;
-import com.njcn.common.pojo.enums.common.LogEnum;
-import com.njcn.common.pojo.enums.response.CommonResponseEnum;
-import com.njcn.common.pojo.response.HttpResult;
-import com.njcn.common.utils.HttpResultUtil;
-import com.njcn.device.pms.pojo.param.PvSubstationParam;
-import com.njcn.device.pms.pojo.param.SubstationQueryParam;
-import com.njcn.device.pms.pojo.po.PvSubstation;
-import com.njcn.device.pms.pojo.vo.PvSubstationVO;
-import com.njcn.device.pms.service.IPvSubstationService;
-import com.njcn.web.controller.BaseController;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiOperation;
-import lombok.RequiredArgsConstructor;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
-
-/**
- * <p>
- *  变电站控制器
- * </p>
- *
- * @author cdf
- * @since 2022-07-05
- */
-@RestController
-@RequestMapping("/pvSubstation")
-@Api(tags = "pv变电站控制器")
-@RequiredArgsConstructor
-public class PvSubstationController extends BaseController {
-
-    private final IPvSubstationService iPvSubstationService;
-
-    /**
-     * 新增变电站
-     * @param pvSubstationParam 变电站实体
-     * @author cdf
-     * @date 2022/7/5
-     */
-    @PostMapping("addSubstation")
-    @OperateInfo(info = LogEnum.SYSTEM_COMMON,operateType = OperateType.ADD)
-    @ApiOperation("新增变电站")
-    @ApiImplicitParam(name = "pvSubstationParam",value = "变电站实体",required = true)
-    public HttpResult<Object> addSubstation(@RequestBody @Validated PvSubstationParam pvSubstationParam){
-        String methodDescribe = getMethodDescribe("addSubstation");
-        iPvSubstationService.addSubstation(pvSubstationParam);
-        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
-
-
-    }
-
-
-    /**
-     * 修改变电站
-     * @author cdf
-     * @date 2022/7/5
-     */
-    @PostMapping("updateSubstation")
-    @OperateInfo(info = LogEnum.SYSTEM_COMMON,operateType = OperateType.UPDATE)
-    @ApiOperation("修改变电站")
-    @ApiImplicitParam(name = "updatePvSubstationParam",value = "变电站实体",required = true)
-    public HttpResult<Object> updateSubstation(@RequestBody @Validated PvSubstationParam.UpdatePvSubstationParam updatePvSubstationParam){
-        String methodDescribe = getMethodDescribe("updateSubstation");
-        iPvSubstationService.updateSubstation(updatePvSubstationParam);
-        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
-
-
-    }
-
-
-    /**
-     * 分页查询变电站
-     * @param substationQueryParam 查询实体
-     * @author cdf
-     * @date 2022/7/5
-     * @return Page<PvSubstation>
-     */
-    @PostMapping("getPvSubstationList")
-    @OperateInfo(info = LogEnum.SYSTEM_COMMON)
-    @ApiOperation("分页查询变电站")
-    @ApiImplicitParam(name = "substationQueryParam",value = "变电站实体",required = true)
-    public HttpResult<Page<PvSubstationVO>> getPvSubstationList(@RequestBody SubstationQueryParam substationQueryParam){
-        String methodDescribe = getMethodDescribe("getPvSubstationList");
-        Page<PvSubstationVO> page = iPvSubstationService.getPvSubstationList(substationQueryParam);
-        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, page, methodDescribe);
-
-    }
-
-    /**
-     * 查询所有变电站
-     * @author cdf
-     * @date 2022/7/5
-     * @return Page<PvSubstation>
-     */
-    @PostMapping("getAllPvSubstationList")
-    @OperateInfo(info = LogEnum.SYSTEM_COMMON)
-    @ApiOperation("查询所有变电站")
-    public HttpResult<List<PvSubstation>> getAllPvSubstationList(){
-        String methodDescribe = getMethodDescribe("getAllPvSubstationList");
-        List<PvSubstation> list = iPvSubstationService.getAllPvSubstationList();
-        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);
-    }
-
-
-    /**
-     * 根据变电站id查询变电站
-     * @param id 变电站id
-     * @author cdf
-     * @date 2022/7/5
-     * @return PvSubstation
-     */
-    @GetMapping("getPvSubstationById")
-    @OperateInfo(info = LogEnum.SYSTEM_COMMON)
-    @ApiOperation("根据变电站id查询变电站")
-    @ApiImplicitParam(name = "id",value = "变电站id",required = true)
-    public HttpResult<PvSubstation> getPvSubstationById(@RequestParam("id") String id){
-        String methodDescribe = getMethodDescribe("getPvSubstationById");
-        PvSubstation pvSubstation = iPvSubstationService.getPvSubstationById(id);
-        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, pvSubstation, methodDescribe);
-    }
-
-
-    /**
-     * 删除变电站
-     * @param ids 变电站ids
-     * @author cdf
-     * @date 2022/7/5
-     * @return boolean
-     */
-    @PostMapping("delPvSubstation")
-    @OperateInfo(info = LogEnum.SYSTEM_COMMON,operateType = OperateType.DELETE)
-    @ApiOperation("删除变电站")
-    @ApiImplicitParam(name = "ids",value = "变电站ids",required = true)
-    public HttpResult<PvSubstation> delPvSubstation(@RequestBody List<String> ids){
-        String methodDescribe = getMethodDescribe("delPvSubstation");
-        iPvSubstationService.delPvSubstation(ids);
-        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
-    }
-
-
-}
-
diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/PvTenVoltageController.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/PvTenVoltageController.java
deleted file mode 100644
index 0625360a6..000000000
--- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/PvTenVoltageController.java
+++ /dev/null
@@ -1,157 +0,0 @@
-package com.njcn.device.pms.controller;
-
-
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.njcn.common.pojo.annotation.OperateInfo;
-import com.njcn.common.pojo.constant.OperateType;
-import com.njcn.common.pojo.enums.common.LogEnum;
-import com.njcn.common.pojo.enums.response.CommonResponseEnum;
-import com.njcn.common.pojo.response.HttpResult;
-import com.njcn.common.utils.HttpResultUtil;
-import com.njcn.device.pms.pojo.param.PvTenVoltageParam;
-import com.njcn.device.pms.pojo.param.TenVoltageQueryParam;
-import com.njcn.device.pms.pojo.po.PvTenVoltage;
-import com.njcn.device.pms.pojo.vo.PvTenVoltageVO;
-import com.njcn.device.pms.service.IPvTenVoltageService;
-import com.njcn.web.controller.BaseController;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiOperation;
-import lombok.RequiredArgsConstructor;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
-
-/**
- * <p>
- * 前端控制器
- * </p>
- *
- * @author cdf
- * @since 2022-07-05
- */
-@RestController
-@RequestMapping("/pvTenVoltage")
-@Api(tags = "pv十千伏线路控制器")
-@RequiredArgsConstructor
-public class PvTenVoltageController extends BaseController {
-
-    private final IPvTenVoltageService iPvTenVoltageService;
-
-    /**
-     * 新增10kV线路
-     *
-     * @param pvTenVoltageParam 10kV线路实体
-     * @author cdf
-     * @date 2022/7/5
-     */
-    @PostMapping("addTenVoltage")
-    @OperateInfo(info = LogEnum.SYSTEM_COMMON, operateType = OperateType.ADD)
-    @ApiOperation("新增10kV线路")
-    @ApiImplicitParam(name = "pvTenVoltageParam", value = "10kV线路实体", required = true)
-    public HttpResult<Object> addTenVoltage(@RequestBody @Validated PvTenVoltageParam pvTenVoltageParam) {
-        String methodDescribe = getMethodDescribe("addTenVoltage");
-        boolean flag = iPvTenVoltageService.addTenVoltage(pvTenVoltageParam);
-        if (flag) {
-            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
-        }
-        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, null, methodDescribe);
-    }
-
-
-    /**
-     * 修改10kV线路
-     *
-     * @author cdf
-     * @date 2022/7/5
-     */
-    @PostMapping("updateTenVoltage")
-    @OperateInfo(info = LogEnum.SYSTEM_COMMON, operateType = OperateType.UPDATE)
-    @ApiOperation("修改10kV线路")
-    @ApiImplicitParam(name = "updatePvTenVoltageParam", value = "10kV线路实体", required = true)
-    public HttpResult<Object> updateTenVoltage(@RequestBody @Validated PvTenVoltageParam.UpdatePvTenVoltageParam updatePvTenVoltageParam) {
-        String methodDescribe = getMethodDescribe("updateTenVoltage");
-        boolean flag = iPvTenVoltageService.updateTenVoltage(updatePvTenVoltageParam);
-        if (flag) {
-            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
-        }
-        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, null, methodDescribe);
-    }
-
-
-    /**
-     * 分页查询10kV线路
-     *
-     * @param tenVoltageQueryParam 查询实体
-     * @return Page<PvTenVoltage>
-     * @author cdf
-     * @date 2022/7/5
-     */
-    @PostMapping("getPvTenVoltageList")
-    @OperateInfo(info = LogEnum.SYSTEM_COMMON)
-    @ApiOperation("分页查询10kV线路")
-    @ApiImplicitParam(name = "tenVoltageQueryParam", value = "10kV线路实体", required = true)
-    public HttpResult<Page<PvTenVoltageVO>> getPvTenVoltageList(@RequestBody @Validated TenVoltageQueryParam tenVoltageQueryParam) {
-        String methodDescribe = getMethodDescribe("getPvTenVoltageList");
-        Page<PvTenVoltageVO> page = iPvTenVoltageService.getPvTenVoltageList(tenVoltageQueryParam);
-        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, page, methodDescribe);
-    }
-
-    /**
-     * 查询所有10kV线路
-     * @author cdf
-     * @date 2022/7/5
-     * @return List<PvTenVoltage>
-     */
-    @GetMapping("getAllPvTenVoltageList")
-    @OperateInfo(info = LogEnum.SYSTEM_COMMON)
-    @ApiOperation("查询所有10kV线路")
-    public HttpResult<List<PvTenVoltage>> getAllPvTenVoltageList(){
-        String methodDescribe = getMethodDescribe("getAllPvTenVoltageList");
-        List<PvTenVoltage> res = iPvTenVoltageService.getAllPvTenVoltageList();
-        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, res, methodDescribe);
-    }
-
-
-    /**
-     * 根据10kV线路id查询10kV线路
-     *
-     * @param id 10kV线路id
-     * @return PvTenVoltage
-     * @author cdf
-     * @date 2022/7/5
-     */
-    @GetMapping("getPvTenVoltageById")
-    @OperateInfo(info = LogEnum.SYSTEM_COMMON)
-    @ApiOperation("根据10kV线路id查询10kV线路")
-    @ApiImplicitParam(name = "id", value = "10kV线路id", required = true)
-    public HttpResult<PvTenVoltage> getPvTenVoltageById(@RequestParam("id") String id) {
-        String methodDescribe = getMethodDescribe("getPvTenVoltageById");
-        PvTenVoltage pvTenVoltage = iPvTenVoltageService.getPvTenVoltageById(id);
-        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, pvTenVoltage, methodDescribe);
-    }
-
-
-    /**
-     * 删除10kV线路
-     *
-     * @param ids 10kV线路id
-     * @return boolean
-     * @author cdf
-     * @date 2022/7/5
-     */
-    @PostMapping("delPvTenVoltage")
-    @OperateInfo(info = LogEnum.SYSTEM_COMMON)
-    @ApiOperation("删除10kV线路")
-    @ApiImplicitParam(name = "ids", value = "10kV线路id", required = true)
-    public HttpResult<PvTenVoltage> delPvTenVoltage(@RequestBody List<String> ids) {
-        String methodDescribe = getMethodDescribe("delPvTenVoltage");
-        boolean flag = iPvTenVoltageService.delPvTenVoltage(ids);
-        if (flag) {
-            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
-        }
-        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, null, methodDescribe);
-    }
-}
-
diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/PvTerminalBaseController.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/PvTerminalBaseController.java
deleted file mode 100644
index b6278b24b..000000000
--- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/PvTerminalBaseController.java
+++ /dev/null
@@ -1,92 +0,0 @@
-package com.njcn.device.pms.controller;
-
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.njcn.common.pojo.annotation.OperateInfo;
-import com.njcn.common.pojo.enums.common.LogEnum;
-import com.njcn.common.pojo.enums.response.CommonResponseEnum;
-import com.njcn.common.pojo.response.HttpResult;
-import com.njcn.common.utils.HttpResultUtil;
-import com.njcn.device.pms.pojo.param.PvTerminalBaseQuery;
-import com.njcn.device.pms.pojo.vo.DisOrLvVO;
-import com.njcn.device.pms.pojo.vo.PvLineAllDetailVO;
-import com.njcn.device.pms.service.PvTerminalBaseService;
-import com.njcn.user.pojo.vo.PvTerminalTreeVO;
-import com.njcn.web.controller.BaseController;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
-import lombok.RequiredArgsConstructor;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
-
-/**
- * pqs
- * 台账相关控制
- *
- * @author cdf
- * @date 2022/7/11
- */
-@RestController
-@RequestMapping("/pvTerminalBase")
-@Api(tags = "pv终端相关基础管理")
-@RequiredArgsConstructor
-public class PvTerminalBaseController extends BaseController {
-
-    private final PvTerminalBaseService pvTerminalBaseService;
-
-
-    /**
-     * 获取终端台账树
-     *
-     * @author cdf
-     * @date 2022/7/11
-     */
-    @GetMapping("pvTree")
-    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
-    @ApiOperation("获取终端台账树")
-    public HttpResult<List<PvTerminalTreeVO>> pvTerminalTree() {
-        String methodDescribe = getMethodDescribe("pvTerminalTree");
-        List<PvTerminalTreeVO> tree = pvTerminalBaseService.pvTerminalTree();
-        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, tree, methodDescribe);
-    }
-
-
-    /**
-     * 点击变电站台区展示监测点详情
-     * @param pvTerminalBaseQuery 传参
-     * @author cdf
-     * @date 2022/7/11
-     */
-    @PostMapping("pvLineDetail")
-    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
-    @ApiOperation("点击树节点获取监测点详情")
-    @ApiImplicitParam(name = "pvTerminalBaseQuery",value = "参数",required = true)
-    public HttpResult<Page<PvLineAllDetailVO>> lineDetailBySubId(@RequestBody @Validated PvTerminalBaseQuery pvTerminalBaseQuery) {
-        String methodDescribe = getMethodDescribe("lineDetailBySubId");
-        Page<PvLineAllDetailVO> all = pvTerminalBaseService.lineDetailBySubId(pvTerminalBaseQuery);
-        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, all, methodDescribe);
-    }
-
-    /**
-     * 根据userCode 和 userCodeType
-     * @author cdf
-     * @date 2022/7/28
-     */
-    @GetMapping("pvDisOrLv")
-    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
-    @ApiOperation("根据用户编号获取低压分布式详情")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "userCode", value = "用户编号"),
-            @ApiImplicitParam(name = "userCodeType", value = "用户编号类型 0.光伏 1.低压"),
-    })
-    public HttpResult<DisOrLvVO> pvDisOrLv(@RequestParam("userCode")String userCode,@RequestParam("userCodeType")Integer userCodeType) {
-        String methodDescribe = getMethodDescribe("pvDisOrLv");
-        DisOrLvVO all = pvTerminalBaseService.pvDisOrLv(userCode,userCodeType);
-        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, all, methodDescribe);
-    }
-
-
-}
diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/PvUnitController.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/PvUnitController.java
deleted file mode 100644
index 115332588..000000000
--- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/PvUnitController.java
+++ /dev/null
@@ -1,119 +0,0 @@
-package com.njcn.device.pms.controller;
-
-
-import com.njcn.device.pms.service.IPvUnitService;
-import com.njcn.web.controller.BaseController;
-import io.swagger.annotations.Api;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- *  前端控制器
- * </p>
- *
- * @author cdf
- * @since 2022-07-05
- */
-@RestController
-@RequestMapping("/pvUnit")
-@Api(tags = "pv单位控制器")
-@RequiredArgsConstructor
-public class PvUnitController extends BaseController {
-
-    private final IPvUnitService iPvUnitService;
-
-   /* *//**
-     * 新增单位
-     * @param pvUnitParam 单位实体
-     * @author cdf
-     * @date 2022/7/5
-     *//*
-    @PostMapping("addUnit")
-    @OperateInfo(info = LogEnum.SYSTEM_COMMON,operateType = OperateType.ADD)
-    @ApiOperation("新增单位")
-    @ApiImplicitParam(name = "pvUnitParam",value = "单位实体",required = true)
-    public HttpResult<Object> addUnit(@RequestBody @Validated PvUnitParam pvUnitParam){
-        String methodDescribe = getMethodDescribe("addUnit");
-        iPvUnitService.addUnit(pvUnitParam);
-        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
-
-
-    }
-
-
-    *//**
-     * 修改单位
-     * @author cdf
-     * @date 2022/7/5
-     *//*
-    @PostMapping("updateUnit")
-    @OperateInfo(info = LogEnum.SYSTEM_COMMON,operateType = OperateType.UPDATE)
-    @ApiOperation("修改单位")
-    @ApiImplicitParam(name = "updatePvUnitParam",value = "单位实体",required = true)
-    public HttpResult<Object> updateUnit(@RequestBody @Validated PvUnitParam.UpdatePvUnitParam updatePvUnitParam){
-        String methodDescribe = getMethodDescribe("updateUnit");
-        iPvUnitService.updateUnit(updatePvUnitParam);
-        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
-
-
-    }
-
-
-    *//**
-     * 查询所有单位
-     * @param baseParam 查询实体
-     * @author cdf
-     * @date 2022/7/5
-     * @return Page<PvUnit>
-     *//*
-    @PostMapping("getPvUnitList")
-    @OperateInfo(info = LogEnum.SYSTEM_COMMON)
-    @ApiOperation("查询所有单位")
-    @ApiImplicitParam(name = "baseParam",value = "单位实体",required = true)
-    public HttpResult<List<UnitTreeVO>> getPvUnitList(@RequestBody BaseParam baseParam){
-        String methodDescribe = getMethodDescribe("getPvUnitList");
-        List<UnitTreeVO> res = iPvUnitService.getPvUnitList(baseParam);
-        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, res, methodDescribe);
-
-    }
-
-
-    *//**
-     * 根据单位id查询单位
-     * @param id 单位id
-     * @author cdf
-     * @date 2022/7/5
-     * @return PvUnit
-     *//*
-    @GetMapping("getPvUnitById")
-    @OperateInfo(info = LogEnum.SYSTEM_COMMON)
-    @ApiOperation("根据单位id查询单位")
-    @ApiImplicitParam(name = "id",value = "单位id",required = true)
-    public HttpResult<PvUnit> getPvUnitById(@RequestParam("id") String id){
-        String methodDescribe = getMethodDescribe("getPvUnitById");
-        PvUnit pvUnit = iPvUnitService.getPvUnitById(id);
-        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, pvUnit, methodDescribe);
-    }
-
-
-    *//**
-     * 删除单位
-     * @param id 单位id
-     * @author cdf
-     * @date 2022/7/5
-     * @return boolean
-     *//*
-    @DeleteMapping("delPvUnit")
-    @OperateInfo(info = LogEnum.SYSTEM_COMMON)
-    @ApiOperation("删除单位")
-    @ApiImplicitParam(name = "id",value = "单位id",required = true)
-    public HttpResult<PvUnit> delPvUnit(@RequestParam("id") String id){
-        String methodDescribe = getMethodDescribe("delPvUnit");
-        iPvUnitService.delPvUnit(id);
-        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
-    }
-*/
-}
-
diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/PvVoltageController.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/PvVoltageController.java
deleted file mode 100644
index 5825a78b8..000000000
--- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/PvVoltageController.java
+++ /dev/null
@@ -1,144 +0,0 @@
-package com.njcn.device.pms.controller;
-
-
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.njcn.common.pojo.annotation.OperateInfo;
-import com.njcn.common.pojo.constant.OperateType;
-import com.njcn.common.pojo.enums.common.LogEnum;
-import com.njcn.common.pojo.enums.response.CommonResponseEnum;
-import com.njcn.common.pojo.response.HttpResult;
-import com.njcn.common.utils.HttpResultUtil;
-import com.njcn.device.pms.pojo.param.PvVoltageParam;
-import com.njcn.device.pms.pojo.param.VoltageQueryParam;
-import com.njcn.device.pms.pojo.po.PvVoltage;
-import com.njcn.device.pms.service.IPvVoltageService;
-import com.njcn.web.controller.BaseController;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiOperation;
-import lombok.RequiredArgsConstructor;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
-
-/**
- * <p>
- *  前端控制器
- * </p>
- *
- * @author cdf
- * @since 2022-07-05
- */
-@RestController
-@RequestMapping("/pvVoltage")
-@Api(tags = "pv母线控制器")
-@RequiredArgsConstructor
-public class PvVoltageController extends BaseController {
-
-    private final IPvVoltageService iPvVoltageService;
-
-
-    /**
-     * 新增母线
-     * @param pvVoltageParam 母线实体
-     * @author cdf
-     * @date 2022/7/5
-     */
-    @PostMapping("addVoltage")
-    @OperateInfo(info = LogEnum.SYSTEM_COMMON,operateType = OperateType.ADD)
-    @ApiOperation("新增母线")
-    @ApiImplicitParam(name = "pvVoltageParam",value = "母线实体",required = true)
-    public HttpResult<Object> addVoltage(@RequestBody @Validated PvVoltageParam pvVoltageParam){
-        String methodDescribe = getMethodDescribe("addVoltage");
-        iPvVoltageService.addVoltage(pvVoltageParam);
-        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
-    }
-
-
-    /**
-     * 修改母线
-     * @author cdf
-     * @date 2022/7/5
-     */
-    @PostMapping("updateVoltage")
-    @OperateInfo(info = LogEnum.SYSTEM_COMMON,operateType = OperateType.UPDATE)
-    @ApiOperation("修改母线")
-    @ApiImplicitParam(name = "updatePvVoltageParam",value = "母线实体",required = true)
-    public HttpResult<Object> updateVoltage(@RequestBody @Validated PvVoltageParam.UpdatePvVoltageParam updatePvVoltageParam){
-        String methodDescribe = getMethodDescribe("updateVoltage");
-        iPvVoltageService.updateVoltage(updatePvVoltageParam);
-        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
-    }
-
-
-    /**
-     * 分页查询母线
-     * @param voltageQueryParam 查询实体
-     * @author cdf
-     * @date 2022/7/5
-     * @return Page<PvVoltage>
-     */
-    @PostMapping("getPvVoltageList")
-    @OperateInfo(info = LogEnum.SYSTEM_COMMON)
-    @ApiOperation("分页查询母线")
-    @ApiImplicitParam(name = "voltageQueryParam",value = "母线实体",required = true)
-    public HttpResult<Page<PvVoltage>> getPvVoltageList(@RequestBody VoltageQueryParam voltageQueryParam){
-        String methodDescribe = getMethodDescribe("getPvVoltageList");
-        Page<PvVoltage> page = iPvVoltageService.getPvVoltageList(voltageQueryParam);
-        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, page, methodDescribe);
-    }
-
-    /**
-     * 查询所有母线
-     * @author cdf
-     * @date 2022/7/5
-     * @return Page<PvVoltage>
-     */
-    @PostMapping("getAllPvVoltageList")
-    @OperateInfo(info = LogEnum.SYSTEM_COMMON)
-    @ApiOperation("查询所有母线")
-    public HttpResult<List<PvVoltage>> getAllPvVoltageList(){
-        String methodDescribe = getMethodDescribe("getAllPvVoltageList");
-        List<PvVoltage> list = iPvVoltageService.getAllPvVoltageList();
-        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);
-    }
-
-
-    /**
-     * 根据母线id查询母线
-     * @param id 母线id
-     * @author cdf
-     * @date 2022/7/5
-     * @return PvVoltage
-     */
-    @GetMapping("getPvVoltageById")
-    @OperateInfo(info = LogEnum.SYSTEM_COMMON)
-    @ApiOperation("根据母线id查询母线")
-    @ApiImplicitParam(name = "id",value = "母线id",required = true)
-    public HttpResult<PvVoltage> getPvVoltageById(@RequestParam("id") String id){
-        String methodDescribe = getMethodDescribe("getPvVoltageById");
-        PvVoltage pvVoltage = iPvVoltageService.getPvVoltageById(id);
-        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, pvVoltage, methodDescribe);
-    }
-
-
-    /**
-     * 删除母线
-     * @param id 母线id
-     * @author cdf
-     * @date 2022/7/5
-     * @return boolean
-     */
-    @DeleteMapping("delPvVoltage")
-    @OperateInfo(info = LogEnum.SYSTEM_COMMON)
-    @ApiOperation("删除母线")
-    @ApiImplicitParam(name = "id",value = "母线id",required = true)
-    public HttpResult<PvVoltage> delPvVoltage(@RequestParam("id") String id){
-        String methodDescribe = getMethodDescribe("delPvVoltage");
-        iPvVoltageService.delPvVoltage(id);
-        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
-    }
-
-}
-
diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/PwMonitorController.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/PwMonitorController.java
new file mode 100644
index 000000000..8c7268271
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/PwMonitorController.java
@@ -0,0 +1,62 @@
+package com.njcn.device.pms.controller;
+
+import cn.hutool.core.collection.CollectionUtil;
+import com.njcn.common.pojo.annotation.OperateInfo;
+import com.njcn.common.pojo.enums.common.LogEnum;
+import com.njcn.common.pojo.enums.response.CommonResponseEnum;
+import com.njcn.common.pojo.response.HttpResult;
+import com.njcn.common.utils.HttpResultUtil;
+import com.njcn.device.pms.pojo.dto.PwPmsMonitorDTO;
+import com.njcn.device.pms.pojo.param.PwPmsMonitorParam;
+import com.njcn.device.pms.service.IMonitorService;
+import com.njcn.device.pms.service.IPwMonitorService;
+import com.njcn.web.controller.BaseController;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * @author yzh
+ * @date 2022/10/28
+ */
+
+@RestController
+@RequestMapping("/pms/pwMonitor")
+@Slf4j
+@Api(tags = "配网监测点信息")
+@RequiredArgsConstructor
+public class PwMonitorController extends BaseController {
+
+    private final IPwMonitorService iPwMonitorService;
+
+
+
+    /**
+     * 获取配网所有监测点信息
+     *
+     * @param pwPmsMonitorParam 参数条件
+     * @return 配网所有监测点信息
+     */
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/getPwMonitorList")
+    @ApiOperation("获取配网所有监测点信息")
+    @ApiImplicitParam(name = "pwPmsMonitorParam",value = "获取配网所有监测点信息条件",required = true)
+    public HttpResult<List<PwPmsMonitorDTO>> getPwMonitorList(@RequestBody @Validated PwPmsMonitorParam pwPmsMonitorParam) {
+        String methodDescribe = getMethodDescribe("getPwMonitorList");
+        List<PwPmsMonitorDTO> monitorList = iPwMonitorService.getPwMonitorList(pwPmsMonitorParam);
+        if (CollectionUtil.isEmpty(monitorList)) {
+            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.NO_DATA, null, methodDescribe);
+        } else {
+            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, monitorList, methodDescribe);
+        }
+    }
+}
diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/RMpMonitorAlarmCountMController.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/RMpMonitorAlarmCountMController.java
new file mode 100644
index 000000000..d5d584d24
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/RMpMonitorAlarmCountMController.java
@@ -0,0 +1,48 @@
+package com.njcn.device.pms.controller;
+
+import com.njcn.common.pojo.annotation.OperateInfo;
+import com.njcn.common.pojo.enums.common.LogEnum;
+import com.njcn.common.pojo.enums.response.CommonResponseEnum;
+import com.njcn.common.pojo.response.HttpResult;
+import com.njcn.common.utils.HttpResultUtil;
+import com.njcn.device.pms.pojo.param.RMpMonitorAlarmCountMParam;
+import com.njcn.device.pms.pojo.param.RStatAreaAlarmCountMParam;
+import com.njcn.device.pms.pojo.vo.RMpMonitorAlarmCountMVO;
+import com.njcn.device.pms.pojo.vo.RStatAreaAlarmCountMVO;
+import com.njcn.device.pms.service.RMpMonitorAlarmCountMService;
+import com.njcn.web.controller.BaseController;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * 监测点告警统计
+ * @Title RMpMonitorAlarmCountMController
+ * @Package com.njcn.device.pms.controller
+ * @Author jianghaifei
+ * @Date 2022-10-13 08:54
+ * @Version V1.0
+ */
+@RestController
+@Api(tags = "主网-监测点告警统计(月)")
+@RequiredArgsConstructor
+@RequestMapping("/rMpMonitorAlarmCountM")
+public class RMpMonitorAlarmCountMController extends BaseController {
+
+    private final RMpMonitorAlarmCountMService rMpMonitorAlarmCountMService;
+
+    @PostMapping("/getRMpMonitorAlarmCountMList")
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @ApiOperation("根据条件查询监测点告警统计(月)")
+    public HttpResult<List<RMpMonitorAlarmCountMVO>> getAllRStatAreaAlarmCountMList(@RequestBody RMpMonitorAlarmCountMParam rMpMonitorAlarmCountMParam) {
+        String methodDescribe = getMethodDescribe("getAllRStatAreaAlarmCountMList");
+        List<RMpMonitorAlarmCountMVO> list = rMpMonitorAlarmCountMService.getRMpMonitorAlarmCountMList(rMpMonitorAlarmCountMParam);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);
+    }
+}
diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/RStatAreaAlarmCountMController.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/RStatAreaAlarmCountMController.java
new file mode 100644
index 000000000..538e56dfd
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/RStatAreaAlarmCountMController.java
@@ -0,0 +1,48 @@
+package com.njcn.device.pms.controller;
+
+import com.njcn.common.pojo.annotation.OperateInfo;
+import com.njcn.common.pojo.enums.common.LogEnum;
+import com.njcn.common.pojo.enums.response.CommonResponseEnum;
+import com.njcn.common.pojo.response.HttpResult;
+import com.njcn.common.utils.HttpResultUtil;
+import com.njcn.device.pms.pojo.param.RStatAreaAlarmCountMParam;
+import com.njcn.device.pms.pojo.param.RStatZwAlarmCountWParam;
+import com.njcn.device.pms.pojo.vo.RStatAreaAlarmCountMVO;
+import com.njcn.device.pms.pojo.vo.RStatZwAlarmCountWVO;
+import com.njcn.device.pms.service.RStatAreaAlarmCountMService;
+import com.njcn.web.controller.BaseController;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * @Title RStatAreaAlarmCountMController
+ * @Package com.njcn.device.pms.controller
+ * @Author jianghaifei
+ * @Date 2022-10-10 15:13
+ * @Version V1.0
+ */
+
+@RestController
+@Api(tags = "主网-区域告警统计(月)")
+@RequiredArgsConstructor
+@RequestMapping("/rStatAreaAlarmCountM")
+public class RStatAreaAlarmCountMController extends BaseController {
+
+    private final RStatAreaAlarmCountMService rStatAreaAlarmCountMService;
+
+    @PostMapping("getAllRStatAreaAlarmCountMList")
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @ApiOperation("根据条件查询所有区域告警统计(月)")
+    public HttpResult<List<RStatAreaAlarmCountMVO>> getAllRStatAreaAlarmCountMList(@RequestBody RStatAreaAlarmCountMParam rStatAreaAlarmCountMParam) {
+        String methodDescribe = getMethodDescribe("getAllRStatAreaAlarmCountMList");
+        List<RStatAreaAlarmCountMVO> list = rStatAreaAlarmCountMService.getAllRStatAreaAlarmCountMList(rStatAreaAlarmCountMParam);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);
+    }
+}
diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/RStatBusbarHarmonicController.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/RStatBusbarHarmonicController.java
new file mode 100644
index 000000000..d911619f5
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/RStatBusbarHarmonicController.java
@@ -0,0 +1,55 @@
+package com.njcn.device.pms.controller;
+
+
+import com.njcn.common.pojo.annotation.OperateInfo;
+import com.njcn.common.pojo.enums.common.LogEnum;
+import com.njcn.common.pojo.enums.response.CommonResponseEnum;
+import com.njcn.common.pojo.response.HttpResult;
+import com.njcn.common.utils.HttpResultUtil;
+import com.njcn.device.pms.pojo.param.UniversalFrontEndParam;
+import com.njcn.device.pms.pojo.vo.RStatBusbarHarmonicVO;
+import com.njcn.device.pms.service.RStatBusbarHarmonicService;
+import com.njcn.web.controller.BaseController;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * 变电站背景谐波
+ *
+ * @author yzh
+ * @date 2022/10/8
+ */
+
+@RestController
+@RequestMapping("/rStatBusbarHarmonic")
+@Api(tags = "变电站背景谐波")
+@RequiredArgsConstructor
+public class RStatBusbarHarmonicController extends BaseController {
+
+    private final RStatBusbarHarmonicService statBusbarHarmonicService;
+
+    /**
+     * 获取变电站母线电压指标年报
+     *
+     * @param param 前端传入参数
+     * @return 变电站母线电压指标年报
+     */
+    @PostMapping("/getRStatBusbarHarmonic")
+    @OperateInfo(info = LogEnum.SYSTEM_COMMON)
+    @ApiOperation("获取变电站母线电压指标年报")
+    @ApiImplicitParam(name = "param", value = "获取变电站母线电压指标年报前端参数", required = true)
+    public HttpResult<List<RStatBusbarHarmonicVO>> getRStatBusbarHarmonic(@RequestBody UniversalFrontEndParam param) {
+        String methodDescribe = getMethodDescribe("getRStatBusbarHarmonic");
+        List<RStatBusbarHarmonicVO> list = statBusbarHarmonicService.getRStatBusbarHarmonic(param);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);
+    }
+
+}
diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/RStatZwAlarmCountWController.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/RStatZwAlarmCountWController.java
new file mode 100644
index 000000000..635742de2
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/RStatZwAlarmCountWController.java
@@ -0,0 +1,71 @@
+package com.njcn.device.pms.controller;
+
+import com.njcn.common.pojo.annotation.OperateInfo;
+import com.njcn.common.pojo.enums.common.LogEnum;
+import com.njcn.common.pojo.enums.response.CommonResponseEnum;
+import com.njcn.common.pojo.response.HttpResult;
+import com.njcn.common.utils.HttpResultUtil;
+import com.njcn.device.pms.pojo.param.RStatZwAlarmCountWParam;
+import com.njcn.device.pms.pojo.vo.ProblemMonitorDetailVO;
+import com.njcn.device.pms.pojo.vo.RStatZwAlarmCountWVO;
+import com.njcn.device.pms.service.RStatZwAlarmCountWService;
+import com.njcn.web.controller.BaseController;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * @Title RStatZwAlarmCountWController
+ * @Package com.njcn.device.pms.controller
+ * @Author jianghaifei
+ * @Date 2022-10-09 08:56
+ * @Version V1.0
+ */
+@RestController
+@Api(tags = "主网-告警统计(周)")
+@RequiredArgsConstructor
+@RequestMapping("/rStatZwAlarmCount")
+public class RStatZwAlarmCountWController extends BaseController {
+
+    private final RStatZwAlarmCountWService rStatZwAlarmCountWService;
+
+
+    /***
+     * 查询所有告警统计(周)
+     * @author jianghaifei
+     * @date 2022-10-09 15:23
+     * @param
+     * @return com.njcn.common.pojo.response.HttpResult<java.util.List<com.njcn.device.pms.pojo.vo.RStatZwAlarmCountWVO>>
+     */
+    @PostMapping("getAllRStatZwAlarmCountList")
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @ApiOperation("根据条件查询所有告警统计(周)")
+    public HttpResult<List<RStatZwAlarmCountWVO>> getAllRStatZwAlarmCountList(@RequestBody RStatZwAlarmCountWParam rStatZwAlarmCountWParam) {
+        String methodDescribe = getMethodDescribe("getAllRStatZwAlarmCountList");
+        List<RStatZwAlarmCountWVO> list = rStatZwAlarmCountWService.getAllRStatZwAlarmCountWList(rStatZwAlarmCountWParam);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);
+    }
+
+    /***
+     * 查询问题严重的监测点信息
+     * @author jianghaifei
+     * @date 2022-10-13 16:34
+     * @param 
+     * @return com.njcn.common.pojo.response.HttpResult<java.util.List<com.njcn.device.pms.pojo.vo.RStatZwAlarmCountWVO>>
+     */
+    @PostMapping("getProblemMonitorDetailList")
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @ApiOperation("查询问题严重的监测点信息")
+    public HttpResult<List<ProblemMonitorDetailVO>> getProblemMonitorDetailList(@RequestBody RStatZwAlarmCountWParam rStatZwAlarmCountWParam) {
+        String methodDescribe = getMethodDescribe("getProblemMonitorDetailList");
+        List<ProblemMonitorDetailVO> list = rStatZwAlarmCountWService.getProblemMonitorDetailList(rStatZwAlarmCountWParam);
+
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);
+    }
+}
diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/RmpEventDetailController.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/RmpEventDetailController.java
new file mode 100644
index 000000000..12f0da08f
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/RmpEventDetailController.java
@@ -0,0 +1,53 @@
+package com.njcn.device.pms.controller;
+
+import com.njcn.common.pojo.annotation.OperateInfo;
+import com.njcn.common.pojo.enums.common.LogEnum;
+import com.njcn.common.pojo.enums.response.CommonResponseEnum;
+import com.njcn.common.pojo.response.HttpResult;
+import com.njcn.common.utils.HttpResultUtil;
+import com.njcn.device.pms.pojo.param.UniversalFrontEndParam;
+import com.njcn.device.pms.pojo.vo.RmpEventDetailVO;
+import com.njcn.device.pms.service.RmpEventDetailService;
+import com.njcn.web.controller.BaseController;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * 暂态事件明细
+ *
+ * @author yzh
+ * @date 2022/10/12
+ */
+
+@RestController
+@RequestMapping("/rmpEventDetail")
+@Api(tags = "暂态事件明细")
+@RequiredArgsConstructor
+public class RmpEventDetailController extends BaseController {
+
+    private final RmpEventDetailService rmpEventDetailService;
+
+    /**
+     * 获取暂态事件明细
+     *
+     * @param param 前端传入参数
+     * @return 暂态事件明细
+     */
+    @PostMapping("/getDetailsOfTransientEvents")
+    @OperateInfo(info = LogEnum.SYSTEM_COMMON)
+    @ApiOperation("获取区域暂态指标统计")
+    @ApiImplicitParam(name = "param", value = "前端参数", required = true)
+    public HttpResult<List<RmpEventDetailVO>> getRmpEventDetail(@RequestBody UniversalFrontEndParam param) {
+        String methodDescribe = getMethodDescribe("getRmpEventDetail");
+        List<RmpEventDetailVO> list = rmpEventDetailService.getRmpEventDetail(param);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);
+    }
+}
diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/SourceManagementController.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/SourceManagementController.java
new file mode 100644
index 000000000..1e5303294
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/SourceManagementController.java
@@ -0,0 +1,22 @@
+package com.njcn.device.pms.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+import com.njcn.web.controller.BaseController;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author hongawen
+ * @since 2022-10-14
+ */
+@RestController
+@RequestMapping("/pms/sourceManagement")
+public class SourceManagementController extends BaseController {
+
+}
+
diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/StatationStatController.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/StatationStatController.java
new file mode 100644
index 000000000..136621df1
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/StatationStatController.java
@@ -0,0 +1,136 @@
+package com.njcn.device.pms.controller;
+
+import cn.hutool.core.collection.CollectionUtil;
+import com.njcn.common.pojo.annotation.OperateInfo;
+import com.njcn.common.pojo.constant.OperateType;
+import com.njcn.common.pojo.enums.common.LogEnum;
+import com.njcn.common.pojo.enums.response.CommonResponseEnum;
+import com.njcn.common.pojo.response.HttpResult;
+import com.njcn.common.utils.HttpResultUtil;
+import com.njcn.device.pms.pojo.dto.PmsStatationStatInfoDTO;
+import com.njcn.device.pms.pojo.param.StatationStatParam;
+import com.njcn.device.pms.pojo.param.PmsStatationStatInfoParam;
+import com.njcn.device.pms.pojo.po.StatationStat;
+import com.njcn.device.pms.service.IStatationStatService;
+import com.njcn.web.controller.BaseController;
+import com.njcn.web.pojo.param.BaseParam;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.constraints.NotEmpty;
+import java.util.List;
+import java.util.Objects;
+
+/**
+ * <p>
+ *  电站监测点设置信息
+ * </p>
+ *
+ * @author hongawen
+ * @since 2022-10-14
+ */
+@RestController
+@RequestMapping("/pms/statationStat")
+@Slf4j
+@Api(tags = "变电站统计")
+@RequiredArgsConstructor
+public class StatationStatController extends BaseController {
+
+    private final IStatationStatService statationStatService;
+    /**
+     * 获取监测点信息
+     */
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/getStatationStat")
+    @ApiOperation("获取指定的变电站信息")
+//    @ApiImplicitParams({
+//            @ApiImplicitParam(name = "pmsStatationStatInfoParam", value = "获取指定的变电站信息条件", required = true)
+//    })
+    public HttpResult<List<PmsStatationStatInfoDTO>> getStatationStatInfo(@RequestBody @Validated PmsStatationStatInfoParam pmsStatationStatInfoParam) {
+        String methodDescribe = getMethodDescribe("getStatationStatInfo");
+        List<PmsStatationStatInfoDTO> monitorInfo = statationStatService.getStatationStatInfo(pmsStatationStatInfoParam);
+        if (CollectionUtil.isEmpty(monitorInfo)) {
+            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.NO_DATA, null, methodDescribe);
+        } else {
+            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, monitorInfo, methodDescribe);
+        }
+    }
+
+
+
+    /*台账部分***************************/
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON,operateType = OperateType.ADD)
+    @PostMapping("/addstatationStat")
+    @ApiOperation("新增电站")
+    @ApiImplicitParam(name = "statationStatParam", value = "电站实体", required = true)
+    public HttpResult<Boolean> addstatationStat(@RequestBody StatationStatParam statationStatParam) {
+        String methodDescribe = getMethodDescribe("addstatationStat");
+        boolean result = statationStatService.addStatationStat(statationStatParam);
+        if(result){
+            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
+        }
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, null, methodDescribe);
+
+    }
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON,operateType = OperateType.UPDATE)
+    @PostMapping("/updatestatationStat")
+    @ApiOperation("修改电站")
+    @ApiImplicitParam(name = "statationStatParam", value = "电站实体", required = true)
+    public HttpResult<Boolean> updatestatationStat(@RequestBody StatationStatParam statationStatParam) {
+        String methodDescribe = getMethodDescribe("updatestatationStat");
+        boolean result = statationStatService.updateStatationStat(statationStatParam);
+        if(result){
+            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
+        }
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, null, methodDescribe);
+
+    }
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON,operateType = OperateType.DELETE)
+    @DeleteMapping("/delstatationStat")
+    @ApiOperation("删除电站")
+    @ApiImplicitParam(name = "statationStatIds", value = "电站ids", required = true)
+    public HttpResult<Boolean> delstatationStat(@RequestBody @NotEmpty(message = "电站id不可为空") List<String> statationStatIds) {
+        String methodDescribe = getMethodDescribe("delstatationStat");
+        boolean result = statationStatService.delStatationStat(statationStatIds);
+        if(result){
+            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
+        }
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, null, methodDescribe);
+
+    }
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @GetMapping("/getstatationStatById")
+    @ApiOperation("根据电站id获取电站")
+    @ApiImplicitParam(name = "statationStatId", value = "电站id", required = true)
+    public HttpResult<StatationStat> getstatationStatById(@RequestParam("statationStatId") String statationStatId) {
+        String methodDescribe = getMethodDescribe("getstatationStatById");
+        StatationStat result = statationStatService.getStatationStatById(statationStatId);
+        if(Objects.nonNull(result)){
+            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
+        }
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, null, methodDescribe);
+
+    }
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/getstatationStatList")
+    @ApiOperation("获取电站列表")
+    @ApiImplicitParam(name = "baseParam", value = "基本查询体", required = true)
+    public HttpResult<List<StatationStat>> getstatationStatList(@RequestBody BaseParam baseParam) {
+        String methodDescribe = getMethodDescribe("getstatationStatList");
+        List<StatationStat> result = statationStatService.getStatationStatList(baseParam);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
+    }
+
+
+}
+
diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/StatisticsRunMonitorController.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/StatisticsRunMonitorController.java
new file mode 100644
index 000000000..9a048d0e3
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/StatisticsRunMonitorController.java
@@ -0,0 +1,22 @@
+package com.njcn.device.pms.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+import com.njcn.web.controller.BaseController;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author hongawen
+ * @since 2022-10-14
+ */
+@RestController
+@RequestMapping("/pms/statisticsRunMonitor")
+public class StatisticsRunMonitorController extends BaseController {
+
+}
+
diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/TerminalController.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/TerminalController.java
new file mode 100644
index 000000000..8de59dc64
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/TerminalController.java
@@ -0,0 +1,132 @@
+package com.njcn.device.pms.controller;
+
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.njcn.common.pojo.annotation.OperateInfo;
+import com.njcn.common.pojo.constant.OperateType;
+import com.njcn.common.pojo.enums.common.LogEnum;
+import com.njcn.common.pojo.enums.response.CommonResponseEnum;
+import com.njcn.common.pojo.response.HttpResult;
+import com.njcn.common.utils.HttpResultUtil;
+import com.njcn.common.utils.LogUtil;
+import com.njcn.device.pms.pojo.param.PmsTerminalParam;
+import com.njcn.device.pms.pojo.po.Terminal;
+import com.njcn.device.pms.pojo.vo.PmsTerminalVO;
+import com.njcn.device.pms.service.ITerminalService;
+import com.njcn.device.pq.pojo.param.TerminalParam;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import com.njcn.web.controller.BaseController;
+
+import java.util.List;
+import java.util.Objects;
+
+/**
+ * <p>
+ *  监测终端台账增删改查
+ * </p>
+ *
+ * @author hongawen
+ * @since 2022-10-14
+ */
+@Slf4j
+@RestController
+@RequestMapping("/pms/terminal")
+@Api(tags = "监测终端台账")
+@RequiredArgsConstructor
+@Validated
+public class TerminalController extends BaseController {
+
+    private final ITerminalService iTerminalService;
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("getTerminalList")
+    @ApiOperation("查询监测终端台账所有信息")
+    @ApiImplicitParam(name = "queryParam",value = "查询监测终端台账信息",required = true)
+    public HttpResult<Page<PmsTerminalVO>> getTerminalList(@RequestBody @Validated PmsTerminalParam.QueryParam queryParam){
+        String methodDescribe = getMethodDescribe("getTerminalList");
+        LogUtil.njcnDebug(log, "{}，查询数据为：{}", methodDescribe, queryParam);
+        Page<PmsTerminalVO> res = iTerminalService.getTerminalList(queryParam);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS,res,methodDescribe);
+    }
+
+    @OperateInfo(info = LogEnum.SYSTEM_COMMON)
+    @GetMapping("/getTerminalById")
+    @ApiOperation("根据ID查询监测终端台账数据")
+    @ApiImplicitParam(name = "id",value = "id",required = true)
+    public HttpResult<Terminal> getTerminalById(@RequestParam("id") String id){
+        String methodDescribe = getMethodDescribe("getTerminalById");
+        Terminal terminal = iTerminalService.getTerminalById(id);
+        if (Objects.nonNull(terminal)){
+            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, terminal, methodDescribe);
+        }
+        else {
+            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
+        }
+    }
+
+    /**
+     * 新增监测终端台账信息
+     * @author hany
+     * @date 2022/10/26
+     */
+    @PostMapping("/addTerminal")
+    @OperateInfo(info = LogEnum.SYSTEM_COMMON,operateType= OperateType.ADD)
+    @ApiOperation("新增监测终端台账信息")
+    @ApiImplicitParam(name = "terminalParam", value = "新增实体", required = true)
+    public HttpResult<Object> add(@RequestBody @Validated PmsTerminalParam terminalParam){
+        String methodDescribe = getMethodDescribe("add");
+        boolean result = iTerminalService.add(terminalParam);
+        if (result) {
+            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
+        } else {
+            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, null, methodDescribe);
+        }
+    }
+
+    /**
+     * 修改监测终端台账信息
+     * @author hany
+     * @date 2022/10/27
+     */
+    @PostMapping("/updateTerminal")
+    @OperateInfo(info = LogEnum.SYSTEM_COMMON,operateType = OperateType.UPDATE)
+    @ApiOperation("修改监测终端台账信息")
+    @ApiImplicitParam(name = "UpdateParam", value = "更新实体", required = true)
+    public HttpResult<Object> update(@RequestBody @Validated PmsTerminalParam updateParam){
+        String methodDescribe = getMethodDescribe("update");
+        boolean result = iTerminalService.update(updateParam);
+        if (result) {
+            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
+        } else {
+            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, null, methodDescribe);
+        }
+    }
+
+    /**
+     * 删除监测终端台账信息
+     * @param ids id
+     * @author hany
+     * @date 2022/10/27
+     */
+    @PostMapping("/deleteTerminal")
+    @OperateInfo(info = LogEnum.SYSTEM_COMMON, operateType = OperateType.DELETE)
+    @ApiOperation("删除监测终端台账信息")
+    @ApiImplicitParam(name = "ids", value = "ID索引", required = true)
+    public HttpResult<Object> delete(@RequestBody List<String> ids){
+        String methodDescribe = getMethodDescribe("delete");
+        boolean result = iTerminalService.delete(ids);
+        if(result){
+            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
+        }else {
+            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, null, methodDescribe);
+        }
+    }
+}
+
diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/TerminalEliminateDataController.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/TerminalEliminateDataController.java
new file mode 100644
index 000000000..dbdb9bb4b
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/TerminalEliminateDataController.java
@@ -0,0 +1,22 @@
+package com.njcn.device.pms.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+import com.njcn.web.controller.BaseController;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author hongawen
+ * @since 2022-10-14
+ */
+@RestController
+@RequestMapping("/pms/terminalEliminateData")
+public class TerminalEliminateDataController extends BaseController {
+
+}
+
diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/TractionStationController.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/TractionStationController.java
new file mode 100644
index 000000000..ce8331386
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/TractionStationController.java
@@ -0,0 +1,128 @@
+package com.njcn.device.pms.controller;
+
+
+import com.njcn.common.pojo.annotation.OperateInfo;
+import com.njcn.common.pojo.constant.OperateType;
+import com.njcn.common.pojo.enums.common.LogEnum;
+import com.njcn.common.pojo.enums.response.CommonResponseEnum;
+import com.njcn.common.pojo.response.HttpResult;
+import com.njcn.common.utils.HttpResultUtil;
+import com.njcn.device.pms.pojo.param.TractionStationParam;
+import com.njcn.device.pms.pojo.po.TractionStation;
+import com.njcn.device.pms.service.ITractionStationService;
+import com.njcn.web.pojo.param.BaseParam;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import com.njcn.web.controller.BaseController;
+
+import java.util.List;
+import java.util.Objects;
+
+/**
+ * <p>
+ *  牵引站信息
+ * </p>
+ *
+ * @author hongawen
+ * @since 2022-10-14
+ */
+@Slf4j
+@RestController
+@RequestMapping("/pms/tractionStation")
+@Api(tags = "牵引站信息")
+@RequiredArgsConstructor
+@Validated
+public class TractionStationController extends BaseController {
+
+    private final ITractionStationService iTractionStationService;
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/getTractionStationList")
+    @ApiOperation("获取牵引站列表")
+    @ApiImplicitParam(name = "baseParam", value = "基本查询体", required = true)
+    public HttpResult<List<TractionStation>> getTractionStationList(@RequestBody BaseParam baseParam) {
+        String methodDescribe = getMethodDescribe("getTractionStationList");
+        List<TractionStation> result = iTractionStationService.getTractionStationList(baseParam);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
+    }
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @GetMapping("/getTractionStationById")
+    @ApiOperation("根据id获取牵引站信息")
+    @ApiImplicitParam(name = "tractionStationId", value = "电站id", required = true)
+    public HttpResult<TractionStation> getTractionStationById(@RequestParam("tractionStationId") String tractionStationId) {
+        String methodDescribe = getMethodDescribe("getTractionStationById");
+        TractionStation res = iTractionStationService.getTractionStationById(tractionStationId);
+        if(Objects.nonNull(res)){
+            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, res, methodDescribe);
+        }
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, null, methodDescribe);
+
+    }
+
+    /**
+     * 新增牵引站信息
+     * @author hany
+     * @date 2022/10/28
+     */
+    @PostMapping("/addTractionStation")
+    @OperateInfo(info = LogEnum.SYSTEM_COMMON,operateType= OperateType.ADD)
+    @ApiOperation("新增牵引站信息")
+    @ApiImplicitParam(name = "tractionStationParam", value = "新增实体", required = true)
+    public HttpResult<Object> add(@RequestBody @Validated TractionStationParam tractionStationParam){
+        String methodDescribe = getMethodDescribe("add");
+        boolean result = iTractionStationService.add(tractionStationParam);
+        if (result) {
+            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
+        } else {
+            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, null, methodDescribe);
+        }
+    }
+
+    /**
+     * 修改牵引站信息
+     * @author hany
+     * @date 2022/10/28
+     */
+    @PostMapping("/updateTractionStation")
+    @OperateInfo(info = LogEnum.SYSTEM_COMMON,operateType = OperateType.UPDATE)
+    @ApiOperation("修改牵引站信息")
+    @ApiImplicitParam(name = "updateParam", value = "更新实体", required = true)
+    public HttpResult<Object> update(@RequestBody @Validated TractionStationParam updateParam){
+        String methodDescribe = getMethodDescribe("update");
+        boolean result = iTractionStationService.update(updateParam);
+        if (result) {
+            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
+        } else {
+            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, null, methodDescribe);
+        }
+    }
+
+    /**
+     * 删除牵引站信息
+     * @param ids id
+     * @author hany
+     * @date 2022/10/28
+     */
+    @PostMapping("/deleteTractionStation")
+    @OperateInfo(info = LogEnum.SYSTEM_COMMON, operateType = OperateType.DELETE)
+    @ApiOperation("删除牵引站信息")
+    @ApiImplicitParam(name = "ids", value = "ID索引", required = true)
+    public HttpResult<Object> delete(@RequestBody List<String> ids){
+        String methodDescribe = getMethodDescribe("delete");
+        boolean result = iTractionStationService.delete(ids);
+        if(result){
+            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
+        }else {
+            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, null, methodDescribe);
+        }
+    }
+
+}
+
diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/TransientStasticDataController.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/TransientStasticDataController.java
new file mode 100644
index 000000000..9ab9ab690
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/TransientStasticDataController.java
@@ -0,0 +1,22 @@
+package com.njcn.device.pms.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+import com.njcn.web.controller.BaseController;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author hongawen
+ * @since 2022-10-14
+ */
+@RestController
+@RequestMapping("/pms/transientStasticData")
+public class TransientStasticDataController extends BaseController {
+
+}
+
diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/TreatTransientDetailDataController.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/TreatTransientDetailDataController.java
new file mode 100644
index 000000000..2ab5a6d70
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/TreatTransientDetailDataController.java
@@ -0,0 +1,22 @@
+package com.njcn.device.pms.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+import com.njcn.web.controller.BaseController;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author hongawen
+ * @since 2022-10-14
+ */
+@RestController
+@RequestMapping("/pms/treatTransientDetailData")
+public class TreatTransientDetailDataController extends BaseController {
+
+}
+
diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/DistributionMonitorMapper.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/DistributionMonitorMapper.java
new file mode 100644
index 000000000..e6d53fd4c
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/DistributionMonitorMapper.java
@@ -0,0 +1,29 @@
+package com.njcn.device.pms.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.njcn.device.pms.pojo.dto.PmsMonitorBaseDTO;
+import com.njcn.device.pms.pojo.param.PmsDeviceInfoParam;
+import com.njcn.device.pms.pojo.po.DistributionMonitor;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author hongawen
+ * @since 2022-10-14
+ */
+public interface DistributionMonitorMapper extends BaseMapper<DistributionMonitor> {
+
+    /**
+     * 根据组织机构id获取配网监测点
+     * @author cdf
+     * @date 2022/10/27
+     */
+    List<PmsMonitorBaseDTO> getIdByOrgId(@Param("orgIds")List<String> orgIds, @Param("pmsDeviceInfoParam") PmsDeviceInfoParam pmsDeviceInfoParam);
+
+
+}
diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/GeneratrixWireMapper.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/GeneratrixWireMapper.java
new file mode 100644
index 000000000..0422b92c4
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/GeneratrixWireMapper.java
@@ -0,0 +1,16 @@
+package com.njcn.device.pms.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.njcn.device.pms.pojo.po.GeneratrixWire;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * pms-device
+ *
+ * @author cdf
+ * @date 2022/10/26
+ */
+@Mapper
+public interface GeneratrixWireMapper extends BaseMapper<GeneratrixWire> {
+
+}
diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/HarmonicGeneralManagementDataMapper.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/HarmonicGeneralManagementDataMapper.java
new file mode 100644
index 000000000..6f3f10cc4
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/HarmonicGeneralManagementDataMapper.java
@@ -0,0 +1,17 @@
+package com.njcn.device.pms.mapper;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.njcn.device.pms.pojo.po.HarmonicGeneralManagementData;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author hongawen
+ * @since 2022-10-14
+ */
+public interface HarmonicGeneralManagementDataMapper extends BaseMapper<HarmonicGeneralManagementData> {
+
+}
diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/HarmonicGeneralManagementMapper.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/HarmonicGeneralManagementMapper.java
new file mode 100644
index 000000000..1c31cb120
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/HarmonicGeneralManagementMapper.java
@@ -0,0 +1,16 @@
+package com.njcn.device.pms.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.njcn.device.pms.pojo.po.HarmonicGeneralManagement;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author hongawen
+ * @since 2022-10-14
+ */
+public interface HarmonicGeneralManagementMapper extends BaseMapper<HarmonicGeneralManagement> {
+
+}
diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/MonitorMapper.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/MonitorMapper.java
new file mode 100644
index 000000000..608c6fcbb
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/MonitorMapper.java
@@ -0,0 +1,59 @@
+package com.njcn.device.pms.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.njcn.common.pojo.dto.SimpleDTO;
+import com.njcn.device.pms.pojo.dto.PmsMonitorBaseDTO;
+import com.njcn.device.pms.pojo.dto.PmsMonitorInfoDTO;
+import com.njcn.device.pms.pojo.dto.PwPmsMonitorDTO;
+import com.njcn.device.pms.pojo.param.PmsDeviceInfoParam;
+import com.njcn.device.pms.pojo.param.PmsMonitorInfoParam;
+import com.njcn.device.pms.pojo.param.PmsMonitorParam;
+import com.njcn.device.pms.pojo.param.PwPmsMonitorParam;
+import com.njcn.device.pms.pojo.po.Monitor;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * Mapper 接口
+ * </p>
+ *
+ * @author hongawen
+ * @since 2022-10-14
+ */
+public interface MonitorMapper extends BaseMapper<Monitor> {
+
+    /***
+     * 根据组织ID以及其查询条件筛选出台账信息
+     * @author hongawen
+     * @date 2022/10/17 13:32
+     * @param orgIdList 部门索引
+     * @param pmsDeviceInfoParam 查询条件
+     * @return List<Monitor>
+     */
+    List<PmsMonitorBaseDTO> getMonitorByCondition(@Param("orgIdList") List<String> orgIdList,
+                                                  @Param("pmsDeviceInfoParam") PmsDeviceInfoParam pmsDeviceInfoParam);
+
+
+    /***
+     * 根据组织ID以及其查询条件筛选出变电站信息
+     * @author hongawen
+     * @date 11/1/2022 11:09 AM
+     * @param orgIdList 部门索引
+     * @param pmsDeviceInfoParam 查询条件
+     * @return List<SimpleDTO>
+     */
+    List<SimpleDTO> getPmsPowerrInfoWithInOrg(@Param("orgIdList") List<String> orgIdList,
+                                              @Param("pmsDeviceInfoParam") PmsDeviceInfoParam pmsDeviceInfoParam);
+
+    /**
+     * 获取指定的监测点信息
+     *
+     * @param pmsMonitorInfoParam 获取监测点详情数据入参
+     * @return 指定的监测点信息
+     */
+    List<PmsMonitorInfoDTO> getMonitorInfo(@Param("pmsMonitorInfoParam") PmsMonitorInfoParam pmsMonitorInfoParam);
+
+
+}
diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/PvVoltageMapper.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/OverlimitMapper.java
similarity index 54%
rename from pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/PvVoltageMapper.java
rename to pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/OverlimitMapper.java
index 066b4ffe7..eb3ebdbd6 100644
--- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/PvVoltageMapper.java
+++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/OverlimitMapper.java
@@ -1,7 +1,9 @@
 package com.njcn.device.pms.mapper;
 
-import com.njcn.device.pms.pojo.po.PvVoltage;
+
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.njcn.device.pq.pojo.po.Overlimit;
+
 
 /**
  * <p>
@@ -9,8 +11,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * </p>
  *
  * @author cdf
- * @since 2022-07-05
+ * @since 2022-01-04
  */
-public interface PvVoltageMapper extends BaseMapper<PvVoltage> {
+public interface OverlimitMapper extends BaseMapper<Overlimit> {
 
 }
diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/PmsGeneratrixMapper.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/PmsGeneratrixMapper.java
new file mode 100644
index 000000000..e921103e6
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/PmsGeneratrixMapper.java
@@ -0,0 +1,26 @@
+package com.njcn.device.pms.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.njcn.device.pms.pojo.dto.PmsGeneratrixDTO;
+import com.njcn.device.pms.pojo.param.PmsGeneratrixParam;
+import com.njcn.device.pms.pojo.po.Generatrix;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * @author yzh
+ * @date 2022/10/18
+ */
+@Mapper
+public interface PmsGeneratrixMapper extends BaseMapper<Generatrix> {
+
+    /**
+     * 获取母线信息
+     *
+     * @param pmsGeneratrixParam 入参
+     * @return 母线信息
+     */
+    List<PmsGeneratrixDTO> getGeneratrixInfo(@Param("pmsGeneratrixParam") PmsGeneratrixParam pmsGeneratrixParam);
+}
diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/PowerClientMapper.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/PowerClientMapper.java
new file mode 100644
index 000000000..511b59ae2
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/PowerClientMapper.java
@@ -0,0 +1,16 @@
+package com.njcn.device.pms.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.njcn.device.pms.pojo.po.PowerClient;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author hongawen
+ * @since 2022-10-14
+ */
+public interface PowerClientMapper extends BaseMapper<PowerClient> {
+
+}
diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/PowerDistributionareaMapper.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/PowerDistributionareaMapper.java
new file mode 100644
index 000000000..e16032153
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/PowerDistributionareaMapper.java
@@ -0,0 +1,23 @@
+package com.njcn.device.pms.mapper;
+
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.njcn.device.pms.pojo.po.PowerDistributionarea;
+import com.njcn.device.pms.pojo.vo.PowerDistributionareaVO;
+import com.njcn.system.pojo.vo.EventTemplateVO;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author hongawen
+ * @since 2022-10-14
+ */
+public interface PowerDistributionareaMapper extends BaseMapper<PowerDistributionarea> {
+
+    Page<PowerDistributionareaVO> page(@Param("page")Page<PowerDistributionareaVO> page, @Param("ew") QueryWrapper<PowerDistributionareaVO> queryWrapper);
+}
diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/PowerGenerationUserMapper.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/PowerGenerationUserMapper.java
new file mode 100644
index 000000000..72a856bce
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/PowerGenerationUserMapper.java
@@ -0,0 +1,16 @@
+package com.njcn.device.pms.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.njcn.device.pms.pojo.po.PowerGenerationUser;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author hongawen
+ * @since 2022-10-14
+ */
+public interface PowerGenerationUserMapper extends BaseMapper<PowerGenerationUser> {
+
+}
diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/PowerQualityMatterMapper.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/PowerQualityMatterMapper.java
new file mode 100644
index 000000000..af3564b95
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/PowerQualityMatterMapper.java
@@ -0,0 +1,16 @@
+package com.njcn.device.pms.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.njcn.device.pms.pojo.po.PowerQualityMatter;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author hongawen
+ * @since 2022-10-14
+ */
+public interface PowerQualityMatterMapper extends BaseMapper<PowerQualityMatter> {
+
+}
diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/PvDeviceMapper.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/PvDeviceMapper.java
deleted file mode 100644
index 96843a0f9..000000000
--- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/PvDeviceMapper.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package com.njcn.device.pms.mapper;
-
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.njcn.device.pms.pojo.param.DeviceQueryParam;
-import com.njcn.device.pms.pojo.po.PvDevice;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.njcn.device.pms.pojo.vo.PvDeviceVO;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author cdf
- * @since 2022-07-05
- */
-public interface PvDeviceMapper extends BaseMapper<PvDevice> {
-
-
-
-
-    /**
-     * 获取所有终端台账
-     * @author cdf
-     * @date 2022/7/8
-     */
-    Page<PvDeviceVO> getPvDeviceList(Page<PvDeviceVO> page, @Param("deviceQueryParam") DeviceQueryParam deviceQueryParam);
-
-
-    List<PvDeviceVO> getAllPvDeviceList();
-
-
-}
diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/PvDeviceRunExMapper.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/PvDeviceRunExMapper.java
deleted file mode 100644
index 2daa5d373..000000000
--- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/PvDeviceRunExMapper.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package com.njcn.device.pms.mapper;
-
-import com.njcn.device.pms.pojo.bo.DeviceRunExBO;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * @author yangj
- * @date 2022/09/14
- */
-public interface PvDeviceRunExMapper {
-
-    /**
-     * 查询pq_line表获取信息
-     * @param lineLevel 监测点等级
-     * @param pid 父级id
-     * @return List<DeviceRunExBO>
-     */
-    List<DeviceRunExBO> findPQLineInfo(@Param("lineLevel") String lineLevel, @Param("pid") String pid);
-
-}
diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/PvDispatchMapper.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/PvDispatchMapper.java
deleted file mode 100644
index 9fcddf407..000000000
--- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/PvDispatchMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.njcn.device.pms.mapper;
-
-import com.njcn.device.pms.pojo.po.PvDispatch;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author cdf
- * @since 2022-07-05
- */
-public interface PvDispatchMapper extends BaseMapper<PvDispatch> {
-
-}
diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/PvDistributedMapper.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/PvDistributedMapper.java
deleted file mode 100644
index 3735dbe27..000000000
--- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/PvDistributedMapper.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package com.njcn.device.pms.mapper;
-
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.njcn.device.pms.pojo.param.DistributedQueryParam;
-import com.njcn.device.pms.pojo.po.PvDistributed;
-import com.njcn.device.pms.pojo.vo.PvDistributedVO;
-import org.apache.ibatis.annotations.Param;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author cdf
- * @since 2022-07-06
- */
-public interface PvDistributedMapper extends BaseMapper<PvDistributed> {
-
-    /**
-     * 查询索引分布式光伏
-     * @author cdf
-     * @date 2022/7/7
-     */
-    Page<PvDistributedVO> getPvDistributedList(Page<PvDistributedVO> page, @Param("distributedQueryParam") DistributedQueryParam distributedQueryParam);
-
-}
diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/PvLineDetailMapper.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/PvLineDetailMapper.java
deleted file mode 100644
index 2a0e372e1..000000000
--- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/PvLineDetailMapper.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.njcn.device.pms.mapper;
-
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.njcn.device.pms.pojo.po.PvLineDetail;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.njcn.device.pms.pojo.vo.PvLineAllDetailVO;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author cdf
- * @since 2022-07-05
- */
-public interface PvLineDetailMapper extends BaseMapper<PvLineDetail> {
-
-
-    /**
-     * 分页查询监测点
-     * @param subIds 变电站ids
-     * @param subAreaIds 台区ids
-     * @author cdf
-     * @date 2022/7/5
-     * @return Page<PvLineDetail>
-     */
-    Page<PvLineAllDetailVO> getPvLineAllDetailMain(Page<PvLineAllDetailVO> page,@Param("subIds") List<String> subIds, @Param("subAreaIds")List<String> subAreaIds,@Param("type")String type,@Param("lineStatus")Integer lineStatus);
-
-
-}
diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/PvLvUserMapper.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/PvLvUserMapper.java
deleted file mode 100644
index a6c3ae4c3..000000000
--- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/PvLvUserMapper.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.njcn.device.pms.mapper;
-
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.njcn.device.pms.pojo.param.LvUserQueryParam;
-import com.njcn.device.pms.pojo.po.PvLvUser;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.njcn.device.pms.pojo.vo.PvLvUserVO;
-import org.apache.ibatis.annotations.Param;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author cdf
- * @since 2022-07-05
- */
-public interface PvLvUserMapper extends BaseMapper<PvLvUser> {
-
-    /**
-     * 分页获取低压用户台账
-     * @author cdf
-     * @date 2022/7/8
-     */
-    Page<PvLvUserVO> getPvLvUserList(Page<PvLvUserVO> page, @Param("lvUserQueryParam") LvUserQueryParam lvUserQueryParam);
-
-}
diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/PvSubAreaMapper.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/PvSubAreaMapper.java
deleted file mode 100644
index 91e622d67..000000000
--- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/PvSubAreaMapper.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package com.njcn.device.pms.mapper;
-
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.njcn.device.pms.pojo.param.SubAreaQueryParam;
-import com.njcn.device.pms.pojo.po.PvSubArea;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.njcn.device.pms.pojo.vo.DisOrLvVO;
-import com.njcn.device.pms.pojo.vo.PvSubAreaVO;
-import com.njcn.user.pojo.vo.PvTerminalTreeVO;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author cdf
- * @since 2022-07-05
- */
-public interface PvSubAreaMapper extends BaseMapper<PvSubArea> {
-
-
-    /**
-     * 查询所有台区
-     * @author cdf
-     * @date 2022/7/7
-     */
-    Page<PvSubAreaVO> getPvSubAreaList(Page<PvSubAreaVO> page, @Param("subsAreaQueryParam") SubAreaQueryParam subsAreaQueryParam);
-
-    /**
-     * 查询所有台区
-     * @author cdf
-     * @date 2022/7/11
-     */
-    List<PvTerminalTreeVO> getSubAreaTreeList();
-
-
-    DisOrLvVO pvDisOrLv(String userCode, String userCodeType);
-}
diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/PvSubstationMapper.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/PvSubstationMapper.java
deleted file mode 100644
index 8a4778762..000000000
--- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/PvSubstationMapper.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package com.njcn.device.pms.mapper;
-
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.njcn.device.pms.pojo.param.SubstationQueryParam;
-import com.njcn.device.pms.pojo.po.PvSubstation;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.njcn.device.pms.pojo.vo.PvSubstationVO;
-import com.njcn.user.pojo.vo.PvTerminalTreeVO;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author cdf
- * @since 2022-07-05
- */
-public interface PvSubstationMapper extends BaseMapper<PvSubstation> {
-
-    Page<PvSubstationVO> getPvSubstationList(Page<PvSubstation> page, @Param("substationQueryParam") SubstationQueryParam substationQueryParam);
-
-    /**
-     * 终端树结构的变电站
-     * @author cdf
-     * @date 2022/7/11
-     */
-    List<PvTerminalTreeVO> getSubstationTreeList();
-}
diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/PvTenVoltageMapper.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/PvTenVoltageMapper.java
deleted file mode 100644
index 97dceeff9..000000000
--- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/PvTenVoltageMapper.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.njcn.device.pms.mapper;
-
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.njcn.device.pms.pojo.param.TenVoltageQueryParam;
-import com.njcn.device.pms.pojo.po.PvTenVoltage;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.njcn.device.pms.pojo.vo.PvTenVoltageVO;
-import org.apache.ibatis.annotations.Param;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author cdf
- * @since 2022-07-05
- */
-public interface PvTenVoltageMapper extends BaseMapper<PvTenVoltage> {
-
-    /**
-     * 获取所有10kV线路
-     * @author cdf
-     * @date 2022/7/7
-     */
-    Page<PvTenVoltageVO> getPvTenVoltageList(Page<PvTenVoltageVO> page, @Param("tenVoltageQueryParam") TenVoltageQueryParam tenVoltageQueryParam);
-
-}
diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/PvUnitMapper.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/PvUnitMapper.java
deleted file mode 100644
index 499678ea4..000000000
--- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/PvUnitMapper.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package com.njcn.device.pms.mapper;
-
-import com.njcn.device.pms.pojo.po.PvUnit;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.njcn.device.pms.pojo.vo.UnitTreeVO;
-import com.njcn.user.pojo.vo.PvTerminalTreeVO;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author cdf
- * @since 2022-07-05
- */
-public interface PvUnitMapper extends BaseMapper<PvUnit> {
-
-    /**
-     * 获取主列表单位树
-     * @author cdf
-     * @date 2022/7/7
-     */
-    List<UnitTreeVO> getPvUnitList(@Param("orderBy")String orderBy,@Param("sortBy")String sortBy);
-
-
-
-
-
-}
diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/PwMonitorMapper.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/PwMonitorMapper.java
new file mode 100644
index 000000000..1972f0142
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/PwMonitorMapper.java
@@ -0,0 +1,26 @@
+package com.njcn.device.pms.mapper;
+
+import com.njcn.device.pms.pojo.dto.PwPmsMonitorDTO;
+import com.njcn.device.pms.pojo.param.PwPmsMonitorParam;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * @author yzh
+ * @date 2022/10/28
+ */
+@Mapper
+public interface PwMonitorMapper {
+
+    /**
+     * 获取配网监测点信息
+     *
+     * @param deptIdList        所有子部门索引
+     * @param pwPmsMonitorParam 查询条件
+     * @return 配网监测点信息
+     */
+    List<PwPmsMonitorDTO> getPwMonitorDataList(@Param("deptIdList") List<String> deptIdList,
+                                               @Param("pwPmsMonitorParam") PwPmsMonitorParam pwPmsMonitorParam);
+}
diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/RMpMonitorAlarmCountMMapper.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/RMpMonitorAlarmCountMMapper.java
new file mode 100644
index 000000000..81dc73a37
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/RMpMonitorAlarmCountMMapper.java
@@ -0,0 +1,15 @@
+package com.njcn.device.pms.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.njcn.device.pms.pojo.po.RMpMonitorAlarmCountM;
+
+/**
+* @author jianghf
+* @description 针对表【r_mp_monitor_alarm_count_m】的数据库操作Mapper
+* @createDate 2022-10-12 20:08:33
+* @Entity com.njcn.device.pms.pojo.po.RMpMonitorAlarmCountM
+*/
+public interface RMpMonitorAlarmCountMMapper extends BaseMapper<RMpMonitorAlarmCountM> {
+
+
+}
diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/RMpPwAlarmDetailDMapper.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/RMpPwAlarmDetailDMapper.java
new file mode 100644
index 000000000..e44f0b8ba
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/RMpPwAlarmDetailDMapper.java
@@ -0,0 +1,15 @@
+package com.njcn.device.pms.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.njcn.device.pms.pojo.po.RMpPwAlarmDetailD;
+
+/**
+* @author jianghf
+* @description 针对表【r_mp_pw_alarm_detail_d】的数据库操作Mapper
+* @createDate 2022-10-17 09:00:27
+* @Entity com.njcn.device.pms.pojo.po.RMpPwAlarmDetailD
+*/
+public interface RMpPwAlarmDetailDMapper extends BaseMapper<RMpPwAlarmDetailD> {
+
+
+}
diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/RMpTargetWarnDMapper.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/RMpTargetWarnDMapper.java
new file mode 100644
index 000000000..f5d3c4948
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/RMpTargetWarnDMapper.java
@@ -0,0 +1,15 @@
+package com.njcn.device.pms.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.njcn.device.pms.pojo.po.RMpTargetWarnD;
+
+/**
+* @author jianghf
+* @description 针对表【r_mp_target_warn_d】的数据库操作Mapper
+* @createDate 2022-10-17 10:20:11
+* @Entity com.njcn.device.pms.pojo.po.RMpTargetWarnD
+*/
+public interface RMpTargetWarnDMapper extends BaseMapper<RMpTargetWarnD> {
+
+
+}
diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/RStatAreaAlarmCountMMapper.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/RStatAreaAlarmCountMMapper.java
new file mode 100644
index 000000000..0f62abe07
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/RStatAreaAlarmCountMMapper.java
@@ -0,0 +1,15 @@
+package com.njcn.device.pms.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.njcn.device.pms.pojo.po.RStatAreaAlarmCountM;
+
+/**
+* @author jianghf
+* @description 针对表【r_stat_area_alarm_count_m】的数据库操作Mapper
+* @createDate 2022-10-10 14:36:46
+* @Entity com.njcn.device.pms.pojo.po.RStatAreaAlarmCountM
+*/
+public interface RStatAreaAlarmCountMMapper extends BaseMapper<RStatAreaAlarmCountM> {
+
+
+}
diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/RStatBusbarHarmonicMapper.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/RStatBusbarHarmonicMapper.java
new file mode 100644
index 000000000..c2f646cdb
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/RStatBusbarHarmonicMapper.java
@@ -0,0 +1,42 @@
+package com.njcn.device.pms.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.njcn.device.pms.pojo.po.PmsMonitorPO;
+import com.njcn.device.pms.pojo.vo.RStatBusbarHarmonicVO;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * 变电站母线电压指标年报持久层
+ *
+ * @author yzh
+ * @date 2022/10/8
+ */
+
+@Mapper
+public interface RStatBusbarHarmonicMapper extends BaseMapper<RStatBusbarHarmonicVO> {
+
+    /**
+     * 根据部门id查询监测点id
+     *
+     * @param deptIds 部门id
+     * @return 监测点id
+     */
+    List<PmsMonitorPO> getMonitorInfo(@Param("deptIds") List<String> deptIds);
+
+
+    /**
+     * 查询变电站背景谐波年表
+     *
+     * @param startTime 开始时间
+     * @param endTime   结束时间
+     * @param generatrixIds 母线id
+     * @return 获取变电站母线电压指标年报
+     */
+    List<RStatBusbarHarmonicVO> getAnnualReportOfSubstationBusVoltageIndex(@Param("startTime") String startTime,
+                                                                           @Param("endTime") String endTime,
+                                                                           @Param("busbarIds") List<String> generatrixIds);
+
+}
diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/RStatEventOrgMapper.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/RStatEventOrgMapper.java
new file mode 100644
index 000000000..4c63c32d1
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/RStatEventOrgMapper.java
@@ -0,0 +1,55 @@
+package com.njcn.device.pms.mapper;
+
+import com.njcn.device.pms.pojo.po.RStatEventOrgPO;
+import com.njcn.device.pms.pojo.vo.RStatEventOrgVO;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * 区域暂态指标分类统计表
+ *
+ * @author yzh
+ * @date 2022/10/13
+ */
+@Mapper
+public interface RStatEventOrgMapper {
+
+    /**
+     * 获取年区域暂态指标分类统计表
+     *
+     * @param deptIds   部门id
+     * @param startTime 开始时间
+     * @param endTime   结束时间
+     * @return 年区域暂态指标分类统计表
+     */
+    List<RStatEventOrgVO> getYearRStatEventOrgInfo(@Param("deptIds") List<String> deptIds,
+                                                   @Param("startTime") String startTime,
+                                                   @Param("endTime") String endTime);
+
+    /**
+     * 获取季区域暂态指标分类统计表
+     *
+     * @param deptIds   部门id
+     * @param startTime 开始时间
+     * @param endTime   结束时间
+     * @return 季区域暂态指标分类统计表
+     */
+    List<RStatEventOrgVO> getQuarterRStatEventOrgInfo(@Param("deptIds") List<String> deptIds,
+                                                      @Param("startTime") String startTime,
+                                                      @Param("endTime") String endTime);
+
+    /**
+     * 获取月区域暂态指标分类统计表
+     *
+     * @param deptIds   部门id
+     * @param startTime 开始时间
+     * @param endTime   结束时间
+     * @return 月区域暂态指标分类统计表
+     */
+    List<RStatEventOrgVO> getMonthRStatEventOrgInfoInfo(@Param("deptIds") List<String> deptIds,
+                                                        @Param("startTime") String startTime,
+                                                        @Param("endTime") String endTime);
+
+}
diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/RStatOrgMapper.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/RStatOrgMapper.java
new file mode 100644
index 000000000..3d1aed2a7
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/RStatOrgMapper.java
@@ -0,0 +1,56 @@
+package com.njcn.device.pms.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.njcn.device.pms.pojo.vo.RStatOrgVO;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * 暂态指标统计
+ *
+ * @author yzh
+ * @date 2022/10/10
+ */
+
+@Mapper
+public interface RStatOrgMapper {
+
+    /**
+     * 获取年区域暂态指标统计
+     *
+     * @param deptIds   单位id
+     * @param startTime 开始时间
+     * @param endTime   结束时间
+     * @return 年区域暂态指标统计
+     */
+    List<RStatOrgVO> getYearRStatOrgInfo(@Param("deptIds") List<String> deptIds,
+                                 @Param("startTime") String startTime,
+                                 @Param("endTime") String endTime);
+
+    /**
+     * 获取季区域暂态指标统计
+     *
+     * @param deptIds   单位id
+     * @param startTime 开始时间
+     * @param endTime   结束时间
+     * @return 季区域暂态指标统计
+     */
+    List<RStatOrgVO> getQuarterRStatOrgInfo(@Param("deptIds") List<String> deptIds,
+                                    @Param("startTime") String startTime,
+                                    @Param("endTime") String endTime);
+
+    /**
+     * 获取月区域暂态指标统计
+     *
+     * @param deptIds   单位id
+     * @param startTime 开始时间
+     * @param endTime   结束时间
+     * @return 月区域暂态指标统计
+     */
+    List<RStatOrgVO> getMonthRStatOrgInfo(@Param("deptIds") List<String> deptIds,
+                                  @Param("startTime") String startTime,
+                                  @Param("endTime") String endTime);
+
+}
diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/RStatSubstationMapper.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/RStatSubstationMapper.java
new file mode 100644
index 000000000..595736189
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/RStatSubstationMapper.java
@@ -0,0 +1,57 @@
+package com.njcn.device.pms.mapper;
+
+import com.njcn.device.pms.pojo.po.PmsMonitorPO;
+import com.njcn.device.pms.pojo.vo.RStatSubstationVO;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * 变电站暂态指标分类统计
+ *
+ * @author yzh
+ * @date 2022/10/14
+ */
+
+@Mapper
+public interface RStatSubstationMapper {
+
+    /**
+     * 根据部门id查询监测点id
+     *
+     * @param deptIds 部门id
+     * @return 监测点id
+     */
+    List<PmsMonitorPO> getMonitorInfo(@Param("deptIds") List<String> deptIds);
+
+    /**
+     * 获取年变电站暂态指标分类统计表
+     *
+     * @param powerrIds 变电站id
+     * @param startTime 开始时间
+     * @param endTime   结束时间
+     * @return 年变电站暂态指标分类统计表
+     */
+    List<RStatSubstationVO> getYearInfo(List<String> powerrIds, String startTime, String endTime);
+
+    /**
+     * 获取季变电站暂态指标分类统计表
+     *
+     * @param powerrIds 变电站id
+     * @param startTime 开始时间
+     * @param endTime   结束时间
+     * @return 季变电站暂态指标分类统计表
+     */
+    List<RStatSubstationVO> getQuarterInfo(List<String> powerrIds, String startTime, String endTime);
+
+    /**
+     * 获取月变电站暂态指标分类统计表
+     *
+     * @param powerrIds 变电站id
+     * @param startTime 开始时间
+     * @param endTime   结束时间
+     * @return 月变电站暂态指标分类统计表
+     */
+    List<RStatSubstationVO> getMonthInfo(List<String> powerrIds, String startTime, String endTime);
+}
diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/RStatZwAlarmCountWMapper.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/RStatZwAlarmCountWMapper.java
new file mode 100644
index 000000000..ef00b3fef
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/RStatZwAlarmCountWMapper.java
@@ -0,0 +1,19 @@
+package com.njcn.device.pms.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.njcn.device.pms.pojo.param.RStatZwAlarmCountWParam;
+import com.njcn.device.pms.pojo.po.RStatZwAlarmCountW;
+import com.njcn.device.pms.pojo.vo.RStatZwAlarmCountWVO;
+import org.apache.ibatis.annotations.Param;
+
+/**
+* @author jianghf
+* @description 针对表【r_stat_zw_alarm_count_w】的数据库操作Mapper
+* @createDate 2022-10-08 16:35:44
+* @Entity generator.domain.RStatZwAlarmCountW
+*/
+public interface RStatZwAlarmCountWMapper extends BaseMapper<RStatZwAlarmCountW> {
+
+    Page<RStatZwAlarmCountWVO> getRStatZwAlarmCountWList(Page<RStatZwAlarmCountWVO> page, @Param("rStatZwAlarmCountWParam") RStatZwAlarmCountWParam rStatZwAlarmCountWParam);
+}
diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/RmpEventDetailMapper.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/RmpEventDetailMapper.java
new file mode 100644
index 000000000..e556c3a67
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/RmpEventDetailMapper.java
@@ -0,0 +1,15 @@
+package com.njcn.device.pms.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.njcn.device.pms.pojo.vo.RmpEventDetailVO;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 暂态事件明细
+ *
+ * @author yzh
+ * @date 2022/10/12
+ */
+@Mapper
+public interface RmpEventDetailMapper extends BaseMapper<RmpEventDetailVO> {
+}
diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/SourceManagementMapper.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/SourceManagementMapper.java
new file mode 100644
index 000000000..678f190ba
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/SourceManagementMapper.java
@@ -0,0 +1,17 @@
+package com.njcn.device.pms.mapper;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.njcn.device.pms.pojo.po.SourceManagement;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author hongawen
+ * @since 2022-10-14
+ */
+public interface SourceManagementMapper extends BaseMapper<SourceManagement> {
+
+}
diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/StatationStatMapper.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/StatationStatMapper.java
new file mode 100644
index 000000000..19dabb8b2
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/StatationStatMapper.java
@@ -0,0 +1,29 @@
+package com.njcn.device.pms.mapper;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.njcn.device.pms.pojo.dto.PmsStatationStatInfoDTO;
+import com.njcn.device.pms.pojo.param.PmsStatationStatInfoParam;
+import com.njcn.device.pms.pojo.po.StatationStat;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author hongawen
+ * @since 2022-10-14
+ */
+public interface StatationStatMapper extends BaseMapper<StatationStat> {
+
+    /**
+     * 获取指定的变电站信息
+     *
+     * @param pmsStatationStatInfoParam 变电站详情数据入参
+     * @return 指定的变电站信息
+     */
+    List<PmsStatationStatInfoDTO> getStatationStatInfo(@Param("pmsStatationStatInfoParam") PmsStatationStatInfoParam pmsStatationStatInfoParam);
+}
diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/StatisticsRunMonitorMapper.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/StatisticsRunMonitorMapper.java
new file mode 100644
index 000000000..9a2c2fc45
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/StatisticsRunMonitorMapper.java
@@ -0,0 +1,16 @@
+package com.njcn.device.pms.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.njcn.device.pms.pojo.po.StatisticsRunMonitor;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author hongawen
+ * @since 2022-10-14
+ */
+public interface StatisticsRunMonitorMapper extends BaseMapper<StatisticsRunMonitor> {
+
+}
diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/TerminalEliminateDataMapper.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/TerminalEliminateDataMapper.java
new file mode 100644
index 000000000..1a8dde5a8
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/TerminalEliminateDataMapper.java
@@ -0,0 +1,16 @@
+package com.njcn.device.pms.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.njcn.device.pms.pojo.po.TerminalEliminateData;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author hongawen
+ * @since 2022-10-14
+ */
+public interface TerminalEliminateDataMapper extends BaseMapper<TerminalEliminateData> {
+
+}
diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/TerminalMapper.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/TerminalMapper.java
new file mode 100644
index 000000000..1058a4f0a
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/TerminalMapper.java
@@ -0,0 +1,21 @@
+package com.njcn.device.pms.mapper;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.njcn.device.pms.pojo.po.Terminal;
+import com.njcn.device.pms.pojo.vo.PmsTerminalVO;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author hongawen
+ * @since 2022-10-14
+ */
+public interface TerminalMapper extends BaseMapper<Terminal> {
+
+    Page<PmsTerminalVO> page(@Param("page")Page<PmsTerminalVO> page, @Param("ew") QueryWrapper<PmsTerminalVO> queryWrapper);
+}
diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/TractionStationMapper.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/TractionStationMapper.java
new file mode 100644
index 000000000..37b4228a0
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/TractionStationMapper.java
@@ -0,0 +1,16 @@
+package com.njcn.device.pms.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.njcn.device.pms.pojo.po.TractionStation;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author hongawen
+ * @since 2022-10-14
+ */
+public interface TractionStationMapper extends BaseMapper<TractionStation> {
+
+}
diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/TransientStasticDataMapper.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/TransientStasticDataMapper.java
new file mode 100644
index 000000000..b4b922d53
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/TransientStasticDataMapper.java
@@ -0,0 +1,16 @@
+package com.njcn.device.pms.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.njcn.device.pms.pojo.po.TransientStasticData;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author hongawen
+ * @since 2022-10-14
+ */
+public interface TransientStasticDataMapper extends BaseMapper<TransientStasticData> {
+
+}
diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/TreatTransientDetailDataMapper.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/TreatTransientDetailDataMapper.java
new file mode 100644
index 000000000..3d72157c0
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/TreatTransientDetailDataMapper.java
@@ -0,0 +1,16 @@
+package com.njcn.device.pms.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.njcn.device.pms.pojo.po.TreatTransientDetailData;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author hongawen
+ * @since 2022-10-14
+ */
+public interface TreatTransientDetailDataMapper extends BaseMapper<TreatTransientDetailData> {
+
+}
diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/DistributionMonitorMapper.xml b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/DistributionMonitorMapper.xml
new file mode 100644
index 000000000..85a416763
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/DistributionMonitorMapper.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.njcn.device.pms.mapper.DistributionMonitorMapper">
+
+
+    <select id="getIdByOrgId" resultType="PmsMonitorBaseDTO">
+        SELECT
+            t.Operation_Id operationId,t.Power_Station_Id powerrId,t.Line_Id lineId,t.id monitorId
+        FROM
+            (
+                ( SELECT id, Operation_Id, Power_Station_Id, Line_Id FROM pms_power_client WHERE org_id IN
+        <foreach collection="orgIds" item="item" open="(" close=")" separator=",">
+            #{item}
+        </foreach>
+                 AND Is_Up_To_Grid = 1 AND STATUS = 1 ) UNION ALL
+                ( SELECT id, Operation_Id, Power_Station_Id, Line_Id FROM pms_power_generation_user WHERE org_id IN
+        <foreach collection="orgIds" item="item" open="(" close=")" separator=",">
+            #{item}
+        </foreach>
+                AND Is_Up_To_Grid = 1 AND STATUS = 1 ) UNION ALL
+                ( SELECT id, Operation_Id, Power_Station_Id, Line_Id FROM pms_power_distributionarea WHERE org_id IN
+        <foreach collection="orgIds" item="item" open="(" close=")" separator=",">
+            #{item}
+        </foreach>
+               AND Is_Up_To_Grid = 1 AND STATUS = 1 ) UNION ALL
+                ( SELECT id, Operation_Id, Powerr_Id, Line_Id FROM pms_monitor WHERE org_id IN
+        <foreach collection="orgIds" item="item" open="(" close=")" separator=",">
+            #{item}
+        </foreach>
+                 AND Is_Up_To_Grid = 1 AND STATUS = 1 )
+            ) t
+                INNER JOIN pms_distribution_monitor b ON t.id = b.Monitor_Id
+    </select>
+</mapper>
diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/HarmonicGeneralManagementDataMapper.xml b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/HarmonicGeneralManagementDataMapper.xml
new file mode 100644
index 000000000..cdde9fbff
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/HarmonicGeneralManagementDataMapper.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.njcn.device.pms.mapper.HarmonicGeneralManagementDataMapper">
+
+</mapper>
diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/HarmonicGeneralManagementMapper.xml b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/HarmonicGeneralManagementMapper.xml
new file mode 100644
index 000000000..10584f1df
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/HarmonicGeneralManagementMapper.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.njcn.device.pms.mapper.HarmonicGeneralManagementMapper">
+
+</mapper>
diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/MonitorMapper.xml b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/MonitorMapper.xml
new file mode 100644
index 000000000..207f77971
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/MonitorMapper.xml
@@ -0,0 +1,137 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.njcn.device.pms.mapper.MonitorMapper">
+
+    <!--根据组织ID以及其查询条件筛选出台账信息-->
+    <select id="getMonitorByCondition" resultType="com.njcn.device.pms.pojo.dto.PmsMonitorBaseDTO">
+        SELECT
+        pms_monitor.id monitorId,
+        pms_monitor.Operation_Id,
+        pms_monitor.Powerr_id,
+        pms_monitor.Terminal_Id,
+        pms_monitor.Generatrix_Id,
+        pms_monitor.line_Name,
+        pms_monitor.line_Id
+        FROM
+        pms_monitor pms_monitor LEFT JOIN pms_terminal pms_terminal ON pms_monitor.Terminal_Id = pms_terminal.id
+        WHERE
+        pms_monitor.Org_Id IN
+        <foreach collection="orgIdList" item="orgId" open="(" close=")" separator=",">
+            #{orgId}
+        </foreach>
+        <if test="pmsDeviceInfoParam.voltageLevel!=null and pmsDeviceInfoParam.voltageLevel.size()!=0">
+            AND pms_monitor.Voltage_Level IN
+            <foreach collection="pmsDeviceInfoParam.voltageLevel" item="item" open="(" close=")" separator=",">
+                #{item.id}
+            </foreach>
+        </if>
+        <if test="pmsDeviceInfoParam.monitorObjectType!=null and pmsDeviceInfoParam.monitorObjectType.size()!=0">
+            AND pms_monitor.Monitor_Object_Type IN
+            <foreach collection="pmsDeviceInfoParam.monitorObjectType" item="item" open="(" close=")" separator=",">
+                #{item.id}
+            </foreach>
+        </if>
+        <if test="pmsDeviceInfoParam.monitorState!=null and pmsDeviceInfoParam.monitorState.size()!=0">
+            AND pms_monitor.Monitor_State IN
+            <foreach collection="pmsDeviceInfoParam.monitorState" item="item" open="(" close=")" separator=",">
+                #{item.id}
+            </foreach>
+        </if>
+        <if test="pmsDeviceInfoParam.manufacturer!=null and pmsDeviceInfoParam.manufacturer.size()!=0">
+            AND pms_terminal.Manufacture IN
+            <foreach collection="pmsDeviceInfoParam.manufacturer" item="item" open="(" close=")" separator=",">
+                #{item.id}
+            </foreach>
+        </if>
+    </select>
+
+
+    <!--根据组织ID以及其查询条件筛选出变电站信息-->
+    <select id="getPmsPowerrInfoWithInOrg" resultType="com.njcn.common.pojo.dto.SimpleDTO">
+        SELECT
+            pms_monitor.Powerr_id id,
+            pms_monitor.Powerr_Name name
+        FROM
+            pms_monitor pms_monitor LEFT JOIN pms_terminal pms_terminal ON pms_monitor.Terminal_Id = pms_terminal.id
+        WHERE
+            pms_monitor.Org_Id IN
+            <foreach collection="orgIdList" item="orgId" open="(" close=")" separator=",">
+                #{orgId}
+            </foreach>
+            <if test="pmsDeviceInfoParam.voltageLevel!=null and pmsDeviceInfoParam.voltageLevel.size()!=0">
+                AND pms_monitor.Voltage_Level IN
+                <foreach collection="pmsDeviceInfoParam.voltageLevel" item="item" open="(" close=")" separator=",">
+                    #{item.id}
+                </foreach>
+            </if>
+            <if test="pmsDeviceInfoParam.monitorObjectType!=null and pmsDeviceInfoParam.monitorObjectType.size()!=0">
+                AND pms_monitor.Monitor_Object_Type IN
+                <foreach collection="pmsDeviceInfoParam.monitorObjectType" item="item" open="(" close=")" separator=",">
+                    #{item.id}
+                </foreach>
+            </if>
+            <if test="pmsDeviceInfoParam.monitorState!=null and pmsDeviceInfoParam.monitorState.size()!=0">
+                AND pms_monitor.Monitor_State IN
+                <foreach collection="pmsDeviceInfoParam.monitorState" item="item" open="(" close=")" separator=",">
+                    #{item.id}
+                </foreach>
+            </if>
+            <if test="pmsDeviceInfoParam.manufacturer!=null and pmsDeviceInfoParam.manufacturer.size()!=0">
+                AND pms_terminal.Manufacture IN
+                <foreach collection="pmsDeviceInfoParam.manufacturer" item="item" open="(" close=")" separator=",">
+                    #{item.id}
+                </foreach>
+            </if>
+    </select>
+
+
+    <!--获取指定的监测点信息-->
+    <select id="getMonitorInfo" resultType="com.njcn.device.pms.pojo.dto.PmsMonitorInfoDTO">
+        SELECT
+        pm.Org_Id AS orgId,
+        pm.Org_Name AS orgName,
+        pm.Powerr_Id AS powerId,
+        pm.Powerr_Name AS powerName,
+        pm.Generatrix_Id AS generatrixId,
+        pm.Generatrix_Name AS generatrixName,
+        pm.Id AS monitorId,
+        pm.`Name` AS monitorName,
+        pm.Generatrix_Id AS generatrixId,
+        pm.Generatrix_Name AS generatrixName,
+        pm.Voltage_Level AS monitorVoltageLevel,
+        pm.Monitor_Type AS monitorType,
+        pm.Monitor_State AS monitorState
+        FROM
+        pms_monitor AS pm
+        WHERE
+        pm.`Status` = 1
+        AND pm.Id IN
+        <foreach collection="pmsMonitorInfoParam.monitorIds" item="item" open="(" close=")" separator=",">
+            #{item}
+        </foreach>
+        <if test="pmsMonitorInfoParam.monitorVoltageLevel != null and pmsMonitorInfoParam.monitorVoltageLevel.size() != 0">
+            AND pm.Voltage_Level IN
+            <foreach collection="pmsMonitorInfoParam.monitorVoltageLevel" item="item" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="pmsMonitorInfoParam.monitorType != null and pmsMonitorInfoParam.monitorType.size() != 0">
+            AND pm.Monitor_Type IN
+            <foreach collection="pmsMonitorInfoParam.monitorType" item="item" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="pmsMonitorInfoParam.monitorState != null and pmsMonitorInfoParam.monitorState.size() != 0">
+            AND pm.Monitor_State IN
+            <foreach collection="pmsMonitorInfoParam.monitorState" item="item" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="pmsMonitorInfoParam.monitorName != null and pmsMonitorInfoParam.monitorName != ''">
+            AND pm.`Name` LIKE CONCAT('%',#{pmsMonitorInfoParam.monitorName},'%')
+        </if>
+    </select>
+
+
+
+</mapper>
diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/PmsGeneratrixMapper.xml b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/PmsGeneratrixMapper.xml
new file mode 100644
index 000000000..e80d9cd51
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/PmsGeneratrixMapper.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.njcn.device.pms.mapper.PmsGeneratrixMapper">
+
+    <!--获取母线信息-->
+    <select id="getGeneratrixInfo" resultType="com.njcn.device.pms.pojo.dto.PmsGeneratrixDTO">
+        SELECT
+        Org_Id AS orgId,
+        Org_Name AS orgName,
+        Powerr_Id AS powerId,
+        Powerr_Name AS powerName,
+        Generatrix_Id AS generatrixId,
+        Generatrix_Name AS generatrixName,
+        Id AS monitorId,
+        `Name` AS monitorName,
+        Voltage_Level AS generatrixVoltageLevel
+        FROM
+        pms_monitor
+        WHERE
+        Status = 1
+        AND Generatrix_Id IN
+        <foreach collection="pmsGeneratrixParam.generatrixIds" item="item" open="(" close=")" separator=",">
+            #{item}
+        </foreach>
+        <if test="pmsGeneratrixParam.generatrixVoltageLevel != null and pmsGeneratrixParam.generatrixVoltageLevel.size() != 0">
+            AND Voltage_Level IN
+            <foreach collection="pmsGeneratrixParam.generatrixVoltageLevel" item="item" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="pmsGeneratrixParam.generatrixName != null and pmsGeneratrixParam.generatrixName != ''">
+            AND Generatrix_Name LIKE CONCAT('%',#{pmsGeneratrixParam.generatrixName},'%')
+        </if>
+    </select>
+
+</mapper>
\ No newline at end of file
diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/PvDispatchMapper.xml b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/PowerClientMapper.xml
similarity index 70%
rename from pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/PvDispatchMapper.xml
rename to pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/PowerClientMapper.xml
index 10896b919..370322afa 100644
--- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/PvDispatchMapper.xml
+++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/PowerClientMapper.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.njcn.device.pms.mapper.PvDispatchMapper">
+<mapper namespace="com.njcn.device.pms.mapper.PowerClientMapper">
+
 
 </mapper>
diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/PowerDistributionareaMapper.xml b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/PowerDistributionareaMapper.xml
new file mode 100644
index 000000000..0e9dbf6c0
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/PowerDistributionareaMapper.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.njcn.device.pms.mapper.PowerDistributionareaMapper">
+
+    <select id="page" resultType="com.njcn.device.pms.pojo.vo.PowerDistributionareaVO">
+        SELECT pms_power_distributionarea.*
+        FROM pms_power_distributionarea pms_power_distributionarea
+        WHERE ${ew.sqlSegment}
+    </select>
+</mapper>
diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/PowerGenerationUserMapper.xml b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/PowerGenerationUserMapper.xml
new file mode 100644
index 000000000..c7c70b14f
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/PowerGenerationUserMapper.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.njcn.device.pms.mapper.PowerGenerationUserMapper">
+
+</mapper>
diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/PowerQualityMatterMapper.xml b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/PowerQualityMatterMapper.xml
new file mode 100644
index 000000000..29381963b
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/PowerQualityMatterMapper.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.njcn.device.pms.mapper.PowerQualityMatterMapper">
+
+</mapper>
diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/PvDeviceMapper.xml b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/PvDeviceMapper.xml
deleted file mode 100644
index ed630ba0a..000000000
--- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/PvDeviceMapper.xml
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.njcn.device.pms.mapper.PvDeviceMapper">
-
-    <select id="getPvDeviceList" resultType="PvDeviceVO">
-        SELECT
-        dev.id,
-        dev.manufacturer,
-        dic.NAME manufacturerName,
-        dic2.NAME devTypeName,
-        dev.dev_Type,
-        dev.type,
-        dic3.name typeName,
-        dev.Dev_Code,
-        dev.name,
-        dev.ip,
-        dev.port,
-        dev.load_time,
-        dev.dev_status,
-        dev.communicate_Type,
-        dev.Series,
-        dev.Dev_Key,
-        dev.This_Time_Check,
-        dev.Next_Time_Check,
-        dic4.name devGradeName,
-        dev.dev_grade
-        FROM
-        pv_device dev
-        LEFT JOIN sys_dict_data dic ON dev.manufacturer = dic.id
-        LEFT JOIN sys_dict_data dic2 ON dev.Dev_Type = dic2.id
-        LEFT JOIN sys_dict_data dic3 ON dev.type = dic3.id
-        LEFT JOIN sys_dict_data dic4 ON dev.dev_grade = dic4.id
-        <where>
-            <if test="deviceQueryParam.searchValue!=null and deviceQueryParam.searchValue!=''">
-                and dev.dev_code like CONCAT('%',#{deviceQueryParam.searchValue},'%')
-                or dev.name like CONCAT('%',#{deviceQueryParam.searchValue},'%')
-            </if>
-
-            <if test="deviceQueryParam.manufacturer!=null and deviceQueryParam.manufacturer.size > 0">
-                and dev.manufacturer in
-                <foreach collection="deviceQueryParam.manufacturer" item="item" open="(" close=")" separator=",">
-                    #{item}
-                </foreach>
-            </if>
-
-            <if test="deviceQueryParam.type!=null and deviceQueryParam.type.size > 0">
-                and dev.type in
-                <foreach collection="deviceQueryParam.type" item="item" open="(" close=")" separator=",">
-                    #{item}
-                </foreach>
-            </if>
-            and dev.state = 1
-        </where>
-        order by dev.create_time asc
-    </select>
-
-
-    <select id="getAllPvDeviceList" resultType="PvDeviceVO">
-        SELECT
-        dev.id,
-        dev.manufacturer,
-        dic.NAME manufacturerName,
-        dic2.NAME devTypeName,
-        dev.dev_Type,
-        dev.type,
-        dic3.name typeName,
-        dic3.code typeCode,
-        dev.Dev_Code,
-        dev.name,
-        dev.ip,
-        dev.port,
-        dev.load_time,
-        dev.dev_status,
-        dev.communicate_Type,
-        dev.Series,
-        dev.Dev_Key,
-        dev.This_Time_Check,
-        dev.Next_Time_Check
-        FROM
-        pv_device dev
-        LEFT JOIN sys_dict_data dic ON dev.manufacturer = dic.id
-        LEFT JOIN sys_dict_data dic2 ON dev.Dev_Type = dic2.id
-        LEFT JOIN sys_dict_data dic3 ON dev.type = dic3.id
-        where dev.state = 1
-    </select>
-</mapper>
diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/PvDeviceRunExMapper.xml b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/PvDeviceRunExMapper.xml
deleted file mode 100644
index ef3902477..000000000
--- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/PvDeviceRunExMapper.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.njcn.device.pms.mapper.PvDeviceRunExMapper">
-
-
-    <resultMap id="findPQLine" type="com.njcn.device.pms.pojo.bo.DeviceRunExBO">
-        <id column="Id" property="id"/>
-        <result column="Pid" property="pid"/>
-        <result column="Pids" property="pidS"/>
-        <result column="Name" property="name"/>
-        <result column="Level" property="level"/>
-        <result column="Sort" property="sort"/>
-        <result column="Remark" property="remark"/>
-        <result column="State" property="state"/>
-        <result column="Create_By" property="createBy"/>
-        <result column="Create_Time" property="createTime"/>
-        <result column="Update_By" property="updateBy"/>
-        <result column="Update_Time" property="updateTime"/>
-        <collection property="children" column="id" ofType="com.njcn.device.pms.pojo.bo.DeviceRunExBO"/>
-    </resultMap>
-
-    <select id="findPQLineInfo" resultMap="findPQLine">
-        select
-            t1.*
-        from pq_line t1
-        left join pq_line_detail t2
-        on t1.Id = t2.Id
-        where pid = #{pid}
-        and t2.Line_Grade = #{lineLevel}
-        and State = 1
-    </select>
-</mapper>
diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/PvDistributedMapper.xml b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/PvDistributedMapper.xml
deleted file mode 100644
index a16520bed..000000000
--- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/PvDistributedMapper.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.njcn.device.pms.mapper.PvDistributedMapper">
-
-    <select id="getPvDistributedList" resultType="PvDistributedVO">
-        SELECT
-        dis.id,
-        dic.NAME scaleName,
-        dis.scale,
-        dis.NAME,
-        dis.User_Code,
-        dis.Dev_Code,
-        dis.Machine_Capacity,
-        dis.Inte_Type,
-        dis.Phase,
-        dis.Energy_Capacity,
-        dis.code,
-        dis.Smart_Switch,
-        dis.install_time,
-        dis.run_time
-        FROM
-        pv_distributed dis
-        LEFT JOIN sys_dict_data dic ON dis.scale = dic.id
-        <where>
-            <if test="distributedQueryParam.searchValue!=null and distributedQueryParam.searchValue!=''">
-                and dis.name like CONCAT('%',#{distributedQueryParam.searchValue},'%')
-            </if>
-
-            <if test="distributedQueryParam.scale!=null and distributedQueryParam.scale.size > 0">
-                and dis.scale in
-                <foreach collection="distributedQueryParam.scale" item="item" open="(" close=")" separator=",">
-                    #{item}
-                </foreach>
-            </if>
-            and dis.state = 1
-        </where>
-        order by dis.create_time asc
-    </select>
-</mapper>
diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/PvLineDetailMapper.xml b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/PvLineDetailMapper.xml
deleted file mode 100644
index 591b5f42e..000000000
--- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/PvLineDetailMapper.xml
+++ /dev/null
@@ -1,179 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.njcn.device.pms.mapper.PvLineDetailMapper">
-
-    <select id="getPvLineAllDetailMain" resultType="PvLineAllDetailVO">
-
-        <if test="subIds!=null and subIds.size!=0">
-            SELECT
-            line.id,
-            line.NAME,
-            line.CODE,
-            line.user_Code,
-            line.user_Code_type,
-            line.dev_id,
-            dev.Dev_Code devName,
-            dev.dev_status lineStatus,
-            dic.NAME typeName,
-            line.type,
-            dic1.NAME scaleName,
-            line.scale,
-            line.Substation_Id,
-            sub.NAME substationName,
-            v.NAME voltageName,
-            line.voltage_id,
-            subArea.NAME subAreaName,
-            line.sub_area_id,
-            dis.NAME distributeName,
-            lv.NAME lvUserName,
-            line.num,
-            line.pt1,
-            line.pt2,
-            line.ct1,
-            line.ct2,
-            line.dev_capacity,
-            line.short_capacity,
-            line.standard_capacity,
-            line.deal_capacity,
-            line.pt_Type,
-            dic6.name ptTypeName,
-            line.time_Interval,
-            dic2.NAME loadType,
-            dic3.NAME businessType,
-            line.Monitor_Flag,
-            line.Power_Flag,
-            line.Monitor_Id,
-            line.Obj_Name,
-            line.small_name,
-            line.big_name,
-            line.Stat_flag,
-            line.Remark,
-            line.Tf_Type,
-            dic4.name tfTypeName,
-            line.Tf_Code,
-            line.Ground_Type,
-            dic5.name groundTypeName,
-            line.Put_In,
-            line.Access,
-            line.Power_Supply
-            FROM
-            pv_line_detail line
-            LEFT JOIN pv_device dev ON line.dev_id = dev.id
-            LEFT JOIN sys_dict_data dic ON line.type = dic.id
-            LEFT JOIN sys_dict_data dic1 ON line.scale = dic1.id
-            LEFT JOIN pv_substation sub ON line.Substation_Id = sub.id
-            LEFT JOIN pv_voltage v ON line.voltage_id = v.id
-            LEFT JOIN pv_sub_area subArea ON line.sub_area_id = subArea.id
-            LEFT JOIN Pv_Distributed dis ON line.user_code = dis.user_code
-            LEFT JOIN Pv_Lv_User lv ON line.user_code = lv.user_code
-            LEFT JOIN sys_dict_data dic2 ON line.load_type = dic2.id
-            LEFT JOIN sys_dict_data dic3 ON line.Business_Type = dic3.id
-            LEFT JOIN sys_dict_data dic4 ON line.Tf_Type = dic4.id
-            LEFT JOIN sys_dict_data dic5 ON line.Ground_Type = dic5.id
-            LEFT JOIN sys_dict_data dic6 ON line.pt_type = dic6.id
-            where line.state = 1
-            <if test="subIds!=null and subIds.size!=0">
-                and line.Substation_Id in
-                <foreach collection="subIds" item="item" open="(" close=")" separator=",">
-                    #{item}
-                </foreach>
-            </if>
-            <if test="type!=null and type!=''">
-                and line.type = #{type}
-            </if>
-            <if test="lineStatus!=null and type!=''">
-                and dev.dev_status = #{lineStatus}
-            </if>
-        </if>
-
-        <if test="subIds!=null and subIds.size!=0 and subAreaIds!=null and subAreaIds.size!=0">
-        UNION ALL
-        </if>
-
-
-        <if test="subAreaIds!=null and subAreaIds.size!=0">
-            SELECT
-            line.id,
-            line.NAME,
-            line.user_Code,
-            line.user_Code_type,
-            line.CODE,
-            line.dev_id,
-            dev.Dev_Code devName,
-            dev.dev_status lineStatus,
-            dic.NAME typeName,
-            line.type,
-            dic1.NAME scaleName,
-            line.scale,
-            line.Substation_Id,
-            sub.NAME substationName,
-            v.NAME voltageName,
-            line.voltage_id,
-            subArea.NAME subAreaName,
-            line.sub_area_id,
-            dis.NAME distributeName,
-            lv.NAME lvUserName,
-            line.num,
-            line.pt1,
-            line.pt2,
-            line.ct1,
-            line.ct2,
-            line.dev_capacity,
-            line.short_capacity,
-            line.standard_capacity,
-            line.deal_capacity,
-            line.pt_Type,
-            dic6.name ptTypeName,
-            line.time_Interval,
-            dic2.NAME loadType,
-            dic3.NAME businessType,
-            line.Monitor_Flag,
-            line.Power_Flag,
-            line.Monitor_Id,
-            line.Obj_Name,
-            line.small_name,
-            line.big_name,
-            line.Stat_flag,
-            line.Remark,
-            line.Tf_Type,
-            dic4.name tfTypeName,
-            line.Tf_Code,
-            line.Ground_Type,
-            dic5.name groundTypeName,
-            line.Put_In,
-            line.Access,
-            line.Power_Supply
-            FROM
-            pv_line_detail line
-            LEFT JOIN pv_device dev ON line.dev_id = dev.id
-            LEFT JOIN sys_dict_data dic ON line.type = dic.id
-            LEFT JOIN sys_dict_data dic1 ON line.scale = dic1.id
-            LEFT JOIN pv_substation sub ON line.Substation_Id = sub.id
-            LEFT JOIN pv_voltage v ON line.voltage_id = v.id
-            LEFT JOIN pv_sub_area subArea ON line.sub_area_id = subArea.id
-            LEFT JOIN Pv_Distributed dis ON line.user_code = dis.user_code
-            LEFT JOIN Pv_Lv_User lv ON line.user_code = lv.user_code
-            LEFT JOIN sys_dict_data dic2 ON line.load_type = dic2.id
-            LEFT JOIN sys_dict_data dic3 ON line.Business_Type = dic3.id
-            LEFT JOIN sys_dict_data dic4 ON line.Tf_Type = dic4.id
-            LEFT JOIN sys_dict_data dic5 ON line.Ground_Type = dic5.id
-            LEFT JOIN sys_dict_data dic6 ON line.pt_type = dic6.id
-            where line.state = 1
-            <if test="subAreaIds!=null and subAreaIds.size!=0">
-                and line.Sub_Area_Id in
-                <foreach collection="subAreaIds" item="item" open="(" close=")" separator=",">
-                    #{item}
-                </foreach>
-            </if>
-            <if test="type!=null and type!=''">
-                and line.type = #{type}
-            </if>
-            <if test="lineStatus!=null and type!=''">
-                and dev.dev_status = #{lineStatus}
-            </if>
-        </if>
-
-
-    </select>
-
-</mapper>
diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/PvLvUserMapper.xml b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/PvLvUserMapper.xml
deleted file mode 100644
index d5bfba422..000000000
--- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/PvLvUserMapper.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.njcn.device.pms.mapper.PvLvUserMapper">
-
-    <select id="getPvLvUserList" resultType="PvLvUserVO">
-        SELECT
-        lv.id,
-        dic.NAME scaleName,
-        lv.scale,
-        lv.NAME,
-        lv.User_Code,
-        lv.User_Capacity,
-        lv.Complain,
-        lv.Complain_Part,
-        lv.Corrective,
-        lv.Dev_Govern,
-        lv.Govern_Type,
-        lv.Govern_Capacity
-        FROM
-        pv_lv_user lv
-        LEFT JOIN sys_dict_data dic ON lv.scale = dic.id
-        <where>
-            <if test="lvUserQueryParam.searchValue!=null and lvUserQueryParam.searchValue!=''">
-                and lv.name like CONCAT('%',#{lvUserQueryParam.searchValue},'%')
-            </if>
-
-            <if test="lvUserQueryParam.scale!=null and lvUserQueryParam.scale.size > 0">
-                and lv.scale in
-                <foreach collection="lvUserQueryParam.scale" item="item" open="(" close=")" separator=",">
-                    #{item}
-                </foreach>
-            </if>
-            and lv.state = 1
-        </where>
-        order by lv.create_time asc
-    </select>
-</mapper>
diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/PvSubAreaMapper.xml b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/PvSubAreaMapper.xml
deleted file mode 100644
index 3debc1211..000000000
--- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/PvSubAreaMapper.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.njcn.device.pms.mapper.PvSubAreaMapper">
-
-    <select id="getPvSubAreaList" resultType="PvSubAreaVO">
-        SELECT
-        sub.id,
-        sub.unit_id,
-        dept.name unitName,
-        sub.ten_Voltage_Id,
-        ten.NAME tenVoltageName,
-        sub.NAME,
-        sub.Code,
-        sub.Cable_Length,
-        sub.Resistance,
-        sub.Reactance,
-        sub.Type,
-        sub.Capacity,
-        sub.Regulation_Mode,
-        sub.React_Capacity,
-        sub.Dev_Fusion,
-        sub.pv,
-        sub.Total_C,
-        sub.Pv_Users,
-        sub.Power_Power
-        FROM
-        pv_sub_area sub
-        INNER JOIN sys_dept dept ON sub.unit_id = dept.id
-        INNER JOIN pv_ten_voltage ten ON ten.id = sub.Ten_Voltage_Id
-        <where>
-            <if test="subsAreaQueryParam.searchValue!=null and subsAreaQueryParam.searchValue!=''">
-                and sub.name like CONCAT('%',#{subsAreaQueryParam.searchValue},'%')
-            </if>
-
-            <if test="subsAreaQueryParam.unitId!=null and subsAreaQueryParam.unitId.size > 0">
-                and sub.unit_id in
-                <foreach collection="subsAreaQueryParam.unitId" item="item" open="(" close=")" separator=",">
-                    #{item}
-                </foreach>
-            </if>
-
-            <if test="subsAreaQueryParam.tenVoltageId!=null and subsAreaQueryParam.tenVoltageId.size > 0">
-                and sub.Ten_Voltage_Id in
-                <foreach collection="subsAreaQueryParam.tenVoltageId" item="item" open="(" close=")" separator=",">
-                    #{item}
-                </foreach>
-            </if>
-        </where>
-        order by ten.create_time asc
-    </select>
-
-
-    <select id="getSubAreaTreeList" resultType="com.njcn.user.pojo.vo.PvTerminalTreeVO">
-        select id,name,unit_id pid,2 as level from pv_sub_area where state = 1
-    </select>
-
-
-    <select id="pvDisOrLv" resultType="DisOrLvVO">
-
-    </select>
-</mapper>
diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/PvSubstationMapper.xml b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/PvSubstationMapper.xml
deleted file mode 100644
index fa901fbd2..000000000
--- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/PvSubstationMapper.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.njcn.device.pms.mapper.PvSubstationMapper">
-
-    <select id="getPvSubstationList" resultType="PvSubstationVO">
-        SELECT
-        sub.id,
-        sub.unit_id,
-        dept.NAME unitName,
-        dic.NAME scaleName,
-        sub.scale,
-        sub.sub_code,
-        sub.NAME,
-        sub.Total_Capacity,
-        sub.Team_Code
-        FROM
-        pv_substation sub
-        LEFT JOIN sys_dict_data dic ON sub.scale = dic.id
-        LEFT JOIN sys_dept dept ON sub.unit_id = dept.id
-        <where>
-            <if test="substationQueryParam.searchValue!=null and substationQueryParam.searchValue!=''">
-               and sub.name like CONCAT('%',#{substationQueryParam.searchValue},'%')
-            </if>
-            <if test="substationQueryParam.unitId!=null and substationQueryParam.unitId.size > 0">
-               and sub.unit_id in
-                <foreach collection="substationQueryParam.unitId" item="item" open="(" close=")" separator=",">
-                    #{item}
-                </foreach>
-            </if>
-            <if test="substationQueryParam.scale!=null and substationQueryParam.scale.size > 0">
-              and sub.scale in
-                <foreach collection="substationQueryParam.scale" item="item" open="(" close=")" separator=",">
-                    #{item}
-                </foreach>
-            </if>
-            <if test="substationQueryParam.sortBy!=null and substationQueryParam.sortBy!='' and substationQueryParam.orderBy!=null and substationQueryParam.orderBy!=''">
-                order by concat(#{substationQueryParam.sortBy},' ',#{substationQueryParam.orderBy})
-            </if>
-        </where>
-
-    </select>
-
-
-    <select id="getSubstationTreeList" resultType="com.njcn.user.pojo.vo.PvTerminalTreeVO">
-        select id,unit_id pid,name,1 as level from pv_substation
-    </select>
-</mapper>
diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/PvTenVoltageMapper.xml b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/PvTenVoltageMapper.xml
deleted file mode 100644
index e66539143..000000000
--- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/PvTenVoltageMapper.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.njcn.device.pms.mapper.PvTenVoltageMapper">
-
-    <select id="getPvTenVoltageList" resultType="PvTenVoltageVO">
-        SELECT
-        ten.id,
-        dic.NAME scaleName,
-        ten.scale,
-        dic2.NAME designScaleName,
-        ten.design_scale,
-        ten.NAME,
-        ten.dispatch_Id,
-        ten.code,
-        ten.Cr_Type,
-        ten.Dev_Status,
-        ten.Earthing,
-        ten.Quality,
-        ten.Master_Stroke,
-        ten.Major,
-        ten.Master,
-        ten.Start_Station,
-        ten.End_Station,
-        ten.Run_Load,
-        ten.Output_Power,
-        ten.Max_Current,
-        ten.Put_Into_Date,
-        ten.pv_Status,
-        ten.pv_Capacity,
-        ten.pv_Num
-        FROM
-        pv_ten_voltage ten
-        LEFT JOIN sys_dict_data dic ON ten.scale = dic.id
-        LEFT JOIN sys_dict_data dic2 ON ten.Design_Scale = dic2.id
-        <where>
-            <if test="tenVoltageQueryParam.pvStatus != null">
-                and ten.pv_status  = #{tenVoltageQueryParam.pvStatus}
-            </if>
-            <if test="tenVoltageQueryParam.searchValue !=null and tenVoltageQueryParam.searchValue!=''">
-                and ten.name like CONCAT('%',#{tenVoltageQueryParam.searchValue},'%')
-                or ten.code like CONCAT('%',#{tenVoltageQueryParam.searchValue},'%')
-            </if>
-
-            <if test="tenVoltageQueryParam.scale!=null and tenVoltageQueryParam.scale.size > 0">
-                and ten.scale in
-                <foreach collection="tenVoltageQueryParam.scale" item="item" open="(" close=")" separator=",">
-                    #{item}
-                </foreach>
-            </if>
-
-            <if test="tenVoltageQueryParam.designScale!=null and tenVoltageQueryParam.designScale.size > 0">
-                and ten.design_Scale in
-                <foreach collection="tenVoltageQueryParam.designScale" item="item" open="(" close=")" separator=",">
-                    #{item}
-                </foreach>
-            </if>
-
-        </where>
-        order by ten.create_time asc
-    </select>
-</mapper>
diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/PvUnitMapper.xml b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/PvUnitMapper.xml
deleted file mode 100644
index ed01a95c1..000000000
--- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/PvUnitMapper.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.njcn.device.pms.mapper.PvUnitMapper">
-
-
-    <select id="getPvUnitList" resultType="UnitTreeVO">
-        select * from pv_unit
-        <if test="orderBy!=null and orderBy!='' and sortBy!=null and sortBy!=''">
-            order by concat(#{sortBy},' ',#{orderBy})
-        </if>
-    </select>
-
-
-
-</mapper>
diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/PwMonitorMapper.xml b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/PwMonitorMapper.xml
new file mode 100644
index 000000000..f9def7d1f
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/PwMonitorMapper.xml
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.njcn.device.pms.mapper.PwMonitorMapper">
+
+    <!--获取配网监测点信息-->
+    <select id="getPwMonitorDataList" resultType="com.njcn.device.pms.pojo.dto.PwPmsMonitorDTO">
+        SELECT DISTINCT
+        monitor.Org_Id AS orgId,
+        monitor.Org_Name AS orgName,
+        monitor.id as monitorId,
+        monitor.`Name` as monitorName,
+        pdm.Monitor_Sort AS monitorSort,
+        pdm.Voltage_Level AS voltageLevel,
+        pdm.If_Power_User AS if_powerUser,
+        pdm.Monitor_State AS monitorState,
+        pdm.Created_Date AS createdDate,
+        pdm.STATUS AS STATUS,
+        pdm.Create_By AS createBy,
+        pdm.Create_Time AS createTime,
+        pdm.Update_By AS updateBy,
+        pdm.Update_Time AS updateTime
+        FROM (
+        (SELECT pm.id, pm.`Name`, pm.`Status`, pm.Org_Id, pm.Org_Name FROM pms_monitor AS pm)
+        UNION ALL
+        (SELECT ppd.id, ppd.`Name`, ppd.`Status`, ppd.Org_Id, ppd.Org_Name
+        FROM pms_power_distributionarea AS ppd)
+        UNION ALL
+        (SELECT ppc.id, ppc.`Name`, ppc.`Status`, ppc.Org_Id, ppc.Org_Name FROM pms_power_client AS ppc)
+        UNION ALL
+        (SELECT ppgu.id, ppgu.`Name`, ppgu.`Status`, ppgu.Org_Id, ppgu.Org_Name
+        FROM pms_power_generation_user AS ppgu)
+        ) AS monitor
+        INNER JOIN pms_distribution_monitor AS pdm ON monitor.id = pdm.Monitor_Id
+        WHERE
+        monitor.`Status` = 1
+        AND pdm.`Status` = 1
+        AND monitor.Org_Id IN
+        <foreach collection="deptIdList" item="orgId" open="(" close=")" separator=",">
+            #{orgId}
+        </foreach>
+        <if test="pwPmsMonitorParam.voltageLevels!=null and pwPmsMonitorParam.voltageLevels.size()!=0">
+            AND pdm.Voltage_Level IN
+            <foreach collection="pwPmsMonitorParam.voltageLevels" item="item" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="pwPmsMonitorParam.monitorSort!=null and pwPmsMonitorParam.monitorSort.size()!=0">
+            AND pdm.Monitor_Sort IN
+            <foreach collection="pwPmsMonitorParam.monitorSort" item="item" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="pwPmsMonitorParam.monitorState!=null and pwPmsMonitorParam.monitorState.size()!=0">
+            AND pdm.Monitor_State IN
+            <foreach collection="pwPmsMonitorParam.monitorState" item="item" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="pwPmsMonitorParam.ifPowerUser != null and pwPmsMonitorParam.ifPowerUser != ''">
+            AND pdm.If_Power_User = #{pwPmsMonitorParam.ifPowerUser}
+        </if>
+        <if test="pwPmsMonitorParam.monitorName !=null and pwPmsMonitorParam.monitorName != ''">
+            AND monitor.`Name` LIKE CONCAT('%',#{pwPmsMonitorParam.monitorName},'%')
+        </if>
+    </select>
+
+</mapper>
\ No newline at end of file
diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/RMpMonitorAlarmCountMMapper.xml b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/RMpMonitorAlarmCountMMapper.xml
new file mode 100644
index 000000000..3bb3e84da
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/RMpMonitorAlarmCountMMapper.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.njcn.device.pms.mapper.RMpMonitorAlarmCountMMapper">
+
+    <resultMap id="BaseResultMap" type="com.njcn.device.pms.pojo.po.RMpMonitorAlarmCountM">
+            <id property="orgNo" column="org_no" jdbcType="VARCHAR"/>
+            <id property="dataDate" column="data_date" jdbcType="DATE"/>
+            <id property="dataType" column="data_type" jdbcType="INTEGER"/>
+            <result property="measurementPointId" column="measurement_point_id" jdbcType="VARCHAR"/>
+            <result property="vdevAlarmInfo" column="vdev_alarm_info" jdbcType="INTEGER"/>
+            <result property="vdevSeverity" column="vdev_severity" jdbcType="INTEGER"/>
+            <result property="freqAlarmInfo" column="freq_alarm_info" jdbcType="INTEGER"/>
+            <result property="freqSeverity" column="freq_severity" jdbcType="INTEGER"/>
+            <result property="unbalanceAlarmInfo" column="unbalance_alarm_info" jdbcType="INTEGER"/>
+            <result property="unbalanceSeverity" column="unbalance_severity" jdbcType="INTEGER"/>
+            <result property="vAlarmInfo" column="v_alarm_info" jdbcType="INTEGER"/>
+            <result property="vSeverity" column="v_severity" jdbcType="INTEGER"/>
+            <result property="flickerAlarmInfo" column="flicker_alarm_info" jdbcType="INTEGER"/>
+            <result property="flickerSeverity" column="flicker_severity" jdbcType="INTEGER"/>
+            <result property="sagAlarmInfo" column="sag_alarm_info" jdbcType="INTEGER"/>
+            <result property="sagSeverity" column="sag_severity" jdbcType="INTEGER"/>
+            <result property="interruptAlarmInfo" column="interrupt_alarm_info" jdbcType="INTEGER"/>
+            <result property="interruptSeverity" column="interrupt_severity" jdbcType="INTEGER"/>
+            <result property="harmonicTypeGrade" column="harmonic_type_grade" jdbcType="INTEGER"/>
+            <result property="eventTypeGrade" column="event_type_grade" jdbcType="INTEGER"/>
+    </resultMap>
+
+    <sql id="Base_Column_List">
+        org_no,data_date,data_type,
+        measurement_point_id,vdev_alarm_info,vdev_severity,
+        freq_alarm_info,freq_severity,unbalance_alarm_info,
+        unbalance_severity,v_alarm_info,v_severity,
+        flicker_alarm_info,flicker_severity,sag_alarm_info,
+        sag_severity,interrupt_alarm_info,interrupt_severity,
+        harmonic_type_grade,event_type_grade
+    </sql>
+</mapper>
diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/RMpPwAlarmDetailDMapper.xml b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/RMpPwAlarmDetailDMapper.xml
new file mode 100644
index 000000000..ecbf73b96
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/RMpPwAlarmDetailDMapper.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.njcn.device.pms.mapper.RMpPwAlarmDetailDMapper">
+
+    <resultMap id="BaseResultMap" type="com.njcn.device.pms.pojo.po.RMpPwAlarmDetailD">
+            <id property="dataDate" column="data_date" jdbcType="DATE"/>
+            <id property="measurementPointId" column="measurement_point_id" jdbcType="INTEGER"/>
+            <result property="alarmType" column="alarm_type" jdbcType="VARCHAR"/>
+            <result property="alarmInfo" column="alarm_info" jdbcType="VARCHAR"/>
+            <result property="alarmLastTime" column="alarm_last_time" jdbcType="FLOAT"/>
+            <result property="isCreateProblem" column="is_create_problem" jdbcType="TINYINT"/>
+    </resultMap>
+
+    <sql id="Base_Column_List">
+        data_date,measurement_point_id,alarm_type,
+        alarm_info,alarm_last_time,is_create_problem
+    </sql>
+</mapper>
diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/RMpTargetWarnDMapper.xml b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/RMpTargetWarnDMapper.xml
new file mode 100644
index 000000000..812bd0b7e
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/RMpTargetWarnDMapper.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.njcn.device.pms.mapper.RMpTargetWarnDMapper">
+
+    <resultMap id="BaseResultMap" type="com.njcn.device.pms.pojo.po.RMpTargetWarnD">
+            <id property="measurementPointId" column="measurement_point_id" jdbcType="VARCHAR"/>
+            <id property="dataDate" column="data_date" jdbcType="DATE"/>
+            <result property="isEffective" column="is_effective" jdbcType="TINYINT"/>
+            <result property="isHarmonic" column="is_harmonic" jdbcType="TINYINT"/>
+            <result property="isEvent" column="is_event" jdbcType="TINYINT"/>
+            <result property="isWarn" column="is_warn" jdbcType="TINYINT"/>
+            <result property="isVDevWarn" column="is_v_dev_warn" jdbcType="TINYINT"/>
+            <result property="isFreqWarn" column="is_freq_warn" jdbcType="TINYINT"/>
+            <result property="isUnbalanceWarn" column="is_unbalance_warn" jdbcType="TINYINT"/>
+            <result property="isVWarn" column="is_v_warn" jdbcType="TINYINT"/>
+            <result property="isFlickerWarn" column="is_flicker_warn" jdbcType="TINYINT"/>
+            <result property="isSagWarn" column="is_sag_warn" jdbcType="TINYINT"/>
+            <result property="isInterruptWarn" column="is_interrupt_warn" jdbcType="TINYINT"/>
+    </resultMap>
+
+    <sql id="Base_Column_List">
+        measurement_point_id,data_date,is_effective,
+        is_harmonic,is_event,is_warn,
+        is_v_dev_warn,is_freq_warn,is_unbalance_warn,
+        is_v_warn,is_flicker_warn,is_sag_warn,
+        is_interrupt_warn
+    </sql>
+</mapper>
diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/RStatAreaAlarmCountMMapper.xml b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/RStatAreaAlarmCountMMapper.xml
new file mode 100644
index 000000000..e6353dd24
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/RStatAreaAlarmCountMMapper.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.njcn.device.pms.mapper.RStatAreaAlarmCountMMapper">
+
+    <resultMap id="BaseResultMap" type="com.njcn.device.pms.pojo.po.RStatAreaAlarmCountM">
+            <id property="orgNo" column="org_no" jdbcType="VARCHAR"/>
+            <id property="dataDate" column="data_date" jdbcType="DATE"/>
+            <id property="dataType" column="data_type" jdbcType="INTEGER"/>
+            <result property="vdevAlarmInfo" column="vdev_alarm_info" jdbcType="INTEGER"/>
+            <result property="vdevAlarmRatio" column="vdev_alarm_ratio" jdbcType="INTEGER"/>
+            <result property="freqAlarmInfo" column="freq_alarm_info" jdbcType="INTEGER"/>
+            <result property="freqAlarmRatio" column="freq_alarm_ratio" jdbcType="INTEGER"/>
+            <result property="unbalanceAlarmInfo" column="unbalance_alarm_info" jdbcType="INTEGER"/>
+            <result property="unbalanceAlarmRatio" column="unbalance_alarm_ratio" jdbcType="INTEGER"/>
+            <result property="vAlarmInfo" column="v_alarm_info" jdbcType="INTEGER"/>
+            <result property="vAlarmRatio" column="v_alarm_ratio" jdbcType="INTEGER"/>
+            <result property="flickerAlarmInfo" column="flicker_alarm_info" jdbcType="INTEGER"/>
+            <result property="flickerAlarmRatio" column="flicker_alarm_ratio" jdbcType="INTEGER"/>
+            <result property="sagAlarmInfo" column="sag_alarm_info" jdbcType="INTEGER"/>
+            <result property="sagAlarmAvgCount" column="sag_alarm_avg_count" jdbcType="INTEGER"/>
+            <result property="interruptAlarmInfo" column="interrupt_alarm_info" jdbcType="INTEGER"/>
+            <result property="interruptAlarmAvgCount" column="interrupt_alarm_avg_count" jdbcType="INTEGER"/>
+            <result property="harmonicTypeGrade" column="harmonic_type_grade" jdbcType="INTEGER"/>
+            <result property="eventTypeGrade" column="event_type_grade" jdbcType="INTEGER"/>
+    </resultMap>
+
+    <sql id="Base_Column_List">
+        org_no,data_date,data_type,
+        vdev_alarm_info,vdev_alarm_ratio,freq_alarm_info,
+        freq_alarm_ratio,unbalance_alarm_info,unbalance_alarm_ratio,
+        v_alarm_info,v_alarm_ratio,flicker_alarm_info,
+        flicker_alarm_ratio,sag_alarm_info,sag_alarm_avg_count,
+        interrupt_alarm_info,interrupt_alarm_avg_count,harmonic_type_grade,
+        event_type_grade
+    </sql>
+</mapper>
diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/RStatBusbarHarmonicMapper.xml b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/RStatBusbarHarmonicMapper.xml
new file mode 100644
index 000000000..766837400
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/RStatBusbarHarmonicMapper.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.njcn.device.pms.mapper.RStatBusbarHarmonicMapper">
+
+    <!--根据部门id查询监测点id-->
+    <select id="getMonitorInfo" resultType="com.njcn.device.pms.pojo.po.PmsMonitorPO">
+        SELECT
+        id,
+        `Name`,
+        Org_Name AS orgName,
+        Org_Id AS orgId,
+        Operation_Name AS operationName,
+        Operation_Id AS operationId,
+        Powerr_Name AS powerrName,
+        Powerr_Id AS powerrId,
+        Generatrix_Name AS generatrixName,
+        Generatrix_Id AS generatrixId
+        FROM
+        pms_monitor
+        WHERE
+        Org_Id IN ()
+        <foreach collection="deptIds" item="item" open="(" close=")" separator=",">
+            #{item}
+        </foreach>
+    </select>
+
+
+
+    <!--查询变电站背景谐波年表-->
+    <select id="getAnnualReportOfSubstationBusVoltageIndex"
+            resultType="com.njcn.device.pms.pojo.vo.RStatBusbarHarmonicVO">
+        SELECT
+        *
+        FROM
+        r_stat_busbar_harmonic_y
+        WHERE
+        <if test="busbarIds != null and busbarIds.size() > 0">
+            busbar_id IN
+            <foreach collection="generatrixIds" item="item" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="startTime != null and startTime != ''">
+            AND DATE_FORMAT( data_date,'%Y-%m-%d') &gt;= DATE_FORMAT(#{startTime},'%Y-%m-%d')
+        </if>
+        <if test="endTime != null and endTime != ''">
+            AND DATE_FORMAT( data_date,'%Y-%m-%d') &lt;= DATE_FORMAT(#{endTime},'%Y-%m-%d')
+        </if>
+    </select>
+</mapper>
\ No newline at end of file
diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/RStatEventOrgMapper.xml b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/RStatEventOrgMapper.xml
new file mode 100644
index 000000000..8786cc331
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/RStatEventOrgMapper.xml
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.njcn.device.pms.mapper.RStatEventOrgMapper">
+
+
+    <sql id="query_rStatEventOrg_field">
+        rso.org_no AS orgNo,
+	    rso.data_date AS dataDate,
+	    rso.effective_measurement_average AS effectiveMeasurementAverage,
+	    rso.effective_measurement_accrued AS effectiveMeasurementAccrued,
+	    rso.event_measurement_average AS eventMeasurementAverage,
+	    rso.event_measurement_accrued AS eventMeasurementAccrued,
+	    rseo.event_type,
+	    rseo.event_measurement_average AS eEventMeasurementAverage,
+	    rseo.event_measurement_accrued AS eEventMeasurementAccrued,
+	    rseo.event_measurement_ratio_average AS eEventMeasurementRatioAverage,
+	    rseo.event_measurement_ratio_accrued AS eEventMeasurementRatioAccrued
+    </sql>
+    <sql id="query_rStatEventOrg_where">
+        rso.org_no IN
+        <foreach collection="deptIds" item="item" open="(" close=")" separator=",">
+            #{item}
+        </foreach>
+        <if test="startTime != null and startTime != ''">
+            AND DATE_FORMAT(rso.data_date, '%Y-%m-%d') &gt;= DATE_FORMAT(#{startTime}, '%Y-%m-%d')
+        </if>
+        <if test="endTime != null and endTime != ''">
+            AND DATE_FORMAT(rso.data_date, '%Y-%m-%d') &lt;= DATE_FORMAT(#{endTime}, '%Y-%m-%d')
+        </if>
+        GROUP BY
+        org_no
+    </sql>
+
+    <!--指标分类统计表-->
+    <select id="getYearRStatEventOrgInfo" resultType="com.njcn.device.pms.pojo.vo.RStatEventOrgVO">
+        SELECT
+        <include refid="query_rStatEventOrg_field"></include>
+        FROM
+        r_stat_org_y AS rso
+        LEFT JOIN r_stat_event_org_y AS rseo ON rso.org_no = rseo.org_no
+        WHERE
+        <include refid="query_rStatEventOrg_where"></include>
+    </select>
+
+
+    <!--获取季区域暂态指标分类统计表-->
+    <select id="getQuarterRStatEventOrgInfo" resultType="com.njcn.device.pms.pojo.vo.RStatEventOrgVO">
+        SELECT
+        <include refid="query_rStatEventOrg_field"></include>
+        FROM
+        r_stat_org_q AS rso
+        LEFT JOIN r_stat_event_org_q AS rseo ON rso.org_no = rseo.org_no
+        WHERE
+        <include refid="query_rStatEventOrg_where"></include>
+    </select>
+
+
+    <!--获取月区域暂态指标分类统计表-->
+    <select id="getMonthRStatEventOrgInfoInfo" resultType="com.njcn.device.pms.pojo.vo.RStatEventOrgVO">
+        SELECT
+        <include refid="query_rStatEventOrg_field"></include>
+        FROM
+        r_stat_org_m AS rso
+        LEFT JOIN r_stat_event_org_m AS rseo ON rso.org_no = rseo.org_no
+        WHERE
+        <include refid="query_rStatEventOrg_where"></include>
+    </select>
+
+
+</mapper>
\ No newline at end of file
diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/RStatOrgMapper.xml b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/RStatOrgMapper.xml
new file mode 100644
index 000000000..ccc4b0aad
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/RStatOrgMapper.xml
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.njcn.device.pms.mapper.RStatOrgMapper">
+
+    <sql id="query_where">
+        org_no IN
+        <foreach collection="deptIds" item="item" open="(" close=")" separator=",">
+            #{item}
+        </foreach>
+        <if test="startTime != null and startTime != ''">
+            AND DATE_FORMAT(data_date, '%Y-%m-%d') &gt;= DATE_FORMAT(#{startTime}, '%Y-%m-%d')
+        </if>
+        <if test="endTime != null and endTime != ''">
+            AND DATE_FORMAT(data_date, '%Y-%m-%d') &lt;= DATE_FORMAT(#{endTime}, '%Y-%m-%d')
+        </if>
+    </sql>
+
+    <sql id="query_field">
+        org_no AS orgNo,
+        data_date AS dataDate,
+        effective_measurement_average AS effectiveMeasurementAverage,
+        effective_measurement_accrued AS effectiveMeasurementAccrued,
+        event_measurement_average AS eventMeasurementAverage,
+        event_measurement_accrued AS eventMeasurementAccrued,
+        event_count AS eventCount,
+        event_freq AS eventFreq
+    </sql>
+
+
+    <!--获取年区域暂态指标统计-->
+    <select id="getYearRStatOrgInfo" resultType="com.njcn.device.pms.pojo.vo.RStatOrgVO">
+        SELECT
+        <include refid="query_field"></include>
+        FROM
+        r_stat_org_y
+        WHERE
+        <include refid="query_where"></include>
+    </select>
+
+    <!--获取季区域暂态指标统计-->
+    <select id="getQuarterRStatOrgInfo" resultType="com.njcn.device.pms.pojo.vo.RStatOrgVO">
+        SELECT
+        <include refid="query_field"></include>
+        FROM
+        r_stat_org_q
+        WHERE
+        <include refid="query_where"></include>
+    </select>
+
+    <!--获取月区域暂态指标统计-->
+    <select id="getMonthRStatOrgInfo" resultType="com.njcn.device.pms.pojo.vo.RStatOrgVO">
+        SELECT
+        <include refid="query_field"></include>
+        FROM
+        r_stat_org_m
+        WHERE
+        <include refid="query_where"></include>
+    </select>
+
+</mapper>
\ No newline at end of file
diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/RStatSubstationMapper.xml b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/RStatSubstationMapper.xml
new file mode 100644
index 000000000..7efaef6fa
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/RStatSubstationMapper.xml
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.njcn.device.pms.mapper.RStatSubstationMapper">
+
+    <!--根据部门id查询监测点id-->
+    <select id="getMonitorInfo" resultType="com.njcn.device.pms.pojo.po.PmsMonitorPO">
+        SELECT
+        id,
+        `Name`,
+        Org_Name AS orgName,
+        Org_Id AS orgId,
+        Operation_Name AS operationName,
+        Operation_Id AS operationId,
+        Powerr_Name AS powerrName,
+        Powerr_Id AS powerrId,
+        Generatrix_Name AS generatrixName,
+        Generatrix_Id AS generatrixId
+        FROM
+        pms_monitor
+        WHERE
+        Org_Id IN ()
+        <foreach collection="deptIds" item="item" open="(" close=")" separator=",">
+            #{item}
+        </foreach>
+    </select>
+
+
+    <sql id="query_field">
+        substation_id AS substationId,
+        data_date AS dataDate,
+        effective_measurement_average AS effectiveMeasurementAverage,
+        effective_measurement_accrued AS effectiveMeasurementAccrued,
+        event_count AS eventCount,
+        event_freq AS eventFreq,
+        interrupt_count AS interruptCount,
+        interrupt_freq AS interruptFreq,
+        swell_count AS swellCount,
+        swell_freq AS swellFreq,
+        sag_count AS sagCount,
+        sag_freq AS sagFreq
+    </sql>
+    <sql id="query_where">
+        substation_id IN
+        <foreach collection="powerrIds" item="item" open="(" close=")" separator=",">
+            #{item}
+        </foreach>
+        <if test="startTime != null and startTime != ''">
+            AND DATE_FORMAT( data_date,'%Y-%m-%d') &gt;= DATE_FORMAT(#{startTime},'%Y-%m-%d')
+        </if>
+        <if test="endTime != null and endTime != ''">
+            AND DATE_FORMAT( data_date,'%Y-%m-%d') &lt;= DATE_FORMAT(#{endTime},'%Y-%m-%d')
+        </if>
+    </sql>
+
+    <!--获取年变电站暂态指标分类统计表-->
+    <select id="getYearInfo" resultType="com.njcn.device.pms.pojo.vo.RStatSubstationVO">
+        SELECT
+        <include refid="query_field"></include>
+        FROM
+        r_stat_substation_y
+        WHERE
+        <include refid="query_where"></include>
+    </select>
+
+    <!--获取季变电站暂态指标分类统计表-->
+    <select id="getQuarterInfo" resultType="com.njcn.device.pms.pojo.vo.RStatSubstationVO">
+        SELECT
+        <include refid="query_field"></include>
+        FROM
+        r_stat_substation_q
+        WHERE
+        <include refid="query_where"></include>
+    </select>
+
+    <!--获取月变电站暂态指标分类统计表-->
+    <select id="getMonthInfo" resultType="com.njcn.device.pms.pojo.vo.RStatSubstationVO">
+        SELECT
+        <include refid="query_field"></include>
+        FROM
+        r_stat_substation_m
+        WHERE
+        <include refid="query_where"></include>
+    </select>
+</mapper>
\ No newline at end of file
diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/RStatZwAlarmCountWMapper.xml b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/RStatZwAlarmCountWMapper.xml
new file mode 100644
index 000000000..ebe4d382a
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/RStatZwAlarmCountWMapper.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.njcn.device.pms.mapper.RStatZwAlarmCountWMapper">
+
+    <resultMap id="BaseResultMap" type="com.njcn.device.pms.pojo.po.RStatZwAlarmCountW">
+            <id property="orgNo" column="org_no" jdbcType="VARCHAR"/>
+            <id property="dataDate" column="data_date" jdbcType="DATE"/>
+            <result property="monitorEffectiveCount" column="monitor_effective_count" jdbcType="INTEGER"/>
+            <result property="warnMonitorCount" column="warn_monitor_count" jdbcType="INTEGER"/>
+            <result property="monitorGradeCount" column="monitor_grade_count" jdbcType="INTEGER"/>
+        
+    </resultMap>
+
+    <sql id="Base_Column_List">
+        org_no,data_date,monitor_effective_count,
+        warn_monitor_count,monitor_grade_count
+    </sql>
+
+
+    <select id="getRStatZwAlarmCountWList" resultType="com.njcn.device.pms.pojo.vo.RStatZwAlarmCountWVO">
+        select <include refid="Base_Column_List"/>
+        from r_stat_zw_alarm_count_w rszac
+        where 1 = 1
+        <if test="rStatZwAlarmCountWParam.orgNo != null and rStatZwAlarmCountWParam.orgNo != ''">
+          and rszac.org_no = #{rStatZwAlarmCountWParam.orgNo}
+        </if>
+        <if test="rStatZwAlarmCountWParam.beginDate != null and rStatZwAlarmCountWParam.beginDate != ''">
+          and DATE_FORMAT(rszac.data_date, '%Y-%m-%d') &gt;= #{rStatZwAlarmCountWParam.beginDate}
+        </if>
+        <if test="rStatZwAlarmCountWParam.endDate != null and rStatZwAlarmCountWParam.endDate != ''">
+            and DATE_FORMAT(rszac.data_date, '%Y-%m-%d') &lt;= #{rStatZwAlarmCountWParam.endDate}
+        </if>
+    </select>
+
+
+</mapper>
diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/RmpEventDetailMapper.xml b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/RmpEventDetailMapper.xml
new file mode 100644
index 000000000..9a12ffff9
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/RmpEventDetailMapper.xml
@@ -0,0 +1,4 @@
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.njcn.device.pms.mapper.RmpEventDetailMapper">
+
+</mapper>
\ No newline at end of file
diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/SourceManagementMapper.xml b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/SourceManagementMapper.xml
new file mode 100644
index 000000000..606c70ab5
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/SourceManagementMapper.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.njcn.device.pms.mapper.SourceManagementMapper">
+
+</mapper>
diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/StatationStatMapper.xml b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/StatationStatMapper.xml
new file mode 100644
index 000000000..dd40bb65a
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/StatationStatMapper.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.njcn.device.pms.mapper.StatationStatMapper">
+
+    <!--获取指定的变电站信息-->
+    <select id="getStatationStatInfo" resultType="com.njcn.device.pms.pojo.dto.PmsStatationStatInfoDTO">
+        SELECT
+        pm.Org_Id AS orgId,
+        pm.Org_Name AS orgName,
+        pm.Powerr_Id AS powerId,
+        pm.Powerr_Name AS powerName,
+        pm.Generatrix_Id AS generatrixId,
+        pm.Generatrix_Name AS generatrixName,
+        pm.Id AS monitorId,
+        pm.`Name` AS monitorName,
+        pss.Voltage_Level AS powerVoltageLevel
+        FROM
+        pms_monitor AS pm
+        LEFT JOIN pms_statation_stat AS pss ON pss.Power_Id = pm.Powerr_Id
+        WHERE
+        pm.Status = 1
+        AND pss.Status = 1
+        AND pm.Powerr_Id IN
+        <foreach collection="pmsStatationStatInfoParam.powerIds" item="item" open="(" close=")" separator=",">
+            #{item}
+        </foreach>
+        <if test="pmsStatationStatInfoParam.powerVoltageLevel !=null and pmsStatationStatInfoParam.powerVoltageLevel.size() != 0">
+            AND pss.Voltage_Level IN
+            <foreach collection="pmsStatationStatInfoParam.powerVoltageLevel" item="item" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="pmsStatationStatInfoParam.powerName != null and pmsStatationStatInfoParam.powerName != ''">
+            AND pm.Powerr_Name LIKE CONCAT('%',#{pmsStatationStatInfoParam.powerName},'%')
+        </if>
+    </select>
+
+</mapper>
diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/StatisticsRunMonitorMapper.xml b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/StatisticsRunMonitorMapper.xml
new file mode 100644
index 000000000..2b831da1c
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/StatisticsRunMonitorMapper.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.njcn.device.pms.mapper.StatisticsRunMonitorMapper">
+
+</mapper>
diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/TerminalEliminateDataMapper.xml b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/TerminalEliminateDataMapper.xml
new file mode 100644
index 000000000..96f1faf8b
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/TerminalEliminateDataMapper.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.njcn.device.pms.mapper.TerminalEliminateDataMapper">
+
+</mapper>
diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/TerminalMapper.xml b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/TerminalMapper.xml
new file mode 100644
index 000000000..297fa4471
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/TerminalMapper.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.njcn.device.pms.mapper.TerminalMapper">
+
+    <select id="page" resultType="com.njcn.device.pms.pojo.vo.PmsTerminalVO">
+        SELECT pms_terminal.*
+        FROM pms_terminal pms_terminal
+        WHERE ${ew.sqlSegment}
+    </select>
+</mapper>
diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/PvVoltageMapper.xml b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/TractionStationMapper.xml
similarity index 69%
rename from pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/PvVoltageMapper.xml
rename to pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/TractionStationMapper.xml
index 69dbe67a1..e839ffba2 100644
--- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/PvVoltageMapper.xml
+++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/TractionStationMapper.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.njcn.device.pms.mapper.PvVoltageMapper">
+<mapper namespace="com.njcn.device.pms.mapper.TractionStationMapper">
 
 </mapper>
diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/TransientStasticDataMapper.xml b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/TransientStasticDataMapper.xml
new file mode 100644
index 000000000..6fbbd6e8e
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/TransientStasticDataMapper.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.njcn.device.pms.mapper.TransientStasticDataMapper">
+
+</mapper>
diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/TreatTransientDetailDataMapper.xml b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/TreatTransientDetailDataMapper.xml
new file mode 100644
index 000000000..6c3c4ccac
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/TreatTransientDetailDataMapper.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.njcn.device.pms.mapper.TreatTransientDetailDataMapper">
+
+</mapper>
diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/IDistributionMonitorService.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/IDistributionMonitorService.java
new file mode 100644
index 000000000..7826efe0c
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/IDistributionMonitorService.java
@@ -0,0 +1,29 @@
+package com.njcn.device.pms.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.njcn.device.pms.pojo.dto.PmsMonitorBaseDTO;
+import com.njcn.device.pms.pojo.param.PmsDeviceInfoParam;
+import com.njcn.device.pms.pojo.po.DistributionMonitor;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  配网
+ * </p>
+ *
+ * @author hongawen
+ * @since 2022-10-14
+ */
+public interface IDistributionMonitorService extends IService<DistributionMonitor> {
+
+
+    /**
+     * 获取组织机构下的配网监测点
+     * @author cdf
+     * @date 2022/10/27
+     * @param
+     */
+    List<PmsMonitorBaseDTO> getMonitorByCondition(List<String> deptIdList, PmsDeviceInfoParam pmsDeviceInfoParam);
+
+}
diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/IGeneratrixWireService.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/IGeneratrixWireService.java
new file mode 100644
index 000000000..07666138d
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/IGeneratrixWireService.java
@@ -0,0 +1,63 @@
+package com.njcn.device.pms.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.njcn.device.pms.pojo.param.GeneratrixWireParam;
+import com.njcn.device.pms.pojo.po.GeneratrixWire;
+import com.njcn.web.pojo.param.BaseParam;
+
+import java.util.List;
+
+/**
+ * pms-device
+ *
+ * @author cdf
+ * @date 2022/10/26
+ */
+public interface IGeneratrixWireService extends IService<GeneratrixWire> {
+
+    /**
+     * 新增线路
+     * @author cdf
+     * @date 2022/10/25
+     * @param generatrixWireParam 线路
+     * @return boolean
+     */
+    boolean addGeneratrixWire(GeneratrixWireParam generatrixWireParam);
+
+    /**
+     * 修改线路
+     * @author cdf
+     * @date 2022/10/25
+     * @param generatrixWireParam 线路
+     * @return boolean
+     */
+    boolean updateGeneratrixWire(GeneratrixWireParam.UpdateGeneratrixWireParam generatrixWireParam);
+
+    /**
+     * 删除线路
+     * @author cdf
+     * @date 2022/10/25
+     * @param generatrixWireIds 线路
+     * @return boolean
+     */
+    boolean delGeneratrixWire(List<String> generatrixWireIds);
+
+    /**
+     * 查询线路
+     * @author cdf
+     * @date 2022/10/25
+     * @param generatrixWireId 线路id
+     * @return boolean
+     */
+    GeneratrixWire getGeneratrixWireById(String generatrixWireId);
+
+    /**
+     * 查询线路列表
+     * @author cdf
+     * @date 2022/10/25
+     * @param baseParam 基础参数
+     * @return boolean
+     */
+    List<GeneratrixWire> getGeneratrixWireList(BaseParam baseParam);
+
+}
diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/IHarmonicGeneralManagementDataService.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/IHarmonicGeneralManagementDataService.java
new file mode 100644
index 000000000..26fc3a073
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/IHarmonicGeneralManagementDataService.java
@@ -0,0 +1,16 @@
+package com.njcn.device.pms.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.njcn.device.pms.pojo.po.HarmonicGeneralManagementData;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author hongawen
+ * @since 2022-10-14
+ */
+public interface IHarmonicGeneralManagementDataService extends IService<HarmonicGeneralManagementData> {
+
+}
diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/IHarmonicGeneralManagementService.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/IHarmonicGeneralManagementService.java
new file mode 100644
index 000000000..a577b78e2
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/IHarmonicGeneralManagementService.java
@@ -0,0 +1,16 @@
+package com.njcn.device.pms.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.njcn.device.pms.pojo.po.HarmonicGeneralManagement;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author hongawen
+ * @since 2022-10-14
+ */
+public interface IHarmonicGeneralManagementService extends IService<HarmonicGeneralManagement> {
+
+}
diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/IMonitorService.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/IMonitorService.java
new file mode 100644
index 000000000..bdba90059
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/IMonitorService.java
@@ -0,0 +1,110 @@
+package com.njcn.device.pms.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.njcn.common.pojo.dto.SimpleDTO;
+import com.njcn.common.pojo.response.HttpResult;
+import com.njcn.device.pms.pojo.dto.PmsMonitorBaseDTO;
+import com.njcn.device.pms.pojo.dto.PmsMonitorDTO;
+import com.njcn.device.pms.pojo.dto.PmsMonitorInfoDTO;
+import com.njcn.device.pms.pojo.dto.PwPmsMonitorDTO;
+import com.njcn.device.pms.pojo.param.MonitorParam;
+import com.njcn.device.pms.pojo.param.PmsDeviceInfoParam;
+import com.njcn.device.pms.pojo.param.PmsMonitorInfoParam;
+import com.njcn.device.pms.pojo.param.PmsMonitorParam;
+import com.njcn.device.pms.pojo.param.PwPmsMonitorParam;
+import com.njcn.device.pms.pojo.po.Monitor;
+import com.njcn.device.pms.pojo.vo.PmsMonitorVO;
+import com.njcn.device.pq.pojo.po.Overlimit;
+import org.springframework.web.bind.annotation.RequestBody;
+
+
+import java.util.List;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author hongawen
+ * @since 2022-10-14
+ */
+public interface IMonitorService extends IService<Monitor> {
+
+    /***
+     *
+     * @author hongawen
+     * @date 2022/10/17 11:36
+     * @param deptIdList 部门索引
+     * @param pmsDeviceInfoParam 前端查询条件
+     * @return List<Monitor>
+     */
+    List<PmsMonitorBaseDTO> getMonitorByCondition(List<String> deptIdList, PmsDeviceInfoParam pmsDeviceInfoParam);
+
+    /**
+     * 获取指定的监测点信息
+     *
+     * @param pmsMonitorInfoParam 获取监测点详情数据入参
+     * @return 指定的监测点信息
+     */
+    List<PmsMonitorInfoDTO> getMonitorInfo(PmsMonitorInfoParam pmsMonitorInfoParam);
+
+    /***
+     * 根据条件获取监测点信息列表
+     * @author jianghaifei
+     * @date 2022-10-20 22:55
+     * @param pmsMonitorParam
+     * @return java.util.List<com.njcn.device.pms.pojo.dto.PmsMonitorDTO>
+     */
+    List<PmsMonitorDTO> getMonitorInfoListByCond(PmsMonitorParam pmsMonitorParam);
+
+    /***
+     * 获取所有监测点信息
+     * @author jianghaifei
+     * @date 2022-10-24 20:01
+     * @param
+     * @return java.util.List<com.njcn.device.pms.pojo.vo.PmsMonitorVO>
+     */
+    List<PmsMonitorVO> getAllMonitorList();
+
+    /**
+     * 获取限值表信息
+     * @param id 监测点id
+     * @return 结果 Overlimit
+     */
+    Overlimit getOverLimitData(String id);
+
+
+    /**
+     * 新增主网监测点
+     * @author cdf
+     * @date 2022/10/25
+     * @param monitorParam 主网监测点
+     * @return boolean
+     */
+    boolean addMonitor(MonitorParam monitorParam);
+
+    /**
+     * 新增主网监测点
+     * @author cdf
+     * @date 2022/10/25
+     * @param monitorParam 主网监测点
+     * @return boolean
+     */
+    boolean updateMonitor(MonitorParam.UpdateMonitorParam monitorParam);
+
+    /**
+     * 新增主网监测点
+     * @author cdf
+     * @date 2022/10/25
+     * @param monitorIds 主网监测点
+     * @return boolean
+     */
+    boolean delMonitor(List<String> monitorIds);
+
+
+    /***
+     *
+     * 根据组织ID及条件，获取响应的变电站基础信息
+     */
+    List<SimpleDTO> getPmsPowerrInfoWithInOrg(List<String> orgIdList, PmsDeviceInfoParam pmsDeviceInfoParam);
+}
diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/IPmsGeneralDeviceService.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/IPmsGeneralDeviceService.java
new file mode 100644
index 000000000..7cf497a6d
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/IPmsGeneralDeviceService.java
@@ -0,0 +1,35 @@
+package com.njcn.device.pms.service;
+
+import com.njcn.common.pojo.dto.SimpleDTO;
+import com.njcn.device.pms.pojo.dto.PmsGeneralDeviceDTO;
+import com.njcn.device.pms.pojo.param.PmsDeviceInfoParam;
+
+import java.util.List;
+
+/**
+ * @author hongawen
+ * @version 1.0.0
+ * @date 2022年10月14日 09:58
+ */
+public interface IPmsGeneralDeviceService {
+
+    /**
+     * 获取指定组织下主网台账综合信息
+     */
+    List<PmsGeneralDeviceDTO> getPmsDeviceInfoWithInOrg(PmsDeviceInfoParam pmsDeviceInfoParam);
+
+    /**
+     * 主网获取指定组织下变电站
+     */
+    List<SimpleDTO> getPmsPowerrInfoWithInOrg(PmsDeviceInfoParam pmsDeviceInfoParam);
+
+
+    /**
+     *
+     * @param pmsDeviceInfoParam
+     * @return
+     */
+    List<PmsGeneralDeviceDTO> getPmsDeviceInfoByOrgId(PmsDeviceInfoParam pmsDeviceInfoParam);
+
+
+}
diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/IPmsGeneratrixService.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/IPmsGeneratrixService.java
new file mode 100644
index 000000000..026de5495
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/IPmsGeneratrixService.java
@@ -0,0 +1,72 @@
+package com.njcn.device.pms.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.njcn.device.pms.pojo.dto.PmsGeneratrixDTO;
+import com.njcn.device.pms.pojo.param.GeneratrixParam;
+import com.njcn.device.pms.pojo.param.PmsGeneratrixParam;
+import com.njcn.device.pms.pojo.po.Generatrix;
+import com.njcn.web.pojo.param.BaseParam;
+
+import java.util.List;
+
+/**
+ * @author yzh
+ * @date 2022/10/18
+ */
+
+public interface IPmsGeneratrixService extends IService<Generatrix> {
+
+    /**
+     * 获取母线信息
+     *
+     * @param pmsGeneratrixParam 入参
+     * @return 母线信息
+     */
+    List<PmsGeneratrixDTO> getGeneratrixInfo(PmsGeneratrixParam pmsGeneratrixParam);
+
+
+    /**
+     * 新增母线
+     * @author cdf
+     * @date 2022/10/25
+     * @param generatrixParam 母线
+     * @return boolean
+     */
+    boolean addGeneratrix(GeneratrixParam generatrixParam);
+
+    /**
+     * 修改母线
+     * @author cdf
+     * @date 2022/10/25
+     * @param generatrixParam 母线
+     * @return boolean
+     */
+    boolean updateGeneratrix(GeneratrixParam.UpdateGeneratrixParam generatrixParam);
+
+    /**
+     * 删除母线
+     * @author cdf
+     * @date 2022/10/25
+     * @param generatrixIds 母线
+     * @return boolean
+     */
+    boolean delGeneratrix(List<String> generatrixIds);
+
+    /**
+     * 查询母线
+     * @author cdf
+     * @date 2022/10/25
+     * @param generatrixId 母线id
+     * @return boolean
+     */
+    Generatrix getGeneratrixById(String generatrixId);
+
+    /**
+     * 查询母线列表
+     * @author cdf
+     * @date 2022/10/25
+     * @param baseParam 基础参数
+     * @return boolean
+     */
+    List<Generatrix> getGeneratrixList(BaseParam baseParam);
+}
diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/IPowerClientService.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/IPowerClientService.java
new file mode 100644
index 000000000..492cc9f00
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/IPowerClientService.java
@@ -0,0 +1,66 @@
+package com.njcn.device.pms.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.njcn.device.pms.pojo.param.PowerClientParam;
+import com.njcn.device.pms.pojo.po.PowerClient;
+import com.njcn.device.pms.pojo.po.PowerClient;
+import com.njcn.web.pojo.param.BaseParam;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author hongawen
+ * @since 2022-10-14
+ */
+public interface IPowerClientService extends IService<PowerClient> {
+
+    /**
+     * 新增用电用户
+     * @author cdf
+     * @date 2022/10/25
+     * @param powerClientParam 用电用户
+     * @return boolean
+     */
+    boolean addPowerClient(PowerClientParam powerClientParam);
+
+    /**
+     * 修改用电用户
+     * @author cdf
+     * @date 2022/10/25
+     * @param powerClientParam 用电用户
+     * @return boolean
+     */
+    boolean updatePowerClient(PowerClientParam powerClientParam);
+
+    /**
+     * 删除用电用户
+     * @author cdf
+     * @date 2022/10/25
+     * @param powerClientIds 用电用户
+     * @return boolean
+     */
+    boolean delPowerClient(List<String> powerClientIds);
+
+    /**
+     * 查询用电用户
+     * @author cdf
+     * @date 2022/10/25
+     * @param powerClientId 用电用户id
+     * @return boolean
+     */
+    PowerClient getPowerClientById(String powerClientId);
+
+    /**
+     * 查询用电用户列表
+     * @author cdf
+     * @date 2022/10/25
+     * @param baseParam 基础参数
+     * @return boolean
+     */
+    List<PowerClient> getPowerClientList(BaseParam baseParam);
+
+}
diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/IPowerDistributionareaService.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/IPowerDistributionareaService.java
new file mode 100644
index 000000000..8b12881c1
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/IPowerDistributionareaService.java
@@ -0,0 +1,53 @@
+package com.njcn.device.pms.service;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.njcn.device.pms.pojo.param.PowerDistributionareaParam;
+import com.njcn.device.pms.pojo.po.PowerDistributionarea;
+import com.njcn.device.pms.pojo.vo.PowerDistributionareaVO;
+import com.njcn.system.pojo.param.EventTemplateParam;
+import com.njcn.system.pojo.po.EventTemplate;
+import com.njcn.system.pojo.vo.EventTemplateVO;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author hongawen
+ * @since 2022-10-14
+ */
+public interface IPowerDistributionareaService extends IService<PowerDistributionarea> {
+
+    /**
+     * 查询所有
+     * @param queryParam
+     * @return
+     */
+    Page<PowerDistributionareaVO> getList(PowerDistributionareaParam.QueryParam queryParam);
+
+    /**
+     * 根据id查询
+     * @return
+     */
+    PowerDistributionarea getDistrictById(String id);
+
+    /**
+     * 新增
+     */
+    boolean add(PowerDistributionareaParam newParam);
+
+    /**
+     * 修改
+     * @param
+     */
+    boolean update(PowerDistributionareaParam updateParam);
+
+    /**
+     * 删除
+     * @param ids ids
+     */
+    boolean delete(List<String> ids);
+}
diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/IPowerGenerationUserService.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/IPowerGenerationUserService.java
new file mode 100644
index 000000000..4ef4f8db9
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/IPowerGenerationUserService.java
@@ -0,0 +1,65 @@
+package com.njcn.device.pms.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.njcn.device.pms.pojo.param.PowerGenerationUserParam;
+import com.njcn.device.pms.pojo.po.PowerGenerationUser;
+import com.njcn.web.pojo.param.BaseParam;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author hongawen
+ * @since 2022-10-14
+ */
+public interface IPowerGenerationUserService extends IService<PowerGenerationUser> {
+
+    /**
+     * 新增发电用户
+     * @author cdf
+     * @date 2022/10/25
+     * @param powerGenerationUserParam 发电用户
+     * @return boolean
+     */
+    boolean addPowerGenerationUser(PowerGenerationUserParam powerGenerationUserParam);
+
+    /**
+     * 修改发电用户
+     * @author cdf
+     * @date 2022/10/25
+     * @param powerGenerationUserParam 发电用户
+     * @return boolean
+     */
+    boolean updatePowerGenerationUser(PowerGenerationUserParam powerGenerationUserParam);
+
+    /**
+     * 删除发电用户
+     * @author cdf
+     * @date 2022/10/25
+     * @param powerGenerationUserIds 发电用户
+     * @return boolean
+     */
+    boolean delPowerGenerationUser(List<String> powerGenerationUserIds);
+
+    /**
+     * 查询发电用户
+     * @author cdf
+     * @date 2022/10/25
+     * @param powerGenerationUserId 发电用户id
+     * @return boolean
+     */
+    PowerGenerationUser getPowerGenerationUserById(String powerGenerationUserId);
+
+    /**
+     * 查询发电用户列表
+     * @author cdf
+     * @date 2022/10/25
+     * @param baseParam 基础参数
+     * @return boolean
+     */
+    List<PowerGenerationUser> getPowerGenerationUserList(BaseParam baseParam);
+
+}
diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/IPowerQualityMatterService.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/IPowerQualityMatterService.java
new file mode 100644
index 000000000..554f67ff8
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/IPowerQualityMatterService.java
@@ -0,0 +1,16 @@
+package com.njcn.device.pms.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.njcn.device.pms.pojo.po.PowerQualityMatter;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author hongawen
+ * @since 2022-10-14
+ */
+public interface IPowerQualityMatterService extends IService<PowerQualityMatter> {
+
+}
diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/IPvDeviceRunExService.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/IPvDeviceRunExService.java
deleted file mode 100644
index 90c03f10f..000000000
--- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/IPvDeviceRunExService.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.njcn.device.pms.service;
-
-
-import com.njcn.device.pms.pojo.bo.DeviceRunExBO;
-import com.njcn.device.pms.pojo.dto.DeviceRunExDTO;
-
-import java.util.List;
-
-/**
- * 终端异常服务类
- *
- * @author yangj
- * @date 2022/09/08
- */
-public interface IPvDeviceRunExService {
-
-
-    /**
-     * 分页条件查询终端异常列表信息
-     * @param deviceRunExDTO 终端条件查询dto
-     * @return List<DeviceRunExBO>
-     */
-    List<DeviceRunExBO> getPvDeviceExList(DeviceRunExDTO deviceRunExDTO);
-}
diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/IPvDeviceService.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/IPvDeviceService.java
deleted file mode 100644
index ddb1105c7..000000000
--- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/IPvDeviceService.java
+++ /dev/null
@@ -1,72 +0,0 @@
-package com.njcn.device.pms.service;
-
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.njcn.device.pms.pojo.param.DeviceQueryParam;
-import com.njcn.device.pms.pojo.param.PvDeviceParam;
-import com.njcn.device.pms.pojo.po.PvDevice;
-import com.njcn.device.pms.pojo.vo.PvDeviceVO;
-
-import java.util.List;
-
-/**
- * <p>
- *  服务类
- * </p>
- *
- * @author cdf
- * @since 2022-07-05
- */
-public interface IPvDeviceService extends IService<PvDevice> {
-
-
-    /**
-     * 新增分布式台账
-     * @param pvDeviceParam 分布式台账实体
-     * @author cdf
-     * @date 2022/7/5
-     * @return boolean
-     */
-    boolean addDevice(PvDeviceParam pvDeviceParam);
-
-    /**
-     * 修改分布式台账
-     * @param updatePvDeviceParam 分布式台账实体
-     * @author cdf
-     * @date 2022/7/5
-     * @return boolean
-     */
-    boolean updateDevice(PvDeviceParam.UpdatePvDeviceParam updatePvDeviceParam);
-
-
-    /**
-     * 分页查询分布式台账
-     * @param deviceQueryParam 分布式台账实体
-     * @author cdf
-     * @date 2022/7/5
-     * @return Page<PvDevice>
-     */
-    Page<PvDeviceVO> getPvDeviceList(DeviceQueryParam deviceQueryParam);
-
-    List<PvDeviceVO> getAllPvDeviceList();
-
-
-    /**
-     * 根据分布式台账id查询分布式台账
-     * @param id 分布式台账id
-     * @author cdf
-     * @date 2022/7/5
-     * @return PvDevice
-     */
-    PvDevice getPvDeviceById(String id);
-
-    /**
-     * 删除分布式台账
-     * @param ids 分布式台账id
-     * @author cdf
-     * @date 2022/7/5
-     * @return boolean
-     */
-    boolean delPvDevice(List<String> ids);
-
-}
diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/IPvDispatchService.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/IPvDispatchService.java
deleted file mode 100644
index d410715aa..000000000
--- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/IPvDispatchService.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.njcn.device.pms.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.njcn.device.pms.pojo.po.PvDispatch;
-
-/**
- * <p>
- *  服务类
- * </p>
- *
- * @author cdf
- * @since 2022-07-05
- */
-public interface IPvDispatchService extends IService<PvDispatch> {
-
-}
diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/IPvDistributedService.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/IPvDistributedService.java
deleted file mode 100644
index 41d3095a8..000000000
--- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/IPvDistributedService.java
+++ /dev/null
@@ -1,74 +0,0 @@
-package com.njcn.device.pms.service;
-
-
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.njcn.device.pms.pojo.param.DistributedQueryParam;
-import com.njcn.device.pms.pojo.param.PvDistributedParam;
-import com.njcn.device.pms.pojo.po.PvDistributed;
-import com.njcn.device.pms.pojo.vo.PvDistributedVO;
-
-import java.util.List;
-
-/**
- * <p>
- *  分布式服务类
- * </p>
- *
- * @author cdf
- * @since 2022-07-06
- */
-public interface IPvDistributedService extends IService<PvDistributed> {
-
-
-    /**
-     * 新增分布式台账
-     * @param pvDistributedParam 分布式台账实体
-     * @author cdf
-     * @date 2022/7/5
-     * @return boolean
-     */
-    boolean addDistributed(PvDistributedParam pvDistributedParam);
-
-    /**
-     * 修改分布式台账
-     * @param updatePvDistributedParam 分布式台账实体
-     * @author cdf
-     * @date 2022/7/5
-     * @return boolean
-     */
-    boolean updateDistributed(PvDistributedParam.UpdatePvDistributedParam updatePvDistributedParam);
-
-
-    /**
-     * 分页查询分布式台账
-     * @param distributedQueryParam 分布式台账实体
-     * @author cdf
-     * @date 2022/7/5
-     * @return Page<PvDistributed>
-     */
-    Page<PvDistributedVO> getPvDistributedList(DistributedQueryParam distributedQueryParam);
-
-    List<PvDistributed> getAllPvDistributedList();
-
-
-    /**
-     * 根据分布式台账id查询分布式台账
-     * @param id 分布式台账id
-     * @author cdf
-     * @date 2022/7/5
-     * @return PvDistributed
-     */
-    PvDistributed getPvDistributedById(String id);
-
-    /**
-     * 删除分布式台账
-     * @param ids 分布式台账id
-     * @author cdf
-     * @date 2022/7/5
-     * @return boolean
-     */
-    boolean delPvDistributed(List<String> ids);
-
-
-}
diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/IPvLineDetailService.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/IPvLineDetailService.java
deleted file mode 100644
index 44a1e4b52..000000000
--- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/IPvLineDetailService.java
+++ /dev/null
@@ -1,85 +0,0 @@
-package com.njcn.device.pms.service;
-
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.njcn.device.pms.pojo.param.LineDetailQueryParam;
-import com.njcn.device.pms.pojo.param.PvLineDetailParam;
-import com.njcn.device.pms.pojo.po.PvLineDetail;
-import com.njcn.device.pms.pojo.vo.PvLineAllDetailVO;
-
-import java.util.List;
-
-/**
- * <p>
- *  服务类
- * </p>
- *
- * @author cdf
- * @since 2022-07-05
- */
-public interface IPvLineDetailService extends IService<PvLineDetail> {
-
-
-    /**
-     * 新增监测点
-     * @param pvLineDetailParam 监测点实体
-     * @author cdf
-     * @date 2022/7/5
-     * @return boolean
-     */
-    boolean addLineDetail(PvLineDetailParam pvLineDetailParam);
-
-    /**
-     * 修改监测点
-     * @param updatePvLineDetailParam 监测点实体
-     * @author cdf
-     * @date 2022/7/5
-     * @return boolean
-     */
-    boolean updateLineDetail(PvLineDetailParam.UpdatePvLineDetailParam updatePvLineDetailParam);
-
-
-    /**
-     * 分页查询监测点
-     * @param lineDetailQueryParam 监测点实体
-     * @author cdf
-     * @date 2022/7/5
-     * @return Page<PvLineDetail>
-     */
-    Page<PvLineDetail> getPvLineDetailList(LineDetailQueryParam lineDetailQueryParam);
-
-    List<PvLineDetail> getAllPvLineDetailList();
-
-
-    /**
-     * 根据监测点id查询监测点
-     * @param id 监测点id
-     * @author cdf
-     * @date 2022/7/5
-     * @return PvLineDetail
-     */
-    PvLineDetail getPvLineDetailById(String id);
-
-    /**
-     * 删除监测点
-     * @param ids 监测点id
-     * @author cdf
-     * @date 2022/7/5
-     * @return boolean
-     */
-    boolean delPvLineDetail(List<String> ids);
-
-
-    /**
-     * 分页查询监测点
-     * @param subIds 变电站ids
-     * @param subAreaIds 台区ids
-     * @author cdf
-     * @date 2022/7/5
-     * @return Page<PvLineDetail>
-     */
-    Page<PvLineAllDetailVO> getPvLineAllDetailMain(Integer pageNum,Integer pageSize,List<String> subIds, List<String> subAreaIds,String type,Integer lineStatus);
-
-
-
-}
diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/IPvLvUserService.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/IPvLvUserService.java
deleted file mode 100644
index 17fe037e4..000000000
--- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/IPvLvUserService.java
+++ /dev/null
@@ -1,71 +0,0 @@
-package com.njcn.device.pms.service;
-
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.njcn.device.pms.pojo.param.LvUserQueryParam;
-import com.njcn.device.pms.pojo.param.PvLvUserParam;
-import com.njcn.device.pms.pojo.po.PvLvUser;
-import com.njcn.device.pms.pojo.vo.PvLvUserVO;
-
-import java.util.List;
-
-/**
- * <p>
- *  服务类
- * </p>
- *
- * @author cdf
- * @since 2022-07-05
- */
-public interface IPvLvUserService extends IService<PvLvUser> {
-
-
-    /**
-     * 新增分低压用户台账
-     * @param pvLvUserParam 分低压用户台账实体
-     * @author cdf
-     * @date 2022/7/5
-     * @return boolean
-     */
-    boolean addLvUser(PvLvUserParam pvLvUserParam);
-
-    /**
-     * 修改分低压用户台账
-     * @param updatePvLvUserParam 分低压用户台账实体
-     * @author cdf
-     * @date 2022/7/5
-     * @return boolean
-     */
-    boolean updateLvUser(PvLvUserParam.UpdatePvLvUserParam updatePvLvUserParam);
-
-
-    /**
-     * 分页查询分低压用户台账
-     * @param lvUserQueryParam 分低压用户台账实体
-     * @author cdf
-     * @date 2022/7/5
-     * @return Page<PvLvUser>
-     */
-    Page<PvLvUserVO> getPvLvUserList(LvUserQueryParam lvUserQueryParam);
-
-    List<PvLvUser> getAllPvLvUserList();
-
-
-    /**
-     * 根据分低压用户台账id查询分低压用户台账
-     * @param id 分低压用户台账id
-     * @author cdf
-     * @date 2022/7/5
-     * @return PvLvUser
-     */
-    PvLvUser getPvLvUserById(String id);
-
-    /**
-     * 删除分低压用户台账
-     * @param ids 分低压用户台账id
-     * @author cdf
-     * @date 2022/7/5
-     * @return boolean
-     */
-    boolean delPvLvUser(List<String> ids);
-}
diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/IPvSubAreaService.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/IPvSubAreaService.java
deleted file mode 100644
index 7102c5bd0..000000000
--- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/IPvSubAreaService.java
+++ /dev/null
@@ -1,71 +0,0 @@
-package com.njcn.device.pms.service;
-
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.njcn.device.pms.pojo.param.PvSubAreaParam;
-import com.njcn.device.pms.pojo.param.SubAreaQueryParam;
-import com.njcn.device.pms.pojo.po.PvSubArea;
-import com.njcn.device.pms.pojo.vo.PvSubAreaVO;
-
-import java.util.List;
-
-/**
- * <p>
- *  服务类
- * </p>
- *
- * @author cdf
- * @since 2022-07-05
- */
-public interface IPvSubAreaService extends IService<PvSubArea> {
-
-    /**
-     * 新增台区
-     * @param pvSubAreaParam 台区实体
-     * @author cdf
-     * @date 2022/7/5
-     * @return boolean
-     */
-    boolean addSubArea(PvSubAreaParam pvSubAreaParam);
-
-    /**
-     * 修改台区
-     * @param updatePvSubAreaParam 台区实体
-     * @author cdf
-     * @date 2022/7/5
-     * @return boolean
-     */
-    boolean updateSubArea(PvSubAreaParam.UpdatePvSubAreaParam updatePvSubAreaParam);
-
-
-    /**
-     * 分页查询台区
-     * @param subAreaQueryParam 台区实体
-     * @author cdf
-     * @date 2022/7/5
-     * @return Page<PvSubArea>
-     */
-    Page<PvSubAreaVO> getPvSubAreaList(SubAreaQueryParam subAreaQueryParam);
-
-    List<PvSubArea> getAllPvSubAreaList();
-
-
-    /**
-     * 根据台区id查询台区
-     * @param id 台区id
-     * @author cdf
-     * @date 2022/7/5
-     * @return PvSubArea
-     */
-    PvSubArea getPvSubAreaById(String id);
-
-    /**
-     * 删除台区
-     * @param ids 台区id
-     * @author cdf
-     * @date 2022/7/5
-     * @return boolean
-     */
-    boolean delPvSubArea(List<String> ids);
-
-}
diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/IPvSubstationService.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/IPvSubstationService.java
deleted file mode 100644
index fae181cd8..000000000
--- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/IPvSubstationService.java
+++ /dev/null
@@ -1,71 +0,0 @@
-package com.njcn.device.pms.service;
-
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.njcn.device.pms.pojo.param.PvSubstationParam;
-import com.njcn.device.pms.pojo.param.SubstationQueryParam;
-import com.njcn.device.pms.pojo.po.PvSubstation;
-import com.njcn.device.pms.pojo.vo.PvSubstationVO;
-
-import java.util.List;
-
-/**
- * <p>
- *  服务类
- * </p>
- *
- * @author cdf
- * @since 2022-07-05
- */
-public interface IPvSubstationService extends IService<PvSubstation> {
-
-    /**
-     * 新增变电站
-     * @param pvSubstationParam 变电站实体
-     * @author cdf
-     * @date 2022/7/5
-     * @return boolean
-     */
-    boolean addSubstation(PvSubstationParam pvSubstationParam);
-
-    /**
-     * 修改变电站
-     * @param updatePvSubstationParam 变电站实体
-     * @author cdf
-     * @date 2022/7/5
-     * @return boolean
-     */
-    boolean updateSubstation(PvSubstationParam.UpdatePvSubstationParam updatePvSubstationParam);
-
-
-    /**
-     * 分页查询变电站
-     * @param substationQueryParam 变电站实体
-     * @author cdf
-     * @date 2022/7/5
-     * @return Page<PvSubstation>
-     */
-    Page<PvSubstationVO> getPvSubstationList(SubstationQueryParam substationQueryParam);
-
-    List<PvSubstation> getAllPvSubstationList();
-
-
-    /**
-     * 根据变电站id查询变电站
-     * @param id 变电站id
-     * @author cdf
-     * @date 2022/7/5
-     * @return PvSubstation
-     */
-    PvSubstation getPvSubstationById(String id);
-
-    /**
-     * 删除变电站
-     * @param ids 变电站id
-     * @author cdf
-     * @date 2022/7/5
-     * @return boolean
-     */
-    boolean delPvSubstation(List<String> ids);
-
-}
diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/IPvTenVoltageService.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/IPvTenVoltageService.java
deleted file mode 100644
index d37a66d0e..000000000
--- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/IPvTenVoltageService.java
+++ /dev/null
@@ -1,78 +0,0 @@
-package com.njcn.device.pms.service;
-
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.njcn.device.pms.pojo.param.PvTenVoltageParam;
-import com.njcn.device.pms.pojo.param.TenVoltageQueryParam;
-import com.njcn.device.pms.pojo.po.PvTenVoltage;
-import com.njcn.device.pms.pojo.vo.PvTenVoltageVO;
-
-import java.util.List;
-
-/**
- * <p>
- *  十千伏线路服务类
- * </p>
- *
- * @author cdf
- * @since 2022-07-05
- */
-public interface IPvTenVoltageService extends IService<PvTenVoltage> {
-
-
-    /**
-     * 新增10kV线路
-     * @param pvTenVoltageParam 10kV线路实体
-     * @author cdf
-     * @date 2022/7/5
-     * @return boolean
-     */
-    boolean addTenVoltage(PvTenVoltageParam pvTenVoltageParam);
-
-    /**
-     * 修改10kV线路
-     * @param updatePvTenVoltageParam 10kV线路实体
-     * @author cdf
-     * @date 2022/7/5
-     * @return boolean
-     */
-    boolean updateTenVoltage(PvTenVoltageParam.UpdatePvTenVoltageParam updatePvTenVoltageParam);
-
-
-    /**
-     * 分页查询10kV线路
-     * @param tenVoltageQueryParam 10kV线路实体
-     * @author cdf
-     * @date 2022/7/5
-     * @return Page<PvTenVoltage>
-     */
-    Page<PvTenVoltageVO> getPvTenVoltageList(TenVoltageQueryParam tenVoltageQueryParam);
-
-    /**
-     * 分页查询10kV线路
-     * @author cdf
-     * @date 2022/7/5
-     * @return List<PvTenVoltage>
-     */
-    List<PvTenVoltage> getAllPvTenVoltageList();
-
-
-    /**
-     * 根据10kV线路id查询10kV线路
-     * @param id 10kV线路id
-     * @author cdf
-     * @date 2022/7/5
-     * @return PvTenVoltage
-     */
-    PvTenVoltage getPvTenVoltageById(String id);
-
-    /**
-     * 删除10kV线路
-     * @param ids 10kV线路id
-     * @author cdf
-     * @date 2022/7/5
-     * @return boolean
-     */
-    boolean delPvTenVoltage(List<String> ids);
-
-}
diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/IPvUnitService.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/IPvUnitService.java
deleted file mode 100644
index 746bae9ad..000000000
--- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/IPvUnitService.java
+++ /dev/null
@@ -1,70 +0,0 @@
-package com.njcn.device.pms.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.njcn.device.pms.pojo.param.PvUnitParam;
-import com.njcn.device.pms.pojo.po.PvUnit;
-import com.njcn.device.pms.pojo.vo.UnitTreeVO;
-import com.njcn.web.pojo.param.BaseParam;
-
-import java.util.List;
-
-/**
- * <p>
- *  单位服务类
- * </p>
- *
- * @author cdf
- * @since 2022-07-05
- */
-public interface IPvUnitService extends IService<PvUnit> {
-
-    /**
-     * 新增单位
-     * @param pvUnitParam 单位实体
-     * @author cdf
-     * @date 2022/7/5
-     * @return boolean
-     */
-   boolean addUnit(PvUnitParam pvUnitParam);
-
-    /**
-     * 修改单位
-     * @param updatePvUnitParam 单位实体
-     * @author cdf
-     * @date 2022/7/5
-     * @return boolean
-     */
-    boolean updateUnit(PvUnitParam.UpdatePvUnitParam updatePvUnitParam);
-
-
-    /**
-     * 查询树形结构单位
-     * @param baseParam 单位实体
-     * @author cdf
-     * @date 2022/7/5
-     * @return Page<PvUnit>
-     */
-    List<UnitTreeVO> getPvUnitList(BaseParam baseParam);
-
-
-
-
-    /**
-     * 根据单位id查询单位
-     * @param id 单位id
-     * @author cdf
-     * @date 2022/7/5
-     * @return PvUnit
-     */
-    PvUnit getPvUnitById(String id);
-
-    /**
-     * 删除单位
-     * @param id 单位id
-     * @author cdf
-     * @date 2022/7/5
-     * @return boolean
-     */
-    boolean delPvUnit(String id);
-
-}
diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/IPvVoltageService.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/IPvVoltageService.java
deleted file mode 100644
index 5bf2645ca..000000000
--- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/IPvVoltageService.java
+++ /dev/null
@@ -1,70 +0,0 @@
-package com.njcn.device.pms.service;
-
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.njcn.device.pms.pojo.param.PvVoltageParam;
-import com.njcn.device.pms.pojo.param.VoltageQueryParam;
-import com.njcn.device.pms.pojo.po.PvVoltage;
-
-import java.util.List;
-
-/**
- * <p>
- *  服务类
- * </p>
- *
- * @author cdf
- * @since 2022-07-05
- */
-public interface IPvVoltageService extends IService<PvVoltage> {
-
-
-    /**
-     * 新增母线
-     * @param pvVoltageParam 母线实体
-     * @author cdf
-     * @date 2022/7/5
-     * @return boolean
-     */
-    boolean addVoltage(PvVoltageParam pvVoltageParam);
-
-    /**
-     * 修改母线
-     * @param updatePvVoltageParam 母线实体
-     * @author cdf
-     * @date 2022/7/5
-     * @return boolean
-     */
-    boolean updateVoltage(PvVoltageParam.UpdatePvVoltageParam updatePvVoltageParam);
-
-
-    /**
-     * 分页查询母线
-     * @param voltageQueryParam 母线实体
-     * @author cdf
-     * @date 2022/7/5
-     * @return Page<PvVoltage>
-     */
-    Page<PvVoltage> getPvVoltageList(VoltageQueryParam voltageQueryParam);
-
-    List<PvVoltage> getAllPvVoltageList();
-
-
-    /**
-     * 根据母线id查询母线
-     * @param id 母线id
-     * @author cdf
-     * @date 2022/7/5
-     * @return PvVoltage
-     */
-    PvVoltage getPvVoltageById(String id);
-
-    /**
-     * 删除母线
-     * @param id 母线id
-     * @author cdf
-     * @date 2022/7/5
-     * @return boolean
-     */
-    boolean delPvVoltage(String id);
-}
diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/IPwMonitorService.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/IPwMonitorService.java
new file mode 100644
index 000000000..748d3ec7d
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/IPwMonitorService.java
@@ -0,0 +1,22 @@
+package com.njcn.device.pms.service;
+
+import com.njcn.device.pms.pojo.dto.PwPmsMonitorDTO;
+import com.njcn.device.pms.pojo.param.PwPmsMonitorParam;
+
+import java.util.List;
+
+/**
+ * @author yzh
+ * @date 2022/10/28
+ */
+
+public interface IPwMonitorService {
+
+    /**
+     * 获取配网所有监测点信息
+     * @author yzh
+     * @param pwPmsMonitorParam 参数条件
+     * @return 配网所有监测点信息
+     */
+    List<PwPmsMonitorDTO> getPwMonitorList(PwPmsMonitorParam pwPmsMonitorParam);
+}
diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/ISourceManagementService.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/ISourceManagementService.java
new file mode 100644
index 000000000..b708714bc
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/ISourceManagementService.java
@@ -0,0 +1,16 @@
+package com.njcn.device.pms.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.njcn.device.pms.pojo.po.SourceManagement;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author hongawen
+ * @since 2022-10-14
+ */
+public interface ISourceManagementService extends IService<SourceManagement> {
+
+}
diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/IStatationStatService.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/IStatationStatService.java
new file mode 100644
index 000000000..70507e5cb
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/IStatationStatService.java
@@ -0,0 +1,77 @@
+package com.njcn.device.pms.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.njcn.device.pms.pojo.dto.PmsStatationStatInfoDTO;
+import com.njcn.device.pms.pojo.param.StatationStatParam;
+import com.njcn.device.pms.pojo.param.PmsStatationStatInfoParam;
+import com.njcn.device.pms.pojo.po.StatationStat;
+import com.njcn.device.pms.pojo.po.StatationStat;
+import com.njcn.web.pojo.param.BaseParam;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 服务类
+ * </p>
+ *
+ * @author hongawen
+ * @since 2022-10-14
+ */
+public interface IStatationStatService extends IService<StatationStat> {
+
+    /**
+     * 获取指定的变电站信息
+     *
+     * @param pmsStatationStatInfoParam 变电站详情数据入参
+     * @return 指定的变电站信息
+     */
+    List<PmsStatationStatInfoDTO> getStatationStatInfo(PmsStatationStatInfoParam pmsStatationStatInfoParam);
+
+
+
+    /**
+     * 新增电站
+     * @author cdf
+     * @date 2022/10/25
+     * @param statationStatParam 电站
+     * @return boolean
+     */
+    boolean addStatationStat(StatationStatParam statationStatParam);
+
+    /**
+     * 修改电站
+     * @author cdf
+     * @date 2022/10/25
+     * @param statationStatParam 电站
+     * @return boolean
+     */
+    boolean updateStatationStat(StatationStatParam statationStatParam);
+
+    /**
+     * 删除电站
+     * @author cdf
+     * @date 2022/10/25
+     * @param statationStatIds 电站
+     * @return boolean
+     */
+    boolean delStatationStat(List<String> statationStatIds);
+
+    /**
+     * 查询电站
+     * @author cdf
+     * @date 2022/10/25
+     * @param statationStatId 电站id
+     * @return boolean
+     */
+    StatationStat getStatationStatById(String statationStatId);
+
+    /**
+     * 查询电站列表
+     * @author cdf
+     * @date 2022/10/25
+     * @param baseParam 基础参数
+     * @return boolean
+     */
+    List<StatationStat> getStatationStatList(BaseParam baseParam);
+}
diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/IStatisticsRunMonitorService.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/IStatisticsRunMonitorService.java
new file mode 100644
index 000000000..b0570ae80
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/IStatisticsRunMonitorService.java
@@ -0,0 +1,16 @@
+package com.njcn.device.pms.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.njcn.device.pms.pojo.po.StatisticsRunMonitor;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author hongawen
+ * @since 2022-10-14
+ */
+public interface IStatisticsRunMonitorService extends IService<StatisticsRunMonitor> {
+
+}
diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/ITerminalEliminateDataService.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/ITerminalEliminateDataService.java
new file mode 100644
index 000000000..9c0827e35
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/ITerminalEliminateDataService.java
@@ -0,0 +1,16 @@
+package com.njcn.device.pms.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.njcn.device.pms.pojo.po.TerminalEliminateData;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author hongawen
+ * @since 2022-10-14
+ */
+public interface ITerminalEliminateDataService extends IService<TerminalEliminateData> {
+
+}
diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/ITerminalService.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/ITerminalService.java
new file mode 100644
index 000000000..3fcb9be6c
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/ITerminalService.java
@@ -0,0 +1,50 @@
+package com.njcn.device.pms.service;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.njcn.device.pms.pojo.param.PmsTerminalParam;
+import com.njcn.device.pms.pojo.po.Terminal;
+import com.njcn.device.pms.pojo.vo.PmsTerminalVO;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author hongawen
+ * @since 2022-10-14
+ */
+public interface ITerminalService extends IService<Terminal> {
+
+    /**
+     * 查询所有
+     * @param queryParam
+     * @return
+     */
+    Page<PmsTerminalVO> getTerminalList(PmsTerminalParam.QueryParam queryParam);
+
+    /**
+     * 根据id查询
+     * @return
+     */
+    Terminal getTerminalById(String id);
+
+    /**
+     * 新增
+     */
+    boolean add(PmsTerminalParam terminalParam);
+
+    /**
+     * 修改
+     * @param
+     */
+    boolean update(PmsTerminalParam updateParam);
+
+    /**
+     * 删除
+     * @param ids ids
+     */
+    boolean delete(List<String> ids);
+}
diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/ITractionStationService.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/ITractionStationService.java
new file mode 100644
index 000000000..9c3bd1254
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/ITractionStationService.java
@@ -0,0 +1,49 @@
+package com.njcn.device.pms.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.njcn.device.pms.pojo.param.TractionStationParam;
+import com.njcn.device.pms.pojo.po.TractionStation;
+import com.njcn.web.pojo.param.BaseParam;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author hongawen
+ * @since 2022-10-14
+ */
+public interface ITractionStationService extends IService<TractionStation> {
+
+    /**
+     * 查询牵引站列表
+     * @return boolean
+     */
+    List<TractionStation> getTractionStationList(BaseParam baseParam);
+
+    /**
+     * 查询牵引站
+     * @return boolean
+     */
+    TractionStation getTractionStationById(String tractionStationId);
+
+    /**
+     * 新增
+     */
+    boolean add(TractionStationParam tractionStationParam);
+
+    /**
+     * 修改
+     * @param
+     */
+    boolean update(TractionStationParam updateParam);
+
+    /**
+     * 删除
+     * @param ids ids
+     */
+    boolean delete(List<String> ids);
+
+}
diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/ITransientStasticDataService.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/ITransientStasticDataService.java
new file mode 100644
index 000000000..b097fa90f
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/ITransientStasticDataService.java
@@ -0,0 +1,16 @@
+package com.njcn.device.pms.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.njcn.device.pms.pojo.po.TransientStasticData;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author hongawen
+ * @since 2022-10-14
+ */
+public interface ITransientStasticDataService extends IService<TransientStasticData> {
+
+}
diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/ITreatTransientDetailDataService.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/ITreatTransientDetailDataService.java
new file mode 100644
index 000000000..90ed93dad
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/ITreatTransientDetailDataService.java
@@ -0,0 +1,16 @@
+package com.njcn.device.pms.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.njcn.device.pms.pojo.po.TreatTransientDetailData;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author hongawen
+ * @since 2022-10-14
+ */
+public interface ITreatTransientDetailDataService extends IService<TreatTransientDetailData> {
+
+}
diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/PvTerminalBaseService.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/PvTerminalBaseService.java
deleted file mode 100644
index 697deb868..000000000
--- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/PvTerminalBaseService.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package com.njcn.device.pms.service;
-
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.njcn.device.pms.pojo.param.PvTerminalBaseQuery;
-import com.njcn.device.pms.pojo.vo.DisOrLvVO;
-import com.njcn.device.pms.pojo.vo.PvLineAllDetailVO;
-import com.njcn.user.pojo.vo.PvTerminalTreeVO;
-
-import java.util.List;
-
-/**
- * pqs
- *
- * @author cdf
- * @date 2022/7/11
- */
-public interface PvTerminalBaseService {
-
-    /**
-     * 获取设备树
-     * @author cdf
-     * @date 2022/7/11
-     */
-    List<PvTerminalTreeVO> pvTerminalTree();
-
-
-    /**
-     * 点击变电站台区展示监测点详情
-     * @author cdf
-     * @date 2022/7/11
-     */
-    Page<PvLineAllDetailVO> lineDetailBySubId(PvTerminalBaseQuery pvTerminalBaseQuery);
-
-    /**
-     *
-     * @author cdf
-     * @date 2022/7/28
-     */
-    DisOrLvVO pvDisOrLv(String userCode,Integer userCodeType);
-
-}
diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/RMpMonitorAlarmCountMService.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/RMpMonitorAlarmCountMService.java
new file mode 100644
index 000000000..f04661dca
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/RMpMonitorAlarmCountMService.java
@@ -0,0 +1,18 @@
+package com.njcn.device.pms.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.njcn.device.pms.pojo.param.RMpMonitorAlarmCountMParam;
+import com.njcn.device.pms.pojo.po.RMpMonitorAlarmCountM;
+import com.njcn.device.pms.pojo.vo.RMpMonitorAlarmCountMVO;
+
+import java.util.List;
+
+/**
+* @author jianghf
+* @description 针对表【r_mp_monitor_alarm_count_m】的数据库操作Service
+* @createDate 2022-10-12 20:08:33
+*/
+public interface RMpMonitorAlarmCountMService extends IService<RMpMonitorAlarmCountM> {
+
+    List<RMpMonitorAlarmCountMVO> getRMpMonitorAlarmCountMList(RMpMonitorAlarmCountMParam rMpMonitorAlarmCountMParam);
+}
diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/RMpPwAlarmDetailDService.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/RMpPwAlarmDetailDService.java
new file mode 100644
index 000000000..0f82dcb0c
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/RMpPwAlarmDetailDService.java
@@ -0,0 +1,13 @@
+package com.njcn.device.pms.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.njcn.device.pms.pojo.po.RMpPwAlarmDetailD;
+
+/**
+* @author jianghf
+* @description 针对表【r_mp_pw_alarm_detail_d】的数据库操作Service
+* @createDate 2022-10-17 09:00:27
+*/
+public interface RMpPwAlarmDetailDService extends IService<RMpPwAlarmDetailD> {
+
+}
diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/RMpTargetWarnDService.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/RMpTargetWarnDService.java
new file mode 100644
index 000000000..0a65aa046
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/RMpTargetWarnDService.java
@@ -0,0 +1,13 @@
+package com.njcn.device.pms.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.njcn.device.pms.pojo.po.RMpTargetWarnD;
+
+/**
+* @author jianghf
+* @description 针对表【r_mp_target_warn_d】的数据库操作Service
+* @createDate 2022-10-17 10:20:11
+*/
+public interface RMpTargetWarnDService extends IService<RMpTargetWarnD> {
+
+}
diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/RStatAreaAlarmCountMService.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/RStatAreaAlarmCountMService.java
new file mode 100644
index 000000000..ddddfdcdf
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/RStatAreaAlarmCountMService.java
@@ -0,0 +1,25 @@
+package com.njcn.device.pms.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.njcn.device.pms.pojo.param.RStatAreaAlarmCountMParam;
+import com.njcn.device.pms.pojo.po.RStatAreaAlarmCountM;
+import com.njcn.device.pms.pojo.vo.RStatAreaAlarmCountMVO;
+
+import java.util.List;
+
+/**
+* @author jianghf
+* @description 针对表【r_stat_area_alarm_count_m】的数据库操作Service
+* @createDate 2022-10-10 14:36:46
+*/
+public interface RStatAreaAlarmCountMService extends IService<RStatAreaAlarmCountM> {
+
+    /***
+     * 根据条件查询所有区域告警统计(月)
+     * @author jianghaifei
+     * @date 2022-10-10 15:20
+     * @param rStatAreaAlarmCountMParam
+     * @return java.util.List<com.njcn.device.pms.pojo.vo.RStatAreaAlarmCountMVO>
+     */
+    List<RStatAreaAlarmCountMVO> getAllRStatAreaAlarmCountMList(RStatAreaAlarmCountMParam rStatAreaAlarmCountMParam);
+}
diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/RStatBusbarHarmonicService.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/RStatBusbarHarmonicService.java
new file mode 100644
index 000000000..edf8bdfef
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/RStatBusbarHarmonicService.java
@@ -0,0 +1,27 @@
+package com.njcn.device.pms.service;
+
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.njcn.device.pms.pojo.param.UniversalFrontEndParam;
+import com.njcn.device.pms.pojo.vo.RStatBusbarHarmonicVO;
+
+import java.util.List;
+
+/**
+ * 变电站母线电压指标年报业务层接口
+ *
+ * @author yzh
+ * @date 2022/10/8
+ */
+
+public interface RStatBusbarHarmonicService extends IService<RStatBusbarHarmonicVO> {
+
+    /**
+     * 获取变电站母线电压指标年报
+     *
+     * @param param 前端参数
+     * @return 变电站母线电压指标年报返回前端实体类
+     */
+    List<RStatBusbarHarmonicVO> getRStatBusbarHarmonic(UniversalFrontEndParam param);
+
+}
diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/RStatZwAlarmCountWService.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/RStatZwAlarmCountWService.java
new file mode 100644
index 000000000..23ca1ed5b
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/RStatZwAlarmCountWService.java
@@ -0,0 +1,36 @@
+package com.njcn.device.pms.service;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.njcn.device.pms.pojo.param.RStatZwAlarmCountWParam;
+import com.njcn.device.pms.pojo.po.RStatZwAlarmCountW;
+import com.njcn.device.pms.pojo.vo.ProblemMonitorDetailVO;
+import com.njcn.device.pms.pojo.vo.RStatZwAlarmCountWVO;
+
+import java.util.List;
+
+/**
+* @author jianghf
+* @description 针对表【r_stat_zw_alarm_count_w】的数据库操作Service
+* @createDate 2022-10-08 16:35:44
+*/
+public interface RStatZwAlarmCountWService extends IService<RStatZwAlarmCountW> {
+
+    /***
+     * 根据条件查询所有告警统计(周)
+     * @author jianghaifei
+     * @date 2022-10-10 10:57
+     * @param rStatZwAlarmCountWParam
+     * @return java.util.List<com.njcn.device.pms.pojo.vo.RStatZwAlarmCountWVO>
+     */
+    List<RStatZwAlarmCountWVO> getAllRStatZwAlarmCountWList(RStatZwAlarmCountWParam rStatZwAlarmCountWParam);
+
+    /***
+     * 查询问题严重的监测点信息
+     * @author jianghaifei
+     * @date 2022-10-13 19:38
+     * @param rStatZwAlarmCountWParam
+     * @return java.util.List<com.njcn.device.pms.pojo.vo.ProblemMonitorDetailVO>
+     */
+    List<ProblemMonitorDetailVO> getProblemMonitorDetailList(RStatZwAlarmCountWParam rStatZwAlarmCountWParam);
+}
diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/RmpEventDetailService.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/RmpEventDetailService.java
new file mode 100644
index 000000000..1226f7ade
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/RmpEventDetailService.java
@@ -0,0 +1,24 @@
+package com.njcn.device.pms.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.njcn.device.pms.pojo.param.UniversalFrontEndParam;
+import com.njcn.device.pms.pojo.vo.RmpEventDetailVO;
+
+import java.util.List;
+
+/**
+ * 暂态事件明细
+ *
+ * @author yzh
+ * @date 2022/10/12
+ */
+
+public interface RmpEventDetailService extends IService<RmpEventDetailVO> {
+
+    /**
+     * 获取暂态事件明细
+     * @param param 前端参数
+     * @return 暂态事件明细
+     */
+    List<RmpEventDetailVO> getRmpEventDetail(UniversalFrontEndParam param);
+}
diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/impl/DistributionMonitorServiceImpl.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/impl/DistributionMonitorServiceImpl.java
new file mode 100644
index 000000000..dea2ac10d
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/impl/DistributionMonitorServiceImpl.java
@@ -0,0 +1,33 @@
+package com.njcn.device.pms.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.njcn.device.pms.mapper.*;
+import com.njcn.device.pms.pojo.dto.PmsMonitorBaseDTO;
+import com.njcn.device.pms.pojo.param.PmsDeviceInfoParam;
+import com.njcn.device.pms.pojo.po.DistributionMonitor;
+import com.njcn.device.pms.service.IDistributionMonitorService;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author hongawen
+ * @since 2022-10-14
+ */
+@Service
+@RequiredArgsConstructor
+@Slf4j
+public class DistributionMonitorServiceImpl extends ServiceImpl<DistributionMonitorMapper, DistributionMonitor> implements IDistributionMonitorService {
+
+
+    @Override
+    public List<PmsMonitorBaseDTO> getMonitorByCondition(List<String> deptIdList, PmsDeviceInfoParam pmsDeviceInfoParam) {
+        return this.baseMapper.getIdByOrgId(deptIdList,pmsDeviceInfoParam);
+    }
+}
diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/impl/GeneratrixWireImpl.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/impl/GeneratrixWireImpl.java
new file mode 100644
index 000000000..df1f7caee
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/impl/GeneratrixWireImpl.java
@@ -0,0 +1,53 @@
+package com.njcn.device.pms.service.impl;
+
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.njcn.device.pms.mapper.GeneratrixWireMapper;
+import com.njcn.device.pms.pojo.param.GeneratrixWireParam;
+import com.njcn.device.pms.pojo.po.GeneratrixWire;
+import com.njcn.device.pms.service.IGeneratrixWireService;
+import com.njcn.web.pojo.param.BaseParam;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Service;
+import java.util.List;
+
+/**
+ * pms-device
+ *
+ * @author cdf
+ * @date 2022/10/26
+ */
+@Service
+@RequiredArgsConstructor
+public class GeneratrixWireImpl extends ServiceImpl<GeneratrixWireMapper, GeneratrixWire> implements IGeneratrixWireService {
+
+    @Override
+    public boolean addGeneratrixWire(GeneratrixWireParam generatrixWireParam) {
+        GeneratrixWire generatrixWire = new GeneratrixWire();
+        BeanUtils.copyProperties(generatrixWireParam, generatrixWire);
+        return this.save(generatrixWire);
+    }
+
+    @Override
+    public boolean updateGeneratrixWire(GeneratrixWireParam.UpdateGeneratrixWireParam generatrixWireParam) {
+        GeneratrixWire generatrixWire = new GeneratrixWire();
+        BeanUtils.copyProperties(generatrixWireParam, generatrixWire);
+        return this.save(generatrixWire);
+    }
+
+    @Override
+    public boolean delGeneratrixWire(List<String> generatrixWireIds) {
+        return this.removeByIds(generatrixWireIds);
+    }
+
+    @Override
+    public GeneratrixWire getGeneratrixWireById(String generatrixWireId) {
+        return this.getById(generatrixWireId);
+    }
+
+    @Override
+    public List<GeneratrixWire> getGeneratrixWireList(BaseParam baseParam) {
+        return this.list();
+    }
+}
diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/impl/HarmonicGeneralManagementDataServiceImpl.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/impl/HarmonicGeneralManagementDataServiceImpl.java
new file mode 100644
index 000000000..3b3eaf84d
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/impl/HarmonicGeneralManagementDataServiceImpl.java
@@ -0,0 +1,20 @@
+package com.njcn.device.pms.service.impl;
+
+import com.njcn.device.pms.mapper.HarmonicGeneralManagementDataMapper;
+import com.njcn.device.pms.pojo.po.HarmonicGeneralManagementData;
+import com.njcn.device.pms.service.IHarmonicGeneralManagementDataService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author hongawen
+ * @since 2022-10-14
+ */
+@Service
+public class HarmonicGeneralManagementDataServiceImpl extends ServiceImpl<HarmonicGeneralManagementDataMapper, HarmonicGeneralManagementData> implements IHarmonicGeneralManagementDataService {
+
+}
diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/impl/HarmonicGeneralManagementServiceImpl.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/impl/HarmonicGeneralManagementServiceImpl.java
new file mode 100644
index 000000000..cfac36ad4
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/impl/HarmonicGeneralManagementServiceImpl.java
@@ -0,0 +1,20 @@
+package com.njcn.device.pms.service.impl;
+
+import com.njcn.device.pms.mapper.HarmonicGeneralManagementMapper;
+import com.njcn.device.pms.pojo.po.HarmonicGeneralManagement;
+import com.njcn.device.pms.service.IHarmonicGeneralManagementService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author hongawen
+ * @since 2022-10-14
+ */
+@Service
+public class HarmonicGeneralManagementServiceImpl extends ServiceImpl<HarmonicGeneralManagementMapper, HarmonicGeneralManagement> implements IHarmonicGeneralManagementService {
+
+}
diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/impl/IPwMonitorServiceImpl.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/impl/IPwMonitorServiceImpl.java
new file mode 100644
index 000000000..54c6a52db
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/impl/IPwMonitorServiceImpl.java
@@ -0,0 +1,88 @@
+package com.njcn.device.pms.service.impl;
+
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.collection.CollectionUtil;
+import com.njcn.device.pms.mapper.PwMonitorMapper;
+import com.njcn.device.pms.pojo.dto.PmsGeneralDeviceDTO;
+import com.njcn.device.pms.pojo.dto.PwPmsMonitorDTO;
+import com.njcn.device.pms.pojo.param.PwPmsMonitorParam;
+import com.njcn.device.pms.service.IPwMonitorService;
+import com.njcn.user.api.DeptFeignClient;
+import com.njcn.user.pojo.dto.DeptDTO;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+/**
+ * 配网监测点信息
+ *
+ * @author yzh
+ * @date 2022/10/28
+ */
+
+@Slf4j
+@Service
+@RequiredArgsConstructor
+public class IPwMonitorServiceImpl implements IPwMonitorService {
+
+    private final DeptFeignClient deptFeignClient;
+
+    private final PwMonitorMapper pwMonitorMapper;
+
+    /**
+     * 获取配网所有监测点信息
+     *
+     * @param pwPmsMonitorParam 参数条件
+     * @return 配网所有监测点信息
+     */
+    @Override
+    public List<PwPmsMonitorDTO> getPwMonitorList(PwPmsMonitorParam pwPmsMonitorParam) {
+        //定义待返回终端信息
+        List<PwPmsMonitorDTO> pwPmsMonitorDTOS = new ArrayList<>();
+        List<DeptDTO> deptInfos = deptFeignClient.getDeptDescendantIndexes(pwPmsMonitorParam.getOrgId(), Stream.of(0, 1).collect(Collectors.toList())).getData();
+        // 过滤出传入id的子单位id
+        List<DeptDTO> directDeptInfos = deptInfos.stream()
+                .filter(deptDTO -> deptDTO.getPid().equals(pwPmsMonitorParam.getOrgId()))
+                .collect(Collectors.toList());
+
+        if (CollectionUtil.isEmpty(directDeptInfos)) {
+            //没有直接子部门，获取当前部门所有信息
+            List<DeptDTO> dept = deptInfos.stream()
+                    .filter(deptDTO -> deptDTO.getId().equals(pwPmsMonitorParam.getOrgId()))
+                    .collect(Collectors.toList());
+            //获取monitor详细数据
+            pwPmsMonitorDTOS = pwMonitorMapper.getPwMonitorDataList(Collections.singletonList(dept.get(0).getId()), pwPmsMonitorParam);
+
+            if (CollUtil.isEmpty(pwPmsMonitorDTOS)) {
+                PwPmsMonitorDTO pwPmsMonitorDTO = new PwPmsMonitorDTO();
+                pwPmsMonitorDTO.setOrgId(dept.get(0).getId());
+                pwPmsMonitorDTO.setOrgName(dept.get(0).getArea());
+                pwPmsMonitorDTOS.add(pwPmsMonitorDTO);
+            }
+        } else {
+            // 遍历子单位id
+            for (DeptDTO deptDTO : directDeptInfos) {
+                // 与全部单位id比较，取出上级为子单位id的集合
+                List<DeptDTO> descendantDeptDTO = deptInfos.stream()
+                        .filter(d -> d.getPids().contains(deptDTO.getId()))
+                        .collect(Collectors.toList());
+                //形成需要查询监测点的部门索引
+                List<String> deptIdList = descendantDeptDTO.stream()
+                        .map(DeptDTO::getId)
+                        .distinct()
+                        .collect(Collectors.toList());
+                deptIdList.add(deptDTO.getId());
+                List<PwPmsMonitorDTO> pwMonitorDataList = pwMonitorMapper.getPwMonitorDataList(deptIdList, pwPmsMonitorParam);
+                pwPmsMonitorDTOS.addAll(pwMonitorDataList);
+            }
+        }
+        return pwPmsMonitorDTOS;
+    }
+}
+
diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/impl/MonitorServiceImpl.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/impl/MonitorServiceImpl.java
new file mode 100644
index 000000000..46319ac88
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/impl/MonitorServiceImpl.java
@@ -0,0 +1,259 @@
+package com.njcn.device.pms.service.impl;
+
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.collection.CollectionUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.njcn.common.pojo.dto.SimpleDTO;
+import com.njcn.common.pojo.enums.common.DataStateEnum;
+import com.njcn.common.pojo.exception.BusinessException;
+import com.njcn.device.pms.enums.PmsDeviceResponseEnum;
+import com.njcn.device.pms.mapper.MonitorMapper;
+import com.njcn.device.pms.pojo.dto.*;
+import com.njcn.device.pms.mapper.OverlimitMapper;
+import com.njcn.device.pms.mapper.GeneratrixWireMapper;
+import com.njcn.device.pms.mapper.PmsGeneratrixMapper;
+import com.njcn.device.pms.pojo.dto.PmsMonitorBaseDTO;
+import com.njcn.device.pms.pojo.dto.PmsMonitorDTO;
+import com.njcn.device.pms.pojo.dto.PmsMonitorInfoDTO;
+import com.njcn.device.pms.pojo.param.MonitorParam;
+import com.njcn.device.pms.pojo.param.PmsDeviceInfoParam;
+import com.njcn.device.pms.pojo.param.PmsMonitorInfoParam;
+import com.njcn.device.pms.pojo.param.PmsMonitorParam;
+import com.njcn.device.pms.pojo.param.PwPmsMonitorParam;
+import com.njcn.device.pms.pojo.po.Generatrix;
+import com.njcn.device.pms.pojo.po.GeneratrixWire;
+import com.njcn.device.pms.pojo.po.Monitor;
+import com.njcn.device.pms.pojo.vo.PmsMonitorVO;
+import com.njcn.device.pms.service.IMonitorService;
+import com.njcn.user.api.DeptFeignClient;
+import com.njcn.user.pojo.dto.DeptDTO;
+import com.njcn.device.pq.pojo.po.Overlimit;
+import com.njcn.system.api.DicDataFeignClient;
+import com.njcn.system.enums.SystemResponseEnum;
+import com.njcn.system.pojo.po.DictData;
+import com.njcn.user.api.DeptFeignClient;
+import com.njcn.user.pojo.po.Dept;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang.StringUtils;
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Objects;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+/**
+ * <p>
+ * 服务实现类
+ * </p>
+ *
+ * @author hongawen
+ * @since 2022-10-14
+ */
+@Slf4j
+@Service
+@RequiredArgsConstructor
+public class MonitorServiceImpl extends ServiceImpl<MonitorMapper, Monitor> implements IMonitorService {
+
+    private final MonitorMapper monitorMapper;
+
+    private final OverlimitMapper overlimitMapper;
+
+    private final DicDataFeignClient dicDataFeignClient;
+
+    private final DeptFeignClient deptFeignClient;
+
+    private final PmsGeneratrixMapper generatrixMapper;
+
+    private final GeneratrixWireMapper generatrixWireMapper;
+
+
+    @Override
+    public List<PmsMonitorBaseDTO> getMonitorByCondition(List<String> deptIdList, PmsDeviceInfoParam pmsDeviceInfoParam) {
+        return this.baseMapper.getMonitorByCondition(deptIdList, pmsDeviceInfoParam);
+    }
+
+    /**
+     * 获取指定的监测点信息
+     *
+     * @param pmsMonitorInfoParam 获取监测点详情数据入参
+     * @return 指定的监测点信息
+     */
+    @Override
+    public List<PmsMonitorInfoDTO> getMonitorInfo(PmsMonitorInfoParam pmsMonitorInfoParam) {
+        return monitorMapper.getMonitorInfo(pmsMonitorInfoParam);
+    }
+
+    /***
+     * 根据条件获取监测点列表（包含监测点所有信息）
+     * @author jianghaifei
+     * @date 2022-10-20 20:29
+     * @param pmsMonitorParam
+     * @return java.util.List<com.njcn.device.pms.pojo.dto.PmsMonitorDTO>
+     */
+    @Override
+    public List<PmsMonitorDTO> getMonitorInfoListByCond(PmsMonitorParam pmsMonitorParam) {
+        LambdaQueryWrapper<Monitor> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+        //组装条件：org_id in (orgIds) and id in (monitorIds) and name like "%monitorName%"
+        //            and voltage_Level in (voltageLevels)
+        lambdaQueryWrapper.in(CollUtil.isNotEmpty(pmsMonitorParam.getOrgIds()), Monitor::getOrgId, pmsMonitorParam.getOrgIds())
+                .in(CollUtil.isNotEmpty(pmsMonitorParam.getMonitorIds()), Monitor::getId, pmsMonitorParam.getMonitorIds())
+                .like(StringUtils.isNotBlank(pmsMonitorParam.getMonitorName()), Monitor::getName, pmsMonitorParam.getMonitorName())
+                .in(CollUtil.isNotEmpty(pmsMonitorParam.getVoltageLevels()), Monitor::getVoltageLevel, pmsMonitorParam.getVoltageLevels())
+                .in(CollUtil.isNotEmpty(pmsMonitorParam.getPowerrIds()),Monitor::getPowerrId,pmsMonitorParam.getPowerrIds())
+                .eq(StringUtils.isNotBlank(pmsMonitorParam.getMonitorType()), Monitor::getMonitorType, pmsMonitorParam.getMonitorType())
+                .eq(StringUtils.isNotBlank(pmsMonitorParam.getMonitorState()), Monitor::getMonitorState, pmsMonitorParam.getMonitorState());
+        List<Monitor> list = this.list(lambdaQueryWrapper);
+        List<PmsMonitorDTO> dtoList = list.stream().map(item -> {
+            PmsMonitorDTO dto = new PmsMonitorDTO();
+            BeanUtils.copyProperties(item, dto);
+            return dto;
+        }).collect(Collectors.toList());
+        return dtoList;
+    }
+
+    /***
+     * 获取所有监测点信息
+     * @author jianghaifei
+     * @date 2022-10-24 20:01
+     * @param
+     * @return java.util.List<com.njcn.device.pms.pojo.vo.PmsMonitorVO>
+     */
+    @Override
+    public List<PmsMonitorVO> getAllMonitorList() {
+        List<Monitor> monitorList = this.list();
+        List<PmsMonitorVO> resultList = monitorList.stream().map(item -> {
+            PmsMonitorVO pmsMonitorVO = new PmsMonitorVO();
+            BeanUtils.copyProperties(item, pmsMonitorVO);
+            return pmsMonitorVO;
+        }).collect(Collectors.toList());
+        return resultList;
+    }
+
+    @Override
+    public Overlimit getOverLimitData(String id) {
+        return overlimitMapper.selectById(id);
+    }
+
+    @Override
+    public boolean addMonitor(MonitorParam monitorParam) {
+
+        checkParam(monitorParam,false);
+        Monitor monitor = new Monitor();
+        BeanUtils.copyProperties(monitorParam,monitor);
+        checkOther(monitorParam,monitor,false);
+        monitor.setStatus(DataStateEnum.ENABLE.getCode());
+        return this.save(monitor);
+    }
+
+    @Override
+    public boolean updateMonitor(MonitorParam.UpdateMonitorParam monitorParam) {
+        checkParam(monitorParam,true);
+        Monitor monitor = new Monitor();
+        BeanUtils.copyProperties(monitorParam,monitor);
+        checkOther(monitorParam,monitor,true);
+
+        return this.updateById(monitor);
+    }
+
+    @Override
+    public boolean delMonitor(List<String> monitorIds) {
+        return false;
+    }
+
+    @Override
+    public List<SimpleDTO> getPmsPowerrInfoWithInOrg(List<String> orgIdList, PmsDeviceInfoParam pmsDeviceInfoParam) {
+        return this.baseMapper.getPmsPowerrInfoWithInOrg(orgIdList, pmsDeviceInfoParam);
+    }
+
+
+    private void checkParam(MonitorParam monitorParam,boolean update){
+
+        //校验电压等级数据
+        DictData voltageDic = dicDataFeignClient.getDicDataById(monitorParam.getVoltageLevel()).getData();
+        if(Objects.isNull(voltageDic)){
+            throw new BusinessException(SystemResponseEnum.VOLTAGE_EMPTY);
+        }
+
+        //校验监测点状态
+        DictData stateDic = dicDataFeignClient.getDicDataById(monitorParam.getMonitorState()).getData();
+        if(Objects.isNull(stateDic)){
+            throw new BusinessException(SystemResponseEnum.LINE_STATE_EMPTY);
+        }
+
+        //校验监测点类型
+        DictData typeDic = dicDataFeignClient.getDicDataById(monitorParam.getMonitorType()).getData();
+        if(Objects.isNull(typeDic)){
+            throw new BusinessException(SystemResponseEnum.LINE_TYPE_EMPTY);
+        }
+
+        //校验电压互感器
+        DictData potentialDic = dicDataFeignClient.getDicDataById(monitorParam.getPotentialTransFormerType()).getData();
+        if(Objects.isNull(potentialDic)){
+            throw new BusinessException(SystemResponseEnum.POTENTIAL_TYPE_EMPTY);
+        }
+
+        //校验中性点接地方式
+        DictData neutralDic = dicDataFeignClient.getDicDataById(monitorParam.getNeutralGroundingMode()).getData();
+        if(Objects.isNull(neutralDic)){
+            throw new BusinessException(SystemResponseEnum.Neutral_Mode_EMPTY);
+        }
+
+        //校验监测点标签
+        DictData tagDic = dicDataFeignClient.getDicDataById(monitorParam.getMonitorTag()).getData();
+        if(Objects.isNull(tagDic)){
+            throw new BusinessException(SystemResponseEnum.MONITOR_TAG_EMPTY);
+        }
+
+        //校验监测对象类型
+        DictData objTypeDic = dicDataFeignClient.getDicDataById(monitorParam.getMonitorObjectType()).getData();
+        if(Objects.isNull(objTypeDic)){
+            throw new BusinessException(SystemResponseEnum.MONITORY_TYPE_EMPTY);
+        }
+
+        //校验监测终端接线方式
+        DictData wireDic = dicDataFeignClient.getDicDataById(monitorParam.getTerminalWiringMethod()).getData();
+        if(Objects.isNull(wireDic)){
+            throw new BusinessException(SystemResponseEnum.TERMINAL_WIRING_EMPTY);
+        }
+    }
+
+    private void checkOther(MonitorParam monitorParam,Monitor monitor,boolean update){
+        //校验组织机构
+        Dept dept = deptFeignClient.getDeptById(monitorParam.getOrgId()).getData();
+        if(Objects.isNull(dept)){
+            throw new BusinessException(PmsDeviceResponseEnum.ORG_ITEM_EMPTY);
+        }
+
+        //校验运维单位
+        Dept deptOp = deptFeignClient.getDeptById(monitorParam.getOperationId()).getData();
+        if(Objects.isNull(deptOp)){
+            throw new BusinessException(PmsDeviceResponseEnum.Operation_ITEM_EMPTY);
+        }
+
+        //校验母线
+        Generatrix generatrix = generatrixMapper.selectById(monitorParam.getGeneratrixId());
+        if(Objects.isNull(generatrix)){
+            throw new BusinessException(PmsDeviceResponseEnum.VOLTAGE_EMPTY);
+        }
+
+        //校验线路
+        GeneratrixWire generatrixWire = generatrixWireMapper.selectById(monitorParam.getLineId());
+        if(Objects.isNull(generatrixWire)){
+            throw new BusinessException(PmsDeviceResponseEnum.LINE_EMPTY);
+        }
+
+        monitor.setOperationName(dept.getName());
+        monitor.setOperationName(deptOp.getName());
+        monitor.setGeneratrixName(generatrix.getGeneratrixName());
+        monitor.setLineName(generatrixWire.getWireName());
+    }
+
+
+
+}
diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/impl/PmsGeneralDeviceServiceImpl.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/impl/PmsGeneralDeviceServiceImpl.java
new file mode 100644
index 000000000..7b36b8522
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/impl/PmsGeneralDeviceServiceImpl.java
@@ -0,0 +1,154 @@
+package com.njcn.device.pms.service.impl;
+
+import cn.hutool.core.collection.CollectionUtil;
+import com.njcn.common.pojo.dto.SimpleDTO;
+import com.njcn.device.pms.pojo.dto.PmsGeneralDeviceDTO;
+import com.njcn.device.pms.pojo.dto.PmsMonitorBaseDTO;
+import com.njcn.device.pms.pojo.param.PmsDeviceInfoParam;
+import com.njcn.device.pms.pojo.po.Monitor;
+import com.njcn.device.pms.service.IDistributionMonitorService;
+import com.njcn.device.pms.service.IMonitorService;
+import com.njcn.device.pms.service.IPmsGeneralDeviceService;
+import com.njcn.user.api.DeptFeignClient;
+import com.njcn.user.pojo.dto.DeptDTO;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+/**
+ * @author hongawen
+ * @version 1.0.0
+ * @date 2022年10月14日 09:58
+ */
+@Service
+@RequiredArgsConstructor
+public class PmsGeneralDeviceServiceImpl implements IPmsGeneralDeviceService {
+
+    private final DeptFeignClient deptFeignClient;
+
+    private final IMonitorService monitorService;
+
+    private final IDistributionMonitorService iDistributionMonitorService;
+
+    @Override
+    public List<PmsGeneralDeviceDTO> getPmsDeviceInfoWithInOrg(PmsDeviceInfoParam pmsDeviceInfoParam) {
+        //定义待返回终端信息
+        List<PmsGeneralDeviceDTO> deviceInfos = new ArrayList<>();
+        List<DeptDTO> deptInfos = deptFeignClient.getDeptDescendantIndexes(pmsDeviceInfoParam.getDeptIndex(), Stream.of(0,1).collect(Collectors.toList())).getData();
+        List<DeptDTO> directDeptInfos = deptInfos.stream()
+                .filter(deptDTO -> deptDTO.getPid().equals(pmsDeviceInfoParam.getDeptIndex()))
+                .collect(Collectors.toList());
+        if (CollectionUtil.isEmpty(directDeptInfos)) {
+            //没有直接子部门，获取当前部门所有信息
+            List<DeptDTO> dept = deptInfos.stream()
+                    .filter(deptDTO -> deptDTO.getId().equals(pmsDeviceInfoParam.getDeptIndex()))
+                    .collect(Collectors.toList());
+            deviceInfos.add(getPmsGeneralDeviceInfo(dept.get(0), Collections.singletonList(pmsDeviceInfoParam.getDeptIndex()), pmsDeviceInfoParam));
+        }else{
+            for (DeptDTO deptDTO : directDeptInfos) {
+                //筛选上级部门pids包含该id的所有部门
+                List<DeptDTO> descendantDeptDTO = deptInfos.stream()
+                        .filter(d -> d.getPids().contains(deptDTO.getId()))
+                        .collect(Collectors.toList());
+                //形成需要查询监测点的部门索引
+                List<String> deptIdList = descendantDeptDTO.stream()
+                        .map(DeptDTO::getId)
+                        .distinct()
+                        .collect(Collectors.toList());
+                deptIdList.add(deptDTO.getId());
+                deviceInfos.add(getPmsGeneralDeviceInfo(deptDTO, deptIdList, pmsDeviceInfoParam));
+            }
+        }
+        return deviceInfos;
+    }
+
+    @Override
+    public List<SimpleDTO> getPmsPowerrInfoWithInOrg(PmsDeviceInfoParam pmsDeviceInfoParam) {
+        List<DeptDTO> deptInfos = deptFeignClient.getDeptDescendantIndexes(pmsDeviceInfoParam.getDeptIndex(), Stream.of(0,1).collect(Collectors.toList())).getData();
+        List<String> orgIdList = deptInfos.stream().map(deptDTO -> deptDTO.getId()).collect(Collectors.toList());
+        return monitorService.getPmsPowerrInfoWithInOrg(orgIdList,pmsDeviceInfoParam);
+    }
+
+    @Override
+    public List<PmsGeneralDeviceDTO> getPmsDeviceInfoByOrgId(PmsDeviceInfoParam pmsDeviceInfoParam) {
+        //定义待返回终端信息
+        List<PmsGeneralDeviceDTO> deviceInfos = new ArrayList<>();
+        List<DeptDTO> deptInfos = deptFeignClient.getDeptDescendantIndexes(pmsDeviceInfoParam.getDeptIndex(), Stream.of(0,1).collect(Collectors.toList())).getData();
+        List<DeptDTO> directDeptInfos = deptInfos.stream()
+                .filter(deptDTO -> deptDTO.getPid().equals(pmsDeviceInfoParam.getDeptIndex()))
+                .collect(Collectors.toList());
+        if (CollectionUtil.isEmpty(directDeptInfos)) {
+            //没有直接子部门，获取当前部门所有信息
+            List<DeptDTO> dept = deptInfos.stream()
+                    .filter(deptDTO -> deptDTO.getId().equals(pmsDeviceInfoParam.getDeptIndex()))
+                    .collect(Collectors.toList());
+            deviceInfos.add(getPmsGeneralDeviceInfoByOrg(dept.get(0), Collections.singletonList(pmsDeviceInfoParam.getDeptIndex()), pmsDeviceInfoParam));
+        }else{
+            for (DeptDTO deptDTO : directDeptInfos) {
+                //筛选上级部门pids包含该id的所有部门
+                List<DeptDTO> descendantDeptDTO = deptInfos.stream()
+                        .filter(d -> d.getPids().contains(deptDTO.getId()))
+                        .collect(Collectors.toList());
+                //形成需要查询监测点的部门索引
+                List<String> deptIdList = descendantDeptDTO.stream()
+                        .map(DeptDTO::getId)
+                        .distinct()
+                        .collect(Collectors.toList());
+                deptIdList.add(deptDTO.getId());
+                deviceInfos.add(getPmsGeneralDeviceInfoByOrg(deptDTO, deptIdList, pmsDeviceInfoParam));
+            }
+        }
+        return deviceInfos;
+    }
+
+    /**
+     * 查询当前部门pms台账信息
+     * @param deptDTO 部门信息
+     * @param deptIdList 所有子部门索引
+     * @param pmsDeviceInfoParam 查询条件
+     */
+    private PmsGeneralDeviceDTO getPmsGeneralDeviceInfo(DeptDTO deptDTO, List<String> deptIdList, PmsDeviceInfoParam pmsDeviceInfoParam) {
+        PmsGeneralDeviceDTO pmsGeneralDeviceDTO = new PmsGeneralDeviceDTO();
+        pmsGeneralDeviceDTO.setIndex(deptDTO.getId());
+        if (deptDTO.getType() == 0) {
+            pmsGeneralDeviceDTO.setName(deptDTO.getArea());
+        } else {
+            pmsGeneralDeviceDTO.setName(deptDTO.getName());
+        }
+        //获取monitor详细数据
+        List<PmsMonitorBaseDTO> monitorList = monitorService.getMonitorByCondition(deptIdList,pmsDeviceInfoParam);
+        pmsGeneralDeviceDTO.setPowerrIdList(monitorList.stream().map(PmsMonitorBaseDTO::getPowerrId).distinct().collect(Collectors.toList()));
+        pmsGeneralDeviceDTO.setTerminalIdList(monitorList.stream().map(PmsMonitorBaseDTO::getTerminalId).distinct().collect(Collectors.toList()));
+        pmsGeneralDeviceDTO.setGeneratrixIdList(monitorList.stream().map(PmsMonitorBaseDTO::getGeneratrixId).distinct().collect(Collectors.toList()));
+        pmsGeneralDeviceDTO.setMonitorIdList(monitorList.stream().map(PmsMonitorBaseDTO::getMonitorId).distinct().collect(Collectors.toList()));
+        return pmsGeneralDeviceDTO;
+    }
+
+
+    /**
+     * 查询当前部门pms台账信息
+     * @param deptDTO 部门信息
+     * @param deptIdList 所有子部门索引
+     * @param pmsDeviceInfoParam 查询条件
+     */
+    private PmsGeneralDeviceDTO getPmsGeneralDeviceInfoByOrg(DeptDTO deptDTO, List<String> deptIdList, PmsDeviceInfoParam pmsDeviceInfoParam) {
+        PmsGeneralDeviceDTO pmsGeneralDeviceDTO = new PmsGeneralDeviceDTO();
+        pmsGeneralDeviceDTO.setIndex(deptDTO.getId());
+        if (deptDTO.getType() == 0) {
+            pmsGeneralDeviceDTO.setName(deptDTO.getArea());
+        } else {
+            pmsGeneralDeviceDTO.setName(deptDTO.getName());
+        }
+        //获取monitor详细数据
+        List<PmsMonitorBaseDTO> monitorList = iDistributionMonitorService.getMonitorByCondition(deptIdList,pmsDeviceInfoParam);
+        pmsGeneralDeviceDTO.setPowerrIdList(monitorList.stream().map(PmsMonitorBaseDTO::getPowerrId).distinct().collect(Collectors.toList()));
+        pmsGeneralDeviceDTO.setLineIdList(monitorList.stream().map(PmsMonitorBaseDTO::getLineId).distinct().collect(Collectors.toList()));
+        pmsGeneralDeviceDTO.setMonitorIdList(monitorList.stream().map(PmsMonitorBaseDTO::getMonitorId).distinct().collect(Collectors.toList()));
+        return pmsGeneralDeviceDTO;
+    }
+}
diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/impl/PmsGeneratrixServiceImpl.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/impl/PmsGeneratrixServiceImpl.java
new file mode 100644
index 000000000..5a3b06a9e
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/impl/PmsGeneratrixServiceImpl.java
@@ -0,0 +1,72 @@
+package com.njcn.device.pms.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.njcn.device.pms.mapper.PmsGeneratrixMapper;
+import com.njcn.device.pms.pojo.dto.PmsGeneratrixDTO;
+import com.njcn.device.pms.pojo.param.GeneratrixParam;
+import com.njcn.device.pms.pojo.param.PmsGeneratrixParam;
+import com.njcn.device.pms.pojo.po.Generatrix;
+import com.njcn.device.pms.service.IPmsGeneratrixService;
+
+import com.njcn.web.pojo.param.BaseParam;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * @author yzh
+ * @date 2022/10/18
+ */
+@Slf4j
+@Service
+@RequiredArgsConstructor
+public class PmsGeneratrixServiceImpl extends ServiceImpl<PmsGeneratrixMapper, Generatrix> implements IPmsGeneratrixService {
+
+    private final PmsGeneratrixMapper pmsGeneratrixMapper;
+
+
+    /**
+     * 获取母线信息
+     *
+     * @param pmsGeneratrixParam 入参
+     * @return 母线信息
+     */
+    @Override
+    public List<PmsGeneratrixDTO> getGeneratrixInfo(PmsGeneratrixParam pmsGeneratrixParam) {
+        return pmsGeneratrixMapper.getGeneratrixInfo(pmsGeneratrixParam);
+    }
+
+
+
+    @Override
+    public boolean addGeneratrix(GeneratrixParam generatrixParam) {
+        Generatrix generatrix = new Generatrix();
+        BeanUtils.copyProperties(generatrixParam,generatrix);
+        return this.save(generatrix);
+    }
+
+    @Override
+    public boolean updateGeneratrix(GeneratrixParam.UpdateGeneratrixParam generatrixParam) {
+        Generatrix generatrix = new Generatrix();
+        BeanUtils.copyProperties(generatrixParam,generatrix);
+        return this.save(generatrix);
+    }
+
+    @Override
+    public boolean delGeneratrix(List<String> generatrixIds) {
+        return this.removeByIds(generatrixIds);
+    }
+
+    @Override
+    public Generatrix getGeneratrixById(String generatrixId) {
+        return this.getById(generatrixId);
+    }
+
+    @Override
+    public List<Generatrix> getGeneratrixList(BaseParam baseParam) {
+        return this.list();
+    }
+}
diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/impl/PowerClientServiceImpl.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/impl/PowerClientServiceImpl.java
new file mode 100644
index 000000000..bb3ee6a88
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/impl/PowerClientServiceImpl.java
@@ -0,0 +1,55 @@
+package com.njcn.device.pms.service.impl;
+
+import com.njcn.device.pms.mapper.PowerClientMapper;
+import com.njcn.device.pms.pojo.param.PowerClientParam;
+import com.njcn.device.pms.pojo.po.PowerClient;
+import com.njcn.device.pms.pojo.po.PowerClient;
+import com.njcn.device.pms.service.IPowerClientService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.njcn.web.pojo.param.BaseParam;
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author hongawen
+ * @since 2022-10-14
+ */
+@Service
+public class PowerClientServiceImpl extends ServiceImpl<PowerClientMapper, PowerClient> implements IPowerClientService {
+
+
+    @Override
+    public boolean addPowerClient(PowerClientParam powerClientParam) {
+        PowerClient powerClient = new PowerClient();
+        BeanUtils.copyProperties(powerClientParam,powerClient);
+        return this.save(powerClient);
+    }
+
+    @Override
+    public boolean updatePowerClient(PowerClientParam powerClientParam) {
+        PowerClient powerClient = new PowerClient();
+        BeanUtils.copyProperties(powerClientParam,powerClient);
+        return this.save(powerClient);
+    }
+
+    @Override
+    public boolean delPowerClient(List<String> powerClientIds) {
+        return this.removeByIds(powerClientIds);
+    }
+
+    @Override
+    public PowerClient getPowerClientById(String powerClientId) {
+        return this.getById(powerClientId);
+    }
+
+    @Override
+    public List<PowerClient> getPowerClientList(BaseParam baseParam) {
+        return this.list();
+    }
+}
diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/impl/PowerDistributionareaServiceImpl.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/impl/PowerDistributionareaServiceImpl.java
new file mode 100644
index 000000000..2b20cce84
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/impl/PowerDistributionareaServiceImpl.java
@@ -0,0 +1,113 @@
+package com.njcn.device.pms.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.njcn.common.pojo.enums.common.DataStateEnum;
+import com.njcn.common.pojo.exception.BusinessException;
+import com.njcn.device.pms.enums.PmsDeviceResponseEnum;
+import com.njcn.device.pms.mapper.PowerDistributionareaMapper;
+import com.njcn.device.pms.pojo.param.PowerDistributionareaParam;
+import com.njcn.device.pms.pojo.po.PowerDistributionarea;
+import com.njcn.device.pms.pojo.vo.PowerDistributionareaVO;
+import com.njcn.device.pms.service.IPowerDistributionareaService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.njcn.system.enums.EventResponseEnum;
+import com.njcn.system.pojo.param.EventTemplateParam;
+import com.njcn.system.pojo.po.EventTemplate;
+import com.njcn.web.factory.PageFactory;
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  台区信息
+ * </p>
+ *
+ * @author hongawen
+ * @since 2022-10-14
+ */
+@Service
+public class PowerDistributionareaServiceImpl extends ServiceImpl<PowerDistributionareaMapper, PowerDistributionarea> implements IPowerDistributionareaService {
+
+
+    @Override
+    public Page<PowerDistributionareaVO> getList(PowerDistributionareaParam.QueryParam queryParam) {
+        QueryWrapper<PowerDistributionareaVO> queryWrapper = new QueryWrapper<>();
+        queryWrapper.ne("pms_power_distributionarea.status", DataStateEnum.DELETED.getCode());
+        if (queryParam.getStatus().equals(1)){
+            queryWrapper.eq("pms_power_distributionarea.status",1);
+        }
+        //初始化分页数据
+        return this.baseMapper.page(new Page<>(PageFactory.getPageNum(queryParam), PageFactory.getPageSize(queryParam)), queryWrapper);
+    }
+
+    /**
+     * 根据id查询
+     * @author hany
+     * @date 2022/10/26
+     */
+    @Override
+    public PowerDistributionarea getDistrictById(String id) {
+        return this.getById(id);
+    }
+
+    /**
+     * 新增台区信息
+     * @author hany
+     * @date 2022/10/26
+     */
+    @Override
+    public boolean add(PowerDistributionareaParam newParam) {
+        checkName(newParam,true);
+        PowerDistributionarea powerDistributionarea = new PowerDistributionarea();
+        BeanUtils.copyProperties(newParam,powerDistributionarea);
+        //设为正常状态
+        powerDistributionarea.setStatus(DataStateEnum.ENABLE.getCode());
+        return this.save(powerDistributionarea);
+    }
+
+    /**
+     * 修改台区信息
+     * @author hany
+     * @date 2022/10/26
+     */
+    @Override
+    public boolean update(PowerDistributionareaParam updateParam) {
+        checkName(updateParam,false);
+        PowerDistributionarea powerDistributionarea = new PowerDistributionarea();
+        BeanUtils.copyProperties(updateParam,powerDistributionarea);
+        return this.updateById(powerDistributionarea);
+    }
+
+    /**
+     * 删除
+     * @param ids
+     */
+    @Override
+    public boolean delete(List<String> ids) {
+        return this.lambdaUpdate().set(PowerDistributionarea::getStatus, DataStateEnum.DELETED.getCode()).in(PowerDistributionarea::getId, ids).update();
+    }
+
+    /**
+     * 名称重复校验
+     */
+    private void checkName(PowerDistributionareaParam newParam, boolean flag){
+        LambdaQueryWrapper<PowerDistributionarea> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+        lambdaQueryWrapper.eq(PowerDistributionarea::getName,newParam.getName());
+        //修改
+        if(!flag){
+            if(newParam instanceof PowerDistributionareaParam){
+                lambdaQueryWrapper.ne(PowerDistributionarea::getId,newParam.getId());
+            }
+        }
+        int result = this.count(lambdaQueryWrapper);
+        //大于等于1个则表示重复
+        if (result >= 1) {
+            throw new BusinessException(PmsDeviceResponseEnum.MODEL_NAME_REPEAT);
+        }
+
+    }
+}
diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/impl/PowerGenerationUserServiceImpl.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/impl/PowerGenerationUserServiceImpl.java
new file mode 100644
index 000000000..88f164578
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/impl/PowerGenerationUserServiceImpl.java
@@ -0,0 +1,54 @@
+package com.njcn.device.pms.service.impl;
+
+import com.njcn.device.pms.mapper.PowerGenerationUserMapper;
+import com.njcn.device.pms.pojo.param.PowerGenerationUserParam;
+import com.njcn.device.pms.pojo.po.PowerGenerationUser;
+import com.njcn.device.pms.pojo.po.PowerGenerationUser;
+import com.njcn.device.pms.service.IPowerGenerationUserService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.njcn.web.pojo.param.BaseParam;
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author hongawen
+ * @since 2022-10-14
+ */
+@Service
+public class PowerGenerationUserServiceImpl extends ServiceImpl<PowerGenerationUserMapper, PowerGenerationUser> implements IPowerGenerationUserService {
+
+    @Override
+    public boolean addPowerGenerationUser(PowerGenerationUserParam powerGenerationUserParam) {
+        PowerGenerationUser powerGenerationUser = new PowerGenerationUser();
+        BeanUtils.copyProperties(powerGenerationUserParam,powerGenerationUser);
+        return this.save(powerGenerationUser);
+    }
+
+    @Override
+    public boolean updatePowerGenerationUser(PowerGenerationUserParam powerGenerationUserParam) {
+        PowerGenerationUser powerGenerationUser = new PowerGenerationUser();
+        BeanUtils.copyProperties(powerGenerationUserParam,powerGenerationUser);
+        return this.save(powerGenerationUser);
+    }
+
+    @Override
+    public boolean delPowerGenerationUser(List<String> powerGenerationUserIds) {
+        return this.removeByIds(powerGenerationUserIds);
+    }
+
+    @Override
+    public PowerGenerationUser getPowerGenerationUserById(String powerGenerationUserId) {
+        return this.getById(powerGenerationUserId);
+    }
+
+    @Override
+    public List<PowerGenerationUser> getPowerGenerationUserList(BaseParam baseParam) {
+        return this.list();
+    }
+}
diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/impl/PowerQualityMatterServiceImpl.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/impl/PowerQualityMatterServiceImpl.java
new file mode 100644
index 000000000..c51bff16e
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/impl/PowerQualityMatterServiceImpl.java
@@ -0,0 +1,20 @@
+package com.njcn.device.pms.service.impl;
+
+import com.njcn.device.pms.mapper.PowerQualityMatterMapper;
+import com.njcn.device.pms.pojo.po.PowerQualityMatter;
+import com.njcn.device.pms.service.IPowerQualityMatterService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author hongawen
+ * @since 2022-10-14
+ */
+@Service
+public class PowerQualityMatterServiceImpl extends ServiceImpl<PowerQualityMatterMapper, PowerQualityMatter> implements IPowerQualityMatterService {
+
+}
diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/impl/PvDeviceRunExServiceImpl.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/impl/PvDeviceRunExServiceImpl.java
deleted file mode 100644
index ea39bc607..000000000
--- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/impl/PvDeviceRunExServiceImpl.java
+++ /dev/null
@@ -1,106 +0,0 @@
-package com.njcn.device.pms.service.impl;
-
-import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.collection.CollectionUtil;
-import cn.hutool.core.util.ObjectUtil;
-import com.njcn.device.pms.pojo.bo.DeviceRunExBO;
-import com.njcn.device.pms.pojo.dto.DeviceRunExDTO;
-import com.njcn.device.pms.pojo.vo.DeviceRunExVO;
-import com.njcn.influxdb.param.InfluxDBPublicParam;
-import com.njcn.influxdb.utils.InfluxDbUtils;
-import com.njcn.device.pms.mapper.PvDeviceRunExMapper;
-import com.njcn.device.pms.service.IPvDeviceRunExService;
-import lombok.RequiredArgsConstructor;
-import org.influxdb.dto.QueryResult;
-import org.influxdb.impl.InfluxDBResultMapper;
-import org.springframework.stereotype.Service;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
-/**
- * 终端异常实现类
- *
- * @author yangj
- * @date 2022/09/08
- */
-@Service
-@RequiredArgsConstructor
-public class PvDeviceRunExServiceImpl implements IPvDeviceRunExService {
-
-    private final PvDeviceRunExMapper deviceRunExMapper;
-
-    private final InfluxDbUtils influxDbUtils;
-
-    @Override
-    public List<DeviceRunExBO> getPvDeviceExList(DeviceRunExDTO deviceRunExDTO) {
-        List<DeviceRunExBO> pqLineInfos = deviceRunExMapper.findPQLineInfo(deviceRunExDTO.getLineLevel(), "0");
-        if (CollectionUtil.isEmpty(pqLineInfos)) {
-            return null;
-        }
-        List<DeviceRunExVO> topDeviceExList = getTopDeviceExList(deviceRunExDTO);
-        if (CollectionUtil.isEmpty(topDeviceExList)) {
-            return pqLineInfos;
-        }
-        List<DeviceRunExVO> topDevices = new ArrayList<>();
-        Map<String, List<DeviceRunExVO>> map = topDeviceExList.parallelStream().collect(Collectors.groupingBy(DeviceRunExVO::getDevId));
-        map.forEach((k, v) -> {
-            DeviceRunExVO deviceRunExVO = map.get(k).parallelStream().reduce((t1, t2) -> {
-                t1.setAlarmNum(t1.getAlarmNum() + t2.getAlarmNum());
-                t1.setComOutNum(t1.getComOutNum() + t2.getComOutNum());
-                t1.setFlowNum(t1.getFlowNum() + t2.getFlowNum());
-                return t1;
-            }).orElse(null);
-
-            if (ObjectUtil.isNotNull(deviceRunExVO)) {
-                topDevices.add(deviceRunExVO);
-            }
-        });
-        getPvDevices(pqLineInfos, topDevices);
-        return pqLineInfos;
-    }
-
-
-    /**
-     * 导入influx统计数据
-     *
-     * @param deviceRunExBoS 展示数据
-     * @param deviceRunExVoS influx统计数据
-     */
-    public void getPvDevices(List<DeviceRunExBO> deviceRunExBoS, List<DeviceRunExVO> deviceRunExVoS) {
-        for (DeviceRunExBO deviceRunExBO : deviceRunExBoS) {
-            if (CollectionUtil.isNotEmpty(deviceRunExBO.getChildren())) {
-                getPvDevices(deviceRunExBO.getChildren(), deviceRunExVoS);
-            }
-            deviceRunExVoS.parallelStream().forEach(deviceRunExVO -> {
-                if (deviceRunExBO.getId().equals(deviceRunExVO.getDevId())) {
-                    BeanUtil.copyProperties(deviceRunExVO, deviceRunExBO);
-                }
-            });
-        }
-    }
-
-    /**
-     * @param deviceRunExDTO 终端运行异常dto
-     * @return List<DeviceRunExVO>
-     */
-    private List<DeviceRunExVO> getTopDeviceExList(DeviceRunExDTO deviceRunExDTO) {
-        //组装sql语句
-        StringBuilder sqlBuilder = new StringBuilder();
-        sqlBuilder.append(InfluxDBPublicParam.TIME + " >= '")
-                .append(deviceRunExDTO.getStartTime())
-                .append("' and ")
-                .append(InfluxDBPublicParam.TIME)
-                .append(" <= '")
-                .append(deviceRunExDTO.getEndTime())
-                .append("'");
-        //sql语句
-        String sql = "SELECT * FROM pqs_top_msg WHERE " + sqlBuilder + InfluxDBPublicParam.TIME_ZONE;
-        QueryResult query = influxDbUtils.query(sql);
-        InfluxDBResultMapper resultMapper = new InfluxDBResultMapper();
-        return resultMapper.toPOJO(query, DeviceRunExVO.class);
-    }
-
-}
diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/impl/PvDeviceServiceImpl.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/impl/PvDeviceServiceImpl.java
deleted file mode 100644
index 56dc57b51..000000000
--- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/impl/PvDeviceServiceImpl.java
+++ /dev/null
@@ -1,143 +0,0 @@
-package com.njcn.device.pms.service.impl;
-
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.njcn.common.pojo.enums.common.DataStateEnum;
-import com.njcn.common.pojo.exception.BusinessException;
-import com.njcn.common.utils.PubUtils;
-import com.njcn.device.pms.pojo.param.DeviceQueryParam;
-import com.njcn.device.pms.pojo.param.PvDeviceParam;
-import com.njcn.device.pms.pojo.po.PvDevice;
-import com.njcn.device.pms.pojo.vo.PvDeviceVO;
-import com.njcn.device.pms.mapper.PvDeviceMapper;
-import com.njcn.device.pms.service.IPvDeviceService;
-import com.njcn.device.pq.enums.PvDeviceResponseEnum;
-import com.njcn.system.api.DicDataFeignClient;
-import com.njcn.system.enums.SystemResponseEnum;
-import com.njcn.web.factory.PageFactory;
-import lombok.RequiredArgsConstructor;
-import org.springframework.beans.BeanUtils;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-import java.util.Objects;
-
-/**
- * <p>
- * 终端台账实现类
- * </p>
- *
- * @author cdf
- * @since 2022-07-05
- */
-@Service
-@RequiredArgsConstructor
-public class PvDeviceServiceImpl extends ServiceImpl<PvDeviceMapper, PvDevice> implements IPvDeviceService {
-
-    private final DicDataFeignClient dicDataFeignClient;
-
-
-    @Override
-    public boolean addDevice(PvDeviceParam pvDeviceParam) {
-        checkNameAndParam(pvDeviceParam, false);
-        PvDevice pvDevice = new PvDevice();
-        BeanUtils.copyProperties(pvDeviceParam, pvDevice);
-        pvDevice.setState(DataStateEnum.ENABLE.getCode());
-        pvDevice.setThisTimeCheck(PubUtils.localDateFormat(pvDeviceParam.getThisTimeCheck()));
-        pvDevice.setNextTimeCheck(PubUtils.localDateFormat(pvDeviceParam.getNextTimeCheck()));
-        return this.save(pvDevice);
-    }
-
-    @Override
-    public boolean updateDevice(PvDeviceParam.UpdatePvDeviceParam updatePvDeviceParam) {
-        checkNameAndParam(updatePvDeviceParam, true);
-        PvDevice pvDevice = new PvDevice();
-        BeanUtils.copyProperties(updatePvDeviceParam, pvDevice);
-        pvDevice.setState(DataStateEnum.ENABLE.getCode());
-        pvDevice.setThisTimeCheck(PubUtils.localDateFormat(updatePvDeviceParam.getThisTimeCheck()));
-        pvDevice.setNextTimeCheck(PubUtils.localDateFormat(updatePvDeviceParam.getNextTimeCheck()));
-        return this.updateById(pvDevice);
-    }
-
-    @Override
-    public Page<PvDeviceVO> getPvDeviceList(DeviceQueryParam subsAreaQueryParam) {
-        Page<PvDeviceVO> page = new Page<>(PageFactory.getPageNum(subsAreaQueryParam), PageFactory.getPageSize(subsAreaQueryParam));
-        return this.baseMapper.getPvDeviceList(page,subsAreaQueryParam);
-    }
-
-    @Override
-    public List<PvDeviceVO> getAllPvDeviceList() {
-        return this.baseMapper.getAllPvDeviceList();
-    }
-
-    @Override
-    public PvDevice getPvDeviceById(String id) {
-        return this.getById(id);
-    }
-
-    @Override
-    public boolean delPvDevice(List<String> ids) {
-        return this.removeByIds(ids);
-    }
-
-
-    /**
-     * 校验单位名称是否重复
-     */
-    private void checkNameAndParam(PvDeviceParam pvDeviceParam, boolean isUpdate) {
-
-        LambdaQueryWrapper<PvDevice> lambdaQueryWrapper = new LambdaQueryWrapper<>();
-        lambdaQueryWrapper.eq(PvDevice::getName, pvDeviceParam.getName());
-        if (isUpdate) {
-            //更新操作
-            if (pvDeviceParam instanceof PvDeviceParam.UpdatePvDeviceParam) {
-                lambdaQueryWrapper.ne(PvDevice::getId, ((PvDeviceParam.UpdatePvDeviceParam) pvDeviceParam).getId());
-            }
-        }
-        int countName = this.count(lambdaQueryWrapper);
-        if (countName > 0) {
-            throw new BusinessException(PvDeviceResponseEnum.DVE_CODE_REPEAT);
-        }
-
-        lambdaQueryWrapper.clear();
-        lambdaQueryWrapper.eq(PvDevice::getDevCode, pvDeviceParam.getDevCode());
-        if (isUpdate) {
-            //更新操作
-            if (pvDeviceParam instanceof PvDeviceParam.UpdatePvDeviceParam) {
-                lambdaQueryWrapper.ne(PvDevice::getId, ((PvDeviceParam.UpdatePvDeviceParam) pvDeviceParam).getId());
-            }
-        }
-        int count = this.count(lambdaQueryWrapper);
-        if (count > 0) {
-            throw new BusinessException(PvDeviceResponseEnum.DVE_CODE_REPEAT);
-        }
-
-        /*校验终端类型*/
-        if (Objects.isNull(dicDataFeignClient.getDicDataById(pvDeviceParam.getType()).getData())) {
-            throw new BusinessException(SystemResponseEnum.DEV_VARIETY);
-        }
-
-        /*校验设备型号*/
-        if (StrUtil.isNotBlank(pvDeviceParam.getDevType())) {
-            if (Objects.isNull(dicDataFeignClient.getDicDataById(pvDeviceParam.getDevType()).getData())) {
-                throw new BusinessException(SystemResponseEnum.DEV_TYPE_EMPTY);
-            }
-        }
-
-        /*校验生产厂家*/
-
-        if (Objects.isNull(dicDataFeignClient.getDicDataById(pvDeviceParam.getManufacturer()).getData())) {
-            throw new BusinessException(SystemResponseEnum.MANUFACTURER);
-        }
-
-    }
-
-    /**
-     * 校验参数是否违规
-     */
-    private void checkParam(PvDeviceParam pvDeviceParam) {
-
-    }
-}
diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/impl/PvDispatchServiceImpl.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/impl/PvDispatchServiceImpl.java
deleted file mode 100644
index f52a9ae6c..000000000
--- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/impl/PvDispatchServiceImpl.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.njcn.device.pms.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.njcn.device.pms.pojo.po.PvDispatch;
-import com.njcn.device.pms.mapper.PvDispatchMapper;
-import com.njcn.device.pms.service.IPvDispatchService;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- *  服务实现类
- * </p>
- *
- * @author cdf
- * @since 2022-07-05
- */
-@Service
-public class PvDispatchServiceImpl extends ServiceImpl<PvDispatchMapper, PvDispatch> implements IPvDispatchService {
-
-}
diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/impl/PvDistributedServiceImpl.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/impl/PvDistributedServiceImpl.java
deleted file mode 100644
index ca364466d..000000000
--- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/impl/PvDistributedServiceImpl.java
+++ /dev/null
@@ -1,121 +0,0 @@
-package com.njcn.device.pms.service.impl;
-
-
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.njcn.common.pojo.enums.common.DataStateEnum;
-import com.njcn.common.pojo.exception.BusinessException;
-import com.njcn.device.pms.pojo.param.DistributedQueryParam;
-import com.njcn.device.pms.pojo.param.PvDistributedParam;
-import com.njcn.device.pms.pojo.po.PvDistributed;
-import com.njcn.device.pms.pojo.vo.PvDistributedVO;
-import com.njcn.device.pms.mapper.PvDistributedMapper;
-import com.njcn.device.pms.service.IPvDistributedService;
-import com.njcn.device.pq.enums.PvDeviceResponseEnum;
-import com.njcn.system.api.DicDataFeignClient;
-import com.njcn.system.enums.SystemResponseEnum;
-import com.njcn.web.factory.PageFactory;
-import lombok.RequiredArgsConstructor;
-import org.springframework.beans.BeanUtils;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-import java.util.Objects;
-
-/**
- * <p>
- *  服务实现类
- * </p>
- *
- * @author cdf
- * @since 2022-07-06
- */
-@Service
-@RequiredArgsConstructor
-public class PvDistributedServiceImpl extends ServiceImpl<PvDistributedMapper, PvDistributed> implements IPvDistributedService {
-
-    private final DicDataFeignClient dicDataFeignClient;
-
-
-    @Override
-    public boolean addDistributed(PvDistributedParam pvDistributedParam) {
-        checkNameAndParam(pvDistributedParam,false);
-        PvDistributed pvDistributed = new PvDistributed();
-        BeanUtils.copyProperties(pvDistributedParam,pvDistributed);
-        pvDistributed.setState(DataStateEnum.ENABLE.getCode());
-        return this.save(pvDistributed);
-    }
-
-    @Override
-    public boolean updateDistributed(PvDistributedParam.UpdatePvDistributedParam updatePvDistributedParam) {
-        checkNameAndParam(updatePvDistributedParam,true);
-        PvDistributed pvDistributed = new PvDistributed();
-        BeanUtils.copyProperties(updatePvDistributedParam,pvDistributed);
-        pvDistributed.setState(DataStateEnum.ENABLE.getCode());
-        return this.updateById(pvDistributed);
-    }
-
-    @Override
-    public Page<PvDistributedVO> getPvDistributedList(DistributedQueryParam distributedQueryParam) {
-       Page<PvDistributedVO> page = new Page<>(PageFactory.getPageNum(distributedQueryParam),PageFactory.getPageSize(distributedQueryParam));
-       return this.baseMapper.getPvDistributedList(page,distributedQueryParam);
-    }
-
-    @Override
-    public List<PvDistributed> getAllPvDistributedList() {
-        return this.list();
-    }
-
-    @Override
-    public PvDistributed getPvDistributedById(String id) {
-        return this.getById(id);
-    }
-
-    @Override
-    public boolean delPvDistributed(List<String> ids) {
-        return this.removeByIds(ids);
-    }
-
-
-    /**
-     * 校验单位名称是否重复
-     */
-    private void checkNameAndParam(PvDistributedParam pvDistributedParam, boolean isUpdate) {
-
-        if(StrUtil.isNotBlank(pvDistributedParam.getScale())) {
-            if (Objects.isNull(dicDataFeignClient.getDicDataById(pvDistributedParam.getScale()).getData())) {
-                throw new BusinessException(SystemResponseEnum.VOLTAGE_EMPTY);
-            }
-        }
-
-        LambdaQueryWrapper<PvDistributed> lambdaQueryWrapper = new LambdaQueryWrapper<>();
-        lambdaQueryWrapper.eq(PvDistributed::getName, pvDistributedParam.getName());
-        if (isUpdate) {
-            //更新操作
-            if (pvDistributedParam instanceof PvDistributedParam.UpdatePvDistributedParam) {
-                lambdaQueryWrapper.ne(PvDistributed::getId, ((PvDistributedParam.UpdatePvDistributedParam) pvDistributedParam).getId());
-            }
-        }
-        int count = this.count(lambdaQueryWrapper);
-        if (count > 0) {
-            throw new BusinessException(PvDeviceResponseEnum.SUB_AREA_REPEAT);
-        }
-
-        lambdaQueryWrapper.clear();
-        lambdaQueryWrapper.eq(PvDistributed::getUserCode, pvDistributedParam.getUserCode());
-        if (isUpdate) {
-            //更新操作
-            if (pvDistributedParam instanceof PvDistributedParam.UpdatePvDistributedParam) {
-                lambdaQueryWrapper.ne(PvDistributed::getId, ((PvDistributedParam.UpdatePvDistributedParam) pvDistributedParam).getId());
-            }
-        }
-        int countUserCode = this.count(lambdaQueryWrapper);
-        if (countUserCode > 0) {
-            throw new BusinessException(PvDeviceResponseEnum.USER_CODE_REPEAT);
-        }
-    }
-
-
-}
diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/impl/PvLineDetailServiceImpl.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/impl/PvLineDetailServiceImpl.java
deleted file mode 100644
index db4285a9c..000000000
--- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/impl/PvLineDetailServiceImpl.java
+++ /dev/null
@@ -1,271 +0,0 @@
-package com.njcn.device.pms.service.impl;
-
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.njcn.common.pojo.enums.common.DataStateEnum;
-import com.njcn.common.pojo.exception.BusinessException;
-import com.njcn.common.utils.PubUtils;
-import com.njcn.device.pms.service.*;
-import com.njcn.device.pms.pojo.param.LineDetailQueryParam;
-import com.njcn.device.pms.pojo.param.PvLineDetailParam;
-import com.njcn.device.pms.pojo.po.PvDevice;
-import com.njcn.device.pms.pojo.po.PvLineDetail;
-import com.njcn.device.pms.pojo.vo.PvLineAllDetailVO;
-import com.njcn.device.pms.mapper.PvLineDetailMapper;
-import com.njcn.device.pq.enums.PvDeviceResponseEnum;
-import com.njcn.system.api.DicDataFeignClient;
-import com.njcn.system.enums.DicDataEnum;
-import com.njcn.system.enums.SystemResponseEnum;
-import com.njcn.system.pojo.po.DictData;
-import com.njcn.web.factory.PageFactory;
-import lombok.RequiredArgsConstructor;
-import org.springframework.beans.BeanUtils;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-import java.util.Objects;
-
-/**
- * <p>
- * 监测点实现类
- * </p>
- *
- * @author cdf
- * @since 2022-07-05
- */
-@Service
-@RequiredArgsConstructor
-public class PvLineDetailServiceImpl extends ServiceImpl<PvLineDetailMapper, PvLineDetail> implements IPvLineDetailService {
-
-    private final DicDataFeignClient dicDataFeignClient;
-
-    private final IPvDeviceService iPvDeviceService;
-
-    private final IPvSubstationService iPvSubstationService;
-
-    private final IPvVoltageService iPvVoltageService;
-
-    private final IPvSubAreaService iPvSubAreaService;
-
-
-    @Override
-    public boolean addLineDetail(PvLineDetailParam pvLineDetailParam) {
-        checkNameAndParam(pvLineDetailParam);
-        //判断同一台装置是否出现监测点序号重复或超过x路序号
-        lineNumIsExit(pvLineDetailParam, false);
-        PvLineDetail pvLineDetail = commMonit(pvLineDetailParam);
-        return this.save(pvLineDetail);
-    }
-
-    @Override
-    public boolean updateLineDetail(PvLineDetailParam.UpdatePvLineDetailParam updatePvLineDetailParam) {
-        checkNameAndParam(updatePvLineDetailParam);
-        lineNumIsExit(updatePvLineDetailParam, true);
-        PvLineDetail pvLineDetail = commMonit(updatePvLineDetailParam);
-        return this.updateById(pvLineDetail);
-    }
-
-
-    /**
-     * 公共代码提取
-     */
-    private PvLineDetail commMonit(PvLineDetailParam pvLineDetailParam) {
-        PvLineDetail pvLineDetail = new PvLineDetail();
-        BeanUtils.copyProperties(pvLineDetailParam, pvLineDetail);
-        pvLineDetail.setState(DataStateEnum.ENABLE.getCode());
-        if (StrUtil.isNotBlank(pvLineDetailParam.getAccess())) {
-            pvLineDetail.setAccess(PubUtils.localDateFormat(pvLineDetailParam.getAccess()));
-        }
-        if (StrUtil.isNotBlank(pvLineDetailParam.getPutIn())) {
-            pvLineDetail.setAccess(PubUtils.localDateFormat(pvLineDetailParam.getPutIn()));
-        }
-        return pvLineDetail;
-    }
-
-
-    /**
-     * 监测点序号是否重复判断
-     *
-     * @author cdf
-     * @date 2022/7/11
-     */
-    private void lineNumIsExit(PvLineDetailParam pvLineDetailParam, Boolean isUpdate) {
-        LambdaQueryWrapper<PvLineDetail> query = new LambdaQueryWrapper<>();
-        query.eq(PvLineDetail::getDevId, pvLineDetailParam.getDevId())
-                .eq(PvLineDetail::getNum, pvLineDetailParam.getNum())
-                .eq(PvLineDetail::getState, DataStateEnum.ENABLE.getCode());
-        if (isUpdate) {
-            if (pvLineDetailParam instanceof PvLineDetailParam.UpdatePvLineDetailParam) {
-                query.ne(PvLineDetail::getId, ((PvLineDetailParam.UpdatePvLineDetailParam) pvLineDetailParam).getId());
-            }
-        }
-        int count = this.count(query);
-        if (count > 0) {
-            throw new BusinessException(PvDeviceResponseEnum.DEV_NUM_NULL);
-        }
-
-    }
-
-    @Override
-    public Page<PvLineDetail> getPvLineDetailList(LineDetailQueryParam subsAreaQueryParam) {
-        Page<PvLineDetail> page = new Page<>(PageFactory.getPageNum(subsAreaQueryParam), PageFactory.getPageSize(subsAreaQueryParam));
-        LambdaQueryWrapper<PvLineDetail> lambdaQueryWrapper = new LambdaQueryWrapper<>();
-        return this.page(page, lambdaQueryWrapper);
-    }
-
-    @Override
-    public List<PvLineDetail> getAllPvLineDetailList() {
-        return this.list();
-    }
-
-    @Override
-    public PvLineDetail getPvLineDetailById(String id) {
-        return this.getById(id);
-    }
-
-    @Override
-    public boolean delPvLineDetail(List<String> ids) {
-        return this.removeByIds(ids);
-    }
-
-    @Override
-    public Page<PvLineAllDetailVO> getPvLineAllDetailMain(Integer pageNum, Integer pageSize, List<String> subIds, List<String> subAreaIds,String type,Integer lineStatus) {
-
-        Page<PvLineAllDetailVO> page = new Page<>(pageNum, pageSize);
-
-        return this.baseMapper.getPvLineAllDetailMain(page, subIds, subAreaIds,type,lineStatus);
-
-
-    }
-
-
-    /**
-     * 校验单位名称是否重复
-     */
-    private void checkNameAndParam(PvLineDetailParam pvLineDetailParam) {
-
-        PvDevice pvDevice = iPvDeviceService.getPvDeviceById(pvLineDetailParam.getDevId());
-        if (Objects.isNull(pvDevice)) {
-            throw new BusinessException(PvDeviceResponseEnum.DEV_NULL);
-        }
-        DictData devType = dicDataFeignClient.getDicDataById(pvDevice.getType()).getData();
-
-        /*校验监测类型*/
-        DictData lineType = dicDataFeignClient.getDicDataById(pvLineDetailParam.getType()).getData();
-        if (Objects.isNull(lineType)) {
-            throw new BusinessException(SystemResponseEnum.LINE_TYPE_VARIETY_EMPTY);
-        }
-
-       /* if (!pvDevice.getType().equals(lineType.getId())) {
-            throw new BusinessException(PvDeviceResponseEnum.LINE_DEVICE_NO_MATCH);
-        }*/
-
-
-
-        /*监测点类型*/
-        if (DicDataEnum.ONE_LINE.getCode().equals(lineType.getCode())) {
-            /*校验变电站*/
-            if (StrUtil.isNotBlank(pvLineDetailParam.getSubstationId())) {
-                if (Objects.isNull(iPvSubstationService.getPvSubstationById(pvLineDetailParam.getSubstationId()))) {
-                    throw new BusinessException(PvDeviceResponseEnum.SUBSTATION_NULL);
-                }
-            }else{
-                throw new BusinessException(PvDeviceResponseEnum.SUBSTATION_EMPTY);
-            }
-            //I类监测点
-            if (StrUtil.hasBlank(pvLineDetailParam.getSubstationId(), pvLineDetailParam.getVoltageId())) {
-                throw new BusinessException(PvDeviceResponseEnum.ONE_SUB_VOLTAGE_EMPTY);
-            }
-            if (StrUtil.isNotBlank(pvLineDetailParam.getSubAreaId())) {
-                pvLineDetailParam.setSubAreaId("");
-            }
-
-            /*校验母线*/
-            if (StrUtil.isBlank(pvLineDetailParam.getVoltageId())) {
-                throw new BusinessException(PvDeviceResponseEnum.VOLTAGE_PARAM_EMPTY);
-            }
-
-            if (Objects.isNull(iPvVoltageService.getPvVoltageById(pvLineDetailParam.getVoltageId()))) {
-                throw new BusinessException(PvDeviceResponseEnum.VOLTAGE_NULL);
-            }
-
-            /*I类监测点终端只能选电能质量监测终端*/
-            if (!DicDataEnum.DEV_QUALITY.getCode().equals(devType.getCode())) {
-                throw new BusinessException(PvDeviceResponseEnum.LINE_DEVICE_NO_MATCH);
-            }
-
-
-        } else if (DicDataEnum.TWO_LINE.getCode().equals(lineType.getCode())) {
-            //II类监测点
-            if (StrUtil.isNotBlank(pvLineDetailParam.getSubstationId()) || StrUtil.isNotBlank(pvLineDetailParam.getVoltageId())) {
-                throw new BusinessException(PvDeviceResponseEnum.TWO_SUB_VOLTAGE_EMPTY_MUST);
-            }
-
-            //2类3类监测点必须存在台区
-            if (StrUtil.isBlank(pvLineDetailParam.getSubAreaId())) {
-                throw new BusinessException(PvDeviceResponseEnum.SUB_AREA_EMPTY);
-            }
-
-            //II III 类监测点所属母线id必须为空
-            if (StrUtil.isNotBlank(pvLineDetailParam.getVoltageId())) {
-                throw new BusinessException(PvDeviceResponseEnum.VOLTAGE_PARAM_EMPTY_MUST);
-            }
-
-            /*II类监测点终端只能选融合终端*/
-            if (DicDataEnum.DEV_QUALITY.getCode().equals(devType.getCode())) {
-                throw new BusinessException(PvDeviceResponseEnum.LINE_DEVICE_NO_MATCH);
-            }
-
-
-        } else if (DicDataEnum.THREE_LINE.getCode().equals(lineType.getCode())) {
-            //III类监测点
-            if (StrUtil.isNotBlank(pvLineDetailParam.getSubstationId()) || StrUtil.isNotBlank(pvLineDetailParam.getVoltageId())) {
-                throw new BusinessException(PvDeviceResponseEnum.TWO_SUB_VOLTAGE_EMPTY_MUST);
-            }
-
-            //2类3类监测点必须存在台区
-            if (StrUtil.isBlank(pvLineDetailParam.getSubAreaId())) {
-                throw new BusinessException(PvDeviceResponseEnum.SUB_AREA_EMPTY);
-            }
-
-            /*III类监测点终端只能选智能电表终端*/
-            if (!DicDataEnum.DEV_QUALITY.getCode().equals(devType.getCode())) {
-                throw new BusinessException(PvDeviceResponseEnum.LINE_DEVICE_NO_MATCH);
-            }
-        }
-
-        /*校验台区*/
-        if (StrUtil.isNotBlank(pvLineDetailParam.getSubAreaId())) {
-            if (Objects.isNull(iPvSubAreaService.getPvSubAreaById(pvLineDetailParam.getSubAreaId()))) {
-                throw new BusinessException(PvDeviceResponseEnum.SUB_AREA_NULL);
-            }
-        }
-
-
-        if (StrUtil.isNotBlank(pvLineDetailParam.getBusinessType())) {
-            if (Objects.isNull(dicDataFeignClient.getDicDataById(pvLineDetailParam.getBusinessType()).getData())) {
-                throw new BusinessException(SystemResponseEnum.BUSINESS_EMPTY);
-            }
-        }
-
-        if (StrUtil.isNotBlank(pvLineDetailParam.getScale())) {
-            if (StrUtil.isNotBlank(pvLineDetailParam.getScale())) {
-                if (Objects.isNull(dicDataFeignClient.getDicDataById(pvLineDetailParam.getScale()).getData())) {
-                    throw new BusinessException(SystemResponseEnum.LINE_TYPE_VARIETY_EMPTY);
-                }
-            }
-        }
-
-        if (StrUtil.isNotBlank(pvLineDetailParam.getLoadType())) {
-            if (Objects.isNull(dicDataFeignClient.getDicDataById(pvLineDetailParam.getLoadType()).getData())) {
-                throw new BusinessException(SystemResponseEnum.INTERFERENCE_EMPTY);
-            }
-        }
-
-
-    }
-
-
-}
diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/impl/PvLvUserServiceImpl.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/impl/PvLvUserServiceImpl.java
deleted file mode 100644
index 47acd9abe..000000000
--- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/impl/PvLvUserServiceImpl.java
+++ /dev/null
@@ -1,122 +0,0 @@
-package com.njcn.device.pms.service.impl;
-
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.njcn.common.pojo.enums.common.DataStateEnum;
-import com.njcn.common.pojo.exception.BusinessException;
-import com.njcn.device.pms.pojo.param.LvUserQueryParam;
-import com.njcn.device.pms.pojo.param.PvLvUserParam;
-import com.njcn.device.pms.pojo.po.PvLvUser;
-import com.njcn.device.pms.pojo.vo.PvLvUserVO;
-import com.njcn.device.pms.mapper.PvLvUserMapper;
-import com.njcn.device.pms.service.IPvLvUserService;
-import com.njcn.device.pq.enums.PvDeviceResponseEnum;
-import com.njcn.system.api.DicDataFeignClient;
-import com.njcn.system.enums.SystemResponseEnum;
-import com.njcn.web.factory.PageFactory;
-import lombok.RequiredArgsConstructor;
-import org.springframework.beans.BeanUtils;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-import java.util.Objects;
-
-/**
- * <p>
- *  分布式用户实现类
- * </p>
- *
- * @author cdf
- * @since 2022-07-05
- */
-@Service
-@RequiredArgsConstructor
-public class PvLvUserServiceImpl extends ServiceImpl<PvLvUserMapper, PvLvUser> implements IPvLvUserService {
-
-    private final DicDataFeignClient dicDataFeignClient;
-
-
-    @Override
-    public boolean addLvUser(PvLvUserParam pvLvUserParam) {
-        checkNameAndParam(pvLvUserParam,false);
-        PvLvUser pvLvUser = new PvLvUser();
-        BeanUtils.copyProperties(pvLvUserParam,pvLvUser);
-        pvLvUser.setState(DataStateEnum.ENABLE.getCode());
-        return this.save(pvLvUser);
-    }
-
-    @Override
-    public boolean updateLvUser(PvLvUserParam.UpdatePvLvUserParam updatePvLvUserParam) {
-        checkNameAndParam(updatePvLvUserParam,true);
-        PvLvUser pvLvUser = new PvLvUser();
-        BeanUtils.copyProperties(updatePvLvUserParam,pvLvUser);
-        pvLvUser.setState(DataStateEnum.ENABLE.getCode());
-        return this.updateById(pvLvUser);
-    }
-
-    @Override
-    public Page<PvLvUserVO> getPvLvUserList(LvUserQueryParam lvUserQueryParam) {
-        Page<PvLvUserVO> page = new Page<>(PageFactory.getPageNum(lvUserQueryParam),PageFactory.getPageSize(lvUserQueryParam));
-        return this.baseMapper.getPvLvUserList(page,lvUserQueryParam);
-    }
-
-    @Override
-    public List<PvLvUser> getAllPvLvUserList() {
-        return this.list();
-    }
-
-    @Override
-    public PvLvUser getPvLvUserById(String id) {
-        return this.getById(id);
-    }
-
-    @Override
-    public boolean delPvLvUser(List<String> ids) {
-        return this.removeByIds(ids);
-    }
-
-
-    /**
-     * 校验单位名称是否重复
-     */
-    private void checkNameAndParam(PvLvUserParam pvLvUserParam, boolean isUpdate) {
-
-        if(StrUtil.isNotBlank(pvLvUserParam.getScale())) {
-            if (Objects.isNull(dicDataFeignClient.getDicDataById(pvLvUserParam.getScale()).getData())) {
-                throw new BusinessException(SystemResponseEnum.VOLTAGE_EMPTY);
-            }
-        }
-
-        LambdaQueryWrapper<PvLvUser> lambdaQueryWrapper = new LambdaQueryWrapper<>();
-        lambdaQueryWrapper.eq(PvLvUser::getName, pvLvUserParam.getName());
-        if (isUpdate) {
-            //更新操作
-            if (pvLvUserParam instanceof PvLvUserParam.UpdatePvLvUserParam) {
-                lambdaQueryWrapper.ne(PvLvUser::getId, ((PvLvUserParam.UpdatePvLvUserParam) pvLvUserParam).getId());
-            }
-        }
-        int count = this.count(lambdaQueryWrapper);
-        if (count > 0) {
-            throw new BusinessException(PvDeviceResponseEnum.LV_USER_REPEAT);
-        }
-
-
-        lambdaQueryWrapper.clear();
-        lambdaQueryWrapper.eq(PvLvUser::getUserCode, pvLvUserParam.getUserCode());
-        if (isUpdate) {
-            //更新操作
-            if (pvLvUserParam instanceof PvLvUserParam.UpdatePvLvUserParam) {
-                lambdaQueryWrapper.ne(PvLvUser::getId, ((PvLvUserParam.UpdatePvLvUserParam) pvLvUserParam).getId());
-            }
-        }
-        int countUserCode = this.count(lambdaQueryWrapper);
-        if (countUserCode > 0) {
-            throw new BusinessException(PvDeviceResponseEnum.USER_CODE_REPEAT);
-        }
-    }
-
-
-
-}
diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/impl/PvSubAreaServiceImpl.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/impl/PvSubAreaServiceImpl.java
deleted file mode 100644
index e44433f69..000000000
--- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/impl/PvSubAreaServiceImpl.java
+++ /dev/null
@@ -1,115 +0,0 @@
-package com.njcn.device.pms.service.impl;
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.njcn.common.pojo.enums.common.DataStateEnum;
-import com.njcn.common.pojo.exception.BusinessException;
-import com.njcn.device.pms.pojo.param.PvSubAreaParam;
-import com.njcn.device.pms.pojo.param.SubAreaQueryParam;
-import com.njcn.device.pms.pojo.po.PvSubArea;
-import com.njcn.device.pms.pojo.vo.PvSubAreaVO;
-import com.njcn.device.pms.mapper.PvSubAreaMapper;
-import com.njcn.device.pms.service.IPvSubAreaService;
-import com.njcn.device.pms.service.IPvTenVoltageService;
-import com.njcn.device.pms.service.IPvUnitService;
-import com.njcn.device.pq.enums.PvDeviceResponseEnum;
-import com.njcn.system.api.DicDataFeignClient;
-import com.njcn.user.api.DeptFeignClient;
-import com.njcn.web.factory.PageFactory;
-import lombok.RequiredArgsConstructor;
-import org.springframework.beans.BeanUtils;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-import java.util.Objects;
-
-/**
- * <p>
- *  服务实现类
- * </p>
- *
- * @author cdf
- * @since 2022-07-05
- */
-@Service
-@RequiredArgsConstructor
-public class PvSubAreaServiceImpl extends ServiceImpl<PvSubAreaMapper, PvSubArea> implements IPvSubAreaService {
-
-
-    private final DicDataFeignClient dicDataFeignClient;
-
-    private final IPvTenVoltageService iPvTenVoltageService;
-
-    private final IPvUnitService iPvUnitService;
-
-    private final DeptFeignClient deptFeignClient;
-
-    @Override
-    public boolean addSubArea(PvSubAreaParam pvSubAreaParam) {
-        checkNameAndParam(pvSubAreaParam,false);
-        PvSubArea pvSubArea = new PvSubArea();
-        BeanUtils.copyProperties(pvSubAreaParam,pvSubArea);
-        pvSubArea.setState(DataStateEnum.ENABLE.getCode());
-        return this.save(pvSubArea);
-    }
-
-    @Override
-    public boolean updateSubArea(PvSubAreaParam.UpdatePvSubAreaParam updatePvSubAreaParam) {
-        checkNameAndParam(updatePvSubAreaParam,true);
-        PvSubArea pvSubArea = new PvSubArea();
-        BeanUtils.copyProperties(updatePvSubAreaParam,pvSubArea);
-        pvSubArea.setState(DataStateEnum.ENABLE.getCode());
-        return this.updateById(pvSubArea);
-    }
-
-    @Override
-    public Page<PvSubAreaVO> getPvSubAreaList(SubAreaQueryParam subsAreaQueryParam) {
-        Page<PvSubAreaVO> page = new Page<>(PageFactory.getPageNum(subsAreaQueryParam),PageFactory.getPageSize(subsAreaQueryParam));
-        return this.baseMapper.getPvSubAreaList(page,subsAreaQueryParam);
-    }
-
-    @Override
-    public List<PvSubArea> getAllPvSubAreaList() {
-        return this.list();
-    }
-
-    @Override
-    public PvSubArea getPvSubAreaById(String id) {
-        return this.getById(id);
-    }
-
-    @Override
-    public boolean delPvSubArea(List<String> ids) {
-        return this.removeByIds(ids);
-    }
-
-
-    /**
-     * 校验单位名称是否重复
-     */
-    private void checkNameAndParam(PvSubAreaParam pvSubAreaParam, boolean isUpdate) {
-
-        if(Objects.isNull(iPvTenVoltageService.getPvTenVoltageById(pvSubAreaParam.getTenVoltageId()))){
-            throw new BusinessException(PvDeviceResponseEnum.TEN_VOLTAGE_NULL);
-        }
-        if(Objects.isNull(deptFeignClient.getDeptById(pvSubAreaParam.getUnitId()))){
-            throw new BusinessException(PvDeviceResponseEnum.UNIT_NULL);
-        }
-
-        LambdaQueryWrapper<PvSubArea> lambdaQueryWrapper = new LambdaQueryWrapper<>();
-        lambdaQueryWrapper.eq(PvSubArea::getName, pvSubAreaParam.getName());
-        if (isUpdate) {
-            //更新操作
-            if (pvSubAreaParam instanceof PvSubAreaParam.UpdatePvSubAreaParam) {
-                lambdaQueryWrapper.ne(PvSubArea::getId, ((PvSubAreaParam.UpdatePvSubAreaParam) pvSubAreaParam).getId());
-            }
-        }
-        int count = this.count(lambdaQueryWrapper);
-        if (count > 0) {
-            throw new BusinessException(PvDeviceResponseEnum.SUB_AREA_REPEAT);
-        }
-    }
-
-
-}
diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/impl/PvSubstationServiceImpl.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/impl/PvSubstationServiceImpl.java
deleted file mode 100644
index 7f2cc359b..000000000
--- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/impl/PvSubstationServiceImpl.java
+++ /dev/null
@@ -1,138 +0,0 @@
-package com.njcn.device.pms.service.impl;
-
-import cn.hutool.core.collection.CollUtil;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.njcn.common.pojo.exception.BusinessException;
-import com.njcn.device.pms.pojo.param.PvSubstationParam;
-import com.njcn.device.pms.pojo.param.SubstationQueryParam;
-import com.njcn.device.pms.pojo.po.PvSubstation;
-import com.njcn.device.pms.pojo.vo.PvSubstationVO;
-import com.njcn.device.pms.mapper.PvSubstationMapper;
-import com.njcn.device.pms.service.IPvSubstationService;
-import com.njcn.device.pms.service.IPvUnitService;
-import com.njcn.device.pq.enums.PvDeviceResponseEnum;
-import com.njcn.system.api.DicDataFeignClient;
-import com.njcn.system.enums.SystemResponseEnum;
-import com.njcn.system.pojo.po.DictData;
-import com.njcn.user.api.DeptFeignClient;
-import com.njcn.web.factory.PageFactory;
-import lombok.RequiredArgsConstructor;
-import org.springframework.beans.BeanUtils;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-import java.util.Objects;
-
-/**
- * <p>
- *  变电站管理实现类
- * </p>
- *
- * @author cdf
- * @since 2022-07-05
- */
-@Service
-@RequiredArgsConstructor
-public class PvSubstationServiceImpl extends ServiceImpl<PvSubstationMapper, PvSubstation> implements IPvSubstationService {
-
-    private final DicDataFeignClient dicDataFeignClient;
-
-    private final IPvUnitService iPvUnitService;
-
-    private final DeptFeignClient deptFeignClient;
-
-
-    @Override
-    public boolean addSubstation(PvSubstationParam pvSubstationParam) {
-        checkNameAndParam(pvSubstationParam,false);
-        PvSubstation pvSubstation = new PvSubstation();
-        BeanUtils.copyProperties(pvSubstationParam,pvSubstation);
-        return this.save(pvSubstation);
-    }
-
-    @Override
-    public boolean updateSubstation(PvSubstationParam.UpdatePvSubstationParam updatePvSubstationParam) {
-        checkNameAndParam(updatePvSubstationParam,true);
-        PvSubstation pvSubstation = new PvSubstation();
-        BeanUtils.copyProperties(updatePvSubstationParam,pvSubstation);
-        return this.updateById(pvSubstation);
-    }
-
-    @Override
-    public Page<PvSubstationVO> getPvSubstationList(SubstationQueryParam substationQueryParam) {
-        Page<PvSubstation> page = new Page<>(PageFactory.getPageNum(substationQueryParam),PageFactory.getPageSize(substationQueryParam));
-        if(CollUtil.isNotEmpty(substationQueryParam.getUnitId())){
-            List<String> tem = deptFeignClient.getDepSonIdtByDeptId(substationQueryParam.getUnitId().get(0)).getData();
-            tem.add(substationQueryParam.getUnitId().get(0));
-            substationQueryParam.setUnitId(tem);
-        }
-        return this.baseMapper.getPvSubstationList(page,substationQueryParam);
-    }
-
-    @Override
-    public List<PvSubstation> getAllPvSubstationList() {
-        return this.list();
-    }
-
-    @Override
-    public PvSubstation getPvSubstationById(String id) {
-        return this.getById(id);
-    }
-
-    @Override
-    public boolean delPvSubstation(List<String> ids) {
-        return this.removeByIds(ids);
-    }
-
-
-    /**
-     * 校验单位名称是否重复
-     *
-     * @author cdf
-     * @date 2022/7/5
-     */
-    private void checkNameAndParam(PvSubstationParam pvSubstationParam, boolean isUpdate) {
-        LambdaQueryWrapper<PvSubstation> lambdaQueryWrapper = new LambdaQueryWrapper<>();
-        lambdaQueryWrapper.eq(PvSubstation::getName, pvSubstationParam.getName());
-
-        if (isUpdate) {
-            //更新操作
-            if (pvSubstationParam instanceof PvSubstationParam.UpdatePvSubstationParam) {
-                lambdaQueryWrapper.ne(PvSubstation::getId, ((PvSubstationParam.UpdatePvSubstationParam) pvSubstationParam).getId());
-            }
-        }
-        int count = this.count(lambdaQueryWrapper);
-        if (count > 0) {
-            throw new BusinessException(PvDeviceResponseEnum.SUBSTATION_REPEAT);
-        }
-
-
-        lambdaQueryWrapper.clear();
-        lambdaQueryWrapper.eq(PvSubstation::getSubCode, pvSubstationParam.getSubCode());
-
-        if (isUpdate) {
-            //更新操作
-            if (pvSubstationParam instanceof PvSubstationParam.UpdatePvSubstationParam) {
-                lambdaQueryWrapper.ne(PvSubstation::getId, ((PvSubstationParam.UpdatePvSubstationParam) pvSubstationParam).getId());
-            }
-        }
-        int countCode = this.count(lambdaQueryWrapper);
-        if (countCode > 0) {
-            throw new BusinessException(PvDeviceResponseEnum.SUBSTATION_CODE_REPEAT);
-        }
-
-        DictData dictData = dicDataFeignClient.getDicDataById(pvSubstationParam.getScale()).getData();
-        if(Objects.isNull(dictData)){
-            throw new BusinessException(SystemResponseEnum.VOLTAGE_EMPTY);
-        }
-        if(Objects.isNull(deptFeignClient.getDeptById(pvSubstationParam.getUnitId()))){
-            throw new BusinessException(PvDeviceResponseEnum.UNIT_NULL);
-        }
-
-
-    }
-
-
-}
diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/impl/PvTenVoltageServiceImpl.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/impl/PvTenVoltageServiceImpl.java
deleted file mode 100644
index 9d1662556..000000000
--- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/impl/PvTenVoltageServiceImpl.java
+++ /dev/null
@@ -1,120 +0,0 @@
-package com.njcn.device.pms.service.impl;
-
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.njcn.common.pojo.enums.common.DataStateEnum;
-import com.njcn.common.pojo.exception.BusinessException;
-import com.njcn.device.pms.pojo.param.PvTenVoltageParam;
-import com.njcn.device.pms.pojo.param.TenVoltageQueryParam;
-import com.njcn.device.pms.pojo.po.PvTenVoltage;
-import com.njcn.device.pms.pojo.vo.PvTenVoltageVO;
-import com.njcn.device.pms.mapper.PvTenVoltageMapper;
-import com.njcn.device.pms.service.IPvTenVoltageService;
-import com.njcn.device.pq.enums.PvDeviceResponseEnum;
-import com.njcn.system.api.DicDataFeignClient;
-import com.njcn.system.enums.SystemResponseEnum;
-import com.njcn.system.pojo.po.DictData;
-import com.njcn.web.factory.PageFactory;
-import lombok.RequiredArgsConstructor;
-import org.springframework.beans.BeanUtils;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-import java.util.Objects;
-
-/**
- * <p>
- *  服务实现类
- * </p>
- *
- * @author cdf
- * @since 2022-07-05
- */
-@Service
-@RequiredArgsConstructor
-public class PvTenVoltageServiceImpl extends ServiceImpl<PvTenVoltageMapper, PvTenVoltage> implements IPvTenVoltageService {
-
-    private final DicDataFeignClient dicDataFeignClient;
-
-    @Override
-    public boolean addTenVoltage(PvTenVoltageParam pvTenVoltageParam) {
-        checkNameAndParam(pvTenVoltageParam,false);
-        PvTenVoltage pvTenVoltage = new PvTenVoltage();
-        BeanUtils.copyProperties(pvTenVoltageParam,pvTenVoltage);
-        pvTenVoltage.setState(DataStateEnum.ENABLE.getCode());
-        return this.save(pvTenVoltage);
-    }
-
-    @Override
-    public boolean updateTenVoltage(PvTenVoltageParam.UpdatePvTenVoltageParam updatePvTenVoltageParam) {
-        checkNameAndParam(updatePvTenVoltageParam,true);
-        PvTenVoltage pvTenVoltage = new PvTenVoltage();
-        BeanUtils.copyProperties(updatePvTenVoltageParam,pvTenVoltage);
-        pvTenVoltage.setState(DataStateEnum.ENABLE.getCode());
-        return this.updateById(pvTenVoltage);
-    }
-
-    @Override
-    public Page<PvTenVoltageVO> getPvTenVoltageList(TenVoltageQueryParam tenVoltageQueryParam) {
-        Page<PvTenVoltageVO> page = new Page<>(PageFactory.getPageNum(tenVoltageQueryParam),PageFactory.getPageSize(tenVoltageQueryParam));
-        return this.baseMapper.getPvTenVoltageList(page,tenVoltageQueryParam);
-    }
-
-    @Override
-    public List<PvTenVoltage> getAllPvTenVoltageList(){
-        return this.list();
-    }
-
-    @Override
-    public PvTenVoltage getPvTenVoltageById(String id) {
-        return this.getById(id);
-    }
-
-    @Override
-    public boolean delPvTenVoltage(List<String> ids) {
-        return this.removeByIds(ids);
-    }
-
-
-    /**
-     * 校验单位名称是否重复
-     *
-     * @author cdf
-     * @date 2022/7/5
-     */
-    private void checkNameAndParam(PvTenVoltageParam pvTenVoltageParam, boolean isUpdate) {
-
-        if(StrUtil.isNotBlank(pvTenVoltageParam.getScale())) {
-            DictData dictData = dicDataFeignClient.getDicDataById(pvTenVoltageParam.getScale()).getData();
-            if (Objects.isNull(dictData)) {
-                throw new BusinessException(SystemResponseEnum.VOLTAGE_EMPTY);
-            }
-        }
-        if(StrUtil.isNotBlank(pvTenVoltageParam.getDesignScale())) {
-            DictData dictDesignScale = dicDataFeignClient.getDicDataById(pvTenVoltageParam.getDesignScale()).getData();
-            if (Objects.isNull(dictDesignScale)) {
-                throw new BusinessException(SystemResponseEnum.VOLTAGE_EMPTY);
-            }
-        }
-
-
-
-        LambdaQueryWrapper<PvTenVoltage> lambdaQueryWrapper = new LambdaQueryWrapper<>();
-        lambdaQueryWrapper.eq(PvTenVoltage::getName, pvTenVoltageParam.getName());
-
-        if (isUpdate) {
-            //更新操作
-            if (pvTenVoltageParam instanceof PvTenVoltageParam.UpdatePvTenVoltageParam) {
-                lambdaQueryWrapper.ne(PvTenVoltage::getId, ((PvTenVoltageParam.UpdatePvTenVoltageParam) pvTenVoltageParam).getId());
-            }
-        }
-        int count = this.count(lambdaQueryWrapper);
-        if (count > 0) {
-            throw new BusinessException(PvDeviceResponseEnum.TEN_VOLTAGE_REPEAT);
-        }
-
-
-    }
-}
diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/impl/PvTerminalBaseServiceImpl.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/impl/PvTerminalBaseServiceImpl.java
deleted file mode 100644
index 77addd7aa..000000000
--- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/impl/PvTerminalBaseServiceImpl.java
+++ /dev/null
@@ -1,139 +0,0 @@
-package com.njcn.device.pms.service.impl;
-
-import cn.hutool.core.collection.CollUtil;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.njcn.common.pojo.enums.common.DataStateEnum;
-import com.njcn.common.pojo.enums.response.CommonResponseEnum;
-import com.njcn.common.pojo.exception.BusinessException;
-import com.njcn.device.pms.mapper.PvDistributedMapper;
-import com.njcn.device.pms.mapper.PvLvUserMapper;
-import com.njcn.device.pms.mapper.PvSubAreaMapper;
-import com.njcn.device.pms.mapper.PvSubstationMapper;
-import com.njcn.device.pms.service.IPvLineDetailService;
-import com.njcn.device.pms.service.IPvSubAreaService;
-import com.njcn.device.pms.service.IPvSubstationService;
-import com.njcn.device.pms.service.PvTerminalBaseService;
-import com.njcn.device.pms.pojo.param.PvTerminalBaseQuery;
-import com.njcn.device.pms.pojo.po.PvDistributed;
-import com.njcn.device.pms.pojo.po.PvLvUser;
-import com.njcn.device.pms.pojo.po.PvSubArea;
-import com.njcn.device.pms.pojo.po.PvSubstation;
-import com.njcn.device.pms.pojo.vo.DisOrLvVO;
-import com.njcn.device.pms.pojo.vo.PvLineAllDetailVO;
-import com.njcn.device.pq.enums.LineBaseEnum;
-import com.njcn.device.pq.enums.PvDeviceResponseEnum;
-import com.njcn.user.api.DeptFeignClient;
-import com.njcn.user.pojo.vo.PvTerminalTreeVO;
-import com.njcn.web.factory.PageFactory;
-import lombok.RequiredArgsConstructor;
-import org.springframework.beans.BeanUtils;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-import java.util.Objects;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
-/**
- * pqs
- *
- * @author cdf
- * @date 2022/7/11
- */
-@Service
-@RequiredArgsConstructor
-public class PvTerminalBaseServiceImpl implements PvTerminalBaseService {
-
-    private final IPvSubstationService iPvSubstationService;
-
-    private final IPvSubAreaService iPvSubAreaService;
-
-    private final IPvLineDetailService iPvLineDetailService;
-
-    private final PvSubstationMapper pvSubstationMapper;
-
-    private final PvSubAreaMapper pvSubAreaMapper;
-
-    private final PvLvUserMapper pvLvUserMapper;
-
-    private final PvDistributedMapper pvDistributedMapper;
-
-    private final DeptFeignClient deptFeignClient;
-
-    @Override
-    public List<PvTerminalTreeVO> pvTerminalTree() {
-        List<PvTerminalTreeVO> unitTreeList = deptFeignClient.allDeptList().getData();
-        List<PvTerminalTreeVO> subTreeList = pvSubstationMapper.getSubstationTreeList();
-        List<PvTerminalTreeVO> subAreaTreeList = pvSubAreaMapper.getSubAreaTreeList();
-        unitTreeList.addAll(subTreeList);
-        unitTreeList.addAll(subAreaTreeList);
-        return unitTreeList.stream().filter(item->item.getPid().equals("0")).peek(tem->tem.setChildren(getChildren(tem,unitTreeList))).collect(Collectors.toList());
-    }
-
-    @Override
-    public Page<PvLineAllDetailVO> lineDetailBySubId(PvTerminalBaseQuery pvTerminalBaseQuery) {
-        String id = pvTerminalBaseQuery.getId();
-        Integer level = pvTerminalBaseQuery.getLevel();
-        if(level.equals(LineBaseEnum.PV_UNIT_LEVEL.getCode())){
-            //点击的是单位节点
-
-            List<String> deptIds = deptFeignClient.getDepSonIdtByDeptId(id).getData();
-            if(CollUtil.isEmpty(deptIds)){
-                deptIds.add(id);
-            }
-            LambdaQueryWrapper<PvSubstation> subQuery= new LambdaQueryWrapper<>();
-            subQuery.in(PvSubstation::getUnitId,deptIds);
-            List<PvSubstation> substationList = iPvSubstationService.list(subQuery);
-            List<String> subIds = substationList.stream().map(PvSubstation::getId).collect(Collectors.toList());
-
-            LambdaQueryWrapper<PvSubArea> areaQuery= new LambdaQueryWrapper<>();
-            areaQuery.in(PvSubArea::getUnitId,deptIds);
-            List<PvSubArea> subAreaList = iPvSubAreaService.list(areaQuery);
-            List<String> subAreaIds = subAreaList.stream().map(PvSubArea::getId).collect(Collectors.toList());
-
-            if(CollUtil.isEmpty(subAreaIds) && CollUtil.isEmpty(subIds)){
-                throw new BusinessException(PvDeviceResponseEnum.NO_SUB);
-            }
-
-            return iPvLineDetailService.getPvLineAllDetailMain(PageFactory.getPageNum(pvTerminalBaseQuery),PageFactory.getPageSize(pvTerminalBaseQuery),subIds,subAreaIds,pvTerminalBaseQuery.getType(),pvTerminalBaseQuery.getLineStatus());
-        }else if(level.equals(LineBaseEnum.PV_SUB_LEVEL.getCode())){
-            return iPvLineDetailService.getPvLineAllDetailMain(PageFactory.getPageNum(pvTerminalBaseQuery),PageFactory.getPageSize(pvTerminalBaseQuery), Stream.of(pvTerminalBaseQuery.getId()).collect(Collectors.toList()), null,pvTerminalBaseQuery.getType(),pvTerminalBaseQuery.getLineStatus());
-        }else if(level.equals(LineBaseEnum.PV_SUB_AREA_LEVEL.getCode())){
-            return iPvLineDetailService.getPvLineAllDetailMain(PageFactory.getPageNum(pvTerminalBaseQuery),PageFactory.getPageSize(pvTerminalBaseQuery),null,Stream.of(pvTerminalBaseQuery.getId()).collect(Collectors.toList()),pvTerminalBaseQuery.getType(),pvTerminalBaseQuery.getLineStatus());
-        }
-        throw new BusinessException(CommonResponseEnum.FAIL);
-    }
-
-    @Override
-    public DisOrLvVO pvDisOrLv(String userCode, Integer userCodeType){
-        DisOrLvVO disOrLvVO = new DisOrLvVO();
-        if(userCodeType == 1){
-            //低压
-            LambdaQueryWrapper<PvLvUser> lambdaQueryWrapper = new LambdaQueryWrapper<>();
-            lambdaQueryWrapper.eq(PvLvUser::getUserCode,userCode).eq(PvLvUser::getState, DataStateEnum.ENABLE.getCode());
-            PvLvUser pvLvUser = pvLvUserMapper.selectOne(lambdaQueryWrapper);
-            if(Objects.nonNull(pvLvUser)){
-                BeanUtils.copyProperties(pvLvUser,disOrLvVO);
-            }
-
-        }else {
-            //分布式
-            LambdaQueryWrapper<PvDistributed> lambdaQueryWrapper = new LambdaQueryWrapper<>();
-            lambdaQueryWrapper.eq(PvDistributed::getUserCode,userCode).eq(PvDistributed::getState, DataStateEnum.ENABLE.getCode());
-            PvDistributed pvDistributed = pvDistributedMapper.selectOne(lambdaQueryWrapper);
-            if(Objects.nonNull(pvDistributed)){
-                BeanUtils.copyProperties(pvDistributed,disOrLvVO);
-            }
-        }
-        return disOrLvVO;
-    }
-
-
-
-
-
-    private List<PvTerminalTreeVO> getChildren(PvTerminalTreeVO tem, List<PvTerminalTreeVO> children) {
-        return children.stream().filter(item -> item.getPid().equals(tem.getId())).peek(t->t.setChildren(getChildren(t,children))).collect(Collectors.toList());
-    }
-}
diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/impl/PvUnitServiceImpl.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/impl/PvUnitServiceImpl.java
deleted file mode 100644
index fbc833540..000000000
--- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/impl/PvUnitServiceImpl.java
+++ /dev/null
@@ -1,108 +0,0 @@
-package com.njcn.device.pms.service.impl;
-
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.njcn.common.pojo.exception.BusinessException;
-import com.njcn.device.pms.pojo.param.PvUnitParam;
-import com.njcn.device.pms.pojo.po.PvUnit;
-import com.njcn.device.pms.pojo.vo.UnitTreeVO;
-import com.njcn.device.pms.mapper.PvUnitMapper;
-import com.njcn.device.pms.service.IPvUnitService;
-import com.njcn.device.pq.enums.PvDeviceResponseEnum;
-import com.njcn.user.pojo.vo.PvTerminalTreeVO;
-import com.njcn.web.pojo.param.BaseParam;
-import org.springframework.beans.BeanUtils;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-import java.util.Objects;
-import java.util.stream.Collectors;
-
-/**
- * <p>
- * 服务实现类
- * </p>
- *
- * @author cdf
- * @since 2022-07-05
- */
-@Service
-public class PvUnitServiceImpl extends ServiceImpl<PvUnitMapper, PvUnit> implements IPvUnitService {
-
-
-    @Override
-    public boolean addUnit(PvUnitParam pvUnitParam) {
-        checkName(pvUnitParam, false);
-        PvUnit pvUnit = new PvUnit();
-        BeanUtils.copyProperties(pvUnitParam, pvUnit);
-        return this.save(pvUnit);
-    }
-
-    @Override
-    public boolean updateUnit(PvUnitParam.UpdatePvUnitParam updatePvUnitParam) {
-        checkName(updatePvUnitParam, true);
-        PvUnit pvUnit = new PvUnit();
-        BeanUtils.copyProperties(updatePvUnitParam, pvUnit);
-        return this.updateById(pvUnit);
-    }
-
-    @Override
-    public List<UnitTreeVO> getPvUnitList(BaseParam baseParam) {
-        List<UnitTreeVO> list = this.baseMapper.getPvUnitList(baseParam.getOrderBy(), baseParam.getSortBy());
-        List<UnitTreeVO> parentList = list.stream().filter(item -> item.getPid().equals("0")).collect(Collectors.toList());
-        parentList.forEach(item -> item.setChildren(getChildren(item,list)));
-        return parentList;
-    }
-
-
-
-    /**
-     * 递归查询子节点
-     * @param root  根节点
-     * @param all   所有节点
-     * @return 根节点信息
-     */
-    private List<UnitTreeVO> getChildren(UnitTreeVO root, List<UnitTreeVO> all) {
-        return all.stream().filter(m -> Objects.equals(m.getPid(), root.getId()))
-                .peek(m -> m.setChildren(getChildren(m, all))).collect(Collectors.toList());
-    }
-
-    private List<PvTerminalTreeVO> getChildrens(PvTerminalTreeVO root, List<PvTerminalTreeVO> all) {
-        return all.stream().filter(m -> Objects.equals(m.getPid(), root.getId()))
-                .peek(m -> m.setChildren(getChildrens(m, all))).collect(Collectors.toList());
-    }
-
-    @Override
-    public PvUnit getPvUnitById(String id) {
-        return this.getById(id);
-    }
-
-    @Override
-    public boolean delPvUnit(String id) {
-        return this.removeById(id);
-    }
-
-
-    /**
-     * 校验单位名称是否重复
-     *
-     * @author cdf
-     * @date 2022/7/5
-     */
-    private void checkName(PvUnitParam pvUnitParam, boolean isUpdate) {
-        LambdaQueryWrapper<PvUnit> lambdaQueryWrapper = new LambdaQueryWrapper<>();
-        lambdaQueryWrapper.eq(PvUnit::getName, pvUnitParam.getName());
-
-        if (isUpdate) {
-            //更新操作
-            if (pvUnitParam instanceof PvUnitParam.UpdatePvUnitParam) {
-                lambdaQueryWrapper.eq(PvUnit::getId, ((PvUnitParam.UpdatePvUnitParam) pvUnitParam).getId());
-            }
-        }
-        int count = this.count(lambdaQueryWrapper);
-        if (count > 0) {
-            throw new BusinessException(PvDeviceResponseEnum.UNIT_REPEAT);
-        }
-    }
-}
diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/impl/PvVoltageServiceImpl.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/impl/PvVoltageServiceImpl.java
deleted file mode 100644
index 9e39f6f12..000000000
--- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/impl/PvVoltageServiceImpl.java
+++ /dev/null
@@ -1,121 +0,0 @@
-package com.njcn.device.pms.service.impl;
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.njcn.common.pojo.exception.BusinessException;
-import com.njcn.device.pms.pojo.param.PvVoltageParam;
-import com.njcn.device.pms.pojo.param.VoltageQueryParam;
-import com.njcn.device.pms.pojo.po.PvVoltage;
-import com.njcn.device.pms.mapper.PvVoltageMapper;
-import com.njcn.device.pms.service.IPvVoltageService;
-import com.njcn.device.pq.enums.PvDeviceResponseEnum;
-import com.njcn.system.api.DicDataFeignClient;
-import com.njcn.system.enums.SystemResponseEnum;
-import com.njcn.system.pojo.po.DictData;
-import com.njcn.web.factory.PageFactory;
-import lombok.RequiredArgsConstructor;
-import org.springframework.beans.BeanUtils;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-import java.util.Objects;
-
-/**
- * <p>
- *  母线实现类
- * </p>
- *
- * @author cdf
- * @since 2022-07-05
- */
-@Service
-@RequiredArgsConstructor
-public class PvVoltageServiceImpl extends ServiceImpl<PvVoltageMapper, PvVoltage> implements IPvVoltageService {
-
-    private final DicDataFeignClient dicDataFeignClient;
-
-    @Override
-    public boolean addVoltage(PvVoltageParam pvVoltageParam) {
-        DictData dictData = dicDataFeignClient.getDicDataById(pvVoltageParam.getScale()).getData();
-        if(Objects.isNull(dictData)){
-            throw new BusinessException(SystemResponseEnum.VOLTAGE_EMPTY);
-        }
-        checkName(pvVoltageParam,false);
-        PvVoltage pvVoltage = new PvVoltage();
-        BeanUtils.copyProperties(pvVoltageParam,pvVoltage);
-        return this.save(pvVoltage);
-    }
-
-    @Override
-    public boolean updateVoltage(PvVoltageParam.UpdatePvVoltageParam updatePvVoltageParam) {
-        DictData dictData = dicDataFeignClient.getDicDataById(updatePvVoltageParam.getScale()).getData();
-        if(Objects.isNull(dictData)){
-            throw new BusinessException(SystemResponseEnum.VOLTAGE_EMPTY);
-        }
-        checkName(updatePvVoltageParam,true);
-        PvVoltage pvVoltage = new PvVoltage();
-        BeanUtils.copyProperties(updatePvVoltageParam,pvVoltage);
-        return this.updateById(pvVoltage);
-    }
-
-    @Override
-    public Page<PvVoltage> getPvVoltageList(VoltageQueryParam voltageQueryParam) {
-        Page<PvVoltage> page = new Page<>(PageFactory.getPageNum(voltageQueryParam),PageFactory.getPageSize(voltageQueryParam));
-        LambdaQueryWrapper<PvVoltage> lambdaQueryWrapper = new LambdaQueryWrapper<>();
-        lambdaQueryWrapper.eq(PvVoltage::getName,voltageQueryParam.getSearchValue())
-                .eq(PvVoltage::getScale,voltageQueryParam.getScale());
-        return this.page(page,lambdaQueryWrapper);
-    }
-
-    @Override
-    public List<PvVoltage> getAllPvVoltageList() {
-        return this.list();
-    }
-
-    @Override
-    public PvVoltage getPvVoltageById(String id) {
-        return this.getById(id);
-    }
-
-    @Override
-    public boolean delPvVoltage(String id) {
-        return this.removeById(id);
-    }
-
-
-    /**
-     * 校验单位名称是否重复
-     *
-     * @author cdf
-     * @date 2022/7/5
-     */
-    private void checkName(PvVoltageParam pvVoltageParam, boolean isUpdate) {
-        LambdaQueryWrapper<PvVoltage> lambdaQueryWrapper = new LambdaQueryWrapper<>();
-        lambdaQueryWrapper.eq(PvVoltage::getName, pvVoltageParam.getName());
-        if (isUpdate) {
-            //更新操作
-            if (pvVoltageParam instanceof PvVoltageParam.UpdatePvVoltageParam) {
-                lambdaQueryWrapper.ne(PvVoltage::getId, ((PvVoltageParam.UpdatePvVoltageParam) pvVoltageParam).getId());
-            }
-        }
-        int count = this.count(lambdaQueryWrapper);
-        if (count > 0) {
-            throw new BusinessException(PvDeviceResponseEnum.VOLTAGE_REPEAT);
-        }
-
-        //校验序号
-      /*  lambdaQueryWrapper.clear();
-        lambdaQueryWrapper.eq(PvVoltage::getNum, pvVoltageParam.getNum());
-        if (isUpdate) {
-            //更新操作
-            if (pvVoltageParam instanceof PvVoltageParam.UpdatePvVoltageParam) {
-                lambdaQueryWrapper.eq(PvVoltage::getId, ((PvVoltageParam.UpdatePvVoltageParam) pvVoltageParam).getId());
-            }
-        }
-        int countNum = this.count(lambdaQueryWrapper);
-        if (countNum > 0) {
-            throw new BusinessException(PvDeviceResponseEnum.SUB_NUM_REPEAT);
-        }*/
-    }
-}
diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/impl/RMpMonitorAlarmCountMServiceImpl.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/impl/RMpMonitorAlarmCountMServiceImpl.java
new file mode 100644
index 000000000..ae9cd80fe
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/impl/RMpMonitorAlarmCountMServiceImpl.java
@@ -0,0 +1,127 @@
+package com.njcn.device.pms.service.impl;
+
+import cn.hutool.core.collection.CollUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.njcn.common.pojo.enums.response.CommonResponseEnum;
+import com.njcn.common.pojo.exception.BusinessException;
+import com.njcn.device.pms.mapper.RMpMonitorAlarmCountMMapper;
+import com.njcn.device.pms.pojo.param.RMpMonitorAlarmCountMParam;
+import com.njcn.device.pms.pojo.po.Monitor;
+import com.njcn.device.pms.pojo.po.RMpMonitorAlarmCountM;
+import com.njcn.device.pms.pojo.vo.RMpMonitorAlarmCountMVO;
+import com.njcn.device.pms.service.IMonitorService;
+import com.njcn.device.pms.service.RMpMonitorAlarmCountMService;
+import com.njcn.system.api.DicDataFeignClient;
+import com.njcn.system.enums.DicDataEnum;
+import com.njcn.system.enums.DicDataTypeEnum;
+import com.njcn.system.pojo.po.DictData;
+import com.njcn.user.api.DeptFeignClient;
+import com.njcn.user.pojo.dto.DeptDTO;
+import com.njcn.web.utils.WebUtil;
+import lombok.RequiredArgsConstructor;
+import org.apache.commons.lang.StringUtils;
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+/**
+ * 监测点告警统计service
+* @author jianghf
+* @description 针对表【r_mp_monitor_alarm_count_m】的数据库操作Service实现
+* @createDate 2022-10-12 20:08:33
+*/
+@Service
+@RequiredArgsConstructor
+public class RMpMonitorAlarmCountMServiceImpl extends ServiceImpl<RMpMonitorAlarmCountMMapper, RMpMonitorAlarmCountM>
+implements RMpMonitorAlarmCountMService{
+
+    private final DeptFeignClient deptFeignClient;
+
+    private final DicDataFeignClient dicDataFeignClient;
+
+    private final IMonitorService iMonitorService; //【监测点】服务类
+
+    @Override
+    public List<RMpMonitorAlarmCountMVO> getRMpMonitorAlarmCountMList(RMpMonitorAlarmCountMParam rMpMonitorAlarmCountMParam) {
+        //提取查询条件
+        String id = rMpMonitorAlarmCountMParam.getId(); //单位id
+        if (StringUtils.isBlank(id)) {
+            throw new BusinessException(CommonResponseEnum.NO_DATA, "单位id不可为空");
+        }
+        String startTime = rMpMonitorAlarmCountMParam.getStartTime(); //开始时间
+        String endTime = rMpMonitorAlarmCountMParam.getEndTime(); //结束时间
+        String monitorObjectType = rMpMonitorAlarmCountMParam.getMonitorObjectType(); //监测点对象类型id
+        List<String> voltageLevelParamList = StringUtils.isNotBlank(rMpMonitorAlarmCountMParam.getVoltageLevel()) ? Arrays.asList(rMpMonitorAlarmCountMParam.getVoltageLevel().split(",")) : null; //电压等级
+        String monitorName = rMpMonitorAlarmCountMParam.getMeasurementPointName(); //监测点名称
+
+        //获取所有子部门信息
+        List<DeptDTO> deptDTOList = deptFeignClient.getDeptDescendantIndexes(id, WebUtil.filterDeptType()).getData();
+        if (CollUtil.isEmpty(deptDTOList)) {
+            throw new BusinessException(CommonResponseEnum.NO_DATA, "部门不存在");
+        }
+        //单位id集合
+        List<String> orgNoList = deptDTOList.stream().map(DeptDTO::getId).collect(Collectors.toList());
+        //将单位信息转为map集合 key: 单位id  value: 单位实体
+        Map<String, DeptDTO> deptDTOMap = deptDTOList.stream().collect(Collectors.toMap(DeptDTO::getId, deptDTO -> deptDTO));
+
+        //获取电压等级的字典
+        List<DictData> voltageLevelList = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.DEV_VOLTAGE.getCode()).getData();
+        //将电压等级信息转成map，key：id  value：name
+        Map<String, String> voltageLevelMap = voltageLevelList.stream().collect(Collectors.toMap(DictData::getId, DictData::getName));
+        //获取监测点类型字典
+        List<DictData> monitorTypeList = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.LINE_TYPE.getCode()).getData();
+        //将监测点类型字典信息转为map集合 key: 字典id  value: 字典名称
+        Map<String, String> monitorTypeMap = monitorTypeList.stream().collect(Collectors.toMap(DictData::getId, DictData::getName));
+        //获取主网id
+        DictData mainId = dicDataFeignClient.getDicDataByCode(DicDataEnum.MAINNET_POINT.getCode()).getData();
+
+        //根据条件查询单位下面的所有监测点
+        LambdaQueryWrapper<Monitor> monitorLambdaQueryWrapper = new LambdaQueryWrapper<>();
+        monitorLambdaQueryWrapper.in(Monitor::getOrgId, orgNoList) //单位id
+                .eq(StringUtils.isNotBlank(monitorObjectType), Monitor::getMonitorObjectType, monitorObjectType) //监测点对象类型id
+                .in(CollUtil.isNotEmpty(voltageLevelParamList), Monitor::getVoltageLevel, voltageLevelParamList) //电压等级id
+                .like(StringUtils.isNotBlank(monitorName), Monitor::getName, monitorName); //监测点名称
+        //监测点集合
+        List<Monitor> monitorList = iMonitorService.list(monitorLambdaQueryWrapper);
+        //监测点id集合
+        List<String> monitorIdList = monitorList.stream().map(Monitor::getId).collect(Collectors.toList());
+        if (CollUtil.isEmpty(monitorIdList)) {
+            return new ArrayList<>();
+        }
+        //监测点map  key:监测点id  value:监测点实体
+        Map<String, Monitor> monitorMap = monitorList.stream().collect(Collectors.toMap(Monitor::getId, monitor -> monitor));
+        //根据监测点idList等条件查询【监测点告警月统计】表数据
+        LambdaQueryWrapper<RMpMonitorAlarmCountM> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+        lambdaQueryWrapper.in(RMpMonitorAlarmCountM::getMeasurementPointId, monitorIdList)
+                .ge(RMpMonitorAlarmCountM::getDataDate, startTime)
+                .le(RMpMonitorAlarmCountM::getDataDate, endTime)
+                .eq(RMpMonitorAlarmCountM::getDataType, mainId);
+        List<RMpMonitorAlarmCountM> alarmCountMList = this.list(lambdaQueryWrapper);
+        List<RMpMonitorAlarmCountMVO> resultList;
+        if (CollUtil.isNotEmpty(alarmCountMList)) {
+            //封装前端展示的数据
+            resultList = alarmCountMList.stream().map(item -> {
+                RMpMonitorAlarmCountMVO rMpMonitorAlarmCountMVO = new RMpMonitorAlarmCountMVO();
+                BeanUtils.copyProperties(item, rMpMonitorAlarmCountMVO);
+                //单位信息
+                rMpMonitorAlarmCountMVO.setOrgName(deptDTOMap.get(item.getOrgNo()).getName()); //所属单位名称
+                //监测点信息
+                rMpMonitorAlarmCountMVO.setMeasurementPointName(monitorMap.get(item.getMeasurementPointId()).getName());//监测点名称
+                rMpMonitorAlarmCountMVO.setMonitorTypeName(monitorTypeMap.get(monitorMap.get(item.getMeasurementPointId()).getMonitorType()));//监测点类型名称
+                rMpMonitorAlarmCountMVO.setMonitorType(monitorMap.get(item.getMeasurementPointId()).getMonitorType());//监测点类型id
+                rMpMonitorAlarmCountMVO.setVoltageLevel(monitorMap.get(item.getMeasurementPointId()).getVoltageLevel()); //电压等级id
+                rMpMonitorAlarmCountMVO.setVoltageLevelName(voltageLevelMap.get(monitorMap.get(item.getMeasurementPointId()).getVoltageLevel())); //电压等级
+                return rMpMonitorAlarmCountMVO;
+            }).collect(Collectors.toList());
+        } else {
+            resultList = new ArrayList<>();
+        }
+        return resultList;
+    }
+}
diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/impl/RMpPwAlarmDetailDServiceImpl.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/impl/RMpPwAlarmDetailDServiceImpl.java
new file mode 100644
index 000000000..6340287c6
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/impl/RMpPwAlarmDetailDServiceImpl.java
@@ -0,0 +1,18 @@
+package com.njcn.device.pms.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.njcn.device.pms.mapper.RMpPwAlarmDetailDMapper;
+import com.njcn.device.pms.pojo.po.RMpPwAlarmDetailD;
+import com.njcn.device.pms.service.RMpPwAlarmDetailDService;
+import org.springframework.stereotype.Service;
+
+/**
+* @author jianghf
+* @description 针对表【r_mp_pw_alarm_detail_d】的数据库操作Service实现
+* @createDate 2022-10-17 09:00:27
+*/
+@Service
+public class RMpPwAlarmDetailDServiceImpl extends ServiceImpl<RMpPwAlarmDetailDMapper, RMpPwAlarmDetailD>
+implements RMpPwAlarmDetailDService{
+
+}
diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/impl/RMpTargetWarnDServiceImpl.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/impl/RMpTargetWarnDServiceImpl.java
new file mode 100644
index 000000000..78e689829
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/impl/RMpTargetWarnDServiceImpl.java
@@ -0,0 +1,18 @@
+package com.njcn.device.pms.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.njcn.device.pms.mapper.RMpTargetWarnDMapper;
+import com.njcn.device.pms.pojo.po.RMpTargetWarnD;
+import com.njcn.device.pms.service.RMpTargetWarnDService;
+import org.springframework.stereotype.Service;
+
+/**
+* @author jianghf
+* @description 针对表【r_mp_target_warn_d】的数据库操作Service实现
+* @createDate 2022-10-17 10:20:11
+*/
+@Service
+public class RMpTargetWarnDServiceImpl extends ServiceImpl<RMpTargetWarnDMapper, RMpTargetWarnD>
+implements RMpTargetWarnDService{
+
+}
diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/impl/RStatAreaAlarmCountMServiceImpl.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/impl/RStatAreaAlarmCountMServiceImpl.java
new file mode 100644
index 000000000..f8393190b
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/impl/RStatAreaAlarmCountMServiceImpl.java
@@ -0,0 +1,91 @@
+package com.njcn.device.pms.service.impl;
+
+import cn.hutool.core.collection.CollUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.njcn.common.pojo.enums.response.CommonResponseEnum;
+import com.njcn.common.pojo.exception.BusinessException;
+import com.njcn.device.pms.mapper.RStatAreaAlarmCountMMapper;
+import com.njcn.device.pms.pojo.param.RStatAreaAlarmCountMParam;
+import com.njcn.device.pms.pojo.po.RStatAreaAlarmCountM;
+import com.njcn.device.pms.pojo.vo.RStatAreaAlarmCountMVO;
+import com.njcn.device.pms.service.RStatAreaAlarmCountMService;
+import com.njcn.system.api.DicDataFeignClient;
+import com.njcn.system.enums.DicDataEnum;
+import com.njcn.system.pojo.po.DictData;
+import com.njcn.user.api.DeptFeignClient;
+import com.njcn.user.pojo.dto.DeptDTO;
+import com.njcn.web.utils.WebUtil;
+import lombok.RequiredArgsConstructor;
+import org.apache.commons.lang.StringUtils;
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+/**
+* @author jianghf
+* @description 针对表【r_stat_area_alarm_count_m】的数据库操作Service实现
+* @createDate 2022-10-10 14:36:46
+*/
+@Service
+@RequiredArgsConstructor
+public class RStatAreaAlarmCountMServiceImpl extends ServiceImpl<RStatAreaAlarmCountMMapper, RStatAreaAlarmCountM>
+implements RStatAreaAlarmCountMService{
+
+    private final DeptFeignClient deptFeignClient;
+
+    private final DicDataFeignClient dicDataFeignClient;
+
+    @Override
+    public List<RStatAreaAlarmCountMVO> getAllRStatAreaAlarmCountMList(RStatAreaAlarmCountMParam rStatAreaAlarmCountMParam) {
+        //获取查询条件
+        String id = rStatAreaAlarmCountMParam.getId(); //单位id
+        if (StringUtils.isBlank(id)) {
+            throw new BusinessException(CommonResponseEnum.NO_DATA, "单位id不可为空");
+        }
+        String startTime = rStatAreaAlarmCountMParam.getStartTime(); //开始时间 yyyy-MM-dd
+        String endTime = rStatAreaAlarmCountMParam.getEndTime(); //截止时间 yyyy-MM-dd
+        //获取所有子部门信息
+        List<DeptDTO> deptDTOList = deptFeignClient.getDeptDescendantIndexes(id, WebUtil.filterDeptType()).getData();
+        if (CollUtil.isEmpty(deptDTOList)) {
+            throw new BusinessException(CommonResponseEnum.NO_DATA, "部门不存在");
+        }
+        //单位id集合
+        List<String> orgNoList = deptDTOList.stream().map(DeptDTO::getId).collect(Collectors.toList());
+        //将单位信息转为map集合 key: 单位id  value: 单位实体
+        Map<String, DeptDTO> deptDTOMap = deptDTOList.stream().collect(Collectors.toMap(DeptDTO::getId, deptDTO -> deptDTO));
+        //获取主网id
+        DictData mainId = dicDataFeignClient.getDicDataByCode(DicDataEnum.MAINNET_POINT.getCode()).getData();
+
+        LambdaQueryWrapper<RStatAreaAlarmCountM> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+        //条件组装: where org_no in (orgNoList) and data_date >= startTime and data_date <= endTime
+        lambdaQueryWrapper.in(CollUtil.isNotEmpty(orgNoList), RStatAreaAlarmCountM::getOrgNo, orgNoList)
+                .ge(StringUtils.isNotBlank(startTime), RStatAreaAlarmCountM::getDataDate, startTime)
+                .le(StringUtils.isNotBlank(endTime), RStatAreaAlarmCountM::getDataDate, endTime)
+                .eq(RStatAreaAlarmCountM::getDataType, mainId);
+
+        //查询区域告警统计(月)集合
+        List<RStatAreaAlarmCountM> records = this.list(lambdaQueryWrapper);
+
+        List<RStatAreaAlarmCountMVO> resultList;
+        if (CollUtil.isNotEmpty(records)) {
+            //填充返回数据
+            resultList = records.stream().map(item -> {
+                RStatAreaAlarmCountMVO rStatAreaAlarmCountMVO = new RStatAreaAlarmCountMVO();
+                BeanUtils.copyProperties(item, rStatAreaAlarmCountMVO);
+                //设置单位名称
+                rStatAreaAlarmCountMVO.setOrgName(deptDTOMap.get(rStatAreaAlarmCountMVO.getOrgNo()).getName());
+
+                return rStatAreaAlarmCountMVO;
+            }).collect(Collectors.toList());
+        } else {
+            resultList = new ArrayList<>();
+        }
+        return resultList;
+    }
+}
diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/impl/RStatBusbarHarmonicServiceImpl.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/impl/RStatBusbarHarmonicServiceImpl.java
new file mode 100644
index 000000000..13434c10b
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/impl/RStatBusbarHarmonicServiceImpl.java
@@ -0,0 +1,122 @@
+package com.njcn.device.pms.service.impl;
+
+import cn.hutool.core.collection.CollectionUtil;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.njcn.device.pms.mapper.RStatBusbarHarmonicMapper;
+import com.njcn.device.pms.pojo.param.UniversalFrontEndParam;
+import com.njcn.device.pms.pojo.po.PmsMonitorPO;
+import com.njcn.device.pms.pojo.vo.RStatBusbarHarmonicVO;
+import com.njcn.device.pms.service.RStatBusbarHarmonicService;
+import com.njcn.system.api.DicDataFeignClient;
+import com.njcn.system.enums.DicDataTypeEnum;
+import com.njcn.system.pojo.po.DictData;
+import com.njcn.user.api.DeptFeignClient;
+import com.njcn.user.pojo.dto.DeptDTO;
+import com.njcn.web.utils.WebUtil;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * 变电站母线电压指标年报业务层实现类
+ *
+ * @author yzh
+ * @date 2022/10/8
+ */
+
+@Service
+@RequiredArgsConstructor
+@Slf4j
+public class RStatBusbarHarmonicServiceImpl extends ServiceImpl<RStatBusbarHarmonicMapper, RStatBusbarHarmonicVO> implements RStatBusbarHarmonicService {
+
+    private final RStatBusbarHarmonicMapper rStatBusbarHarmonicMapper;
+
+    private final DicDataFeignClient dicDataFeignClient;
+
+    private final DeptFeignClient deptFeignClient;
+
+
+    /**
+     * 获取变电站母线电压指标年报
+     *
+     * @param param 前端参数
+     * @return 变电站母线电压指标年报返回前端实体类
+     */
+    @Override
+    public List<RStatBusbarHarmonicVO> getRStatBusbarHarmonic(UniversalFrontEndParam param) {
+
+        // 获取登录用户的部门id
+//        String deptIndex = RequestUtil.getDeptIndex();
+
+        // 获取当前用户的部门的子部门信息
+        List<DeptDTO> data = deptFeignClient.getDeptDescendantIndexes(param.getId(), WebUtil.filterDeptType()).getData();
+
+        if (CollectionUtil.isNotEmpty(data)) {
+            // 创建集合用于封装数据
+            List<RStatBusbarHarmonicVO> info = new ArrayList<>();
+
+            // 过滤出部门id
+            List<String> deptIds = data.stream().map(DeptDTO::getId).collect(Collectors.toList());
+            // 根据部门id 获取监测点信息
+            List<PmsMonitorPO> monitorInfo = rStatBusbarHarmonicMapper.getMonitorInfo(deptIds);
+            // 取出母线id
+            List<String> generatrixIds = monitorInfo.stream().map(PmsMonitorPO::getGeneratrixId).collect(Collectors.toList());
+
+            // 获取电压字典
+            List<DictData> devVoltageData = dicDataFeignClient.getDicDataByTypeCode(
+                    DicDataTypeEnum.DEV_VOLTAGE.getCode()).getData();
+
+            // 通过母线id查询变电站背景谐波年表
+            info = rStatBusbarHarmonicMapper.getAnnualReportOfSubstationBusVoltageIndex(param.getStartTime(), param.getEndTime(), generatrixIds);
+
+            // 属性赋值
+            for (RStatBusbarHarmonicVO vo : info) {
+                for (PmsMonitorPO pmsMonitor : monitorInfo) {
+                    if (vo.getBusbarId().equals(pmsMonitor.getGeneratrixId())){
+                        vo.setDeptId(pmsMonitor.getOrgId());
+                    }
+                }
+            }
+
+            return info;
+        } else {
+            return new ArrayList<>();
+        }
+    }
+
+    /**
+     * 属性赋值
+     *
+     * @param data                                    当前用户的部门的子部门信息
+     * @param annualReportOfSubstationBusVoltageIndex 母线id查询变电站背景谐波年表
+     * @param subAndVoltageInfos                      母线和变电站信息
+     * @return 返回前端集合
+     */
+    private void attributeCopy(List<DeptDTO> data, List<RStatBusbarHarmonicVO> annualReportOfSubstationBusVoltageIndex, List<RStatBusbarHarmonicVO> subAndVoltageInfos) {
+        // 属性赋值
+        for (RStatBusbarHarmonicVO vo : annualReportOfSubstationBusVoltageIndex) {
+            for (RStatBusbarHarmonicVO subAndVoltageInfo : subAndVoltageInfos) {
+                if (subAndVoltageInfo.getBusbarId().equals(vo.getBusbarId())) {
+                    vo.setDeptId(subAndVoltageInfo.getDeptId());
+                    vo.setSubName(subAndVoltageInfo.getSubName());
+                    vo.setSubVoltageLevel(subAndVoltageInfo.getSubVoltageLevel());
+                    vo.setBusbarName(subAndVoltageInfo.getBusbarName());
+                }
+            }
+        }
+
+        // 属性赋值
+        for (RStatBusbarHarmonicVO vo : annualReportOfSubstationBusVoltageIndex) {
+            for (DeptDTO datum : data) {
+                if (datum.getId().equals(vo.getDeptId())) {
+                    vo.setCompany(datum.getName());
+                }
+            }
+        }
+    }
+
+}
diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/impl/RStatZwAlarmCountWServiceImpl.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/impl/RStatZwAlarmCountWServiceImpl.java
new file mode 100644
index 000000000..f9afb4557
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/impl/RStatZwAlarmCountWServiceImpl.java
@@ -0,0 +1,233 @@
+package com.njcn.device.pms.service.impl;
+
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.date.Month;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.njcn.common.pojo.enums.response.CommonResponseEnum;
+import com.njcn.common.pojo.exception.BusinessException;
+import com.njcn.device.pms.mapper.RStatZwAlarmCountWMapper;
+import com.njcn.device.pms.pojo.param.RStatZwAlarmCountWParam;
+import com.njcn.device.pms.pojo.po.*;
+import com.njcn.device.pms.pojo.vo.ProblemMonitorDetailVO;
+import com.njcn.device.pms.pojo.vo.RStatZwAlarmCountWVO;
+import com.njcn.device.pms.service.*;
+import com.njcn.system.api.DicDataFeignClient;
+import com.njcn.system.enums.DicDataTypeEnum;
+import com.njcn.system.pojo.po.DictData;
+import com.njcn.user.api.DeptFeignClient;
+import com.njcn.user.pojo.dto.DeptDTO;
+import com.njcn.web.utils.WebUtil;
+import lombok.RequiredArgsConstructor;
+import org.apache.commons.lang.StringUtils;
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Service;
+
+import java.text.DecimalFormat;
+import java.util.*;
+import java.util.stream.Collectors;
+
+/**
+* @author jianghf
+* @description 针对表【r_stat_zw_alarm_count_w】的数据库操作Service实现
+* @createDate 2022-10-08 16:35:44
+*/
+@Service
+@RequiredArgsConstructor
+public class RStatZwAlarmCountWServiceImpl extends ServiceImpl<RStatZwAlarmCountWMapper, RStatZwAlarmCountW>
+implements RStatZwAlarmCountWService {
+
+    private final DeptFeignClient deptFeignClient;
+
+    private final RMpPwAlarmDetailDService rMpPwAlarmDetailDService; //【告警明细-日表】服务类
+
+    private final RMpTargetWarnDService rMpTargetWarnDService; // 【监测点指标告警明细日表】服务类
+
+    private final IMonitorService iMonitorService; //【监测点】服务类
+
+    private final IStatationStatService iStatationStatService; //【变电站】服务类
+
+    private final DicDataFeignClient dicDataFeignClient; //字典
+    /***
+     * 查询所有告警统计(周)
+     * @author jianghaifei
+     * @date 2022-10-09 10:22
+     * @param
+     * @return java.util.List<com.njcn.device.pms.pojo.po.RStatZwAlarmCountW>
+     */
+    @Override
+    public List<RStatZwAlarmCountWVO> getAllRStatZwAlarmCountWList(RStatZwAlarmCountWParam rStatZwAlarmCountWParam) {
+        //获取查询条件
+        String id = rStatZwAlarmCountWParam.getId(); //单位id
+        if (StringUtils.isBlank(id)) {
+            throw new BusinessException(CommonResponseEnum.NO_DATA, "单位id不可为空");
+        }
+        String startTime = rStatZwAlarmCountWParam.getStartTime(); //开始时间 yyyy-MM-dd
+        String endTime = rStatZwAlarmCountWParam.getEndTime(); //截止时间 yyyy-MM-dd
+        //获取所有子部门信息
+        List<DeptDTO> deptDTOList = deptFeignClient.getDeptDescendantIndexes(id, WebUtil.filterDeptType()).getData();
+        if (CollUtil.isEmpty(deptDTOList)) {
+            throw new BusinessException(CommonResponseEnum.NO_DATA, "部门不存在");
+        }
+        //单位id集合
+        List<String> orgNoList = deptDTOList.stream().map(DeptDTO::getId).collect(Collectors.toList());
+        //将单位信息转为map集合 key: 单位id  value: 单位实体
+        Map<String, DeptDTO> deptDTOMap = deptDTOList.stream().collect(Collectors.toMap(DeptDTO::getId, deptDTO -> deptDTO));
+
+        LambdaQueryWrapper<RStatZwAlarmCountW> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+        //条件组装: where org_no in (orgNoList) and data_date >= startTime and data_date <= endTime
+        lambdaQueryWrapper.in(CollUtil.isNotEmpty(orgNoList), RStatZwAlarmCountW::getOrgNo, orgNoList)
+                .ge(StringUtils.isNotBlank(startTime), RStatZwAlarmCountW::getDataDate, startTime)
+                .le(StringUtils.isNotBlank(endTime), RStatZwAlarmCountW::getDataDate, endTime);
+        //查询告警统计(周)集合
+        List<RStatZwAlarmCountW> records = this.list(lambdaQueryWrapper);
+        List<RStatZwAlarmCountWVO> resultList;
+        if (CollUtil.isNotEmpty(records)) {
+            resultList = records.stream().map(item -> {
+                RStatZwAlarmCountWVO rStatZwAlarmCountWVO = new RStatZwAlarmCountWVO();
+                BeanUtils.copyProperties(item, rStatZwAlarmCountWVO);
+                //单位名称
+                rStatZwAlarmCountWVO.setOrgName(deptDTOMap.get(rStatZwAlarmCountWVO.getOrgNo()).getName());
+                DecimalFormat df = new DecimalFormat("###.00");
+                //获取有效监测点数量
+                Integer monitorEffectiveCount = item.getMonitorEffectiveCount();
+                if (monitorEffectiveCount == null || monitorEffectiveCount <= 0) {
+                    throw new BusinessException(CommonResponseEnum.NO_DATA, "有效监测点数量异常");
+                }
+                //计算告警四次及以上监测点占比（ * 100 是直接取到百分比）
+                Double warnMonitorRate = Double.parseDouble(df.format(item.getWarnMonitorCount() / (monitorEffectiveCount * 1.0) * 100));
+                rStatZwAlarmCountWVO.setWarnMonitorRate(warnMonitorRate);
+                //级别'较差'监测点占比（ * 100 是直接取到百分比）
+                Double monitorGradeRate = Double.parseDouble(df.format(item.getMonitorGradeCount() / (monitorEffectiveCount * 1.0) * 100));
+                rStatZwAlarmCountWVO.setMonitorGradeRate(monitorGradeRate);
+
+                return rStatZwAlarmCountWVO;
+            }).collect(Collectors.toList());
+        } else {
+            resultList = new ArrayList<>();
+        }
+
+        return resultList;
+    }
+
+
+    /***
+     * 查询问题严重的监测点信息
+     * @author jianghaifei
+     * @date 2022-10-13 19:38
+     * @param rStatZwAlarmCountWParam
+     * @return java.util.List<com.njcn.device.pms.pojo.vo.ProblemMonitorDetailVO>
+     */
+    @Override
+    public List<ProblemMonitorDetailVO> getProblemMonitorDetailList(RStatZwAlarmCountWParam rStatZwAlarmCountWParam) {
+        //提取参数
+        String id = rStatZwAlarmCountWParam.getId(); //单位id
+        String startTime = rStatZwAlarmCountWParam.getStartTime();
+        String endTime = rStatZwAlarmCountWParam.getEndTime();
+
+        //获取电压等级的字典
+        List<DictData> voltageLevelList = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.DEV_VOLTAGE.getCode()).getData();
+        //将电压信息转成map，key：id  value：name
+        Map<String, String> voltageLevelMap = voltageLevelList.stream().collect(Collectors.toMap(DictData::getId, DictData::getName));
+        //查询当前单位下监测点idList
+        LambdaQueryWrapper<Monitor> monitorLambdaQueryWrapper = new LambdaQueryWrapper<>();
+        monitorLambdaQueryWrapper.eq(Monitor::getOrgId, id);
+        List<String> orgMeasurementPointIdList = iMonitorService.list(monitorLambdaQueryWrapper).stream().map(Monitor::getId).collect(Collectors.toList());
+        //以周为时间段，查询告警超过四次的监测点信息
+        LambdaQueryWrapper<RMpPwAlarmDetailD> alarmDetailWrapper = new LambdaQueryWrapper<>();
+        /*
+        组装查询条件：select count(1) from r_mp_pw_alarm_detail_d where data_date <= '2022-10-23'
+             and data_date >= '2022-10-17' and measurement_point_id in (orgMeasurementPointIdList)
+             group by measurement_point_id having count(measurement_point_id) >= 4
+         */
+        alarmDetailWrapper.select(RMpPwAlarmDetailD::getMeasurementPointId)
+                .in(RMpPwAlarmDetailD::getMeasurementPointId, orgMeasurementPointIdList)
+                .ge(StringUtils.isNotBlank(startTime), RMpPwAlarmDetailD::getDataDate, startTime)
+                .le(StringUtils.isNotBlank(endTime), RMpPwAlarmDetailD::getDataDate, endTime)
+                .groupBy(RMpPwAlarmDetailD::getMeasurementPointId)
+                .having("count(measurement_point_id) >= {0}", 4);
+        //告警超过四次的监测点idList
+        List<String> measurementPointIdList = rMpPwAlarmDetailDService.listObjs(alarmDetailWrapper, Object::toString);
+
+        // 计算问题严重的监测点
+        //  获取查询条件：月份开始时间、结束时间
+        Date date = DateUtil.parse(startTime);
+        String startTimeOfMonth = DateUtil.format(DateUtil.beginOfMonth(date), "yyyy-MM-dd");
+        String endTimeOfMonth = DateUtil.format(DateUtil.endOfMonth(date), "yyyy-MM-dd");
+        //获取查询月份的自然月天数
+        int monthDay = Month.of(DateUtil.month(date)).getLastDay(DateUtil.isLeapYear(DateUtil.year(date)));
+
+        //根据单位下监测点idList、月份条件查询监测点告警信息
+        LambdaQueryWrapper<RMpTargetWarnD> targetWarnWrapper = new LambdaQueryWrapper<>();
+        //组装查询条件：
+        targetWarnWrapper.in(RMpTargetWarnD::getMeasurementPointId, orgMeasurementPointIdList)
+                .ge(StringUtils.isNotBlank(startTime), RMpTargetWarnD::getDataDate, startTimeOfMonth)
+                .le(StringUtils.isNotBlank(endTime), RMpTargetWarnD::getDataDate, endTimeOfMonth);
+        List<RMpTargetWarnD> targetWarnDList = rMpTargetWarnDService.list(targetWarnWrapper);
+        //使用stream的分组方法（Collectors.partitioningBy()）对告警记录和没有告警的记录进行分组 true：有告警的记录 false：没有告警的记录
+//        Map<Boolean, List<RMpTargetWarnD>> booleanListMap = targetWarnDList.stream().collect(Collectors.groupingBy(
+//                item -> item.getIsEffective() == 1 || item.getIsHarmonic() == 1 || item.getIsEvent() == 1 || item.getIsWarn() == 1
+//                || item.getIsVDevWarn() == 1 || item.getIsFreqWarn() == 1 || item.getIsUnbalanceWarn() == 1 || item.getIsVWarn() == 1
+//                || item.getIsFlickerWarn() == 1 || item.getIsSagWarn() == 1 || item.getIsInterruptWarn() == 1));
+        //提取有告警情况的记录
+//        List<RMpTargetWarnD> rMpTargetWarnDS4Warn = booleanListMap.get(true);
+        //提取没有告警情况的记录
+//        List<RMpTargetWarnD> rMpTargetWarnDS4Normal = booleanListMap.get(true);
+        //过滤出有告警信息的记录
+        List<RMpTargetWarnD> rMpTargetWarnDS4Warn = targetWarnDList.stream().filter(
+                item -> item.getIsEffective() == 1 || item.getIsHarmonic() == 1 || item.getIsEvent() == 1 || item.getIsWarn() == 1
+                        || item.getIsVDevWarn() == 1 || item.getIsFreqWarn() == 1 || item.getIsUnbalanceWarn() == 1 || item.getIsVWarn() == 1
+                        || item.getIsFlickerWarn() == 1 || item.getIsSagWarn() == 1 || item.getIsInterruptWarn() == 1).collect(Collectors.toList());
+        //创建map集合，用于统计某个监测点的记录条数
+        HashMap<String, Integer> monitorCountMap = new HashMap<>();
+        for (RMpTargetWarnD item : rMpTargetWarnDS4Warn) {
+            if (monitorCountMap.containsKey(item.getMeasurementPointId())) {
+                monitorCountMap.put(item.getMeasurementPointId(), monitorCountMap.get(item.getMeasurementPointId()) + 1);
+            } else {
+                monitorCountMap.put(item.getMeasurementPointId(), 1);
+            }
+        }
+        //创建map集合，key：监测点id  value：严重程度
+        HashMap<String, Double> severityMap = new HashMap<>();
+        for (String measurementPointId : monitorCountMap.keySet()) {
+            Integer integer = monitorCountMap.get(measurementPointId); //当前遍历的监测点告警天数
+            double severity = integer / (monthDay * 1.0); //严重程度
+            severityMap.put(measurementPointId, severity);
+        }
+        //给严重程度从大到小排序，并将严重程度前【30%】的监测点id放到List集合中
+//        List<String> severity = new ArrayList<>();
+//        severityMap.entrySet().stream().sorted(Map.Entry.comparingByValue(Comparator.reverseOrder())).collect(Collectors.toList())
+//                .subList(0, (int)(severityMap.size() * 0.3)).forEach(item -> severity.add(item.getKey()));
+        List<String> severity = severityMap.entrySet().stream().sorted(Map.Entry.comparingByValue(Comparator.reverseOrder()))
+                .limit((int)Math.ceil(severityMap.size() * 0.3)).map(Map.Entry::getKey).collect(Collectors.toList());
+        //合并告警超过四次的监测点ids和严重程度前30%监测点dis
+        measurementPointIdList.addAll(severity);
+        //去除集合中重复的监测点id，得到最终的有严重问题的监测点id集合
+        List<String> lastMeasurementPointList = measurementPointIdList.stream().distinct().collect(Collectors.toList());
+        //根据监测点ids查询监测点信息
+        monitorLambdaQueryWrapper.clear();
+        monitorLambdaQueryWrapper.in(Monitor::getId, lastMeasurementPointList);
+        List<Monitor> monitorList = iMonitorService.list(monitorLambdaQueryWrapper);
+        //提取出监测点相关的变电站id，获取变电站电压等级map（key: 变电站id  value: 电压等级）
+        List<String> powerIdList = monitorList.stream().map(Monitor::getPowerrId).collect(Collectors.toList());
+        LambdaQueryWrapper<StatationStat> stationLambdaQueryWrapper = new LambdaQueryWrapper<>();
+        stationLambdaQueryWrapper.in(StatationStat::getPowerId, powerIdList);
+        Map<String, String> stationVoltageLevelMap = iStatationStatService.list(stationLambdaQueryWrapper).stream()
+                .collect(Collectors.toMap(StatationStat::getPowerId, StatationStat::getVoltageLevel));
+        //封装返回数据
+        List<ProblemMonitorDetailVO> resultList = monitorList.stream().map(item -> {
+            ProblemMonitorDetailVO problemMonitorDetailVO = new ProblemMonitorDetailVO();
+            problemMonitorDetailVO.setOrgNo(item.getOrgId()); //单位id
+            problemMonitorDetailVO.setOrgName(item.getOrgName()); //单位名称
+            problemMonitorDetailVO.setMonitorId(item.getId()); //监测点id
+            problemMonitorDetailVO.setMonitorName(item.getName()); //监测点名称
+            problemMonitorDetailVO.setPowerName(item.getPowerrName()); //变电站名称
+            problemMonitorDetailVO.setVoltageLevel(stationVoltageLevelMap.get(item.getPowerrId())); //变电站电压等级id
+            problemMonitorDetailVO.setVoltageLevelName(voltageLevelMap.get(stationVoltageLevelMap.get(item.getPowerrId()))); //变电站电压等级
+
+            return problemMonitorDetailVO;
+        }).collect(Collectors.toList());
+        return resultList;
+    }
+}
diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/impl/RmpEventDetailServiceImpl.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/impl/RmpEventDetailServiceImpl.java
new file mode 100644
index 000000000..db093e70a
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/impl/RmpEventDetailServiceImpl.java
@@ -0,0 +1,37 @@
+package com.njcn.device.pms.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.njcn.device.pms.mapper.RmpEventDetailMapper;
+import com.njcn.device.pms.pojo.param.UniversalFrontEndParam;
+import com.njcn.device.pms.pojo.vo.RmpEventDetailVO;
+import com.njcn.device.pms.service.RmpEventDetailService;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * 暂态事件明细
+ *
+ * @author yzh
+ * @date 2022/10/12
+ */
+@Service
+@Slf4j
+@RequiredArgsConstructor
+public class RmpEventDetailServiceImpl extends ServiceImpl<RmpEventDetailMapper, RmpEventDetailVO> implements RmpEventDetailService {
+
+    private final RmpEventDetailMapper rmpEventDetailMapper;
+
+    /**
+     * 获取暂态事件明细
+     *
+     * @param param 前端参数
+     * @return 暂态事件明细
+     */
+    @Override
+    public List<RmpEventDetailVO> getRmpEventDetail(UniversalFrontEndParam param) {
+        return null;
+    }
+}
diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/impl/SourceManagementServiceImpl.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/impl/SourceManagementServiceImpl.java
new file mode 100644
index 000000000..2718245e1
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/impl/SourceManagementServiceImpl.java
@@ -0,0 +1,20 @@
+package com.njcn.device.pms.service.impl;
+
+import com.njcn.device.pms.mapper.SourceManagementMapper;
+import com.njcn.device.pms.pojo.po.SourceManagement;
+import com.njcn.device.pms.service.ISourceManagementService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author hongawen
+ * @since 2022-10-14
+ */
+@Service
+public class SourceManagementServiceImpl extends ServiceImpl<SourceManagementMapper, SourceManagement> implements ISourceManagementService {
+
+}
diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/impl/StatationStatServiceImpl.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/impl/StatationStatServiceImpl.java
new file mode 100644
index 000000000..0dea3b711
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/impl/StatationStatServiceImpl.java
@@ -0,0 +1,72 @@
+package com.njcn.device.pms.service.impl;
+
+import com.njcn.device.pms.mapper.StatationStatMapper;
+import com.njcn.device.pms.pojo.dto.PmsStatationStatInfoDTO;
+import com.njcn.device.pms.pojo.param.StatationStatParam;
+import com.njcn.device.pms.pojo.param.PmsStatationStatInfoParam;
+import com.njcn.device.pms.pojo.po.StatationStat;
+import com.njcn.device.pms.pojo.po.StatationStat;
+import com.njcn.device.pms.service.IStatationStatService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.njcn.web.pojo.param.BaseParam;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author hongawen
+ * @since 2022-10-14
+ */
+@Service
+@RequiredArgsConstructor
+public class StatationStatServiceImpl extends ServiceImpl<StatationStatMapper, StatationStat> implements IStatationStatService {
+
+    private final StatationStatMapper statationStatMapper;
+
+    /**
+     * 获取指定的变电站信息
+     *
+     * @param pmsStatationStatInfoParam 变电站详情数据入参
+     * @return 指定的变电站信息
+     */
+    @Override
+    public List<PmsStatationStatInfoDTO> getStatationStatInfo(PmsStatationStatInfoParam pmsStatationStatInfoParam) {
+        return statationStatMapper.getStatationStatInfo(pmsStatationStatInfoParam);
+    }
+
+
+    @Override
+    public boolean addStatationStat(StatationStatParam statationStatParam) {
+        StatationStat statationStat = new StatationStat();
+        BeanUtils.copyProperties(statationStatParam, statationStat);
+        return this.save(statationStat);
+    }
+
+    @Override
+    public boolean updateStatationStat(StatationStatParam statationStatParam) {
+        StatationStat statationStat = new StatationStat();
+        BeanUtils.copyProperties(statationStatParam, statationStat);
+        return this.save(statationStat);
+    }
+
+    @Override
+    public boolean delStatationStat(List<String> statationStatIds) {
+        return this.removeByIds(statationStatIds);
+    }
+
+    @Override
+    public StatationStat getStatationStatById(String statationStatId) {
+        return this.getById(statationStatId);
+    }
+
+    @Override
+    public List<StatationStat> getStatationStatList(BaseParam baseParam) {
+        return this.list();
+    }
+}
diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/impl/StatisticsRunMonitorServiceImpl.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/impl/StatisticsRunMonitorServiceImpl.java
new file mode 100644
index 000000000..936a1aa5e
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/impl/StatisticsRunMonitorServiceImpl.java
@@ -0,0 +1,20 @@
+package com.njcn.device.pms.service.impl;
+
+import com.njcn.device.pms.mapper.StatisticsRunMonitorMapper;
+import com.njcn.device.pms.pojo.po.StatisticsRunMonitor;
+import com.njcn.device.pms.service.IStatisticsRunMonitorService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author hongawen
+ * @since 2022-10-14
+ */
+@Service
+public class StatisticsRunMonitorServiceImpl extends ServiceImpl<StatisticsRunMonitorMapper, StatisticsRunMonitor> implements IStatisticsRunMonitorService {
+
+}
diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/impl/TerminalEliminateDataServiceImpl.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/impl/TerminalEliminateDataServiceImpl.java
new file mode 100644
index 000000000..907521cc2
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/impl/TerminalEliminateDataServiceImpl.java
@@ -0,0 +1,20 @@
+package com.njcn.device.pms.service.impl;
+
+import com.njcn.device.pms.mapper.TerminalEliminateDataMapper;
+import com.njcn.device.pms.pojo.po.TerminalEliminateData;
+import com.njcn.device.pms.service.ITerminalEliminateDataService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author hongawen
+ * @since 2022-10-14
+ */
+@Service
+public class TerminalEliminateDataServiceImpl extends ServiceImpl<TerminalEliminateDataMapper, TerminalEliminateData> implements ITerminalEliminateDataService {
+
+}
diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/impl/TerminalServiceImpl.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/impl/TerminalServiceImpl.java
new file mode 100644
index 000000000..59cf3002d
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/impl/TerminalServiceImpl.java
@@ -0,0 +1,109 @@
+package com.njcn.device.pms.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.njcn.common.pojo.enums.common.DataStateEnum;
+import com.njcn.common.pojo.exception.BusinessException;
+import com.njcn.device.pms.enums.PmsDeviceResponseEnum;
+import com.njcn.device.pms.mapper.TerminalMapper;
+import com.njcn.device.pms.pojo.param.PmsTerminalParam;
+import com.njcn.device.pms.pojo.po.Terminal;
+import com.njcn.device.pms.pojo.vo.PmsTerminalVO;
+import com.njcn.device.pms.service.ITerminalService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.njcn.web.factory.PageFactory;
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  监测终端台账
+ * </p>
+ *
+ * @author hongawen
+ * @since 2022-10-14
+ */
+@Service
+public class TerminalServiceImpl extends ServiceImpl<TerminalMapper, Terminal> implements ITerminalService {
+
+    @Override
+    public Page<PmsTerminalVO> getTerminalList(PmsTerminalParam.QueryParam queryParam) {
+        QueryWrapper<PmsTerminalVO> queryWrapper = new QueryWrapper<>();
+        queryWrapper.ne("pms_terminal.status", DataStateEnum.DELETED.getCode());
+        if(queryParam.getStatus().equals(1)){
+            queryWrapper.eq("pms_terminal.status",1);
+        }
+        //初始化分页数据
+        return this.baseMapper.page(new Page<>(PageFactory.getPageNum(queryParam), PageFactory.getPageSize(queryParam)), queryWrapper);
+    }
+
+    /**
+     * 根据id查询
+     * @author hany
+     * @date 2022/10/27
+     */
+    @Override
+    public Terminal getTerminalById(String id) {
+        return this.getById(id);
+    }
+
+    /**
+     * 新增监测终端台账
+     * @author hany
+     * @date 2022/10/27
+     */
+    @Override
+    public boolean add(PmsTerminalParam terminalParam) {
+        checkName(terminalParam,true);
+        Terminal terminal = new Terminal();
+        BeanUtils.copyProperties(terminalParam,terminal);
+        //设为正常状态
+        terminal.setStatus(DataStateEnum.ENABLE.getCode());
+        return this.save(terminal);
+    }
+
+    /**
+     * 修改监测终端台账
+     * @author hany
+     * @date 2022/10/27
+     */
+    @Override
+    public boolean update(PmsTerminalParam updateParam) {
+        checkName(updateParam,false);
+        Terminal terminal = new Terminal();
+        BeanUtils.copyProperties(updateParam,terminal);
+        return this.updateById(terminal);
+    }
+
+    /**
+     * 删除
+     * @param ids
+     */
+    @Override
+    public boolean delete(List<String> ids) {
+        return this.lambdaUpdate().set(Terminal::getStatus, DataStateEnum.DELETED.getCode()).in(Terminal::getId, ids).update();
+    }
+
+    /**
+     * 名称重复校验
+     */
+    private void checkName(PmsTerminalParam terminalParam, boolean flag){
+        LambdaQueryWrapper<Terminal> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+        lambdaQueryWrapper.eq(Terminal::getName,terminalParam.getName());
+        //修改
+        if(!flag){
+            if(terminalParam instanceof PmsTerminalParam){
+                lambdaQueryWrapper.ne(Terminal::getId,terminalParam.getId());
+            }
+        }
+        int result = this.count(lambdaQueryWrapper);
+        //大于等于1个则表示重复
+        if (result >= 1) {
+            throw new BusinessException(PmsDeviceResponseEnum.MODEL_NAME_REPEAT);
+        }
+
+    }
+}
diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/impl/TractionStationServiceImpl.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/impl/TractionStationServiceImpl.java
new file mode 100644
index 000000000..1c78942d2
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/impl/TractionStationServiceImpl.java
@@ -0,0 +1,106 @@
+package com.njcn.device.pms.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.njcn.common.pojo.enums.common.DataStateEnum;
+import com.njcn.common.pojo.exception.BusinessException;
+import com.njcn.device.pms.enums.PmsDeviceResponseEnum;
+import com.njcn.device.pms.mapper.TractionStationMapper;
+import com.njcn.device.pms.pojo.param.TractionStationParam;
+import com.njcn.device.pms.pojo.po.TractionStation;
+import com.njcn.device.pms.service.ITractionStationService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.njcn.web.pojo.param.BaseParam;
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author hongawen
+ * @since 2022-10-14
+ */
+@Service
+public class TractionStationServiceImpl extends ServiceImpl<TractionStationMapper, TractionStation> implements ITractionStationService {
+
+    /**
+     * 查询牵引站列表
+     * @param baseParam
+     * @return
+     */
+    @Override
+    public List<TractionStation> getTractionStationList(BaseParam baseParam) {
+        return this.list();
+    }
+
+    /**
+     * 根据ID查询牵引站信息
+     * @param tractionStationId
+     * @return
+     */
+    @Override
+    public TractionStation getTractionStationById(String tractionStationId) {
+        return this.getById(tractionStationId);
+    }
+
+    /**
+     * 新增牵引站信息
+     * @author hany
+     * @date 2022/10/28
+     */
+    @Override
+    public boolean add(TractionStationParam tractionStationParam) {
+        checkName(tractionStationParam,true);
+        TractionStation tractionStation = new TractionStation();
+        BeanUtils.copyProperties(tractionStationParam,tractionStation);
+        //设为正常状态
+        tractionStation.setStatus(DataStateEnum.ENABLE.getCode());
+        return this.save(tractionStation);
+    }
+
+    /**
+     * 修改牵引站信息
+     * @author hany
+     * @date 2022/10/28
+     */
+    @Override
+    public boolean update(TractionStationParam updateParam) {
+        checkName(updateParam,false);
+        TractionStation tractionStation = new TractionStation();
+        BeanUtils.copyProperties(updateParam,tractionStation);
+        return this.updateById(tractionStation);
+    }
+
+    /**
+     * 删除
+     * @param ids
+     */
+    @Override
+    public boolean delete(List<String> ids) {
+        return this.lambdaUpdate().set(TractionStation::getStatus, DataStateEnum.DELETED.getCode()).in(TractionStation::getId, ids).update();
+    }
+
+    /**
+     * 名称重复校验
+     */
+    private void checkName(TractionStationParam tractionStationParam, boolean flag){
+        LambdaQueryWrapper<TractionStation> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+        lambdaQueryWrapper.eq(TractionStation::getName,tractionStationParam.getName());
+        //修改
+        if(!flag){
+            if(tractionStationParam instanceof TractionStationParam){
+                lambdaQueryWrapper.ne(TractionStation::getId,tractionStationParam.getId());
+            }
+        }
+        int result = this.count(lambdaQueryWrapper);
+        //大于等于1个则表示重复
+        if (result >= 1) {
+            throw new BusinessException(PmsDeviceResponseEnum.MODEL_NAME_REPEAT);
+        }
+
+    }
+
+}
diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/impl/TransientStasticDataServiceImpl.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/impl/TransientStasticDataServiceImpl.java
new file mode 100644
index 000000000..280b2a503
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/impl/TransientStasticDataServiceImpl.java
@@ -0,0 +1,20 @@
+package com.njcn.device.pms.service.impl;
+
+import com.njcn.device.pms.mapper.TransientStasticDataMapper;
+import com.njcn.device.pms.pojo.po.TransientStasticData;
+import com.njcn.device.pms.service.ITransientStasticDataService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author hongawen
+ * @since 2022-10-14
+ */
+@Service
+public class TransientStasticDataServiceImpl extends ServiceImpl<TransientStasticDataMapper, TransientStasticData> implements ITransientStasticDataService {
+
+}
diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/impl/TreatTransientDetailDataServiceImpl.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/impl/TreatTransientDetailDataServiceImpl.java
new file mode 100644
index 000000000..8b1b9dd11
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/impl/TreatTransientDetailDataServiceImpl.java
@@ -0,0 +1,20 @@
+package com.njcn.device.pms.service.impl;
+
+import com.njcn.device.pms.mapper.TreatTransientDetailDataMapper;
+import com.njcn.device.pms.pojo.po.TreatTransientDetailData;
+import com.njcn.device.pms.service.ITreatTransientDetailDataService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author hongawen
+ * @since 2022-10-14
+ */
+@Service
+public class TreatTransientDetailDataServiceImpl extends ServiceImpl<TreatTransientDetailDataMapper, TreatTransientDetailData> implements ITreatTransientDetailDataService {
+
+}
diff --git a/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/api/DeptLineFeignClient.java b/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/api/DeptLineFeignClient.java
index 5d67f6004..b52a54a09 100644
--- a/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/api/DeptLineFeignClient.java
+++ b/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/api/DeptLineFeignClient.java
@@ -8,6 +8,7 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * @author denghuajun
@@ -24,4 +25,13 @@ public interface DeptLineFeignClient {
 
     @PostMapping("removeBind")
     HttpResult<Integer> removeBind(@RequestParam("id") String id);
+    /**
+    * @Description:获取部门和监测点的关系（分稳态暂态）
+    * @Param: [devDataType] 0：暂态 1：稳态
+    * @return: com.njcn.common.pojo.response.HttpResult<java.lang.Integer>
+    * @Author: clam
+    * @Date: 2022/10/19
+    */
+    @PostMapping("getLineByDeptRelation")
+    HttpResult<Map<String,List<String>>> getLineByDeptRelation(@RequestParam("devDataType") Integer devDataType);
 }
diff --git a/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/api/LineFeignClient.java b/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/api/LineFeignClient.java
index 5005db8ba..da8ae027d 100644
--- a/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/api/LineFeignClient.java
+++ b/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/api/LineFeignClient.java
@@ -15,6 +15,7 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestParam;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * @author denghuajun
@@ -255,4 +256,26 @@ public interface LineFeignClient {
      */
     @PostMapping("getOnLineDevLine")
     HttpResult<List<OnlineLineDTO>> getOnLineDevLine(@RequestBody List<String> lineIds);
+
+    /**
+    * @Description: 获取变电站和监测点的关系（分稳态暂态）
+    * @Param: [devDataType] 0：暂态 1：稳态
+    * @return: com.njcn.common.pojo.response.HttpResult<java.util.Map<java.lang.String,java.util.List<java.lang.String>>>
+    * @Author: clam
+    * @Date: 2022/10/20
+    */
+    @PostMapping("getLineBySubstationRelation")
+    HttpResult<Map<String,List<String>>> getLineBySubstationRelation(@RequestParam("devDataType") Integer devDataType);
+
+    /**
+     * 获取监测点基础详情
+     * @param lineIds 监测点id集合
+     * @return 监测点详情信息
+     * @author cdf
+     * @date 2022/10/26
+     */
+    @PostMapping("getLineDetailList")
+    HttpResult<List<LineDetailDataVO>> getLineDetailList(@RequestBody List<String> lineIds);
+
+
 }
diff --git a/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/api/fallback/DeptLineFeignClientFallbackFactory.java b/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/api/fallback/DeptLineFeignClientFallbackFactory.java
index 2a6da3af7..f8deea0f1 100644
--- a/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/api/fallback/DeptLineFeignClientFallbackFactory.java
+++ b/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/api/fallback/DeptLineFeignClientFallbackFactory.java
@@ -10,6 +10,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * @author denghuajun
@@ -48,6 +49,12 @@ public class DeptLineFeignClientFallbackFactory implements FallbackFactory<DeptL
                 log.error("{}异常，降级处理，异常为：{}", "部门解除绑定", throwable.toString());
                 throw new BusinessException(finalExceptionEnum);
             }
+
+            @Override
+            public HttpResult<Map<String,List<String>>> getLineByDeptRelation(Integer devDataType) {
+                log.error("{}异常，降级处理，异常为：{}", "获取部门和监测点的关系（分稳态暂态）", throwable.toString());
+                throw new BusinessException(finalExceptionEnum);
+            }
         };
     }
 }
diff --git a/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/api/fallback/LineFeignClientFallbackFactory.java b/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/api/fallback/LineFeignClientFallbackFactory.java
index 9d1543c5b..eb26e16f4 100644
--- a/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/api/fallback/LineFeignClientFallbackFactory.java
+++ b/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/api/fallback/LineFeignClientFallbackFactory.java
@@ -14,8 +14,11 @@ import com.njcn.device.pq.utils.DeviceEnumUtil;
 import feign.hystrix.FallbackFactory;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * @author denghuajun
@@ -192,6 +195,18 @@ public class LineFeignClientFallbackFactory implements FallbackFactory<LineFeign
                 throw new BusinessException(finalExceptionEnum);
             }
 
+            @Override
+            public HttpResult<Map<String,List<String>>> getLineBySubstationRelation(@RequestParam("devDataType") Integer devDataType) {
+                log.error("{}异常，降级处理，异常为：{}", "获取变电站和监测点的关系（分稳态暂态）:  ", throwable.toString());
+                throw new BusinessException(finalExceptionEnum);
+            }
+
+            @Override
+            public HttpResult<List<LineDetailDataVO>> getLineDetailList(@RequestBody List<String> lineIds) {
+                log.error("{}异常，降级处理，异常为：{}", "获取监测点基础详情异常:  ", throwable.toString());
+                throw new BusinessException(finalExceptionEnum);
+            }
+
 
         };
     }
diff --git a/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/vo/LineDetailDataVO.java b/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/vo/LineDetailDataVO.java
index 48131a24d..fd12a2bee 100644
--- a/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/vo/LineDetailDataVO.java
+++ b/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/vo/LineDetailDataVO.java
@@ -75,4 +75,10 @@ public class LineDetailDataVO {
     @ApiModelProperty(name = "dealCapacity",value = "用户协议容量（MVA）")
     private Float dealCapacity;
 
+    /**
+     * 测量间隔（1-10分钟）
+     */
+    @ApiModelProperty(name = "timeInterval",value = "测量间隔（1-10分钟）")
+    private Integer timeInterval;
+
 }
diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/DeptLineController.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/DeptLineController.java
index ac1f91269..ae1bb47a1 100644
--- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/DeptLineController.java
+++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/DeptLineController.java
@@ -19,6 +19,7 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * @author denghuajun
@@ -107,5 +108,14 @@ public class DeptLineController extends BaseController {
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);
     }
 
+    @PostMapping("/getLineByDeptRelation")
+    @ApiOperation("获取部门和监测点的关系（分稳态暂态）")
+    @ApiImplicitParam(name = "devDataType", value = "数据类型（0：暂态系统；1：稳态系统；）", required = true)
+    public HttpResult<Map<String,List<String>> > getLineByDeptRelation(@RequestParam("devDataType") Integer devDataType) {
+        String methodDescribe = getMethodDescribe("getLineByDeptRelation");
+        Map<String,List<String>> map= deptLineService.getLineByDeptRelation(devDataType);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, map, methodDescribe);
+    }
+
 
 }
diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/LineController.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/LineController.java
index e98234640..18e345de0 100644
--- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/LineController.java
+++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/LineController.java
@@ -34,6 +34,7 @@ import springfox.documentation.annotations.ApiIgnore;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 import java.util.Objects;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
@@ -124,7 +125,7 @@ public class LineController extends BaseController {
     @ApiOperation("根据监测点id获取越限数值")
     @ApiImplicitParam(name = "id", value = "监测点id", required = true)
     public HttpResult<Overlimit> getOverLimitData(@RequestParam("id") String id) {
-        String methodDescribe = getMethodDescribe("getLineOverLimitData");
+        String methodDescribe = getMethodDescribe("getOverLimitData");
         Overlimit result = lineService.getOverLimitData(id);
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
     }
@@ -375,4 +376,28 @@ public class LineController extends BaseController {
 
     }
 
+    @PostMapping("/getLineBySubstationRelation")
+    @ApiOperation("获取变电站和监测点的关系（分稳态暂态）")
+    @ApiImplicitParam(name = "devDataType", value = "数据类型（0：暂态系统；1：稳态系统；）", required = true)
+    public HttpResult<Map<String,List<String>>> getLineBySubstationRelation(@RequestParam("devDataType") Integer devDataType) {
+        String methodDescribe = getMethodDescribe("getLineBySubstationRelation");
+        Map<String,List<String>> map= lineService.getLineBySubstationRelation(devDataType);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, map, methodDescribe);
+    }
+
+
+    /**
+     * 获取基础监测点详细信息
+     * @author cdf
+     * @date 2022/10/26
+     */
+    @PostMapping("/getLineDetailList")
+    @ApiOperation("获取基础监测点详细信息")
+    @ApiImplicitParam(name = "lineIds", value = "监测点id集合", required = true)
+    public HttpResult<List<LineDetailDataVO>> getLineDetailList(@RequestBody List<String> lineIds) {
+        String methodDescribe = getMethodDescribe("getLineDetailList");
+        List<LineDetailDataVO> resList= lineService.getLineDetailList(lineIds);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, resList, methodDescribe);
+    }
+
 }
diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/DeptLineMapper.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/DeptLineMapper.java
index 620b7768b..53d4f4e65 100644
--- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/DeptLineMapper.java
+++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/DeptLineMapper.java
@@ -4,6 +4,7 @@ package com.njcn.device.pq.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.njcn.device.pq.pojo.po.DeptLine;
 import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
 import org.springframework.web.bind.annotation.PostMapping;
 
 import java.util.List;
@@ -44,4 +45,26 @@ public interface DeptLineMapper extends BaseMapper<DeptLine> {
      * @return
      */
     List<String> getMyselfBindLine(@Param("deptId")String deptId);
+
+    @Select ("SELECT\n" +
+            "\tpq_dept_line.Id,\n" +
+            "\tpq_dept_line.Line_Id\n" +
+            "FROM\n" +
+            "\tpq_dept_line\n" +
+            "WHERE\n" +
+            "\tEXISTS (\n" +
+            "\t\tSELECT\n" +
+            "\t\t\t1\n" +
+            "\t\tFROM\n" +
+            "\t\t\tpq_device,\n" +
+            "\t\t\tpq_line\n" +
+            "\t\tWHERE\n" +
+            "\t\t\tSUBSTRING_INDEX(\n" +
+            "\t\t\t\tSUBSTRING_INDEX(pq_line.Pids, ',', 5),\n" +
+            "\t\t\t\t',',\n" +
+            "\t\t\t\t- 1\n" +
+            "\t\t\t) = pq_device.Id\n" +
+            "\t\tAND pq_line.Id = pq_dept_line.Line_Id and (pq_device.Dev_Data_Type= 2 or pq_device.Dev_Data_Type = #{devDataType})\n" +
+            "\t)")
+    List<DeptLine> getLineByDeptRelation(@Param("devDataType")Integer devDataType);
 }
diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/LineDetailMapper.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/LineDetailMapper.java
index 1ca0632ac..aa97fa3bb 100644
--- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/LineDetailMapper.java
+++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/LineDetailMapper.java
@@ -3,6 +3,7 @@ package com.njcn.device.pq.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.njcn.device.pq.pojo.po.LineDetail;
+import com.njcn.device.pq.pojo.vo.LineDetailDataVO;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -33,4 +34,12 @@ public interface LineDetailMapper extends BaseMapper<LineDetail> {
      */
     List<LineDetail> getSpecifyLineDetail(@Param("list") List<String> list);
 
+
+    /**
+     * 获取指定的监测点信息以及电压等级(需要其他字段可在基础上扩充)
+     * @param lineIds 监测点集合
+     * @return 结果
+     */
+    List<LineDetailDataVO> getLineDetailInfo(@Param("lineIds") List<String> lineIds);
+
 }
diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/LineMapper.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/LineMapper.java
index 8c2be30e5..22a39cb76 100644
--- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/LineMapper.java
+++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/LineMapper.java
@@ -16,6 +16,7 @@ import com.njcn.device.pq.pojo.vo.*;
 import com.njcn.device.pq.pojo.dto.PollutionSubstationDTO;
 import com.njcn.web.pojo.vo.LineDataVO;
 import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
 
 
 import java.util.List;
@@ -330,4 +331,31 @@ public interface LineMapper extends BaseMapper<Line> {
      * @return 在线或离线监测点ids
      */
     List<String> getOnOrUnLine(@Param("list")List<String> lineIds,@Param("comFlag")Integer comFlag);
+    /** 
+    * @Description: 获取变电站id和监测点id用
+    * @Param: [devDataType] 
+    * @return: java.util.List<com.njcn.device.pq.pojo.po.Line> 
+    * @Author: clam
+    * @Date: 2022/10/20 
+    */
+    @Select ("SELECT\n" +
+            "\tpq_line.Id,\n" +
+            "\tSUBSTRING_INDEX(\n" +
+            "\t\tSUBSTRING_INDEX(pq_line.Pids, ',', 4),\n" +
+            "\t\t',' ,- 1\n" +
+            "\t) AS Pids\n" +
+            "FROM\n" +
+            "\tpq_line,\n" +
+            "\tpq_device\n" +
+            "WHERE\n" +
+            "\tpq_line.`Level` = 6\n" +
+            "AND SUBSTRING_INDEX(\n" +
+            "\tSUBSTRING_INDEX(pq_line.Pids, ',', 5),\n" +
+            "\t',' ,- 1\n" +
+            ") = pq_device.Id\n" +
+            "AND (\n" +
+            "\tpq_device.Dev_Data_Type = 2\n" +
+            "\tOR pq_device.Dev_Data_Type = #{devDataType}\n" +
+            ") ")
+    List<Line> getLineBySubstationRelation(@Param("devDataType")Integer devDataType);
 }
diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/LineDetailMapper.xml b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/LineDetailMapper.xml
index 41dccd685..d727fbc89 100644
--- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/LineDetailMapper.xml
+++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/LineDetailMapper.xml
@@ -36,4 +36,20 @@
           A1.Pid = A2.Id AND A2.Pid = A3.Id AND A3.Id = C.Id AND
           C.Dev_Model = 1 AND C.Dev_Data_Type IN (1,2) AND C.Run_Flag = 0 AND A1.Id = D.Id
     </select>
+
+    <select id="getLineDetailInfo" resultType="com.njcn.device.pq.pojo.vo.LineDetailDataVO">
+        select
+        a.name lineName,
+        c.Time_Interval,
+        e.name scale
+        from pq_line a
+        inner join pq_line b on a.pid = b.id
+        inner join pq_line_detail c on a.id = c.id
+        inner join pq_voltage d on b.id = d.id
+        left join sys_dict_data e on d.scale = e.id
+		where a.id in
+		<foreach collection="lineIds" item="item" separator="," open="(" close=")">
+            #{item}
+        </foreach>
+    </select>
 </mapper>
diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/DeptLineService.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/DeptLineService.java
index b94bdee55..f5643ebee 100644
--- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/DeptLineService.java
+++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/DeptLineService.java
@@ -5,6 +5,7 @@ import com.njcn.device.pq.pojo.po.DeptLine;
 import com.njcn.web.pojo.param.DeptLineParam;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * @author denghuajun
@@ -52,4 +53,12 @@ public interface DeptLineService extends IService<DeptLine> {
      * @date 2022/1/25 9:28
      */
     List<String> getLineByDeptId(String id);
+    /** 
+    * @Description: 获取部门和监测点的关系（分稳态暂态）
+    * @Param: [devDataType] 
+    * @return: java.util.Map<java.lang.String,java.util.List<java.lang.String>> 
+    * @Author: clam
+    * @Date: 2022/10/19 
+    */ 
+    Map<String, List<String>> getLineByDeptRelation(Integer devDataType);
 }
diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/LineService.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/LineService.java
index 0a68d31b5..dab667750 100644
--- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/LineService.java
+++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/LineService.java
@@ -5,10 +5,13 @@ import com.njcn.device.pq.pojo.dto.PollutionParamDTO;
 import com.njcn.device.pq.pojo.dto.PollutionSubstationDTO;
 import com.njcn.device.pq.pojo.param.DeviceInfoParam;
 import com.njcn.device.pq.pojo.po.Line;
+import com.njcn.device.pq.pojo.po.LineDetail;
 import com.njcn.device.pq.pojo.po.Overlimit;
 import com.njcn.device.pq.pojo.vo.*;
+import org.springframework.web.bind.annotation.RequestBody;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 监测点类
@@ -155,4 +158,22 @@ public interface LineService {
     * @Date: 2022/10/10
     */
     List<DeptLineCountVO> getDeptLineCount(DeviceInfoParam deviceInfoParam);
+
+    /**
+    * @Description: 获取变电站和监测点的关系（分稳态暂态）
+    * @Param: [devDataType]
+    * @return: java.util.Map<java.lang.String,java.util.List<java.lang.String>>
+    * @Author: clam
+    * @Date: 2022/10/20
+    */
+    Map<String, List<String>> getLineBySubstationRelation(Integer devDataType);
+
+    /**
+     * 获取监测点基础详情
+     * @param lineIds 监测点id集合
+     * @return 监测点详情信息
+     * @author cdf
+     * @date 2022/10/26
+     */
+    List<LineDetailDataVO> getLineDetailList(List<String> lineIds);
 }
diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/DeptLineServiceImpl.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/DeptLineServiceImpl.java
index db582bf09..7fde625c7 100644
--- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/DeptLineServiceImpl.java
+++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/DeptLineServiceImpl.java
@@ -11,7 +11,9 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 
 /**
@@ -24,6 +26,8 @@ import java.util.stream.Collectors;
 @RequiredArgsConstructor
 public class DeptLineServiceImpl extends ServiceImpl<DeptLineMapper, DeptLine> implements DeptLineService {
 
+    private final DeptLineMapper deptLineMapper;
+
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void deptBindLine(DeptLineParam deptLineParam) {
@@ -67,5 +71,24 @@ public class DeptLineServiceImpl extends ServiceImpl<DeptLineMapper, DeptLine> i
         return this.lambdaQuery().in(DeptLine::getId, id).list().stream().map(DeptLine::getLineId).distinct().collect(Collectors.toList());
     }
 
+    /**
+     * @param devDataType
+     * @Description: 获取部门和监测点的关系（分稳态暂态）
+     * @Param: [devDataType]
+     * @return: java.util.Map<java.lang.String, java.util.List < java.lang.String>>
+     * @Author: clam
+     * @Date: 2022/10/19
+     */
+    @Override
+    public Map<String, List<String>> getLineByDeptRelation(Integer devDataType) {
+
+        Map<String, List<String>> map = new HashMap<> ();
+
+        List<DeptLine> deptLines = deptLineMapper.getLineByDeptRelation(devDataType);
+        Map<String, List<String>> collect = deptLines.stream ( ).collect (Collectors.groupingBy (DeptLine::getId, Collectors.mapping (DeptLine::getLineId,Collectors.toList ())));
+
+        return collect;
+    }
+
 
 }
diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/LineServiceImpl.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/LineServiceImpl.java
index e1bacba3b..1b430e6c6 100644
--- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/LineServiceImpl.java
+++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/LineServiceImpl.java
@@ -776,6 +776,31 @@ public class LineServiceImpl extends ServiceImpl<LineMapper, Line> implements Li
         return deptLineCountVOList;
     }
 
+    /**
+     * @param devDataType
+     * @Description: 获取变电站和监测点的关系（分稳态暂态）
+     * @Param: [devDataType]
+     * @return: java.util.Map<java.lang.String, java.util.List < java.lang.String>>
+     * @Author: clam
+     * @Date: 2022/10/20
+     */
+    @Override
+    public Map<String, List<String>> getLineBySubstationRelation(Integer devDataType) {
+
+        Map<String, List<String>> map = new HashMap<> ();
+
+        List<Line> deptLines = lineMapper.getLineBySubstationRelation(devDataType);
+        Map<String, List<String>> collect = deptLines.stream ( ).collect (Collectors.groupingBy (Line::getPids, Collectors.mapping (Line::getId,Collectors.toList ())));
+
+        return collect;
+    }
+
+    @Override
+    public List<LineDetailDataVO> getLineDetailList(List<String> lineIds){
+
+        return lineDetailMapper.getLineDetailInfo(lineIds);
+    }
+
     /**
      * 根据用户选择的时间区间返回月份日期
      */
diff --git a/pqs-event/event-boot/src/main/java/com/njcn/event/service/Impl/ReportController.java b/pqs-event/event-boot/src/main/java/com/njcn/event/service/Impl/ReportController.java
new file mode 100644
index 000000000..a2b73ad75
--- /dev/null
+++ b/pqs-event/event-boot/src/main/java/com/njcn/event/service/Impl/ReportController.java
@@ -0,0 +1,1939 @@
+package com.njcn.event.service.Impl;//package com.njcn.event.service.Impl;
+//
+//import java.io.ByteArrayInputStream;
+//import java.io.File;
+//import java.io.FileInputStream;
+//import java.io.FileOutputStream;
+//import java.io.IOException;
+//import java.io.InputStream;
+//import java.io.OutputStream;
+//import java.io.UnsupportedEncodingException;
+//import java.math.BigInteger;
+//import java.net.URLEncoder;
+//import java.text.DecimalFormat;
+//import java.text.SimpleDateFormat;
+//import java.util.ArrayList;
+//import java.util.Collections;
+//import java.util.Comparator;
+//import java.util.Date;
+//import java.util.List;
+//import java.util.Properties;
+//
+//import javax.annotation.Resource;
+//import javax.servlet.http.HttpServletRequest;
+//import javax.servlet.http.HttpServletResponse;
+//import javax.servlet.http.HttpSession;
+//
+//import com.njcn.pojo.data.WaveSvg;
+//import org.apache.commons.lang3.StringUtils;
+//import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
+//import org.apache.poi.util.Units;
+//import org.apache.poi.xwpf.usermodel.XWPFDocument;
+//import org.apache.poi.xwpf.usermodel.XWPFParagraph;
+//import org.apache.poi.xwpf.usermodel.XWPFRun;
+//import org.apache.poi.xwpf.usermodel.XWPFTable;
+//import org.apache.poi.xwpf.usermodel.XWPFTableRow;
+//import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTTblWidth;
+//import org.openxmlformats.schemas.wordprocessingml.x2006.main.STTblWidth;
+//import org.slf4j.Logger;
+//import org.slf4j.LoggerFactory;
+//import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.stereotype.Controller;
+//import org.springframework.util.CollectionUtils;
+//import org.springframework.web.bind.annotation.GetMapping;
+//import org.springframework.web.bind.annotation.PostMapping;
+//import org.springframework.web.bind.annotation.RequestMapping;
+//import org.springframework.web.bind.annotation.RequestMethod;
+//import org.springframework.web.bind.annotation.RequestParam;
+//import org.springframework.web.bind.annotation.ResponseBody;
+//
+//import com.njcn.enums.LogTypeEnum;
+//import com.njcn.mapper.advanced.RangeMapper;
+//import com.njcn.mapper.configuration.RptAssMapper;
+//import com.njcn.mapper.configuration.RptDataMapper;
+//import com.njcn.mapper.configuration.RptPloyMapper;
+//import com.njcn.pojo.advanced.EventAssObj;
+//import com.njcn.pojo.commons.DatePojo;
+//import com.njcn.pojo.commons.EventEigDetail;
+//import com.njcn.pojo.commons.EventInfoDetail;
+//import com.njcn.pojo.commons.HttpResult;
+//import com.njcn.pojo.commons.RedisDB;
+//import com.njcn.pojo.commons.ReportAreaPojo;
+//import com.njcn.pojo.commons.ReportMonitorPojo;
+//import com.njcn.pojo.commons.WaveData;
+//import com.njcn.pojo.commons.area.Area;
+//import com.njcn.pojo.commons.area.AreaGeneral;
+//import com.njcn.pojo.commons.area.Iec28;
+//import com.njcn.pojo.commons.area.Interval;
+//import com.njcn.pojo.commons.area.Voltage;
+//import com.njcn.pojo.commons.device.AnalyzeInfo;
+//import com.njcn.pojo.commons.device.DeviceValue;
+//import com.njcn.pojo.commons.device.EventCause;
+//import com.njcn.pojo.commons.device.EventChance;
+//import com.njcn.pojo.commons.device.EventDataList;
+//import com.njcn.pojo.commons.device.EventDensity;
+//import com.njcn.pojo.commons.device.EventTypeList;
+//import com.njcn.pojo.commons.device.LineInfo;
+//import com.njcn.pojo.configuration.RptPloy;
+//import com.njcn.pojo.data.EventDetail;
+//import com.njcn.pojo.data.LineMaps;
+//import com.njcn.pojo.user.Depts;
+//import com.njcn.pojo.wave.WaveDataDetail;
+//import com.njcn.service.advanced.RangeService;
+//import com.njcn.service.commons.IWaveService;
+//import com.njcn.service.configuration.DeviceService;
+//import com.njcn.service.configuration.ReportService;
+//import com.njcn.service.data.EventDetailService;
+//import com.njcn.service.log.UserLogDetailService;
+//import com.njcn.shiro.token.TokenManager;
+//import com.njcn.utils.AppConfig;
+//import com.njcn.utils.ClearPathUtil;
+//import com.njcn.utils.InstantiateUtil;
+//import com.njcn.utils.PubUtils;
+//import com.njcn.utils.UserUtil;
+//import com.njcn.utils.redis.JedisManager;
+//import com.pqs9200.pojo.commons.device.DevMapInfo;
+//import com.pqs9200.service.area.IAreaService;
+//import com.pqs9200.service.data.IOverviewServer;
+//import com.pqs9200.utils.WordUtil;
+//import com.pqs9200.utils.WordUtils;
+//
+//import net.sf.json.JSONArray;
+//import net.sf.json.JSONObject;
+//import sun.misc.BASE64Decoder;
+//
+//@Controller
+//@RequestMapping("report")
+//public class ReportController {
+//    @Resource
+//    private RptDataMapper rptDataMapper;
+//
+//    @Resource
+//    private RptPloyMapper rptPloyMapper;
+//
+//    @Resource
+//    private RptAssMapper rptAssMapper;
+//
+//    @Resource
+//    private ReportService getreportInfo;
+//
+//    @Autowired
+//    private ReportService reportService;
+//
+//    @Autowired
+//    private IAreaService areaService;
+//
+//    @Autowired
+//    private IOverviewServer iOverviewServer;
+//
+//    @Resource
+//    UserLogDetailService userLog;
+//
+//    @Autowired
+//    private RangeMapper rangeMapper;
+//
+//    @Autowired
+//    private RangeService rangeService;
+//
+//    @Autowired
+//    private EventDetailService eventDetailService;
+//
+//    @Autowired
+//    private IWaveService waveService;
+//    @Autowired
+//    private AppConfig appConfig;
+//    // 日志记录
+//    private static final Logger logger = LoggerFactory.getLogger(DeviceController.class);
+//    /**
+//     * 缓存每个方法查询的结果，缓存时间为半小时
+//     * <p>
+//     * key:方法名+参数值（参数为对象时，约定某个属性值）
+//     */
+//    @Autowired
+//    private JedisManager jedisManager;
+//
+//    @Autowired
+//    private DeviceService deviceInfo;
+//
+//    @Resource
+//    private UserUtil userUtil;
+//
+//    @Autowired
+//    private UserLogDetailService userLogDetailService;
+//
+//    private InstantiateUtil<JSONObject> instantiateUtil;
+//    private InstantiateUtil<JSONArray> jsonArrayInstantiateUtil;
+//    private InstantiateUtil<String> stringInstantiateUtil;
+//
+//    public ReportController() {
+//        instantiateUtil = new InstantiateUtil<>();
+//        jsonArrayInstantiateUtil = new InstantiateUtil<>();
+//        stringInstantiateUtil = new InstantiateUtil<>();
+//    }
+//
+//    /**
+//     * 获取模板引擎
+//     *
+//     * @return
+//     */
+//    @PostMapping("monitorTemplate")
+//    @ResponseBody
+//    public HttpResult monitorTemplate() {
+//        HttpResult result;
+//        List<RptPloy> datas;
+//        datas = reportService.getTemplate(Integer.valueOf(0));
+//        if (CollectionUtils.isEmpty(datas)) {
+//            result = PubUtils.assignmentResult(null, 500, "沒有对应的模板");
+//        } else {
+//            result = PubUtils.assignmentResult(datas, 200, "获取模板成功");
+//        }
+//        return result;
+//    }
+//
+//    @PostMapping("monitor")
+//    @ResponseBody
+//    public HttpResult monitor(HttpServletRequest request, String startTime, String endTime, String lineIndex, String lineName, boolean jcdxq,
+//                              boolean zjsjlb, boolean zjsjssbx, boolean zjmdbg, boolean zjmdtx, boolean zjsjditic, boolean zjsjdf47, boolean glfbzjfz,
+//                              boolean glfbcxsj, boolean yftjbg, boolean yftjtx, boolean zjyybg, boolean zjyytx, boolean zjlxbg, boolean zjlxtx) throws Exception {
+//        HttpResult result;
+//        List<Object> reList = new ArrayList<>();
+//        ReportMonitorPojo reportMonitorPojo = getMonitorChoose(request, startTime, endTime, lineIndex, lineName, jcdxq, zjsjlb, zjsjssbx, zjmdbg, zjmdtx, zjsjditic, zjsjdf47, glfbzjfz, glfbcxsj, yftjbg, yftjtx, zjyybg, zjyytx, zjlxbg, zjlxtx);
+//        DatePojo datePojo;
+//        datePojo = PubUtils.validateDate(reportMonitorPojo.getStartTime(), reportMonitorPojo.getEndTime(), "monitor");
+//        String userIndex = TokenManager.getUserId();
+//        if (!datePojo.getValidity()) {
+//            result = PubUtils.assignmentResult(null, 500, "解析前台传递的时间有误");
+//            return result;
+//        }
+//        try {
+//            /* 监测点详情数据获取 */
+//            LineInfo lineInfo;
+//            if (reportMonitorPojo.isJcdxq()) {
+//                lineInfo = deviceInfo.getDeviceInfo(Long.valueOf(reportMonitorPojo.getLineIndex()));
+//                JSONObject lineO = JSONObject.fromObject(lineInfo);
+//                jedisManager.hset(RedisDB.SHORT_TIME_QUERY, userIndex, "lineInfo", instantiateUtil.stringInstantiate(lineO), RedisDB.SHORT_TIME);
+//            }
+//            /* 暂降事件列表 */
+//            List<AnalyzeInfo> analyzeInfos = null;
+//            if (reportMonitorPojo.isZjsjlb()) {
+//                analyzeInfos = deviceInfo.queryanalyzeinfo(datePojo.getStartTime(), datePojo.getEndTime(),
+//                        reportMonitorPojo.getLineIndex());
+//                JSONArray anArray = JSONArray.fromObject(analyzeInfos);
+//                jedisManager.hset(RedisDB.SHORT_TIME_QUERY, userIndex, "analyzeInfos", jsonArrayInstantiateUtil.stringInstantiate(anArray),
+//                        RedisDB.SHORT_TIME);
+//            }
+//            /* 暂降事件波形 */
+//            List<List> arry = new ArrayList<>();
+//            int waveNum = 0;
+//            if (reportMonitorPojo.isZjsjssbx()) {
+//                List<AnalyzeInfo> analyzeInfo = null;
+//                analyzeInfo = deviceInfo.queryanalyzeinfo(datePojo.getStartTime(), datePojo.getEndTime(),
+//                        reportMonitorPojo.getLineIndex());
+//                for (int i = 0; i < analyzeInfo.size(); i++) {
+//                    if (Integer.parseInt(analyzeInfo.get(i).getFileFlag()) == 0) {
+//                        analyzeInfo.remove(i);
+//                    }
+//                }
+//                if (analyzeInfo.size() > 10) {
+//                    waveNum = 10;
+//                } else {
+//                    waveNum = analyzeInfo.size();
+//                }
+//                for (int i = 0; i < waveNum; i++) {
+//                    List<WaveSvg> shunS = new ArrayList<>();
+//                    WaveData waveData = waveService.getWavedata(analyzeInfo.get(i).getEventDetailIndex(), 1);
+//                    if (waveData != null) {
+//                        if (waveData.getiPhasic() > 0) {
+//                            //数据筛选,如果是双路电压的话，会存在2个波形数据
+//                            List<WaveDataDetail> waveDataDetails = waveService.filteWaveData(waveData);
+//                            if (waveData.getSunData().size() == 0) {
+//
+//                            } else {
+//                                String time = waveData.getTime();
+//                                String title = "监测点名称：" + waveData.getLineName() + " 发生时刻：" + time + "特征幅值：" + waveData.getEventValue() + " 持续时间：" + waveData.getPersistTime() + "s";
+//                                if (waveDataDetails.size() == 1) {
+//                                    shunS.add(waveService.createShunSTitle(title, waveDataDetails.get(0)));
+//                                } else {
+//                                    shunS.add(waveService.createShunSTitle(title, waveDataDetails.get(0)));
+//                                    for (int n = 1; n < waveDataDetails.size(); n++) {
+//                                        shunS.add(waveService.createShunS(waveDataDetails.get(n)));
+//                                    }
+//                                }
+//
+//                            }
+//                            arry.add(shunS);
+//                        }
+//                    }
+//                }
+//            }
+//            /* 暂降密度数据获取 */
+//            List<EventDensity> eventDensities = new ArrayList<>();
+//            if (reportMonitorPojo.isZjmdtx()) {
+//                eventDensities = deviceInfo.getEventDensity(datePojo.getStartTime(), datePojo.getEndTime(),
+//                        reportMonitorPojo.getLineIndex());
+//            }
+//            List<List> eventDisdip;
+//            List<List> ec411;
+//            List<List> ec28;
+//            if (reportMonitorPojo.isZjmdbg()) {
+//                eventDisdip = deviceInfo.getEventDisdip(datePojo.getStartTime(), datePojo.getEndTime(),
+//                        reportMonitorPojo.getLineIndex());
+//                ec411 = deviceInfo.getIEC411(datePojo.getStartTime(), datePojo.getEndTime(),
+//                        reportMonitorPojo.getLineIndex());
+//                ec28 = deviceInfo.getIEC28(datePojo.getStartTime(), datePojo.getEndTime(),
+//                        reportMonitorPojo.getLineIndex());
+//                JSONArray evArray = JSONArray.fromObject(eventDisdip);
+//                jedisManager.hset(RedisDB.SHORT_TIME_QUERY, userIndex, "eventDisdip", jsonArrayInstantiateUtil.stringInstantiate(evArray),
+//                        RedisDB.SHORT_TIME);
+//                JSONArray ec4Array = JSONArray.fromObject(ec411);
+//                jedisManager.hset(RedisDB.SHORT_TIME_QUERY, userIndex, "ec411", jsonArrayInstantiateUtil.stringInstantiate(ec4Array), RedisDB.SHORT_TIME);
+//                JSONArray ec2Array = JSONArray.fromObject(ec28);
+//                jedisManager.hset(RedisDB.SHORT_TIME_QUERY, userIndex, "ec28", jsonArrayInstantiateUtil.stringInstantiate(ec2Array), RedisDB.SHORT_TIME);
+//            }
+//            /* 暂降事件点图 */
+//            List<EventDataList> eventDataLists = new ArrayList<>();
+//            if (reportMonitorPojo.isZjsjditic() || reportMonitorPojo.isZjsjdf47()) {
+//                eventDataLists = deviceInfo.getEventDataList(datePojo.getStartTime(), datePojo.getEndTime(),
+//                        reportMonitorPojo.getLineIndex());
+//            }
+//            /* 概率分布 */
+//            EventChance eventChance = new EventChance();
+//            if (reportMonitorPojo.isGlfbzjfz() || reportMonitorPojo.isGlfbcxsj()) {
+//                eventChance = deviceInfo.getEventChance(datePojo.getStartTime(), datePojo.getEndTime(),
+//                        reportMonitorPojo.getLineIndex());
+//            }
+//            /* 月份统计图 */
+//            List<Interval> intervals = new ArrayList<>();
+//            if (reportMonitorPojo.isYftjbg() || reportMonitorPojo.isYftjtx()) {
+//                intervals = deviceInfo.getEventTime(datePojo.getStartTime(), datePojo.getEndTime(),
+//                        reportMonitorPojo.getLineIndex());
+//                JSONArray inArray = JSONArray.fromObject(intervals);
+//                jedisManager.hset(RedisDB.SHORT_TIME_QUERY, userIndex, "intervals", jsonArrayInstantiateUtil.stringInstantiate(inArray),
+//                        RedisDB.SHORT_TIME);
+//            }
+//            /* 暂降原因 */
+//            List<EventCause> eventCauses = new ArrayList<>();
+//            if (reportMonitorPojo.isZjyybg() || reportMonitorPojo.isZjyytx()) {
+//                eventCauses = deviceInfo.getEventCause(datePojo.getStartTime(), datePojo.getEndTime(),
+//                        reportMonitorPojo.getLineIndex());
+//                JSONArray caArray = JSONArray.fromObject(eventCauses);
+//                jedisManager.hset(RedisDB.SHORT_TIME_QUERY, userIndex, "eventCauses", jsonArrayInstantiateUtil.stringInstantiate(caArray),
+//                        RedisDB.SHORT_TIME);
+//            }
+//            /* 暂降类型 */
+//            List<EventTypeList> eventTypeLists = new ArrayList<>();
+//            if (reportMonitorPojo.isZjlxbg() || reportMonitorPojo.isZjlxtx()) {
+//                eventTypeLists = deviceInfo.getEventType(datePojo.getStartTime(), datePojo.getEndTime(),
+//                        reportMonitorPojo.getLineIndex());
+//                JSONArray tyArray = JSONArray.fromObject(eventTypeLists);
+//                jedisManager.hset(RedisDB.SHORT_TIME_QUERY, userIndex, "eventTypeLists", jsonArrayInstantiateUtil.stringInstantiate(tyArray),
+//                        RedisDB.SHORT_TIME);
+//            }
+//            JSONObject reportPojo = JSONObject.fromObject(reportMonitorPojo);
+//            String key = TokenManager.getUserId() + "reportPojo";
+//            jedisManager.hset(RedisDB.SHORT_TIME_QUERY, userIndex, key, instantiateUtil.stringInstantiate(reportPojo), RedisDB.SHORT_TIME);
+//            /* 将前台需要画图的数据返回 */
+//            reList.add(eventDensities);
+//            reList.add(eventDataLists);
+//            reList.add(eventChance);
+//            reList.add(intervals);
+//            reList.add(eventCauses);
+//            reList.add(eventTypeLists);
+//            reList.add(arry);
+//            result = PubUtils.assignmentResult(reList, 200, "获取监测点图表数据成功");
+//        } catch (Exception e) {
+//            logger.error("获取监测点图表数据异常,异常为：" + e.toString());
+//            result = PubUtils.assignmentResult(null, 500, "获取监测点图表数据异常");
+//        }
+//
+//        return result;
+//    }
+//
+//    /**
+//     * 根据用户页面的选择，指定我们需要查询的数据
+//     *
+//     * @param request 请求
+//     */
+//    private ReportMonitorPojo getMonitorChoose(HttpServletRequest request, String startTime, String endTime, String lineIndex, String lineName, boolean jcdxq,
+//                                               boolean zjsjlb, boolean zjsjssbx, boolean zjmdbg, boolean zjmdtx, boolean zjsjditic, boolean zjsjdf47, boolean glfbzjfz,
+//                                               boolean glfbcxsj, boolean yftjbg, boolean yftjtx, boolean zjyybg, boolean zjyytx, boolean zjlxbg, boolean zjlxtx) {
+//        ReportMonitorPojo reportMonitorPojo = new ReportMonitorPojo();
+//        reportMonitorPojo.setJcdxq(Boolean.valueOf(jcdxq));
+//        reportMonitorPojo.setZjsjlb(Boolean.valueOf(zjsjlb));
+//        reportMonitorPojo.setZjsjssbx(Boolean.valueOf(zjsjssbx));
+//        reportMonitorPojo.setZjmdbg(Boolean.valueOf(zjmdbg));
+//        reportMonitorPojo.setZjmdtx(Boolean.valueOf(zjmdtx));
+//        reportMonitorPojo.setZjsjditic(Boolean.valueOf(zjsjditic));
+//        reportMonitorPojo.setZjsjdf47(Boolean.valueOf(zjsjdf47));
+//        reportMonitorPojo.setGlfbzjfz(Boolean.valueOf(glfbzjfz));
+//        reportMonitorPojo.setGlfbcxsj(Boolean.valueOf(glfbcxsj));
+//        reportMonitorPojo.setYftjbg(Boolean.valueOf(yftjbg));
+//        reportMonitorPojo.setYftjtx(Boolean.valueOf(yftjtx));
+//        reportMonitorPojo.setZjyybg(Boolean.valueOf(zjyybg));
+//        reportMonitorPojo.setZjyytx(Boolean.valueOf(zjyytx));
+//        reportMonitorPojo.setZjlxbg(Boolean.valueOf(zjlxbg));
+//        reportMonitorPojo.setZjlxtx(Boolean.valueOf(zjlxtx));
+//        reportMonitorPojo.setStartTime(startTime);
+//        reportMonitorPojo.setEndTime(endTime);
+//        reportMonitorPojo.setLineIndex(lineIndex);
+//        reportMonitorPojo.setLineName(lineName);
+//        return reportMonitorPojo;
+//
+//    }
+//
+//    @PostMapping("exportReport")
+//    @ResponseBody
+//    public String exportReport(HttpServletRequest request, String densityImage, String iticImage, String f47Image, String eventValueImage,
+//                               String persisttimeImage, String shunSImg, String timeImage, String causeImage, String typeImage, String startTime, String endTime) throws Exception {
+//        String userIndex = TokenManager.getUserId();
+//        JSONObject jsonObject = instantiateUtil.deInstantiate(instantiateUtil.stringDeInstantiate(jedisManager.hget(RedisDB.SHORT_TIME_QUERY, userIndex,
+//                TokenManager.getUserId() + "reportPojo")));
+//        ReportMonitorPojo reportMonitorPojo = (ReportMonitorPojo) JSONObject.toBean(jsonObject,
+//                ReportMonitorPojo.class);
+//        // 需要展示的图
+//        if (reportMonitorPojo.isZjmdtx()) {
+//            jedisManager.hset(RedisDB.SHORT_TIME_QUERY, userIndex, "densityImage", stringInstantiateUtil.stringInstantiate(densityImage), RedisDB.SHORT_TIME);
+//        }
+//        if (reportMonitorPojo.isZjsjssbx()) {
+//            if (!shunSImg.equals("[]")) {
+//                JSONArray jsonArray = JSONArray.fromObject(shunSImg);
+//                jedisManager.hset(RedisDB.SHORT_TIME_QUERY, userIndex, "shunSImage", jsonArrayInstantiateUtil.stringInstantiate(jsonArray), RedisDB.SHORT_TIME);
+//            } else {
+//                jedisManager.hset(RedisDB.SHORT_TIME_QUERY, userIndex, "shunSImage", jsonArrayInstantiateUtil.stringInstantiate(null), RedisDB.SHORT_TIME);
+//            }
+//        }
+//        if (reportMonitorPojo.isZjsjditic()) {
+//            jedisManager.hset(RedisDB.SHORT_TIME_QUERY, userIndex, "iticImage", stringInstantiateUtil.stringInstantiate(iticImage), RedisDB.SHORT_TIME);
+//        }
+//        if (reportMonitorPojo.isZjsjdf47()) {
+//            jedisManager.hset(RedisDB.SHORT_TIME_QUERY, userIndex, "f47Image", stringInstantiateUtil.stringInstantiate(f47Image), RedisDB.SHORT_TIME);
+//        }
+//        if (reportMonitorPojo.isGlfbzjfz()) {
+//            jedisManager.hset(RedisDB.SHORT_TIME_QUERY, userIndex, "eventValueImage", stringInstantiateUtil.stringInstantiate(eventValueImage),
+//                    RedisDB.SHORT_TIME);
+//        }
+//        if (reportMonitorPojo.isGlfbcxsj()) {
+//            jedisManager.hset(RedisDB.SHORT_TIME_QUERY, userIndex, "persisttimeImage", stringInstantiateUtil.stringInstantiate(persisttimeImage),
+//                    RedisDB.SHORT_TIME);
+//        }
+//        if (reportMonitorPojo.isYftjtx()) {
+//            jedisManager.hset(RedisDB.SHORT_TIME_QUERY, userIndex, "timeImage", stringInstantiateUtil.stringInstantiate(timeImage), RedisDB.SHORT_TIME);
+//        }
+//        if (reportMonitorPojo.isZjyytx()) {
+//            jedisManager.hset(RedisDB.SHORT_TIME_QUERY, userIndex, "causeImage", stringInstantiateUtil.stringInstantiate(causeImage), RedisDB.SHORT_TIME);
+//        }
+//        if (reportMonitorPojo.isZjlxtx()) {
+//            jedisManager.hset(RedisDB.SHORT_TIME_QUERY, userIndex, "typeImage", stringInstantiateUtil.stringInstantiate(typeImage), RedisDB.SHORT_TIME);
+//        }
+//        userLogDetailService.saveUserLog(TokenManager.getToken().getUserIndex(), TokenManager.getToken().getLoginName(),
+//                "生成监测点报告", "成功", appConfig.getSystemFlag(), PubUtils.getIpAddr(request),
+//                LogTypeEnum.BUSSINESS.toString(), 0);
+//        return "success";
+//    }
+//
+//    @GetMapping("downMonitorReport")
+//    public void downMonitorReport(HttpServletResponse response, HttpServletRequest request, String name) throws Exception {
+//        String userIndex = TokenManager.getUserId();
+//        JSONObject jsonObject = instantiateUtil.deInstantiate(instantiateUtil.stringDeInstantiate(jedisManager.hget(RedisDB.SHORT_TIME_QUERY, userIndex,
+//                TokenManager.getUserId() + "reportPojo")));
+//        jedisManager.hdel(RedisDB.SHORT_TIME_QUERY, userIndex, TokenManager.getUserId() + "reportPojo");
+//        ReportMonitorPojo reportMonitorPojo = (ReportMonitorPojo) JSONObject.toBean(jsonObject,
+//                ReportMonitorPojo.class);
+//        int one = 1;
+//        // 开始做文档
+//        XWPFDocument document = new XWPFDocument();
+//        // 设定标题格式
+//        WordUtils.setHeadingStyle(document);
+//        // 添加标题
+//        XWPFParagraph titleParagraph = WordUtils.getCenterParagraph(document);
+//        WordUtils.addLine(titleParagraph, 11);
+//        // 设置段落居中
+//        XWPFRun titleParagraphRun = titleParagraph.createRun();
+//        Depts deptTmp = userUtil.getCurrentDept();
+//        String titlename = deptTmp.getDeptsName();
+//        WordUtils.addParagraph(titleParagraphRun, "宋体", 15, "000000", titlename, true);
+//        WordUtils.addLine(titleParagraph, 3);
+//        XWPFRun titleParagraphBigRun = titleParagraph.createRun();
+//        WordUtils.addParagraph(titleParagraphBigRun, "宋体", 36, "000000", "电压暂降事件分析报告", true);
+//        WordUtils.addLine(titleParagraph, 19);
+//        XWPFRun titleParagraphDateRun = titleParagraph.createRun();
+//        WordUtils.addParagraph(titleParagraphDateRun, "宋体", 14, "000000", "日期：" + WordUtils.getRightNow(), true);
+//        titleParagraph.setPageBreak(true);
+//        // 段落
+//        XWPFParagraph statisticsParagraph = WordUtils.getCenterParagraph(document);
+//        // 段前分页
+//        statisticsParagraph.setPageBreak(true);
+//        XWPFRun statisticsRun = statisticsParagraph.createRun();
+//        WordUtils.addParagraph(statisticsRun, "宋体", 24, "000000", "电压暂降事件分析报告", false);
+//        createTitle(document, "1. 引言", "标题 1", 0, 15);
+//        XWPFParagraph introductionContentParagraph = WordUtils.getLeftParagraph(document);
+//        // 首行缩进---段落
+//        introductionContentParagraph.setIndentationFirstLine(200);
+//        XWPFRun introductionContentRun = introductionContentParagraph.createRun();
+//        WordUtils.addParagraph(introductionContentRun, "宋体", 11, "000000", "对所选中区间内电压暂降事件进行分析，能够直观清晰查看相应的暂降事件信息。",
+//                false);
+//        createTitle(document, "2. 报告分析对象", "标题 1", 0, 15);
+//        XWPFParagraph objectContentParagraph = WordUtils.getLeftParagraph(document);
+//        objectContentParagraph.setIndentationFirstLine(200);
+//        XWPFRun objectContentRun = objectContentParagraph.createRun();
+//        WordUtils.addParagraph(objectContentRun, "宋体", 11, "000000", reportMonitorPojo.getLineName(), false);
+//        createTitle(document, "3. 报告分析时间", "标题 1", 0, 15);
+//        XWPFParagraph timeContentParagraph = WordUtils.getLeftParagraph(document);
+//        timeContentParagraph.setIndentationFirstLine(200);
+//        XWPFRun timeContentRun = timeContentParagraph.createRun();
+//        WordUtils.addParagraph(timeContentRun, "宋体", 11, "000000",
+//                reportMonitorPojo.getStartTime() + " 至 " + reportMonitorPojo.getEndTime(), false);
+//        createTitle(document, "4. 汇总信息", "标题 1", 0, 15);
+//        /* 填充监测点详情 */
+//        if (reportMonitorPojo.isJcdxq()) {
+//            createTitle(document, "4." + one + " 监测点信息", "标题 2", 200, 11);
+//            // 监测点信息
+//            XWPFTable monitorInfo = createTable(document);
+//            XWPFParagraph monitorInfoExcelParagraph = WordUtils.getCenterParagraph(document);
+//            LineInfo lineInfo;
+//            JSONObject jo = instantiateUtil.deInstantiate(instantiateUtil.stringDeInstantiate(jedisManager.hget(RedisDB.SHORT_TIME_QUERY, userIndex, "lineInfo")));
+//            lineInfo = (LineInfo) JSONObject.toBean(jo, LineInfo.class);
+//            // 表格第一行
+//            insertRow(document, monitorInfo, monitorInfoExcelParagraph, true, "项目", "描述");
+//            insertRow(document, monitorInfo, monitorInfoExcelParagraph, false, "监测点名称", lineInfo.getName());
+//            insertRow(document, monitorInfo, monitorInfoExcelParagraph, false, "电压等级", lineInfo.getScale());
+//            insertRow(document, monitorInfo, monitorInfoExcelParagraph, false, "PT变比", lineInfo.getPT());
+//            insertRow(document, monitorInfo, monitorInfoExcelParagraph, false, "CT变比", lineInfo.getCT());
+//            insertRow(document, monitorInfo, monitorInfoExcelParagraph, false, "协议容量",
+//                    String.valueOf(lineInfo.getXYCMP()));
+//            insertRow(document, monitorInfo, monitorInfoExcelParagraph, false, "基准容量",
+//                    String.valueOf(lineInfo.getJZCMP()));
+//            insertRow(document, monitorInfo, monitorInfoExcelParagraph, false, "设备容量",
+//                    String.valueOf(lineInfo.getDEVCMP()));
+//            insertRow(document, monitorInfo, monitorInfoExcelParagraph, false, "最小短路容量",
+//                    String.valueOf(lineInfo.getDLCMP()));
+//            insertRow(document, monitorInfo, monitorInfoExcelParagraph, false, "接线方式", lineInfo.getPttype());
+//            one++;
+//        }
+//        /* 暂降事件列表 */
+//        List<AnalyzeInfo> analyzeInfos = null;
+//        if (reportMonitorPojo.isZjsjlb()) {
+//            createTitle(document, "4." + one + " 暂降事件列表", "标题 2", 200, 11);
+//            XWPFTable sum = createTable(document);
+//            XWPFParagraph sumExcelParagraph = WordUtils.getCenterParagraph(document);
+//            JSONArray ja = jsonArrayInstantiateUtil.deInstantiate(jsonArrayInstantiateUtil.stringDeInstantiate(jedisManager.hget(RedisDB.SHORT_TIME_QUERY, userIndex, "analyzeInfos")));
+//            analyzeInfos = (List<AnalyzeInfo>) JSONArray.toCollection(ja, AnalyzeInfo.class);
+//            insertRow(document, sum, sumExcelParagraph, true, "序号", "暂降发生时刻", "暂降幅值(%)", "持续时间(s)", "暂降类型", "暂降原因",
+//                    "严重度");
+//            if (analyzeInfos.isEmpty()) {
+//                insertRow(document, sum, sumExcelParagraph, false, "", "", "", "", "", "", "");
+//            } else {
+//                for (int i = 0; i < analyzeInfos.size(); i++) {
+//                    insertRow(document, sum, sumExcelParagraph, false, String.valueOf(i + 1),
+//                            analyzeInfos.get(i).getTime(), analyzeInfos.get(i).getEventvaule(),
+//                            analyzeInfos.get(i).getPersisttime(), analyzeInfos.get(i).getType(),
+//                            analyzeInfos.get(i).getReason(), String.valueOf(analyzeInfos.get(i).getYzd()));
+//                }
+//            }
+//            one++;
+//        }
+//        /* 暂降事件波形 */
+//        if (reportMonitorPojo.isZjsjssbx()) {
+//            createTitle(document, "4." + one + " 暂降事件图形", "标题 2", 200, 11);
+//            int two = 1;
+//            if (reportMonitorPojo.isZjsjssbx()) {
+//                List<AnalyzeInfo> analyzeInfo = null;
+//                JSONArray ja = jsonArrayInstantiateUtil.deInstantiate(jsonArrayInstantiateUtil.stringDeInstantiate(jedisManager.hget(RedisDB.SHORT_TIME_QUERY, userIndex, "analyzeInfos")));
+//                analyzeInfo = (List<AnalyzeInfo>) JSONArray.toCollection(ja, AnalyzeInfo.class);
+//                for (int i = 0; i < analyzeInfo.size(); i++) {
+//                    if (Integer.parseInt(analyzeInfo.get(i).getFileFlag()) == 0) {
+//                        analyzeInfo.remove(i);
+//                    }
+//                }
+//                JSONArray shunSImages = jsonArrayInstantiateUtil.deInstantiate(jsonArrayInstantiateUtil.stringDeInstantiate(jedisManager.hget(RedisDB.SHORT_TIME_QUERY, userIndex, "shunSImage")));
+//                if (shunSImages != null) {
+//                    for (int i = 0; i < shunSImages.size(); i++) {
+//                        if (Integer.parseInt(analyzeInfo.get(i).getFileFlag()) == 1) {
+//                            createTitle(document, "事件" + (i + 1) + ":" + analyzeInfo.get(i).getTime(), "标题 3", 400, 11);
+//                            List<String> shunSImage;
+//                            shunSImage = (List<String>) JSONArray.toCollection((JSONArray) shunSImages.get(i));
+//                            for (int j = 0; j < shunSImage.size(); j++) {
+//                                createPic(document, shunSImage.get(j), "暂降事件图形");
+//                            }
+//                        }
+//                    }
+//
+//                } else {
+//                    if (analyzeInfos.size() > 10) {
+//                        two = 10;
+//                    } else {
+//                        two = analyzeInfos.size();
+//                    }
+//                    for (int i = 0; i < two; i++) {
+//                        if (Integer.parseInt(analyzeInfos.get(i).getFileFlag()) == 1) {
+//                            createTitle(document, "事件" + (i + 1) + ":" + analyzeInfos.get(i).getTime() + "(未找到波形文件)", "标题 3", 400, 11);
+//                        }
+//                    }
+//                }
+//
+//            }
+//            one++;
+//        }
+//        /* 暂降事件点图 */
+//        if (reportMonitorPojo.isZjsjditic() || reportMonitorPojo.isZjsjdf47()) {
+//            createTitle(document, "4." + one + " 暂降事件点图", "标题 2", 200, 11);
+//            int two = 1;
+//            if (reportMonitorPojo.isZjsjditic()) {
+//                createTitle(document, "4." + one + "." + two + " ITIC曲线", "标题 3", 400, 11);
+//                String iticImage = stringInstantiateUtil.deInstantiate(stringInstantiateUtil.stringDeInstantiate(jedisManager.hget(RedisDB.SHORT_TIME_QUERY, userIndex, "iticImage")));
+//                createPic(document, iticImage, "ITIC曲线");
+//                two++;
+//            }
+//            if (reportMonitorPojo.isZjsjdf47()) {
+//                createTitle(document, "4." + one + "." + two + " F47曲线", "标题 3", 400, 11);
+//                String f47Image = stringInstantiateUtil.deInstantiate(stringInstantiateUtil.stringDeInstantiate(jedisManager.hget(RedisDB.SHORT_TIME_QUERY, userIndex, "f47Image")));
+//                createPic(document, f47Image, "F47曲线");
+//            }
+//            one++;
+//        }
+//        /* 暂降密度 */
+//        if (reportMonitorPojo.isZjmdtx() || reportMonitorPojo.isZjmdbg()) {
+//            createTitle(document, "4." + one + " 暂降密度", "标题 2", 200, 11);
+//            int two = 1;
+//            if (reportMonitorPojo.isZjmdtx()) {
+//                createTitle(document, "4." + one + "." + two + " 暂降密度点图", "标题 3", 400, 11);
+//                String densityImage = stringInstantiateUtil.deInstantiate(stringInstantiateUtil.stringDeInstantiate(jedisManager.hget(RedisDB.SHORT_TIME_QUERY, userIndex, "densityImage")));
+//                createPic(document, densityImage, "暂降密度点图");
+//                two++;
+//            }
+//            if (reportMonitorPojo.isZjmdbg()) {
+//                createTitle(document, "4." + one + "." + two + " DISDIP表格:国际发配电联盟(UNIPEDE)", "标题 3", 400, 11);
+//                XWPFTable disdip = createTable(document);
+//                XWPFParagraph disdipExcelParagraph = WordUtils.getCenterParagraph(document);
+//                List<List> eventDisdip;
+//                JSONArray arrayeventDisdip = jsonArrayInstantiateUtil.deInstantiate(jsonArrayInstantiateUtil.stringDeInstantiate(jedisManager.hget(RedisDB.SHORT_TIME_QUERY, userIndex, "eventDisdip")));
+//                eventDisdip = (List<List>) JSONArray.toCollection(arrayeventDisdip, ArrayList.class);
+//                insertRow(document, disdip, disdipExcelParagraph, true, "剩余电压", "20ms", "100ms", "500ms", "1s", "3s",
+//                        "20s", "60s", "180s");
+//                if (eventDisdip.isEmpty()) {
+//                    insertRow(document, disdip, disdipExcelParagraph, false, "", "", "", "", "", "", "", "", "");
+//                } else {
+//                    for (List list : eventDisdip) {
+//                        insertRow(document, disdip, disdipExcelParagraph, false, list.get(0).toString(),
+//                                list.get(1).toString(), list.get(2).toString(), list.get(3).toString(),
+//                                list.get(4).toString(), list.get(5).toString(), list.get(6).toString(),
+//                                list.get(7).toString(), list.get(8).toString());
+//                    }
+//                }
+//                two++;
+//                createTitle(document, "4." + one + "." + two + " IEC 61000-4-11:(用电终端的电压暂降抗度)", "标题 3", 400, 11);
+//                XWPFTable ec411Table = createTable(document);
+//                XWPFParagraph ec411TableExcelParagraph = WordUtils.getCenterParagraph(document);
+//                List<List> ec411;
+//                JSONArray arrayec411 = jsonArrayInstantiateUtil.deInstantiate(jsonArrayInstantiateUtil.stringDeInstantiate(jedisManager.hget(RedisDB.SHORT_TIME_QUERY, userIndex, "ec411")));
+//                ec411 = (List<List>) JSONArray.toCollection(arrayec411, ArrayList.class);
+//                insertRow(document, ec411Table, ec411TableExcelParagraph, true, "剩余电压", "10~20ms", "20~100ms",
+//                        "0.1~0.2s", "0.2~0.5s", "0.5~1s", ">1s");
+//                if (ec411.isEmpty()) {
+//                    insertRow(document, ec411Table, ec411TableExcelParagraph, false, "", "", "", "", "", "", "");
+//                } else {
+//                    for (List list : ec411) {
+//                        insertRow(document, ec411Table, ec411TableExcelParagraph, false, list.get(0).toString(),
+//                                list.get(1).toString(), list.get(2).toString(), list.get(3).toString(),
+//                                list.get(4).toString(), list.get(5).toString(), list.get(6).toString());
+//                    }
+//                }
+//                two++;
+//                createTitle(document, "4." + one + "." + two + " IEC 61000-2-8:(公共电网电压暂降测量统计)", "标题 3", 400, 11);
+//                XWPFTable ec28Table = createTable(document);
+//                XWPFParagraph ec28TableExcelParagraph = WordUtils.getCenterParagraph(document);
+//                List<List> ec28;
+//                JSONArray arrayec28 = jsonArrayInstantiateUtil.deInstantiate(jsonArrayInstantiateUtil.stringDeInstantiate(jedisManager.hget(RedisDB.SHORT_TIME_QUERY, userIndex, "ec28")));
+//                ec28 = (List<List>) JSONArray.toCollection(arrayec28, ArrayList.class);
+//                insertRow(document, ec28Table, ec28TableExcelParagraph, true, "剩余电压", "0.02~0.1s", "0.1~0.25s",
+//                        "0.25~0.5s", "0.5~1s", "1~3s", "3~20s", "20~60s", "60~180s");
+//                if (ec28.isEmpty()) {
+//                    insertRow(document, ec28Table, ec28TableExcelParagraph, false, "", "", "", "", "", "", "", "", "");
+//                } else {
+//                    for (List list : ec28) {
+//                        insertRow(document, ec28Table, ec28TableExcelParagraph, false, list.get(0).toString(),
+//                                list.get(1).toString(), list.get(2).toString(), list.get(3).toString(),
+//                                list.get(4).toString(), list.get(5).toString(), list.get(6).toString(),
+//                                list.get(7).toString(), list.get(8).toString());
+//                    }
+//                }
+//            }
+//            one++;
+//        }
+//        /* 概率分布 */
+//        if (reportMonitorPojo.isGlfbcxsj() || reportMonitorPojo.isGlfbzjfz()) {
+//            createTitle(document, "4." + one + " 暂降幅值概率分布图", "标题 2", 200, 11);
+//            int two = 1;
+//            if (reportMonitorPojo.isGlfbzjfz()) {
+//                createTitle(document, "4." + one + "." + two + " 暂降幅值的概率分函数", "标题 3", 400, 11);
+//                String eventValueImage = stringInstantiateUtil.deInstantiate(stringInstantiateUtil.stringDeInstantiate(jedisManager.hget(RedisDB.SHORT_TIME_QUERY, userIndex, "eventValueImage")));
+//                createPic(document, eventValueImage, "暂降幅值的概率分布函数");
+//                two++;
+//            }
+//            if (reportMonitorPojo.isGlfbcxsj()) {
+//                createTitle(document, "4." + one + "." + two + " 持续时间的概率分函数", "标题 3", 400, 11);
+//                String persisttimeImage = stringInstantiateUtil.deInstantiate(stringInstantiateUtil.stringDeInstantiate(jedisManager.hget(RedisDB.SHORT_TIME_QUERY, userIndex, "persisttimeImage")));
+//                createPic(document, persisttimeImage, "持续时间的概率分函数");
+//            }
+//            one++;
+//        }
+//        /* 月份统计 */
+//        if (reportMonitorPojo.isYftjtx() || reportMonitorPojo.isYftjbg()) {
+//            createTitle(document, "4." + one + " 月份统计", "标题 2", 200, 11);
+//            int two = 1;
+//            if (reportMonitorPojo.isYftjtx()) {
+//                createTitle(document, "4." + one + "." + two + " 月份统计图", "标题 3", 400, 11);
+//                String timeImage = stringInstantiateUtil.deInstantiate(stringInstantiateUtil.stringDeInstantiate(jedisManager.hget(RedisDB.SHORT_TIME_QUERY, userIndex, "timeImage")));
+//                createPic(document, timeImage, "月份统计图");
+//                two++;
+//            }
+//            if (reportMonitorPojo.isYftjbg()) {
+//                createTitle(document, "4." + one + "." + two + " 月份统计表格", "标题 3", 400, 11);
+//                XWPFTable intervalsTable = createTable(document);
+//                XWPFParagraph intervalsTableExcelParagraph = WordUtils.getCenterParagraph(document);
+//                List<Interval> intervals;
+//                JSONArray arrayintervals = jsonArrayInstantiateUtil.deInstantiate(jsonArrayInstantiateUtil.stringDeInstantiate(jedisManager.hget(RedisDB.SHORT_TIME_QUERY, userIndex, "intervals")));
+//                intervals = (List<Interval>) JSONArray.toCollection(arrayintervals, Interval.class);
+//                insertRow(document, intervalsTable, intervalsTableExcelParagraph, true, "月份", "电压暂降次数");
+//                if (intervals.isEmpty()) {
+//                    insertRow(document, intervalsTable, intervalsTableExcelParagraph, false, "", "");
+//                } else {
+//                    for (Interval interval : intervals) {
+//                        insertRow(document, intervalsTable, intervalsTableExcelParagraph, false, interval.getMonth(),
+//                                String.valueOf(interval.getTimes()));
+//                    }
+//                }
+//            }
+//            one++;
+//        }
+//        /* 原因统计 */
+//        if (reportMonitorPojo.isZjyytx() || reportMonitorPojo.isZjyybg()) {
+//            createTitle(document, "4." + one + " 原因统计", "标题 2", 200, 11);
+//            int two = 1;
+//            if (reportMonitorPojo.isZjyytx()) {
+//                createTitle(document, "4." + one + "." + two + " 原因统计图", "标题 3", 400, 11);
+//                String causeImage = stringInstantiateUtil.deInstantiate(stringInstantiateUtil.stringDeInstantiate(jedisManager.hget(RedisDB.SHORT_TIME_QUERY, userIndex, "causeImage")));
+//                createPic(document, causeImage, "原因统计图");
+//                two++;
+//            }
+//            if (reportMonitorPojo.isZjyybg()) {
+//                createTitle(document, "4." + one + "." + two + " 原因统计表格", "标题 3", 400, 11);
+//                XWPFTable causeTable = createTable(document);
+//                XWPFParagraph causeTableExcelParagraph = WordUtils.getCenterParagraph(document);
+//                List<EventCause> eventCauses;
+//                JSONArray arrayeventCauses = jsonArrayInstantiateUtil.deInstantiate(jsonArrayInstantiateUtil.stringDeInstantiate(jedisManager.hget(RedisDB.SHORT_TIME_QUERY, userIndex, "eventCauses")));
+//                eventCauses = (List<EventCause>) JSONArray.toCollection(arrayeventCauses, EventCause.class);
+//                insertRow(document, causeTable, causeTableExcelParagraph, true, "暂降原因", "电压暂降次数");
+//                if (eventCauses.isEmpty()) {
+//                    insertRow(document, causeTable, causeTableExcelParagraph, false, "", "");
+//                } else {
+//                    for (EventCause eventCause : eventCauses) {
+//                        insertRow(document, causeTable, causeTableExcelParagraph, false, eventCause.getCause(),
+//                                String.valueOf(eventCause.getCount()));
+//                    }
+//                }
+//            }
+//            one++;
+//        }
+//        /* 类型统计 */
+//        if (reportMonitorPojo.isZjlxtx() || reportMonitorPojo.isZjlxbg()) {
+//            createTitle(document, "4." + one + " 类型统计", "标题 2", 200, 11);
+//            int two = 1;
+//            if (reportMonitorPojo.isZjlxtx()) {
+//                createTitle(document, "4." + one + "." + two + " 类型统计图", "标题 3", 400, 11);
+//                String typeImage = stringInstantiateUtil.deInstantiate(stringInstantiateUtil.stringDeInstantiate(jedisManager.hget(RedisDB.SHORT_TIME_QUERY, userIndex, "typeImage")));
+//                createPic(document, typeImage, "类型统计图");
+//                two++;
+//            }
+//            if (reportMonitorPojo.isZjlxbg()) {
+//                createTitle(document, "4." + one + "." + two + " 类型统计表格", "标题 3", 400, 11);
+//                XWPFTable typeTable = createTable(document);
+//                XWPFParagraph typeTableExcelParagraph = WordUtils.getCenterParagraph(document);
+//                List<EventTypeList> eventTypeLists = new ArrayList();
+//                JSONArray arrayeventTypes = jsonArrayInstantiateUtil.deInstantiate(jsonArrayInstantiateUtil.stringDeInstantiate(jedisManager.hget(RedisDB.SHORT_TIME_QUERY, userIndex, "eventTypeLists")));
+//                eventTypeLists = (List<EventTypeList>) JSONArray.toCollection(arrayeventTypes, EventTypeList.class);
+//                insertRow(document, typeTable, typeTableExcelParagraph, true, "暂降类型", "电压暂降次数");
+//                if (eventTypeLists.isEmpty()) {
+//                    insertRow(document, typeTable, typeTableExcelParagraph, false, "", "");
+//                } else {
+//                    for (EventTypeList eventTypeList : eventTypeLists) {
+//                        insertRow(document, typeTable, typeTableExcelParagraph, false, eventTypeList.getType(),
+//                                String.valueOf(eventTypeList.getCount()));
+//                    }
+//                }
+//            }
+//        }
+//        OutputStream out;
+//        try {
+//            response.setContentType("application/force-download");// 设置强制下载不打开
+//            String agent = request.getHeader("User-Agent").toUpperCase(); // 获得浏览器信息并转换为大写
+//            if (agent.indexOf("MSIE") > 0 || (agent.indexOf("GECKO") > 0 && agent.indexOf("RV:11") > 0)) { // IE浏览器和Edge浏览器
+//                name = URLEncoder.encode(name, "UTF-8");
+//            } else { // 其他浏览器
+////                name = new String(name.getBytes("UTF-8"), "iso-8859-1");
+//                name = URLEncoder.encode(name, "UTF-8");
+//            }
+//            response.addHeader("Content-Disposition", "attachment;fileName=" + name + ".docx");// 设置文件名
+//
+//            out = response.getOutputStream();
+//            document.write(out);
+//            document.close();
+//            out.close();
+//        } catch (Exception e) {
+//            logger.error(e.getMessage());
+//        }
+//    }
+//
+//    /**
+//     * 创建标题
+//     *
+//     * @param document 文档
+//     * @param message  标题内容
+//     * @param style    标题等级
+//     * @param line     缩进
+//     * @param fontSize 字体大小
+//     */
+//    public static void createTitle(XWPFDocument document, String message, String style, int line, int fontSize) {
+//        XWPFParagraph summaeTableParagraph = WordUtils.getLeftParagraph(document);
+//        summaeTableParagraph.setStyle(style);
+//        summaeTableParagraph.setIndentationFirstLine(line);
+//        XWPFRun summaeTableRun = summaeTableParagraph.createRun();
+//        WordUtils.addParagraph(summaeTableRun, "宋体", fontSize, "000000", message, false);
+//    }
+//
+//    /**
+//     * 创建图片在word中
+//     *
+//     * @param document 文档
+//     * @param image    图片base64
+//     * @param name     图片名
+//     * @throws IOException
+//     * @throws InvalidFormatException
+//     */
+//    public void createPic(XWPFDocument document, String image, String name) throws IOException, InvalidFormatException {
+//        XWPFParagraph picParagraph = WordUtils.getCenterParagraph(document);
+//        XWPFRun createRun = picParagraph.createRun();
+//        byte[] base64Info = decodeBase64(image);
+//        InputStream in = new ByteArrayInputStream(base64Info);
+//        createRun.addPicture(in, 5, name, Units.toEMU(410), Units.toEMU(170));
+//    }
+//
+//    /**
+//     * 创建地图
+//     *
+//     * @param document 文档
+//     * @param image    图片base64
+//     * @param name     图片名
+//     * @throws IOException
+//     * @throws InvalidFormatException
+//     */
+//    public void createMap(XWPFDocument document, String image, String name) throws IOException, InvalidFormatException {
+//        XWPFParagraph picParagraph = WordUtils.getCenterParagraph(document);
+//        XWPFRun createRun = picParagraph.createRun();
+//        byte[] base64Info = decodeBase64(image);
+//        InputStream in = new ByteArrayInputStream(base64Info);
+//        createRun.addPicture(in, 5, name, Units.toEMU(410), Units.toEMU(210));
+//    }
+//
+//    /**
+//     * 创建表格
+//     *
+//     * @param document
+//     * @return
+//     */
+//    public static XWPFTable createTable(XWPFDocument document) {
+//        XWPFTable summaTable = document.createTable();
+//        // 列宽自动分割
+//        CTTblWidth summaTableWidth = summaTable.getCTTbl().addNewTblPr().addNewTblW();
+//        summaTableWidth.setType(STTblWidth.DXA);
+//        summaTableWidth.setW(BigInteger.valueOf(8160));
+//        return summaTable;
+//    }
+//
+//    /**
+//     * 表格插入行数据
+//     *
+//     * @param document 文档
+//     * @param table    表格
+//     * @param head     是否是表头
+//     * @param values   数据内容
+//     */
+//    public static void insertRow(XWPFDocument document, XWPFTable table, XWPFParagraph excelParagraph, boolean head,
+//                                 String... values) {
+//        if (head) {
+//            XWPFTableRow summaTableRowOne = table.getRow(0);
+//            WordUtils.setExcelHeadContent(excelParagraph, summaTableRowOne, values);
+//        } else {
+//            XWPFTableRow summaTableRowOne = table.createRow();
+//            WordUtils.setExcelContent(excelParagraph, summaTableRowOne, values);
+//        }
+//    }
+//
+//    /**
+//     * 解析base64，返回图片所在路径
+//     *
+//     * @param base64Info
+//     * @return
+//     */
+//    private byte[] decodeBase64(String base64Info) {
+//        if (StringUtils.isEmpty(base64Info)) {
+//            return null;
+//        }
+//        BASE64Decoder decoder = new BASE64Decoder();
+//        if (!base64Info.contains("base64,"))
+//            return null;
+//        String[] arr = base64Info.split("base64,");
+//        // 数据中：data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAABI4AAAEsCAYAAAClh/jbAAA
+//        // ... 在"base64,"之后的才是图片信息
+//        try {
+//            return decoder.decodeBuffer(arr[1]);
+//        } catch (IOException e) {
+//            return null;
+//        }
+//    }
+//
+//    /**
+//     * 获取区域模板
+//     *
+//     * @return
+//     */
+//    @PostMapping("areaTemplate")
+//    @ResponseBody
+//    public HttpResult areaTemplate() {
+//        HttpResult result;
+//        List<RptPloy> datas;
+//        datas = reportService.getTemplate(Integer.valueOf(1));
+//        if (CollectionUtils.isEmpty(datas)) {
+//            result = PubUtils.assignmentResult(null, 500, "沒有对应的模板");
+//        } else {
+//            result = PubUtils.assignmentResult(datas, 200, "获取模板成功");
+//        }
+//        return result;
+//    }
+//
+//
+//    @PostMapping("area")
+//    @ResponseBody
+//    public HttpResult area(HttpServletRequest request, String startTime, String endTime, String area, String areaname, String jcwfb, String zjsjbg,
+//                           String zjsjtx, String zjmdbg, String zjmdtx, String zjsjditic, String zjsjdf47, String glfbzjfz, String glfbcxsj,
+//                           String sjglbg, String zjyybg, String zjyytx, String zjlxbg, String zjlxtx, String zjrlt) throws Exception {
+//        HttpResult result;
+//        List<Object> reList = new ArrayList<>();
+//        ReportAreaPojo reportAreaPojo = getAreaChoose(request, startTime, endTime, area, areaname, jcwfb, zjsjbg, zjsjtx, zjmdbg, zjmdtx,
+//                zjsjditic, zjsjdf47, glfbzjfz, glfbcxsj, sjglbg, zjyybg, zjyytx, zjlxbg, zjlxtx, zjrlt);
+//        DatePojo datePojo;
+//        datePojo = PubUtils.validateDate(reportAreaPojo.getStartTime(), reportAreaPojo.getEndTime(), "monitor");
+//        String userIndex = TokenManager.getUserId();
+//        if (!datePojo.getValidity()) {
+//            result = PubUtils.assignmentResult(null, 500, "解析前台传递的时间有误");
+//            return result;
+//        }
+//        try {
+//            DevMapInfo devMapInfo = new DevMapInfo();
+//            devMapInfo = areaService.getDevMap(reportAreaPojo.getArea());
+//            JSONArray devMapArray = JSONArray.fromObject(devMapInfo.getOnline());
+//            jedisManager.hset(RedisDB.SHORT_TIME_QUERY, userIndex, "linecount",
+//                    stringInstantiateUtil.stringInstantiate(String.valueOf(devMapInfo.getMaps().size())), RedisDB.SHORT_TIME);
+//            jedisManager.hset(RedisDB.SHORT_TIME_QUERY, userIndex, "devMapInfo", jsonArrayInstantiateUtil.stringInstantiate(devMapArray),
+//                    RedisDB.SHORT_TIME);
+//            AreaGeneral eventcount = areaService.getGeneralDate(reportAreaPojo.getArea(), datePojo.getStartTime(),
+//                    datePojo.getEndTime());
+//            jedisManager.hset(RedisDB.SHORT_TIME_QUERY, userIndex, "eventcount", stringInstantiateUtil.stringInstantiate(eventcount.getTotalTimes().toString()),
+//                    RedisDB.SHORT_TIME);
+//            jedisManager.hset(RedisDB.SHORT_TIME_QUERY, userIndex, "isPro", stringInstantiateUtil.stringInstantiate(eventcount.getPro()), RedisDB.SHORT_TIME);
+//            /* 监测网分布 */
+//            List<LineMaps> maps = new ArrayList<>();
+//            if (reportAreaPojo.isJcwfb()) {
+//                maps = iOverviewServer.getLineMaps();
+//            }
+//            /* 暂降事件列表 */
+//            AreaGeneral analyzeInfos = new AreaGeneral();
+//            if (reportAreaPojo.isZjsjbg() || reportAreaPojo.isZjsjtx()) {
+//                analyzeInfos = areaService.getGeneralDate(reportAreaPojo.getArea(), datePojo.getStartTime(),
+//                        datePojo.getEndTime());
+//                if (analyzeInfos == null) {
+//                    result = PubUtils.assignmentResult(null, 500, "该区域暂无数据");
+//                    return result;
+//                }
+//
+//                List<Area> areas = new ArrayList<>();
+//                if (analyzeInfos.getPro() == "city") {
+//                    for (int i = 0; i < analyzeInfos.getArea().size(); i++) {
+//                        if (analyzeInfos.getArea().get(i).getCity().equals(analyzeInfos.getCityName())) {
+//                            areas.add(analyzeInfos.getArea().get(i));
+//                        }
+//                    }
+//                    analyzeInfos.setArea(areas);
+//                } else {
+//                    areas = analyzeInfos.getArea();
+//                }
+//                List<Voltage> vol = analyzeInfos.getVol();
+//                List<Interval> interval = analyzeInfos.getInterval();
+//                JSONArray areaArray = JSONArray.fromObject(areas);
+//                JSONArray volArray = JSONArray.fromObject(vol);
+//                JSONArray intervalArray = JSONArray.fromObject(interval);
+//                jedisManager.hset(RedisDB.SHORT_TIME_QUERY, userIndex, "area", jsonArrayInstantiateUtil.stringInstantiate(areaArray), RedisDB.SHORT_TIME);
+//                jedisManager.hset(RedisDB.SHORT_TIME_QUERY, userIndex, "vol", jsonArrayInstantiateUtil.stringInstantiate(volArray), RedisDB.SHORT_TIME);
+//                jedisManager.hset(RedisDB.SHORT_TIME_QUERY, userIndex, "interval", jsonArrayInstantiateUtil.stringInstantiate(intervalArray),
+//                        RedisDB.SHORT_TIME);
+//            }
+//            /* 暂降密度数据获取 */
+//            List<EventDensity> eventDensities = new ArrayList<>();
+//            if (reportAreaPojo.isZjmdtx()) {
+//                eventDensities = areaService.getEventDensity(datePojo.getStartTime(), datePojo.getEndTime(),
+//                        reportAreaPojo.getArea());
+//                if (eventDensities == null) {
+//                    result = PubUtils.assignmentResult(null, 500, "该区域暂无数据");
+//                    return result;
+//                }
+//            }
+//            List<List> eventDisdip;
+//            List<List> ec411;
+//            Iec28 iec28;
+//            if (reportAreaPojo.isZjmdbg()) {
+//                eventDisdip = areaService.getEventDisdip(datePojo.getStartTime(), datePojo.getEndTime(),
+//                        reportAreaPojo.getArea());
+//                ec411 = areaService.getIEC411(datePojo.getStartTime(), datePojo.getEndTime(), reportAreaPojo.getArea());
+//                iec28 = areaService.getIEC28(datePojo.getStartTime(), datePojo.getEndTime(), reportAreaPojo.getArea());
+//                if (eventDisdip == null || ec411 == null || iec28 == null) {
+//                    result = PubUtils.assignmentResult(null, 500, "该区域暂无数据");
+//                    return result;
+//                }
+//                List<List> ec28 = iec28.getData();
+//                JSONArray evArray = JSONArray.fromObject(eventDisdip);
+//                jedisManager.hset(RedisDB.SHORT_TIME_QUERY, userIndex, "eventDisdip", jsonArrayInstantiateUtil.stringInstantiate(evArray),
+//                        RedisDB.SHORT_TIME);
+//                JSONArray ec4Array = JSONArray.fromObject(ec411);
+//                jedisManager.hset(RedisDB.SHORT_TIME_QUERY, userIndex, "ec411", jsonArrayInstantiateUtil.stringInstantiate(ec4Array), RedisDB.SHORT_TIME);
+//                JSONArray ec2Array = JSONArray.fromObject(ec28);
+//                jedisManager.hset(RedisDB.SHORT_TIME_QUERY, userIndex, "ec28", jsonArrayInstantiateUtil.stringInstantiate(ec2Array), RedisDB.SHORT_TIME);
+//
+//                jedisManager.hset(RedisDB.SHORT_TIME_QUERY, userIndex, "pertime", stringInstantiateUtil.stringInstantiate(iec28.getPertime()),
+//                        RedisDB.SHORT_TIME);
+//                jedisManager.hset(RedisDB.SHORT_TIME_QUERY, userIndex, "eventvalue", stringInstantiateUtil.stringInstantiate(iec28.getEventvalue()),
+//                        RedisDB.SHORT_TIME);
+//            }
+//            /* 暂降事件点图 */
+//            List<EventDataList> eventDataLists = new ArrayList<>();
+//            if (reportAreaPojo.isZjsjditic() || reportAreaPojo.isZjsjdf47()) {
+//                eventDataLists = areaService.getEventDataList(datePojo.getStartTime(), datePojo.getEndTime(),
+//                        reportAreaPojo.getArea());
+//                if (eventDataLists == null) {
+//                    result = PubUtils.assignmentResult(null, 500, "该区域暂无数据");
+//                    return result;
+//                }
+//            }
+//            /* 概率分布 */
+//            EventChance eventChance = new EventChance();
+//            if (reportAreaPojo.isGlfbzjfz() || reportAreaPojo.isGlfbcxsj()) {
+//                eventChance = areaService.getEventChance(datePojo.getStartTime(), datePojo.getEndTime(),
+//                        reportAreaPojo.getArea());
+//                if (eventChance == null) {
+//                    result = PubUtils.assignmentResult(null, 500, "该区域暂无数据");
+//                    return result;
+//                }
+//            }
+//            /* 事件关联 */
+//            List<EventAssObj> list = new ArrayList<>();
+//            if (reportAreaPojo.isSjglbg()) {
+//
+//                list = rangeService.queryEventsByTime(reportAreaPojo.getStartTime(), reportAreaPojo.getEndTime());
+//                if (list == null) {
+//                    result = PubUtils.assignmentResult(null, 500, "该区域暂无数据");
+//                    return result;
+//                }
+//                JSONArray inArray = JSONArray.fromObject(list);
+//                jedisManager.hset(RedisDB.SHORT_TIME_QUERY, userIndex, "eventass", jsonArrayInstantiateUtil.stringInstantiate(inArray),
+//                        RedisDB.SHORT_TIME);
+//            }
+//            /* 暂降原因 */
+//            List<EventCause> eventCauses = new ArrayList<>();
+//            if (reportAreaPojo.isZjyybg() || reportAreaPojo.isZjyytx()) {
+//                eventCauses = areaService.getEventCause(datePojo.getStartTime(), datePojo.getEndTime(),
+//                        reportAreaPojo.getArea());
+//                if (eventCauses == null) {
+//                    result = PubUtils.assignmentResult(null, 500, "该区域暂无数据");
+//                    return result;
+//                }
+//                JSONArray caArray = JSONArray.fromObject(eventCauses);
+//                jedisManager.hset(RedisDB.SHORT_TIME_QUERY, userIndex, "eventCauses", jsonArrayInstantiateUtil.stringInstantiate(caArray),
+//                        RedisDB.SHORT_TIME);
+//            }
+//            /* 暂降类型 */
+//            List<EventTypeList> eventTypeLists = new ArrayList<>();
+//            if (reportAreaPojo.isZjlxbg() || reportAreaPojo.isZjlxtx()) {
+//                eventTypeLists = areaService.getEventType(datePojo.getStartTime(), datePojo.getEndTime(),
+//                        reportAreaPojo.getArea());
+//                if (eventTypeLists == null) {
+//                    result = PubUtils.assignmentResult(null, 500, "该区域暂无数据");
+//                    return result;
+//                }
+//                JSONArray tyArray = JSONArray.fromObject(eventTypeLists);
+//                jedisManager.hset(RedisDB.SHORT_TIME_QUERY, userIndex, "eventTypeLists", jsonArrayInstantiateUtil.stringInstantiate(tyArray),
+//                        RedisDB.SHORT_TIME);
+//            }
+//            JSONObject reportPojo = JSONObject.fromObject(reportAreaPojo);
+//            String key = TokenManager.getUserId() + "reportPojo";
+//            jedisManager.hset(RedisDB.SHORT_TIME_QUERY, userIndex, key, instantiateUtil.stringInstantiate(reportPojo), RedisDB.SHORT_TIME);
+//            /* 暂降热力图 */
+//            List<LineInfo> eventMap = new ArrayList<>();
+//            if (reportAreaPojo.isZjrlt()) {
+//                eventMap = areaService.getEventMaps(datePojo.getStartTime(), datePojo.getEndTime());
+//                if (eventMap == null) {
+//                    result = PubUtils.assignmentResult(null, 500, "该区域暂无数据");
+//                    return result;
+//                }
+//            }
+//            /* 将前台需要画图的数据返回 */
+//            reList.add(analyzeInfos);
+//            reList.add(eventDensities);
+//            reList.add(eventDataLists);
+//            reList.add(eventChance);
+//            reList.add(eventCauses);
+//            reList.add(eventTypeLists);
+//            reList.add(maps);
+//            reList.add(eventMap);
+//            result = PubUtils.assignmentResult(reList, 200, "获取监测点图表数据成功");
+//            userLog.getLog("查询区域报告", "成功", PubUtils.getIpAddr(request), LogTypeEnum.BUSSINESS.toString(), 0);
+//        } catch (Exception e) {
+//            // TODO: handle exception
+//            result = PubUtils.assignmentResult(null, 500, "获取监测点图表数据失败");
+//            userLog.getLog("查询区域报告", "失败", PubUtils.getIpAddr(request), LogTypeEnum.BUSSINESS.toString(), 0);
+//        }
+//        return result;
+//    }
+//
+//    /**
+//     * 根据用户页面的选择，指定我们需要查询的数据
+//     *
+//     * @param request 请求
+//     */
+//    private ReportAreaPojo getAreaChoose(HttpServletRequest request, String startTime, String endTime, String area, String areaname, String jcwfb, String zjsjbg,
+//                                         String zjsjtx, String zjmdbg, String zjmdtx, String zjsjditic, String zjsjdf47, String glfbzjfz, String glfbcxsj,
+//                                         String sjglbg, String zjyybg, String zjyytx, String zjlxbg, String zjlxtx, String zjrlt) {
+//        ReportAreaPojo reportAreaPojo = new ReportAreaPojo();
+//        reportAreaPojo.setJcwfb(Boolean.valueOf(jcwfb));
+//        reportAreaPojo.setZjsjbg(Boolean.valueOf(zjsjbg));
+//        reportAreaPojo.setZjsjtx(Boolean.valueOf(zjsjtx));
+//        reportAreaPojo.setZjmdbg(Boolean.valueOf(zjmdbg));
+//        reportAreaPojo.setZjmdtx(Boolean.valueOf(zjmdtx));
+//        reportAreaPojo.setZjsjditic(Boolean.valueOf(zjsjditic));
+//        reportAreaPojo.setZjsjdf47(Boolean.valueOf(zjsjdf47));
+//        reportAreaPojo.setGlfbzjfz(Boolean.valueOf(glfbzjfz));
+//        reportAreaPojo.setGlfbcxsj(Boolean.valueOf(glfbcxsj));
+//        reportAreaPojo.setSjglbg(Boolean.valueOf(sjglbg));
+//        reportAreaPojo.setZjyybg(Boolean.valueOf(zjyybg));
+//        reportAreaPojo.setZjyytx(Boolean.valueOf(zjyytx));
+//        reportAreaPojo.setZjlxbg(Boolean.valueOf(zjlxbg));
+//        reportAreaPojo.setZjlxtx(Boolean.valueOf(zjlxtx));
+//        reportAreaPojo.setZjrlt(Boolean.valueOf(zjrlt));
+//        reportAreaPojo.setStartTime(startTime);
+//        reportAreaPojo.setEndTime(endTime);
+//        reportAreaPojo.setArea(area);
+//        reportAreaPojo.setAreaname(areaname);
+//        return reportAreaPojo;
+//
+//    }
+//
+//
+//    @PostMapping("exportAreaReport")
+//    @ResponseBody
+//    public String exportAreaReport(HttpServletRequest request, String devmapImage, String intervalImage, String districtImage, String voltageImage,
+//                                   String densityImage, String iticImage, String f47Image, String eventValueImage, String persisttimeImage,
+//                                   String timeImage, String causeImage, String typeImage, String eventmapImage, String itictips, String f47tips,
+//                                   String startTime, String endTime) throws Exception {
+//        String userIndex = TokenManager.getUserId();
+//        JSONObject jsonObject = instantiateUtil.deInstantiate(instantiateUtil.stringDeInstantiate(jedisManager.hget(RedisDB.SHORT_TIME_QUERY, userIndex,
+//                TokenManager.getUserId() + "reportPojo")));
+//        ReportAreaPojo reportAreaPojo = (ReportAreaPojo) JSONObject.toBean(jsonObject, ReportAreaPojo.class);
+//        // 需要展示的图
+//        if (reportAreaPojo.isJcwfb()) {
+//            jedisManager.hset(RedisDB.SHORT_TIME_QUERY, userIndex, "devmapImage", stringInstantiateUtil.stringInstantiate(devmapImage), RedisDB.SHORT_TIME);
+//        }
+//        if (reportAreaPojo.isZjsjtx()) {
+//            jedisManager.hset(RedisDB.SHORT_TIME_QUERY, userIndex, "intervalImage", stringInstantiateUtil.stringInstantiate(intervalImage), RedisDB.SHORT_TIME);
+//            jedisManager.hset(RedisDB.SHORT_TIME_QUERY, userIndex, "districtImage", stringInstantiateUtil.stringInstantiate(districtImage), RedisDB.SHORT_TIME);
+//            jedisManager.hset(RedisDB.SHORT_TIME_QUERY, userIndex, "voltageImage", stringInstantiateUtil.stringInstantiate(voltageImage), RedisDB.SHORT_TIME);
+//        }
+//        if (reportAreaPojo.isZjmdtx()) {
+//            jedisManager.hset(RedisDB.SHORT_TIME_QUERY, userIndex, "densityImage", stringInstantiateUtil.stringInstantiate(densityImage), RedisDB.SHORT_TIME);
+//        }
+//        if (reportAreaPojo.isZjsjditic()) {
+//            jedisManager.hset(RedisDB.SHORT_TIME_QUERY, userIndex, "iticImage", stringInstantiateUtil.stringInstantiate(iticImage), RedisDB.SHORT_TIME);
+//            jedisManager.hset(RedisDB.SHORT_TIME_QUERY, userIndex, "itictips", stringInstantiateUtil.stringInstantiate(itictips), RedisDB.SHORT_TIME);
+//        }
+//        if (reportAreaPojo.isZjsjdf47()) {
+//            jedisManager.hset(RedisDB.SHORT_TIME_QUERY, userIndex, "f47Image", stringInstantiateUtil.stringInstantiate(f47Image), RedisDB.SHORT_TIME);
+//            jedisManager.hset(RedisDB.SHORT_TIME_QUERY, userIndex, "f47tips", stringInstantiateUtil.stringInstantiate(f47tips), RedisDB.SHORT_TIME);
+//        }
+//        if (reportAreaPojo.isGlfbzjfz()) {
+//            jedisManager.hset(RedisDB.SHORT_TIME_QUERY, userIndex, "eventValueImage", stringInstantiateUtil.stringInstantiate(eventValueImage),
+//                    RedisDB.SHORT_TIME);
+//        }
+//        if (reportAreaPojo.isGlfbcxsj()) {
+//            jedisManager.hset(RedisDB.SHORT_TIME_QUERY, userIndex, "persisttimeImage", stringInstantiateUtil.stringInstantiate(persisttimeImage),
+//                    RedisDB.SHORT_TIME);
+//        }
+//        if (reportAreaPojo.isZjyytx()) {
+//            jedisManager.hset(RedisDB.SHORT_TIME_QUERY, userIndex, "causeImage", stringInstantiateUtil.stringInstantiate(causeImage), RedisDB.SHORT_TIME);
+//        }
+//        if (reportAreaPojo.isZjlxtx()) {
+//            jedisManager.hset(RedisDB.SHORT_TIME_QUERY, userIndex, "typeImage", stringInstantiateUtil.stringInstantiate(typeImage), RedisDB.SHORT_TIME);
+//        }
+//        if (reportAreaPojo.isZjrlt()) {
+//            jedisManager.hset(RedisDB.SHORT_TIME_QUERY, userIndex, "eventmapImage", stringInstantiateUtil.stringInstantiate(eventmapImage), RedisDB.SHORT_TIME);
+//        }
+//        return "success";
+//    }
+//
+//    @GetMapping("downAreaReport")
+//    public void downAreaReport(HttpServletResponse response, HttpServletRequest request, String name) throws Exception {
+//        String userIndex = TokenManager.getUserId();
+//        JSONObject jsonObject = instantiateUtil.deInstantiate(instantiateUtil.stringDeInstantiate(jedisManager.hget(RedisDB.SHORT_TIME_QUERY, userIndex,
+//                TokenManager.getUserId() + "reportPojo")));
+//        jedisManager.hdel(RedisDB.SHORT_TIME_QUERY, userIndex, TokenManager.getUserId() + "reportPojo");
+//        ReportAreaPojo reportAreaPojo = (ReportAreaPojo) JSONObject.toBean(jsonObject, ReportAreaPojo.class);
+//        int one = 1;
+//        // 开始做文档
+//        XWPFDocument document = new XWPFDocument();
+//        // 设定标题格式
+//        WordUtils.setHeadingStyle(document);
+//        // 添加标题
+//        XWPFParagraph titleParagraph = WordUtils.getCenterParagraph(document);
+//        WordUtils.addLine(titleParagraph, 11);
+//        // 设置段落居中
+//        XWPFRun titleParagraphRun = titleParagraph.createRun();
+//        WordUtils.addParagraph(titleParagraphRun, "宋体", 15, "000000", reportAreaPojo.getAreaname() + "供电公司", true);
+//        WordUtils.addLine(titleParagraph, 3);
+//        XWPFRun titleParagraphBigRun = titleParagraph.createRun();
+//        WordUtils.addParagraph(titleParagraphBigRun, "宋体", 36, "000000", "电压暂降事件区域报告", true);
+//        WordUtils.addLine(titleParagraph, 19);
+//        XWPFRun titleParagraphDateRun = titleParagraph.createRun();
+//        WordUtils.addParagraph(titleParagraphDateRun, "宋体", 14, "000000", "日期：" + WordUtils.getRightNow(), true);
+//        titleParagraph.setPageBreak(true);
+//        // 段落
+//        XWPFParagraph statisticsParagraph = WordUtils.getCenterParagraph(document);
+//        // 段前分页
+//        statisticsParagraph.setPageBreak(true);
+//        XWPFRun statisticsRun = statisticsParagraph.createRun();
+//        WordUtils.addParagraph(statisticsRun, "宋体", 24, "000000", "电压暂降事件区域报告", false);
+//        createTitle(document, "1. 引言", "标题 1", 0, 15);
+//        XWPFParagraph introductionContentParagraph = WordUtils.getLeftParagraph(document);
+//        // 首行缩进---段落
+//        introductionContentParagraph.setIndentationFirstLine(200);
+//        XWPFRun introductionContentRun = introductionContentParagraph.createRun();
+//
+//        List<DeviceValue> devmap;
+//        JSONArray dev = jsonArrayInstantiateUtil.deInstantiate(jsonArrayInstantiateUtil.stringDeInstantiate(jedisManager.hget(RedisDB.SHORT_TIME_QUERY, userIndex, "devMapInfo")));
+//        devmap = (List<DeviceValue>) JSONArray.toCollection(dev, DeviceValue.class);
+//
+//        String pro = stringInstantiateUtil.deInstantiate(stringInstantiateUtil.stringDeInstantiate(jedisManager.hget(RedisDB.SHORT_TIME_QUERY, userIndex, "isPro")));
+//        String yy;
+//        if (pro == "pro") {
+//            yy = reportAreaPojo.getAreaname() + "电网总共有"
+//                    + stringInstantiateUtil.deInstantiate(stringInstantiateUtil.stringDeInstantiate(jedisManager.hget(RedisDB.SHORT_TIME_QUERY, userIndex, "linecount") + "个监测点，"
+//                    + String.valueOf(devmap.size()))) + "个市(州)电压暂降监测点分布情况如下所示：";
+//            for (int i = 0; i < devmap.size(); i++) {
+//                if (i != devmap.size() - 1) {
+//                    yy = yy + devmap.get(i).getName() + "：" + devmap.get(i).getAmounts() + "个，";
+//                } else {
+//                    yy = yy + devmap.get(i).getName() + "：" + devmap.get(i).getAmounts() + "个。";
+//                }
+//            }
+//        } else {
+//            yy = reportAreaPojo.getAreaname() + "电网总共有"
+//                    + stringInstantiateUtil.deInstantiate(stringInstantiateUtil.stringDeInstantiate(jedisManager.hget(RedisDB.SHORT_TIME_QUERY, userIndex, "linecount"))) + "个监测点。";
+//        }
+//        WordUtils.addParagraph(introductionContentRun, "宋体", 11, "000000", yy, false);
+//
+//        String eventcount = stringInstantiateUtil.deInstantiate(stringInstantiateUtil.stringDeInstantiate(jedisManager.hget(RedisDB.SHORT_TIME_QUERY, userIndex, "eventcount")));
+//        WordUtils.addParagraph(introductionContentRun, "宋体", 11, "000000",
+//                reportAreaPojo.getAreaname() + "电网在所选择时间段" + reportAreaPojo.getStartTime() + " 至 "
+//                        + reportAreaPojo.getEndTime() + "累计监测到暂降事件" + eventcount
+//                        + "条，本报告按照监测点分布，暂降事件统计，暂降事件点图，暂降热力图，暂降密度图，暂降概率分布图，事件关联统计，暂降类型统计，暂降原因统计等方面进行数据分析。",
+//                false);
+//        createTitle(document, "2. 报告分析对象", "标题 1", 0, 15);
+//        XWPFParagraph objectContentParagraph = WordUtils.getLeftParagraph(document);
+//        objectContentParagraph.setIndentationFirstLine(200);
+//        XWPFRun objectContentRun = objectContentParagraph.createRun();
+//        WordUtils.addParagraph(objectContentRun, "宋体", 11, "000000", reportAreaPojo.getAreaname() + "。", false);
+//        createTitle(document, "3. 报告分析时间", "标题 1", 0, 15);
+//        XWPFParagraph timeContentParagraph = WordUtils.getLeftParagraph(document);
+//        timeContentParagraph.setIndentationFirstLine(200);
+//        XWPFRun timeContentRun = timeContentParagraph.createRun();
+//        WordUtils.addParagraph(timeContentRun, "宋体", 11, "000000",
+//                reportAreaPojo.getStartTime() + " 至 " + reportAreaPojo.getEndTime() + "。", false);
+//        createTitle(document, "4. 汇总信息", "标题 1", 0, 15);
+//
+//        String tips;
+//        /* 监测网分布 */
+//        if (reportAreaPojo.isJcwfb()) {
+//            createTitle(document, "4." + one + " 监测网分布", "标题 2", 200, 11);
+//            XWPFParagraph jcwfbtParagraph = WordUtils.getLeftParagraph(document);
+//            jcwfbtParagraph.setIndentationFirstLine(200);
+//            XWPFRun jcwfbContentRun = jcwfbtParagraph.createRun();
+//            Integer oncount = 0;
+//            Integer offcount = 0;
+//            Integer totalcount = Integer.valueOf(stringInstantiateUtil.deInstantiate(stringInstantiateUtil.stringDeInstantiate(jedisManager.hget(RedisDB.SHORT_TIME_QUERY, userIndex, "linecount"))));
+//            for (int i = 0; i < devmap.size(); i++) {
+//                oncount = oncount + devmap.get(i).getOncount();
+//                offcount = offcount + devmap.get(i).getOffcount();
+//            }
+//            float rate = (Float.valueOf(oncount) / Float.valueOf(totalcount)) * 100;
+//            DecimalFormat df = new DecimalFormat("0.00");
+//            tips = new String();
+//            if (pro == "pro") {
+//                tips = reportAreaPojo.getAreaname() + "电网总共有监测点"
+//                        + stringInstantiateUtil.deInstantiate(stringInstantiateUtil.stringDeInstantiate(jedisManager.hget(RedisDB.SHORT_TIME_QUERY, userIndex, "linecount"))) + "个，其中";
+//                tips = tips + devmap.get(0).getName() + "、" + devmap.get(1).getName() + "监测点数量较多 ，监测点在线率达到"
+//                        + df.format(rate) + "%（通讯正常为：" + String.valueOf(oncount) + "个，通讯异常为：" + String.valueOf(offcount)
+//                        + "个）[在线率=通讯正常点数/总监测点数（统计时候排除检修和热备用监测点）]，具体见下图";
+//            } else {
+//                tips = reportAreaPojo.getAreaname() + "电网总共有监测点"
+//                        + stringInstantiateUtil.deInstantiate(stringInstantiateUtil.stringDeInstantiate(jedisManager.hget(RedisDB.SHORT_TIME_QUERY, userIndex, "linecount"))) + "个。";
+//                tips = tips + "监测点在线率达到" + df.format(rate) + "%（通讯正常为：" + String.valueOf(oncount) + "个，通讯异常为："
+//                        + String.valueOf(offcount) + "个）[通讯正常/总监测点数（统计时候排除检修和热备用监测点）]，具体见下图：";
+//            }
+//            WordUtils.addParagraph(jcwfbContentRun, "宋体", 11, "000000", tips, false);
+//            String devmapImage = stringInstantiateUtil.deInstantiate(stringInstantiateUtil.stringDeInstantiate(jedisManager.hget(RedisDB.SHORT_TIME_QUERY, userIndex, "devmapImage")));
+//            createMap(document, devmapImage, "监测网分布");
+//            one++;
+//        }
+//        /* 暂降事件列表 */
+//        if (reportAreaPojo.isZjsjbg() || reportAreaPojo.isZjsjtx()) {
+//            createTitle(document, "4." + one + " 暂降事件列表", "标题 2", 200, 11);
+//            XWPFParagraph zjsjlbParagraph = WordUtils.getLeftParagraph(document);
+//            zjsjlbParagraph.setIndentationFirstLine(200);
+//            XWPFRun zjsjlbContentRun = zjsjlbParagraph.createRun();
+//
+//            List<Area> area;
+//            List<Voltage> vol;
+//            List<Interval> interval;
+//            JSONArray ar = jsonArrayInstantiateUtil.deInstantiate(jsonArrayInstantiateUtil.stringDeInstantiate(jedisManager.hget(RedisDB.SHORT_TIME_QUERY, userIndex, "area")));
+//            area = (List<Area>) JSONArray.toCollection(ar, Area.class);
+//
+//            JSONArray vo = jsonArrayInstantiateUtil.deInstantiate(jsonArrayInstantiateUtil.stringDeInstantiate(jedisManager.hget(RedisDB.SHORT_TIME_QUERY, userIndex, "vol")));
+//            vol = (List<Voltage>) JSONArray.toCollection(vo, Voltage.class);
+//
+//            JSONArray in = jsonArrayInstantiateUtil.deInstantiate(jsonArrayInstantiateUtil.stringDeInstantiate(jedisManager.hget(RedisDB.SHORT_TIME_QUERY, userIndex, "interval")));
+//            interval = (List<Interval>) JSONArray.toCollection(in, Interval.class);
+//
+//            List<Voltage> voldesc = (List<Voltage>) JSONArray.toCollection(vo, Voltage.class);
+//            List<Interval> intervaldesc = (List<Interval>) JSONArray.toCollection(in, Interval.class);
+//            Collections.sort(voldesc, new Comparator<Voltage>() {
+//                /*
+//                 * 返回一个基本类型的整型， 返回负数表示：p1 小于p2， 返回0 表示：p1和p2相等， 返回正数表示：p1大于p2
+//                 */
+//                public int compare(Voltage p1, Voltage p2) {
+//                    if (p2.getTimes() > p1.getTimes()) {
+//                        return 1;
+//                    }
+//                    if (p2.getTimes() == p1.getTimes()) {
+//                        return 0;
+//                    }
+//                    return -1;
+//                }
+//            });
+//            Collections.sort(intervaldesc, new Comparator<Interval>() {
+//                /*
+//                 * 返回一个基本类型的整型， 返回负数表示：p1 小于p2， 返回0 表示：p1和p2相等， 返回正数表示：p1大于p2
+//                 */
+//                public int compare(Interval p1, Interval p2) {
+//                    if (p2.getTimes() > p1.getTimes()) {
+//                        return 1;
+//                    }
+//                    if (p2.getTimes() == p1.getTimes()) {
+//                        return 0;
+//                    }
+//                    return -1;
+//                }
+//            });
+//            tips = new String();
+//            tips = reportAreaPojo.getAreaname() + "电网在所选择的分析时间段内累计监测暂降记录" + eventcount + "条";
+//            if (pro == "pro") {
+//                if (area.size() > 0) {
+//                    tips = tips + "，其中" + area.get(0).getCity();
+//                    if (area.size() > 1) {
+//                        tips = tips + "、" + area.get(1).getCity();
+//                    }
+//                    tips = tips + "暂降事件居多";
+//                }
+//            }
+//            if (voldesc.size() > 0) {
+//                tips = tips + "，" + voldesc.get(0).getVoltageValue();
+//                if (vol.size() > 1) {
+//                    tips = tips + "、" + voldesc.get(1).getVoltageValue();
+//                }
+//                tips = tips + "暂降事件居多";
+//            }
+//            if (interval.size() > 0) {
+//                tips = tips + "，" + intervaldesc.get(0).getMonth();
+//                if (interval.size() > 1) {
+//                    tips = tips + "、" + intervaldesc.get(1).getMonth();
+//                }
+//                tips = tips + "月暂降事件居多";
+//            }
+//            tips = tips + "，具体见下表(图)：";
+//            WordUtils.addParagraph(zjsjlbContentRun, "宋体", 11, "000000", tips, false);
+//
+//            int two = 1;
+//            if (reportAreaPojo.isZjsjtx()) {
+//                createTitle(document, "4." + one + "." + two + " 暂降事件图形", "标题 3", 400, 11);
+//                String districtImage = stringInstantiateUtil.deInstantiate(stringInstantiateUtil.stringDeInstantiate(jedisManager.hget(RedisDB.SHORT_TIME_QUERY, userIndex, "districtImage")));
+//                createPic(document, districtImage, "按区域统计");
+//
+//                String intervalImage = stringInstantiateUtil.deInstantiate(stringInstantiateUtil.stringDeInstantiate(jedisManager.hget(RedisDB.SHORT_TIME_QUERY, userIndex, "intervalImage")));
+//                createPic(document, intervalImage, "按月份统计");
+//
+//                String voltageImage = stringInstantiateUtil.deInstantiate(stringInstantiateUtil.stringDeInstantiate(jedisManager.hget(RedisDB.SHORT_TIME_QUERY, userIndex, "voltageImage")));
+//                createPic(document, voltageImage, "按区域统计");
+//                two++;
+//            }
+//            if (reportAreaPojo.isZjsjbg()) {
+//                createTitle(document, "4." + one + "." + two + " 暂降事件表格", "标题 3", 400, 11);
+//
+//                XWPFTable sum = createTable(document);
+//                XWPFParagraph sumExcelParagraph = WordUtils.getCenterParagraph(document);
+//                insertRow(document, sum, sumExcelParagraph, true, "区域 ", "电压暂降次数");
+//                if (area.isEmpty()) {
+//                    insertRow(document, sum, sumExcelParagraph, false, "", "");
+//                } else {
+//                    for (int i = 0; i < area.size(); i++) {
+//                        insertRow(document, sum, sumExcelParagraph, false, area.get(i).getCity(),
+//                                String.valueOf(area.get(i).getTimes()));
+//                    }
+//                }
+//
+//                XWPFTable volsum = createTable(document);
+//                XWPFParagraph volsumExcelParagraph = WordUtils.getCenterParagraph(document);
+//                insertRow(document, volsum, volsumExcelParagraph, true, "电压等级 ", "电压暂降次数");
+//                if (vol.isEmpty()) {
+//                    insertRow(document, volsum, volsumExcelParagraph, false, "", "");
+//                } else {
+//                    for (int i = 0; i < vol.size(); i++) {
+//                        insertRow(document, volsum, volsumExcelParagraph, false, vol.get(i).getVoltageValue(),
+//                                String.valueOf(vol.get(i).getTimes()));
+//                    }
+//                }
+//
+//                XWPFTable intsum = createTable(document);
+//                XWPFParagraph intsumExcelParagraph = WordUtils.getCenterParagraph(document);
+//                insertRow(document, intsum, intsumExcelParagraph, true, "月份 ", "电压暂降次数");
+//                if (interval.isEmpty()) {
+//                    insertRow(document, intsum, intsumExcelParagraph, false, "", "");
+//                } else {
+//                    for (int i = 0; i < interval.size(); i++) {
+//                        insertRow(document, intsum, intsumExcelParagraph, false, interval.get(i).getMonth(),
+//                                String.valueOf(interval.get(i).getTimes()));
+//                    }
+//                }
+//            }
+//            one++;
+//        }
+//        /* 暂降事件点图 */
+//        if (reportAreaPojo.isZjsjditic() || reportAreaPojo.isZjsjdf47()) {
+//            createTitle(document, "4." + one + " 暂降事件点图", "标题 2", 200, 11);
+//
+//            XWPFParagraph zjsjdParagraph = WordUtils.getLeftParagraph(document);
+//            zjsjdParagraph.setIndentationFirstLine(200);
+//            XWPFRun zjsjdContentRun = zjsjdParagraph.createRun();
+//
+//            tips = new String();
+//            tips = "暂降事件点图统计分成ITIC曲线和F47曲线展示。";
+//            WordUtils.addParagraph(zjsjdContentRun, "宋体", 11, "000000", tips, false);
+//            int two = 1;
+//            if (reportAreaPojo.isZjsjditic()) {
+//                createTitle(document, "4." + one + "." + two + " ITIC曲线", "标题 3", 400, 11);
+//
+//                XWPFParagraph iticParagraph = WordUtils.getLeftParagraph(document);
+//                iticParagraph.setIndentationFirstLine(200);
+//                XWPFRun iticContentRun = iticParagraph.createRun();
+//
+//                tips = new String();
+//                tips = stringInstantiateUtil.deInstantiate(stringInstantiateUtil.stringDeInstantiate(jedisManager.hget(RedisDB.SHORT_TIME_QUERY, userIndex, "itictips")));
+//                WordUtils.addParagraph(iticContentRun, "宋体", 11, "000000", tips, false);
+//                String iticImage = stringInstantiateUtil.deInstantiate(stringInstantiateUtil.stringDeInstantiate(jedisManager.hget(RedisDB.SHORT_TIME_QUERY, userIndex, "iticImage")));
+//                createPic(document, iticImage, "ITIC曲线");
+//                two++;
+//            }
+//            if (reportAreaPojo.isZjsjdf47()) {
+//                createTitle(document, "4." + one + "." + two + " F47曲线", "标题 3", 400, 11);
+//
+//                XWPFParagraph f47Paragraph = WordUtils.getLeftParagraph(document);
+//                f47Paragraph.setIndentationFirstLine(200);
+//                XWPFRun f47ContentRun = f47Paragraph.createRun();
+//
+//                tips = new String();
+//                tips = stringInstantiateUtil.deInstantiate(stringInstantiateUtil.stringDeInstantiate(jedisManager.hget(RedisDB.SHORT_TIME_QUERY, userIndex, "f47tips")));
+//                WordUtils.addParagraph(f47ContentRun, "宋体", 11, "000000", tips, false);
+//                String f47Image = stringInstantiateUtil.deInstantiate(stringInstantiateUtil.stringDeInstantiate(jedisManager.hget(RedisDB.SHORT_TIME_QUERY, userIndex, "f47Image")));
+//                createPic(document, f47Image, "F47曲线");
+//            }
+//            one++;
+//        }
+//        /* 暂降密度 */
+//        if (reportAreaPojo.isZjmdtx() || reportAreaPojo.isZjmdbg()) {
+//            createTitle(document, "4." + one + " 暂降密度", "标题 2", 200, 11);
+//
+//            XWPFParagraph zjmdParagraph = WordUtils.getLeftParagraph(document);
+//            zjmdParagraph.setIndentationFirstLine(200);
+//            XWPFRun zjmdContentRun = zjmdParagraph.createRun();
+//            String pertime = stringInstantiateUtil.deInstantiate(stringInstantiateUtil.stringDeInstantiate(jedisManager.hget(RedisDB.SHORT_TIME_QUERY, userIndex, "pertime")));
+//            String eventvalue = stringInstantiateUtil.deInstantiate(stringInstantiateUtil.stringDeInstantiate(jedisManager.hget(RedisDB.SHORT_TIME_QUERY, userIndex, "eventvalue")));
+//            tips = new String();
+//            tips = "暂降密度统计可以从幅值和持续时间两个维度直接地反映暂降事件发生情况，主要反应事件的发生次数，";
+//            tips = tips + reportAreaPojo.getAreaname() + "电网在所选择的分析时间内暂降事件主要集中在幅值为" + eventvalue + "，持续时间为" + pertime
+//                    + "[根据 IEC 61000-2-8:(公共电网电压暂降测量统计)算出暂降事件发生最多的区间],具体见表（图）：";
+//            WordUtils.addParagraph(zjmdContentRun, "宋体", 11, "000000", tips, false);
+//            int two = 1;
+//            if (reportAreaPojo.isZjmdtx()) {
+//                createTitle(document, "4." + one + "." + two + " 暂降密度图", "标题 3", 400, 11);
+//                String densityImage = stringInstantiateUtil.deInstantiate(stringInstantiateUtil.stringDeInstantiate(jedisManager.hget(RedisDB.SHORT_TIME_QUERY, userIndex, "densityImage")));
+//                createPic(document, densityImage, "暂降密度图");
+//                two++;
+//            }
+//            if (reportAreaPojo.isZjmdbg()) {
+//                createTitle(document, "4." + one + "." + two + " DISDIP表格:国际发配电联盟(UNIPEDE)", "标题 3", 400, 11);
+//                XWPFTable disdip = createTable(document);
+//                XWPFParagraph disdipExcelParagraph = WordUtils.getCenterParagraph(document);
+//                List<List> eventDisdip;
+//                JSONArray arrayeventDisdip = jsonArrayInstantiateUtil.deInstantiate(jsonArrayInstantiateUtil.stringDeInstantiate(jedisManager.hget(RedisDB.SHORT_TIME_QUERY, userIndex, "eventDisdip")));
+//                eventDisdip = (List<List>) JSONArray.toCollection(arrayeventDisdip, ArrayList.class);
+//                insertRow(document, disdip, disdipExcelParagraph, true, "剩余电压", "20ms", "100ms", "500ms", "1s", "3s",
+//                        "20s", "60s", "180s");
+//                if (eventDisdip.isEmpty()) {
+//                    insertRow(document, disdip, disdipExcelParagraph, false, "", "", "", "", "", "", "", "", "");
+//                } else {
+//                    for (List list : eventDisdip) {
+//                        insertRow(document, disdip, disdipExcelParagraph, false, list.get(0).toString(),
+//                                list.get(1).toString(), list.get(2).toString(), list.get(3).toString(),
+//                                list.get(4).toString(), list.get(5).toString(), list.get(6).toString(),
+//                                list.get(7).toString(), list.get(8).toString());
+//                    }
+//                }
+//                two++;
+//                createTitle(document, "4." + one + "." + two + " IEC 61000-4-11:(用电终端的电压暂降抗度)", "标题 3", 400, 11);
+//                XWPFTable ec411Table = createTable(document);
+//                XWPFParagraph ec411TableExcelParagraph = WordUtils.getCenterParagraph(document);
+//                List<List> ec411;
+//                JSONArray arrayec411 = jsonArrayInstantiateUtil.deInstantiate(jsonArrayInstantiateUtil.stringDeInstantiate(jedisManager.hget(RedisDB.SHORT_TIME_QUERY, userIndex, "ec411")));
+//                ec411 = (List<List>) JSONArray.toCollection(arrayec411, ArrayList.class);
+//                insertRow(document, ec411Table, ec411TableExcelParagraph, true, "剩余电压", "10~20ms", "20~100ms",
+//                        "0.1~0.2s", "0.2~0.5s", "0.5~1s", ">1s");
+//                if (ec411.isEmpty()) {
+//                    insertRow(document, ec411Table, ec411TableExcelParagraph, false, "", "", "", "", "", "", "");
+//                } else {
+//                    for (List list : ec411) {
+//                        insertRow(document, ec411Table, ec411TableExcelParagraph, false, list.get(0).toString(),
+//                                list.get(1).toString(), list.get(2).toString(), list.get(3).toString(),
+//                                list.get(4).toString(), list.get(5).toString(), list.get(6).toString());
+//                    }
+//                }
+//                two++;
+//                createTitle(document, "4." + one + "." + two + " IEC 61000-2-8:(公共电网电压暂降测量统计)", "标题 3", 400, 11);
+//                XWPFTable ec28Table = createTable(document);
+//                XWPFParagraph ec28TableExcelParagraph = WordUtils.getCenterParagraph(document);
+//                List<List> ec28;
+//                JSONArray arrayec28 = jsonArrayInstantiateUtil.deInstantiate(jsonArrayInstantiateUtil.stringDeInstantiate(jedisManager.hget(RedisDB.SHORT_TIME_QUERY, userIndex, "ec28")));
+//                ec28 = (List<List>) JSONArray.toCollection(arrayec28, ArrayList.class);
+//                insertRow(document, ec28Table, ec28TableExcelParagraph, true, "剩余电压", "0.02~0.1s", "0.1~0.25s",
+//                        "0.25~0.5s", "0.5~1s", "1~3s", "3~20s", "20~60s", "60~180s");
+//                if (ec28.isEmpty()) {
+//                    insertRow(document, ec28Table, ec28TableExcelParagraph, false, "", "", "", "", "", "", "", "", "");
+//                } else {
+//                    for (List list : ec28) {
+//                        insertRow(document, ec28Table, ec28TableExcelParagraph, false, list.get(0).toString(),
+//                                list.get(1).toString(), list.get(2).toString(), list.get(3).toString(),
+//                                list.get(4).toString(), list.get(5).toString(), list.get(6).toString(),
+//                                list.get(7).toString(), list.get(8).toString());
+//                    }
+//                }
+//            }
+//            one++;
+//        }
+//        /* 概率分布 */
+//        if (reportAreaPojo.isGlfbcxsj() || reportAreaPojo.isGlfbzjfz()) {
+//            createTitle(document, "4." + one + " 暂降幅值概率分布图", "标题 2", 200, 11);
+//
+//            XWPFParagraph glfbParagraph = WordUtils.getLeftParagraph(document);
+//            glfbParagraph.setIndentationFirstLine(200);
+//            XWPFRun glfbContentRun = glfbParagraph.createRun();
+//            String pertime = stringInstantiateUtil.deInstantiate(stringInstantiateUtil.stringDeInstantiate(jedisManager.hget(RedisDB.SHORT_TIME_QUERY, userIndex, "pertime")));
+//            String eventvalue = stringInstantiateUtil.deInstantiate(stringInstantiateUtil.stringDeInstantiate(jedisManager.hget(RedisDB.SHORT_TIME_QUERY, userIndex, "eventvalue")));
+//            tips = new String();
+//            tips = "暂降概率分布图分成暂降幅值概率分布和持续时间概率分布图，";
+//            tips = tips + reportAreaPojo.getAreaname() + "电网在所选择的分析时间内暂降事件从幅值概率分布统计主要集中在幅值为" + eventvalue
+//                    + "之间，从持续时间统计主要集中在持续时间为" + pertime + "[持续时间排序，选择暂降记录发生最多的区域]，如下表（图）：";
+//            WordUtils.addParagraph(glfbContentRun, "宋体", 11, "000000", tips, false);
+//            int two = 1;
+//            if (reportAreaPojo.isGlfbzjfz()) {
+//                createTitle(document, "4." + one + "." + two + " 暂降幅值的概率分函数", "标题 3", 400, 11);
+//                String eventValueImage = stringInstantiateUtil.deInstantiate(stringInstantiateUtil.stringDeInstantiate(jedisManager.hget(RedisDB.SHORT_TIME_QUERY, userIndex, "eventValueImage")));
+//                createPic(document, eventValueImage, "暂降幅值的概率分布函数");
+//                two++;
+//            }
+//            if (reportAreaPojo.isGlfbcxsj()) {
+//                createTitle(document, "4." + one + "." + two + " 持续时间的概率分函数", "标题 3", 400, 11);
+//                String persisttimeImage = stringInstantiateUtil.deInstantiate(stringInstantiateUtil.stringDeInstantiate(jedisManager.hget(RedisDB.SHORT_TIME_QUERY, userIndex, "persisttimeImage")));
+//                createPic(document, persisttimeImage, "持续时间的概率分函数");
+//            }
+//            one++;
+//        }
+//        /* 事件关联分析 */
+//        if (reportAreaPojo.isSjglbg()) {
+//            createTitle(document, "4." + one + " 事件关联分析", "标题 2", 200, 11);
+//            List<EventAssObj> eventass;
+//            JSONArray arrayeventass = jsonArrayInstantiateUtil.deInstantiate(jsonArrayInstantiateUtil.stringDeInstantiate(jedisManager.hget(RedisDB.SHORT_TIME_QUERY, userIndex, "eventass")));
+//            eventass = (List<EventAssObj>) JSONArray.toCollection(arrayeventass, EventAssObj.class);
+//
+//            XWPFParagraph sjglParagraph = WordUtils.getLeftParagraph(document);
+//            sjglParagraph.setIndentationFirstLine(200);
+//            XWPFRun sjglContentRun = sjglParagraph.createRun();
+//            tips = new String();
+//            tips = reportAreaPojo.getAreaname() + "电网在所选择的分析时间段内累计监测暂降记录" + eventcount + "条，归一化统计后共"
+//                    + String.valueOf(eventass.size()) + "[此为归一化后的暂态事件结果]条，,具体如下图所示：";
+//            WordUtils.addParagraph(sjglContentRun, "宋体", 11, "000000", tips, false);
+//            XWPFTable intervalsTable = createTable(document);
+//            XWPFParagraph intervalsTableExcelParagraph = WordUtils.getCenterParagraph(document);
+//            insertRow(document, intervalsTable, intervalsTableExcelParagraph, true, "时间", "事件关联分析名称", "事件关联分析描述");
+//            if (eventass.isEmpty()) {
+//                insertRow(document, intervalsTable, intervalsTableExcelParagraph, false, "", "");
+//            } else {
+//                for (EventAssObj eventas : eventass) {
+//                    insertRow(document, intervalsTable, intervalsTableExcelParagraph, false,
+//                            PubUtils.date2String(eventas.getTime(), "yyyy-MM-dd HH:mm:ss"), eventas.getName(),
+//                            eventas.getDescribe());
+//                }
+//            }
+//            one++;
+//        }
+//        /* 原因统计 */
+//        if (reportAreaPojo.isZjyytx() || reportAreaPojo.isZjyybg()) {
+//            createTitle(document, "4." + one + " 原因统计", "标题 2", 200, 11);
+//            List<EventCause> eventCauses;
+//            JSONArray arrayeventCauses = jsonArrayInstantiateUtil.deInstantiate(jsonArrayInstantiateUtil.stringDeInstantiate(jedisManager.hget(RedisDB.SHORT_TIME_QUERY, userIndex, "eventCauses")));
+//            eventCauses = (List<EventCause>) JSONArray.toCollection(arrayeventCauses, EventCause.class);
+//
+//            Collections.sort(eventCauses, new Comparator<EventCause>() {
+//                /*
+//                 * int compare(Person p1, Person p2) 返回一个基本类型的整型， 返回负数表示：p1
+//                 * 小于p2， 返回0 表示：p1和p2相等， 返回正数表示：p1大于p2
+//                 */
+//                public int compare(EventCause p1, EventCause p2) {
+//                    // 按照Person的年龄进行升序排列
+//                    if (p2.getCount() > p1.getCount()) {
+//                        return 1;
+//                    }
+//                    if (p2.getCount() == p1.getCount()) {
+//                        return 0;
+//                    }
+//                    return -1;
+//                }
+//            });
+//
+//            XWPFParagraph reasonParagraph = WordUtils.getLeftParagraph(document);
+//            reasonParagraph.setIndentationFirstLine(200);
+//            XWPFRun reasonContentRun = reasonParagraph.createRun();
+//            tips = new String();
+//            tips = reportAreaPojo.getAreaname() + "电网在所选择的分析时间内暂态事件主要的暂态原因为" + eventCauses.get(0).getCause()
+//                    + "[根据表格中的次数来进行分析]，见下表（图）：";
+//            WordUtils.addParagraph(reasonContentRun, "宋体", 11, "000000", tips, false);
+//            int two = 1;
+//            if (reportAreaPojo.isZjyytx()) {
+//                createTitle(document, "4." + one + "." + two + " 原因统计图", "标题 3", 400, 11);
+//                String causeImage = stringInstantiateUtil.deInstantiate(stringInstantiateUtil.stringDeInstantiate(jedisManager.hget(RedisDB.SHORT_TIME_QUERY, userIndex, "causeImage")));
+//                createPic(document, causeImage, "原因统计图");
+//                two++;
+//            }
+//            if (reportAreaPojo.isZjyybg()) {
+//                createTitle(document, "4." + one + "." + two + " 原因统计表格", "标题 3", 400, 11);
+//                XWPFTable causeTable = createTable(document);
+//                XWPFParagraph causeTableExcelParagraph = WordUtils.getCenterParagraph(document);
+//                insertRow(document, causeTable, causeTableExcelParagraph, true, "暂态原因", "电压暂降次数");
+//                if (eventCauses.isEmpty()) {
+//                    insertRow(document, causeTable, causeTableExcelParagraph, false, "", "");
+//                } else {
+//                    for (EventCause eventCause : eventCauses) {
+//                        insertRow(document, causeTable, causeTableExcelParagraph, false, eventCause.getCause(),
+//                                String.valueOf(eventCause.getCount()));
+//                    }
+//                }
+//            }
+//            one++;
+//        }
+//        /* 类型统计 */
+//        if (reportAreaPojo.isZjlxtx() || reportAreaPojo.isZjlxbg()) {
+//            createTitle(document, "4." + one + " 类型统计", "标题 2", 200, 11);
+//            List<EventTypeList> eventTypeLists = new ArrayList();
+//            JSONArray arrayeventTypes = jsonArrayInstantiateUtil.deInstantiate(jsonArrayInstantiateUtil.stringDeInstantiate(jedisManager.hget(RedisDB.SHORT_TIME_QUERY, userIndex, "eventTypeLists")));
+//            eventTypeLists = (List<EventTypeList>) JSONArray.toCollection(arrayeventTypes, EventTypeList.class);
+//
+//            Collections.sort(eventTypeLists, new Comparator<EventTypeList>() {
+//                /*
+//                 * int compare(Person p1, Person p2) 返回一个基本类型的整型， 返回负数表示：p1
+//                 * 小于p2， 返回0 表示：p1和p2相等， 返回正数表示：p1大于p2
+//                 */
+//                @Override
+//                public int compare(EventTypeList p1, EventTypeList p2) {
+//                    // 按照Person的年龄进行升序排列
+//                    if (p2.getCount() > p1.getCount()) {
+//                        return 1;
+//                    }
+//                    if (p2.getCount() == p1.getCount()) {
+//                        return 0;
+//                    }
+//                    return -1;
+//                }
+//            });
+//
+//            XWPFParagraph typeParagraph = WordUtils.getLeftParagraph(document);
+//            typeParagraph.setIndentationFirstLine(200);
+//            XWPFRun typeContentRun = typeParagraph.createRun();
+//            tips = new String();
+//            tips = reportAreaPojo.getAreaname() + "电网在所选择的分析时间内暂态事件主要的暂态类型为" + eventTypeLists.get(0).getType()
+//                    + "[根据表格中的次数来进行分析]，见下表（图）：";
+//            WordUtils.addParagraph(typeContentRun, "宋体", 11, "000000", tips, false);
+//            int two = 1;
+//            if (reportAreaPojo.isZjlxtx()) {
+//                createTitle(document, "4." + one + "." + two + " 类型统计图", "标题 3", 400, 11);
+//                String typeImage = stringInstantiateUtil.deInstantiate(stringInstantiateUtil.stringDeInstantiate(jedisManager.hget(RedisDB.SHORT_TIME_QUERY, userIndex, "typeImage")));
+//                createPic(document, typeImage, "类型统计图");
+//                two++;
+//            }
+//            if (reportAreaPojo.isZjlxbg()) {
+//                createTitle(document, "4." + one + "." + two + " 类型统计表格", "标题 3", 400, 11);
+//                XWPFTable typeTable = createTable(document);
+//                XWPFParagraph typeTableExcelParagraph = WordUtils.getCenterParagraph(document);
+//                insertRow(document, typeTable, typeTableExcelParagraph, true, "暂态类型", "电压暂态次数");
+//                if (eventTypeLists.isEmpty()) {
+//                    insertRow(document, typeTable, typeTableExcelParagraph, false, "", "");
+//                } else {
+//                    for (EventTypeList eventTypeList : eventTypeLists) {
+//                        insertRow(document, typeTable, typeTableExcelParagraph, false, eventTypeList.getType(),
+//                                String.valueOf(eventTypeList.getCount()));
+//                    }
+//                }
+//            }
+//            one++;
+//        }
+//        /* 暂降热力图 */
+//        if (reportAreaPojo.isZjrlt()) {
+//            createTitle(document, "4." + one + " 暂降热力图", "标题 2", 200, 11);
+//
+//            XWPFParagraph zjrltParagraph = WordUtils.getLeftParagraph(document);
+//            zjrltParagraph.setIndentationFirstLine(200);
+//            XWPFRun zjrltContentRun = zjrltParagraph.createRun();
+//            tips = new String();
+//            tips = reportAreaPojo.getAreaname() + "网在所选择的分析时间段内累计监测暂降记录" + eventcount
+//                    + "条，使用颜色将地图上按照暂降记录发生频率进行描绘，所形成的热力具体见下图：";
+//            WordUtils.addParagraph(zjrltContentRun, "宋体", 11, "000000", tips, false);
+//            String eventmapImage = stringInstantiateUtil.deInstantiate(stringInstantiateUtil.stringDeInstantiate(jedisManager.hget(RedisDB.SHORT_TIME_QUERY, userIndex, "eventmapImage")));
+//            System.out.println(eventmapImage);
+//            createMap(document, eventmapImage, "暂降热力图");
+//            one++;
+//        }
+//        OutputStream out;
+//        try {
+//            response.setContentType("application/force-download");// 设置强制下载不打开
+//            // response.addHeader("Content-Disposition",
+//            // "attachment;fileName="+new
+//            // String(name.getBytes("GB2312"),"iso8859-1")+".docx" );// 设置文件名
+//            String agent = request.getHeader("User-Agent").toUpperCase(); // 获得浏览器信息并转换为大写
+//            if (agent.indexOf("MSIE") > 0 || (agent.indexOf("GECKO") > 0 && agent.indexOf("RV:11") > 0)) { // IE浏览器和Edge浏览器
+//                name = URLEncoder.encode(name, "UTF-8");
+//            } else { // 其他浏览器
+////            	name = new String(name.getBytes("UTF-8"), "iso-8859-1");
+//                name = URLEncoder.encode(name, "UTF-8");
+//            }
+//            response.addHeader("Content-Disposition", "attachment;fileName=" + name + ".docx");// 设置文件名
+//            out = response.getOutputStream();
+//            document.write(out);
+//            document.close();
+//            out.close();
+//        } catch (Exception e) {
+//            logger.error(e.getMessage());
+//        }
+//    }
+//
+//    /**
+//     * 电压暂降列表，获取列表数据
+//     *
+//     * @param startTime 起始时间
+//     * @param endTime   结束事件
+//     * @param area      区域名称
+//     */
+//    @RequestMapping(value = "getEventList", method = RequestMethod.POST)
+//    @ResponseBody
+//    public HttpResult getEventList(String startTime, String endTime, String area, String type, String waveType, HttpServletRequest request) {
+//        HttpResult result = PubUtils.initResult(TokenManager.getToken().getLoginName(), request, LogTypeEnum.BUSSINESS.toString(), 0);
+//        DatePojo datePojo;
+//        datePojo = PubUtils.validateDateTime(startTime, endTime, "getEventList");
+//        if (!datePojo.getValidity()) {
+//            result = PubUtils.assignmentResult(null, 500, datePojo.getMsg());
+//            return result;
+//        }
+//        // 统计时间段内的暂降原因次数、暂降类型次数
+//        List<EventDetail> voltageList;
+//        try {
+//            if (StringUtils.isEmpty(waveType) || waveType.equals("")) {
+//                voltageList = eventDetailService.getVolList(datePojo.getStartTime(), datePojo.getEndTime(), area, type, null, null, null, null, null, null, null, null, null, null);
+//            } else {
+//                voltageList = eventDetailService.getVolListByType(datePojo.getStartTime(), datePojo.getEndTime(), area, type, waveType, null, null, null, null, null, null, null, null, null, null);
+//            }
+//            if (null == voltageList) {
+//                result = PubUtils.assignmentResultLog(null, 500, "没有暂降列表的数据", "查询区域暂降列表", "成功", result);
+//            } else {
+//                result = PubUtils.assignmentResultLog(voltageList, 200, "获取暂降数据成功", "查询区域暂降列表", "成功", result);
+//            }
+//        } catch (Exception e) {
+//            logger.error("后台获取数据出错，方法名为：getEventList，异常为：" + e);
+//            result = PubUtils.assignmentResultLog(null, 500, "获取暂降数据失败", "查询区域暂降列表", "失败", result);
+//        }
+//        result.setResult(userUtil.getPro(area));
+//        return result;
+//    }
+//
+//    /**
+//     * 生成暂降事件报告
+//     */
+//    @PostMapping("createEventReport")
+//    @ResponseBody
+//    public HttpResult createEventReport(@RequestParam("index[]") List<String> index, HttpSession session) {
+//        HttpResult result;
+//        if (CollectionUtils.isEmpty(index)) {
+//            result = PubUtils.assignmentResult(null, 500, "请选中需要下载的波形");
+//            return result;
+//        }
+//
+//        try {
+//            WordUtil wordUtil = new WordUtil();
+//            for (int i = 0; i < index.size(); i++) {
+//                WaveData waveData = waveService.getWavedata(index.get(i), 1);
+//                //数据筛选,如果是双路电压的话，会存在2个波形数据
+//                List<WaveDataDetail> waveDataDetails = waveService.filteWaveData(waveData);
+//                if (waveData.getSunData().size() == 0) {
+//                    result = PubUtils.assignmentResult(null, 500, "没有波形数据");
+//                } else {
+//                    String time = waveData.getTime();
+//                    time = time.replace(" ", "%20");
+//                    String title = "监测点名称：" + waveData.getLineName() + "%20发生时刻：" + time + "%20特征幅值：" + waveData.getEventValue() + "%25%20持续时间：" + waveData.getPersistTime() + "s";
+//
+//                    List<String> shun = new ArrayList<>();
+//                    List<String> rms = new ArrayList<>();
+//                    if (waveDataDetails.size() == 1) {
+//                        shun.add(waveService.createShunTitle(title, waveDataDetails.get(0)));
+//                        rms.add(waveService.createRMSTitle(title, waveDataDetails.get(0)));
+//                    } else {
+//                        shun.add(waveService.createShunTitle(title, waveDataDetails.get(0)));
+//                        rms.add(waveService.createRMSTitle(title, waveDataDetails.get(0)));
+//                        for (int n = 1; n < waveDataDetails.size(); n++) {
+//                            shun.add(waveService.createShun(waveDataDetails.get(n)));
+//                            rms.add(waveService.createRMS(waveDataDetails.get(n)));
+//                        }
+//                    }
+//                    wordUtil.translateShun(i, shun);
+//                    wordUtil.translateRms(i, rms);
+//                    List<EventEigDetail> eventDetailEigenvalue = eventDetailService.eventDetailEigenvalue(index.get(i));
+//                    wordUtil.setEventDetailEigenvalue(i, eventDetailEigenvalue);
+//                    EventInfoDetail eventInfoList = eventDetailService.eventDetailBaseInfoByIndex(index.get(i));
+//                    wordUtil.setEventInfoList(i, eventInfoList);
+//                }
+//            }
+//            wordUtil.createReport(index.size());
+//            result = PubUtils.assignmentResult(null, 200, "事件报告生成完毕");
+//
+//            SimpleDateFormat formatter = new SimpleDateFormat("yyyyMMddHHmm");// 报告时分秒格式
+//            String fileName = "暂降事件报告_" + formatter.format(new Date()) + ".docx";
+//            //读取配置文件
+//            Properties pros = PubUtils.readProperties(getClass().getClassLoader(), "java.properties");
+//            String tmpPath = pros.get("TMP_PATH").toString() + File.separator + "eventreoprt";
+//            tmpPath = ClearPathUtil.cleanString(tmpPath);
+//            OutputStream os = null;
+//            File tmpfile = new File(tmpPath);
+//            if (!tmpfile.exists()) {
+//                tmpfile.mkdir();
+//            }
+//            tmpPath = tmpPath + File.separator + fileName;
+//            tmpPath = ClearPathUtil.cleanString(tmpPath);
+//            File tmp = new File(tmpPath);
+//            if (tmp.exists()) {
+//                tmp.delete();
+//            }
+//            PubUtils.createFile(tmpPath);
+//            try {
+//                os = new FileOutputStream(tmpPath);
+//                if (null != wordUtil.getDocument()) {
+//                    wordUtil.getDocument().write(os);
+//                    session.setAttribute("eventFilePath", tmpPath);
+//                    session.setAttribute("eventFileName", fileName);
+//                }
+//            } catch (Exception e) {
+//                session.setAttribute("eventFilePath", "");
+//                session.setAttribute("eventFileName", "");
+//                logger.error("输出暂态事件报告异常，原因为：" + e.toString());
+//            } finally {
+//                try {
+//                    if (os != null) {
+//                        os.close();
+//                    }
+//                } catch (Exception e) {
+//                    logger.error("关闭流异常，原因为：" + e.toString());
+//                }
+//            }
+//        } catch (Exception e) {
+//            e.printStackTrace();
+//            logger.error("生成事件报告失败，方法名为：getEventReport，异常为：" + e.toString());
+//            result = PubUtils.assignmentResult(null, 500, "生成事件报告出错，请联系管理员");
+//        }
+//
+//        return result;
+//    }
+//
+//    @GetMapping("downEventReport")
+//    public void downEventReport(HttpServletResponse response, HttpSession session) throws UnsupportedEncodingException {
+//        String tmpPath = (String) session.getAttribute("eventFilePath");
+//        String filename = (String) session.getAttribute("eventFileName");
+//
+//        // 设置输出的格式
+//        response.reset();
+//        response.setContentType("application/docx");
+//        response.addHeader("Content-Disposition",
+//                "attachment; filename=" + new String(filename.getBytes("gb2312"), "ISO8859-1"));
+//        // 循环取出流中的数据
+//        byte[] b = new byte[100];
+//        int len;
+//        if (StringUtils.isBlank(tmpPath)) {
+//
+//        } else {
+//            if (!StringUtils.isBlank(tmpPath)) {
+//                tmpPath = ClearPathUtil.cleanString(tmpPath);
+//                // 读到流中
+//                InputStream inStream = null;
+//                try {
+//                    inStream = new FileInputStream(tmpPath);
+//
+//                    if (null != inStream) {
+//                        while ((len = inStream.read(b)) > 0)
+//                            response.getOutputStream().write(b, 0, len);
+//                    }
+//                } catch (IOException e) {
+//                    // TODO Auto-generated catch block
+//                    logger.error("读取报告信息失败：" + e.getMessage());
+//                } finally {
+//                    if (inStream != null) {
+//                        try {
+//                            inStream.close();
+//                        } catch (Exception e) {
+//                            logger.error("关闭输入流异常，异常为：" + e.toString());
+//                        }
+//                    }
+//                }
+//
+//            }
+//            // 清除session中的数据
+//            session.removeAttribute("eventFilePath");
+//            session.removeAttribute("eventFileName");
+//        }
+//
+//    }
+//}
diff --git a/pqs-harmonic/harmonic-api/pom.xml b/pqs-harmonic/harmonic-api/pom.xml
index 6386ebb7e..50fd29d1b 100644
--- a/pqs-harmonic/harmonic-api/pom.xml
+++ b/pqs-harmonic/harmonic-api/pom.xml
@@ -38,6 +38,11 @@
             <artifactId>common-poi</artifactId>
             <version>${project.version}</version>
         </dependency>
+        <dependency>
+            <groupId>com.njcn</groupId>
+            <artifactId>pms-device-api</artifactId>
+            <version>${project.version}</version>
+        </dependency>
         <dependency>
             <groupId>org.influxdb</groupId>
             <artifactId>influxdb-java</artifactId>
@@ -48,6 +53,13 @@
             <version>1.0.0</version>
             <scope>compile</scope>
         </dependency>
+
+        <dependency>
+            <groupId>com.github.jeffreyning</groupId>
+            <artifactId>mybatisplus-plus</artifactId>
+            <version>1.5.1-RELEASE</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 
 </project>
\ No newline at end of file
diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/constant/Param.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/constant/Param.java
index f5d36619f..b83c5980b 100644
--- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/constant/Param.java
+++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/constant/Param.java
@@ -62,4 +62,13 @@ public interface Param {
     String PHASIC_TYPE = "phasic_type";
     String PARENT_ID = "0";
 
+    /**
+     * 算法处理
+     */
+    String TARGET_FREQ = "freq";
+    String TARGET_RMS = "rms";
+    String TARGET_RMS_LVR = "rms_lvr";
+    String TARGET_V_THD = "v_thd";
+    String TARGET_V_UNBALANCE = "v_unbalance";
+
 }
diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/enums/HarmonicResponseEnum.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/enums/HarmonicResponseEnum.java
index 8977abe1b..abb53039c 100644
--- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/enums/HarmonicResponseEnum.java
+++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/enums/HarmonicResponseEnum.java
@@ -26,6 +26,14 @@ public enum HarmonicResponseEnum {
     CUSTOM_TYPE("A00555","字典中未查询到报表模板类型"),
     CUSTOM_REPORT_ACTIVE("A00556","不存在激活的自定义报告模板"),
     CUSTOM_REPORT_EMPTY("A00557","自定义报表模板异常,模板数据为空"),
+
+    ALGORITHM_LINE_EMPTY("A00558","算法监测点数据为空"),
+    ALGORITHM_FREP_RULE("A00559","该监测点频率数据异常"),
+    ALGORITHM_RMS_RULE("A00560","该监测点相变压数据异常"),
+    ALGORITHM_RMS_LVR_RULE("A00561","该监测点线变压数据异常"),
+    ALGORITHM_V_THD_RULE("A00562","该监测点电压总谐波畸变率数据异常"),
+    ALGORITHM_V_UNBALANCE_RULE("A00563","该监测点负序电压不平衡度数据异常"),
+    ALGORITHM_DATA_ERROR("A00564","未获取到data数据"),
     ;
 
     private final String code;
diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/param/AlgorithmSearchParam.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/param/AlgorithmSearchParam.java
new file mode 100644
index 000000000..213f0f6ef
--- /dev/null
+++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/param/AlgorithmSearchParam.java
@@ -0,0 +1,25 @@
+package com.njcn.harmonic.pojo.param;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 算法通用查询参数
+ *
+ * @author qijian
+ * @date 2022/10/26
+ */
+@Data
+public class AlgorithmSearchParam {
+
+    @ApiModelProperty(name = "id",value = "编号")
+    private String id;
+
+    @ApiModelProperty(name = "type",value = "时间类型")
+    private Integer type;
+
+    @ApiModelProperty(name = "datadate",value = "查询时间")
+    private String datadate;
+
+
+}
diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/param/RMpBenchmarkLevelParam.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/param/RMpBenchmarkLevelParam.java
new file mode 100644
index 000000000..7457f3e28
--- /dev/null
+++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/param/RMpBenchmarkLevelParam.java
@@ -0,0 +1,24 @@
+package com.njcn.harmonic.pojo.param;
+
+import com.njcn.common.pojo.param.StatisticsBizBaseParam;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 【基准水平】参数
+ * @Title RMpBenchmarkLevelParam
+ * @Package com.njcn.device.pms.pojo.param
+ * @Author jianghaifei
+ * @Date 2022-10-11 10:38
+ * @Version V1.0
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class RMpBenchmarkLevelParam extends StatisticsBizBaseParam {
+    @ApiModelProperty(name = "voltageLevel", value = "电压等级id")
+    private String voltageLevel; //电压等级
+
+    @ApiModelProperty(name = "benchmarkIndicator", value = "基准水平评价指标")
+    private String benchmarkIndicator;
+}
diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/param/RMpHarmonicReportDParam.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/param/RMpHarmonicReportDParam.java
new file mode 100644
index 000000000..e2f6d8a5a
--- /dev/null
+++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/param/RMpHarmonicReportDParam.java
@@ -0,0 +1,24 @@
+package com.njcn.harmonic.pojo.param;
+
+import com.njcn.common.pojo.param.StatisticsBizBaseParam;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 【监测点稳态指标日报】查询参数实体
+ * @Title RMpHarmonicReportDParam
+ * @Package com.njcn.harmonic.pojo.param
+ * @Author jianghaifei
+ * @Date 2022-10-20 19:13
+ * @Version V1.0
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class RMpHarmonicReportDParam extends StatisticsBizBaseParam {
+//    @ApiModelProperty(name = "monitorName", value = "监测点名称")
+//    private String monitorName;
+
+    @ApiModelProperty(name = "monitorId", value = "监测点id")
+    private String monitorId;
+}
diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/param/RStatHarmonicMParam.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/param/RStatHarmonicMParam.java
new file mode 100644
index 000000000..279996429
--- /dev/null
+++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/param/RStatHarmonicMParam.java
@@ -0,0 +1,28 @@
+package com.njcn.harmonic.pojo.param;
+
+import com.njcn.common.pojo.param.StatisticsBizBaseParam;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+
+/**
+ * <功能描述>
+ *
+ * @author 1754607820@qq.com
+ * @createTime: 2022-10-11
+ */
+@Data
+public class RStatHarmonicMParam extends StatisticsBizBaseParam {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "干扰源ID",required = true)
+    @NotBlank(message = "干扰源类型名称不为空")
+    private String monitorID;
+
+    @ApiModelProperty(value = "指标类型ID",required = true)
+    @NotBlank(message = "指标类型名称不为空")
+    private String stasisID;
+
+}
diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/param/RStatOrgParam.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/param/RStatOrgParam.java
new file mode 100644
index 000000000..215d581ed
--- /dev/null
+++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/param/RStatOrgParam.java
@@ -0,0 +1,28 @@
+package com.njcn.harmonic.pojo.param;
+
+import com.njcn.common.pojo.param.StatisticsBizBaseParam;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.List;
+
+/**
+ * <功能描述>
+ *
+ * @author 1754607820@qq.com
+ * @createTime: 2022-10-31
+ */
+@Data
+public class RStatOrgParam extends StatisticsBizBaseParam {
+
+    @ApiModelProperty(name = "monitorIds", value = "监测点名称")
+    private String monitorName;
+
+    @ApiModelProperty(name = "voltageLevel", value = "电压等级")
+    private List<String> voltageLevels;
+
+    @ApiModelProperty(name = "powerrIds",value = "变电站id")
+    private List<String> powerrIds;
+
+}
diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/param/StatSubstationBizBaseParam.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/param/StatSubstationBizBaseParam.java
new file mode 100644
index 000000000..6f7d0a425
--- /dev/null
+++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/param/StatSubstationBizBaseParam.java
@@ -0,0 +1,21 @@
+package com.njcn.harmonic.pojo.param;
+
+import com.njcn.common.pojo.param.StatisticsBizBaseParam;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * <功能描述>
+ *
+ * @author 1754607820@qq.com
+ * @createTime: 2022-10-18
+ */
+@Data
+public class StatSubstationBizBaseParam extends StatisticsBizBaseParam {
+
+    @ApiModelProperty(value = "ids集合",required = true)
+    List<String> ids;
+
+}
diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/DataV.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/DataV.java
new file mode 100644
index 000000000..c3532cac6
--- /dev/null
+++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/DataV.java
@@ -0,0 +1,56 @@
+package com.njcn.harmonic.pojo.po;
+
+import lombok.Data;
+import org.influxdb.annotation.Column;
+import org.influxdb.annotation.Measurement;
+
+import java.time.Instant;
+
+/**
+ * DataV influxDB别名映射表
+ *
+ * @author qijian
+ * @version 1.0.0
+ * @createTime 2022/10/27 15:27
+ */
+@Data
+@Measurement(name = "data_v")
+public class DataV {
+
+    @Column(name = "time")
+    private Instant time;
+
+    @Column(name = "line_id")
+    private String lineId;
+
+    @Column(name = "freq_max")
+    private Double frepMAX;
+
+    @Column(name = "freq_min")
+    private Double frepMIN;
+
+    @Column(name = "rms_max")
+    private Double rmsMAX;
+
+    @Column(name = "rms_min")
+    private Double rmsMIN;
+
+    @Column(name = "rms_lvr_max")
+    private Double rmsLvrMAX;
+
+    @Column(name = "rms_lvr_min")
+    private Double rmsLvrMIN;
+
+    @Column(name = "v_thd_max")
+    private Double vThdMAX;
+
+    @Column(name = "v_thd_min")
+    private Double vThdMIN;
+
+    @Column(name = "v_unbalance_max")
+    private Double vUnbalanceMAX;
+
+    @Column(name = "v_unbalance_min")
+    private Double vUnbalanceMIN;
+
+}
diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/LimitRatePO.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/LimitRatePO.java
index b356c050f..12d8d38f0 100644
--- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/LimitRatePO.java
+++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/LimitRatePO.java
@@ -1,5 +1,8 @@
 package com.njcn.harmonic.pojo.po;
 
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.github.jeffreyning.mybatisplus.anno.MppMultiId;
 import lombok.Data;
 import org.influxdb.annotation.Column;
 import org.influxdb.annotation.Measurement;
@@ -13,237 +16,318 @@ import java.time.Instant;
  */
 @Data
 @Measurement(name = "limit_rate")
+@TableName(value = "limit_rate")
 public class LimitRatePO {
     //时间索引
+    @MppMultiId
     @Column(name = "time")
+    @TableField(value = "time")
     private Instant time;
     //监测点索引
+    @MppMultiId
     @Column(name = "line_id")
+    @TableField(value = "line_id")
     private String lineId;
     //数据类型
+    @MppMultiId
     @Column(name = "phasic_type")
+    @TableField(value = "phasic_type")
     private String phasicType;
     //总次数
     @Column(name = "all_time")
+    @TableField(value = "all_time")
     private Integer allTime;
     //闪变越限次数
     @Column(name = "flicker_overtime")
+    @TableField(value = "flicker_overtime")
     private Integer flickerOverTime;
     //闪变总次数
     @Column(name = "flicker_all_time")
+    @TableField(value = "flicker_all_time")
     private Integer flickerAllTime;
     //频率偏差越限次数
     @Column(name = "freq_dev_overtime")
+    @TableField(value = "freq_dev_overtime")
     private Integer freqDevOverTime;
     //电压偏差越限次数
     @Column(name = "voltage_dev_overtime")
+    @TableField(value = "voltage_dev_overtime")
     private Integer voltageDevOverTime;
     //电压不平衡度越限次数
     @Column(name = "ubalance_overtime")
+    @TableField(value = "ubalance_overtime")
     private Integer uBalanceOverTime;
     //电压谐波畸变率越限次数
     @Column(name = "uaberrance_overtime")
+    @TableField(value = "uaberrance_overtime")
     private Integer uAberranceOverTime;
     //负序电流限值次数
     @Column(name = "i_neg_overtime")
+    @TableField(value = "i_neg_overtime")
     private Integer iNegOverTime;
     //2次电压谐波含有率越限次数
     @Column(name = "uharm_2_overtime")
+    @TableField(value = "uharm_2_overtime")
     private Integer uHarm2OverTime;
     //3次电压谐波含有率越限次数
     @Column(name = "uharm_3_overtime")
+    @TableField(value = "uharm_3_overtime")
     private Integer uHarm3OverTime;
     //4次电压谐波含有率越限次数
     @Column(name = "uharm_4_overtime")
+    @TableField(value = "uharm_4_overtime")
     private Integer uHarm4OverTime;
     //5次电压谐波含有率越限次数
     @Column(name = "uharm_5_overtime")
+    @TableField(value = "uharm_5_overtime")
     private Integer uHarm5OverTime;
     //6次电压谐波含有率越限次数
     @Column(name = "uharm_6_overtime")
+    @TableField(value = "uharm_6_overtime")
     private Integer uHarm6OverTime;
     //2次电压谐波含有率越限次数
     @Column(name = "uharm_7_overtime")
+    @TableField(value = "uharm_7_overtime")
     private Integer uHarm7OverTime;
     //2次电压谐波含有率越限次数
     @Column(name = "uharm_8_overtime")
+    @TableField(value = "uharm_8_overtime")
     private Integer uHarm8OverTime;
     //2次电压谐波含有率越限次数
     @Column(name = "uharm_9_overtime")
+    @TableField(value = "uharm_9_overtime")
     private Integer uHarm9OverTime;
     //2次电压谐波含有率越限次数
     @Column(name = "uharm_10_overtime")
+    @TableField(value = "uharm_10_overtime")
     private Integer uHarm10OverTime;
     //2次电压谐波含有率越限次数
     @Column(name = "uharm_11_overtime")
+    @TableField(value = "uharm_11_overtime")
     private Integer uHarm11OverTime;
     //2次电压谐波含有率越限次数
     @Column(name = "uharm_12_overtime")
+    @TableField(value = "uharm_12_overtime")
     private Integer uHarm12OverTime;
     //2次电压谐波含有率越限次数
     @Column(name = "uharm_13_overtime")
+    @TableField(value = "uharm_13_overtime")
     private Integer uHarm13OverTime;
     //2次电压谐波含有率越限次数
     @Column(name = "uharm_14_overtime")
+    @TableField(value = "uharm_14_overtime")
     private Integer uHarm14OverTime;
     //2次电压谐波含有率越限次数
     @Column(name = "uharm_15_overtime")
+    @TableField(value = "uharm_15_overtime")
     private Integer uHarm15OverTime;
     //2次电压谐波含有率越限次数
     @Column(name = "uharm_16_overtime")
+    @TableField(value = "uharm_16_overtime")
     private Integer uHarm16OverTime;
     //2次电压谐波含有率越限次数
     @Column(name = "uharm_17_overtime")
+    @TableField(value = "uharm_17_overtime")
     private Integer uHarm17OverTime;
     //2次电压谐波含有率越限次数
     @Column(name = "uharm_18_overtime")
+    @TableField(value = "uharm_18_overtime")
     private Integer uHarm18OverTime;
     //2次电压谐波含有率越限次数
     @Column(name = "uharm_19_overtime")
+    @TableField(value = "uharm_19_overtime")
     private Integer uHarm19OverTime;
     //2次电压谐波含有率越限次数
     @Column(name = "uharm_20_overtime")
+    @TableField(value = "uharm_20_overtime")
     private Integer uHarm20OverTime;
     //2次电压谐波含有率越限次数
     @Column(name = "uharm_21_overtime")
+    @TableField(value = "uharm_21_overtime")
     private Integer uHarm21OverTime;
     //2次电压谐波含有率越限次数
     @Column(name = "uharm_22_overtime")
+    @TableField(value = "uharm_22_overtime")
     private Integer uHarm22OverTime;
     //2次电压谐波含有率越限次数
     @Column(name = "uharm_23_overtime")
+    @TableField(value = "uharm_23_overtime")
     private Integer uHarm23OverTime;
     //2次电压谐波含有率越限次数
     @Column(name = "uharm_24_overtime")
+    @TableField(value = "uharm_24_overtime")
     private Integer uHarm24OverTime;
     //2次电压谐波含有率越限次数
     @Column(name = "uharm_25_overtime")
+    @TableField(value = "uharm_25_overtime")
     private Integer uHarm25OverTime;
     //2次电流谐波幅值越限次数
     @Column(name = "iharm_2_overtime")
+    @TableField(value = "iharm_2_overtime")
     private Integer iHarm2OverTime;
     //3次电流谐波幅值越限次数
     @Column(name = "iharm_3_overtime")
+    @TableField(value = "iharm_3_overtime")
     private Integer iHarm3OverTime;
     //4次电流谐波幅值越限次数
     @Column(name = "iharm_4_overtime")
+    @TableField(value = "iharm_4_overtime")
     private Integer iHarm4OverTime;
     //5次电流谐波幅值越限次数
     @Column(name = "iharm_5_overtime")
+    @TableField(value = "iharm_5_overtime")
     private Integer iHarm5OverTime;
     //6次电流谐波幅值越限次数
     @Column(name = "iharm_6_overtime")
+    @TableField(value = "iharm_6_overtime")
     private Integer iHarm6OverTime;
     //2次电流谐波幅值越限次数
     @Column(name = "iharm_7_overtime")
+    @TableField(value = "iharm_7_overtime")
     private Integer iHarm7OverTime;
     //2次电流谐波幅值越限次数
     @Column(name = "iharm_8_overtime")
+    @TableField(value = "iharm_8_overtime")
     private Integer iHarm8OverTime;
     //2次电流谐波幅值越限次数
     @Column(name = "iharm_9_overtime")
+    @TableField(value = "iharm_9_overtime")
     private Integer iHarm9OverTime;
     //2次电流谐波幅值越限次数
     @Column(name = "iharm_10_overtime")
+    @TableField(value = "iharm_10_overtime")
     private Integer iHarm10OverTime;
     //2次电流谐波幅值越限次数
     @Column(name = "iharm_11_overtime")
+    @TableField(value = "iharm_11_overtime")
     private Integer iHarm11OverTime;
     //2次电流谐波幅值越限次数
     @Column(name = "iharm_12_overtime")
+    @TableField(value = "iharm_12_overtime")
     private Integer iHarm12OverTime;
     //2次电流谐波幅值越限次数
     @Column(name = "iharm_13_overtime")
+    @TableField(value = "iharm_13_overtime")
     private Integer iHarm13OverTime;
     //2次电流谐波幅值越限次数
     @Column(name = "iharm_14_overtime")
+    @TableField(value = "iharm_14_overtime")
     private Integer iHarm14OverTime;
     //2次电流谐波幅值越限次数
     @Column(name = "iharm_15_overtime")
+    @TableField(value = "iharm_15_overtime")
     private Integer iHarm15OverTime;
     //2次电流谐波幅值越限次数
     @Column(name = "iharm_16_overtime")
+    @TableField(value = "iharm_16_overtime")
     private Integer iHarm16OverTime;
     //2次电流谐波幅值越限次数
     @Column(name = "iharm_17_overtime")
+    @TableField(value = "iharm_17_overtime")
     private Integer iHarm17OverTime;
     //2次电流谐波幅值越限次数
     @Column(name = "iharm_18_overtime")
+    @TableField(value = "iharm_18_overtime")
     private Integer iHarm18OverTime;
     //2次电流谐波幅值越限次数
     @Column(name = "iharm_19_overtime")
+    @TableField(value = "iharm_19_overtime")
     private Integer iHarm19OverTime;
     //2次电流谐波幅值越限次数
     @Column(name = "iharm_20_overtime")
+    @TableField(value = "iharm_20_overtime")
     private Integer iHarm20OverTime;
     //2次电流谐波幅值越限次数
     @Column(name = "iharm_21_overtime")
+    @TableField(value = "iharm_21_overtime")
     private Integer iHarm21OverTime;
     //2次电流谐波幅值越限次数
     @Column(name = "iharm_22_overtime")
+    @TableField(value = "iharm_22_overtime")
     private Integer iHarm22OverTime;
     //2次电流谐波幅值越限次数
     @Column(name = "iharm_23_overtime")
+    @TableField(value = "iharm_23_overtime")
     private Integer iHarm23OverTime;
     //2次电流谐波幅值越限次数
     @Column(name = "iharm_24_overtime")
+    @TableField(value = "iharm_24_overtime")
     private Integer iHarm24OverTime;
     //2次电流谐波幅值越限次数
     @Column(name = "iharm_25_overtime")
+    @TableField(value = "iharm_25_overtime")
     private Integer iHarm25OverTime;
     //0.5次间谐波电压限值次数
     @Column(name = "inuharm_1_overtime")
+    @TableField(value = "inuharm_1_overtime")
     private Integer inUHARM1OverTime;
     //1.5次间谐波电压限值次数
     @Column(name = "inuharm_2_overtime")
+    @TableField(value = "inuharm_2_overtime")
     private Integer inUHARM2OverTime;
     //2.5次间谐波电压限值次数
     @Column(name = "inuharm_3_overtime")
+    @TableField(value = "inuharm_3_overtime")
     private Integer inUHARM3OverTime;
     //3.5次间谐波电压限值次数
     @Column(name = "inuharm_4_overtime")
+    @TableField(value = "inuharm_4_overtime")
     private Integer inUHARM4OverTime;
     //4.5次间谐波电压限值次数
     @Column(name = "inuharm_5_overtime")
+    @TableField(value = "inuharm_5_overtime")
     private Integer inUHARM5OverTime;
     //5.5次间谐波电压限值次数
     @Column(name = "inuharm_6_overtime")
+    @TableField(value = "inuharm_6_overtime")
     private Integer inUHARM6OverTime;
     //6.5次间谐波电压限值次数
     @Column(name = "inuharm_7_overtime")
+    @TableField(value = "inuharm_7_overtime")
     private Integer inUHARM7OverTime;
     //7.5次间谐波电压限值次数
     @Column(name = "inuharm_8_overtime")
+    @TableField(value = "inuharm_8_overtime")
     private Integer inUHARM8OverTime;
     //8.5次间谐波电压限值次数
     @Column(name = "inuharm_9_overtime")
+    @TableField(value = "inuharm_9_overtime")
     private Integer inUHARM9OverTime;
     //9.5次间谐波电压限值次数
     @Column(name = "inuharm_10_overtime")
+    @TableField(value = "inuharm_10_overtime")
     private Integer inUHARM10OverTime;
     //10.5次间谐波电压限值次数
     @Column(name = "inuharm_11_overtime")
+    @TableField(value = "inuharm_11_overtime")
     private Integer inUHARM11OverTime;
     //11.5次间谐波电压限值次数
     @Column(name = "inuharm_12_overtime")
+    @TableField(value = "inuharm_12_overtime")
     private Integer inUHARM12OverTime;
     //12.5次间谐波电压限值次数
     @Column(name = "inuharm_13_overtime")
+    @TableField(value = "inuharm_13_overtime")
     private Integer inUHARM13OverTime;
     //13.5次间谐波电压限值次数
     @Column(name = "inuharm_14_overtime")
+    @TableField(value = "inuharm_14_overtime")
     private Integer inUHARM14OverTime;
     //14.5次间谐波电压限值次数
     @Column(name = "inuharm_15_overtime")
+    @TableField(value = "inuharm_15_overtime")
     private Integer inUHARM15OverTime;
     //15.5次间谐波电压限值次数
     @Column(name = "inuharm_16_overtime")
+    @TableField(value = "inuharm_16_overtime")
     private Integer inUHARM16OverTime;
 
 
     //日类型数据
+    @TableField(exist = false)
     private String dayStr;
     //月类型数据
+    @TableField(exist = false)
     private String mouthStr;
 
 
diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/PmsAbnormalRules.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/PmsAbnormalRules.java
new file mode 100644
index 000000000..3652ee8f8
--- /dev/null
+++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/PmsAbnormalRules.java
@@ -0,0 +1,44 @@
+package com.njcn.harmonic.pojo.po;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * (PmsAbnormalRules)实体类
+ *
+ * @author qijian
+ * @since 2022-10-27 14:49:22
+ */
+@Data
+@TableName(value = "pms_abnormal_rules")
+public class PmsAbnormalRules implements Serializable {
+    private static final long serialVersionUID = -68797682413850371L;
+    /**
+     * 主键
+     */
+    private String id;
+    /**
+     * 规则类型（字典 0 数据异常 1......）
+     */
+    private Integer type;
+    /**
+     * 指标名称
+     */
+    private String targetName;
+    /**
+     * 对应字段
+     */
+    private String target;
+    /**
+     * 下限
+     */
+    private Double lowerLimit;
+    /**
+     * 上限
+     */
+    private Double upperLimit;
+
+}
+
diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpBenchmarkLevelM.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpBenchmarkLevelM.java
new file mode 100644
index 000000000..b6fddb553
--- /dev/null
+++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpBenchmarkLevelM.java
@@ -0,0 +1,69 @@
+package com.njcn.harmonic.pojo.po;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 【基准水平-月】
+ * @author jianghf
+ * @TableName r_mp_benchmark_level_m
+ */
+@Data
+@TableName("r_mp_benchmark_level_m")
+public class RMpBenchmarkLevelM implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 监测点ID
+     */
+    private String measurementPointId;
+
+    /**
+     * 生成数据的时间,每月统计一次
+     */
+    private Date dataDate;
+
+    /**
+     * 电压水平均值
+     */
+    private Double voltageAvg;
+
+    /**
+     * 电压水平标准差
+     */
+    private Double voltageSd;
+
+    /**
+     * 三相电压不平衡水平均值
+     */
+    private Double unbalanceAvg;
+
+    /**
+     * 三相电压不平衡水平标准差
+     */
+    private Double unbalanceSd;
+
+    /**
+     * 电压总谐波畸变率水平均值
+     */
+    private Double vthdAvg;
+
+    /**
+     * 电压总谐波畸变率水平标准差
+     */
+    private Double vthdSd;
+
+    /**
+     * 长时间闪变水平均值
+     */
+    private Double flickerAvg;
+
+    /**
+     * 长时间闪变水平标准差
+     */
+    private Double flickerSd;
+
+}
\ No newline at end of file
diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpBenchmarkLevelQ.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpBenchmarkLevelQ.java
new file mode 100644
index 000000000..69d6a130d
--- /dev/null
+++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpBenchmarkLevelQ.java
@@ -0,0 +1,70 @@
+package com.njcn.harmonic.pojo.po;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 【基准水平-季】
+ * @author jianghf
+ * @TableName r_mp_benchmark_level_q
+ */
+@Data
+@TableName("r_mp_benchmark_level_q")
+public class RMpBenchmarkLevelQ implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 监测点ID
+     */
+    private String measurementPointId;
+
+    /**
+     * 生成数据的时间,每季统计一次
+     */
+    private Date dataDate;
+
+    /**
+     * 电压水平均值
+     */
+    private Double voltageAvg;
+
+    /**
+     * 电压水平标准差
+     */
+    private Double voltageSd;
+
+    /**
+     * 三相电压不平衡水平均值
+     */
+    private Double unbalanceAvg;
+
+    /**
+     * 三相电压不平衡水平标准差
+     */
+    private Double unbalanceSd;
+
+    /**
+     * 电压总谐波畸变率水平均值
+     */
+    private Double vthdAvg;
+
+    /**
+     * 电压总谐波畸变率水平标准差
+     */
+    private Double vthdSd;
+
+    /**
+     * 长时间闪变水平均值
+     */
+    private Double flickerAvg;
+
+    /**
+     * 长时间闪变水平标准差
+     */
+    private Double flickerSd;
+
+}
\ No newline at end of file
diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpBenchmarkLevelY.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpBenchmarkLevelY.java
new file mode 100644
index 000000000..2268770fb
--- /dev/null
+++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpBenchmarkLevelY.java
@@ -0,0 +1,69 @@
+package com.njcn.harmonic.pojo.po;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 【基准水平-年】
+ * @author jianghf
+ * @TableName r_mp_benchmark_level_y
+ */
+@Data
+@TableName("r_mp_benchmark_level_y")
+public class RMpBenchmarkLevelY implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 监测点ID
+     */
+    private String measurementPointId;
+
+    /**
+     * 生成数据的时间,每年统计一次
+     */
+    private Date dataDate;
+
+    /**
+     * 电压水平均值
+     */
+    private Double voltageAvg;
+
+    /**
+     * 电压水平标准差
+     */
+    private Double voltageSd;
+
+    /**
+     * 三相电压不平衡水平均值
+     */
+    private Double unbalanceAvg;
+
+    /**
+     * 三相电压不平衡水平标准差
+     */
+    private Double unbalanceSd;
+
+    /**
+     * 电压总谐波畸变率水平均值
+     */
+    private Double vthdAvg;
+
+    /**
+     * 电压总谐波畸变率水平标准差
+     */
+    private Double vthdSd;
+
+    /**
+     * 长时间闪变水平均值
+     */
+    private Double flickerAvg;
+
+    /**
+     * 长时间闪变水平标准差
+     */
+    private Double flickerSd;
+
+}
\ No newline at end of file
diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpHarmonicIMagReportD.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpHarmonicIMagReportD.java
new file mode 100644
index 000000000..7e0366801
--- /dev/null
+++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpHarmonicIMagReportD.java
@@ -0,0 +1,1074 @@
+package com.njcn.harmonic.pojo.po;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.util.Date;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 稳态监测点指标日报-日表(主配网表)  /各次谐波电流有效值
+ * @author jianghf
+ * @TableName r_mp_harmonic_i_mag_report_d
+ */
+@TableName(value ="r_mp_harmonic_i_mag_report_d")
+@Data
+public class RMpHarmonicIMagReportD implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 监测点ID
+     */
+    @ApiModelProperty(name = "measurementPointId", value = "监测点id")
+    private String measurementPointId;
+
+    /**
+     * 生成数据的时间,每日统计一次
+     */
+    @ApiModelProperty(name = "dataDate", value = "dataDate")
+    private Date dataDate;
+
+    /**
+     * 相别：‘A’ 'B' 'C' 'ABC' 'T'  配网部分相别的数据采用T标志存储
+     */
+    @ApiModelProperty(name = "phase", value = "相别")
+    private String phase;
+
+    /**
+     * 基波电流-最大值
+     */
+    @ApiModelProperty(name = "fundamentalCurrentMax", value = "基波电流-最大值")
+    private Double fundamentalCurrentMax;
+
+    /**
+     * 基波电流-最小值
+     */
+    @ApiModelProperty(name = "fundamentalCurrentMin", value = "基波电流-最小值")
+    private Double fundamentalCurrentMin;
+
+    /**
+     * 基波电流-平均值
+     */
+    @ApiModelProperty(name = "fundamentalCurrentAvg", value = "基波电流-平均值")
+    private Double fundamentalCurrentAvg;
+
+    /**
+     * 基波电流-95值
+     */
+    @ApiModelProperty(name = "fundamentalCurrent95", value = "基波电流-95值")
+    private Double fundamentalCurrent95;
+
+    /**
+     * 电流总谐波畸变率-最大值
+     */
+    private Double harmonicCurrentThdMax;
+
+    /**
+     * 电流总谐波畸变率-最小值
+     */
+    private Double harmonicCurrentThdMin;
+
+    /**
+     * 电流总谐波畸变率-平均值
+     */
+    private Double harmonicCurrentThdAvg;
+
+    /**
+     * 电流总谐波畸变率-95值
+     */
+    private Double harmonicCurrentThd95;
+
+    /**
+     * 2次谐波电流有效值-最大值
+     */
+    @ApiModelProperty(name = "harmonicCurrentEffective2Max", value = "2次谐波电流有效值-最大值")
+    private Double harmonicCurrentEffective2Max;
+
+    /**
+     * 2次谐波电流有效值-最小值
+     */
+    @ApiModelProperty(name = "harmonicCurrentEffective2Min", value = "2次谐波电流有效值-最小值")
+    private Double harmonicCurrentEffective2Min;
+
+    /**
+     * 2次谐波电流有效值-平均值
+     */
+    @ApiModelProperty(name = "harmonicCurrentEffective2Avg", value = "2次谐波电流有效值-平均值")
+    private Double harmonicCurrentEffective2Avg;
+
+    /**
+     * 2次谐波电流有效值-95值
+     */
+    @ApiModelProperty(name = "harmonicCurrentEffective295", value = "2次谐波电流有效值-95值")
+    private Double harmonicCurrentEffective295;
+
+    /**
+     * 3次谐波电流有效值-最大值
+     */
+    @ApiModelProperty(name = "harmonicCurrentEffective3Max", value = "3次谐波电流有效值-最大值")
+    private Double harmonicCurrentEffective3Max;
+
+    /**
+     * 3次谐波电流有效值-最小值
+     */
+    @ApiModelProperty(name = "harmonicCurrentEffective3Min", value = "3次谐波电流有效值-最小值")
+    private Double harmonicCurrentEffective3Min;
+
+    /**
+     * 3次谐波电流有效值-平均值
+     */
+    @ApiModelProperty(name = "harmonicCurrentEffective3Avg", value = "3次谐波电流有效值-平均值")
+    private Double harmonicCurrentEffective3Avg;
+
+    /**
+     * 3次谐波电流有效值-95值
+     */
+    @ApiModelProperty(name = "harmonicCurrentEffective395", value = "3次谐波电流有效值-95值")
+    private Double harmonicCurrentEffective395;
+
+    /**
+     * 4次谐波电流有效值-最大值
+     */
+    private Double harmonicCurrentEffective4Max;
+
+    /**
+     * 4次谐波电流有效值-最小值
+     */
+    private Double harmonicCurrentEffective4Min;
+
+    /**
+     * 4次谐波电流有效值-平均值
+     */
+    private Double harmonicCurrentEffective4Avg;
+
+    /**
+     * 4次谐波电流有效值-95值
+     */
+    private Double harmonicCurrentEffective495;
+
+    /**
+     * 5次谐波电流有效值-最大值
+     */
+    private Double harmonicCurrentEffective5Max;
+
+    /**
+     * 5次谐波电流有效值-最小值
+     */
+    private Double harmonicCurrentEffective5Min;
+
+    /**
+     * 5次谐波电流有效值-平均值
+     */
+    private Double harmonicCurrentEffective5Avg;
+
+    /**
+     * 5次谐波电流有效值-95值
+     */
+    private Double harmonicCurrentEffective595;
+
+    /**
+     * 6次谐波电流有效值-最大值
+     */
+    private Double harmonicCurrentEffective6Max;
+
+    /**
+     * 6次谐波电流有效值-最小值
+     */
+    private Double harmonicCurrentEffective6Min;
+
+    /**
+     * 6次谐波电流有效值-平均值
+     */
+    private Double harmonicCurrentEffective6Avg;
+
+    /**
+     * 6次谐波电流有效值-95值
+     */
+    private Double harmonicCurrentEffective695;
+
+    /**
+     * 7次谐波电流有效值-最大值
+     */
+    private Double harmonicCurrentEffective7Max;
+
+    /**
+     * 7次谐波电流有效值-最小值
+     */
+    private Double harmonicCurrentEffective7Min;
+
+    /**
+     * 7次谐波电流有效值-平均值
+     */
+    private Double harmonicCurrentEffective7Avg;
+
+    /**
+     * 7次谐波电流有效值-95值
+     */
+    private Double harmonicCurrentEffective795;
+
+    /**
+     * 8次谐波电流有效值-最大值
+     */
+    private Double harmonicCurrentEffective8Max;
+
+    /**
+     * 8次谐波电流有效值-最小值
+     */
+    private Double harmonicCurrentEffective8Min;
+
+    /**
+     * 8次谐波电流有效值-平均值
+     */
+    private Double harmonicCurrentEffective8Avg;
+
+    /**
+     * 8次谐波电流有效值-95值
+     */
+    private Double harmonicCurrentEffective895;
+
+    /**
+     * 9次谐波电流有效值-最大值
+     */
+    private Double harmonicCurrentEffective9Max;
+
+    /**
+     * 9次谐波电流有效值-最小值
+     */
+    private Double harmonicCurrentEffective9Min;
+
+    /**
+     * 9次谐波电流有效值-平均值
+     */
+    private Double harmonicCurrentEffective9Avg;
+
+    /**
+     * 9次谐波电流有效值-95值
+     */
+    private Double harmonicCurrentEffective995;
+
+    /**
+     * 10次谐波电流有效值-最大值
+     */
+    private Double harmonicCurrentEffective10Max;
+
+    /**
+     * 10次谐波电流有效值-最小值
+     */
+    private Double harmonicCurrentEffective10Min;
+
+    /**
+     * 10次谐波电流有效值-平均值
+     */
+    private Double harmonicCurrentEffective10Avg;
+
+    /**
+     * 10次谐波电流有效值-95值
+     */
+    private Double harmonicCurrentEffective1095;
+
+    /**
+     * 11次谐波电流有效值-最大值
+     */
+    private Double harmonicCurrentEffective11Max;
+
+    /**
+     * 11次谐波电流有效值-最小值
+     */
+    private Double harmonicCurrentEffective11Min;
+
+    /**
+     * 11次谐波电流有效值-平均值
+     */
+    private Double harmonicCurrentEffective11Avg;
+
+    /**
+     * 11次谐波电流有效值-95值
+     */
+    private Double harmonicCurrentEffective1195;
+
+    /**
+     * 12次谐波电流有效值-最大值
+     */
+    private Double harmonicCurrentEffective12Max;
+
+    /**
+     * 12次谐波电流有效值-最小值
+     */
+    private Double harmonicCurrentEffective12Min;
+
+    /**
+     * 12次谐波电流有效值-平均值
+     */
+    private Double harmonicCurrentEffective12Avg;
+
+    /**
+     * 12次谐波电流有效值-95值
+     */
+    private Double harmonicCurrentEffective1295;
+
+    /**
+     * 13次谐波电流有效值-最大值
+     */
+    private Double harmonicCurrentEffective13Max;
+
+    /**
+     * 13次谐波电流有效值-最小值
+     */
+    private Double harmonicCurrentEffective13Min;
+
+    /**
+     * 13次谐波电流有效值-平均值
+     */
+    private Double harmonicCurrentEffective13Avg;
+
+    /**
+     * 13次谐波电流有效值-95值
+     */
+    private Double harmonicCurrentEffective1395;
+
+    /**
+     * 14次谐波电流有效值-最大值
+     */
+    private Double harmonicCurrentEffective14Max;
+
+    /**
+     * 14次谐波电流有效值-最小值
+     */
+    private Double harmonicCurrentEffective14Min;
+
+    /**
+     * 14次谐波电流有效值-平均值
+     */
+    private Double harmonicCurrentEffective14Avg;
+
+    /**
+     * 14次谐波电流有效值-95值
+     */
+    private Double harmonicCurrentEffective1495;
+
+    /**
+     * 15次谐波电流有效值-最大值
+     */
+    private Double harmonicCurrentEffective15Max;
+
+    /**
+     * 15次谐波电流有效值-最小值
+     */
+    private Double harmonicCurrentEffective15Min;
+
+    /**
+     * 15次谐波电流有效值-平均值
+     */
+    private Double harmonicCurrentEffective15Avg;
+
+    /**
+     * 15次谐波电流有效值-95值
+     */
+    private Double harmonicCurrentEffective1595;
+
+    /**
+     * 16次谐波电流有效值-最大值
+     */
+    private Double harmonicCurrentEffective16Max;
+
+    /**
+     * 16次谐波电流有效值-最小值
+     */
+    private Double harmonicCurrentEffective16Min;
+
+    /**
+     * 16次谐波电流有效值-平均值
+     */
+    private Double harmonicCurrentEffective16Avg;
+
+    /**
+     * 16次谐波电流有效值-95值
+     */
+    private Double harmonicCurrentEffective1695;
+
+    /**
+     * 17次谐波电流有效值-最大值
+     */
+    private Double harmonicCurrentEffective17Max;
+
+    /**
+     * 17次谐波电流有效值-最小值
+     */
+    private Double harmonicCurrentEffective17Min;
+
+    /**
+     * 17次谐波电流有效值-平均值
+     */
+    private Double harmonicCurrentEffective17Avg;
+
+    /**
+     * 17次谐波电流有效值-95值
+     */
+    private Double harmonicCurrentEffective1795;
+
+    /**
+     * 18次谐波电流有效值-最大值
+     */
+    private Double harmonicCurrentEffective18Max;
+
+    /**
+     * 18次谐波电流有效值-最小值
+     */
+    private Double harmonicCurrentEffective18Min;
+
+    /**
+     * 18次谐波电流有效值-平均值
+     */
+    private Double harmonicCurrentEffective18Avg;
+
+    /**
+     * 18次谐波电流有效值-95值
+     */
+    private Double harmonicCurrentEffective1895;
+
+    /**
+     * 19次谐波电流有效值-最大值
+     */
+    private Double harmonicCurrentEffective19Max;
+
+    /**
+     * 19次谐波电流有效值-最小值
+     */
+    private Double harmonicCurrentEffective19Min;
+
+    /**
+     * 19次谐波电流有效值-平均值
+     */
+    private Double harmonicCurrentEffective19Avg;
+
+    /**
+     * 19次谐波电流有效值-95值
+     */
+    private Double harmonicCurrentEffective1995;
+
+    /**
+     * 20次谐波电流有效值-最大值
+     */
+    private Double harmonicCurrentEffective20Max;
+
+    /**
+     * 20次谐波电流有效值-最小值
+     */
+    private Double harmonicCurrentEffective20Min;
+
+    /**
+     * 20次谐波电流有效值-平均值
+     */
+    private Double harmonicCurrentEffective20Avg;
+
+    /**
+     * 20次谐波电流有效值-95值
+     */
+    private Double harmonicCurrentEffective2095;
+
+    /**
+     * 21次谐波电流有效值-最大值
+     */
+    private Double harmonicCurrentEffective21Max;
+
+    /**
+     * 21次谐波电流有效值-最小值
+     */
+    private Double harmonicCurrentEffective21Min;
+
+    /**
+     * 21次谐波电流有效值-平均值
+     */
+    private Double harmonicCurrentEffective21Avg;
+
+    /**
+     * 21次谐波电流有效值-95值
+     */
+    private Double harmonicCurrentEffective2195;
+
+    /**
+     * 22次谐波电流有效值-最大值
+     */
+    private Double harmonicCurrentEffective22Max;
+
+    /**
+     * 22次谐波电流有效值-最小值
+     */
+    private Double harmonicCurrentEffective22Min;
+
+    /**
+     * 22次谐波电流有效值-平均值
+     */
+    private Double harmonicCurrentEffective22Avg;
+
+    /**
+     * 22次谐波电流有效值-95值
+     */
+    private Double harmonicCurrentEffective2295;
+
+    /**
+     * 23次谐波电流有效值-最大值
+     */
+    private Double harmonicCurrentEffective23Max;
+
+    /**
+     * 23次谐波电流有效值-最小值
+     */
+    private Double harmonicCurrentEffective23Min;
+
+    /**
+     * 23次谐波电流有效值-平均值
+     */
+    private Double harmonicCurrentEffective23Avg;
+
+    /**
+     * 23次谐波电流有效值-95值
+     */
+    private Double harmonicCurrentEffective2395;
+
+    /**
+     * 24次谐波电流有效值-最大值
+     */
+    private Double harmonicCurrentEffective24Max;
+
+    /**
+     * 24次谐波电流有效值-最小值
+     */
+    private Double harmonicCurrentEffective24Min;
+
+    /**
+     * 24次谐波电流有效值-平均值
+     */
+    private Double harmonicCurrentEffective24Avg;
+
+    /**
+     * 24次谐波电流有效值-95值
+     */
+    private Double harmonicCurrentEffective2495;
+
+    /**
+     * 25次谐波电流有效值-最大值
+     */
+    private Double harmonicCurrentEffective25Max;
+
+    /**
+     * 25次谐波电流有效值-最小值
+     */
+    private Double harmonicCurrentEffective25Min;
+
+    /**
+     * 25次谐波电流有效值-平均值
+     */
+    private Double harmonicCurrentEffective25Avg;
+
+    /**
+     * 25次谐波电流有效值-95值
+     */
+    private Double harmonicCurrentEffective2595;
+
+    /**
+     * 26次谐波电流有效值-最大值
+     */
+    private Double harmonicCurrentEffective26Max;
+
+    /**
+     * 26次谐波电流有效值-最小值
+     */
+    private Double harmonicCurrentEffective26Min;
+
+    /**
+     * 26次谐波电流有效值-平均值
+     */
+    private Double harmonicCurrentEffective26Avg;
+
+    /**
+     * 26次谐波电流有效值-95值
+     */
+    private Double harmonicCurrentEffective2695;
+
+    /**
+     * 27次谐波电流有效值-最大值
+     */
+    private Double harmonicCurrentEffective27Max;
+
+    /**
+     * 27次谐波电流有效值-最小值
+     */
+    private Double harmonicCurrentEffective27Min;
+
+    /**
+     * 27次谐波电流有效值-平均值
+     */
+    private Double harmonicCurrentEffective27Avg;
+
+    /**
+     * 27次谐波电流有效值-95值
+     */
+    private Double harmonicCurrentEffective2795;
+
+    /**
+     * 28次谐波电流有效值-最大值
+     */
+    private Double harmonicCurrentEffective28Max;
+
+    /**
+     * 28次谐波电流有效值-最小值
+     */
+    private Double harmonicCurrentEffective28Min;
+
+    /**
+     * 28次谐波电流有效值-平均值
+     */
+    private Double harmonicCurrentEffective28Avg;
+
+    /**
+     * 28次谐波电流有效值-95值
+     */
+    private Double harmonicCurrentEffective2895;
+
+    /**
+     * 29次谐波电流有效值-最大值
+     */
+    private Double harmonicCurrentEffective29Max;
+
+    /**
+     * 29次谐波电流有效值-最小值
+     */
+    private Double harmonicCurrentEffective29Min;
+
+    /**
+     * 29次谐波电流有效值-平均值
+     */
+    private Double harmonicCurrentEffective29Avg;
+
+    /**
+     * 29次谐波电流有效值-95值
+     */
+    private Double harmonicCurrentEffective2995;
+
+    /**
+     * 30次谐波电流有效值-最大值
+     */
+    private Double harmonicCurrentEffective30Max;
+
+    /**
+     * 30次谐波电流有效值-最小值
+     */
+    private Double harmonicCurrentEffective30Min;
+
+    /**
+     * 30次谐波电流有效值-平均值
+     */
+    private Double harmonicCurrentEffective30Avg;
+
+    /**
+     * 30次谐波电流有效值-95值
+     */
+    private Double harmonicCurrentEffective3095;
+
+    /**
+     * 31次谐波电流有效值-最大值
+     */
+    private Double harmonicCurrentEffective31Max;
+
+    /**
+     * 31次谐波电流有效值-最小值
+     */
+    private Double harmonicCurrentEffective31Min;
+
+    /**
+     * 31次谐波电流有效值-平均值
+     */
+    private Double harmonicCurrentEffective31Avg;
+
+    /**
+     * 31次谐波电流有效值-95值
+     */
+    private Double harmonicCurrentEffective3195;
+
+    /**
+     * 32次谐波电流有效值-最大值
+     */
+    private Double harmonicCurrentEffective32Max;
+
+    /**
+     * 32次谐波电流有效值-最小值
+     */
+    private Double harmonicCurrentEffective32Min;
+
+    /**
+     * 32次谐波电流有效值-平均值
+     */
+    private Double harmonicCurrentEffective32Avg;
+
+    /**
+     * 32次谐波电流有效值-95值
+     */
+    private Double harmonicCurrentEffective3295;
+
+    /**
+     * 33次谐波电流有效值-最大值
+     */
+    private Double harmonicCurrentEffective33Max;
+
+    /**
+     * 33次谐波电流有效值-最小值
+     */
+    private Double harmonicCurrentEffective33Min;
+
+    /**
+     * 33次谐波电流有效值-平均值
+     */
+    private Double harmonicCurrentEffective33Avg;
+
+    /**
+     * 33次谐波电流有效值-95值
+     */
+    private Double harmonicCurrentEffective3395;
+
+    /**
+     * 34次谐波电流有效值-最大值
+     */
+    private Double harmonicCurrentEffective34Max;
+
+    /**
+     * 34次谐波电流有效值-最小值
+     */
+    private Double harmonicCurrentEffective34Min;
+
+    /**
+     * 34次谐波电流有效值-平均值
+     */
+    private Double harmonicCurrentEffective34Avg;
+
+    /**
+     * 34次谐波电流有效值-95值
+     */
+    private Double harmonicCurrentEffective3495;
+
+    /**
+     * 35次谐波电流有效值-最大值
+     */
+    private Double harmonicCurrentEffective35Max;
+
+    /**
+     * 35次谐波电流有效值-最小值
+     */
+    private Double harmonicCurrentEffective35Min;
+
+    /**
+     * 35次谐波电流有效值-平均值
+     */
+    private Double harmonicCurrentEffective35Avg;
+
+    /**
+     * 35次谐波电流有效值-95值
+     */
+    private Double harmonicCurrentEffective3595;
+
+    /**
+     * 36次谐波电流有效值-最大值
+     */
+    private Double harmonicCurrentEffective36Max;
+
+    /**
+     * 36次谐波电流有效值-最小值
+     */
+    private Double harmonicCurrentEffective36Min;
+
+    /**
+     * 36次谐波电流有效值-平均值
+     */
+    private Double harmonicCurrentEffective36Avg;
+
+    /**
+     * 36次谐波电流有效值-95值
+     */
+    private Double harmonicCurrentEffective3695;
+
+    /**
+     * 37次谐波电流有效值-最大值
+     */
+    private Double harmonicCurrentEffective37Max;
+
+    /**
+     * 37次谐波电流有效值-最小值
+     */
+    private Double harmonicCurrentEffective37Min;
+
+    /**
+     * 37次谐波电流有效值-平均值
+     */
+    private Double harmonicCurrentEffective37Avg;
+
+    /**
+     * 37次谐波电流有效值-95值
+     */
+    private Double harmonicCurrentEffective3795;
+
+    /**
+     * 38次谐波电流有效值-最大值
+     */
+    private Double harmonicCurrentEffective38Max;
+
+    /**
+     * 38次谐波电流有效值-最小值
+     */
+    private Double harmonicCurrentEffective38Min;
+
+    /**
+     * 38次谐波电流有效值-平均值
+     */
+    private Double harmonicCurrentEffective38Avg;
+
+    /**
+     * 38次谐波电流有效值-95值
+     */
+    private Double harmonicCurrentEffective3895;
+
+    /**
+     * 39次谐波电流有效值-最大值
+     */
+    private Double harmonicCurrentEffective39Max;
+
+    /**
+     * 39次谐波电流有效值-最小值
+     */
+    private Double harmonicCurrentEffective39Min;
+
+    /**
+     * 39次谐波电流有效值-平均值
+     */
+    private Double harmonicCurrentEffective39Avg;
+
+    /**
+     * 39次谐波电流有效值-95值
+     */
+    private Double harmonicCurrentEffective3995;
+
+    /**
+     * 40次谐波电流有效值-最大值
+     */
+    private Double harmonicCurrentEffective40Max;
+
+    /**
+     * 40次谐波电流有效值-最小值
+     */
+    private Double harmonicCurrentEffective40Min;
+
+    /**
+     * 40次谐波电流有效值-平均值
+     */
+    private Double harmonicCurrentEffective40Avg;
+
+    /**
+     * 40次谐波电流有效值-95值
+     */
+    private Double harmonicCurrentEffective4095;
+
+    /**
+     * 41次谐波电流有效值-最大值
+     */
+    private Double harmonicCurrentEffective41Max;
+
+    /**
+     * 41次谐波电流有效值-最小值
+     */
+    private Double harmonicCurrentEffective41Min;
+
+    /**
+     * 41次谐波电流有效值-平均值
+     */
+    private Double harmonicCurrentEffective41Avg;
+
+    /**
+     * 41次谐波电流有效值-95值
+     */
+    private Double harmonicCurrentEffective4195;
+
+    /**
+     * 42次谐波电流有效值-最大值
+     */
+    private Double harmonicCurrentEffective42Max;
+
+    /**
+     * 42次谐波电流有效值-最小值
+     */
+    private Double harmonicCurrentEffective42Min;
+
+    /**
+     * 42次谐波电流有效值-平均值
+     */
+    private Double harmonicCurrentEffective42Avg;
+
+    /**
+     * 42次谐波电流有效值-95值
+     */
+    private Double harmonicCurrentEffective4295;
+
+    /**
+     * 43次谐波电流有效值-最大值
+     */
+    private Double harmonicCurrentEffective43Max;
+
+    /**
+     * 43次谐波电流有效值-最小值
+     */
+    private Double harmonicCurrentEffective43Min;
+
+    /**
+     * 43次谐波电流有效值-平均值
+     */
+    private Double harmonicCurrentEffective43Avg;
+
+    /**
+     * 43次谐波电流有效值-95值
+     */
+    private Double harmonicCurrentEffective4395;
+
+    /**
+     * 44次谐波电流有效值-最大值
+     */
+    private Double harmonicCurrentEffective44Max;
+
+    /**
+     * 44次谐波电流有效值-最小值
+     */
+    private Double harmonicCurrentEffective44Min;
+
+    /**
+     * 44次谐波电流有效值-平均值
+     */
+    private Double harmonicCurrentEffective44Avg;
+
+    /**
+     * 44次谐波电流有效值-95值
+     */
+    private Double harmonicCurrentEffective4495;
+
+    /**
+     * 45次谐波电流有效值-最大值
+     */
+    private Double harmonicCurrentEffective45Max;
+
+    /**
+     * 45次谐波电流有效值-最小值
+     */
+    private Double harmonicCurrentEffective45Min;
+
+    /**
+     * 45次谐波电流有效值-平均值
+     */
+    private Double harmonicCurrentEffective45Avg;
+
+    /**
+     * 45次谐波电流有效值-95值
+     */
+    private Double harmonicCurrentEffective4595;
+
+    /**
+     * 46次谐波电流有效值-最大值
+     */
+    private Double harmonicCurrentEffective46Max;
+
+    /**
+     * 46次谐波电流有效值-最小值
+     */
+    private Double harmonicCurrentEffective46Min;
+
+    /**
+     * 46次谐波电流有效值-平均值
+     */
+    private Double harmonicCurrentEffective46Avg;
+
+    /**
+     * 46次谐波电流有效值-95值
+     */
+    private Double harmonicCurrentEffective4695;
+
+    /**
+     * 47次谐波电流有效值-最大值
+     */
+    private Double harmonicCurrentEffective47Max;
+
+    /**
+     * 47次谐波电流有效值-最小值
+     */
+    private Double harmonicCurrentEffective47Min;
+
+    /**
+     * 47次谐波电流有效值-平均值
+     */
+    private Double harmonicCurrentEffective47Avg;
+
+    /**
+     * 47次谐波电流有效值-95值
+     */
+    private Double harmonicCurrentEffective4795;
+
+    /**
+     * 48次谐波电流有效值-最大值
+     */
+    private Double harmonicCurrentEffective48Max;
+
+    /**
+     * 48次谐波电流有效值-最小值
+     */
+    private Double harmonicCurrentEffective48Min;
+
+    /**
+     * 48次谐波电流有效值-平均值
+     */
+    private Double harmonicCurrentEffective48Avg;
+
+    /**
+     * 48次谐波电流有效值-95值
+     */
+    private Double harmonicCurrentEffective4895;
+
+    /**
+     * 49次谐波电流有效值-最大值
+     */
+    private Double harmonicCurrentEffective49Max;
+
+    /**
+     * 49次谐波电流有效值-最小值
+     */
+    private Double harmonicCurrentEffective49Min;
+
+    /**
+     * 49次谐波电流有效值-平均值
+     */
+    private Double harmonicCurrentEffective49Avg;
+
+    /**
+     * 49次谐波电流有效值-95值
+     */
+    private Double harmonicCurrentEffective4995;
+
+    /**
+     * 50次谐波电流有效值-最大值
+     */
+    private Double harmonicCurrentEffective50Max;
+
+    /**
+     * 50次谐波电流有效值-最小值
+     */
+    private Double harmonicCurrentEffective50Min;
+
+    /**
+     * 50次谐波电流有效值-平均值
+     */
+    private Double harmonicCurrentEffective50Avg;
+
+    /**
+     * 50次谐波电流有效值-95值
+     */
+    private Double harmonicCurrentEffective5095;
+
+
+}
\ No newline at end of file
diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpHarmonicIRateReportD.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpHarmonicIRateReportD.java
new file mode 100644
index 000000000..e1440efd3
--- /dev/null
+++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpHarmonicIRateReportD.java
@@ -0,0 +1,1029 @@
+package com.njcn.harmonic.pojo.po;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.util.Date;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 稳态监测点指标日报-日表(主网表)  /各次谐波电流含有率
+ * @TableName r_mp_harmonic_i_rate_report_d
+ */
+@TableName(value ="r_mp_harmonic_i_rate_report_d")
+@Data
+public class RMpHarmonicIRateReportD implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 监测点ID
+     */
+    @ApiModelProperty(name = "measurementPointId", value = "监测点id")
+    private String measurementPointId;
+
+    /**
+     * 生成数据的时间,每日统计一次
+     */
+    @ApiModelProperty(name = "dataDate", value = "dataDate")
+    private Date dataDate;
+
+    /**
+     * 相别：‘A’ 'B' 'C' 'ABC' 'T' 配网部分相别的数据采用T标志存储
+     */
+    @ApiModelProperty(name = "phase", value = "相别")
+    private String phase;
+
+    /**
+     * 2次谐波电流含有率-最大值
+     */
+    @ApiModelProperty(name = "i2Max", value = "2次谐波电流含有率-最大值")
+    private Double i2Max;
+
+    /**
+     * 2次谐波电流含有率-最小值
+     */
+    @ApiModelProperty(name = "i2Min", value = "2次谐波电流含有率-最小值")
+    private Double i2Min;
+
+    /**
+     * 2次谐波电流含有率-平均值
+     */
+    @ApiModelProperty(name = "i2Avg", value = "2次谐波电流含有率-平均值")
+    private Double i2Avg;
+
+    /**
+     * 2次谐波电流含有率-cp95值
+     */
+    @ApiModelProperty(name = "i2Cp95", value = "2次谐波电流含有率-cp95值")
+    private Double i2Cp95;
+
+    /**
+     * 3次谐波电流含有率-最大值
+     */
+    @ApiModelProperty(name = "i3Max", value = "3次谐波电流含有率-最大值")
+    private Double i3Max;
+
+    /**
+     * 3次谐波电流含有率-最小值
+     */
+    @ApiModelProperty(name = "i3Min", value = "3次谐波电流含有率-最小值")
+    private Double i3Min;
+
+    /**
+     * 3次谐波电流含有率-平均值
+     */
+    @ApiModelProperty(name = "i3Avg", value = "3次谐波电流含有率-平均值")
+    private Double i3Avg;
+
+    /**
+     * 3次谐波电流含有率-cp95值
+     */
+    @ApiModelProperty(name = "i3Cp95", value = "3次谐波电流含有率-cp95值")
+    private Double i3Cp95;
+
+    /**
+     * 4次谐波电流含有率-最大值
+     */
+    private Double i4Max;
+
+    /**
+     * 4次谐波电流含有率-最小值
+     */
+    private Double i4Min;
+
+    /**
+     * 4次谐波电流含有率-平均值
+     */
+    private Double i4Avg;
+
+    /**
+     * 4次谐波电流含有率-cp95值
+     */
+    private Double i4Cp95;
+
+    /**
+     * 5次谐波电流含有率-最大值
+     */
+    private Double i5Max;
+
+    /**
+     * 5次谐波电流含有率-最小值
+     */
+    private Double i5Min;
+
+    /**
+     * 5次谐波电流含有率-平均值
+     */
+    private Double i5Avg;
+
+    /**
+     * 5次谐波电流含有率-cp95值
+     */
+    private Double i5Cp95;
+
+    /**
+     * 6次谐波电流含有率-最大值
+     */
+    private Double i6Max;
+
+    /**
+     * 6次谐波电流含有率-最小值
+     */
+    private Double i6Min;
+
+    /**
+     * 6次谐波电流含有率-平均值
+     */
+    private Double i6Avg;
+
+    /**
+     * 6次谐波电流含有率-cp95值
+     */
+    private Double i6Cp95;
+
+    /**
+     * 7次谐波电流含有率-最大值
+     */
+    private Double i7Max;
+
+    /**
+     * 7次谐波电流含有率-最小值
+     */
+    private Double i7Min;
+
+    /**
+     * 7次谐波电流含有率-平均值
+     */
+    private Double i7Avg;
+
+    /**
+     * 7次谐波电流含有率-cp95值
+     */
+    private Double i7Cp95;
+
+    /**
+     * 8次谐波电流含有率-最大值
+     */
+    private Double i8Max;
+
+    /**
+     * 8次谐波电流含有率-最小值
+     */
+    private Double i8Min;
+
+    /**
+     * 8次谐波电流含有率-平均值
+     */
+    private Double i8Avg;
+
+    /**
+     * 8次谐波电流含有率-cp95值
+     */
+    private Double i8Cp95;
+
+    /**
+     * 9次谐波电流含有率-最大值
+     */
+    private Double i9Max;
+
+    /**
+     * 9次谐波电流含有率-最小值
+     */
+    private Double i9Min;
+
+    /**
+     * 9次谐波电流含有率-平均值
+     */
+    private Double i9Avg;
+
+    /**
+     * 9次谐波电流含有率-cp95值
+     */
+    private Double i9Cp95;
+
+    /**
+     * 10次谐波电流含有率-最大值
+     */
+    private Double i10Max;
+
+    /**
+     * 10次谐波电流含有率-最小值
+     */
+    private Double i10Min;
+
+    /**
+     * 10次谐波电流含有率-平均值
+     */
+    private Double i10Avg;
+
+    /**
+     * 10次谐波电流含有率-cp95值
+     */
+    private Double i10Cp95;
+
+    /**
+     * 11次谐波电流含有率-最大值
+     */
+    private Double i11Max;
+
+    /**
+     * 11次谐波电流含有率-最小值
+     */
+    private Double i11Min;
+
+    /**
+     * 11次谐波电流含有率-平均值
+     */
+    private Double i11Avg;
+
+    /**
+     * 11次谐波电流含有率-cp95值
+     */
+    private Double i11Cp95;
+
+    /**
+     * 12次谐波电流含有率-最大值
+     */
+    private Double i12Max;
+
+    /**
+     * 12次谐波电流含有率-最小值
+     */
+    private Double i12Min;
+
+    /**
+     * 12次谐波电流含有率-平均值
+     */
+    private Double i12Avg;
+
+    /**
+     * 12次谐波电流含有率-cp95值
+     */
+    private Double i12Cp95;
+
+    /**
+     * 13次谐波电流含有率-最大值
+     */
+    private Double i13Max;
+
+    /**
+     * 13次谐波电流含有率-最小值
+     */
+    private Double i13Min;
+
+    /**
+     * 13次谐波电流含有率-平均值
+     */
+    private Double i13Avg;
+
+    /**
+     * 13次谐波电流含有率-cp95值
+     */
+    private Double i13Cp95;
+
+    /**
+     * 14次谐波电流含有率-最大值
+     */
+    private Double i14Max;
+
+    /**
+     * 14次谐波电流含有率-最小值
+     */
+    private Double i14Min;
+
+    /**
+     * 14次谐波电流含有率-平均值
+     */
+    private Double i14Avg;
+
+    /**
+     * 14次谐波电流含有率-cp95值
+     */
+    private Double i14Cp95;
+
+    /**
+     * 15次谐波电流含有率-最大值
+     */
+    private Double i15Max;
+
+    /**
+     * 15次谐波电流含有率-最小值
+     */
+    private Double i15Min;
+
+    /**
+     * 15次谐波电流含有率-平均值
+     */
+    private Double i15Avg;
+
+    /**
+     * 15次谐波电流含有率-cp95值
+     */
+    private Double i15Cp95;
+
+    /**
+     * 16次谐波电流含有率-最大值
+     */
+    private Double i16Max;
+
+    /**
+     * 16次谐波电流含有率-最小值
+     */
+    private Double i16Min;
+
+    /**
+     * 16次谐波电流含有率-平均值
+     */
+    private Double i16Avg;
+
+    /**
+     * 16次谐波电流含有率-cp95值
+     */
+    private Double i16Cp95;
+
+    /**
+     * 17次谐波电流含有率-最大值
+     */
+    private Double i17Max;
+
+    /**
+     * 17次谐波电流含有率-最小值
+     */
+    private Double i17Min;
+
+    /**
+     * 17次谐波电流含有率-平均值
+     */
+    private Double i17Avg;
+
+    /**
+     * 17次谐波电流含有率-cp95值
+     */
+    private Double i17Cp95;
+
+    /**
+     * 18次谐波电流含有率-最大值
+     */
+    private Double i18Max;
+
+    /**
+     * 18次谐波电流含有率-最小值
+     */
+    private Double i18Min;
+
+    /**
+     * 18次谐波电流含有率-平均值
+     */
+    private Double i18Avg;
+
+    /**
+     * 18次谐波电流含有率-cp95值
+     */
+    private Double i18Cp95;
+
+    /**
+     * 19次谐波电流含有率-最大值
+     */
+    private Double i19Max;
+
+    /**
+     * 19次谐波电流含有率-最小值
+     */
+    private Double i19Min;
+
+    /**
+     * 19次谐波电流含有率-平均值
+     */
+    private Double i19Avg;
+
+    /**
+     * 19次谐波电流含有率-cp95值
+     */
+    private Double i19Cp95;
+
+    /**
+     * 20次谐波电流含有率-最大值
+     */
+    private Double i20Max;
+
+    /**
+     * 20次谐波电流含有率-最小值
+     */
+    private Double i20Min;
+
+    /**
+     * 20次谐波电流含有率-平均值
+     */
+    private Double i20Avg;
+
+    /**
+     * 20次谐波电流含有率-cp95值
+     */
+    private Double i20Cp95;
+
+    /**
+     * 21次谐波电流含有率-最大值
+     */
+    private Double i21Max;
+
+    /**
+     * 21次谐波电流含有率-最小值
+     */
+    private Double i21Min;
+
+    /**
+     * 21次谐波电流含有率-平均值
+     */
+    private Double i21Avg;
+
+    /**
+     * 21次谐波电流含有率-cp95值
+     */
+    private Double i21Cp95;
+
+    /**
+     * 22次谐波电流含有率-最大值
+     */
+    private Double i22Max;
+
+    /**
+     * 22次谐波电流含有率-最小值
+     */
+    private Double i22Min;
+
+    /**
+     * 22次谐波电流含有率-平均值
+     */
+    private Double i22Avg;
+
+    /**
+     * 22次谐波电流含有率-cp95值
+     */
+    private Double i22Cp95;
+
+    /**
+     * 23次谐波电流含有率-最大值
+     */
+    private Double i23Max;
+
+    /**
+     * 23次谐波电流含有率-最小值
+     */
+    private Double i23Min;
+
+    /**
+     * 23次谐波电流含有率-平均值
+     */
+    private Double i23Avg;
+
+    /**
+     * 23次谐波电流含有率-cp95值
+     */
+    private Double i23Cp95;
+
+    /**
+     * 24次谐波电流含有率-最大值
+     */
+    private Double i24Max;
+
+    /**
+     * 24次谐波电流含有率-最小值
+     */
+    private Double i24Min;
+
+    /**
+     * 24次谐波电流含有率-平均值
+     */
+    private Double i24Avg;
+
+    /**
+     * 24次谐波电流含有率-cp95值
+     */
+    private Double i24Cp95;
+
+    /**
+     * 25次谐波电流含有率-最大值
+     */
+    private Double i25Max;
+
+    /**
+     * 25次谐波电流含有率-最小值
+     */
+    private Double i25Min;
+
+    /**
+     * 25次谐波电流含有率-平均值
+     */
+    private Double i25Avg;
+
+    /**
+     * 25次谐波电流含有率-cp95值
+     */
+    private Double i25Cp95;
+
+    /**
+     * 26次谐波电流含有率-最大值
+     */
+    private Double i26Max;
+
+    /**
+     * 26次谐波电流含有率-最小值
+     */
+    private Double i26Min;
+
+    /**
+     * 26次谐波电流含有率-平均值
+     */
+    private Double i26Avg;
+
+    /**
+     * 26次谐波电流含有率-cp95值
+     */
+    private Double i26Cp95;
+
+    /**
+     * 27次谐波电流含有率-最大值
+     */
+    private Double i27Max;
+
+    /**
+     * 27次谐波电流含有率-最小值
+     */
+    private Double i27Min;
+
+    /**
+     * 27次谐波电流含有率-平均值
+     */
+    private Double i27Avg;
+
+    /**
+     * 27次谐波电流含有率-cp95值
+     */
+    private Double i27Cp95;
+
+    /**
+     * 28次谐波电流含有率-最大值
+     */
+    private Double i28Max;
+
+    /**
+     * 28次谐波电流含有率-最小值
+     */
+    private Double i28Min;
+
+    /**
+     * 28次谐波电流含有率-平均值
+     */
+    private Double i28Avg;
+
+    /**
+     * 28次谐波电流含有率-cp95值
+     */
+    private Double i28Cp95;
+
+    /**
+     * 29次谐波电流含有率-最大值
+     */
+    private Double i29Max;
+
+    /**
+     * 29次谐波电流含有率-最小值
+     */
+    private Double i29Min;
+
+    /**
+     * 29次谐波电流含有率-平均值
+     */
+    private Double i29Avg;
+
+    /**
+     * 29次谐波电流含有率-cp95值
+     */
+    private Double i29Cp95;
+
+    /**
+     * 30次谐波电流含有率-最大值
+     */
+    private Double i30Max;
+
+    /**
+     * 30次谐波电流含有率-最小值
+     */
+    private Double i30Min;
+
+    /**
+     * 30次谐波电流含有率-平均值
+     */
+    private Double i30Avg;
+
+    /**
+     * 30次谐波电流含有率-cp95值
+     */
+    private Double i30Cp95;
+
+    /**
+     * 31次谐波电流含有率-最大值
+     */
+    private Double i31Max;
+
+    /**
+     * 31次谐波电流含有率-最小值
+     */
+    private Double i31Min;
+
+    /**
+     * 31次谐波电流含有率-平均值
+     */
+    private Double i31Avg;
+
+    /**
+     * 31次谐波电流含有率-cp95值
+     */
+    private Double i31Cp95;
+
+    /**
+     * 32次谐波电流含有率-最大值
+     */
+    private Double i32Max;
+
+    /**
+     * 32次谐波电流含有率-最小值
+     */
+    private Double i32Min;
+
+    /**
+     * 32次谐波电流含有率-平均值
+     */
+    private Double i32Avg;
+
+    /**
+     * 32次谐波电流含有率-cp95值
+     */
+    private Double i32Cp95;
+
+    /**
+     * 33次谐波电流含有率-最大值
+     */
+    private Double i33Max;
+
+    /**
+     * 33次谐波电流含有率-最小值
+     */
+    private Double i33Min;
+
+    /**
+     * 33次谐波电流含有率-平均值
+     */
+    private Double i33Avg;
+
+    /**
+     * 33次谐波电流含有率-cp95值
+     */
+    private Double i33Cp95;
+
+    /**
+     * 34次谐波电流含有率-最大值
+     */
+    private Double i34Max;
+
+    /**
+     * 34次谐波电流含有率-最小值
+     */
+    private Double i34Min;
+
+    /**
+     * 34次谐波电流含有率-平均值
+     */
+    private Double i34Avg;
+
+    /**
+     * 34次谐波电流含有率-cp95值
+     */
+    private Double i34Cp95;
+
+    /**
+     * 35次谐波电流含有率-最大值
+     */
+    private Double i35Max;
+
+    /**
+     * 35次谐波电流含有率-最小值
+     */
+    private Double i35Min;
+
+    /**
+     * 35次谐波电流含有率-平均值
+     */
+    private Double i35Avg;
+
+    /**
+     * 35次谐波电流含有率-cp95值
+     */
+    private Double i35Cp95;
+
+    /**
+     * 36次谐波电流含有率-最大值
+     */
+    private Double i36Max;
+
+    /**
+     * 36次谐波电流含有率-最小值
+     */
+    private Double i36Min;
+
+    /**
+     * 36次谐波电流含有率-平均值
+     */
+    private Double i36Avg;
+
+    /**
+     * 36次谐波电流含有率-cp95值
+     */
+    private Double i36Cp95;
+
+    /**
+     * 37次谐波电流含有率-最大值
+     */
+    private Double i37Max;
+
+    /**
+     * 37次谐波电流含有率-最小值
+     */
+    private Double i37Min;
+
+    /**
+     * 37次谐波电流含有率-平均值
+     */
+    private Double i37Avg;
+
+    /**
+     * 37次谐波电流含有率-cp95值
+     */
+    private Double i37Cp95;
+
+    /**
+     * 38次谐波电流含有率-最大值
+     */
+    private Double i38Max;
+
+    /**
+     * 38次谐波电流含有率-最小值
+     */
+    private Double i38Min;
+
+    /**
+     * 38次谐波电流含有率-平均值
+     */
+    private Double i38Avg;
+
+    /**
+     * 38次谐波电流含有率-cp95值
+     */
+    private Double i38Cp95;
+
+    /**
+     * 39次谐波电流含有率-最大值
+     */
+    private Double i39Max;
+
+    /**
+     * 39次谐波电流含有率-最小值
+     */
+    private Double i39Min;
+
+    /**
+     * 39次谐波电流含有率-平均值
+     */
+    private Double i39Avg;
+
+    /**
+     * 39次谐波电流含有率-cp95值
+     */
+    private Double i39Cp95;
+
+    /**
+     * 40次谐波电流含有率-最大值
+     */
+    private Double i40Max;
+
+    /**
+     * 40次谐波电流含有率-最小值
+     */
+    private Double i40Min;
+
+    /**
+     * 40次谐波电流含有率-平均值
+     */
+    private Double i40Avg;
+
+    /**
+     * 40次谐波电流含有率-cp95值
+     */
+    private Double i40Cp95;
+
+    /**
+     * 41次谐波电流含有率-最大值
+     */
+    private Double i41Max;
+
+    /**
+     * 41次谐波电流含有率-最小值
+     */
+    private Double i41Min;
+
+    /**
+     * 41次谐波电流含有率-平均值
+     */
+    private Double i41Avg;
+
+    /**
+     * 41次谐波电流含有率-cp95值
+     */
+    private Double i41Cp95;
+
+    /**
+     * 42次谐波电流含有率-最大值
+     */
+    private Double i42Max;
+
+    /**
+     * 42次谐波电流含有率-最小值
+     */
+    private Double i42Min;
+
+    /**
+     * 42次谐波电流含有率-平均值
+     */
+    private Double i42Avg;
+
+    /**
+     * 42次谐波电流含有率-cp95值
+     */
+    private Double i42Cp95;
+
+    /**
+     * 43次谐波电流含有率-最大值
+     */
+    private Double i43Max;
+
+    /**
+     * 43次谐波电流含有率-最小值
+     */
+    private Double i43Min;
+
+    /**
+     * 43次谐波电流含有率-平均值
+     */
+    private Double i43Avg;
+
+    /**
+     * 43次谐波电流含有率-cp95值
+     */
+    private Double i43Cp95;
+
+    /**
+     * 44次谐波电流含有率-最大值
+     */
+    private Double i44Max;
+
+    /**
+     * 44次谐波电流含有率-最小值
+     */
+    private Double i44Min;
+
+    /**
+     * 44次谐波电流含有率-平均值
+     */
+    private Double i44Avg;
+
+    /**
+     * 44次谐波电流含有率-cp95值
+     */
+    private Double i44Cp95;
+
+    /**
+     * 45次谐波电流含有率-最大值
+     */
+    private Double i45Max;
+
+    /**
+     * 45次谐波电流含有率-最小值
+     */
+    private Double i45Min;
+
+    /**
+     * 45次谐波电流含有率-平均值
+     */
+    private Double i45Avg;
+
+    /**
+     * 45次谐波电流含有率-cp95值
+     */
+    private Double i45Cp95;
+
+    /**
+     * 46次谐波电流含有率-最大值
+     */
+    private Double i46Max;
+
+    /**
+     * 46次谐波电流含有率-最小值
+     */
+    private Double i46Min;
+
+    /**
+     * 46次谐波电流含有率-平均值
+     */
+    private Double i46Avg;
+
+    /**
+     * 46次谐波电流含有率-cp95值
+     */
+    private Double i46Cp95;
+
+    /**
+     * 47次谐波电流含有率-最大值
+     */
+    private Double i47Max;
+
+    /**
+     * 47次谐波电流含有率-最小值
+     */
+    private Double i47Min;
+
+    /**
+     * 47次谐波电流含有率-平均值
+     */
+    private Double i47Avg;
+
+    /**
+     * 47次谐波电流含有率-cp95值
+     */
+    private Double i47Cp95;
+
+    /**
+     * 48次谐波电流含有率-最大值
+     */
+    private Double i48Max;
+
+    /**
+     * 48次谐波电流含有率-最小值
+     */
+    private Double i48Min;
+
+    /**
+     * 48次谐波电流含有率-平均值
+     */
+    private Double i48Avg;
+
+    /**
+     * 48次谐波电流含有率-cp95值
+     */
+    private Double i48Cp95;
+
+    /**
+     * 49次谐波电流含有率-最大值
+     */
+    private Double i49Max;
+
+    /**
+     * 49次谐波电流含有率-最小值
+     */
+    private Double i49Min;
+
+    /**
+     * 49次谐波电流含有率-平均值
+     */
+    private Double i49Avg;
+
+    /**
+     * 49次谐波电流含有率-cp95值
+     */
+    private Double i49Cp95;
+
+    /**
+     * 50次谐波电流含有率-最大值
+     */
+    private Double i50Max;
+
+    /**
+     * 50次谐波电流含有率-最小值
+     */
+    private Double i50Min;
+
+    /**
+     * 50次谐波电流含有率-平均值
+     */
+    private Double i50Avg;
+
+    /**
+     * 50次谐波电流含有率-cp95值
+     */
+    private Double i50Cp95;
+
+
+}
\ No newline at end of file
diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpHarmonicVRateReportD.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpHarmonicVRateReportD.java
new file mode 100644
index 000000000..72150bb77
--- /dev/null
+++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpHarmonicVRateReportD.java
@@ -0,0 +1,1075 @@
+package com.njcn.harmonic.pojo.po;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.util.Date;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ *
+ * 稳态监测点指标日报-日表(主配网表)  /各次谐波电压含有率
+ * @author jianghf
+ * @TableName r_mp_harmonic_v_rate_report_d
+ */
+@TableName(value ="r_mp_harmonic_v_rate_report_d")
+@Data
+public class RMpHarmonicVRateReportD implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 监测点ID
+     */
+    @ApiModelProperty(name = "measurementPointId", value = "监测点id")
+    private String measurementPointId;
+
+    /**
+     * 生成数据的时间,每日统计一次
+     */
+    @ApiModelProperty(name = "dataDate", value = "dataDate")
+    private Date dataDate;
+
+    /**
+     * 相别：‘A’ 'B' 'C' 'ABC' 'T'  配网部分相别的数据采用T标志存储
+     */
+    @ApiModelProperty(name = "phase", value = "相别")
+    private String phase;
+
+    /**
+     * 电压总谐波畸变率-最大值
+     */
+    private Double voltageHarmonicThdMax;
+
+    /**
+     * 电压总谐波畸变率-最小值
+     */
+    private Double voltageHarmonicThdMin;
+
+    /**
+     * 电压总谐波畸变率-平均值
+     */
+    private Double voltageHarmonicThdAvg;
+
+    /**
+     * 电压总谐波畸变率-95值
+     */
+    private Double voltageHarmonicThd95;
+
+    /**
+     * 相（线）电压基波有效值-最大值
+     */
+    @ApiModelProperty(name = "fundamentalVoltageMax", value = "基波电压-最大值")
+    private Double fundamentalVoltageMax;
+
+    /**
+     * 相（线）电压基波有效值-最小值
+     */
+    @ApiModelProperty(name = "fundamentalVoltageMin", value = "基波电压-最小值")
+    private Double fundamentalVoltageMin;
+
+    /**
+     * 相（线）电压基波有效值-平均值
+     */
+    @ApiModelProperty(name = "fundamentalVoltageAvg", value = "基波电压-平均值")
+    private Double fundamentalVoltageAvg;
+
+    /**
+     * 相（线）电压基波有效值-95值
+     */
+    @ApiModelProperty(name = "fundamentalVoltage95", value = "基波电压-95值")
+    private Double fundamentalVoltage95;
+
+    /**
+     * 2次谐波电压含有率最大值
+     */
+    @ApiModelProperty(name = "harmonicVoltageContent2Max", value = "2次谐波电压含有率最大值")
+    private Double harmonicVoltageContent2Max;
+
+    /**
+     * 2次谐波电压含有率最小值
+     */
+    @ApiModelProperty(name = "harmonicVoltageContent2Min", value = "2次谐波电压含有率最小值")
+    private Double harmonicVoltageContent2Min;
+
+    /**
+     * 2次谐波电压含有率平均值
+     */
+    @ApiModelProperty(name = "harmonicVoltageContent2Avg", value = "2次谐波电压含有率平均值")
+    private Double harmonicVoltageContent2Avg;
+
+    /**
+     * 2次谐波电压含有率95值
+     */
+    @ApiModelProperty(name = "harmonicVoltageContent295", value = "2次谐波电压含有率95值")
+    private Double harmonicVoltageContent295;
+
+    /**
+     * 3次谐波电压含有率最大值
+     */
+    @ApiModelProperty(name = "harmonicVoltageContent3Max", value = "3次谐波电压含有率最大值")
+    private Double harmonicVoltageContent3Max;
+
+    /**
+     * 3次谐波电压含有率最小值
+     */
+    @ApiModelProperty(name = "harmonicVoltageContent3Min", value = "3次谐波电压含有率最小值")
+    private Double harmonicVoltageContent3Min;
+
+    /**
+     * 3次谐波电压含有率平均值
+     */
+    @ApiModelProperty(name = "harmonicVoltageContent3Avg", value = "3次谐波电压含有率平均值")
+    private Double harmonicVoltageContent3Avg;
+
+    /**
+     * 3次谐波电压含有率95值
+     */
+    @ApiModelProperty(name = "harmonicVoltageContent395", value = "3次谐波电压含有率95值")
+    private Double harmonicVoltageContent395;
+
+    /**
+     * 4次谐波电压含有率最大值
+     */
+    private Double harmonicVoltageContent4Max;
+
+    /**
+     * 4次谐波电压含有率最小值
+     */
+    private Double harmonicVoltageContent4Min;
+
+    /**
+     * 4次谐波电压含有率平均值
+     */
+    private Double harmonicVoltageContent4Avg;
+
+    /**
+     * 4次谐波电压含有率95值
+     */
+    private Double harmonicVoltageContent495;
+
+    /**
+     * 5次谐波电压含有率最大值
+     */
+    private Double harmonicVoltageContent5Max;
+
+    /**
+     * 5次谐波电压含有率最小值
+     */
+    private Double harmonicVoltageContent5Min;
+
+    /**
+     * 5次谐波电压含有率平均值
+     */
+    private Double harmonicVoltageContent5Avg;
+
+    /**
+     * 5次谐波电压含有率95值
+     */
+    private Double harmonicVoltageContent595;
+
+    /**
+     * 6次谐波电压含有率最大值
+     */
+    private Double harmonicVoltageContent6Max;
+
+    /**
+     * 6次谐波电压含有率最小值
+     */
+    private Double harmonicVoltageContent6Min;
+
+    /**
+     * 6次谐波电压含有率平均值
+     */
+    private Double harmonicVoltageContent6Avg;
+
+    /**
+     * 6次谐波电压含有率95值
+     */
+    private Double harmonicVoltageContent695;
+
+    /**
+     * 7次谐波电压含有率最大值
+     */
+    private Double harmonicVoltageContent7Max;
+
+    /**
+     * 7次谐波电压含有率最小值
+     */
+    private Double harmonicVoltageContent7Min;
+
+    /**
+     * 7次谐波电压含有率平均值
+     */
+    private Double harmonicVoltageContent7Avg;
+
+    /**
+     * 7次谐波电压含有率95值
+     */
+    private Double harmonicVoltageContent795;
+
+    /**
+     * 8次谐波电压含有率最大值
+     */
+    private Double harmonicVoltageContent8Max;
+
+    /**
+     * 8次谐波电压含有率最小值
+     */
+    private Double harmonicVoltageContent8Min;
+
+    /**
+     * 8次谐波电压含有率平均值
+     */
+    private Double harmonicVoltageContent8Avg;
+
+    /**
+     * 8次谐波电压含有率95值
+     */
+    private Double harmonicVoltageContent895;
+
+    /**
+     * 9次谐波电压含有率最大值
+     */
+    private Double harmonicVoltageContent9Max;
+
+    /**
+     * 9次谐波电压含有率最小值
+     */
+    private Double harmonicVoltageContent9Min;
+
+    /**
+     * 9次谐波电压含有率平均值
+     */
+    private Double harmonicVoltageContent9Avg;
+
+    /**
+     * 9次谐波电压含有率95值
+     */
+    private Double harmonicVoltageContent995;
+
+    /**
+     * 10次谐波电压含有率最大值
+     */
+    private Double harmonicVoltageContent10Max;
+
+    /**
+     * 10次谐波电压含有率最小值
+     */
+    private Double harmonicVoltageContent10Min;
+
+    /**
+     * 10次谐波电压含有率平均值
+     */
+    private Double harmonicVoltageContent10Avg;
+
+    /**
+     * 10次谐波电压含有率95值
+     */
+    private Double harmonicVoltageContent1095;
+
+    /**
+     * 11次谐波电压含有率最大值
+     */
+    private Double harmonicVoltageContent11Max;
+
+    /**
+     * 11次谐波电压含有率最小值
+     */
+    private Double harmonicVoltageContent11Min;
+
+    /**
+     * 11次谐波电压含有率平均值
+     */
+    private Double harmonicVoltageContent11Avg;
+
+    /**
+     * 11次谐波电压含有率95值
+     */
+    private Double harmonicVoltageContent1195;
+
+    /**
+     * 12次谐波电压含有率最大值
+     */
+    private Double harmonicVoltageContent12Max;
+
+    /**
+     * 12次谐波电压含有率最小值
+     */
+    private Double harmonicVoltageContent12Min;
+
+    /**
+     * 12次谐波电压含有率平均值
+     */
+    private Double harmonicVoltageContent12Avg;
+
+    /**
+     * 12次谐波电压含有率95值
+     */
+    private Double harmonicVoltageContent1295;
+
+    /**
+     * 13次谐波电压含有率最大值
+     */
+    private Double harmonicVoltageContent13Max;
+
+    /**
+     * 13次谐波电压含有率最小值
+     */
+    private Double harmonicVoltageContent13Min;
+
+    /**
+     * 13次谐波电压含有率平均值
+     */
+    private Double harmonicVoltageContent13Avg;
+
+    /**
+     * 13次谐波电压含有率95值
+     */
+    private Double harmonicVoltageContent1395;
+
+    /**
+     * 14次谐波电压含有率最大值
+     */
+    private Double harmonicVoltageContent14Max;
+
+    /**
+     * 14次谐波电压含有率最小值
+     */
+    private Double harmonicVoltageContent14Min;
+
+    /**
+     * 14次谐波电压含有率平均值
+     */
+    private Double harmonicVoltageContent14Avg;
+
+    /**
+     * 14次谐波电压含有率95值
+     */
+    private Double harmonicVoltageContent1495;
+
+    /**
+     * 15次谐波电压含有率最大值
+     */
+    private Double harmonicVoltageContent15Max;
+
+    /**
+     * 15次谐波电压含有率最小值
+     */
+    private Double harmonicVoltageContent15Min;
+
+    /**
+     * 15次谐波电压含有率平均值
+     */
+    private Double harmonicVoltageContent15Avg;
+
+    /**
+     * 15次谐波电压含有率95值
+     */
+    private Double harmonicVoltageContent1595;
+
+    /**
+     * 16次谐波电压含有率最大值
+     */
+    private Double harmonicVoltageContent16Max;
+
+    /**
+     * 16次谐波电压含有率最小值
+     */
+    private Double harmonicVoltageContent16Min;
+
+    /**
+     * 16次谐波电压含有率平均值
+     */
+    private Double harmonicVoltageContent16Avg;
+
+    /**
+     * 16次谐波电压含有率95值
+     */
+    private Double harmonicVoltageContent1695;
+
+    /**
+     * 17次谐波电压含有率最大值
+     */
+    private Double harmonicVoltageContent17Max;
+
+    /**
+     * 17次谐波电压含有率最小值
+     */
+    private Double harmonicVoltageContent17Min;
+
+    /**
+     * 17次谐波电压含有率平均值
+     */
+    private Double harmonicVoltageContent17Avg;
+
+    /**
+     * 17次谐波电压含有率95值
+     */
+    private Double harmonicVoltageContent1795;
+
+    /**
+     * 18次谐波电压含有率最大值
+     */
+    private Double harmonicVoltageContent18Max;
+
+    /**
+     * 18次谐波电压含有率最小值
+     */
+    private Double harmonicVoltageContent18Min;
+
+    /**
+     * 18次谐波电压含有率平均值
+     */
+    private Double harmonicVoltageContent18Avg;
+
+    /**
+     * 18次谐波电压含有率95值
+     */
+    private Double harmonicVoltageContent1895;
+
+    /**
+     * 19次谐波电压含有率最大值
+     */
+    private Double harmonicVoltageContent19Max;
+
+    /**
+     * 19次谐波电压含有率最小值
+     */
+    private Double harmonicVoltageContent19Min;
+
+    /**
+     * 19次谐波电压含有率平均值
+     */
+    private Double harmonicVoltageContent19Avg;
+
+    /**
+     * 19次谐波电压含有率95值
+     */
+    private Double harmonicVoltageContent1995;
+
+    /**
+     * 20次谐波电压含有率最大值
+     */
+    private Double harmonicVoltageContent20Max;
+
+    /**
+     * 20次谐波电压含有率最小值
+     */
+    private Double harmonicVoltageContent20Min;
+
+    /**
+     * 20次谐波电压含有率平均值
+     */
+    private Double harmonicVoltageContent20Avg;
+
+    /**
+     * 20次谐波电压含有率95值
+     */
+    private Double harmonicVoltageContent2095;
+
+    /**
+     * 21次谐波电压含有率最大值
+     */
+    private Double harmonicVoltageContent21Max;
+
+    /**
+     * 21次谐波电压含有率最小值
+     */
+    private Double harmonicVoltageContent21Min;
+
+    /**
+     * 21次谐波电压含有率平均值
+     */
+    private Double harmonicVoltageContent21Avg;
+
+    /**
+     * 21次谐波电压含有率95值
+     */
+    private Double harmonicVoltageContent2195;
+
+    /**
+     * 22次谐波电压含有率最大值
+     */
+    private Double harmonicVoltageContent22Max;
+
+    /**
+     * 22次谐波电压含有率最小值
+     */
+    private Double harmonicVoltageContent22Min;
+
+    /**
+     * 22次谐波电压含有率平均值
+     */
+    private Double harmonicVoltageContent22Avg;
+
+    /**
+     * 22次谐波电压含有率95值
+     */
+    private Double harmonicVoltageContent2295;
+
+    /**
+     * 23次谐波电压含有率最大值
+     */
+    private Double harmonicVoltageContent23Max;
+
+    /**
+     * 23次谐波电压含有率最小值
+     */
+    private Double harmonicVoltageContent23Min;
+
+    /**
+     * 23次谐波电压含有率平均值
+     */
+    private Double harmonicVoltageContent23Avg;
+
+    /**
+     * 23次谐波电压含有率95值
+     */
+    private Double harmonicVoltageContent2395;
+
+    /**
+     * 24次谐波电压含有率最大值
+     */
+    private Double harmonicVoltageContent24Max;
+
+    /**
+     * 24次谐波电压含有率最小值
+     */
+    private Double harmonicVoltageContent24Min;
+
+    /**
+     * 24次谐波电压含有率平均值
+     */
+    private Double harmonicVoltageContent24Avg;
+
+    /**
+     * 24次谐波电压含有率95值
+     */
+    private Double harmonicVoltageContent2495;
+
+    /**
+     * 25次谐波电压含有率最大值
+     */
+    private Double harmonicVoltageContent25Max;
+
+    /**
+     * 25次谐波电压含有率最小值
+     */
+    private Double harmonicVoltageContent25Min;
+
+    /**
+     * 25次谐波电压含有率平均值
+     */
+    private Double harmonicVoltageContent25Avg;
+
+    /**
+     * 25次谐波电压含有率95值
+     */
+    private Double harmonicVoltageContent2595;
+
+    /**
+     * 26次谐波电压含有率最大值
+     */
+    private Double harmonicVoltageContent26Max;
+
+    /**
+     * 26次谐波电压含有率最小值
+     */
+    private Double harmonicVoltageContent26Min;
+
+    /**
+     * 26次谐波电压含有率平均值
+     */
+    private Double harmonicVoltageContent26Avg;
+
+    /**
+     * 26次谐波电压含有率95值
+     */
+    private Double harmonicVoltageContent2695;
+
+    /**
+     * 27次谐波电压含有率最大值
+     */
+    private Double harmonicVoltageContent27Max;
+
+    /**
+     * 27次谐波电压含有率最小值
+     */
+    private Double harmonicVoltageContent27Min;
+
+    /**
+     * 27次谐波电压含有率平均值
+     */
+    private Double harmonicVoltageContent27Avg;
+
+    /**
+     * 27次谐波电压含有率95值
+     */
+    private Double harmonicVoltageContent2795;
+
+    /**
+     * 28次谐波电压含有率最大值
+     */
+    private Double harmonicVoltageContent28Max;
+
+    /**
+     * 28次谐波电压含有率最小值
+     */
+    private Double harmonicVoltageContent28Min;
+
+    /**
+     * 28次谐波电压含有率平均值
+     */
+    private Double harmonicVoltageContent28Avg;
+
+    /**
+     * 28次谐波电压含有率95值
+     */
+    private Double harmonicVoltageContent2895;
+
+    /**
+     * 29次谐波电压含有率最大值
+     */
+    private Double harmonicVoltageContent29Max;
+
+    /**
+     * 29次谐波电压含有率最小值
+     */
+    private Double harmonicVoltageContent29Min;
+
+    /**
+     * 29次谐波电压含有率平均值
+     */
+    private Double harmonicVoltageContent29Avg;
+
+    /**
+     * 29次谐波电压含有率95值
+     */
+    private Double harmonicVoltageContent2995;
+
+    /**
+     * 30次谐波电压含有率最大值
+     */
+    private Double harmonicVoltageContent30Max;
+
+    /**
+     * 30次谐波电压含有率最小值
+     */
+    private Double harmonicVoltageContent30Min;
+
+    /**
+     * 30次谐波电压含有率平均值
+     */
+    private Double harmonicVoltageContent30Avg;
+
+    /**
+     * 30次谐波电压含有率95值
+     */
+    private Double harmonicVoltageContent3095;
+
+    /**
+     * 31次谐波电压含有率最大值
+     */
+    private Double harmonicVoltageContent31Max;
+
+    /**
+     * 31次谐波电压含有率最小值
+     */
+    private Double harmonicVoltageContent31Min;
+
+    /**
+     * 31次谐波电压含有率平均值
+     */
+    private Double harmonicVoltageContent31Avg;
+
+    /**
+     * 31次谐波电压含有率95值
+     */
+    private Double harmonicVoltageContent3195;
+
+    /**
+     * 32次谐波电压含有率最大值
+     */
+    private Double harmonicVoltageContent32Max;
+
+    /**
+     * 32次谐波电压含有率最小值
+     */
+    private Double harmonicVoltageContent32Min;
+
+    /**
+     * 32次谐波电压含有率平均值
+     */
+    private Double harmonicVoltageContent32Avg;
+
+    /**
+     * 32次谐波电压含有率95值
+     */
+    private Double harmonicVoltageContent3295;
+
+    /**
+     * 33次谐波电压含有率最大值
+     */
+    private Double harmonicVoltageContent33Max;
+
+    /**
+     * 33次谐波电压含有率最小值
+     */
+    private Double harmonicVoltageContent33Min;
+
+    /**
+     * 33次谐波电压含有率平均值
+     */
+    private Double harmonicVoltageContent33Avg;
+
+    /**
+     * 33次谐波电压含有率95值
+     */
+    private Double harmonicVoltageContent3395;
+
+    /**
+     * 34次谐波电压含有率最大值
+     */
+    private Double harmonicVoltageContent34Max;
+
+    /**
+     * 34次谐波电压含有率最小值
+     */
+    private Double harmonicVoltageContent34Min;
+
+    /**
+     * 34次谐波电压含有率平均值
+     */
+    private Double harmonicVoltageContent34Avg;
+
+    /**
+     * 34次谐波电压含有率95值
+     */
+    private Double harmonicVoltageContent3495;
+
+    /**
+     * 35次谐波电压含有率最大值
+     */
+    private Double harmonicVoltageContent35Max;
+
+    /**
+     * 35次谐波电压含有率最小值
+     */
+    private Double harmonicVoltageContent35Min;
+
+    /**
+     * 35次谐波电压含有率平均值
+     */
+    private Double harmonicVoltageContent35Avg;
+
+    /**
+     * 35次谐波电压含有率95值
+     */
+    private Double harmonicVoltageContent3595;
+
+    /**
+     * 36次谐波电压含有率最大值
+     */
+    private Double harmonicVoltageContent36Max;
+
+    /**
+     * 36次谐波电压含有率最小值
+     */
+    private Double harmonicVoltageContent36Min;
+
+    /**
+     * 36次谐波电压含有率平均值
+     */
+    private Double harmonicVoltageContent36Avg;
+
+    /**
+     * 36次谐波电压含有率95值
+     */
+    private Double harmonicVoltageContent3695;
+
+    /**
+     * 37次谐波电压含有率最大值
+     */
+    private Double harmonicVoltageContent37Max;
+
+    /**
+     * 37次谐波电压含有率最小值
+     */
+    private Double harmonicVoltageContent37Min;
+
+    /**
+     * 37次谐波电压含有率平均值
+     */
+    private Double harmonicVoltageContent37Avg;
+
+    /**
+     * 37次谐波电压含有率95值
+     */
+    private Double harmonicVoltageContent3795;
+
+    /**
+     * 38次谐波电压含有率最大值
+     */
+    private Double harmonicVoltageContent38Max;
+
+    /**
+     * 38次谐波电压含有率最小值
+     */
+    private Double harmonicVoltageContent38Min;
+
+    /**
+     * 38次谐波电压含有率平均值
+     */
+    private Double harmonicVoltageContent38Avg;
+
+    /**
+     * 38次谐波电压含有率95值
+     */
+    private Double harmonicVoltageContent3895;
+
+    /**
+     * 39次谐波电压含有率最大值
+     */
+    private Double harmonicVoltageContent39Max;
+
+    /**
+     * 39次谐波电压含有率最小值
+     */
+    private Double harmonicVoltageContent39Min;
+
+    /**
+     * 39次谐波电压含有率平均值
+     */
+    private Double harmonicVoltageContent39Avg;
+
+    /**
+     * 39次谐波电压含有率95值
+     */
+    private Double harmonicVoltageContent3995;
+
+    /**
+     * 40次谐波电压含有率最大值
+     */
+    private Double harmonicVoltageContent40Max;
+
+    /**
+     * 40次谐波电压含有率最小值
+     */
+    private Double harmonicVoltageContent40Min;
+
+    /**
+     * 40次谐波电压含有率平均值
+     */
+    private Double harmonicVoltageContent40Avg;
+
+    /**
+     * 40次谐波电压含有率95值
+     */
+    private Double harmonicVoltageContent4095;
+
+    /**
+     * 41次谐波电压含有率最大值
+     */
+    private Double harmonicVoltageContent41Max;
+
+    /**
+     * 41次谐波电压含有率最小值
+     */
+    private Double harmonicVoltageContent41Min;
+
+    /**
+     * 41次谐波电压含有率平均值
+     */
+    private Double harmonicVoltageContent41Avg;
+
+    /**
+     * 41次谐波电压含有率95值
+     */
+    private Double harmonicVoltageContent4195;
+
+    /**
+     * 42次谐波电压含有率最大值
+     */
+    private Double harmonicVoltageContent42Max;
+
+    /**
+     * 42次谐波电压含有率最小值
+     */
+    private Double harmonicVoltageContent42Min;
+
+    /**
+     * 42次谐波电压含有率平均值
+     */
+    private Double harmonicVoltageContent42Avg;
+
+    /**
+     * 42次谐波电压含有率95值
+     */
+    private Double harmonicVoltageContent4295;
+
+    /**
+     * 43次谐波电压含有率最大值
+     */
+    private Double harmonicVoltageContent43Max;
+
+    /**
+     * 43次谐波电压含有率最小值
+     */
+    private Double harmonicVoltageContent43Min;
+
+    /**
+     * 43次谐波电压含有率平均值
+     */
+    private Double harmonicVoltageContent43Avg;
+
+    /**
+     * 43次谐波电压含有率95值
+     */
+    private Double harmonicVoltageContent4395;
+
+    /**
+     * 44次谐波电压含有率最大值
+     */
+    private Double harmonicVoltageContent44Max;
+
+    /**
+     * 44次谐波电压含有率最小值
+     */
+    private Double harmonicVoltageContent44Min;
+
+    /**
+     * 44次谐波电压含有率平均值
+     */
+    private Double harmonicVoltageContent44Avg;
+
+    /**
+     * 44次谐波电压含有率95值
+     */
+    private Double harmonicVoltageContent4495;
+
+    /**
+     * 45次谐波电压含有率最大值
+     */
+    private Double harmonicVoltageContent45Max;
+
+    /**
+     * 45次谐波电压含有率最小值
+     */
+    private Double harmonicVoltageContent45Min;
+
+    /**
+     * 45次谐波电压含有率平均值
+     */
+    private Double harmonicVoltageContent45Avg;
+
+    /**
+     * 45次谐波电压含有率95值
+     */
+    private Double harmonicVoltageContent4595;
+
+    /**
+     * 46次谐波电压含有率最大值
+     */
+    private Double harmonicVoltageContent46Max;
+
+    /**
+     * 46次谐波电压含有率最小值
+     */
+    private Double harmonicVoltageContent46Min;
+
+    /**
+     * 46次谐波电压含有率平均值
+     */
+    private Double harmonicVoltageContent46Avg;
+
+    /**
+     * 46次谐波电压含有率95值
+     */
+    private Double harmonicVoltageContent4695;
+
+    /**
+     * 47次谐波电压含有率最大值
+     */
+    private Double harmonicVoltageContent47Max;
+
+    /**
+     * 47次谐波电压含有率最小值
+     */
+    private Double harmonicVoltageContent47Min;
+
+    /**
+     * 47次谐波电压含有率平均值
+     */
+    private Double harmonicVoltageContent47Avg;
+
+    /**
+     * 47次谐波电压含有率95值
+     */
+    private Double harmonicVoltageContent4795;
+
+    /**
+     * 48次谐波电压含有率最大值
+     */
+    private Double harmonicVoltageContent48Max;
+
+    /**
+     * 48次谐波电压含有率最小值
+     */
+    private Double harmonicVoltageContent48Min;
+
+    /**
+     * 48次谐波电压含有率平均值
+     */
+    private Double harmonicVoltageContent48Avg;
+
+    /**
+     * 48次谐波电压含有率95值
+     */
+    private Double harmonicVoltageContent4895;
+
+    /**
+     * 49次谐波电压含有率最大值
+     */
+    private Double harmonicVoltageContent49Max;
+
+    /**
+     * 49次谐波电压含有率最小值
+     */
+    private Double harmonicVoltageContent49Min;
+
+    /**
+     * 49次谐波电压含有率平均值
+     */
+    private Double harmonicVoltageContent49Avg;
+
+    /**
+     * 49次谐波电压含有率95值
+     */
+    private Double harmonicVoltageContent4995;
+
+    /**
+     * 50次谐波电压含有率最大值
+     */
+    private Double harmonicVoltageContent50Max;
+
+    /**
+     * 50次谐波电压含有率最小值
+     */
+    private Double harmonicVoltageContent50Min;
+
+    /**
+     * 50次谐波电压含有率平均值
+     */
+    private Double harmonicVoltageContent50Avg;
+
+    /**
+     * 50次谐波电压含有率95值
+     */
+    private Double harmonicVoltageContent5095;
+
+
+}
\ No newline at end of file
diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpInharmonicIRateReportD.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpInharmonicIRateReportD.java
new file mode 100644
index 000000000..a45c9ecf4
--- /dev/null
+++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpInharmonicIRateReportD.java
@@ -0,0 +1,1030 @@
+package com.njcn.harmonic.pojo.po;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.util.Date;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 稳态监测点指标日报-日表(主网表)  /各次间谐波电流含有率
+ * @TableName r_mp_inharmonic_i_rate_report_d
+ */
+@TableName(value ="r_mp_inharmonic_i_rate_report_d")
+@Data
+public class RMpInharmonicIRateReportD implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 监测点ID
+     */
+    @ApiModelProperty(name = "measurementPointId", value = "监测点id")
+    private String measurementPointId;
+
+    /**
+     * 生成数据的时间,每日统计一次
+     */
+    @ApiModelProperty(name = "dataDate", value = "dataDate")
+    private Date dataDate;
+
+    /**
+     * 相别：‘A’ 'B' 'C' 'ABC' 'T'  配网部分相别的数据采用T标志存储
+     */
+    @ApiModelProperty(name = "phase", value = "相别")
+    private String phase;
+
+    /**
+     * 2次间谐波电流含有率-最大值
+     */
+    @ApiModelProperty(name = "inharmI2Max", value = "2次间谐波电流含有率-最大值")
+    private Double inharmI2Max;
+
+    /**
+     * 2次间谐波电流含有率-最小值
+     */
+    @ApiModelProperty(name = "inharmI2Min", value = "2次间谐波电流含有率-最小值")
+    private Double inharmI2Min;
+
+    /**
+     * 2次间谐波电流含有率-平均值
+     */
+    @ApiModelProperty(name = "inharmI2Avg", value = "2次间谐波电流含有率-平均值")
+    private Double inharmI2Avg;
+
+    /**
+     * 2次间谐波电流含有率-cp95值
+     */
+    @ApiModelProperty(name = "inharmI2Cp95", value = "2次间谐波电流含有率-cp95值")
+    private Double inharmI2Cp95;
+
+    /**
+     * 3次间谐波电流含有率-最大值
+     */
+    @ApiModelProperty(name = "inharmI3Max", value = "3次间谐波电流含有率-最大值")
+    private Double inharmI3Max;
+
+    /**
+     * 3次间谐波电流含有率-最小值
+     */
+    @ApiModelProperty(name = "inharmI3Min", value = "3次间谐波电流含有率-最小值")
+    private Double inharmI3Min;
+
+    /**
+     * 3次间谐波电流含有率-平均值
+     */
+    @ApiModelProperty(name = "inharmI3Avg", value = "3次间谐波电流含有率-平均值")
+    private Double inharmI3Avg;
+
+    /**
+     * 3次间谐波电流含有率-cp95值
+     */
+    @ApiModelProperty(name = "inharmI3Cp95", value = "3次间谐波电流含有率-cp95值")
+    private Double inharmI3Cp95;
+
+    /**
+     * 4次间谐波电流含有率-最大值
+     */
+    private Double inharmI4Max;
+
+    /**
+     * 4次间谐波电流含有率-最小值
+     */
+    private Double inharmI4Min;
+
+    /**
+     * 4次间谐波电流含有率-平均值
+     */
+    private Double inharmI4Avg;
+
+    /**
+     * 4次间谐波电流含有率-cp95值
+     */
+    private Double inharmI4Cp95;
+
+    /**
+     * 5次间谐波电流含有率-最大值
+     */
+    private Double inharmI5Max;
+
+    /**
+     * 5次间谐波电流含有率-最小值
+     */
+    private Double inharmI5Min;
+
+    /**
+     * 5次间谐波电流含有率-平均值
+     */
+    private Double inharmI5Avg;
+
+    /**
+     * 5次间谐波电流含有率-cp95值
+     */
+    private Double inharmI5Cp95;
+
+    /**
+     * 6次间谐波电流含有率-最大值
+     */
+    private Double inharmI6Max;
+
+    /**
+     * 6次间谐波电流含有率-最小值
+     */
+    private Double inharmI6Min;
+
+    /**
+     * 6次间谐波电流含有率-平均值
+     */
+    private Double inharmI6Avg;
+
+    /**
+     * 6次间谐波电流含有率-cp95值
+     */
+    private Double inharmI6Cp95;
+
+    /**
+     * 7次间谐波电流含有率-最大值
+     */
+    private Double inharmI7Max;
+
+    /**
+     * 7次间谐波电流含有率-最小值
+     */
+    private Double inharmI7Min;
+
+    /**
+     * 7次间谐波电流含有率-平均值
+     */
+    private Double inharmI7Avg;
+
+    /**
+     * 7次间谐波电流含有率-cp95值
+     */
+    private Double inharmI7Cp95;
+
+    /**
+     * 8次间谐波电流含有率-最大值
+     */
+    private Double inharmI8Max;
+
+    /**
+     * 8次间谐波电流含有率-最小值
+     */
+    private Double inharmI8Min;
+
+    /**
+     * 8次间谐波电流含有率-平均值
+     */
+    private Double inharmI8Avg;
+
+    /**
+     * 8次间谐波电流含有率-cp95值
+     */
+    private Double inharmI8Cp95;
+
+    /**
+     * 9次间谐波电流含有率-最大值
+     */
+    private Double inharmI9Max;
+
+    /**
+     * 9次间谐波电流含有率-最小值
+     */
+    private Double inharmI9Min;
+
+    /**
+     * 9次间谐波电流含有率-平均值
+     */
+    private Double inharmI9Avg;
+
+    /**
+     * 9次间谐波电流含有率-cp95值
+     */
+    private Double inharmI9Cp95;
+
+    /**
+     * 10次间谐波电流含有率-最大值
+     */
+    private Double inharmI10Max;
+
+    /**
+     * 10次间谐波电流含有率-最小值
+     */
+    private Double inharmI10Min;
+
+    /**
+     * 10次间谐波电流含有率-平均值
+     */
+    private Double inharmI10Avg;
+
+    /**
+     * 10次间谐波电流含有率-cp95值
+     */
+    private Double inharmI10Cp95;
+
+    /**
+     * 11次间谐波电流含有率-最大值
+     */
+    private Double inharmI11Max;
+
+    /**
+     * 11次间谐波电流含有率-最小值
+     */
+    private Double inharmI11Min;
+
+    /**
+     * 11次间谐波电流含有率-平均值
+     */
+    private Double inharmI11Avg;
+
+    /**
+     * 11次间谐波电流含有率-cp95值
+     */
+    private Double inharmI11Cp95;
+
+    /**
+     * 12次间谐波电流含有率-最大值
+     */
+    private Double inharmI12Max;
+
+    /**
+     * 12次间谐波电流含有率-最小值
+     */
+    private Double inharmI12Min;
+
+    /**
+     * 12次间谐波电流含有率-平均值
+     */
+    private Double inharmI12Avg;
+
+    /**
+     * 12次间谐波电流含有率-cp95值
+     */
+    private Double inharmI12Cp95;
+
+    /**
+     * 13次间谐波电流含有率-最大值
+     */
+    private Double inharmI13Max;
+
+    /**
+     * 13次间谐波电流含有率-最小值
+     */
+    private Double inharmI13Min;
+
+    /**
+     * 13次间谐波电流含有率-平均值
+     */
+    private Double inharmI13Avg;
+
+    /**
+     * 13次间谐波电流含有率-cp95值
+     */
+    private Double inharmI13Cp95;
+
+    /**
+     * 14次间谐波电流含有率-最大值
+     */
+    private Double inharmI14Max;
+
+    /**
+     * 14次间谐波电流含有率-最小值
+     */
+    private Double inharmI14Min;
+
+    /**
+     * 14次间谐波电流含有率-平均值
+     */
+    private Double inharmI14Avg;
+
+    /**
+     * 14次间谐波电流含有率-cp95值
+     */
+    private Double inharmI14Cp95;
+
+    /**
+     * 15次间谐波电流含有率-最大值
+     */
+    private Double inharmI15Max;
+
+    /**
+     * 15次间谐波电流含有率-最小值
+     */
+    private Double inharmI15Min;
+
+    /**
+     * 15次间谐波电流含有率-平均值
+     */
+    private Double inharmI15Avg;
+
+    /**
+     * 15次间谐波电流含有率-cp95值
+     */
+    private Double inharmI15Cp95;
+
+    /**
+     * 16次间谐波电流含有率-最大值
+     */
+    private Double inharmI16Max;
+
+    /**
+     * 16次间谐波电流含有率-最小值
+     */
+    private Double inharmI16Min;
+
+    /**
+     * 16次间谐波电流含有率-平均值
+     */
+    private Double inharmI16Avg;
+
+    /**
+     * 16次间谐波电流含有率-cp95值
+     */
+    private Double inharmI16Cp95;
+
+    /**
+     * 17次间谐波电流含有率-最大值
+     */
+    private Double inharmI17Max;
+
+    /**
+     * 17次间谐波电流含有率-最小值
+     */
+    private Double inharmI17Min;
+
+    /**
+     * 17次间谐波电流含有率-平均值
+     */
+    private Double inharmI17Avg;
+
+    /**
+     * 17次间谐波电流含有率-cp95值
+     */
+    private Double inharmI17Cp95;
+
+    /**
+     * 18次间谐波电流含有率-最大值
+     */
+    private Double inharmI18Max;
+
+    /**
+     * 18次间谐波电流含有率-最小值
+     */
+    private Double inharmI18Min;
+
+    /**
+     * 18次间谐波电流含有率-平均值
+     */
+    private Double inharmI18Avg;
+
+    /**
+     * 18次间谐波电流含有率-cp95值
+     */
+    private Double inharmI18Cp95;
+
+    /**
+     * 19次间谐波电流含有率-最大值
+     */
+    private Double inharmI19Max;
+
+    /**
+     * 19次间谐波电流含有率-最小值
+     */
+    private Double inharmI19Min;
+
+    /**
+     * 19次间谐波电流含有率-平均值
+     */
+    private Double inharmI19Avg;
+
+    /**
+     * 19次间谐波电流含有率-cp95值
+     */
+    private Double inharmI19Cp95;
+
+    /**
+     * 20次间谐波电流含有率-最大值
+     */
+    private Double inharmI20Max;
+
+    /**
+     * 20次间谐波电流含有率-最小值
+     */
+    private Double inharmI20Min;
+
+    /**
+     * 20次间谐波电流含有率-平均值
+     */
+    private Double inharmI20Avg;
+
+    /**
+     * 20次间谐波电流含有率-cp95值
+     */
+    private Double inharmI20Cp95;
+
+    /**
+     * 21次间谐波电流含有率-最大值
+     */
+    private Double inharmI21Max;
+
+    /**
+     * 21次间谐波电流含有率-最小值
+     */
+    private Double inharmI21Min;
+
+    /**
+     * 21次间谐波电流含有率-平均值
+     */
+    private Double inharmI21Avg;
+
+    /**
+     * 21次间谐波电流含有率-cp95值
+     */
+    private Double inharmI21Cp95;
+
+    /**
+     * 22次间谐波电流含有率-最大值
+     */
+    private Double inharmI22Max;
+
+    /**
+     * 22次间谐波电流含有率-最小值
+     */
+    private Double inharmI22Min;
+
+    /**
+     * 22次间谐波电流含有率-平均值
+     */
+    private Double inharmI22Avg;
+
+    /**
+     * 22次间谐波电流含有率-cp95值
+     */
+    private Double inharmI22Cp95;
+
+    /**
+     * 23次间谐波电流含有率-最大值
+     */
+    private Double inharmI23Max;
+
+    /**
+     * 23次间谐波电流含有率-最小值
+     */
+    private Double inharmI23Min;
+
+    /**
+     * 23次间谐波电流含有率-平均值
+     */
+    private Double inharmI23Avg;
+
+    /**
+     * 23次间谐波电流含有率-cp95值
+     */
+    private Double inharmI23Cp95;
+
+    /**
+     * 24次间谐波电流含有率-最大值
+     */
+    private Double inharmI24Max;
+
+    /**
+     * 24次间谐波电流含有率-最小值
+     */
+    private Double inharmI24Min;
+
+    /**
+     * 24次间谐波电流含有率-平均值
+     */
+    private Double inharmI24Avg;
+
+    /**
+     * 24次间谐波电流含有率-cp95值
+     */
+    private Double inharmI24Cp95;
+
+    /**
+     * 25次间谐波电流含有率-最大值
+     */
+    private Double inharmI25Max;
+
+    /**
+     * 25次间谐波电流含有率-最小值
+     */
+    private Double inharmI25Min;
+
+    /**
+     * 25次间谐波电流含有率-平均值
+     */
+    private Double inharmI25Avg;
+
+    /**
+     * 25次间谐波电流含有率-cp95值
+     */
+    private Double inharmI25Cp95;
+
+    /**
+     * 26次间谐波电流含有率-最大值
+     */
+    private Double inharmI26Max;
+
+    /**
+     * 26次间谐波电流含有率-最小值
+     */
+    private Double inharmI26Min;
+
+    /**
+     * 26次间谐波电流含有率-平均值
+     */
+    private Double inharmI26Avg;
+
+    /**
+     * 26次间谐波电流含有率-cp95值
+     */
+    private Double inharmI26Cp95;
+
+    /**
+     * 27次间谐波电流含有率-最大值
+     */
+    private Double inharmI27Max;
+
+    /**
+     * 27次间谐波电流含有率-最小值
+     */
+    private Double inharmI27Min;
+
+    /**
+     * 27次间谐波电流含有率-平均值
+     */
+    private Double inharmI27Avg;
+
+    /**
+     * 27次间谐波电流含有率-cp95值
+     */
+    private Double inharmI27Cp95;
+
+    /**
+     * 28次间谐波电流含有率-最大值
+     */
+    private Double inharmI28Max;
+
+    /**
+     * 28次间谐波电流含有率-最小值
+     */
+    private Double inharmI28Min;
+
+    /**
+     * 28次间谐波电流含有率-平均值
+     */
+    private Double inharmI28Avg;
+
+    /**
+     * 28次间谐波电流含有率-cp95值
+     */
+    private Double inharmI28Cp95;
+
+    /**
+     * 29次间谐波电流含有率-最大值
+     */
+    private Double inharmI29Max;
+
+    /**
+     * 29次间谐波电流含有率-最小值
+     */
+    private Double inharmI29Min;
+
+    /**
+     * 29次间谐波电流含有率-平均值
+     */
+    private Double inharmI29Avg;
+
+    /**
+     * 29次间谐波电流含有率-cp95值
+     */
+    private Double inharmI29Cp95;
+
+    /**
+     * 30次间谐波电流含有率-最大值
+     */
+    private Double inharmI30Max;
+
+    /**
+     * 30次间谐波电流含有率-最小值
+     */
+    private Double inharmI30Min;
+
+    /**
+     * 30次间谐波电流含有率-平均值
+     */
+    private Double inharmI30Avg;
+
+    /**
+     * 30次间谐波电流含有率-cp95值
+     */
+    private Double inharmI30Cp95;
+
+    /**
+     * 31次间谐波电流含有率-最大值
+     */
+    private Double inharmI31Max;
+
+    /**
+     * 31次间谐波电流含有率-最小值
+     */
+    private Double inharmI31Min;
+
+    /**
+     * 31次间谐波电流含有率-平均值
+     */
+    private Double inharmI31Avg;
+
+    /**
+     * 31次间谐波电流含有率-cp95值
+     */
+    private Double inharmI31Cp95;
+
+    /**
+     * 32次间谐波电流含有率-最大值
+     */
+    private Double inharmI32Max;
+
+    /**
+     * 32次间谐波电流含有率-最小值
+     */
+    private Double inharmI32Min;
+
+    /**
+     * 32次间谐波电流含有率-平均值
+     */
+    private Double inharmI32Avg;
+
+    /**
+     * 32次间谐波电流含有率-cp95值
+     */
+    private Double inharmI32Cp95;
+
+    /**
+     * 33次间谐波电流含有率-最大值
+     */
+    private Double inharmI33Max;
+
+    /**
+     * 33次间谐波电流含有率-最小值
+     */
+    private Double inharmI33Min;
+
+    /**
+     * 33次间谐波电流含有率-平均值
+     */
+    private Double inharmI33Avg;
+
+    /**
+     * 33次间谐波电流含有率-cp95值
+     */
+    private Double inharmI33Cp95;
+
+    /**
+     * 34次间谐波电流含有率-最大值
+     */
+    private Double inharmI34Max;
+
+    /**
+     * 34次间谐波电流含有率-最小值
+     */
+    private Double inharmI34Min;
+
+    /**
+     * 34次间谐波电流含有率-平均值
+     */
+    private Double inharmI34Avg;
+
+    /**
+     * 34次间谐波电流含有率-cp95值
+     */
+    private Double inharmI34Cp95;
+
+    /**
+     * 35次间谐波电流含有率-最大值
+     */
+    private Double inharmI35Max;
+
+    /**
+     * 35次间谐波电流含有率-最小值
+     */
+    private Double inharmI35Min;
+
+    /**
+     * 35次间谐波电流含有率-平均值
+     */
+    private Double inharmI35Avg;
+
+    /**
+     * 35次间谐波电流含有率-cp95值
+     */
+    private Double inharmI35Cp95;
+
+    /**
+     * 36次间谐波电流含有率-最大值
+     */
+    private Double inharmI36Max;
+
+    /**
+     * 36次间谐波电流含有率-最小值
+     */
+    private Double inharmI36Min;
+
+    /**
+     * 36次间谐波电流含有率-平均值
+     */
+    private Double inharmI36Avg;
+
+    /**
+     * 36次间谐波电流含有率-cp95值
+     */
+    private Double inharmI36Cp95;
+
+    /**
+     * 37次间谐波电流含有率-最大值
+     */
+    private Double inharmI37Max;
+
+    /**
+     * 37次间谐波电流含有率-最小值
+     */
+    private Double inharmI37Min;
+
+    /**
+     * 37次间谐波电流含有率-平均值
+     */
+    private Double inharmI37Avg;
+
+    /**
+     * 37次间谐波电流含有率-cp95值
+     */
+    private Double inharmI37Cp95;
+
+    /**
+     * 38次间谐波电流含有率-最大值
+     */
+    private Double inharmI38Max;
+
+    /**
+     * 38次间谐波电流含有率-最小值
+     */
+    private Double inharmI38Min;
+
+    /**
+     * 38次间谐波电流含有率-平均值
+     */
+    private Double inharmI38Avg;
+
+    /**
+     * 38次间谐波电流含有率-cp95值
+     */
+    private Double inharmI38Cp95;
+
+    /**
+     * 39次间谐波电流含有率-最大值
+     */
+    private Double inharmI39Max;
+
+    /**
+     * 39次间谐波电流含有率-最小值
+     */
+    private Double inharmI39Min;
+
+    /**
+     * 39次间谐波电流含有率-平均值
+     */
+    private Double inharmI39Avg;
+
+    /**
+     * 39次间谐波电流含有率-cp95值
+     */
+    private Double inharmI39Cp95;
+
+    /**
+     * 40次间谐波电流含有率-最大值
+     */
+    private Double inharmI40Max;
+
+    /**
+     * 40次间谐波电流含有率-最小值
+     */
+    private Double inharmI40Min;
+
+    /**
+     * 40次间谐波电流含有率-平均值
+     */
+    private Double inharmI40Avg;
+
+    /**
+     * 40次间谐波电流含有率-cp95值
+     */
+    private Double inharmI40Cp95;
+
+    /**
+     * 41次间谐波电流含有率-最大值
+     */
+    private Double inharmI41Max;
+
+    /**
+     * 41次间谐波电流含有率-最小值
+     */
+    private Double inharmI41Min;
+
+    /**
+     * 41次间谐波电流含有率-平均值
+     */
+    private Double inharmI41Avg;
+
+    /**
+     * 41次间谐波电流含有率-cp95值
+     */
+    private Double inharmI41Cp95;
+
+    /**
+     * 42次间谐波电流含有率-最大值
+     */
+    private Double inharmI42Max;
+
+    /**
+     * 42次间谐波电流含有率-最小值
+     */
+    private Double inharmI42Min;
+
+    /**
+     * 42次间谐波电流含有率-平均值
+     */
+    private Double inharmI42Avg;
+
+    /**
+     * 42次间谐波电流含有率-cp95值
+     */
+    private Double inharmI42Cp95;
+
+    /**
+     * 43次间谐波电流含有率-最大值
+     */
+    private Double inharmI43Max;
+
+    /**
+     * 43次间谐波电流含有率-最小值
+     */
+    private Double inharmI43Min;
+
+    /**
+     * 43次间谐波电流含有率-平均值
+     */
+    private Double inharmI43Avg;
+
+    /**
+     * 43次间谐波电流含有率-cp95值
+     */
+    private Double inharmI43Cp95;
+
+    /**
+     * 44次间谐波电流含有率-最大值
+     */
+    private Double inharmI44Max;
+
+    /**
+     * 44次间谐波电流含有率-最小值
+     */
+    private Double inharmI44Min;
+
+    /**
+     * 44次间谐波电流含有率-平均值
+     */
+    private Double inharmI44Avg;
+
+    /**
+     * 44次间谐波电流含有率-cp95值
+     */
+    private Double inharmI44Cp95;
+
+    /**
+     * 45次间谐波电流含有率-最大值
+     */
+    private Double inharmI45Max;
+
+    /**
+     * 45次间谐波电流含有率-最小值
+     */
+    private Double inharmI45Min;
+
+    /**
+     * 45次间谐波电流含有率-平均值
+     */
+    private Double inharmI45Avg;
+
+    /**
+     * 45次间谐波电流含有率-cp95值
+     */
+    private Double inharmI45Cp95;
+
+    /**
+     * 46次间谐波电流含有率-最大值
+     */
+    private Double inharmI46Max;
+
+    /**
+     * 46次间谐波电流含有率-最小值
+     */
+    private Double inharmI46Min;
+
+    /**
+     * 46次间谐波电流含有率-平均值
+     */
+    private Double inharmI46Avg;
+
+    /**
+     * 46次间谐波电流含有率-cp95值
+     */
+    private Double inharmI46Cp95;
+
+    /**
+     * 47次间谐波电流含有率-最大值
+     */
+    private Double inharmI47Max;
+
+    /**
+     * 47次间谐波电流含有率-最小值
+     */
+    private Double inharmI47Min;
+
+    /**
+     * 47次间谐波电流含有率-平均值
+     */
+    private Double inharmI47Avg;
+
+    /**
+     * 47次间谐波电流含有率-cp95值
+     */
+    private Double inharmI47Cp95;
+
+    /**
+     * 48次间谐波电流含有率-最大值
+     */
+    private Double inharmI48Max;
+
+    /**
+     * 48次间谐波电流含有率-最小值
+     */
+    private Double inharmI48Min;
+
+    /**
+     * 48次间谐波电流含有率-平均值
+     */
+    private Double inharmI48Avg;
+
+    /**
+     * 48次间谐波电流含有率-cp95值
+     */
+    private Double inharmI48Cp95;
+
+    /**
+     * 49次间谐波电流含有率-最大值
+     */
+    private Double inharmI49Max;
+
+    /**
+     * 49次间谐波电流含有率-最小值
+     */
+    private Double inharmI49Min;
+
+    /**
+     * 49次间谐波电流含有率-平均值
+     */
+    private Double inharmI49Avg;
+
+    /**
+     * 49次间谐波电流含有率-cp95值
+     */
+    private Double inharmI49Cp95;
+
+    /**
+     * 50次间谐波电流含有率-最大值
+     */
+    private Double inharmI50Max;
+
+    /**
+     * 50次间谐波电流含有率-最小值
+     */
+    private Double inharmI50Min;
+
+    /**
+     * 50次间谐波电流含有率-平均值
+     */
+    private Double inharmI50Avg;
+
+    /**
+     * 50次间谐波电流含有率-cp95值
+     */
+    private Double inharmI50Cp95;
+
+
+}
\ No newline at end of file
diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpInharmonicVRateReportD.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpInharmonicVRateReportD.java
new file mode 100644
index 000000000..a3b42cd62
--- /dev/null
+++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpInharmonicVRateReportD.java
@@ -0,0 +1,1050 @@
+package com.njcn.harmonic.pojo.po;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.util.Date;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 
+ * @TableName r_mp_inharmonic_v_rate_report_d
+ */
+@TableName(value ="r_mp_inharmonic_v_rate_report_d")
+@Data
+public class RMpInharmonicVRateReportD implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 监测点ID
+     */
+    @ApiModelProperty(name = "measurementPointId", value = "监测点id")
+    private String measurementPointId;
+
+    /**
+     * 生成数据的时间,每日统计一次
+     */
+    @ApiModelProperty(name = "dataDate", value = "dataDate")
+    private Date dataDate;
+
+    /**
+     * 相别："A" "B" "C" "ABC" "T"  配网部分相别的数据采用T标志存储
+     */
+    @ApiModelProperty(name = "phase", value = "相别")
+    private String phase;
+
+    /**
+     * 0.5次间谐波电压含有率最大值
+     */
+    @ApiModelProperty(name = "inharmV1Max", value = "0.5次间谐波电压含有率最大值")
+    private Double inharmV1Max;
+
+    /**
+     * 0.5次间谐波电压含有率最小值
+     */
+    @ApiModelProperty(name = "inharmV1Min", value = "0.5次间谐波电压含有率最小值")
+    private Double inharmV1Min;
+
+    /**
+     * 0.5次间谐波电压含有率平均值
+     */
+    @ApiModelProperty(name = "inharmV1Avg", value = "0.5次间谐波电压含有率平均值")
+    private Double inharmV1Avg;
+
+    /**
+     * 0.5次间谐波电压含有率95值
+     */
+    @ApiModelProperty(name = "inharmV1Cp95", value = "0.5次间谐波电压含有率95值")
+    private Double inharmV1Cp95;
+
+    /**
+     * 1.5次间谐波电压含有率最大值
+     */
+    @ApiModelProperty(name = "inharmV2Max", value = "1.5次间谐波电压含有率最大值")
+    private Double inharmV2Max;
+
+    /**
+     * 1.5次间谐波电压含有率最小值
+     */
+    @ApiModelProperty(name = "inharmV2Min", value = "1.5次间谐波电压含有率最小值")
+    private Double inharmV2Min;
+
+    /**
+     * 1.5次间谐波电压含有率平均值
+     */
+    @ApiModelProperty(name = "inharmV2Avg", value = "1.5次间谐波电压含有率平均值")
+    private Double inharmV2Avg;
+
+    /**
+     * 1.5次间谐波电压含有率95值
+     */
+    @ApiModelProperty(name = "inharmV2Cp95", value = "1.5次间谐波电压含有率95值")
+    private Double inharmV2Cp95;
+
+    /**
+     * 2.5次间谐波电压含有率最大值
+     */
+    private Double inharmV3Max;
+
+    /**
+     * 2.5次间谐波电压含有率最小值
+     */
+    private Double inharmV3Min;
+
+    /**
+     * 2.5次间谐波电压含有率平均值
+     */
+    private Double inharmV3Avg;
+
+    /**
+     * 2.5次间谐波电压含有率95值
+     */
+    private Double inharmV3Cp95;
+
+    /**
+     * 3.5次间谐波电压含有率最大值
+     */
+    private Double inharmV4Max;
+
+    /**
+     * 3.5次间谐波电压含有率最小值
+     */
+    private Double inharmV4Min;
+
+    /**
+     * 3.5次间谐波电压含有率平均值
+     */
+    private Double inharmV4Avg;
+
+    /**
+     * 3.5次间谐波电压含有率95值
+     */
+    private Double inharmV4Cp95;
+
+    /**
+     * 4.5次间谐波电压含有率最大值
+     */
+    private Double inharmV5Max;
+
+    /**
+     * 4.5次间谐波电压含有率最小值
+     */
+    private Double inharmV5Min;
+
+    /**
+     * 4.5次间谐波电压含有率平均值
+     */
+    private Double inharmV5Avg;
+
+    /**
+     * 4.5次间谐波电压含有率95值
+     */
+    private Double inharmV5Cp95;
+
+    /**
+     * 5.5次间谐波电压含有率最大值
+     */
+    private Double inharmV6Max;
+
+    /**
+     * 5.5次间谐波电压含有率最小值
+     */
+    private Double inharmV6Min;
+
+    /**
+     * 5.5次间谐波电压含有率平均值
+     */
+    private Double inharmV6Avg;
+
+    /**
+     * 5.5次间谐波电压含有率95值
+     */
+    private Double inharmV6Cp95;
+
+    /**
+     * 6.5次间谐波电压含有率最大值
+     */
+    private Double inharmV7Max;
+
+    /**
+     * 6.5次间谐波电压含有率最小值
+     */
+    private Double inharmV7Min;
+
+    /**
+     * 6.5次间谐波电压含有率平均值
+     */
+    private Double inharmV7Avg;
+
+    /**
+     * 6.5次间谐波电压含有率95值
+     */
+    private Double inharmV7Cp95;
+
+    /**
+     * 7.5次间谐波电压含有率最大值
+     */
+    private Double inharmV8Max;
+
+    /**
+     * 7.5次间谐波电压含有率最小值
+     */
+    private Double inharmV8Min;
+
+    /**
+     * 7.5次间谐波电压含有率平均值
+     */
+    private Double inharmV8Avg;
+
+    /**
+     * 7.5次间谐波电压含有率95值
+     */
+    private Double inharmV8Cp95;
+
+    /**
+     * 8.5次间谐波电压含有率最大值
+     */
+    private Double inharmV9Max;
+
+    /**
+     * 8.5次间谐波电压含有率最小值
+     */
+    private Double inharmV9Min;
+
+    /**
+     * 8.5次间谐波电压含有率平均值
+     */
+    private Double inharmV9Avg;
+
+    /**
+     * 8.5次间谐波电压含有率95值
+     */
+    private Double inharmV9Cp95;
+
+    /**
+     * 9.5次间谐波电压含有率最大值
+     */
+    private Double inharmV10Max;
+
+    /**
+     * 9.5次间谐波电压含有率最小值
+     */
+    private Double inharmV10Min;
+
+    /**
+     * 9.5次间谐波电压含有率平均值
+     */
+    private Double inharmV10Avg;
+
+    /**
+     * 9.5次间谐波电压含有率95值
+     */
+    private Double inharmV10Cp95;
+
+    /**
+     * 10.5次间谐波电压含有率最大值
+     */
+    private Double inharmV11Max;
+
+    /**
+     * 10.5次间谐波电压含有率最小值
+     */
+    private Double inharmV11Min;
+
+    /**
+     * 10.5次间谐波电压含有率平均值
+     */
+    private Double inharmV11Avg;
+
+    /**
+     * 10.5次间谐波电压含有率95值
+     */
+    private Double inharmV11Cp95;
+
+    /**
+     * 11.5次间谐波电压含有率最大值
+     */
+    private Double inharmV12Max;
+
+    /**
+     * 11.5次间谐波电压含有率最小值
+     */
+    private Double inharmV12Min;
+
+    /**
+     * 11.5次间谐波电压含有率平均值
+     */
+    private Double inharmV12Avg;
+
+    /**
+     * 11.5次间谐波电压含有率95值
+     */
+    private Double inharmV12Cp95;
+
+    /**
+     * 12.5次间谐波电压含有率最大值
+     */
+    private Double inharmV13Max;
+
+    /**
+     * 12.5次间谐波电压含有率最小值
+     */
+    private Double inharmV13Min;
+
+    /**
+     * 12.5次间谐波电压含有率平均值
+     */
+    private Double inharmV13Avg;
+
+    /**
+     * 12.5次间谐波电压含有率95值
+     */
+    private Double inharmV13Cp95;
+
+    /**
+     * 13.5次间谐波电压含有率最大值
+     */
+    private Double inharmV14Max;
+
+    /**
+     * 13.5次间谐波电压含有率最小值
+     */
+    private Double inharmV14Min;
+
+    /**
+     * 13.5次间谐波电压含有率平均值
+     */
+    private Double inharmV14Avg;
+
+    /**
+     * 13.5次间谐波电压含有率95值
+     */
+    private Double inharmV14Cp95;
+
+    /**
+     * 14.5次间谐波电压含有率最大值
+     */
+    private Double inharmV15Max;
+
+    /**
+     * 14.5次间谐波电压含有率最小值
+     */
+    private Double inharmV15Min;
+
+    /**
+     * 14.5次间谐波电压含有率平均值
+     */
+    private Double inharmV15Avg;
+
+    /**
+     * 14.5次间谐波电压含有率95值
+     */
+    private Double inharmV15Cp95;
+
+    /**
+     * 15.5次间谐波电压含有率最大值
+     */
+    private Double inharmV16Max;
+
+    /**
+     * 15.5次间谐波电压含有率最小值
+     */
+    private Double inharmV16Min;
+
+    /**
+     * 15.5次间谐波电压含有率平均值
+     */
+    private Double inharmV16Avg;
+
+    /**
+     * 15.5次间谐波电压含有率95值
+     */
+    private Double inharmV16Cp95;
+
+    /**
+     * 16.5次间谐波电压含有率最大值
+     */
+    private Double inharmV17Max;
+
+    /**
+     * 16.5次间谐波电压含有率最小值
+     */
+    private Double inharmV17Min;
+
+    /**
+     * 16.5次间谐波电压含有率平均值
+     */
+    private Double inharmV17Avg;
+
+    /**
+     * 16.5次间谐波电压含有率95值
+     */
+    private Double inharmV17Cp95;
+
+    /**
+     * 17.5次间谐波电压含有率最大值
+     */
+    private Double inharmV18Max;
+
+    /**
+     * 17.5次间谐波电压含有率最小值
+     */
+    private Double inharmV18Min;
+
+    /**
+     * 17.5次间谐波电压含有率平均值
+     */
+    private Double inharmV18Avg;
+
+    /**
+     * 17.5次间谐波电压含有率95值
+     */
+    private Double inharmV18Cp95;
+
+    /**
+     * 18.5次间谐波电压含有率最大值
+     */
+    private Double inharmV19Max;
+
+    /**
+     * 18.5次间谐波电压含有率最小值
+     */
+    private Double inharmV19Min;
+
+    /**
+     * 18.5次间谐波电压含有率平均值
+     */
+    private Double inharmV19Avg;
+
+    /**
+     * 18.5次间谐波电压含有率95值
+     */
+    private Double inharmV19Cp95;
+
+    /**
+     * 19.5次间谐波电压含有率最大值
+     */
+    private Double inharmV20Max;
+
+    /**
+     * 19.5次间谐波电压含有率最小值
+     */
+    private Double inharmV20Min;
+
+    /**
+     * 19.5次间谐波电压含有率平均值
+     */
+    private Double inharmV20Avg;
+
+    /**
+     * 19.5次间谐波电压含有率95值
+     */
+    private Double inharmV20Cp95;
+
+    /**
+     * 20.5次间谐波电压含有率最大值
+     */
+    private Double inharmV21Max;
+
+    /**
+     * 20.5次间谐波电压含有率最小值
+     */
+    private Double inharmV21Min;
+
+    /**
+     * 20.5次间谐波电压含有率平均值
+     */
+    private Double inharmV21Avg;
+
+    /**
+     * 20.5次间谐波电压含有率95值
+     */
+    private Double inharmV21Cp95;
+
+    /**
+     * 21.5次间谐波电压含有率最大值
+     */
+    private Double inharmV22Max;
+
+    /**
+     * 21.5次间谐波电压含有率最小值
+     */
+    private Double inharmV22Min;
+
+    /**
+     * 21.5次间谐波电压含有率平均值
+     */
+    private Double inharmV22Avg;
+
+    /**
+     * 21.5次间谐波电压含有率95值
+     */
+    private Double inharmV22Cp95;
+
+    /**
+     * 22.5次间谐波电压含有率最大值
+     */
+    private Double inharmV23Max;
+
+    /**
+     * 22.5次间谐波电压含有率最小值
+     */
+    private Double inharmV23Min;
+
+    /**
+     * 22.5次间谐波电压含有率平均值
+     */
+    private Double inharmV23Avg;
+
+    /**
+     * 22.5次间谐波电压含有率95值
+     */
+    private Double inharmV23Cp95;
+
+    /**
+     * 23.5次间谐波电压含有率最大值
+     */
+    private Double inharmV24Max;
+
+    /**
+     * 23.5次间谐波电压含有率最小值
+     */
+    private Double inharmV24Min;
+
+    /**
+     * 23.5次间谐波电压含有率平均值
+     */
+    private Double inharmV24Avg;
+
+    /**
+     * 23.5次间谐波电压含有率95值
+     */
+    private Double inharmV24Cp95;
+
+    /**
+     * 24.5次间谐波电压含有率最大值
+     */
+    private Double inharmV25Max;
+
+    /**
+     * 24.5次间谐波电压含有率最小值
+     */
+    private Double inharmV25Min;
+
+    /**
+     * 24.5次间谐波电压含有率平均值
+     */
+    private Double inharmV25Avg;
+
+    /**
+     * 24.5次间谐波电压含有率95值
+     */
+    private Double inharmV25Cp95;
+
+    /**
+     * 25.5次间谐波电压含有率最大值
+     */
+    private Double inharmV26Max;
+
+    /**
+     * 25.5次间谐波电压含有率最小值
+     */
+    private Double inharmV26Min;
+
+    /**
+     * 25.5次间谐波电压含有率平均值
+     */
+    private Double inharmV26Avg;
+
+    /**
+     * 25.5次间谐波电压含有率95值
+     */
+    private Double inharmV26Cp95;
+
+    /**
+     * 26.5次间谐波电压含有率最大值
+     */
+    private Double inharmV27Max;
+
+    /**
+     * 26.5次间谐波电压含有率最小值
+     */
+    private Double inharmV27Min;
+
+    /**
+     * 26.5次间谐波电压含有率平均值
+     */
+    private Double inharmV27Avg;
+
+    /**
+     * 26.5次间谐波电压含有率95值
+     */
+    private Double inharmV27Cp95;
+
+    /**
+     * 27.5次间谐波电压含有率最大值
+     */
+    private Double inharmV28Max;
+
+    /**
+     * 27.5次间谐波电压含有率最小值
+     */
+    private Double inharmV28Min;
+
+    /**
+     * 27.5次间谐波电压含有率平均值
+     */
+    private Double inharmV28Avg;
+
+    /**
+     * 27.5次间谐波电压含有率95值
+     */
+    private Double inharmV28Cp95;
+
+    /**
+     * 28.5次间谐波电压含有率最大值
+     */
+    private Double inharmV29Max;
+
+    /**
+     * 28.5次间谐波电压含有率最小值
+     */
+    private Double inharmV29Min;
+
+    /**
+     * 28.5次间谐波电压含有率平均值
+     */
+    private Double inharmV29Avg;
+
+    /**
+     * 28.5次间谐波电压含有率95值
+     */
+    private Double inharmV29Cp95;
+
+    /**
+     * 29.5次间谐波电压含有率最大值
+     */
+    private Double inharmV30Max;
+
+    /**
+     * 29.5次间谐波电压含有率最小值
+     */
+    private Double inharmV30Min;
+
+    /**
+     * 29.5次间谐波电压含有率平均值
+     */
+    private Double inharmV30Avg;
+
+    /**
+     * 29.5次间谐波电压含有率95值
+     */
+    private Double inharmV30Cp95;
+
+    /**
+     * 30.5次间谐波电压含有率最大值
+     */
+    private Double inharmV31Max;
+
+    /**
+     * 30.5次间谐波电压含有率最小值
+     */
+    private Double inharmV31Min;
+
+    /**
+     * 30.5次间谐波电压含有率平均值
+     */
+    private Double inharmV31Avg;
+
+    /**
+     * 30.5次间谐波电压含有率95值
+     */
+    private Double inharmV31Cp95;
+
+    /**
+     * 31.5次间谐波电压含有率最大值
+     */
+    private Double inharmV32Max;
+
+    /**
+     * 31.5次间谐波电压含有率最小值
+     */
+    private Double inharmV32Min;
+
+    /**
+     * 31.5次间谐波电压含有率平均值
+     */
+    private Double inharmV32Avg;
+
+    /**
+     * 31.5次间谐波电压含有率95值
+     */
+    private Double inharmV32Cp95;
+
+    /**
+     * 32.5次间谐波电压含有率最大值
+     */
+    private Double inharmV33Max;
+
+    /**
+     * 32.5次间谐波电压含有率最小值
+     */
+    private Double inharmV33Min;
+
+    /**
+     * 32.5次间谐波电压含有率平均值
+     */
+    private Double inharmV33Avg;
+
+    /**
+     * 32.5次间谐波电压含有率95值
+     */
+    private Double inharmV33Cp95;
+
+    /**
+     * 33.5次间谐波电压含有率最大值
+     */
+    private Double inharmV34Max;
+
+    /**
+     * 33.5次间谐波电压含有率最小值
+     */
+    private Double inharmV34Min;
+
+    /**
+     * 33.5次间谐波电压含有率平均值
+     */
+    private Double inharmV34Avg;
+
+    /**
+     * 33.5次间谐波电压含有率95值
+     */
+    private Double inharmV34Cp95;
+
+    /**
+     * 34.5次间谐波电压含有率最大值
+     */
+    private Double inharmV35Max;
+
+    /**
+     * 34.5次间谐波电压含有率最小值
+     */
+    private Double inharmV35Min;
+
+    /**
+     * 34.5次间谐波电压含有率平均值
+     */
+    private Double inharmV35Avg;
+
+    /**
+     * 34.5次间谐波电压含有率95值
+     */
+    private Double inharmV35Cp95;
+
+    /**
+     * 35.5次间谐波电压含有率最大值
+     */
+    private Double inharmV36Max;
+
+    /**
+     * 35.5次间谐波电压含有率最小值
+     */
+    private Double inharmV36Min;
+
+    /**
+     * 35.5次间谐波电压含有率平均值
+     */
+    private Double inharmV36Avg;
+
+    /**
+     * 35.5次间谐波电压含有率95值
+     */
+    private Double inharmV36Cp95;
+
+    /**
+     * 36.5次间谐波电压含有率最大值
+     */
+    private Double inharmV37Max;
+
+    /**
+     * 36.5次间谐波电压含有率最小值
+     */
+    private Double inharmV37Min;
+
+    /**
+     * 36.5次间谐波电压含有率平均值
+     */
+    private Double inharmV37Avg;
+
+    /**
+     * 36.5次间谐波电压含有率95值
+     */
+    private Double inharmV37Cp95;
+
+    /**
+     * 37.5次间谐波电压含有率最大值
+     */
+    private Double inharmV38Max;
+
+    /**
+     * 37.5次间谐波电压含有率最小值
+     */
+    private Double inharmV38Min;
+
+    /**
+     * 37.5次间谐波电压含有率平均值
+     */
+    private Double inharmV38Avg;
+
+    /**
+     * 37.5次间谐波电压含有率95值
+     */
+    private Double inharmV38Cp95;
+
+    /**
+     * 38.5次间谐波电压含有率最大值
+     */
+    private Double inharmV39Max;
+
+    /**
+     * 38.5次间谐波电压含有率最小值
+     */
+    private Double inharmV39Min;
+
+    /**
+     * 38.5次间谐波电压含有率平均值
+     */
+    private Double inharmV39Avg;
+
+    /**
+     * 38.5次间谐波电压含有率95值
+     */
+    private Double inharmV39Cp95;
+
+    /**
+     * 39.5次间谐波电压含有率最大值
+     */
+    private Double inharmV40Max;
+
+    /**
+     * 39.5次间谐波电压含有率最小值
+     */
+    private Double inharmV40Min;
+
+    /**
+     * 39.5次间谐波电压含有率平均值
+     */
+    private Double inharmV40Avg;
+
+    /**
+     * 39.5次间谐波电压含有率95值
+     */
+    private Double inharmV40Cp95;
+
+    /**
+     * 40.5次间谐波电压含有率最大值
+     */
+    private Double inharmV41Max;
+
+    /**
+     * 40.5次间谐波电压含有率最小值
+     */
+    private Double inharmV41Min;
+
+    /**
+     * 40.5次间谐波电压含有率平均值
+     */
+    private Double inharmV41Avg;
+
+    /**
+     * 40.5次间谐波电压含有率95值
+     */
+    private Double inharmV41Cp95;
+
+    /**
+     * 41.5次间谐波电压含有率最大值
+     */
+    private Double inharmV42Max;
+
+    /**
+     * 41.5次间谐波电压含有率最小值
+     */
+    private Double inharmV42Min;
+
+    /**
+     * 41.5次间谐波电压含有率平均值
+     */
+    private Double inharmV42Avg;
+
+    /**
+     * 41.5次间谐波电压含有率95值
+     */
+    private Double inharmV42Cp95;
+
+    /**
+     * 42.5次间谐波电压含有率最大值
+     */
+    private Double inharmV43Max;
+
+    /**
+     * 42.5次间谐波电压含有率最小值
+     */
+    private Double inharmV43Min;
+
+    /**
+     * 42.5次间谐波电压含有率平均值
+     */
+    private Double inharmV43Avg;
+
+    /**
+     * 42.5次间谐波电压含有率95值
+     */
+    private Double inharmV43Cp95;
+
+    /**
+     * 43.5次间谐波电压含有率最大值
+     */
+    private Double inharmV44Max;
+
+    /**
+     * 43.5次间谐波电压含有率最小值
+     */
+    private Double inharmV44Min;
+
+    /**
+     * 43.5次间谐波电压含有率平均值
+     */
+    private Double inharmV44Avg;
+
+    /**
+     * 43.5次间谐波电压含有率95值
+     */
+    private Double inharmV44Cp95;
+
+    /**
+     * 44.5次间谐波电压含有率最大值
+     */
+    private Double inharmV45Max;
+
+    /**
+     * 44.5次间谐波电压含有率最小值
+     */
+    private Double inharmV45Min;
+
+    /**
+     * 44.5次间谐波电压含有率平均值
+     */
+    private Double inharmV45Avg;
+
+    /**
+     * 44.5次间谐波电压含有率95值
+     */
+    private Double inharmV45Cp95;
+
+    /**
+     * 45.5次间谐波电压含有率最大值
+     */
+    private Double inharmV46Max;
+
+    /**
+     * 45.5次间谐波电压含有率最小值
+     */
+    private Double inharmV46Min;
+
+    /**
+     * 45.5次间谐波电压含有率平均值
+     */
+    private Double inharmV46Avg;
+
+    /**
+     * 45.5次间谐波电压含有率95值
+     */
+    private Double inharmV46Cp95;
+
+    /**
+     * 46.5次间谐波电压含有率最大值
+     */
+    private Double inharmV47Max;
+
+    /**
+     * 46.5次间谐波电压含有率最小值
+     */
+    private Double inharmV47Min;
+
+    /**
+     * 46.5次间谐波电压含有率平均值
+     */
+    private Double inharmV47Avg;
+
+    /**
+     * 46.5次间谐波电压含有率95值
+     */
+    private Double inharmV47Cp95;
+
+    /**
+     * 47.5次间谐波电压含有率最大值
+     */
+    private Double inharmV48Max;
+
+    /**
+     * 47.5次间谐波电压含有率最小值
+     */
+    private Double inharmV48Min;
+
+    /**
+     * 47.5次间谐波电压含有率平均值
+     */
+    private Double inharmV48Avg;
+
+    /**
+     * 47.5次间谐波电压含有率95值
+     */
+    private Double inharmV48Cp95;
+
+    /**
+     * 48.5次间谐波电压含有率最大值
+     */
+    private Double inharmV49Max;
+
+    /**
+     * 48.5次间谐波电压含有率最小值
+     */
+    private Double inharmV49Min;
+
+    /**
+     * 48.5次间谐波电压含有率平均值
+     */
+    private Double inharmV49Avg;
+
+    /**
+     * 48.5次间谐波电压含有率95值
+     */
+    private Double inharmV49Cp95;
+
+    /**
+     * 49.5次间谐波电压含有率最大值
+     */
+    private Double inharmV50Max;
+
+    /**
+     * 49.5次间谐波电压含有率最小值
+     */
+    private Double inharmV50Min;
+
+    /**
+     * 49.5次间谐波电压含有率平均值
+     */
+    private Double inharmV50Avg;
+
+    /**
+     * 49.5次间谐波电压含有率95值
+     */
+    private Double inharmV50Cp95;
+
+
+}
\ No newline at end of file
diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpIntegrityD.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpIntegrityD.java
new file mode 100644
index 000000000..02a7faf29
--- /dev/null
+++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpIntegrityD.java
@@ -0,0 +1,61 @@
+package com.njcn.harmonic.pojo.po;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * (RMpIntegrityD)实体类
+ *
+ * @author qijian
+ * @since 2022-10-26 14:10:32
+ */
+@Data
+@TableName(value = "r_mp_integrity_d")
+public class RMpIntegrityD implements Serializable {
+    private static final long serialVersionUID = 320784653665837465L;
+    /**
+     * 监测点id
+     */
+    private String measurementPointId;
+    /**
+     * 生成数据的时间,每天统计一次
+     */
+    private Date dataDate;
+    /**
+     * 有效接入分钟数量
+     */
+    private Integer effectiveMinuteCount;
+    /**
+     * 频率平均值指标数据个数
+     */
+    private Integer freqCount;
+    /**
+     * 相电压有效值平均值指标数据个数
+     */
+    private Integer phaseVoltageCount;
+    /**
+     * 线电压有效值平均值指标数据个数
+     */
+    private Integer lineVoltageCount;
+    /**
+     * 电压总谐波畸变率平均值指标数据个数
+     */
+    private Integer vThdCount;
+    /**
+     * 三相电压不平衡度平均值指标数据个数
+     */
+    private Integer unbalanceCount;
+    /**
+     * 监测点短时闪变、电压波动类指标数据个数
+     */
+    private Integer pstCount;
+    /**
+     * 监测点长时闪变指标数据个数
+     */
+    private Integer pltCount;
+
+}
+
diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpMeasurePhaseReportD.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpMeasurePhaseReportD.java
new file mode 100644
index 000000000..4c2b0d055
--- /dev/null
+++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpMeasurePhaseReportD.java
@@ -0,0 +1,252 @@
+package com.njcn.harmonic.pojo.po;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.util.Date;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 
+ * @TableName r_mp_measure_phase_report_d
+ */
+@TableName(value ="r_mp_measure_phase_report_d")
+@Data
+public class RMpMeasurePhaseReportD implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 监测点ID
+     */
+    @ApiModelProperty(name = "measurementPointId", value = "监测点id")
+    private String measurementPointId;
+
+    /**
+     * 生成数据的时间,每日统计一次
+     */
+    @ApiModelProperty(name = "dataDate", value = "监测日期")
+    private Date dataDate;
+
+    /**
+     * 相别：‘A’ ‘B’ ‘C’ ‘ABC’ ‘T’  配网部分相别的数据采用T标志存储
+     */
+    private String phase;
+
+    /**
+     * 相电压有效值-最大值
+     */
+    private Double phaseVoltageEffectiveMax;
+
+    /**
+     * 相电压有效值-最小值
+     */
+    private Double phaseVoltageEffectiveMin;
+
+    /**
+     * 相电压有效值-平均值
+     */
+    private Double phaseVoltageEffectiveAvg;
+
+    /**
+     * 相电压有效值-95值
+     */
+
+    private Double phaseVoltageEffective95;
+
+    /**
+     * 线电压有效值-最大值
+     */
+    private Double lineVoltageEffectiveMax;
+
+    /**
+     * 线电压有效值-最小值
+     */
+    private Double lineVoltageEffectiveMin;
+
+    /**
+     * 线电压有效值-平均值
+     */
+    private Double lineVoltageEffectiveAvg;
+
+    /**
+     * 线电压有效值-95值
+     */
+    private Double lineVoltageEffective95;
+
+    /**
+     * 电压上偏差-最大值
+     */
+    @ApiModelProperty(name = "vDeUpMax", value = "电压正偏差-最大值")
+    private Double vDeUpMax;
+
+    /**
+     * 电压上偏差-最小值
+     */
+    private Double vDeUpMin;
+
+    /**
+     * 电压上偏差-平均值
+     */
+    private Double vDeUpAvg;
+
+    /**
+     * 电压上偏差-95值
+     */
+    private Double vDeUp95;
+
+    /**
+     * 电压下偏差-最大值
+     */
+    @ApiModelProperty(name = "vDeLowMax", value = "电压负偏差-最大值")
+    private Double vDeLowMax;
+
+    /**
+     * 电压下偏差-最小值
+     */
+    private Double vDeLowMin;
+
+    /**
+     * 电压下偏差-平均值
+     */
+    private Double vDeLowAvg;
+
+    /**
+     * 电压下偏差-95值
+     */
+    private Double vDeLow95;
+
+    /**
+     * 电流有效值-最大值
+     */
+    private Double currentEffectiveMax;
+
+    /**
+     * 电流有效值-最小值
+     */
+    private Double currentEffectiveMin;
+
+    /**
+     * 电流有效值-平均值
+     */
+    private Double currentEffectiveAvg;
+
+    /**
+     * 电流有效值-95值
+     */
+    private Double currentEffective95;
+
+    /**
+     * 单相有功功率-最大值
+     */
+    private Double spActivePowerMax;
+
+    /**
+     * 单相有功功率-最小值
+     */
+    private Double spActivePowerMin;
+
+    /**
+     * 单相有功功率-平均值
+     */
+    private Double spActivePowerAvg;
+
+    /**
+     * 单相有功功率-95值
+     */
+    private Double spActivePower95;
+
+    /**
+     * 单相无功功率-最大值
+     */
+    private Double spReactivePowerMax;
+
+    /**
+     * 单相无功功率-最小值
+     */
+    private Double spReactivePowerMin;
+
+    /**
+     * 单相无功功率-平均值
+     */
+    private Double spReactivePowerAvg;
+
+    /**
+     * 单相无功功率-95值
+     */
+    private Double spReactivePower95;
+
+    /**
+     * 单相视在功率-最大值
+     */
+    @ApiModelProperty(name = "spApparentPowerMax", value = "视在功率-最大值")
+    private Double spApparentPowerMax;
+
+    /**
+     * 单相视在功率-最小值
+     */
+    @ApiModelProperty(name = "spApparentPowerMin", value = "视在功率-最小值")
+    private Double spApparentPowerMin;
+
+    /**
+     * 单相视在功率-平均值
+     */
+    @ApiModelProperty(name = "spApparentPowerAvg", value = "视在功率-平均值")
+    private Double spApparentPowerAvg;
+
+    /**
+     * 单相视在功率-95值
+     */
+    @ApiModelProperty(name = "spApparentPower95", value = "视在功率-95值")
+    private Double spApparentPower95;
+
+    /**
+     * 单相功率因数-最大值
+     */
+    @ApiModelProperty(name = "spPowerFactorMax", value = "功率因数-最大值")
+    private Double spPowerFactorMax;
+
+    /**
+     * 单相功率因数-最小值
+     */
+    @ApiModelProperty(name = "spPowerFactorMin", value = "功率因数-最小值")
+    private Double spPowerFactorMin;
+
+    /**
+     * 单相功率因数-平均值
+     */
+    @ApiModelProperty(name = "spPowerFactorAvg", value = "功率因数-平均值")
+    private Double spPowerFactorAvg;
+
+    /**
+     * 单相功率因数-95值
+     */
+    @ApiModelProperty(name = "spPowerFactor95", value = "功率因数-95值")
+    private Double spPowerFactor95;
+
+    /**
+     * 单相基波功率因数-最大值
+     */
+    private Double spFundamentalPowerFactorMax;
+
+    /**
+     * 单相基波功率因数-最小值
+     */
+    private Double spFundamentalPowerFactorMin;
+
+    /**
+     * 单相基波功率因数-平均值
+     */
+    private Double spFundamentalPowerFactorAvg;
+
+    /**
+     * 单相基波功率因数-95值
+     */
+    private Double spFundamentalPowerFactor95;
+
+
+}
\ No newline at end of file
diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpMeasureReportD.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpMeasureReportD.java
new file mode 100644
index 000000000..f7d2e87a6
--- /dev/null
+++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpMeasureReportD.java
@@ -0,0 +1,425 @@
+package com.njcn.harmonic.pojo.po;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.Size;
+import javax.validation.constraints.NotNull;
+
+import java.io.Serializable;
+
+import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.hibernate.validator.constraints.Length;
+
+/**
+* 【稳态监测点非谐波不带相位指标日报-日表】
+ * @author jianghf
+* @TableName r_mp_measure_report_d
+*/
+@Data
+@TableName("r_mp_measure_report_d")
+public class RMpMeasureReportD implements Serializable {
+
+    /**
+    * 监测点ID
+    */
+    @ApiModelProperty("监测点ID")
+    private String measurementPointId;
+    /**
+    * 生成数据的时间,每日统计一次
+    */
+    @ApiModelProperty("生成数据的时间,每日统计一次")
+    private Date dataDate;
+    /**
+    * 频率-最大值
+    */
+    private Double frequencyMax;
+    /**
+    * 频率-最小值
+    */
+    private Double frequencyMin;
+    /**
+    * 频率-平均值
+    */
+    private Double frequencyAvg;
+    /**
+    * 频率-95值
+    */
+    private Double frequency95;
+    /**
+    * 频率偏差-最大值
+    */
+    private Double frequencyDeviationMax;
+    /**
+    * 频率偏差-最小值
+    */
+    private Double frequencyDeviationMin;
+    /**
+    * 频率偏差-平均值
+    */
+    private Double frequencyDeviationAvg;
+    /**
+    * 频率偏差-95值
+    */
+    private Double frequencyDeviation95;
+    /**
+    * 总有功功率-最大值
+    */
+    @ApiModelProperty("总有功功率-最大值")
+    private Double totalActivePowerMax;
+    /**
+    * 总有功功率-最小值
+    */
+    @ApiModelProperty("总有功功率-最小值")
+    private Double totalActivePowerMin;
+    /**
+    * 总有功功率-平均值
+    */
+    @ApiModelProperty("总有功功率-平均值")
+    private Double totalActivePowerAvg;
+    /**
+    * 总有功功率-95值
+    */
+    @ApiModelProperty("总有功功率-95值")
+    private Double totalActivePower95;
+    /**
+    * 总无功功率-最大值
+    */
+    @ApiModelProperty("总无功功率-最大值")
+    private Double totalReactivePowerMax;
+    /**
+    * 总无功功率-最小值
+    */
+    @ApiModelProperty("总无功功率-最小值")
+    private Double totalReactivePowerMin;
+    /**
+    * 总无功功率-平均值
+    */
+    @ApiModelProperty("总无功功率-平均值")
+    private Double totalReactivePowerAvg;
+    /**
+    * 总无功功率-95值
+    */
+    @ApiModelProperty("总无功功率-95值")
+    private Double totalReactivePower95;
+    /**
+    * 总视在功率-最大值
+    */
+    @ApiModelProperty("总视在功率-最大值")
+    private Double totalApparentPowerMax;
+    /**
+    * 总视在功率-最小值
+    */
+    @ApiModelProperty("总视在功率-最小值")
+    private Double totalApparentPowerMin;
+    /**
+    * 总视在功率-平均值
+    */
+    @ApiModelProperty("总视在功率-平均值")
+    private Double totalApparentPowerAvg;
+    /**
+    * 总视在功率-95值
+    */
+    @ApiModelProperty("总视在功率-95值")
+    private Double totalApparentPower95;
+    /**
+    * 三相功率因数-最大值
+    */
+    private Double tpPowerFactorMax;
+    /**
+    * 三相功率因数-最小值
+    */
+    private Double tpPowerFactorMin;
+    /**
+    * 三相功率因数-平均值
+    */
+    private Double tpPowerFactorAvg;
+    /**
+    * 三相功率因数-95值
+    */
+    private Double tpPowerFactor95;
+    /**
+    * 基波功率因数-最大值
+    */
+    private Double fundamentalPowerFactorMax;
+    /**
+    * 基波功率因数-最小值
+    */
+    private Double fundamentalPowerFactorMin;
+    /**
+    * 基波功率因数-平均值
+    */
+    private Double fundamentalPowerFactorAvg;
+    /**
+    * 基波功率因数-95值
+    */
+    private Double fundamentalPowerFactor95;
+    /**
+    * 正序电压-最大值
+    */
+    private Double positiveSequenceVoltageMax;
+    /**
+    * 正序电压-最小值
+    */
+    private Double positiveSequenceVoltageMin;
+    /**
+    * 正序电压-平均值
+    */
+    private Double positiveSequenceVoltageAvg;
+    /**
+    * 正序电压-95值
+    */
+    private Double positiveSequenceVoltage95;
+    /**
+    * 负序电压-最大值
+    */
+    private Double negativeSequenceVoltageMax;
+    /**
+    * 负序电压-最小值
+    */
+    private Double negativeSequenceVoltageMin;
+    /**
+    * 负序电压-平均值
+    */
+    private Double negativeSequenceVoltageAvg;
+    /**
+    * 负序电压-95值
+    */
+    private Double negativeSequenceVoltage95;
+    /**
+    * 零序电压-最大值
+    */
+    private Double zeroSequenceVoltageMax;
+    /**
+    * 零序电压-最小值
+    */
+    private Double zeroSequenceVoltageMin;
+    /**
+    * 零序电压-平均值
+    */
+    private Double zeroSequenceVoltageAvg;
+    /**
+    * 零序电压-95值
+    */
+    private Double zeroSequenceVoltage95;
+    /**
+    * 负序电压不平衡度-最大值
+    */
+    @ApiModelProperty("负序电压（三相电压）不平衡度-最大值")
+    private Double negativeSequenceVoltageUnbalanceMax;
+    /**
+    * 负序电压不平衡度-最小值
+    */
+    @ApiModelProperty("负序电压（三相电压）不平衡度-最小值")
+    private Double negativeSequenceVoltageUnbalanceMin;
+    /**
+    * 负序电压不平衡度-平均值
+    */
+    @ApiModelProperty("负序电压（三相电压）不平衡度-平均值")
+    private Double negativeSequenceVoltageUnbalanceAvg;
+    /**
+    * 负序电压不平衡度-95值
+    */
+    @ApiModelProperty("负序电压（三相电压）不平衡度-95值")
+    private Double negativeSequenceVoltageUnbalance95;
+    /**
+    * 零序电压不平衡度-最大值
+    */
+    private Double zeroSequenceVoltageUnbalanceMax;
+    /**
+    * 零序电压不平衡度-最小值
+    */
+    private Double zeroSequenceVoltageUnbalanceMin;
+    /**
+    * 零序电压不平衡度-平均值
+    */
+    private Double zeroSequenceVoltageUnbalanceAvg;
+    /**
+    * 零序电压不平衡度-95值
+    */
+    private Double zeroSequenceVoltageUnbalance95;
+    /**
+    * 正序电流-最大值
+    */
+    private Double positiveSequenceCurrentMax;
+    /**
+    * 正序电流-最小值
+    */
+    private Double positiveSequenceCurrentMin;
+    /**
+    * 正序电流-平均值
+    */
+    private Double positiveSequenceCurrentAvg;
+    /**
+    * 正序电流-95值
+    */
+    private Double positiveSequenceCurrent95;
+    /**
+    * 负序电流-最大值
+    */
+    @ApiModelProperty("负序电流-最大值")
+    private Double negativeSequenceCurrentMax;
+    /**
+    * 负序电流-最小值
+    */
+    @ApiModelProperty("负序电流-最小值")
+    private Double negativeSequenceCurrentMin;
+    /**
+    * 负序电流-平均值
+    */
+    @ApiModelProperty("负序电流-平均值")
+    private Double negativeSequenceCurrentAvg;
+    /**
+    * 负序电流-95值
+    */
+    @ApiModelProperty("负序电流-95值")
+    private Double negativeSequenceCurrent95;
+    /**
+    * 零序电流-最大值
+    */
+    private Double zeroSequenceCurrentMax;
+    /**
+    * 零序电流-最小值
+    */
+    private Double zeroSequenceCurrentMin;
+    /**
+    * 零序电流-平均值
+    */
+    private Double zeroSequenceCurrentAvg;
+    /**
+    * 零序电流-95值
+    */
+    private Double zeroSequenceCurrent95;
+    /**
+    * 负序电流不平衡度-最大值
+    */
+    private Double negativeSequenceCurrentUnbalanceMax;
+    /**
+    * 负序电流不平衡度-最小值
+    */
+    private Double negativeSequenceCurrentUnbalanceMin;
+    /**
+    * 负序电流不平衡度-平均值
+    */
+    private Double negativeSequenceCurrentUnbalanceAvg;
+    /**
+    * 负序电流不平衡度-95值
+    */
+    private Double negativeSequenceCurrentUnbalance95;
+    /**
+    * 零序电流不平衡度-最大值
+    */
+    private Double zeroSequenceCurrentImbalanceMax;
+    /**
+    * 零序电流不平衡度-最小值
+    */
+    private Double zeroSequenceCurrentImbalanceMin;
+    /**
+    * 零序电流不平衡度-平均值
+    */
+    private Double zeroSequenceCurrentImbalanceAvg;
+    /**
+    * 零序电流不平衡度-95值
+    */
+    private Double zeroSequenceCurrentImbalance95;
+    /**
+    * 等效视在功率-最大值
+    */
+    private Double equivalentApparentPowerMax;
+    /**
+    * 等效视在功率-最小值
+    */
+    private Double equivalentApparentPowerMin;
+    /**
+    * 等效视在功率-平均值
+    */
+    private Double equivalentApparentPowerAvg;
+    /**
+    * 等效视在功率-95值
+    */
+    private Double equivalentApparentPower95;
+    /**
+    * 等效功率因数-最大值
+    */
+    private Double equivalentPowerFactorMax;
+    /**
+    * 等效功率因数-最小值
+    */
+    private Double equivalentPowerFactorMin;
+    /**
+    * 等效功率因数-平均值
+    */
+    private Double equivalentPowerFactorAvg;
+    /**
+    * 等效功率因数-95值
+    */
+    private Double equivalentPowerFactor95;
+    /**
+    * 基波正序视在功率-最大值
+    */
+    private Double fundamentalWaveRateoMax;
+    /**
+    * 基波正序视在功率-最小值
+    */
+    private Double fundamentalWaveRateoMin;
+    /**
+    * 基波正序视在功率-平均值
+    */
+    private Double fundamentalWaveRateoAvg;
+    /**
+    * 基波正序视在功率-95值
+    */
+    private Double fundamentalWaveRateo95;
+    /**
+    * 基波等效视在功率-最大值
+    */
+    private Double fundamentalWaveApparentMax;
+    /**
+    * 基波等效视在功率-最小值
+    */
+    private Double fundamentalWaveApparentMin;
+    /**
+    * 基波等效视在功率-平均值
+    */
+    private Double fundamentalWaveApparentAvg;
+    /**
+    * 基波等效视在功率-95值
+    */
+    private Double fundamentalWaveApparent95;
+    /**
+    * 非基波等效视在功率-最大值
+    */
+    private Double nonfundamentalWaveRateoMax;
+    /**
+    * 非基波等效视在功率-最小值
+    */
+    private Double nonfundamentalWaveRateoMin;
+    /**
+    * 非基波等效视在功率-平均值
+    */
+    private Double nonfundamentalWaveRateoAvg;
+    /**
+    * 非基波等效视在功率-95值
+    */
+    private Double nonfundamentalWaveRateo95;
+    /**
+    * 不平衡视在功率-最大值
+    */
+    private Double unbalancedApparentPowerMax;
+    /**
+    * 不平衡视在功率-最小值
+    */
+    private Double unbalancedApparentPowerMin;
+    /**
+    * 不平衡视在功率-平均值
+    */
+    private Double unbalancedApparentPowerAvg;
+    /**
+    * 不平衡视在功率-95值
+    */
+    private Double unbalancedApparentPower95;
+
+
+}
diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpPartHarmonicDetailD.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpPartHarmonicDetailD.java
new file mode 100644
index 000000000..6763ae5ac
--- /dev/null
+++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpPartHarmonicDetailD.java
@@ -0,0 +1,379 @@
+package com.njcn.harmonic.pojo.po;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import java.time.LocalDate;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.io.Serializable;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author rui.wu
+ * @since 2022-10-24
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@TableName("r_mp_part_harmonic_detail_d")
+@ApiModel(value="RMpPartHarmonicDetailD对象", description="")
+public class RMpPartHarmonicDetailD implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "监测点ID")
+    @TableId(value = "measurement_point_id", type = IdType.ASSIGN_ID)
+    private String measurementPointId;
+
+    @ApiModelProperty(value = "生成数据的时间,每月统计一次")
+    private LocalDate dataDate;
+
+    @ApiModelProperty(value = "稳态指标是否超标(0:否 1:是)")
+    private Integer isHarmonic;
+
+    @ApiModelProperty(value = "频率偏差是否超标(0:否 1:是)")
+    private Integer isFreq;
+
+    @ApiModelProperty(value = "频率偏差超标次数")
+    private Integer freqTimes;
+
+    @ApiModelProperty(value = "电压上偏差是否超标(0:否 1:是)")
+    private Integer isVDevUp;
+
+    @ApiModelProperty(value = "电压下偏差超是否超标(0:否 1:是)")
+    private Integer isVDevLow;
+
+    @ApiModelProperty(value = "电压偏差是否超标(0:否 1:是)")
+    private Integer isVDev;
+
+    @ApiModelProperty(value = "电压总谐波畸变率是否超标(0:否 1:是)")
+    private Integer isVThd;
+
+    @ApiModelProperty(value = "电压偏差超标次数")
+    private Integer vDevTimes;
+
+    @ApiModelProperty(value = "谐波电压是否超标(0:否 1:是)")
+    private Integer isV;
+
+    @ApiModelProperty(value = "谐波电压超标次数")
+    private Integer vTimes;
+
+    @ApiModelProperty(value = "谐波电流是否超标(0:否 1:是)")
+    private Integer isI;
+
+    @ApiModelProperty(value = "谐波电流超标次数")
+    private Integer iTimes;
+
+    @ApiModelProperty(value = "2次谐波电压含有率是否超标(0:否 1:是)")
+    private Integer isV2;
+
+    @ApiModelProperty(value = "3次谐波电压含有率是否超标(0:否 1:是)")
+    private Integer isV3;
+
+    @ApiModelProperty(value = "4次谐波电压含有率是否超标(0:否 1:是)")
+    private Integer isV4;
+
+    @ApiModelProperty(value = "5次谐波电压含有率是否超标(0:否 1:是)")
+    private Integer isV5;
+
+    @ApiModelProperty(value = "6次谐波电压含有率是否超标(0:否 1:是)")
+    private Integer isV6;
+
+    @ApiModelProperty(value = "7次谐波电压含有率是否超标(0:否 1:是)")
+    private Integer isV7;
+
+    @ApiModelProperty(value = "8次谐波电压含有率是否超标(0:否 1:是)")
+    private Integer isV8;
+
+    @ApiModelProperty(value = "9次谐波电压含有率是否超标(0:否 1:是)")
+    private Integer isV9;
+
+    @ApiModelProperty(value = "10次谐波电压含有率是否超标(0:否 1:是)")
+    private Integer isV10;
+
+    @ApiModelProperty(value = "11次谐波电压含有率是否超标(0:否 1:是)")
+    private Integer isV11;
+
+    @ApiModelProperty(value = "12次谐波电压含有率是否超标(0:否 1:是)")
+    private Integer isV12;
+
+    @ApiModelProperty(value = "13次谐波电压含有率是否超标(0:否 1:是)")
+    private Integer isV13;
+
+    @ApiModelProperty(value = "14次谐波电压含有率是否超标(0:否 1:是)")
+    private Integer isV14;
+
+    @ApiModelProperty(value = "15次谐波电压含有率是否超标(0:否 1:是)")
+    private Integer isV15;
+
+    @ApiModelProperty(value = "16次谐波电压含有率是否超标(0:否 1:是)")
+    private Integer isV16;
+
+    @ApiModelProperty(value = "17次谐波电压含有率是否超标(0:否 1:是)")
+    private Integer isV17;
+
+    @ApiModelProperty(value = "18次谐波电压含有率是否超标(0:否 1:是)")
+    private Integer isV18;
+
+    @ApiModelProperty(value = "19次谐波电压含有率是否超标(0:否 1:是)")
+    private Integer isV19;
+
+    @ApiModelProperty(value = "20次谐波电压含有率是否超标(0:否 1:是)")
+    private Integer isV20;
+
+    @ApiModelProperty(value = "21次谐波电压含有率是否超标(0:否 1:是)")
+    private Integer isV21;
+
+    @ApiModelProperty(value = "22次谐波电压含有率是否超标(0:否 1:是)")
+    private Integer isV22;
+
+    @ApiModelProperty(value = "23次谐波电压含有率是否超标(0:否 1:是)")
+    private Integer isV23;
+
+    @ApiModelProperty(value = "24次谐波电压含有率是否超标(0:否 1:是)")
+    private Integer isV24;
+
+    @ApiModelProperty(value = "25次谐波电压含有率是否超标(0:否 1:是)")
+    private Integer isV25;
+
+    @ApiModelProperty(value = "26次谐波电压含有率是否超标(0:否 1:是)")
+    private Integer isV26;
+
+    @ApiModelProperty(value = "27次谐波电压含有率是否超标(0:否 1:是)")
+    private Integer isV27;
+
+    @ApiModelProperty(value = "28次谐波电压含有率是否超标(0:否 1:是)")
+    private Integer isV28;
+
+    @ApiModelProperty(value = "29次谐波电压含有率是否超标(0:否 1:是)")
+    private Integer isV29;
+
+    @ApiModelProperty(value = "30次谐波电压含有率是否超标(0:否 1:是)")
+    private Integer isV30;
+
+    @ApiModelProperty(value = "31次谐波电压含有率是否超标(0:否 1:是)")
+    private Integer isV31;
+
+    @ApiModelProperty(value = "32次谐波电压含有率是否超标(0:否 1:是)")
+    private Integer isV32;
+
+    @ApiModelProperty(value = "33次谐波电压含有率是否超标(0:否 1:是)")
+    private Integer isV33;
+
+    @ApiModelProperty(value = "34次谐波电压含有率是否超标(0:否 1:是)")
+    private Integer isV34;
+
+    @ApiModelProperty(value = "35次谐波电压含有率是否超标(0:否 1:是)")
+    private Integer isV35;
+
+    @ApiModelProperty(value = "36次谐波电压含有率是否超标(0:否 1:是)")
+    private Integer isV36;
+
+    @ApiModelProperty(value = "37次谐波电压含有率是否超标(0:否 1:是)")
+    private Integer isV37;
+
+    @ApiModelProperty(value = "38次谐波电压含有率是否超标(0:否 1:是)")
+    private Integer isV38;
+
+    @ApiModelProperty(value = "39次谐波电压含有率是否超标(0:否 1:是)")
+    private Integer isV39;
+
+    @ApiModelProperty(value = "40次谐波电压含有率是否超标(0:否 1:是)")
+    private Integer isV40;
+
+    @ApiModelProperty(value = "41次谐波电压含有率是否超标(0:否 1:是)")
+    private Integer isV41;
+
+    @ApiModelProperty(value = "42次谐波电压含有率是否超标(0:否 1:是)")
+    private Integer isV42;
+
+    @ApiModelProperty(value = "43次谐波电压含有率是否超标(0:否 1:是)")
+    private Integer isV43;
+
+    @ApiModelProperty(value = "44次谐波电压含有率是否超标(0:否 1:是)")
+    private Integer isV44;
+
+    @ApiModelProperty(value = "45次谐波电压含有率是否超标(0:否 1:是)")
+    private Integer isV45;
+
+    @ApiModelProperty(value = "46次谐波电压含有率是否超标(0:否 1:是)")
+    private Integer isV46;
+
+    @ApiModelProperty(value = "47次谐波电压含有率是否超标(0:否 1:是)")
+    private Integer isV47;
+
+    @ApiModelProperty(value = "48次谐波电压含有率是否超标(0:否 1:是)")
+    private Integer isV48;
+
+    @ApiModelProperty(value = "49次谐波电压含有率是否超标(0:否 1:是)")
+    private Integer isV49;
+
+    @ApiModelProperty(value = "50次谐波电压含有率是否超标(0:否 1:是)")
+    private Integer isV50;
+
+    @ApiModelProperty(value = "2次谐波电流含有率是否超标(0:否 1:是)")
+    private Integer isI2;
+
+    @ApiModelProperty(value = "3次谐波电流含有率是否超标(0:否 1:是)")
+    private Integer isI3;
+
+    @ApiModelProperty(value = "4次谐波电流含有率是否超标(0:否 1:是)")
+    private Integer isI4;
+
+    @ApiModelProperty(value = "5次谐波电流含有率是否超标(0:否 1:是)")
+    private Integer isI5;
+
+    @ApiModelProperty(value = "6次谐波电流含有率是否超标(0:否 1:是)")
+    private Integer isI6;
+
+    @ApiModelProperty(value = "7次谐波电流含有率是否超标(0:否 1:是)")
+    private Integer isI7;
+
+    @ApiModelProperty(value = "8次谐波电流含有率是否超标(0:否 1:是)")
+    private Integer isI8;
+
+    @ApiModelProperty(value = "9次谐波电流含有率是否超标(0:否 1:是)")
+    private Integer isI9;
+
+    @ApiModelProperty(value = "10次谐波电流含有率是否超标(0:否 1:是)")
+    private Integer isI10;
+
+    @ApiModelProperty(value = "11次谐波电流含有率是否超标(0:否 1:是)")
+    private Integer isI11;
+
+    @ApiModelProperty(value = "12次谐波电流含有率是否超标(0:否 1:是)")
+    private Integer isI12;
+
+    @ApiModelProperty(value = "13次谐波电流含有率是否超标(0:否 1:是)")
+    private Integer isI13;
+
+    @ApiModelProperty(value = "14次谐波电流含有率是否超标(0:否 1:是)")
+    private Integer isI14;
+
+    @ApiModelProperty(value = "15次谐波电流含有率是否超标(0:否 1:是)")
+    private Integer isI15;
+
+    @ApiModelProperty(value = "16次谐波电流含有率是否超标(0:否 1:是)")
+    private Integer isI16;
+
+    @ApiModelProperty(value = "17次谐波电流含有率是否超标(0:否 1:是)")
+    private Integer isI17;
+
+    @ApiModelProperty(value = "18次谐波电流含有率是否超标(0:否 1:是)")
+    private Integer isI18;
+
+    @ApiModelProperty(value = "19次谐波电流含有率是否超标(0:否 1:是)")
+    private Integer isI19;
+
+    @ApiModelProperty(value = "20次谐波电流含有率是否超标(0:否 1:是)")
+    private Integer isI20;
+
+    @ApiModelProperty(value = "21次谐波电流含有率是否超标(0:否 1:是)")
+    private Integer isI21;
+
+    @ApiModelProperty(value = "22次谐波电流含有率是否超标(0:否 1:是)")
+    private Integer isI22;
+
+    @ApiModelProperty(value = "23次谐波电流含有率是否超标(0:否 1:是)")
+    private Integer isI23;
+
+    @ApiModelProperty(value = "24次谐波电流含有率是否超标(0:否 1:是)")
+    private Integer isI24;
+
+    @ApiModelProperty(value = "25次谐波电流含有率是否超标(0:否 1:是)")
+    private Integer isI25;
+
+    @ApiModelProperty(value = "26次谐波电流含有率是否超标(0:否 1:是)")
+    private Integer isI26;
+
+    @ApiModelProperty(value = "27次谐波电流含有率是否超标(0:否 1:是)")
+    private Integer isI27;
+
+    @ApiModelProperty(value = "28次谐波电流含有率是否超标(0:否 1:是)")
+    private Integer isI28;
+
+    @ApiModelProperty(value = "29次谐波电流含有率是否超标(0:否 1:是)")
+    private Integer isI29;
+
+    @ApiModelProperty(value = "30次谐波电流含有率是否超标(0:否 1:是)")
+    private Integer isI30;
+
+    @ApiModelProperty(value = "31次谐波电流含有率是否超标(0:否 1:是)")
+    private Integer isI31;
+
+    @ApiModelProperty(value = "32次谐波电流含有率是否超标(0:否 1:是)")
+    private Integer isI32;
+
+    @ApiModelProperty(value = "33次谐波电流含有率是否超标(0:否 1:是)")
+    private Integer isI33;
+
+    @ApiModelProperty(value = "34次谐波电流含有率是否超标(0:否 1:是)")
+    private Integer isI34;
+
+    @ApiModelProperty(value = "35次谐波电流含有率是否超标(0:否 1:是)")
+    private Integer isI35;
+
+    @ApiModelProperty(value = "36次谐波电流含有率是否超标(0:否 1:是)")
+    private Integer isI36;
+
+    @ApiModelProperty(value = "37次谐波电流含有率是否超标(0:否 1:是)")
+    private Integer isI37;
+
+    @ApiModelProperty(value = "38次谐波电流含有率是否超标(0:否 1:是)")
+    private Integer isI38;
+
+    @ApiModelProperty(value = "39次谐波电流含有率是否超标(0:否 1:是)")
+    private Integer isI39;
+
+    @ApiModelProperty(value = "40次谐波电流含有率是否超标(0:否 1:是)")
+    private Integer isI40;
+
+    @ApiModelProperty(value = "41次谐波电流含有率是否超标(0:否 1:是)")
+    private Integer isI41;
+
+    @ApiModelProperty(value = "42次谐波电流含有率是否超标(0:否 1:是)")
+    private Integer isI42;
+
+    @ApiModelProperty(value = "43次谐波电流含有率是否超标(0:否 1:是)")
+    private Integer isI43;
+
+    @ApiModelProperty(value = "44次谐波电流含有率是否超标(0:否 1:是)")
+    private Integer isI44;
+
+    @ApiModelProperty(value = "45次谐波电流含有率是否超标(0:否 1:是)")
+    private Integer isI45;
+
+    @ApiModelProperty(value = "46次谐波电流含有率是否超标(0:否 1:是)")
+    private Integer isI46;
+
+    @ApiModelProperty(value = "47次谐波电流含有率是否超标(0:否 1:是)")
+    private Integer isI47;
+
+    @ApiModelProperty(value = "48次谐波电流含有率是否超标(0:否 1:是)")
+    private Integer isI48;
+
+    @ApiModelProperty(value = "49次谐波电流含有率是否超标(0:否 1:是)")
+    private Integer isI49;
+
+    @ApiModelProperty(value = "50次谐波电流含有率是否超标(0:否 1:是)")
+    private Integer isI50;
+
+    @ApiModelProperty(value = "三相电压不平衡度是否超标(0:否 1:是)")
+    private Integer isUnbalance;
+
+    @ApiModelProperty(value = "负序电流是否超标(0:否 1:是)")
+    private Integer isINeg;
+
+    @ApiModelProperty(value = "三相电压不平衡度超标次数")
+    private Integer unbalanceTimes;
+
+    @ApiModelProperty(value = "负序电流超标次数")
+    private Integer iNegTimes;
+
+
+}
diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpPartHarmonicDetailM.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpPartHarmonicDetailM.java
new file mode 100644
index 000000000..8cf5e73e2
--- /dev/null
+++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpPartHarmonicDetailM.java
@@ -0,0 +1,361 @@
+package com.njcn.harmonic.pojo.po;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import java.time.LocalDate;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.io.Serializable;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author rui.wu
+ * @since 2022-10-24
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@TableName("r_mp_part_harmonic_detail_m")
+@ApiModel(value="RMpPartHarmonicDetailM对象", description="")
+public class RMpPartHarmonicDetailM implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "监测点ID")
+    @TableId(value = "measurement_point_id", type = IdType.ASSIGN_ID)
+    private String measurementPointId;
+
+    @ApiModelProperty(value = "生成数据的时间,每月统计一次")
+    private LocalDate dataDate;
+
+    @ApiModelProperty(value = "当月超标天数")
+    private Integer measurementOverDay;
+
+    @ApiModelProperty(value = "频率偏差超标天数")
+    private Integer freqOverDay;
+
+    @ApiModelProperty(value = "电压上偏差超标天数")
+    private Integer vDevUpOverDay;
+
+    @ApiModelProperty(value = "电压下偏差超标天数")
+    private Integer vDevLowOverDay;
+
+    @ApiModelProperty(value = "电压偏差超标天数")
+    private Integer vDevOverDay;
+
+    @ApiModelProperty(value = "电压总谐波畸变率超标天数")
+    private Integer vThdOverDay;
+
+    @ApiModelProperty(value = "谐波电压超标天数")
+    private Integer vOverDay;
+
+    @ApiModelProperty(value = "谐波电流超标天数")
+    private Integer iOverDay;
+
+    @ApiModelProperty(value = "2次谐波电压含有率超标天数")
+    private Integer v2OverDay;
+
+    @ApiModelProperty(value = "3次谐波电压含有率超标天数")
+    private Integer v3OverDay;
+
+    @ApiModelProperty(value = "4次谐波电压含有率超标天数")
+    private Integer v4OverDay;
+
+    @ApiModelProperty(value = "5次谐波电压含有率超标天数")
+    private Integer v5OverDay;
+
+    @ApiModelProperty(value = "6次谐波电压含有率超标天数")
+    private Integer v6OverDay;
+
+    @ApiModelProperty(value = "7次谐波电压含有率超标天数")
+    private Integer v7OverDay;
+
+    @ApiModelProperty(value = "8次谐波电压含有率超标天数")
+    private Integer v8OverDay;
+
+    @ApiModelProperty(value = "9次谐波电压含有率超标天数")
+    private Integer v9OverDay;
+
+    @ApiModelProperty(value = "10次谐波电压含有率超标天数")
+    private Integer v10OverDay;
+
+    @ApiModelProperty(value = "11次谐波电压含有率超标天数")
+    private Integer v11OverDay;
+
+    @ApiModelProperty(value = "12次谐波电压含有率超标天数")
+    private Integer v12OverDay;
+
+    @ApiModelProperty(value = "13次谐波电压含有率超标天数")
+    private Integer v13OverDay;
+
+    @ApiModelProperty(value = "14次谐波电压含有率超标天数")
+    private Integer v14OverDay;
+
+    @ApiModelProperty(value = "15次谐波电压含有率超标天数")
+    private Integer v15OverDay;
+
+    @ApiModelProperty(value = "16次谐波电压含有率超标天数")
+    private Integer v16OverDay;
+
+    @ApiModelProperty(value = "17次谐波电压含有率超标天数")
+    private Integer v17OverDay;
+
+    @ApiModelProperty(value = "18次谐波电压含有率超标天数")
+    private Integer v18OverDay;
+
+    @ApiModelProperty(value = "19次谐波电压含有率超标天数")
+    private Integer v19OverDay;
+
+    @ApiModelProperty(value = "20次谐波电压含有率超标天数")
+    private Integer v20OverDay;
+
+    @ApiModelProperty(value = "21次谐波电压含有率超标天数")
+    private Integer v21OverDay;
+
+    @ApiModelProperty(value = "22次谐波电压含有率超标天数")
+    private Integer v22OverDay;
+
+    @ApiModelProperty(value = "23次谐波电压含有率超标天数")
+    private Integer v23OverDay;
+
+    @ApiModelProperty(value = "24次谐波电压含有率超标天数")
+    private Integer v24OverDay;
+
+    @ApiModelProperty(value = "25次谐波电压含有率超标天数")
+    private Integer v25OverDay;
+
+    @ApiModelProperty(value = "26次谐波电压含有率超标天数")
+    private Integer v26OverDay;
+
+    @ApiModelProperty(value = "27次谐波电压含有率超标天数")
+    private Integer v27OverDay;
+
+    @ApiModelProperty(value = "28次谐波电压含有率超标天数")
+    private Integer v28OverDay;
+
+    @ApiModelProperty(value = "29次谐波电压含有率超标天数")
+    private Integer v29OverDay;
+
+    @ApiModelProperty(value = "30次谐波电压含有率超标天数")
+    private Integer v30OverDay;
+
+    @ApiModelProperty(value = "31次谐波电压含有率超标天数")
+    private Integer v31OverDay;
+
+    @ApiModelProperty(value = "32次谐波电压含有率超标天数")
+    private Integer v32OverDay;
+
+    @ApiModelProperty(value = "33次谐波电压含有率超标天数")
+    private Integer v33OverDay;
+
+    @ApiModelProperty(value = "34次谐波电压含有率超标天数")
+    private Integer v34OverDay;
+
+    @ApiModelProperty(value = "35次谐波电压含有率超标天数")
+    private Integer v35OverDay;
+
+    @ApiModelProperty(value = "36次谐波电压含有率超标天数")
+    private Integer v36OverDay;
+
+    @ApiModelProperty(value = "37次谐波电压含有率超标天数")
+    private Integer v37OverDay;
+
+    @ApiModelProperty(value = "38次谐波电压含有率超标天数")
+    private Integer v38OverDay;
+
+    @ApiModelProperty(value = "39次谐波电压含有率超标天数")
+    private Integer v39OverDay;
+
+    @ApiModelProperty(value = "40次谐波电压含有率超标天数")
+    private Integer v40OverDay;
+
+    @ApiModelProperty(value = "41次谐波电压含有率超标天数")
+    private Integer v41OverDay;
+
+    @ApiModelProperty(value = "42次谐波电压含有率超标天数")
+    private Integer v42OverDay;
+
+    @ApiModelProperty(value = "43次谐波电压含有率超标天数")
+    private Integer v43OverDay;
+
+    @ApiModelProperty(value = "44次谐波电压含有率超标天数")
+    private Integer v44OverDay;
+
+    @ApiModelProperty(value = "45次谐波电压含有率超标天数")
+    private Integer v45OverDay;
+
+    @ApiModelProperty(value = "46次谐波电压含有率超标天数")
+    private Integer v46OverDay;
+
+    @ApiModelProperty(value = "47次谐波电压含有率超标天数")
+    private Integer v47OverDay;
+
+    @ApiModelProperty(value = "48次谐波电压含有率超标天数")
+    private Integer v48OverDay;
+
+    @ApiModelProperty(value = "49次谐波电压含有率超标天数")
+    private Integer v49OverDay;
+
+    @ApiModelProperty(value = "50次谐波电压含有率超标天数")
+    private Integer v50OverDay;
+
+    @ApiModelProperty(value = "2次谐波电流含有率超标天数")
+    private Integer i2OverDay;
+
+    @ApiModelProperty(value = "3次谐波电流含有率超标天数")
+    private Integer i3OverDay;
+
+    @ApiModelProperty(value = "4次谐波电流含有率超标天数")
+    private Integer i4OverDay;
+
+    @ApiModelProperty(value = "5次谐波电流含有率超标天数")
+    private Integer i5OverDay;
+
+    @ApiModelProperty(value = "6次谐波电流含有率超标天数")
+    private Integer i6OverDay;
+
+    @ApiModelProperty(value = "7次谐波电流含有率超标天数")
+    private Integer i7OverDay;
+
+    @ApiModelProperty(value = "8次谐波电流含有率超标天数")
+    private Integer i8OverDay;
+
+    @ApiModelProperty(value = "9次谐波电流含有率超标天数")
+    private Integer i9OverDay;
+
+    @ApiModelProperty(value = "10次谐波电流含有率超标天数")
+    private Integer i10OverDay;
+
+    @ApiModelProperty(value = "11次谐波电流含有率超标天数")
+    private Integer i11OverDay;
+
+    @ApiModelProperty(value = "12次谐波电流含有率超标天数")
+    private Integer i12OverDay;
+
+    @ApiModelProperty(value = "13次谐波电流含有率超标天数")
+    private Integer i13OverDay;
+
+    @ApiModelProperty(value = "14次谐波电流含有率超标天数")
+    private Integer i14OverDay;
+
+    @ApiModelProperty(value = "15次谐波电流含有率超标天数")
+    private Integer i15OverDay;
+
+    @ApiModelProperty(value = "16次谐波电流含有率超标天数")
+    private Integer i16OverDay;
+
+    @ApiModelProperty(value = "17次谐波电流含有率超标天数")
+    private Integer i17OverDay;
+
+    @ApiModelProperty(value = "18次谐波电流含有率超标天数")
+    private Integer i18OverDay;
+
+    @ApiModelProperty(value = "19次谐波电流含有率超标天数")
+    private Integer i19OverDay;
+
+    @ApiModelProperty(value = "20次谐波电流含有率超标天数")
+    private Integer i20OverDay;
+
+    @ApiModelProperty(value = "21次谐波电流含有率超标天数")
+    private Integer i21OverDay;
+
+    @ApiModelProperty(value = "22次谐波电流含有率超标天数")
+    private Integer i22OverDay;
+
+    @ApiModelProperty(value = "23次谐波电流含有率超标天数")
+    private Integer i23OverDay;
+
+    @ApiModelProperty(value = "24次谐波电流含有率超标天数")
+    private Integer i24OverDay;
+
+    @ApiModelProperty(value = "25次谐波电流含有率超标天数")
+    private Integer i25OverDay;
+
+    @ApiModelProperty(value = "26次谐波电流含有率超标天数")
+    private Integer i26OverDay;
+
+    @ApiModelProperty(value = "27次谐波电流含有率超标天数")
+    private Integer i27OverDay;
+
+    @ApiModelProperty(value = "28次谐波电流含有率超标天数")
+    private Integer i28OverDay;
+
+    @ApiModelProperty(value = "29次谐波电流含有率超标天数")
+    private Integer i29OverDay;
+
+    @ApiModelProperty(value = "30次谐波电流含有率超标天数")
+    private Integer i30OverDay;
+
+    @ApiModelProperty(value = "31次谐波电流含有率超标天数")
+    private Integer i31OverDay;
+
+    @ApiModelProperty(value = "32次谐波电流含有率超标天数")
+    private Integer i32OverDay;
+
+    @ApiModelProperty(value = "33次谐波电流含有率超标天数")
+    private Integer i33OverDay;
+
+    @ApiModelProperty(value = "34次谐波电流含有率超标天数")
+    private Integer i34OverDay;
+
+    @ApiModelProperty(value = "35次谐波电流含有率超标天数")
+    private Integer i35OverDay;
+
+    @ApiModelProperty(value = "36次谐波电流含有率超标天数")
+    private Integer i36OverDay;
+
+    @ApiModelProperty(value = "37次谐波电流含有率超标天数")
+    private Integer i37OverDay;
+
+    @ApiModelProperty(value = "38次谐波电流含有率超标天数")
+    private Integer i38OverDay;
+
+    @ApiModelProperty(value = "39次谐波电流含有率超标天数")
+    private Integer i39OverDay;
+
+    @ApiModelProperty(value = "40次谐波电流含有率超标天数")
+    private Integer i40OverDay;
+
+    @ApiModelProperty(value = "41次谐波电流含有率超标天数")
+    private Integer i41OverDay;
+
+    @ApiModelProperty(value = "42次谐波电流含有率超标天数")
+    private Integer i42OverDay;
+
+    @ApiModelProperty(value = "43次谐波电流含有率超标天数")
+    private Integer i43OverDay;
+
+    @ApiModelProperty(value = "44次谐波电流含有率超标天数")
+    private Integer i44OverDay;
+
+    @ApiModelProperty(value = "45次谐波电流含有率超标天数")
+    private Integer i45OverDay;
+
+    @ApiModelProperty(value = "46次谐波电流含有率超标天数")
+    private Integer i46OverDay;
+
+    @ApiModelProperty(value = "47次谐波电流含有率超标天数")
+    private Integer i47OverDay;
+
+    @ApiModelProperty(value = "48次谐波电流含有率超标天数")
+    private Integer i48OverDay;
+
+    @ApiModelProperty(value = "49次谐波电流含有率超标天数")
+    private Integer i49OverDay;
+
+    @ApiModelProperty(value = "50次谐波电流含有率超标天数")
+    private Integer i50OverDay;
+
+    @ApiModelProperty(value = "三相电压不平衡度超标天数")
+    private Integer unbalanceOverDay;
+
+    @ApiModelProperty(value = "负序电流超标天数")
+    private Integer iNegOverDay;
+
+
+}
diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpPassRateM.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpPassRateM.java
new file mode 100644
index 000000000..6a88e1312
--- /dev/null
+++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpPassRateM.java
@@ -0,0 +1,46 @@
+package com.njcn.harmonic.pojo.po;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import java.time.LocalDate;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.io.Serializable;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author rui.wu
+ * @since 2022-10-24
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@TableName("r_mp_pass_rate_m")
+@ApiModel(value="RMpPassRateM对象", description="")
+public class RMpPassRateM implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "监测点ID")
+    @TableId(value = "measurement_point_id", type = IdType.ASSIGN_ID)
+    private String measurementPointId;
+
+    @ApiModelProperty(value = "生成数据的时间,每月统计一次")
+    private LocalDate dataDate;
+
+    @ApiModelProperty(value = "频率偏差合格率")
+    private Float freqPassRate;
+
+    @ApiModelProperty(value = "电压偏差合格率")
+    private Float vDevPassRate;
+
+    @ApiModelProperty(value = "闪变合格率")
+    private Float flickerPassRate;
+
+
+}
diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpPassRateQ.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpPassRateQ.java
new file mode 100644
index 000000000..5e1206950
--- /dev/null
+++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpPassRateQ.java
@@ -0,0 +1,46 @@
+package com.njcn.harmonic.pojo.po;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import java.time.LocalDate;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.io.Serializable;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author rui.wu
+ * @since 2022-10-24
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@TableName("r_mp_pass_rate_q")
+@ApiModel(value="RMpPassRateQ对象", description="")
+public class RMpPassRateQ implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "监测点ID")
+    @TableId(value = "measurement_point_id", type = IdType.ASSIGN_ID)
+    private String measurementPointId;
+
+    @ApiModelProperty(value = "生成数据的时间,每季统计一次")
+    private LocalDate dataDate;
+
+    @ApiModelProperty(value = "频率偏差合格率")
+    private Float freqPassRate;
+
+    @ApiModelProperty(value = "电压偏差合格率")
+    private Float vDevPassRate;
+
+    @ApiModelProperty(value = "闪变合格率")
+    private Float flickerPassRate;
+
+
+}
diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpPassRateY.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpPassRateY.java
new file mode 100644
index 000000000..57482b04f
--- /dev/null
+++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpPassRateY.java
@@ -0,0 +1,46 @@
+package com.njcn.harmonic.pojo.po;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import java.time.LocalDate;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.io.Serializable;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author rui.wu
+ * @since 2022-10-24
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@TableName("r_mp_pass_rate_y")
+@ApiModel(value="RMpPassRateY对象", description="")
+public class RMpPassRateY implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "监测点ID")
+    @TableId(value = "measurement_point_id", type = IdType.ASSIGN_ID)
+    private String measurementPointId;
+
+    @ApiModelProperty(value = "生成数据的时间,每年统计一次")
+    private LocalDate dataDate;
+
+    @ApiModelProperty(value = "频率偏差合格率")
+    private Float freqPassRate;
+
+    @ApiModelProperty(value = "电压偏差合格率")
+    private Float vDevPassRate;
+
+    @ApiModelProperty(value = "闪变合格率")
+    private Float flickerPassRate;
+
+
+}
diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpSurplusHarmonicDetailD.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpSurplusHarmonicDetailD.java
new file mode 100644
index 000000000..b0cf41b74
--- /dev/null
+++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpSurplusHarmonicDetailD.java
@@ -0,0 +1,199 @@
+package com.njcn.harmonic.pojo.po;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import java.time.LocalDate;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.io.Serializable;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author rui.wu
+ * @since 2022-10-24
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@TableName("r_mp_surplus_harmonic_detail_d")
+@ApiModel(value="RMpSurplusHarmonicDetailD对象", description="")
+public class RMpSurplusHarmonicDetailD implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "监测点ID")
+    @TableId(value = "measurement_point_id", type = IdType.ASSIGN_ID)
+    private String measurementPointId;
+
+    @ApiModelProperty(value = "生成数据的时间,每月统计一次")
+    private LocalDate dataDate;
+
+    @ApiModelProperty(value = "闪变发生次数")
+    private Integer flickerTimes;
+
+    @ApiModelProperty(value = "闪变是否超标(0:否 1:是)")
+    private Integer isFlicker;
+
+    @ApiModelProperty(value = "间谐波电压超标次数")
+    private Integer inuharmTimes;
+
+    @ApiModelProperty(value = "间谐波电压是否超标(0:否 1:是)")
+    private Integer isInuharm;
+
+    @ApiModelProperty(value = "0.5次谐波电流含有率是否超标(0:否 1:是)")
+    private Integer isInuharm1;
+
+    @ApiModelProperty(value = "1.5次谐波电流含有率是否超标(0:否 1:是)")
+    private Integer isInuharm2;
+
+    @ApiModelProperty(value = "2.5次谐波电流含有率是否超标(0:否 1:是)")
+    private Integer isInuharm3;
+
+    @ApiModelProperty(value = "3.5次谐波电流含有率是否超标(0:否 1:是)")
+    private Integer isInuharm4;
+
+    @ApiModelProperty(value = "4.5次谐波电流含有率是否超标(0:否 1:是)")
+    private Integer isInuharm5;
+
+    @ApiModelProperty(value = "5.5次谐波电流含有率是否超标(0:否 1:是)")
+    private Integer isInuharm6;
+
+    @ApiModelProperty(value = "6.5次谐波电流含有率是否超标(0:否 1:是)")
+    private Integer isInuharm7;
+
+    @ApiModelProperty(value = "7.5次谐波电流含有率是否超标(0:否 1:是)")
+    private Integer isInuharm8;
+
+    @ApiModelProperty(value = "8.5次谐波电流含有率是否超标(0:否 1:是)")
+    private Integer isInuharm9;
+
+    @ApiModelProperty(value = "9.5次谐波电流含有率是否超标(0:否 1:是)")
+    private Integer isInuharm10;
+
+    @ApiModelProperty(value = "10.5次谐波电流含有率是否超标(0:否 1:是)")
+    private Integer isInuharm11;
+
+    @ApiModelProperty(value = "11.5次谐波电流含有率是否超标(0:否 1:是)")
+    private Integer isInuharm12;
+
+    @ApiModelProperty(value = "12.5次谐波电流含有率是否超标(0:否 1:是)")
+    private Integer isInuharm13;
+
+    @ApiModelProperty(value = "13.5次谐波电流含有率是否超标(0:否 1:是)")
+    private Integer isInuharm14;
+
+    @ApiModelProperty(value = "14.5次谐波电流含有率是否超标(0:否 1:是)")
+    private Integer isInuharm15;
+
+    @ApiModelProperty(value = "15.5次谐波电流含有率是否超标(0:否 1:是)")
+    private Integer isInuharm16;
+
+    @ApiModelProperty(value = "16.5次谐波电流含有率是否超标(0:否 1:是)")
+    private Integer isInuharm17;
+
+    @ApiModelProperty(value = "17.5次谐波电流含有率是否超标(0:否 1:是)")
+    private Integer isInuharm18;
+
+    @ApiModelProperty(value = "18.5次谐波电流含有率是否超标(0:否 1:是)")
+    private Integer isInuharm19;
+
+    @ApiModelProperty(value = "19.5次谐波电流含有率是否超标(0:否 1:是)")
+    private Integer isInuharm20;
+
+    @ApiModelProperty(value = "20.5次谐波电流含有率是否超标(0:否 1:是)")
+    private Integer isInuharm21;
+
+    @ApiModelProperty(value = "21.5次谐波电流含有率是否超标(0:否 1:是)")
+    private Integer isInuharm22;
+
+    @ApiModelProperty(value = "22.5次谐波电流含有率是否超标(0:否 1:是)")
+    private Integer isInuharm23;
+
+    @ApiModelProperty(value = "23.5次谐波电流含有率是否超标(0:否 1:是)")
+    private Integer isInuharm24;
+
+    @ApiModelProperty(value = "24.5次谐波电流含有率是否超标(0:否 1:是)")
+    private Integer isInuharm25;
+
+    @ApiModelProperty(value = "25.5次谐波电流含有率是否超标(0:否 1:是)")
+    private Integer isInuharm26;
+
+    @ApiModelProperty(value = "26.5次谐波电流含有率是否超标(0:否 1:是)")
+    private Integer isInuharm27;
+
+    @ApiModelProperty(value = "27.5次谐波电流含有率是否超标(0:否 1:是)")
+    private Integer isInuharm28;
+
+    @ApiModelProperty(value = "28.5次谐波电流含有率是否超标(0:否 1:是)")
+    private Integer isInuharm29;
+
+    @ApiModelProperty(value = "29.5次谐波电流含有率是否超标(0:否 1:是)")
+    private Integer isInuharm30;
+
+    @ApiModelProperty(value = "30.5次谐波电流含有率是否超标(0:否 1:是)")
+    private Integer isInuharm31;
+
+    @ApiModelProperty(value = "31.5次谐波电流含有率是否超标(0:否 1:是)")
+    private Integer isInuharm32;
+
+    @ApiModelProperty(value = "32.5次谐波电流含有率是否超标(0:否 1:是)")
+    private Integer isInuharm33;
+
+    @ApiModelProperty(value = "33.5次谐波电流含有率是否超标(0:否 1:是)")
+    private Integer isInuharm34;
+
+    @ApiModelProperty(value = "34.5次谐波电流含有率是否超标(0:否 1:是)")
+    private Integer isInuharm35;
+
+    @ApiModelProperty(value = "35.5次谐波电流含有率是否超标(0:否 1:是)")
+    private Integer isInuharm36;
+
+    @ApiModelProperty(value = "36.5次谐波电流含有率是否超标(0:否 1:是)")
+    private Integer isInuharm37;
+
+    @ApiModelProperty(value = "37.5次谐波电流含有率是否超标(0:否 1:是)")
+    private Integer isInuharm38;
+
+    @ApiModelProperty(value = "38.5次谐波电流含有率是否超标(0:否 1:是)")
+    private Integer isInuharm39;
+
+    @ApiModelProperty(value = "39.5次谐波电流含有率是否超标(0:否 1:是)")
+    private Integer isInuharm40;
+
+    @ApiModelProperty(value = "40.5次谐波电流含有率是否超标(0:否 1:是)")
+    private Integer isInuharm41;
+
+    @ApiModelProperty(value = "41.5次谐波电流含有率是否超标(0:否 1:是)")
+    private Integer isInuharm42;
+
+    @ApiModelProperty(value = "42.5次谐波电流含有率是否超标(0:否 1:是)")
+    private Integer isInuharm43;
+
+    @ApiModelProperty(value = "43.5次谐波电流含有率是否超标(0:否 1:是)")
+    private Integer isInuharm44;
+
+    @ApiModelProperty(value = "44.5次谐波电流含有率是否超标(0:否 1:是)")
+    private Integer isInuharm45;
+
+    @ApiModelProperty(value = "45.5次谐波电流含有率是否超标(0:否 1:是)")
+    private Integer isInuharm46;
+
+    @ApiModelProperty(value = "46.5次谐波电流含有率是否超标(0:否 1:是)")
+    private Integer isInuharm47;
+
+    @ApiModelProperty(value = "47.5次谐波电流含有率是否超标(0:否 1:是)")
+    private Integer isInuharm48;
+
+    @ApiModelProperty(value = "48.5次谐波电流含有率是否超标(0:否 1:是)")
+    private Integer isInuharm49;
+
+    @ApiModelProperty(value = "49.5次谐波电流含有率是否超标(0:否 1:是)")
+    private Integer isInuharm50;
+
+
+}
diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpSurplusHarmonicDetailM.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpSurplusHarmonicDetailM.java
new file mode 100644
index 000000000..f89784c4e
--- /dev/null
+++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpSurplusHarmonicDetailM.java
@@ -0,0 +1,193 @@
+package com.njcn.harmonic.pojo.po;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import java.time.LocalDate;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.io.Serializable;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author rui.wu
+ * @since 2022-10-24
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@TableName("r_mp_surplus_harmonic_detail_m")
+@ApiModel(value="RMpSurplusHarmonicDetailM对象", description="")
+public class RMpSurplusHarmonicDetailM implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "监测点ID")
+    @TableId(value = "measurement_point_id", type = IdType.ASSIGN_ID)
+    private String measurementPointId;
+
+    @ApiModelProperty(value = "生成数据的时间,每月统计一次")
+    private LocalDate dataDate;
+
+    @ApiModelProperty(value = "间谐波电压超标天数")
+    private Integer inuharmOverDay;
+
+    @ApiModelProperty(value = "0.5次间谐波电压含有率超标天数")
+    private Integer inuharm1OverDay;
+
+    @ApiModelProperty(value = "1.5次间谐波电压含有率超标天数")
+    private Integer inuharm2OverDay;
+
+    @ApiModelProperty(value = "2.5次间谐波电压含有率超标天数")
+    private Integer inuharm3OverDay;
+
+    @ApiModelProperty(value = "3.5次间谐波电压含有率超标天数")
+    private Integer inuharm4OverDay;
+
+    @ApiModelProperty(value = "4.5次间谐波电压含有率超标天数")
+    private Integer inuharm5OverDay;
+
+    @ApiModelProperty(value = "5.5次间谐波电压含有率超标天数")
+    private Integer inuharm6OverDay;
+
+    @ApiModelProperty(value = "6.5次间谐波电压含有率超标天数")
+    private Integer inuharm7OverDay;
+
+    @ApiModelProperty(value = "7.5次间谐波电压含有率超标天数")
+    private Integer inuharm8OverDay;
+
+    @ApiModelProperty(value = "8.5次间谐波电压含有率超标天数")
+    private Integer inuharm9OverDay;
+
+    @ApiModelProperty(value = "9.5次间谐波电压含有率超标天数")
+    private Integer inuharm10OverDay;
+
+    @ApiModelProperty(value = "10.5次间谐波电压含有率超标天数")
+    private Integer inuharm11OverDay;
+
+    @ApiModelProperty(value = "11.5次间谐波电压含有率超标天数")
+    private Integer inuharm12OverDay;
+
+    @ApiModelProperty(value = "12.5次间谐波电压含有率超标天数")
+    private Integer inuharm13OverDay;
+
+    @ApiModelProperty(value = "13.5次间谐波电压含有率超标天数")
+    private Integer inuharm14OverDay;
+
+    @ApiModelProperty(value = "14.5次间谐波电压含有率超标天数")
+    private Integer inuharm15OverDay;
+
+    @ApiModelProperty(value = "15.5次间谐波电压含有率超标天数")
+    private Integer inuharm16OverDay;
+
+    @ApiModelProperty(value = "16.5次间谐波电压含有率超标天数")
+    private Integer inuharm17OverDay;
+
+    @ApiModelProperty(value = "17.5次间谐波电压含有率超标天数")
+    private Integer inuharm18OverDay;
+
+    @ApiModelProperty(value = "18.5次间谐波电压含有率超标天数")
+    private Integer inuharm19OverDay;
+
+    @ApiModelProperty(value = "19.5次间谐波电压含有率超标天数")
+    private Integer inuharm20OverDay;
+
+    @ApiModelProperty(value = "20.5次间谐波电压含有率超标天数")
+    private Integer inuharm21OverDay;
+
+    @ApiModelProperty(value = "21.5次间谐波电压含有率超标天数")
+    private Integer inuharm22OverDay;
+
+    @ApiModelProperty(value = "22.5次间谐波电压含有率超标天数")
+    private Integer inuharm23OverDay;
+
+    @ApiModelProperty(value = "23.5次间谐波电压含有率超标天数")
+    private Integer inuharm24OverDay;
+
+    @ApiModelProperty(value = "24.5次间谐波电压含有率超标天数")
+    private Integer inuharm25OverDay;
+
+    @ApiModelProperty(value = "25.5次间谐波电压含有率超标天数")
+    private Integer inuharm26OverDay;
+
+    @ApiModelProperty(value = "26.5次间谐波电压含有率超标天数")
+    private Integer inuharm27OverDay;
+
+    @ApiModelProperty(value = "27.5次间谐波电压含有率超标天数")
+    private Integer inuharm28OverDay;
+
+    @ApiModelProperty(value = "28.5次间谐波电压含有率超标天数")
+    private Integer inuharm29OverDay;
+
+    @ApiModelProperty(value = "29.5次间谐波电压含有率超标天数")
+    private Integer inuharm30OverDay;
+
+    @ApiModelProperty(value = "30.5次间谐波电压含有率超标天数")
+    private Integer inuharm31OverDay;
+
+    @ApiModelProperty(value = "31.5次间谐波电压含有率超标天数")
+    private Integer inuharm32OverDay;
+
+    @ApiModelProperty(value = "32.5次间谐波电压含有率超标天数")
+    private Integer inuharm33OverDay;
+
+    @ApiModelProperty(value = "33.5次间谐波电压含有率超标天数")
+    private Integer inuharm34OverDay;
+
+    @ApiModelProperty(value = "34.5次间谐波电压含有率超标天数")
+    private Integer inuharm35OverDay;
+
+    @ApiModelProperty(value = "35.5次间谐波电压含有率超标天数")
+    private Integer inuharm36OverDay;
+
+    @ApiModelProperty(value = "36.5次间谐波电压含有率超标天数")
+    private Integer inuharm37OverDay;
+
+    @ApiModelProperty(value = "37.5次间谐波电压含有率超标天数")
+    private Integer inuharm38OverDay;
+
+    @ApiModelProperty(value = "38.5次间谐波电压含有率超标天数")
+    private Integer inuharm39OverDay;
+
+    @ApiModelProperty(value = "39.5次间谐波电压含有率超标天数")
+    private Integer inuharm40OverDay;
+
+    @ApiModelProperty(value = "40.5次间谐波电压含有率超标天数")
+    private Integer inuharm41OverDay;
+
+    @ApiModelProperty(value = "41.5次间谐波电压含有率超标天数")
+    private Integer inuharm42OverDay;
+
+    @ApiModelProperty(value = "42.5次间谐波电压含有率超标天数")
+    private Integer inuharm43OverDay;
+
+    @ApiModelProperty(value = "43.5次间谐波电压含有率超标天数")
+    private Integer inuharm44OverDay;
+
+    @ApiModelProperty(value = "44.5次间谐波电压含有率超标天数")
+    private Integer inuharm45OverDay;
+
+    @ApiModelProperty(value = "45.5次间谐波电压含有率超标天数")
+    private Integer inuharm46OverDay;
+
+    @ApiModelProperty(value = "46.5次间谐波电压含有率超标天数")
+    private Integer inuharm47OverDay;
+
+    @ApiModelProperty(value = "47.5次间谐波电压含有率超标天数")
+    private Integer inuharm48OverDay;
+
+    @ApiModelProperty(value = "48.5次间谐波电压含有率超标天数")
+    private Integer inuharm49OverDay;
+
+    @ApiModelProperty(value = "49.5次间谐波电压含有率超标天数")
+    private Integer inuharm50OverDay;
+
+    @ApiModelProperty(value = "闪变超标天数")
+    private Integer flickerOverDay;
+
+
+}
diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatAbnormalD.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatAbnormalD.java
new file mode 100644
index 000000000..a7e8d5d49
--- /dev/null
+++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatAbnormalD.java
@@ -0,0 +1,33 @@
+package com.njcn.harmonic.pojo.po;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * (RStatAbnormalD)实体类
+ *
+ * @author qijian
+ * @since 2022-10-27 14:49:43
+ */
+@Data
+@TableName(value = "r_stat_abnormal_d")
+public class RStatAbnormalD implements Serializable {
+    private static final long serialVersionUID = 130540916944391303L;
+    /**
+     * 时间
+     */
+    private Date dataDate;
+    /**
+     * 监测点ID
+     */
+    private String measurementPointId;
+    /**
+     * 数据是否异常（0异常，1正常）
+     */
+    private Integer valueAlarm;
+
+}
+
diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatHarmonicD.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatHarmonicD.java
new file mode 100644
index 000000000..f988dcb58
--- /dev/null
+++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatHarmonicD.java
@@ -0,0 +1,53 @@
+package com.njcn.harmonic.pojo.po;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+import java.time.LocalDate;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author rui.wu
+ * @since 2022-10-12
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@TableName("r_stat_harmonic_d")
+@ApiModel(value="RStatHarmonicD对象", description="")
+public class RStatHarmonicD implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "单位ID")
+    @TableId(value = "org_no", type = IdType.ASSIGN_ID)
+    private String orgNo;
+
+    @ApiModelProperty(value = "生成数据的时间,每日统计一次")
+    private LocalDate dataDate;
+
+    @ApiModelProperty(value = "监测点类别ID、监测对象类型ID")
+    private String measurementTypeClass;
+
+    @ApiModelProperty(value = "稳态指标类型Id，字典表ID")
+    private String harmonicType;
+
+    @ApiModelProperty(value = "超标监测点数")
+    private Integer overLimitMeasurement;
+
+    @ApiModelProperty(value = "超标监测点数占比")
+    private Float overLimitMeasurementRatio;
+
+    @ApiModelProperty(value = "数据类型,字典表（01：主网测点  02：配网测点）")
+    private String dataType;
+
+
+}
diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatHarmonicM.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatHarmonicM.java
new file mode 100644
index 000000000..7377360af
--- /dev/null
+++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatHarmonicM.java
@@ -0,0 +1,59 @@
+package com.njcn.harmonic.pojo.po;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author rui.wu
+ * @since 2022-10-09
+ */
+@Data
+@TableName("r_stat_harmonic_m")
+@ApiModel(value="RStatHarmonicM对象", description="")
+public class RStatHarmonicM  {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "单位ID")
+    @TableId(value = "org_no", type = IdType.ASSIGN_ID)
+    private String orgNo;
+
+    @ApiModelProperty(value = "生成数据的时间,每月统计一次")
+    private Date dataDate;
+
+    @ApiModelProperty(value = "监测点类别ID、监测对象类型ID")
+    private String measurementTypeClass;
+
+    @ApiModelProperty(value = "稳态指标类型Id，字典表ID")
+    private String harmonicType;
+
+    @ApiModelProperty(value = "日均超标监测点数（根据 日表的超标监测点数 取平均值）")
+    private Integer overLimitMeasurementAverage;
+
+    @ApiModelProperty(value = "累计超标监测点数（监测点指标统计明细日表 统计）")
+    private Integer overLimitMeasurementAccrued;
+
+    @ApiModelProperty(value = "累计超标天数（根据 日表的超标监测点数 求和）")
+    private Integer overDay;
+
+    @ApiModelProperty(value = "日均超标监测点数占比（根据 日表的超标监测点数占比 取平均值）")
+    private Float overLimitMeasurementRatioAverage;
+
+    @ApiModelProperty(value = "累计超标监测点数占比（此表的累计超标监测点数/区域统计表中的区域分类统计月表中的累计有效接入监测点数）")
+    private Float overLimitMeasurementRatioAccrued;
+
+    @ApiModelProperty(value = "数据类型,字典表（01：主网测点  02：配网测点）")
+    private String dataType;
+
+
+}
diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatHarmonicQ.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatHarmonicQ.java
new file mode 100644
index 000000000..db475d241
--- /dev/null
+++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatHarmonicQ.java
@@ -0,0 +1,62 @@
+package com.njcn.harmonic.pojo.po;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+import java.time.LocalDate;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author rui.wu
+ * @since 2022-10-12
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@TableName("r_stat_harmonic_q")
+@ApiModel(value="RStatHarmonicQ对象", description="")
+public class RStatHarmonicQ implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "单位ID")
+    @TableId(value = "org_no", type = IdType.ASSIGN_ID)
+    private String orgNo;
+
+    @ApiModelProperty(value = "生成数据的时间,每季度统计一次")
+    private LocalDate dataDate;
+
+    @ApiModelProperty(value = "监测点类别ID、监测对象类型ID")
+    private String measurementTypeClass;
+
+    @ApiModelProperty(value = "稳态指标类型Id，字典表ID")
+    private String harmonicType;
+
+    @ApiModelProperty(value = "日均超标监测点数（根据 日表的超标监测点数 取平均值）")
+    private Integer overLimitMeasurementAverage;
+
+    @ApiModelProperty(value = "累计超标监测点数（监测点指标统计明细日表 统计）")
+    private Integer overLimitMeasurementAccrued;
+
+    @ApiModelProperty(value = "平均超标天数（月表的累计超标天数之和/月表的累计超标监测点数之和）")
+    private Float averageOverDay;
+
+    @ApiModelProperty(value = "日均超标监测点数占比（根据 日表的超标监测点数占比 取平均值）")
+    private Float overLimitMeasurementRatioAverage;
+
+    @ApiModelProperty(value = "累计超标监测点数占比（此表的累计超标监测点数/区域统计表中的区域分类统计季表中的累计有效接入监测点数）")
+    private Float overLimitMeasurementRatioAccrued;
+
+    @ApiModelProperty(value = "数据类型,字典表（01：主网测点  02：配网测点）")
+    private String dataType;
+
+
+}
diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatHarmonicVoltageD.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatHarmonicVoltageD.java
new file mode 100644
index 000000000..861d720f2
--- /dev/null
+++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatHarmonicVoltageD.java
@@ -0,0 +1,53 @@
+package com.njcn.harmonic.pojo.po;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.time.LocalDate;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author rui.wu
+ * @since 2022-10-10
+ */
+@Data
+@TableName("r_stat_harmonic_voltage_d")
+@ApiModel(value="RStatHarmonicVoltageD对象", description="")
+public class RStatHarmonicVoltageD  {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "单位ID")
+    @TableId(value = "org_no", type = IdType.ASSIGN_ID)
+    private String orgNo;
+
+    @ApiModelProperty(value = "生成数据的时间,每日统计一次")
+    private LocalDate dataDate;
+
+    @ApiModelProperty(value = "监测对象类型ID")
+    private String measurementTypeClass;
+
+    @ApiModelProperty(value = "稳态指标类型Id，字典表ID")
+    private String harmonicType;
+
+    @ApiModelProperty(value = "电压等级Id，字典表ID")
+    private String voltageType;
+
+    @ApiModelProperty(value = "超标监测点数")
+    private Integer overLimitMeasurementAverage;
+
+    @ApiModelProperty(value = "超标监测点数占比")
+    private Float overLimitMeasurementRatioAverage;
+
+    @ApiModelProperty(value = "数据类型,字典表（01：主网测点  02：配网测点）")
+    private String dataType;
+
+
+}
diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatHarmonicVoltageM.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatHarmonicVoltageM.java
new file mode 100644
index 000000000..b644fbedd
--- /dev/null
+++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatHarmonicVoltageM.java
@@ -0,0 +1,62 @@
+package com.njcn.harmonic.pojo.po;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.time.LocalDate;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author rui.wu
+ * @since 2022-10-10
+ */
+@Data
+@TableName("r_stat_harmonic_voltage_m")
+@ApiModel(value="RStatHarmonicVoltageM对象", description="")
+public class RStatHarmonicVoltageM  {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "单位ID")
+    @TableId(value = "org_no", type = IdType.ASSIGN_ID)
+    private String orgNo;
+
+    @ApiModelProperty(value = "生成数据的时间,每日统计一次")
+    private LocalDate dataDate;
+
+    @ApiModelProperty(value = "监测对象类型ID")
+    private String measurementTypeClass;
+
+    @ApiModelProperty(value = "稳态指标类型Id，字典表ID")
+    private String harmonicType;
+
+    @ApiModelProperty(value = "电压等级Id，字典表ID")
+    private String voltageType;
+
+    @ApiModelProperty(value = "日均超标监测点数")
+    private Integer overLimitMeasurementAverage;
+
+    @ApiModelProperty(value = "累计超标监测点数")
+    private Integer overLimitMeasurementAccrued;
+
+    @ApiModelProperty(value = "累计超标天数")
+    private Integer overDay;
+
+    @ApiModelProperty(value = "日均超标监测点数占比")
+    private Float overLimitMeasurementRatioAverage;
+
+    @ApiModelProperty(value = "累计超标监测点数占比")
+    private Float overLimitMeasurementRatioAccrued;
+
+    @ApiModelProperty(value = "数据类型,字典表（01：主网测点  02：配网测点）")
+    private String dataType;
+
+
+}
diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatHarmonicY.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatHarmonicY.java
new file mode 100644
index 000000000..237717808
--- /dev/null
+++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatHarmonicY.java
@@ -0,0 +1,62 @@
+package com.njcn.harmonic.pojo.po;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+import java.time.LocalDate;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author rui.wu
+ * @since 2022-10-12
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@TableName("r_stat_harmonic_y")
+@ApiModel(value="RStatHarmonicY对象", description="")
+public class RStatHarmonicY implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "单位ID")
+    @TableId(value = "org_no", type = IdType.ASSIGN_ID)
+    private String orgNo;
+
+    @ApiModelProperty(value = "生成数据的时间,每季度统计一次")
+    private LocalDate dataDate;
+
+    @ApiModelProperty(value = "监测点类别ID、监测对象类型ID")
+    private String measurementTypeClass;
+
+    @ApiModelProperty(value = "稳态指标类型Id，字典表ID")
+    private String harmonicType;
+
+    @ApiModelProperty(value = "日均超标监测点数（根据 日表的超标监测点数 取平均值）")
+    private Integer overLimitMeasurementAverage;
+
+    @ApiModelProperty(value = "累计超标监测点数（监测点指标统计明细日表 统计）")
+    private Integer overLimitMeasurementAccrued;
+
+    @ApiModelProperty(value = "平均超标天数（月表的累计超标天数之和/月表的累计超标监测点数之和）")
+    private Float averageOverDay;
+
+    @ApiModelProperty(value = "日均超标监测点数占比（根据 日表的超标监测点数占比 取平均值）")
+    private Float overLimitMeasurementRatioAverage;
+
+    @ApiModelProperty(value = "累计超标监测点数占比（此表的累计超标监测点数/区域统计表中的区域分类统计季表中的累计有效接入监测点数）")
+    private Float overLimitMeasurementRatioAccrued;
+
+    @ApiModelProperty(value = "数据类型,字典表（01：主网测点  02：配网测点）")
+    private String dataType;
+
+
+}
diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatLoadTypeM.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatLoadTypeM.java
new file mode 100644
index 000000000..17d01b63a
--- /dev/null
+++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatLoadTypeM.java
@@ -0,0 +1,73 @@
+package com.njcn.harmonic.pojo.po;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import java.time.LocalDate;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.io.Serializable;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author rui.wu
+ * @since 2022-10-19
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@TableName("r_stat_load_type_m")
+@ApiModel(value="RStatLoadTypeM对象", description="")
+public class RStatLoadTypeM implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "单位ID")
+    @TableId(value = "org_no", type = IdType.ASSIGN_ID)
+    private String orgNo;
+
+    @ApiModelProperty(value = "生成数据的时间,每月统计一次")
+    private LocalDate dataDate;
+
+    @ApiModelProperty(value = "四类典型干扰源类型(风电、光伏、其他非线性负荷、电铁)")
+    private String loadType;
+
+    @ApiModelProperty(value = "有效接入监测点数")
+    private Integer effectiveMeasurement;
+
+    @ApiModelProperty(value = "日均谐波电压超标点占比")
+    private Float vAverage;
+
+    @ApiModelProperty(value = "谐波电压超标点数")
+    private Integer vCount;
+
+    @ApiModelProperty(value = "日均谐波电流超标点占比")
+    private Float iAverage;
+
+    @ApiModelProperty(value = "谐波电流超标点数")
+    private Integer iCount;
+
+    @ApiModelProperty(value = "日均三相电压不平衡度超标点占比")
+    private Float unbalanceAverage;
+
+    @ApiModelProperty(value = "三相电压不平衡度超标点数")
+    private Integer unbalanceCount;
+
+    @ApiModelProperty(value = "日均负序电流超标点占比")
+    private Float iNegAverage;
+
+    @ApiModelProperty(value = "负序电流超标点数")
+    private Integer iNegCount;
+
+    @ApiModelProperty(value = "日均闪变超标点占比")
+    private Float flickerAverage;
+
+    @ApiModelProperty(value = "闪变超标点数")
+    private Integer flickerCount;
+
+
+}
diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatLoadTypeQ.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatLoadTypeQ.java
new file mode 100644
index 000000000..927dca5d3
--- /dev/null
+++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatLoadTypeQ.java
@@ -0,0 +1,73 @@
+package com.njcn.harmonic.pojo.po;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import java.time.LocalDate;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.io.Serializable;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author rui.wu
+ * @since 2022-10-19
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@TableName("r_stat_load_type_q")
+@ApiModel(value="RStatLoadTypeQ对象", description="")
+public class RStatLoadTypeQ implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "单位ID")
+    @TableId(value = "org_no", type = IdType.ASSIGN_ID)
+    private String orgNo;
+
+    @ApiModelProperty(value = "生成数据的时间,每季统计一次")
+    private LocalDate dataDate;
+
+    @ApiModelProperty(value = "四类典型干扰源类型(风电、光伏、其他非线性负荷、电铁)")
+    private String loadType;
+
+    @ApiModelProperty(value = "有效接入监测点数")
+    private Integer effectiveMeasurement;
+
+    @ApiModelProperty(value = "日均谐波电压超标点占比")
+    private Float vAverage;
+
+    @ApiModelProperty(value = "谐波电压超标点数")
+    private Integer vCount;
+
+    @ApiModelProperty(value = "日均谐波电流超标点占比")
+    private Float iAverage;
+
+    @ApiModelProperty(value = "谐波电流超标点数")
+    private Integer iCount;
+
+    @ApiModelProperty(value = "日均三相电压不平衡度超标点占比")
+    private Float unbalanceAverage;
+
+    @ApiModelProperty(value = "三相电压不平衡度超标点数")
+    private Integer unbalanceCount;
+
+    @ApiModelProperty(value = "日均负序电流超标点占比")
+    private Float iNegAverage;
+
+    @ApiModelProperty(value = "负序电流超标点数")
+    private Integer iNegCount;
+
+    @ApiModelProperty(value = "日均闪变超标点占比")
+    private Float flickerAverage;
+
+    @ApiModelProperty(value = "闪变超标点数")
+    private Integer flickerCount;
+
+
+}
diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatLoadTypeY.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatLoadTypeY.java
new file mode 100644
index 000000000..ae5ff048b
--- /dev/null
+++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatLoadTypeY.java
@@ -0,0 +1,73 @@
+package com.njcn.harmonic.pojo.po;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import java.time.LocalDate;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.io.Serializable;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author rui.wu
+ * @since 2022-10-19
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@TableName("r_stat_load_type_y")
+@ApiModel(value="RStatLoadTypeY对象", description="")
+public class RStatLoadTypeY implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "单位ID")
+    @TableId(value = "org_no", type = IdType.ASSIGN_ID)
+    private String orgNo;
+
+    @ApiModelProperty(value = "生成数据的时间,每年统计一次")
+    private LocalDate dataDate;
+
+    @ApiModelProperty(value = "四类典型干扰源类型(风电、光伏、其他非线性负荷、电铁)")
+    private String loadType;
+
+    @ApiModelProperty(value = "有效接入监测点数")
+    private Integer effectiveMeasurement;
+
+    @ApiModelProperty(value = "日均谐波电压超标点占比")
+    private Float vAverage;
+
+    @ApiModelProperty(value = "谐波电压超标点数")
+    private Integer vCount;
+
+    @ApiModelProperty(value = "日均谐波电流超标点占比")
+    private Float iAverage;
+
+    @ApiModelProperty(value = "谐波电流超标点数")
+    private Integer iCount;
+
+    @ApiModelProperty(value = "日均三相电压不平衡度超标点占比")
+    private Float unbalanceAverage;
+
+    @ApiModelProperty(value = "三相电压不平衡度超标点数")
+    private Integer unbalanceCount;
+
+    @ApiModelProperty(value = "日均负序电流超标点占比")
+    private Float iNegAverage;
+
+    @ApiModelProperty(value = "负序电流超标点数")
+    private Integer iNegCount;
+
+    @ApiModelProperty(value = "日均闪变超标点占比")
+    private Float flickerAverage;
+
+    @ApiModelProperty(value = "闪变超标点数")
+    private Integer flickerCount;
+
+
+}
diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatOrgBusbarVoltageM.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatOrgBusbarVoltageM.java
new file mode 100644
index 000000000..cb1e48b93
--- /dev/null
+++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatOrgBusbarVoltageM.java
@@ -0,0 +1,61 @@
+package com.njcn.harmonic.pojo.po;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import java.time.LocalDate;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.io.Serializable;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author rui.wu
+ * @since 2022-10-19
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@TableName("r_stat_org_busbar_voltage_m")
+@ApiModel(value="RStatOrgBusbarVoltageM对象", description="")
+public class RStatOrgBusbarVoltageM implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "单位ID")
+    @TableId(value = "org_no", type = IdType.ASSIGN_ID)
+    private String orgNo;
+
+    @ApiModelProperty(value = "生成数据的时间,每日统计一次")
+    private LocalDate dataDate;
+
+    @ApiModelProperty(value = "母线ID")
+    private String busbarId;
+
+    @ApiModelProperty(value = "有效接入监测点总数量")
+    private Integer measurementCount;
+
+    @ApiModelProperty(value = "日均谐波电压超标-占比")
+    private Float vAverage;
+
+    @ApiModelProperty(value = "累计谐波电压超标-占比")
+    private Float vAccrued;
+
+    @ApiModelProperty(value = "日均三相电压不平衡超标-占比")
+    private Float unbalanceAverage;
+
+    @ApiModelProperty(value = "累计三相电压不平衡超标-占比")
+    private Float unbalanceAccrued;
+
+    @ApiModelProperty(value = "日均闪变超标-占比")
+    private Float flickerAverage;
+
+    @ApiModelProperty(value = "累计闪变超标-占比")
+    private Float flickerAccrued;
+
+
+}
diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatOrgBusbarVoltageQ.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatOrgBusbarVoltageQ.java
new file mode 100644
index 000000000..2f873023e
--- /dev/null
+++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatOrgBusbarVoltageQ.java
@@ -0,0 +1,61 @@
+package com.njcn.harmonic.pojo.po;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import java.time.LocalDate;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.io.Serializable;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author rui.wu
+ * @since 2022-10-19
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@TableName("r_stat_org_busbar_voltage_q")
+@ApiModel(value="RStatOrgBusbarVoltageQ对象", description="")
+public class RStatOrgBusbarVoltageQ implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "单位ID")
+    @TableId(value = "org_no", type = IdType.ASSIGN_ID)
+    private String orgNo;
+
+    @ApiModelProperty(value = "生成数据的时间,每日统计一次")
+    private LocalDate dataDate;
+
+    @ApiModelProperty(value = "母线ID")
+    private String busbarId;
+
+    @ApiModelProperty(value = "有效接入监测点总数量")
+    private Integer measurementCount;
+
+    @ApiModelProperty(value = "日均谐波电压超标-占比")
+    private Float vAverage;
+
+    @ApiModelProperty(value = "累计谐波电压超标-占比")
+    private Float vAccrued;
+
+    @ApiModelProperty(value = "日均三相电压不平衡超标-占比")
+    private Float unbalanceAverage;
+
+    @ApiModelProperty(value = "累计三相电压不平衡超标-占比")
+    private Float unbalanceAccrued;
+
+    @ApiModelProperty(value = "日均闪变超标-占比")
+    private Float flickerAverage;
+
+    @ApiModelProperty(value = "累计闪变超标-占比")
+    private Float flickerAccrued;
+
+
+}
diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatOrgBusbarVoltageY.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatOrgBusbarVoltageY.java
new file mode 100644
index 000000000..ba331eb7a
--- /dev/null
+++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatOrgBusbarVoltageY.java
@@ -0,0 +1,61 @@
+package com.njcn.harmonic.pojo.po;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import java.time.LocalDate;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.io.Serializable;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author rui.wu
+ * @since 2022-10-19
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@TableName("r_stat_org_busbar_voltage_y")
+@ApiModel(value="RStatOrgBusbarVoltageY对象", description="")
+public class RStatOrgBusbarVoltageY implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "单位ID")
+    @TableId(value = "org_no", type = IdType.ASSIGN_ID)
+    private String orgNo;
+
+    @ApiModelProperty(value = "生成数据的时间,每日统计一次")
+    private LocalDate dataDate;
+
+    @ApiModelProperty(value = "母线ID")
+    private String busbarId;
+
+    @ApiModelProperty(value = "有效接入监测点总数量")
+    private Integer measurementCount;
+
+    @ApiModelProperty(value = "日均谐波电压超标-占比")
+    private Float vAverage;
+
+    @ApiModelProperty(value = "累计谐波电压超标-占比")
+    private Float vAccrued;
+
+    @ApiModelProperty(value = "日均三相电压不平衡超标-占比")
+    private Float unbalanceAverage;
+
+    @ApiModelProperty(value = "累计三相电压不平衡超标-占比")
+    private Float unbalanceAccrued;
+
+    @ApiModelProperty(value = "日均闪变超标-占比")
+    private Float flickerAverage;
+
+    @ApiModelProperty(value = "累计闪变超标-占比")
+    private Float flickerAccrued;
+
+
+}
diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatOrgM.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatOrgM.java
new file mode 100644
index 000000000..988796a9b
--- /dev/null
+++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatOrgM.java
@@ -0,0 +1,94 @@
+package com.njcn.harmonic.pojo.po;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import java.time.LocalDateTime;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.io.Serializable;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 区域分类统计月表
+ * </p>
+ *
+ * @author rui.wu
+ * @since 2022-10-17
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@TableName("r_stat_org_m")
+@ApiModel(value="RStatOrgM对象", description="区域分类统计月表")
+public class RStatOrgM implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "单位ID")
+    @TableId(value = "org_no", type = IdType.ASSIGN_ID)
+    private String orgNo;
+
+    @ApiModelProperty(value = "生成数据的时间,每月统计一次")
+    private LocalDateTime dataDate;
+
+    @ApiModelProperty(value = "监测点类别ID、监测对象类型ID")
+    private String measurementTypeClass;
+
+    @ApiModelProperty(value = "总监测点数")
+    private Integer allCount;
+
+    @ApiModelProperty(value = "日均有效接入监测点数")
+    private Integer effectiveMeasurementAverage;
+
+    @ApiModelProperty(value = "累计有效接入监测点数")
+    private Integer effectiveMeasurementAccrued;
+
+    @ApiModelProperty(value = "日均稳态超标监测点数")
+    private Integer harmonicMeasurementAverage;
+
+    @ApiModelProperty(value = "累计稳态超标监测点数")
+    private Integer harmonicMeasurementAccrued;
+
+    @ApiModelProperty(value = "日均稳态超标监测点数占比")
+    private Float harmonicMeasurementRatioAverage;
+
+    @ApiModelProperty(value = "累计超标天数")
+    private Integer overDayAccrued;
+
+    @ApiModelProperty(value = "频率偏差合格率")
+    private Float freqPassRate;
+
+    @ApiModelProperty(value = "电压偏差合格率")
+    private Float vDevPassRate;
+
+    @ApiModelProperty(value = "闪变合格率")
+    private Float flickerPassRate;
+
+    @ApiModelProperty(value = "日均监测到暂态指标的监测点数")
+    private Integer eventMeasurementAverage;
+
+    @ApiModelProperty(value = "累计监测到暂态指标的监测点数")
+    private Integer eventMeasurementAccrued;
+
+    @ApiModelProperty(value = "日均暂态超标监测点数占比")
+    private Float eventMeasurementRatioAverage;
+
+    @ApiModelProperty(value = "暂态指标发生频次")
+    private Float eventFreq;
+
+    @ApiModelProperty(value = "暂态指标发生次数")
+    private Integer eventCount;
+
+    @ApiModelProperty(value = "应设点数")
+    private Integer shouldCount;
+
+    @ApiModelProperty(value = "告警监测点数")
+    private Integer warnCount;
+
+    @ApiModelProperty(value = "数据类型,字典表（01：主网测点  02：配网测点）")
+    private String dataType;
+
+
+}
diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatOrgQ.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatOrgQ.java
new file mode 100644
index 000000000..8d8e8ea2a
--- /dev/null
+++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatOrgQ.java
@@ -0,0 +1,94 @@
+package com.njcn.harmonic.pojo.po;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import java.time.LocalDateTime;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.io.Serializable;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 区域分类统计季表
+ * </p>
+ *
+ * @author rui.wu
+ * @since 2022-10-17
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@TableName("r_stat_org_q")
+@ApiModel(value="RStatOrgQ对象", description="区域分类统计季表")
+public class RStatOrgQ implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "单位ID")
+    @TableId(value = "org_no", type = IdType.ASSIGN_ID)
+    private String orgNo;
+
+    @ApiModelProperty(value = "生成数据的时间,每季统计一次")
+    private LocalDateTime dataDate;
+
+    @ApiModelProperty(value = "监测点类别ID、监测对象类型ID")
+    private String measurementTypeClass;
+
+    @ApiModelProperty(value = "总监测点数")
+    private Integer allCount;
+
+    @ApiModelProperty(value = "日均有效接入监测点数")
+    private Integer effectiveMeasurementAverage;
+
+    @ApiModelProperty(value = "累计有效接入监测点数")
+    private Integer effectiveMeasurementAccrued;
+
+    @ApiModelProperty(value = "日均稳态超标监测点数")
+    private Integer harmonicMeasurementAverage;
+
+    @ApiModelProperty(value = "累计稳态超标监测点数")
+    private Integer harmonicMeasurementAccrued;
+
+    @ApiModelProperty(value = "日均稳态超标监测点数占比")
+    private Float harmonicMeasurementRatioAverage;
+
+    @ApiModelProperty(value = "稳态指标平均超标天数")
+    private Float averageOverDay;
+
+    @ApiModelProperty(value = "频率偏差合格率")
+    private Float freqPassRate;
+
+    @ApiModelProperty(value = "电压偏差合格率")
+    private Float vDevPassRate;
+
+    @ApiModelProperty(value = "闪变合格率")
+    private Float flickerPassRate;
+
+    @ApiModelProperty(value = "日均监测到暂态指标的监测点数")
+    private Integer eventMeasurementAverage;
+
+    @ApiModelProperty(value = "累计监测到暂态指标的监测点数")
+    private Integer eventMeasurementAccrued;
+
+    @ApiModelProperty(value = "日均暂态超标监测点数占比")
+    private Float eventMeasurementRatioAverage;
+
+    @ApiModelProperty(value = "暂态指标发生频次")
+    private Float eventFreq;
+
+    @ApiModelProperty(value = "暂态指标发生次数")
+    private Integer eventCount;
+
+    @ApiModelProperty(value = "应设点数")
+    private Integer shouldCount;
+
+    @ApiModelProperty(value = "告警监测点数")
+    private Integer warnCount;
+
+    @ApiModelProperty(value = "数据类型,字典表（01：主网测点  02：配网测点）")
+    private String dataType;
+
+
+}
diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatOrgY.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatOrgY.java
new file mode 100644
index 000000000..7956b9ed2
--- /dev/null
+++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatOrgY.java
@@ -0,0 +1,94 @@
+package com.njcn.harmonic.pojo.po;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import java.time.LocalDateTime;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.io.Serializable;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 区域分类统计年表
+ * </p>
+ *
+ * @author rui.wu
+ * @since 2022-10-17
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@TableName("r_stat_org_y")
+@ApiModel(value="RStatOrgY对象", description="区域分类统计年表")
+public class RStatOrgY implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "单位ID")
+    @TableId(value = "org_no", type = IdType.ASSIGN_ID)
+    private String orgNo;
+
+    @ApiModelProperty(value = "生成数据的时间,每年统计一次")
+    private LocalDateTime dataDate;
+
+    @ApiModelProperty(value = "监测点类别ID、监测对象类型ID")
+    private String measurementTypeClass;
+
+    @ApiModelProperty(value = "总监测点数")
+    private Integer allCount;
+
+    @ApiModelProperty(value = "日均有效接入监测点数")
+    private Integer effectiveMeasurementAverage;
+
+    @ApiModelProperty(value = "累计有效接入监测点数")
+    private Integer effectiveMeasurementAccrued;
+
+    @ApiModelProperty(value = "日均稳态超标监测点数")
+    private Integer overLimitMeasurementAverage;
+
+    @ApiModelProperty(value = "累计稳态超标监测点数")
+    private Integer overLimitMeasurementAccrued;
+
+    @ApiModelProperty(value = "日均稳态超标监测点数占比")
+    private Float harmonicMeasurementRatioAverage;
+
+    @ApiModelProperty(value = "稳态指标平均超标天数")
+    private Float averageOverDay;
+
+    @ApiModelProperty(value = "频率偏差合格率")
+    private Float freqPassRate;
+
+    @ApiModelProperty(value = "电压偏差合格率")
+    private Float vDevPassRate;
+
+    @ApiModelProperty(value = "闪变合格率")
+    private Float flickerPassRate;
+
+    @ApiModelProperty(value = "日均监测到暂态指标的监测点数")
+    private Integer eventMeasurementAverage;
+
+    @ApiModelProperty(value = "累计监测到暂态指标的监测点数")
+    private Integer eventMeasurementAccrued;
+
+    @ApiModelProperty(value = "日均暂态超标监测点数占比")
+    private Float eventMeasurementRatioAverage;
+
+    @ApiModelProperty(value = "暂态指标发生频次")
+    private Float eventFreq;
+
+    @ApiModelProperty(value = "暂态指标发生次数")
+    private Integer eventCount;
+
+    @ApiModelProperty(value = "应设点数")
+    private Integer shouldCount;
+
+    @ApiModelProperty(value = "告警监测点数")
+    private Integer warnCount;
+
+    @ApiModelProperty(value = "数据类型,字典表（01：主网测点  02：配网测点）")
+    private String dataType;
+
+
+}
diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatSubstationM.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatSubstationM.java
new file mode 100644
index 000000000..ea73dddc4
--- /dev/null
+++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatSubstationM.java
@@ -0,0 +1,121 @@
+package com.njcn.harmonic.pojo.po;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import java.time.LocalDate;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.io.Serializable;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author rui.wu
+ * @since 2022-10-18
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@TableName("r_stat_substation_m")
+@ApiModel(value="RStatSubstationM对象", description="")
+public class RStatSubstationM implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "生成数据的时间,每月统计一次")
+    @TableId(value = "data_date", type = IdType.ASSIGN_ID)
+    private LocalDate dataDate;
+
+    @ApiModelProperty(value = "变电站id")
+    private String substationId;
+
+    @ApiModelProperty(value = "日均有效接入监测点数")
+    private Integer effectiveMeasurementAverage;
+
+    @ApiModelProperty(value = "累计有效接入监测点数")
+    private Integer effectiveMeasurementAccrued;
+
+    @ApiModelProperty(value = "稳态累计超标天数")
+    private Float harmonicOverDay;
+
+    @ApiModelProperty(value = "稳态累计超标监测点数")
+    private Integer harmonicCount;
+
+    @ApiModelProperty(value = "频率偏差累计超标天数")
+    private Float freqOverDay;
+
+    @ApiModelProperty(value = "频率偏差累计超标监测点数")
+    private Integer freqCount;
+
+    @ApiModelProperty(value = "电压偏差累计超标天数")
+    private Float vDevOverDay;
+
+    @ApiModelProperty(value = "电压偏差累计超标监测点数")
+    private Integer vDevCount;
+
+    @ApiModelProperty(value = "谐波电压累计超标天数")
+    private Float vOverDay;
+
+    @ApiModelProperty(value = "谐波电压累计超标监测点数")
+    private Integer vCount;
+
+    @ApiModelProperty(value = "谐波电流累计超标天数")
+    private Float iOverDay;
+
+    @ApiModelProperty(value = "谐波电流累计超标监测点数")
+    private Integer iCount;
+
+    @ApiModelProperty(value = "三相电压不平衡累计超标天数")
+    private Float unbalanceOverDay;
+
+    @ApiModelProperty(value = "三相电压不平衡累计超标监测点数")
+    private Integer unbalanceCount;
+
+    @ApiModelProperty(value = "负序电流累计超标天数")
+    private Float iNegOverDay;
+
+    @ApiModelProperty(value = "负序电流累计超标监测点数")
+    private Integer iNegCount;
+
+    @ApiModelProperty(value = "闪变累计超标天数")
+    private Float flickerOverDay;
+
+    @ApiModelProperty(value = "闪变累计超标监测点数")
+    private Integer flickerCount;
+
+    @ApiModelProperty(value = "间谐波电压累计超标天数")
+    private Float inuharmOverDay;
+
+    @ApiModelProperty(value = "间谐波电压累计超标监测点数")
+    private Integer inuharmCount;
+
+    @ApiModelProperty(value = "暂态指标发生次数")
+    private Integer eventCount;
+
+    @ApiModelProperty(value = "暂态指标发生频次")
+    private Float eventFreq;
+
+    @ApiModelProperty(value = "电压暂降发生次数")
+    private Integer sagCount;
+
+    @ApiModelProperty(value = "电压暂降发生频次")
+    private Float sagFreq;
+
+    @ApiModelProperty(value = "电压暂升发生次数")
+    private Integer swellCount;
+
+    @ApiModelProperty(value = "电压暂升发生频次")
+    private Float swellFreq;
+
+    @ApiModelProperty(value = "短时中断发生次数")
+    private Integer interruptCount;
+
+    @ApiModelProperty(value = "短时中断发生频次")
+    private Float interruptFreq;
+
+
+}
diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatSubstationQ.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatSubstationQ.java
new file mode 100644
index 000000000..5d1ee2efe
--- /dev/null
+++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatSubstationQ.java
@@ -0,0 +1,94 @@
+package com.njcn.harmonic.pojo.po;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import java.time.LocalDate;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.io.Serializable;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author rui.wu
+ * @since 2022-10-18
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@TableName("r_stat_substation_q")
+@ApiModel(value="RStatSubstationQ对象", description="")
+public class RStatSubstationQ implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "生成数据的时间,每季统计一次")
+    @TableId(value = "data_date", type = IdType.ASSIGN_ID)
+    private LocalDate dataDate;
+
+    @ApiModelProperty(value = "变电站id")
+    private String substationId;
+
+    @ApiModelProperty(value = "日均有效接入监测点数")
+    private Integer effectiveMeasurementAverage;
+
+    @ApiModelProperty(value = "累计有效接入监测点数")
+    private Integer effectiveMeasurementAccrued;
+
+    @ApiModelProperty(value = "稳态平均超标天数")
+    private Float harmonicAverageOverDay;
+
+    @ApiModelProperty(value = "频率偏差平均超标天数")
+    private Float freqAverageOverDay;
+
+    @ApiModelProperty(value = "电压偏差平均超标天数")
+    private Float vDevAverageOverDay;
+
+    @ApiModelProperty(value = "谐波电压平均超标天数")
+    private Float vAverageOverDay;
+
+    @ApiModelProperty(value = "谐波电流平均超标天数")
+    private Float iAverageOverDay;
+
+    @ApiModelProperty(value = "三相电压不平衡平均超标天数")
+    private Float unbalanceAverageOverDay;
+
+    @ApiModelProperty(value = "负序电流平均超标天数")
+    private Float iNegAverageOverDay;
+
+    @ApiModelProperty(value = "闪变平均超标天数")
+    private Float flickerAverageOverDay;
+
+    @ApiModelProperty(value = "间谐波电压平均超标天数")
+    private Float inuharmAverageOverDay;
+
+    @ApiModelProperty(value = "暂态指标发生次数")
+    private Integer eventCount;
+
+    @ApiModelProperty(value = "暂态指标发生频次")
+    private Float eventFreq;
+
+    @ApiModelProperty(value = "电压暂降发生次数")
+    private Integer sagCount;
+
+    @ApiModelProperty(value = "电压暂降发生频次")
+    private Float sagFreq;
+
+    @ApiModelProperty(value = "电压暂升发生次数")
+    private Integer swellCount;
+
+    @ApiModelProperty(value = "电压暂升发生频次")
+    private Float swellFreq;
+
+    @ApiModelProperty(value = "短时中断发生次数")
+    private Integer interruptCount;
+
+    @ApiModelProperty(value = "短时中断发生频次")
+    private Float interruptFreq;
+
+
+}
diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatSubstationVoltageM.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatSubstationVoltageM.java
new file mode 100644
index 000000000..bb0933d4f
--- /dev/null
+++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatSubstationVoltageM.java
@@ -0,0 +1,49 @@
+package com.njcn.harmonic.pojo.po;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import java.time.LocalDate;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.io.Serializable;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author rui.wu
+ * @since 2022-10-18
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@TableName("r_stat_substation_voltage_m")
+@ApiModel(value="RStatSubstationVoltageM对象", description="")
+public class RStatSubstationVoltageM implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "单位ID")
+    @TableId(value = "org_no", type = IdType.ASSIGN_ID)
+    private String orgNo;
+
+    @ApiModelProperty(value = "生成数据的时间,每月统计一次")
+    private LocalDate dataDate;
+
+    @ApiModelProperty(value = "电压等级")
+    private String substationVoltage;
+
+    @ApiModelProperty(value = "变电站数量")
+    private Integer substationCount;
+
+    @ApiModelProperty(value = "稳态超标变电站数量")
+    private Integer harmonicCount;
+
+    @ApiModelProperty(value = "暂态变电站数量")
+    private Integer eventCount;
+
+
+}
diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatSubstationY.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatSubstationY.java
new file mode 100644
index 000000000..0fe743cd2
--- /dev/null
+++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatSubstationY.java
@@ -0,0 +1,94 @@
+package com.njcn.harmonic.pojo.po;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import java.time.LocalDate;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.io.Serializable;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author rui.wu
+ * @since 2022-10-18
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@TableName("r_stat_substation_y")
+@ApiModel(value="RStatSubstationY对象", description="")
+public class RStatSubstationY implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "生成数据的时间,每年统计一次")
+    @TableId(value = "data_date", type = IdType.ASSIGN_ID)
+    private LocalDate dataDate;
+
+    @ApiModelProperty(value = "变电站id")
+    private String substationId;
+
+    @ApiModelProperty(value = "日均有效接入监测点数")
+    private Integer effectiveMeasurementAverage;
+
+    @ApiModelProperty(value = "累计有效接入监测点数")
+    private Integer effectiveMeasurementAccrued;
+
+    @ApiModelProperty(value = "稳态平均超标天数")
+    private Float harmonicOverDay;
+
+    @ApiModelProperty(value = "频率偏差平均超标天数")
+    private Float freqAverageOverDay;
+
+    @ApiModelProperty(value = "电压偏差平均超标天数")
+    private Float vDevAverageOverDay;
+
+    @ApiModelProperty(value = "谐波电压平均超标天数")
+    private Float vAverageOverDay;
+
+    @ApiModelProperty(value = "谐波电流平均超标天数")
+    private Float iAverageOverDay;
+
+    @ApiModelProperty(value = "三相电压不平衡平均超标天数")
+    private Float unbalanceAverageOverDay;
+
+    @ApiModelProperty(value = "负序电流平均超标天数")
+    private Float iNegAverageOverDay;
+
+    @ApiModelProperty(value = "闪变平均超标天数")
+    private Float flickerAverageOverDay;
+
+    @ApiModelProperty(value = "间谐波电压平均超标天数")
+    private Float inuharmAverageOverDay;
+
+    @ApiModelProperty(value = "暂态指标发生次数")
+    private Integer eventCount;
+
+    @ApiModelProperty(value = "暂态指标发生频次")
+    private Float eventFreq;
+
+    @ApiModelProperty(value = "电压暂降发生次数")
+    private Integer sagCount;
+
+    @ApiModelProperty(value = "电压暂降发生频次")
+    private Float sagFreq;
+
+    @ApiModelProperty(value = "电压暂升发生次数")
+    private Integer swellCount;
+
+    @ApiModelProperty(value = "电压暂升发生频次")
+    private Float swellFreq;
+
+    @ApiModelProperty(value = "短时中断发生次数")
+    private Integer interruptCount;
+
+    @ApiModelProperty(value = "短时中断发生频次")
+    private Float interruptFreq;
+
+
+}
diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RArrayVO.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RArrayVO.java
new file mode 100644
index 000000000..f7b76d2eb
--- /dev/null
+++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RArrayVO.java
@@ -0,0 +1,27 @@
+package com.njcn.harmonic.pojo.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * <功能描述>
+ *
+ * @author 1754607820@qq.com
+ * @createTime: 2022-10-10
+ */
+@Data
+public class RArrayVO {
+
+    @ApiModelProperty(value = "指标名称")
+    String rowName;
+
+    @ApiModelProperty("排序")
+    private Integer sort;
+
+    @ApiModelProperty(value = "检测点类型")
+    List<?> columns;
+
+
+}
diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RHarmonicPolylineVO.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RHarmonicPolylineVO.java
new file mode 100644
index 000000000..8d9ab6036
--- /dev/null
+++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RHarmonicPolylineVO.java
@@ -0,0 +1,30 @@
+package com.njcn.harmonic.pojo.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * <功能描述>
+ *
+ * @author 1754607820@qq.com
+ * @createTime: 2022-10-10
+ */
+@Data
+public class RHarmonicPolylineVO {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "时间")
+    private String date;
+
+    @ApiModelProperty(value ="监测点数")
+    private Integer num;
+
+    @ApiModelProperty(value = "超标监测点数占比")
+    private Float overLimitMeasurementRatioAverage;
+
+    @ApiModelProperty(value = "平均超标天数")
+    private Integer averageOverDay;
+
+
+}
diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RIconVO.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RIconVO.java
new file mode 100644
index 000000000..964f94014
--- /dev/null
+++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RIconVO.java
@@ -0,0 +1,36 @@
+package com.njcn.harmonic.pojo.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * <功能描述>
+ *
+ * @author 1754607820@qq.com
+ * @createTime: 2022-10-10
+ */
+@Data
+public class RIconVO {
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "指标名称")
+    private String rowName;
+
+    @ApiModelProperty(value ="排序")
+    private Integer sort;
+
+    @ApiModelProperty(value ="日均监测点数")
+    private Integer overLimitMeasurementAverage;
+
+    @ApiModelProperty(value ="累计监测点数")
+    private Integer overLimitMeasurementAccrued;
+
+    @ApiModelProperty(value = "日均超标监测点数占比")
+    private Float overLimitMeasurementRatioAverage;
+
+    @ApiModelProperty(value = "累计超标监测点数占比")
+    private Float overLimitMeasurementRatioAccrued;
+
+    @ApiModelProperty(value = "平均超标天数")
+    private Float averageOverDay;
+}
diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RMpBenchmarkLevelVO.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RMpBenchmarkLevelVO.java
new file mode 100644
index 000000000..2bdb64bdf
--- /dev/null
+++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RMpBenchmarkLevelVO.java
@@ -0,0 +1,71 @@
+package com.njcn.harmonic.pojo.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 【基准水平】台账展示
+ * @Title RMpBenchmarkLevelVO
+ * @Package com.njcn.device.pms.pojo.vo
+ * @Author jianghaifei
+ * @Date 2022-10-11 19:28
+ * @Version V1.0
+ */
+@Data
+public class RMpBenchmarkLevelVO implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(name = "orgNo", value = "单位id")
+    private String orgNo;
+
+    @ApiModelProperty(name = "orgName", value = "单位名称")
+    private String orgName;
+
+    @ApiModelProperty(name = "benchmarkIndicator", value = "基准水平评价指标id")
+    private String benchmarkIndicator;
+
+    @ApiModelProperty(name = "benchmarkIndicator", value = "基准水平评价指标")
+    private String benchmarkIndicatorName;
+
+    @ApiModelProperty(name = "measurementPointId", value = "监测点ID")
+    private String measurementPointId;
+
+    @ApiModelProperty(name = "measurementPointName", value = "监测点名称")
+    private String measurementPointName;
+
+    @ApiModelProperty(name = "voltage_Level", value = "电压等级id")
+    private String voltageLevel;
+
+    @ApiModelProperty(name = "voltage_Level", value = "电压等级名称")
+    private String voltageLevelName;
+
+    @ApiModelProperty(name = "dataDate", value = "生成数据的时间")
+    private Date dataDate;
+
+    @ApiModelProperty(name = "voltageAvg", value = "电压水平均值")
+    private Double voltageAvg;
+
+    @ApiModelProperty(name = "voltageSd", value = "电压水平标准差")
+    private Double voltageSd;
+
+    @ApiModelProperty(name = "unbalanceAvg", value = "三相电压不平衡水平均值")
+    private Double unbalanceAvg;
+
+    @ApiModelProperty(name = "unbalanceSd", value = "三相电压不平衡水平标准差")
+    private Double unbalanceSd;
+
+    @ApiModelProperty(name = "vthdAvg", value = "电压总谐波畸变率水平均值")
+    private Double vthdAvg;
+
+    @ApiModelProperty(name = "vthdSd", value = "电压总谐波畸变率水平标准差")
+    private Double vthdSd;
+
+    @ApiModelProperty(name = "flickerAvg", value = "长时间闪变水平均值")
+    private Double flickerAvg;
+
+    @ApiModelProperty(name = "flickerSd", value = "长时间闪变水平标准差")
+    private Double flickerSd;
+}
diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RMpHarmonicReportDVO.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RMpHarmonicReportDVO.java
new file mode 100644
index 000000000..0f693bec9
--- /dev/null
+++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RMpHarmonicReportDVO.java
@@ -0,0 +1,129 @@
+package com.njcn.harmonic.pojo.vo;
+
+import com.njcn.harmonic.pojo.po.*;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.json.JSONObject;
+
+import java.io.Serializable;
+import java.util.Map;
+
+/**
+ * 【监测点稳态指标日报】展示字段
+ * @Title RMpHarmonicReportDVO
+ * @Package com.njcn.harmonic.pojo.vo
+ * @Author jianghaifei
+ * @Date 2022-10-20 10:01
+ * @Version V1.0
+ */
+@Data
+public class RMpHarmonicReportDVO implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    // monitor
+    @ApiModelProperty(name = "orgNo", value = "单位ID")
+    private String orgNo; //单位ID
+    @ApiModelProperty(name = "orgName", value = "单位名称")
+    private String orgName; //单位名称
+    @ApiModelProperty(name = "powerId", value = "变电站id")
+    private String powerId; //变电站id
+    @ApiModelProperty(name = "powerName", value = "变电站名称")
+    private String powerName; //变电站名称
+    @ApiModelProperty(name = "measurementPointId", value = "监测点ID")
+    private String measurementPointId; //监测点ID
+    @ApiModelProperty(name = "measurementPointName", value = "监测点名称")
+    private String measurementPointName; //监测点名称
+    @ApiModelProperty(name = "minShortCircuitCapacity", value = "最小短路容量")
+    private Float minShortCircuitCapacity; //最小短路容量
+
+    @ApiModelProperty(name = "voltageLevel", value = "变电站电压等级id")
+    private String voltageLevel; //变电站电压等级id
+    @ApiModelProperty(name = "voltageLevelName", value = "变电站电压等级")
+    private String voltageLevelName; //变电站电压等级
+
+    @ApiModelProperty(name = "dataDate", value = "监测日期")
+    private String dataDate; //监测日期
+
+    //r_mp_measure_report_d【稳态监测点非谐波不带相位指标日报-日表(主配网表)  】
+    private RMpMeasureReportD rMpMeasureReportD;
+//    private Double totalActivePowerMax; //总有功功率-最大值
+//    private Double totalActivePowerMin; //总有功功率-最小值
+//    private Double totalActivePowerAvg; //总有功功率-平均值
+//    private Double totalActivePower95; //总有功功率-95值
+
+    @ApiModelProperty(name = "frequencyDeviationMaxResult", value = "频率偏差-最大值限值结论")
+    private String frequencyDeviationMaxResult; //频率偏差-最大值限值结论（用接口调用（接口只返回一个值，用表中的最大值去对比）越限/正常）
+
+//    private Double totalReactivePowerMax; //总无功功率-最大值
+//    private Double totalReactivePowerMin; //总无功功率-最小值
+//    private Double totalReactivePowerAvg; //总无功功率-平均值
+//    private Double totalReactivePower95; //总无功功率-95值
+
+//    private Double negativeSequenceVoltageUnbalanceMax; //负序电压不平衡度-最大值（三相电压不平衡度）
+//    private Double negativeSequenceVoltageUnbalanceMin; //负序电压不平衡度-最小值
+//    private Double negativeSequenceVoltageUnbalanceAvg; //负序电压不平衡度-平均值
+//    private Double negativeSequenceVoltageUnbalance95; //负序电压不平衡度-95值
+    @ApiModelProperty(name = "negativeSequenceVoltageUnbalance95Result", value = "负序电压（三相电压）不平衡度-95值限值结论")
+    private String negativeSequenceVoltageUnbalance95Result; //负序电压不平衡度-95值限值结论（用接口调用（接口只返回一个值，用表中的95值去对比）越限/正常）
+    private String negativeSequenceVoltageUnbalanceMaxResult; //负序电压不平衡度-最大值限值结论（用接口调用（接口只返回一个值，用表中的95值去对比）越限/正常）
+
+//    private Double negativeSequenceCurrentMax; //负序电流-最大值
+//    private Double negativeSequenceCurrentMin; //负序电流-最小值
+//    private Double negativeSequenceCurrentAvg; //负序电流-平均值
+//    private Double negativeSequenceCurrent95; //负序电流-95值
+    @ApiModelProperty(name = "negativeSequenceCurrent95Result", value = "负序电流-95值限值结论")
+    private String negativeSequenceCurrent95Result; //负序电流-95值限值结论 （用接口调用（接口只返回一个值，用表中的95值去对比）越限/正常）
+    private String negativeSequenceCurrentMaxResult; //负序电流最大值限值结论
+
+    //r_mp_measure_phase_report_d 【稳态监测点非谐波带相位指标日报-日表(主配网表)】
+    private Map<String, RMpMeasurePhaseReportD> phaseReportD;
+    // A/B/C三相 todo
+//    private Double spApparentPowerMax; //视在功率-最大值 （单相视在功率）
+//    private Double spApparentPowerMin; //视在功率-最小值
+//    private Double spApparentPowerAvg; //视在功率-平均值
+//    private Double spApparentPower95; //视在功率-95值
+    // A/B/C三相 todo
+//    private Double spPowerFactorMax; //功率因数-最大值 （单相功率因数）
+//    private Double spPowerFactorMin; //功率因数-最小值 （单相功率因数）
+//    private Double spPowerFactorAvg; //功率因数-平均值 （单相功率因数）
+//    private Double spPowerFactor95; //功率因数-95值 （单相功率因数）
+
+    // A/B/C三相 todo
+//    private Double vDeUpMax; //电压正偏差-最大值（电压上偏差-最大值）
+
+    // A/B/C三相 todo
+//    private Double vDeLowMax; //电压负偏差-最大值（电压下偏差-最大值）
+
+    //r_mp_harmonic_v_rate_report_d 【稳态监测点指标日报-日表(主配网表)  /各次谐波电压含有率】
+    // A/B/C三相 todo
+//    private Double fundamentalVoltageMax; //基波电压-最大值 （相（线）电压基波有效值-最大值）
+//    private Double fundamentalVoltageMin; //基波电压-最小值
+//    private Double fundamentalVoltageAvg; //基波电压-平均值
+//    private Double fundamentalVoltage95; //基波电压-95值
+
+    @ApiModelProperty(name = "voltageHarmonicWave95", value = "电压总谐波畸变率-95限值结论")
+    private Map<String, String> voltageHarmonicWave95ResultMap; //电压总谐波畸变率-95限值结论（用接口调用（接口只返回一个值，用表中的95值去对比）越限/正常）
+    //各相各次谐波电压含有率 （key:相别 value：实体）
+    @ApiModelProperty(name = "rMpHarmonicVRateReportDMap", value = "各相各次谐波电压含有率")
+    private Map<String, RMpHarmonicVRateReportD> rMpHarmonicVRateReportDMap;
+
+    //r_mp_harmonic_i_mag_report_d 【稳态监测点指标日报-日表(主配网表)  /各次谐波电流有效值】
+    // A/B/C三相 todo
+    @ApiModelProperty(name = "rMpHarmonicIMagReportDMap", value = "各次谐波电流有效值")
+    private Map<String, RMpHarmonicIMagReportD> rMpHarmonicIMagReportDMap;
+//    private Double fundamentalCurrentMax; //基波电流-最大值
+//    private Double fundamentalCurrentMin; //基波电流-最小值
+//    private Double fundamentalCurrentAvg; //基波电流-平均值
+//    private Double fundamentalCurrent95; //基波电流-95值
+
+    //各相各次谐波电流含有率 r_mp_harmonic_i_rate_report_d
+    @ApiModelProperty(name = "rMpHarmonicIRateReportDMap", value = "各相各次谐波电流含有率")
+    private Map<String, RMpHarmonicIRateReportD> rMpHarmonicIRateReportDMap;
+    //各相各次间谐波电压含有率 r_mp_inharmonic_v_rate_report_d
+    @ApiModelProperty(name = "rMpInharmonicVRateReportDMap", value = "各相各次间谐波电压含有率")
+    private Map<String, RMpInharmonicVRateReportD> rMpInharmonicVRateReportDMap;
+    //各相各次间谐波电流含有率 r_mp_inharmonic_i_rate_report_d
+    @ApiModelProperty(name = "rMpInharmonicIRateReportDMap", value = "各相各次间谐波电流含有率")
+    private Map<String, RMpInharmonicIRateReportD> rMpInharmonicIRateReportDMap;
+}
+
diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RMpHarmonicReportMVO.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RMpHarmonicReportMVO.java
new file mode 100644
index 000000000..5be612264
--- /dev/null
+++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RMpHarmonicReportMVO.java
@@ -0,0 +1,15 @@
+package com.njcn.harmonic.pojo.vo;
+
+import java.io.Serializable;
+
+/**
+ * 【基准水平】
+ * @Title RMpHarmonicReportMVO
+ * @Package com.njcn.harmonic.pojo.vo
+ * @Author jianghaifei
+ * @Date 2022-10-20 13:53
+ * @Version V1.0
+ */
+public class RMpHarmonicReportMVO implements Serializable {
+
+}
diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RMpPartHarmonicDetailIconVO.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RMpPartHarmonicDetailIconVO.java
new file mode 100644
index 000000000..a00b9f6ee
--- /dev/null
+++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RMpPartHarmonicDetailIconVO.java
@@ -0,0 +1,47 @@
+package com.njcn.harmonic.pojo.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.time.LocalDate;
+
+/**
+ * <功能描述>
+ *
+ * @author wr
+ * @createTime: 2022-10-24
+ */
+@Data
+public class RMpPartHarmonicDetailIconVO {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "时间")
+    private String dataDate;
+
+    @ApiModelProperty(value = "谐波电压超标次数")
+    private Integer vTimes;
+
+    @ApiModelProperty(value = "谐波电流超标次数")
+    private Integer iTimes;
+
+    @ApiModelProperty(value = "三相电压不平衡度超标次数")
+    private Integer unbalanceTimes;
+
+    @ApiModelProperty(value = "负序电流超标次数")
+    private Integer iNegTimes;
+
+    @ApiModelProperty(value = "频率偏差超标次数")
+    private Integer freqTimes;
+
+    @ApiModelProperty(value = "电压偏差超标次数")
+    private Integer vDevTimes;
+
+    @ApiModelProperty(value = "闪变发生次数")
+    private Integer flickerTimes;
+
+    @ApiModelProperty(value = "间谐波电压超标次数")
+    private Integer inuharmTimes;
+
+
+}
diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RMpPartHarmonicDetailVO.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RMpPartHarmonicDetailVO.java
new file mode 100644
index 000000000..e9e1b9960
--- /dev/null
+++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RMpPartHarmonicDetailVO.java
@@ -0,0 +1,218 @@
+package com.njcn.harmonic.pojo.vo;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.time.LocalDate;
+
+/**
+ * <功能描述>
+ *
+ * @author wr
+ * @createTime: 2022-10-24
+ */
+@Data
+public class RMpPartHarmonicDetailVO {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "监测点ID")
+    private String measurementPointId;
+
+    @ApiModelProperty(value = "所属单位名称")
+    private String OrgName;
+
+    @ApiModelProperty(value = "所属变电站名称")
+    private String powerrName;
+
+    @ApiModelProperty(value = "电压等级名称")
+    private String monitorVoltageName;
+
+    @ApiModelProperty(value = "监测点名称")
+    private String measurementPointName;
+
+    @ApiModelProperty(value = "生成数据的时间,每月统计一次")
+    private LocalDate dataDate;
+
+    @ApiModelProperty(value = "当月超标天数")
+    private Integer measurementOverDay;
+
+    @ApiModelProperty(value = "频率偏差超标天数")
+    private Integer freqOverDay;
+
+    @ApiModelProperty(value = "电压上偏差超标天数")
+    private Integer vDevUpOverDay;
+
+    @ApiModelProperty(value = "电压下偏差超标天数")
+    private Integer vDevLowOverDay;
+
+    @ApiModelProperty(value = "电压偏差超标天数")
+    private Integer vDevOverDay;
+
+    @ApiModelProperty(value = "电压总谐波畸变率超标天数")
+    private Integer vThdOverDay;
+
+    @ApiModelProperty(value = "谐波电压超标天数")
+    private Integer vOverDay;
+
+    @ApiModelProperty(value = "谐波电流超标天数")
+    private Integer iOverDay;
+
+    @ApiModelProperty(value = "2次谐波电压含有率超标天数")
+    private Integer v2OverDay;
+
+    @ApiModelProperty(value = "3次谐波电压含有率超标天数")
+    private Integer v3OverDay;
+
+    @ApiModelProperty(value = "4次谐波电压含有率超标天数")
+    private Integer v4OverDay;
+
+    @ApiModelProperty(value = "5次谐波电压含有率超标天数")
+    private Integer v5OverDay;
+
+    @ApiModelProperty(value = "6次谐波电压含有率超标天数")
+    private Integer v6OverDay;
+
+    @ApiModelProperty(value = "7次谐波电压含有率超标天数")
+    private Integer v7OverDay;
+
+    @ApiModelProperty(value = "8次谐波电压含有率超标天数")
+    private Integer v8OverDay;
+
+    @ApiModelProperty(value = "9次谐波电压含有率超标天数")
+    private Integer v9OverDay;
+
+    @ApiModelProperty(value = "10次谐波电压含有率超标天数")
+    private Integer v10OverDay;
+
+    @ApiModelProperty(value = "11次谐波电压含有率超标天数")
+    private Integer v11OverDay;
+
+    @ApiModelProperty(value = "12次谐波电压含有率超标天数")
+    private Integer v12OverDay;
+
+    @ApiModelProperty(value = "13次谐波电压含有率超标天数")
+    private Integer v13OverDay;
+
+    @ApiModelProperty(value = "14次谐波电压含有率超标天数")
+    private Integer v14OverDay;
+
+    @ApiModelProperty(value = "15次谐波电压含有率超标天数")
+    private Integer v15OverDay;
+
+    @ApiModelProperty(value = "16次谐波电压含有率超标天数")
+    private Integer v16OverDay;
+
+    @ApiModelProperty(value = "17次谐波电压含有率超标天数")
+    private Integer v17OverDay;
+
+    @ApiModelProperty(value = "18次谐波电压含有率超标天数")
+    private Integer v18OverDay;
+
+    @ApiModelProperty(value = "19次谐波电压含有率超标天数")
+    private Integer v19OverDay;
+
+    @ApiModelProperty(value = "20次谐波电压含有率超标天数")
+    private Integer v20OverDay;
+
+    @ApiModelProperty(value = "21次谐波电压含有率超标天数")
+    private Integer v21OverDay;
+
+    @ApiModelProperty(value = "22次谐波电压含有率超标天数")
+    private Integer v22OverDay;
+
+    @ApiModelProperty(value = "23次谐波电压含有率超标天数")
+    private Integer v23OverDay;
+
+    @ApiModelProperty(value = "24次谐波电压含有率超标天数")
+    private Integer v24OverDay;
+
+    @ApiModelProperty(value = "25次谐波电压含有率超标天数")
+    private Integer v25OverDay;
+
+    @ApiModelProperty(value = "2次谐波电流含有率超标天数")
+    private Integer i2OverDay;
+
+    @ApiModelProperty(value = "3次谐波电流含有率超标天数")
+    private Integer i3OverDay;
+
+    @ApiModelProperty(value = "4次谐波电流含有率超标天数")
+    private Integer i4OverDay;
+
+    @ApiModelProperty(value = "5次谐波电流含有率超标天数")
+    private Integer i5OverDay;
+
+    @ApiModelProperty(value = "6次谐波电流含有率超标天数")
+    private Integer i6OverDay;
+
+    @ApiModelProperty(value = "7次谐波电流含有率超标天数")
+    private Integer i7OverDay;
+
+    @ApiModelProperty(value = "8次谐波电流含有率超标天数")
+    private Integer i8OverDay;
+
+    @ApiModelProperty(value = "9次谐波电流含有率超标天数")
+    private Integer i9OverDay;
+
+    @ApiModelProperty(value = "10次谐波电流含有率超标天数")
+    private Integer i10OverDay;
+
+    @ApiModelProperty(value = "11次谐波电流含有率超标天数")
+    private Integer i11OverDay;
+
+    @ApiModelProperty(value = "12次谐波电流含有率超标天数")
+    private Integer i12OverDay;
+
+    @ApiModelProperty(value = "13次谐波电流含有率超标天数")
+    private Integer i13OverDay;
+
+    @ApiModelProperty(value = "14次谐波电流含有率超标天数")
+    private Integer i14OverDay;
+
+    @ApiModelProperty(value = "15次谐波电流含有率超标天数")
+    private Integer i15OverDay;
+
+    @ApiModelProperty(value = "16次谐波电流含有率超标天数")
+    private Integer i16OverDay;
+
+    @ApiModelProperty(value = "17次谐波电流含有率超标天数")
+    private Integer i17OverDay;
+
+    @ApiModelProperty(value = "18次谐波电流含有率超标天数")
+    private Integer i18OverDay;
+
+    @ApiModelProperty(value = "19次谐波电流含有率超标天数")
+    private Integer i19OverDay;
+
+    @ApiModelProperty(value = "20次谐波电流含有率超标天数")
+    private Integer i20OverDay;
+
+    @ApiModelProperty(value = "21次谐波电流含有率超标天数")
+    private Integer i21OverDay;
+
+    @ApiModelProperty(value = "22次谐波电流含有率超标天数")
+    private Integer i22OverDay;
+
+    @ApiModelProperty(value = "23次谐波电流含有率超标天数")
+    private Integer i23OverDay;
+
+    @ApiModelProperty(value = "24次谐波电流含有率超标天数")
+    private Integer i24OverDay;
+
+    @ApiModelProperty(value = "25次谐波电流含有率超标天数")
+    private Integer i25OverDay;
+
+    @ApiModelProperty(value = "间谐波电压超标天数")
+    private Integer inuharmOverDay;
+
+    @ApiModelProperty(value = "三相电压不平衡度超标天数")
+    private Integer unbalanceOverDay;
+
+    @ApiModelProperty(value = "负序电流超标天数")
+    private Integer iNegOverDay;
+
+    @ApiModelProperty(value = "闪变超标天数")
+    private Integer flickerOverDay;
+}
diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RStatHarmonicMVO.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RStatHarmonicMVO.java
new file mode 100644
index 000000000..ca52ec297
--- /dev/null
+++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RStatHarmonicMVO.java
@@ -0,0 +1,42 @@
+package com.njcn.harmonic.pojo.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author rui.wu
+ * @since 2022-10-09
+ */
+@Data
+public class RStatHarmonicMVO {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("排序")
+    private Integer sort;
+
+    @ApiModelProperty(value = "稳态指标类型名称")
+    private String harmonicName;
+
+    @ApiModelProperty(value = "日均超标监测点数")
+    private Integer overLimitMeasurementAverage;
+
+    @ApiModelProperty(value = "累计超标监测点数")
+    private Integer overLimitMeasurementAccrued;
+
+    @ApiModelProperty(value = "累计超标天数")
+    private Integer overDay;
+
+    @ApiModelProperty(value = "日均超标监测点数占比")
+    private Float overLimitMeasurementRatioAverage;
+
+    @ApiModelProperty(value = "累计超标监测点数占比")
+    private Float overLimitMeasurementRatioAccrued;
+
+    @ApiModelProperty(value = "平均超标天数")
+    private Float averageOverDay;
+}
diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RStatLoadTypeVO.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RStatLoadTypeVO.java
new file mode 100644
index 000000000..84c7f6c9b
--- /dev/null
+++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RStatLoadTypeVO.java
@@ -0,0 +1,72 @@
+package com.njcn.harmonic.pojo.vo;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+import java.time.LocalDate;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author rui.wu
+ * @since 2022-10-19
+ */
+@Data
+public class RStatLoadTypeVO  {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "排序")
+    private Integer sort;
+
+    @ApiModelProperty(value = "单位ID")
+    private String orgNo;
+
+    @ApiModelProperty(value = "单位名称")
+    private String orgName;
+
+    @ApiModelProperty(value = "四类典型干扰源类型(风电、光伏、其他非线性负荷、电铁)")
+    private String loadType;
+
+    @ApiModelProperty(value = "四类典型干扰源类型(风电、光伏、其他非线性负荷、电铁)")
+    private String loadName;
+
+    @ApiModelProperty(value = "日均谐波电压超标点占比")
+    private Float vAverage;
+
+    @ApiModelProperty(value = "累计谐波电压超标占比")
+    private Float vAccrued;
+
+    @ApiModelProperty(value = "日均谐波电流超标点占比")
+    private Float iAverage;
+
+    @ApiModelProperty(value = "累计谐波电流超标占比")
+    private Float iAccrued;
+
+    @ApiModelProperty(value = "日均三相电压不平衡度超标点占比")
+    private Float unbalanceAverage;
+
+    @ApiModelProperty(value = "累计三相电压不平衡度超标占比")
+    private Float unbalanceAccrued;
+
+    @ApiModelProperty(value = "日均负序电流超标点占比")
+    private Float iNegAverage;
+
+    @ApiModelProperty(value = "累计负序电流超标占比")
+    private Float iNegAccrued;
+
+    @ApiModelProperty(value = "日均闪变超标点占比")
+    private Float flickerAverage;
+
+    @ApiModelProperty(value = "累计闪变超标占比")
+    private Float flickerAccrued;
+
+}
diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RStatOrgBusbarVoltageVO.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RStatOrgBusbarVoltageVO.java
new file mode 100644
index 000000000..bd10d3126
--- /dev/null
+++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RStatOrgBusbarVoltageVO.java
@@ -0,0 +1,64 @@
+package com.njcn.harmonic.pojo.vo;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+import java.time.LocalDate;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author rui.wu
+ * @since 2022-10-19
+ */
+@Data
+public class RStatOrgBusbarVoltageVO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "单位ID")
+    private String orgNo;
+
+    @ApiModelProperty(value = "单位名称")
+    private String orgName;
+
+    @ApiModelProperty(value = "变电站ID")
+    private String PowerStationID;
+
+    @ApiModelProperty(value = "变电站名称")
+    private String PowerStationName;
+
+    @ApiModelProperty(value = "母线ID")
+    private String busbarId;
+
+    @ApiModelProperty(value = "母线电压等级")
+    private String busbarName;
+
+    @ApiModelProperty(value = "日均谐波电压超标-占比")
+    private Float vAverage;
+
+    @ApiModelProperty(value = "累计谐波电压超标-占比")
+    private Float vAccrued;
+
+    @ApiModelProperty(value = "日均三相电压不平衡超标-占比")
+    private Float unbalanceAverage;
+
+    @ApiModelProperty(value = "累计三相电压不平衡超标-占比")
+    private Float unbalanceAccrued;
+
+    @ApiModelProperty(value = "日均闪变超标-占比")
+    private Float flickerAverage;
+
+    @ApiModelProperty(value = "累计闪变超标-占比")
+    private Float flickerAccrued;
+
+
+}
diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RStatOrgIndexVO.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RStatOrgIndexVO.java
new file mode 100644
index 000000000..241f86401
--- /dev/null
+++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RStatOrgIndexVO.java
@@ -0,0 +1,68 @@
+package com.njcn.harmonic.pojo.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author rui.wu
+ * @since 2022-10-18
+ */
+@Data
+public class RStatOrgIndexVO  {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "单位id")
+    private String orgNo;
+
+    @ApiModelProperty(value = "单位名称")
+    private String orgName;
+
+    @ApiModelProperty(value = "监测点ID")
+    private String measurementPointId;
+
+    @ApiModelProperty(value = "监测点名称")
+    private String measurementPointName;
+
+    @ApiModelProperty(value = "监测点电压等级名称")
+    private String monitorVoltageName;
+
+    @ApiModelProperty(value = "电站名称")
+    private String powerrName;
+
+    @ApiModelProperty(value = "频率偏差合格率月")
+    private Float freqPassRate;
+
+    @ApiModelProperty(value = "电压偏差合格率月")
+    private Float vDevPassRate;
+
+    @ApiModelProperty(value = "闪变合格率月")
+    private Float flickerPassRate;
+
+    @Data
+    @EqualsAndHashCode(callSuper = true)
+    public static class RStatOrgIndexInfoVO extends RStatOrgIndexVO {
+
+        @ApiModelProperty(value = "在线监测点数")
+        private Integer allCount;
+
+        @ApiModelProperty(value = "频率偏差合格率年")
+        private Float freqPassRateYear;
+
+        @ApiModelProperty(value = "电压偏差合格率年")
+        private Float vDevPassRateYear;
+
+        @ApiModelProperty(value = "闪变合格率年")
+        private Float flickerPassRateYear;
+
+
+    }
+
+}
diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RStatOrgVO.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RStatOrgVO.java
new file mode 100644
index 000000000..e9f6b1313
--- /dev/null
+++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RStatOrgVO.java
@@ -0,0 +1,47 @@
+package com.njcn.harmonic.pojo.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 区域分类统计季表
+ * </p>
+ *
+ * @author rui.wu
+ * @since 2022-10-17
+ */
+@Data
+public class RStatOrgVO  {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "单位名称")
+    private String orgName;
+
+    @ApiModelProperty(value = "日均有效接入监测点数")
+    private Integer effectiveMeasurementAverage;
+
+    @ApiModelProperty(value = "累计有效接入监测点数")
+    private Integer effectiveMeasurementAccrued;
+
+    @ApiModelProperty(value = "日均稳态超标监测点数")
+    private Integer overLimitMeasurementAverage;
+
+    @ApiModelProperty(value = "累计稳态超标监测点数")
+    private Integer overLimitMeasurementAccrued;
+
+    @ApiModelProperty(value = "日均稳态超标监测点数占比")
+    private Float harmonicMeasurementRatioAverage;
+
+    @ApiModelProperty(value = "累计稳态超标监测点数占比")
+    private Float harmonicMeasurementRatioAccrued;
+
+    @ApiModelProperty(value = "稳态指标平均超标天数")
+    private Float averageOverDay;
+
+
+
+}
diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RStatSubstationOrg2VO.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RStatSubstationOrg2VO.java
new file mode 100644
index 000000000..0bf5248ff
--- /dev/null
+++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RStatSubstationOrg2VO.java
@@ -0,0 +1,212 @@
+package com.njcn.harmonic.pojo.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 变电站指标统计表实体类
+ *
+ * @author rui.wu
+ * @since 2022-10-18
+ */
+@Data
+@ApiModel(value = "变电站指标统计表实体类")
+public class RStatSubstationOrg2VO implements Serializable {
+    private static final long serialVersionUID = 117875946877905400L;
+
+    public static final String FREQUENCY_DEV = "Frequency_Dev";
+    public static final String VOLTAGE_DEV = "Voltage_Dev";
+    public static final String FLICKER = "Flicker";
+    public static final String HARMONIC_VOLTAGE = "Harmonic_Voltage";
+    public static final String HARMONIC_CURRENT = "Harmonic_Current";
+    public static final String INTERHARMONIC_VOLTAGE = "Interharmonic_Voltage";
+    public static final String PHASE_VOLTAGE = "phase_Voltage";
+    public static final String NEG_CURRENT = "Neg_Current";
+    public static final String TOTAL_INDICATOR = "Total_Indicator";
+
+    /**
+     * 单位ID
+     */
+    @ApiModelProperty(name = "orgNo", value = "单位ID")
+    private String orgNo;
+
+    /**
+     * 单位名称
+     */
+    @ApiModelProperty(name = "orgName", value = "单位名称")
+    private String orgName;
+
+    /**
+     * 生成数据的时间,每年统计一次
+     */
+    @ApiModelProperty(name = "dataDate", value = "生成数据的时间,每年统计一次")
+    private Date dataDate;
+
+    /**
+     * 日均有效接入监测点数
+     */
+    @ApiModelProperty(name = "effectiveMeasurementAverage", value = "日均有效接入监测点数")
+    private Integer effectiveMeasurementAverage;
+
+    /**
+     * 累计有效接入监测点数
+     */
+    @ApiModelProperty(name = "effectiveMeasurementAccrued", value = "累计有效接入监测点数")
+    private Integer effectiveMeasurementAccrued;
+
+    /**
+     * 日均稳态超标监测点数
+     */
+    @ApiModelProperty(name = "eventMeasurementAverage", value = "日均监测到暂态指标的监测点数")
+    private Integer harmonicMeasurementAverage;
+
+    /**
+     * 累计稳态超标监测点数
+     */
+    @ApiModelProperty(name = "eventMeasurementAccrued", value = "累计监测到暂态指标的监测点数")
+    private Integer harmonicMeasurementAccrued;
+
+    /**
+     * 日均暂态超标监测点数占比
+     */
+    @ApiModelProperty(name = "eventMeasurementRatioAverage", value = "日均暂态超标监测点数占比")
+    private Integer harmonicMeasurementRatioAverage;
+
+    /**
+     * 累计暂态超标监测点数占比
+     */
+    @ApiModelProperty(name = "eventMeasurementRatioAccrued", value = "累计暂态超标监测点数占比")
+    private Integer harmonicMeasurementRatioAccrued;
+
+    /**
+     * 暂态指标类型Id，字典表ID
+     */
+    @ApiModelProperty(name = "eventType", value = "暂态指标类型Id，字典表ID")
+    private String harmonicType;
+
+    /**
+     * 频率偏差
+     */
+    private Integer tAverage;
+    private Integer tAccrued;
+    private Float oAverage;
+    private Float oAccrued;
+    private Integer chainAverage;
+    private Integer chainAccrued;
+    private Integer sameAverage;
+    private Integer sameAccrued;
+    private Float averageOverDay;
+
+    /**
+     *  电压偏差
+     */
+    private Integer tAverage1;
+    private Integer tAccrued1;
+    private Float oAverage1;
+    private Float oAccrued1;
+    private Integer chainAverage1;
+    private Integer chainAccrued1;
+    private Integer sameAverage1;
+    private Integer sameAccrued1;
+    private Float averageOverDay1;
+
+    /**
+     * 闪变
+     */
+    private Integer tAverage2;
+    private Integer tAccrued2;
+    private Float oAverage2;
+    private Float oAccrued2;
+    private Integer chainAverage2;
+    private Integer chainAccrued2;
+    private Integer sameAverage2;
+    private Integer sameAccrued2;
+    private Float averageOverDay2;
+
+    /**
+     * 谐波电压
+     */
+    private Integer tAverage3;
+    private Integer tAccrued3;
+    private Float oAverage3;
+    private Float oAccrued3;
+    private Integer chainAverage3;
+    private Integer chainAccrued3;
+    private Integer sameAverage3;
+    private Integer sameAccrued3;
+    private Float averageOverDay3;
+
+    /**
+     *谐波电流
+     */
+    private Integer tAverage4;
+    private Integer tAccrued4;
+    private Float oAverage4;
+    private Float oAccrued4;
+    private Integer chainAverage4;
+    private Integer chainAccrued4;
+    private Integer sameAverage4;
+    private Integer sameAccrued4;
+    private Float averageOverDay4;
+
+
+    /**
+     *间谐波电压
+     */
+    private Integer tAverage5;
+    private Integer tAccrued5;
+    private Float oAverage5;
+    private Float oAccrued5;
+    private Integer chainAverage5;
+    private Integer chainAccrued5;
+    private Integer sameAverage5;
+    private Integer sameAccrued5;
+    private Float averageOverDay5;
+
+
+    /**
+     *三相电压不平衡度
+     */
+    private Integer tAverage6;
+    private Integer tAccrued6;
+    private Float oAverage6;
+    private Float oAccrued6;
+    private Integer chainAverage6;
+    private Integer chainAccrued6;
+    private Integer sameAverage6;
+    private Integer sameAccrued6;
+    private Float averageOverDay6;
+
+    /**
+     *负序电流
+     */
+    private Integer tAverage7;
+    private Integer tAccrued7;
+    private Float oAverage7;
+    private Float oAccrued7;
+    private Integer chainAverage7;
+    private Integer chainAccrued7;
+    private Integer sameAverage7;
+    private Integer sameAccrued7;
+    private Float averageOverDay7;
+
+    /**
+     *总稳态指标
+     */
+    private Integer tAverage8;
+    private Integer tAccrued8;
+    private Float oAverage8;
+    private Float oAccrued8;
+    private Integer chainAverage8;
+    private Integer chainAccrued8;
+    private Integer sameAverage8;
+    private Integer sameAccrued8;
+    private Float averageOverDay8;
+
+
+}
+
diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RStatSubstationOrgVO.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RStatSubstationOrgVO.java
new file mode 100644
index 000000000..ef11f1c86
--- /dev/null
+++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RStatSubstationOrgVO.java
@@ -0,0 +1,121 @@
+package com.njcn.harmonic.pojo.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 变电站指标统计表实体类
+ *
+ * @author rui.wu
+ * @since 2022-10-18
+ */
+@Data
+@ApiModel(value = "变电站指标统计表实体类")
+public class RStatSubstationOrgVO implements Serializable {
+    private static final long serialVersionUID = 117875946877905400L;
+
+    public static final String Frequency_Dev = "Frequency_Dev";
+    public static final String Voltage_Dev = "Voltage_Dev";
+    public static final String Flicker = "Flicker";
+    public static final String Harmonic_Voltage = "Harmonic_Voltage";
+    public static final String Harmonic_Current = "Harmonic_Current";
+    public static final String Interharmonic_Voltage = "Interharmonic_Voltage";
+    public static final String phase_Voltage = "phase_Voltage";
+    public static final String Neg_Current = "Neg_Current";
+    public static final String Total_Indicator = "Total_Indicator";
+
+    /**
+     * 单位ID
+     */
+    @ApiModelProperty(name = "orgNo", value = "单位ID")
+    private String orgNo;
+
+    /**
+     * 单位名称
+     */
+    @ApiModelProperty(name = "orgName", value = "单位名称")
+    private String orgName;
+
+    /**
+     * 生成数据的时间,每年统计一次
+     */
+    @ApiModelProperty(name = "dataDate", value = "生成数据的时间,每年统计一次")
+    private Date dataDate;
+
+    /**
+     * 日均有效接入监测点数
+     */
+    @ApiModelProperty(name = "effectiveMeasurementAverage", value = "日均有效接入监测点数")
+    private Integer effectiveMeasurementAverage;
+
+    /**
+     * 累计有效接入监测点数
+     */
+    @ApiModelProperty(name = "effectiveMeasurementAccrued", value = "累计有效接入监测点数")
+    private Integer effectiveMeasurementAccrued;
+
+    /**
+     * 日均稳态超标监测点数
+     */
+    @ApiModelProperty(name = "eventMeasurementAverage", value = "日均监测到暂态指标的监测点数")
+    private Integer harmonicMeasurementAverage;
+
+    /**
+     * 累计稳态超标监测点数
+     */
+    @ApiModelProperty(name = "eventMeasurementAccrued", value = "累计监测到暂态指标的监测点数")
+    private Integer harmonicMeasurementAccrued;
+
+    /**
+     * 日均暂态超标监测点数占比
+     */
+    @ApiModelProperty(name = "eventMeasurementRatioAverage", value = "日均暂态超标监测点数占比")
+    private Integer harmonicMeasurementRatioAverage;
+
+    /**
+     * 累计暂态超标监测点数占比
+     */
+    @ApiModelProperty(name = "eventMeasurementRatioAccrued", value = "累计暂态超标监测点数占比")
+    private Integer harmonicMeasurementRatioAccrued;
+
+    /**
+     * 暂态指标类型Id，字典表ID
+     */
+    @ApiModelProperty(name = "eventType", value = "暂态指标类型Id，字典表ID")
+    private String harmonicType;
+
+    /**
+     * 日均超标监测点数（根据 日表的超标监测点数 取平均值）
+     */
+    private Integer overLimitMeasurementAverage;
+    /**
+     * 累计超标监测点数（监测点指标统计明细日表 统计）
+     */
+    private Integer overLimitMeasurementAccrued;
+    /**
+     * 累计超标天数（根据 日表的超标监测点数 求和）
+     */
+    private Integer overDay;
+    /**
+     * 日均超标监测点数占比（根据 日表的超标监测点数占比 取平均值）
+     */
+    private Float overLimitMeasurementRatioAverage;
+    /**
+     * 累计超标监测点数占比（此表的累计超标监测点数/区域统计表中的区域分类统计月表中的累计有效接入监测点数）
+     */
+    private Float overLimitMeasurementRatioAccrued;
+    //同比，环比，平均天数
+    private Integer chainAverage;
+    private Integer chainAccrued;
+    private Integer sameAverage;
+    private Integer sameAccrued;
+    private Float   averageOverDay;
+
+
+
+}
+
diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RSubstationIcon2VO.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RSubstationIcon2VO.java
new file mode 100644
index 000000000..2ea833ad8
--- /dev/null
+++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RSubstationIcon2VO.java
@@ -0,0 +1,65 @@
+package com.njcn.harmonic.pojo.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author rui.wu
+ * @since 2022-10-18
+ */
+@Data
+public class RSubstationIcon2VO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "变电站id")
+    private String substationId;
+
+    @ApiModelProperty(value = "变电站名称")
+    private String substationName;
+
+    @ApiModelProperty(value = "在线监测点数")
+    private Integer effectiveMeasurementAccrued;
+
+    @ApiModelProperty(value = "频率偏差天数")
+    private Float freqAverageOverDay;
+
+    @ApiModelProperty(value = "电压偏差天数")
+    private Float vDevAverageOverDay;
+
+    @ApiModelProperty(value = "闪变天数")
+    private Float flickerAverageOverDay;
+
+    @ApiModelProperty(value = "谐波电压天数")
+    private Float vAverageOverDay;
+
+    @ApiModelProperty(value = "谐波电流天数")
+    private Float iAverageOverDay;
+
+    @ApiModelProperty(value = "间谐波电压天数")
+    private Float inuharmAverageOverDay;
+
+    @ApiModelProperty(value = "三相电压不平衡天数")
+    private Float unbalanceAverageOverDay;
+
+    @ApiModelProperty(value = "负序电流天数")
+    private Float iNegAverageOverDay;
+
+    @Data
+    @EqualsAndHashCode(callSuper = true)
+    public static class RSubstationInfoVO extends RSubstationIcon2VO {
+//        @ApiModelProperty(value = "省公司")
+//        private String provinceName;
+
+        @ApiModelProperty(value = "市公司")
+        private String cityName;
+    }
+
+}
diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RSubstationIconVO.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RSubstationIconVO.java
new file mode 100644
index 000000000..a7877f467
--- /dev/null
+++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RSubstationIconVO.java
@@ -0,0 +1,42 @@
+package com.njcn.harmonic.pojo.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * <功能描述>
+ *
+ * @author 1754607820@qq.com
+ * @createTime: 2022-10-18
+ */
+@Data
+public class RSubstationIconVO {
+    private static final long serialVersionUID = 1L;
+    /**
+     * 柱状图
+     */
+    private String num1;
+    private String num2;
+    private String num3;
+    private String num4;
+    private String num5;
+    private String num6;
+    private String num7;
+    private String num8;
+    private String num9;
+    private String num10;
+    /**
+     * 折线图
+     */
+    private String upRatio1;
+    private String upRatio2;
+    private String upRatio3;
+    private String upRatio4;
+    private String upRatio5;
+    private String upRatio6;
+    private String upRatio7;
+    private String upRatio8;
+    private String upRatio9;
+    private String upRatio10;
+
+}
diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RVoltageIconVO.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RVoltageIconVO.java
new file mode 100644
index 000000000..0cd59e665
--- /dev/null
+++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RVoltageIconVO.java
@@ -0,0 +1,26 @@
+package com.njcn.harmonic.pojo.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * <功能描述>
+ *
+ * @author 1754607820@qq.com
+ * @createTime: 2022-10-18
+ */
+@Data
+public class RVoltageIconVO {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "电压等级")
+    private String substationVoltage;
+
+    @ApiModelProperty(value = "变电站数量")
+    private Integer substationCount;
+
+    @ApiModelProperty(value = "稳态超标变电站数量")
+    private Integer harmonicCount;
+
+}
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/DataExceptionController.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/DataExceptionController.java
new file mode 100644
index 000000000..da726468f
--- /dev/null
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/DataExceptionController.java
@@ -0,0 +1,51 @@
+package com.njcn.harmonic.controller;
+
+import com.njcn.common.pojo.annotation.OperateInfo;
+import com.njcn.common.pojo.enums.common.LogEnum;
+import com.njcn.common.pojo.enums.response.CommonResponseEnum;
+import com.njcn.common.pojo.response.HttpResult;
+import com.njcn.common.utils.HttpResultUtil;
+import com.njcn.harmonic.pojo.param.AlgorithmSearchParam;
+import com.njcn.harmonic.service.DataExceptionService;
+import com.njcn.web.controller.BaseController;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @author qijian
+ * @date 2022/10/26
+ * 数据是否异常
+ */
+@Validated
+@Slf4j
+@RestController
+@RequestMapping("/dataException")
+@Api(tags = "数据是否异常")
+@AllArgsConstructor
+public class DataExceptionController extends BaseController {
+
+    private final DataExceptionService dataExceptionService;
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/lineDataException")
+    @ApiOperation("监测点数据是否异常")
+    @ApiImplicitParam(name = "algorithmSearchParam", value = "算法通用查询参数", required = true)
+    public HttpResult<Boolean> lineDataException(@RequestBody @Validated AlgorithmSearchParam algorithmSearchParam) {
+        String methodDescribe = getMethodDescribe("lineDataException");
+        boolean res = dataExceptionService.lineDataException(algorithmSearchParam);
+        if(res){
+            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
+        }else {
+            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, null, methodDescribe);
+        }
+
+    }
+}
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/DataIntegrityRateController.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/DataIntegrityRateController.java
new file mode 100644
index 000000000..4d6a72e35
--- /dev/null
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/DataIntegrityRateController.java
@@ -0,0 +1,51 @@
+package com.njcn.harmonic.controller;
+
+import com.njcn.common.pojo.annotation.OperateInfo;
+import com.njcn.common.pojo.enums.common.LogEnum;
+import com.njcn.common.pojo.enums.response.CommonResponseEnum;
+import com.njcn.common.pojo.response.HttpResult;
+import com.njcn.common.utils.HttpResultUtil;
+import com.njcn.harmonic.pojo.param.AlgorithmSearchParam;
+import com.njcn.harmonic.service.DataIntegrityRateService;
+import com.njcn.web.controller.BaseController;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @author qijian
+ * @date 2022/10/26
+ * 数据完整率算法
+ */
+@Validated
+@Slf4j
+@RestController
+@RequestMapping("/dataIntegrityRate")
+@Api(tags = "数据完整率算法")
+@AllArgsConstructor
+public class DataIntegrityRateController extends BaseController {
+
+    private final DataIntegrityRateService dataIntegrityRateService;
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/lineDataIntegrityRate")
+    @ApiOperation("监测点日数据完整率")
+    @ApiImplicitParam(name = "algorithmSearchParam", value = "算法通用查询参数", required = true)
+    public HttpResult<Boolean> lineDataIntegrityRate(@RequestBody @Validated AlgorithmSearchParam algorithmSearchParam) {
+        String methodDescribe = getMethodDescribe("lineDataIntegrityRate");
+        boolean res = dataIntegrityRateService.lineDataIntegrityRate(algorithmSearchParam);
+        if(res){
+            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
+        }else {
+            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, null, methodDescribe);
+        }
+
+    }
+}
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/RMpBenchmarkLevelController.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/RMpBenchmarkLevelController.java
new file mode 100644
index 000000000..0b05502bf
--- /dev/null
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/RMpBenchmarkLevelController.java
@@ -0,0 +1,72 @@
+package com.njcn.harmonic.controller;
+
+import com.njcn.common.pojo.annotation.OperateInfo;
+import com.njcn.common.pojo.constant.BizParamConstant;
+import com.njcn.common.pojo.enums.common.LogEnum;
+import com.njcn.common.pojo.enums.response.CommonResponseEnum;
+import com.njcn.common.pojo.response.HttpResult;
+import com.njcn.common.utils.HttpResultUtil;
+import com.njcn.harmonic.pojo.param.RMpBenchmarkLevelParam;
+import com.njcn.harmonic.pojo.vo.RMpBenchmarkLevelVO;
+import com.njcn.harmonic.service.RMpBenchmarkLevelMService;
+import com.njcn.harmonic.service.RMpBenchmarkLevelQService;
+import com.njcn.harmonic.service.RMpBenchmarkLevelYService;
+import com.njcn.web.controller.BaseController;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * @Title RMpBenchmarkLevelController
+ * @Package com.njcn.device.pms.controller
+ * @Author jianghaifei
+ * @Date 2022-10-11 10:34
+ * @Version V1.0
+ */
+@RestController
+@Api(tags = "主网-区域稳态电能质量水平评估")
+@RequiredArgsConstructor
+@RequestMapping("/rMpBenchmarkLevel")
+public class RMpBenchmarkLevelController extends BaseController {
+
+    private final RMpBenchmarkLevelMService rMpBenchmarkLevelMService; //基准水平-月
+
+    private final RMpBenchmarkLevelQService rMpBenchmarkLevelQService; //基准水平-季
+
+    private final RMpBenchmarkLevelYService rMpBenchmarkLevelYService; //基准水平-年
+
+
+    @PostMapping("getAllRMpBenchmarkLevelList")
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @ApiOperation("查询区域稳态电能质量水平评估")
+    public HttpResult<List<RMpBenchmarkLevelVO>> getAllRMpBenchmarkLevelList(@RequestBody RMpBenchmarkLevelParam rMpBenchmarkLevelParam) {
+        String methodDescribe = getMethodDescribe("getAllRMpBenchmarkLevelList");
+        //获取查询条件-时间类型
+        String type = rMpBenchmarkLevelParam.getType().toString();
+        List<RMpBenchmarkLevelVO> rMpBenchmarkLevelList;
+        switch (type) {
+            case BizParamConstant.STAT_BIZ_YEAR:
+                //查询基准水平-年数据
+                rMpBenchmarkLevelList = rMpBenchmarkLevelYService.getRMpBenchmarkLevelList(rMpBenchmarkLevelParam);
+                break;
+            case BizParamConstant.STAT_BIZ_QUARTER:
+                //查询基准水平-季数据
+                rMpBenchmarkLevelList = rMpBenchmarkLevelQService.getRMpBenchmarkLevelList(rMpBenchmarkLevelParam);
+                break;
+            case BizParamConstant.STAT_BIZ_MONTH:
+                //查询基准水平-月数据
+                rMpBenchmarkLevelList = rMpBenchmarkLevelMService.getRMpBenchmarkLevelList(rMpBenchmarkLevelParam);
+                break;
+            default:
+                //如果前端没有传type默认查询月数据
+                rMpBenchmarkLevelList = rMpBenchmarkLevelMService.getRMpBenchmarkLevelList(rMpBenchmarkLevelParam);
+        }
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, rMpBenchmarkLevelList, methodDescribe);
+    }
+}
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/RMpHarmonicReportDController.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/RMpHarmonicReportDController.java
new file mode 100644
index 000000000..4d514e192
--- /dev/null
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/RMpHarmonicReportDController.java
@@ -0,0 +1,45 @@
+package com.njcn.harmonic.controller;
+
+import com.njcn.common.pojo.annotation.OperateInfo;
+import com.njcn.common.pojo.enums.common.LogEnum;
+import com.njcn.common.pojo.enums.response.CommonResponseEnum;
+import com.njcn.common.pojo.response.HttpResult;
+import com.njcn.common.utils.HttpResultUtil;
+import com.njcn.harmonic.pojo.param.RMpHarmonicReportDParam;
+import com.njcn.harmonic.pojo.vo.RMpHarmonicReportDVO;
+import com.njcn.harmonic.service.RMpHarmonicReportDService;
+import com.njcn.web.controller.BaseController;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * @Title RMpHarmonicReportDController
+ * @Package com.njcn.harmonic.controller
+ * @Author jianghaifei
+ * @Date 2022-10-20 19:08
+ * @Version V1.0
+ */
+@RestController
+@RequestMapping("/rMpHarmonicReportD")
+@Api(tags = "主网-监测点稳态指标日报")
+@RequiredArgsConstructor
+public class RMpHarmonicReportDController extends BaseController {
+
+    private final RMpHarmonicReportDService rMpHarmonicReportDService;
+
+    @PostMapping("getMonitorStatisticsD")
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @ApiOperation("查询监测点日统计信息")
+    public HttpResult<List<RMpHarmonicReportDVO>> getMonitorStatisticsD(@RequestBody RMpHarmonicReportDParam rMpHarmonicReportDParam) {
+        String methodDescribe = getMethodDescribe("getMonitorStatisticsD");
+        List<RMpHarmonicReportDVO> list = rMpHarmonicReportDService.getMonitorStatisticsD(rMpHarmonicReportDParam);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);
+    }
+}
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/RStatHarmonicMController.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/RStatHarmonicMController.java
new file mode 100644
index 000000000..d81e90a01
--- /dev/null
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/RStatHarmonicMController.java
@@ -0,0 +1,97 @@
+package com.njcn.harmonic.controller;
+
+
+import com.njcn.common.pojo.annotation.OperateInfo;
+import com.njcn.common.pojo.constant.BizParamConstant;
+import com.njcn.common.pojo.enums.common.LogEnum;
+import com.njcn.common.pojo.enums.response.CommonResponseEnum;
+import com.njcn.common.pojo.param.StatisticsBizBaseParam;
+import com.njcn.common.pojo.response.HttpResult;
+import com.njcn.common.utils.HttpResultUtil;
+import com.njcn.harmonic.pojo.param.RStatHarmonicMParam;
+import com.njcn.harmonic.pojo.vo.*;
+import com.njcn.harmonic.service.*;
+import com.njcn.web.controller.BaseController;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author rui.wu
+ * @since 2022-10-09
+ */
+@RestController
+@RequiredArgsConstructor
+@Api(tags = "主网指标分类概览-监测点分类总览")
+@RequestMapping("/harmonic/rStatHarmonic")
+public class RStatHarmonicMController extends BaseController {
+
+    private final RStatHarmonicMService rStatHarmonicMService;
+    private final RStatHarmonicQService rStatHarmonicQService;
+    private final RStatHarmonicYService rStatHarmonicYService;
+
+    /**
+     * 查询查询监测点稳态指标 日/月点数
+     */
+    @GetMapping("/getAllRStatHarmonic")
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @ApiOperation("查询稳态累计超标监测点数")
+    public HttpResult<List<RArrayVO>> getAllRStatHarmonicM(StatisticsBizBaseParam param){
+        String methodDescribe = getMethodDescribe("getAllRStatHarmonic");
+        List<RArrayVO> rStatHarmonicMAll = null;
+        String string = param.getType().toString();
+        switch (string) {
+            //查询超标监测点数-年数据
+            case BizParamConstant.STAT_BIZ_YEAR:
+                rStatHarmonicMAll = rStatHarmonicYService.getRStatHarmonicYAll(param);
+                break;
+            //查询超标监测点数-季数据
+            case BizParamConstant.STAT_BIZ_QUARTER:
+                rStatHarmonicMAll = rStatHarmonicQService.getRStatHarmonicQAll(param);
+                break;
+            //查询超标监测点数-月数据
+            case BizParamConstant.STAT_BIZ_MONTH:
+                rStatHarmonicMAll = rStatHarmonicMService.getRStatHarmonicMAll(param);
+                break;
+            default:
+                break;
+        }
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, rStatHarmonicMAll, methodDescribe);
+    }
+
+    /**
+     * 电铁-频率偏差-电压统计图
+     */
+    @GetMapping("/getRStatHarmonicIconVoltage")
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @ApiOperation("稳态电铁-频率偏差-电压统计图")
+    public HttpResult<List<RIconVO>> getRStatHarmonicIcon(RStatHarmonicMParam param){
+        String methodDescribe = getMethodDescribe("getRStatHarmonicIconVoltage");
+        List<RIconVO> rStatHarmonicIcon = rStatHarmonicMService.getRStatHarmonicIcon(param);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, rStatHarmonicIcon, methodDescribe);
+    }
+
+    /**
+     * 电铁-频率偏差-电压统计图
+     */
+    @GetMapping("/getRStatHarmonicIconDate")
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @ApiOperation("稳态电铁-频率偏差-越线日期统计图")
+    public HttpResult<List<RHarmonicPolylineVO>> getRStatHarmonicIcon2(RStatHarmonicMParam param){
+        String methodDescribe = getMethodDescribe("getRStatHarmonicIconDate");
+        List<RHarmonicPolylineVO> rStatHarmonicIcon = rStatHarmonicMService.getRStatHarmonicIcon2(param);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, rStatHarmonicIcon, methodDescribe);
+    }
+
+
+}
+
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/RStatHarmonicOrgMController.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/RStatHarmonicOrgMController.java
new file mode 100644
index 000000000..f3665b8bf
--- /dev/null
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/RStatHarmonicOrgMController.java
@@ -0,0 +1,104 @@
+package com.njcn.harmonic.controller;
+
+
+import com.njcn.common.pojo.annotation.OperateInfo;
+import com.njcn.common.pojo.constant.BizParamConstant;
+import com.njcn.common.pojo.enums.common.LogEnum;
+import com.njcn.common.pojo.enums.response.CommonResponseEnum;
+import com.njcn.common.pojo.param.StatisticsBizBaseParam;
+import com.njcn.common.pojo.response.HttpResult;
+import com.njcn.common.utils.HttpResultUtil;
+import com.njcn.harmonic.pojo.param.RStatHarmonicMParam;
+import com.njcn.harmonic.pojo.vo.RArrayVO;
+import com.njcn.harmonic.pojo.vo.RIconVO;
+import com.njcn.harmonic.service.*;
+import com.njcn.web.controller.BaseController;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author rui.wu
+ * @since 2022-10-14
+ */
+@RestController
+@RequiredArgsConstructor
+@Api(tags = "主网指标分类概览-各单位分类总览")
+@RequestMapping("/harmonic/rStatHarmonicOrg")
+public class RStatHarmonicOrgMController extends BaseController {
+
+    private final RStatHarmonicOrgYService rStatHarmonicOrgYService;
+    private final RStatHarmonicOrgQService rStatHarmonicOrgQService;
+    private final RStatHarmonicOrgMService rStatHarmonicOrgMService;
+
+    /**
+     * 查询查询监测点稳态指标 日/月点数
+     */
+    @GetMapping("/getAllRStatHarmonicOrg")
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @ApiOperation("查询稳态累计超标监测点数")
+    public HttpResult<List<RArrayVO>> getAllRStatHarmonicOrgM(StatisticsBizBaseParam param){
+        String methodDescribe = getMethodDescribe("getAllRStatHarmonicOrg");
+        List<RArrayVO> rStatHarmonicOrgMAll = null;
+        String string = param.getType().toString();
+        switch (string) {
+            //查询各单位累计超标监测点数-年数据
+            case BizParamConstant.STAT_BIZ_YEAR:
+                rStatHarmonicOrgMAll = rStatHarmonicOrgYService.getRStatHarmonicYAll(param);
+                break;
+            //查询各单位累计超标监测点数-季数据
+            case BizParamConstant.STAT_BIZ_QUARTER:
+                rStatHarmonicOrgMAll = rStatHarmonicOrgQService.getRStatHarmonicQAll(param);
+                break;
+            //查询各单位累计超标监测点数-月数据
+            case BizParamConstant.STAT_BIZ_MONTH:
+                rStatHarmonicOrgMAll = rStatHarmonicOrgMService.getRStatHarmonicMAll(param);
+                break;
+            default:
+                break;
+        }
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, rStatHarmonicOrgMAll, methodDescribe);
+    }
+
+
+    /**
+     * 查询查询监测点稳态指标 日/月点数
+     */
+    @GetMapping("/getAllRStatHarmonicOrgIcon")
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @ApiOperation("查询稳态各单位超标监测统计图")
+    public HttpResult<List<RIconVO>> getAllRStatHarmonicOrgIcon(RStatHarmonicMParam param){
+        String methodDescribe = getMethodDescribe("getAllRStatHarmonicOrgIcon");
+        List<RIconVO> getAllRStatHarmonicOrgIcon = null;
+        String string = param.getType().toString();
+        switch (string) {
+            //查询各单位累计超标监测点数统计图-年数据
+            case BizParamConstant.STAT_BIZ_YEAR:
+                getAllRStatHarmonicOrgIcon = rStatHarmonicOrgYService.getRStatHarmonicOrgYIcon(param);
+                break;
+            //查询各单位累计超标监测点数-季数据
+            case BizParamConstant.STAT_BIZ_QUARTER:
+                getAllRStatHarmonicOrgIcon = rStatHarmonicOrgQService.getRStatHarmonicOrgQIcon(param);
+                break;
+            //查询各单位累计超标监测点数-月数据
+            case BizParamConstant.STAT_BIZ_MONTH:
+                getAllRStatHarmonicOrgIcon = rStatHarmonicOrgMService.getRStatHarmonicOrgMIcon(param);
+                break;
+            default:
+                break;
+        }
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, getAllRStatHarmonicOrgIcon, methodDescribe);
+    }
+
+}
+
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/RStatOrgController.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/RStatOrgController.java
new file mode 100644
index 000000000..363a9572f
--- /dev/null
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/RStatOrgController.java
@@ -0,0 +1,188 @@
+package com.njcn.harmonic.controller;
+
+
+import com.njcn.common.pojo.annotation.OperateInfo;
+import com.njcn.common.pojo.constant.BizParamConstant;
+import com.njcn.common.pojo.enums.common.LogEnum;
+import com.njcn.common.pojo.enums.response.CommonResponseEnum;
+import com.njcn.common.pojo.param.StatisticsBizBaseParam;
+import com.njcn.common.pojo.response.HttpResult;
+import com.njcn.common.utils.HttpResultUtil;
+import com.njcn.harmonic.pojo.param.RStatOrgParam;
+import com.njcn.harmonic.pojo.param.StatSubstationBizBaseParam;
+import com.njcn.harmonic.pojo.vo.*;
+import com.njcn.harmonic.service.*;
+import com.njcn.web.controller.BaseController;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+
+import java.util.List;
+
+
+/**
+ * <p>
+ * 区域分类统计月表 前端控制器
+ * </p>
+ *
+ * @author rui.wu
+ * @since 2022-10-17
+ */
+@RestController
+@RequiredArgsConstructor
+@Api(tags = "主网指标-稳态指标")
+@RequestMapping("/harmonic/rStatOrg")
+public class RStatOrgController extends BaseController {
+
+    private final RStatOrgYService rStatOrgYService;
+    private final RStatOrgQService rStatOrgQService;
+    private final RStatOrgMService rStatOrgMService;
+    private final RStatOrgBusbarVoltageService rStatOrgBusbarVoltageService;
+    private final RStatLoadTypeService rStatLoadTypeService;
+    private final RMpPartHarmonicDetailMService rMpPartHarmonicDetailMService;
+    private final RMpPartHarmonicDetailDService rMpPartHarmonicDetailDService;
+    private final RMpPassRateService rMpPassRateService;
+
+
+    /**
+     * 查询区域超标统计
+     */
+    @GetMapping("/getAllRStatHarmonicOrg")
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @ApiOperation("区域超标统计")
+    public HttpResult<List<RStatOrgVO>> getAllRStatHarmonicOrgM(StatisticsBizBaseParam param){
+        String methodDescribe = getMethodDescribe("getAllRStatHarmonicOrg");
+        List<RStatOrgVO> rStatHarmonicOrgMAll = null;
+        String string = param.getType().toString();
+        switch (string) {
+            //查询区域超标统计-年数据
+            case BizParamConstant.STAT_BIZ_YEAR:
+                rStatHarmonicOrgMAll = rStatOrgYService.getRStatHarmonicYAll(param);
+                break;
+            //查询区域超标统计-季数据
+            case BizParamConstant.STAT_BIZ_QUARTER:
+                rStatHarmonicOrgMAll = rStatOrgQService.getRStatHarmonicQAll(param);
+                break;
+            //查询各区域超标统计-月数据
+            case BizParamConstant.STAT_BIZ_MONTH:
+                rStatHarmonicOrgMAll = rStatOrgMService.getRStatHarmonicMAll(param);
+                break;
+            default:
+                break;
+        }
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, rStatHarmonicOrgMAll, methodDescribe);
+    }
+
+
+    /**
+     * 区域稳态指标超标分类统计表
+     */
+    @GetMapping("/getRStatSubstation")
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @ApiOperation("区域稳态指标超标分类统计表")
+    public HttpResult<List<RStatSubstationOrg2VO>> getAllRStatSubstation(StatisticsBizBaseParam param){
+        String methodDescribe = getMethodDescribe("getRStatSubstation");
+        List<RStatSubstationOrg2VO> statSubstationIcon = rStatOrgYService.getRStatSubstationOrg(param);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, statSubstationIcon, methodDescribe);
+    }
+
+    /**
+     * 区域稳态指标超标分类统计表
+     */
+//    @GetMapping("/getRStatOrgBusbarVoltage")
+//    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+//    @ApiOperation("区域电站母线电压类指标超标计")
+//    public HttpResult<List<RStatOrgBusbarVoltageVO>> getRStatOrgBusbarVoltage(StatisticsBizBaseParam param){
+//        String methodDescribe = getMethodDescribe("getRStatSubstation");
+//        List<RStatOrgBusbarVoltageVO> statSubstationIcon = rStatOrgBusbarVoltageService.getRStatOrgBusbarVoltage(param);
+//        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, statSubstationIcon, methodDescribe);
+//    }
+
+    /**
+     * 区域干扰源电流类指标超标统计
+     * @param param
+     * @return
+     */
+    @GetMapping("/getRStatLoadType")
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @ApiOperation("区域干扰源电流类指标超标统计")
+    public HttpResult<List<RArrayVO>> getRStatLoadType(StatisticsBizBaseParam param){
+        String methodDescribe = getMethodDescribe("getRStatLoadType");
+        List<RArrayVO> rStatLoadType = rStatLoadTypeService.getRStatLoadType(param);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, rStatLoadType, methodDescribe);
+    }
+
+    /**
+     * 变电站（换流站）稳态指标超标分类统计表
+     * @param param
+     * @return
+     */
+    @PostMapping("/getRStatSubstationOrg")
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @ApiOperation("变电站（换流站）稳态指标超标分类统计表")
+    public HttpResult<List<RSubstationIcon2VO.RSubstationInfoVO>> getRStatSubstationOrg(@RequestBody StatSubstationBizBaseParam param
+             ){
+        String methodDescribe = getMethodDescribe("getRStatSubstationOrg");
+        List<RSubstationIcon2VO.RSubstationInfoVO> rStatOrg = rStatOrgYService.getRStatSubstation(param);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, rStatOrg, methodDescribe);
+    }
+
+    /**
+     * 稳态指标超标明细表
+     * @param param
+     * @return
+     */
+    @PostMapping("/getRMpPartHarmonicDetail")
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @ApiOperation("稳态指标超标明细表")
+    public HttpResult<List<RMpPartHarmonicDetailVO>> getRMpPartHarmonicDetail(@RequestBody RStatOrgParam param){
+        String methodDescribe = getMethodDescribe("getRMpPartHarmonicDetail");
+        List<RMpPartHarmonicDetailVO> rMpPartHarmonicDetail = rMpPartHarmonicDetailMService.getRMpPartHarmonicDetail(param);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, rMpPartHarmonicDetail, methodDescribe);
+    }
+    /**
+     * 稳态指标超标明细表-指标趋势图
+     * @param param
+     * @return
+     */
+    @GetMapping("/getRMpPartHarmonicDetailIcon")
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @ApiOperation("稳态指标超标明细表-指标趋势图")
+    public HttpResult<List<RMpPartHarmonicDetailIconVO>> getRMpPartHarmonicDetailIcon(StatisticsBizBaseParam param){
+        String methodDescribe = getMethodDescribe("getRMpPartHarmonicDetailIcon");
+        List<RMpPartHarmonicDetailIconVO> rMpPartHarmonicDetail = rMpPartHarmonicDetailDService.getRMpPartHarmonicDetailIcon(param);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, rMpPartHarmonicDetail, methodDescribe);
+    }
+
+    /**
+     * 区域稳态指标合格率统计表-主网（稳态指标合格率统计）
+     * @param param
+     * @return
+     */
+    @GetMapping("/getRStatOrgIndex")
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @ApiOperation("区域稳态指标合格率统计表")
+    public HttpResult<List<RStatOrgIndexVO.RStatOrgIndexInfoVO>> getRStatOrgIndex(StatisticsBizBaseParam param){
+        String methodDescribe = getMethodDescribe("getRStatOrgIndex");
+        List<RStatOrgIndexVO.RStatOrgIndexInfoVO> rStatOrg = rStatOrgYService.getRStatOrgIndex(param);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, rStatOrg, methodDescribe);
+    }
+
+    /**
+     * 区域稳态指标合格率统计表-主网（稳态指标合格率统计）
+     * @param param
+     * @return
+     */
+    @PostMapping("/getRMpPassRateInfo")
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @ApiOperation("稳态指标合格率明细表")
+    public HttpResult<List<RStatOrgIndexVO>> getRMpPassRateInfo(@RequestBody RStatOrgParam param){
+        String methodDescribe = getMethodDescribe("getRMpPassRateInfo");
+        List<RStatOrgIndexVO> rStatOrg = rMpPassRateService.getRMpPassRateInfo(param);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, rStatOrg, methodDescribe);
+    }
+
+}
+
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/RStatSubstationMController.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/RStatSubstationMController.java
new file mode 100644
index 000000000..c56672b09
--- /dev/null
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/RStatSubstationMController.java
@@ -0,0 +1,81 @@
+package com.njcn.harmonic.controller;
+
+
+import com.njcn.common.pojo.annotation.OperateInfo;
+import com.njcn.common.pojo.enums.common.LogEnum;
+import com.njcn.common.pojo.enums.response.CommonResponseEnum;
+import com.njcn.common.pojo.param.StatisticsBizBaseParam;
+import com.njcn.common.pojo.response.HttpResult;
+import com.njcn.common.utils.HttpResultUtil;
+import com.njcn.harmonic.pojo.vo.RSubstationIcon2VO;
+import com.njcn.harmonic.pojo.vo.RSubstationIconVO;
+import com.njcn.harmonic.pojo.vo.RVoltageIconVO;
+import com.njcn.harmonic.service.RStatSubstationMService;
+import com.njcn.harmonic.service.RStatSubstationVoltageMService;
+import com.njcn.web.controller.BaseController;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author rui.wu
+ * @since 2022-10-18
+ */
+@RestController
+@RequiredArgsConstructor
+@Api(tags = "主网指标分类概览-变电站分类总览")
+@RequestMapping("/harmonic/rStatSubstation")
+public class RStatSubstationMController extends BaseController {
+
+    private final RStatSubstationMService rStatSubstationMService;
+    private final RStatSubstationVoltageMService rStatSubstationVoltageMService;
+
+    /**
+     * 变电站稳态指标超标分布（按超标天数）
+     */
+    @GetMapping("/getAllRStatSubstationIconDays")
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @ApiOperation("变电站稳态指标超标分布（按超标天数）")
+    public HttpResult<RSubstationIconVO> getAllRStatSubstation(StatisticsBizBaseParam param){
+        String methodDescribe = getMethodDescribe("getAllRStatSubstationIconDays");
+        RSubstationIconVO statSubstationIcon = rStatSubstationMService.getStatSubstationIcon(param);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, statSubstationIcon, methodDescribe);
+    }
+
+    /**
+     * 变电站稳态指标超标分布（按电压等级）
+     */
+    @GetMapping("/getAllRStatSubstationIconVoltage")
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @ApiOperation("变电站稳态指标超标分布（按电压等级）")
+    public HttpResult<List<RVoltageIconVO>> getAllRStatSubstationIcon2(StatisticsBizBaseParam param){
+        String methodDescribe = getMethodDescribe("getAllRStatSubstationIconVoltage");
+        List<RVoltageIconVO> statSubstationIcon = rStatSubstationVoltageMService.getStatSubstationIcon(param);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, statSubstationIcon, methodDescribe);
+    }
+
+
+    /**
+     * 变电站稳态指标平均超标天数
+     */
+    @GetMapping("/getAllRStatSubstationIconAvgDays")
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @ApiOperation("变电站稳态指标平均超标天数")
+    public HttpResult<List<RSubstationIcon2VO>> getAllRStatSubstationIcon3(StatisticsBizBaseParam param){
+        String methodDescribe = getMethodDescribe("getAllRStatSubstationIconAvgDays");
+        List<RSubstationIcon2VO> statSubstationIcon = rStatSubstationMService.getStatSubstationIcon2(param);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, statSubstationIcon, methodDescribe);
+    }
+}
+
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/PmsAbnormalRulesMapper.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/PmsAbnormalRulesMapper.java
new file mode 100644
index 000000000..c0432d6a7
--- /dev/null
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/PmsAbnormalRulesMapper.java
@@ -0,0 +1,14 @@
+package com.njcn.harmonic.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.njcn.harmonic.pojo.po.PmsAbnormalRules;
+
+/**
+ * PmsAbnormalRulesMapper
+ *
+ * @author qijian
+ * @date 2022/10/26
+ */
+public interface PmsAbnormalRulesMapper extends BaseMapper<PmsAbnormalRules> {
+
+}
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RMpBenchmarkLevelMMapper.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RMpBenchmarkLevelMMapper.java
new file mode 100644
index 000000000..626ad8a08
--- /dev/null
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RMpBenchmarkLevelMMapper.java
@@ -0,0 +1,15 @@
+package com.njcn.harmonic.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.njcn.harmonic.pojo.po.RMpBenchmarkLevelM;
+
+/**
+* @author jianghf
+* @description 针对表【r_mp_benchmark_level_m】的数据库操作Mapper
+* @createDate 2022-10-11 10:32:18
+* @Entity com.njcn.device.pms.pojo.po.RMpBenchmarkLevelM
+*/
+public interface RMpBenchmarkLevelMMapper extends BaseMapper<RMpBenchmarkLevelM> {
+
+
+}
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RMpBenchmarkLevelQMapper.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RMpBenchmarkLevelQMapper.java
new file mode 100644
index 000000000..81136dd6c
--- /dev/null
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RMpBenchmarkLevelQMapper.java
@@ -0,0 +1,15 @@
+package com.njcn.harmonic.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.njcn.harmonic.pojo.po.RMpBenchmarkLevelQ;
+
+/**
+* @author jianghf
+* @description 针对表【r_mp_benchmark_level_q】的数据库操作Mapper
+* @createDate 2022-10-11 10:32:18
+* @Entity com.njcn.device.pms.pojo.po.RMpBenchmarkLevelQ
+*/
+public interface RMpBenchmarkLevelQMapper extends BaseMapper<RMpBenchmarkLevelQ> {
+
+
+}
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RMpBenchmarkLevelYMapper.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RMpBenchmarkLevelYMapper.java
new file mode 100644
index 000000000..dbf91c41a
--- /dev/null
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RMpBenchmarkLevelYMapper.java
@@ -0,0 +1,15 @@
+package com.njcn.harmonic.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.njcn.harmonic.pojo.po.RMpBenchmarkLevelY;
+
+/**
+* @author jianghf
+* @description 针对表【r_mp_benchmark_level_y】的数据库操作Mapper
+* @createDate 2022-10-11 10:32:18
+* @Entity com.njcn.device.pms.pojo.po.RMpBenchmarkLevelY
+*/
+public interface RMpBenchmarkLevelYMapper extends BaseMapper<RMpBenchmarkLevelY> {
+
+
+}
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RMpHarmonicIMagReportDMapper.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RMpHarmonicIMagReportDMapper.java
new file mode 100644
index 000000000..e0c579475
--- /dev/null
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RMpHarmonicIMagReportDMapper.java
@@ -0,0 +1,22 @@
+package com.njcn.harmonic.mapper;
+
+import com.njcn.harmonic.pojo.po.RMpHarmonicIMagReportD;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+* @author Administrator
+* @description 针对表【r_mp_harmonic_i_mag_report_d(稳态监测点指标日报-日表(主配网表)  /各次谐波电流有效值)】的数据库操作Mapper
+* @createDate 2022-10-20 18:38:15
+* @Entity com.njcn.harmonic.pojo.po.RMpHarmonicIMagReportD
+*/
+public interface RMpHarmonicIMagReportDMapper extends BaseMapper<RMpHarmonicIMagReportD> {
+
+    List<RMpHarmonicIMagReportD> getListByCond(Map<String, Object> condMap);
+}
+
+
+
+
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RMpHarmonicIRateReportDMapper.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RMpHarmonicIRateReportDMapper.java
new file mode 100644
index 000000000..4e3bfb6e8
--- /dev/null
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RMpHarmonicIRateReportDMapper.java
@@ -0,0 +1,22 @@
+package com.njcn.harmonic.mapper;
+
+import com.njcn.harmonic.pojo.po.RMpHarmonicIRateReportD;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+* @author Administrator
+* @description 针对表【r_mp_harmonic_i_rate_report_d(稳态监测点指标日报-日表(主网表)  /各次谐波电流含有率)】的数据库操作Mapper
+* @createDate 2022-10-20 18:43:52
+* @Entity com.njcn.harmonic.pojo.po.RMpHarmonicIRateReportD
+*/
+public interface RMpHarmonicIRateReportDMapper extends BaseMapper<RMpHarmonicIRateReportD> {
+
+    List<RMpHarmonicIRateReportD> getListByCond(Map<String, Object> condMap);
+}
+
+
+
+
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RMpHarmonicVRateReportDMapper.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RMpHarmonicVRateReportDMapper.java
new file mode 100644
index 000000000..224bcce51
--- /dev/null
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RMpHarmonicVRateReportDMapper.java
@@ -0,0 +1,22 @@
+package com.njcn.harmonic.mapper;
+
+import com.njcn.harmonic.pojo.po.RMpHarmonicVRateReportD;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+* @author jianghf
+* @description 针对表【r_mp_harmonic_v_rate_report_d(稳态监测点指标日报-日表(主配网表)  /各次谐波电压含有率 )】的数据库操作Mapper
+* @createDate 2022-10-20 18:34:05
+* @Entity com.njcn.harmonic.pojo.po.RMpHarmonicVRateReportD
+*/
+public interface RMpHarmonicVRateReportDMapper extends BaseMapper<RMpHarmonicVRateReportD> {
+
+    List<RMpHarmonicVRateReportD> getListByCond(Map<String, Object> map);
+}
+
+
+
+
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RMpInharmonicIRateReportDMapper.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RMpInharmonicIRateReportDMapper.java
new file mode 100644
index 000000000..d38ffff32
--- /dev/null
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RMpInharmonicIRateReportDMapper.java
@@ -0,0 +1,22 @@
+package com.njcn.harmonic.mapper;
+
+import com.njcn.harmonic.pojo.po.RMpInharmonicIRateReportD;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+* @author Administrator
+* @description 针对表【r_mp_inharmonic_i_rate_report_d(稳态监测点指标日报-日表(主网表)  /各次间谐波电流含有率)】的数据库操作Mapper
+* @createDate 2022-10-20 18:45:58
+* @Entity com.njcn.harmonic.pojo.po.RMpInharmonicIRateReportD
+*/
+public interface RMpInharmonicIRateReportDMapper extends BaseMapper<RMpInharmonicIRateReportD> {
+
+    List<RMpInharmonicIRateReportD> getListByCond(Map<String, Object> condMap);
+}
+
+
+
+
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RMpInharmonicVRateReportDMapper.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RMpInharmonicVRateReportDMapper.java
new file mode 100644
index 000000000..976a8b119
--- /dev/null
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RMpInharmonicVRateReportDMapper.java
@@ -0,0 +1,22 @@
+package com.njcn.harmonic.mapper;
+
+import com.njcn.harmonic.pojo.po.RMpInharmonicVRateReportD;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+* @author Administrator
+* @description 针对表【r_mp_inharmonic_v_rate_report_d】的数据库操作Mapper
+* @createDate 2022-10-20 18:45:36
+* @Entity com.njcn.harmonic.pojo.po.RMpInharmonicVRateReportD
+*/
+public interface RMpInharmonicVRateReportDMapper extends BaseMapper<RMpInharmonicVRateReportD> {
+
+    List<RMpInharmonicVRateReportD> getListByCond(Map<String, Object> condMap);
+}
+
+
+
+
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RMpIntegrityDMapper.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RMpIntegrityDMapper.java
new file mode 100644
index 000000000..908c761fd
--- /dev/null
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RMpIntegrityDMapper.java
@@ -0,0 +1,14 @@
+package com.njcn.harmonic.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.njcn.harmonic.pojo.po.RMpIntegrityD;
+
+/**
+ * RMpIntegrityDMapper
+ *
+ * @author qijian
+ * @date 2022/10/26
+ */
+public interface RMpIntegrityDMapper extends BaseMapper<RMpIntegrityD> {
+
+}
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RMpMeasurePhaseReportDMapper.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RMpMeasurePhaseReportDMapper.java
new file mode 100644
index 000000000..c7b4fdbb8
--- /dev/null
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RMpMeasurePhaseReportDMapper.java
@@ -0,0 +1,23 @@
+package com.njcn.harmonic.mapper;
+
+import com.njcn.harmonic.pojo.po.RMpMeasurePhaseReportD;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+* @author Administrator
+* @description 针对表【r_mp_measure_phase_report_d】的数据库操作Mapper
+* @createDate 2022-10-20 18:20:08
+* @Entity com.njcn.harmonic.pojo.po.RMpMeasurePhaseReportD
+*/
+public interface RMpMeasurePhaseReportDMapper extends BaseMapper<RMpMeasurePhaseReportD> {
+
+    List<RMpMeasurePhaseReportD> getListByCond(Map<String, Object> condMap);
+}
+
+
+
+
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RMpMeasureReportDMapper.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RMpMeasureReportDMapper.java
new file mode 100644
index 000000000..5e4174695
--- /dev/null
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RMpMeasureReportDMapper.java
@@ -0,0 +1,19 @@
+package com.njcn.harmonic.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.njcn.harmonic.pojo.po.RMpMeasureReportD;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+* @author jianghf
+* @description 针对表【r_mp_measure_report_d】的数据库操作Mapper
+* @createDate 2022-10-20 16:32:37
+* @Entity com.njcn.harmonic.pojo.po.RMpMeasureReportD
+*/
+public interface RMpMeasureReportDMapper extends BaseMapper<RMpMeasureReportD> {
+
+
+    List<RMpMeasureReportD> getListByCond(Map<String, Object> condMap);
+}
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RMpPartHarmonicDetailDMapper.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RMpPartHarmonicDetailDMapper.java
new file mode 100644
index 000000000..c94da4811
--- /dev/null
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RMpPartHarmonicDetailDMapper.java
@@ -0,0 +1,27 @@
+package com.njcn.harmonic.mapper;
+
+import com.njcn.common.pojo.param.StatisticsBizBaseParam;
+import com.njcn.harmonic.pojo.po.RMpPartHarmonicDetailD;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.njcn.harmonic.pojo.vo.RMpPartHarmonicDetailIconVO;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author rui.wu
+ * @since 2022-10-24
+ */
+public interface RMpPartHarmonicDetailDMapper extends BaseMapper<RMpPartHarmonicDetailD> {
+
+    /**
+     * 稳态指标超标明细表-指标趋势图
+     * @param param
+     * @return
+     */
+    List<RMpPartHarmonicDetailIconVO> getRMpPartHarmonicDetailIcon(@Param("param") StatisticsBizBaseParam param);
+}
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RMpPartHarmonicDetailMMapper.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RMpPartHarmonicDetailMMapper.java
new file mode 100644
index 000000000..51051d966
--- /dev/null
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RMpPartHarmonicDetailMMapper.java
@@ -0,0 +1,16 @@
+package com.njcn.harmonic.mapper;
+
+import com.njcn.harmonic.pojo.po.RMpPartHarmonicDetailM;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author rui.wu
+ * @since 2022-10-24
+ */
+public interface RMpPartHarmonicDetailMMapper extends BaseMapper<RMpPartHarmonicDetailM> {
+
+}
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RMpPassRateMMapper.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RMpPassRateMMapper.java
new file mode 100644
index 000000000..a50fed663
--- /dev/null
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RMpPassRateMMapper.java
@@ -0,0 +1,27 @@
+package com.njcn.harmonic.mapper;
+
+import com.njcn.harmonic.pojo.param.StatSubstationBizBaseParam;
+import com.njcn.harmonic.pojo.po.RMpPassRateM;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.njcn.harmonic.pojo.vo.RStatOrgIndexVO;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author rui.wu
+ * @since 2022-10-24
+ */
+public interface RMpPassRateMMapper extends BaseMapper<RMpPassRateM> {
+
+    /**
+     * 获取月稳态指标合格率明细表
+     * @param baseParam
+     * @return
+     */
+    List<RStatOrgIndexVO> getMonthPassRate(@Param("param") StatSubstationBizBaseParam baseParam);
+}
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RMpPassRateQMapper.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RMpPassRateQMapper.java
new file mode 100644
index 000000000..48d1975b9
--- /dev/null
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RMpPassRateQMapper.java
@@ -0,0 +1,27 @@
+package com.njcn.harmonic.mapper;
+
+import com.njcn.harmonic.pojo.param.StatSubstationBizBaseParam;
+import com.njcn.harmonic.pojo.po.RMpPassRateQ;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.njcn.harmonic.pojo.vo.RStatOrgIndexVO;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author rui.wu
+ * @since 2022-10-24
+ */
+public interface RMpPassRateQMapper extends BaseMapper<RMpPassRateQ> {
+
+    /**
+     * 获取季稳态指标合格率明细表
+     * @param baseParam
+     * @return
+     */
+    List<RStatOrgIndexVO> getQuarterPassRate(@Param("param") StatSubstationBizBaseParam baseParam);
+}
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RMpPassRateYMapper.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RMpPassRateYMapper.java
new file mode 100644
index 000000000..c45283170
--- /dev/null
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RMpPassRateYMapper.java
@@ -0,0 +1,27 @@
+package com.njcn.harmonic.mapper;
+
+import com.njcn.harmonic.pojo.param.StatSubstationBizBaseParam;
+import com.njcn.harmonic.pojo.po.RMpPassRateY;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.njcn.harmonic.pojo.vo.RStatOrgIndexVO;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author rui.wu
+ * @since 2022-10-24
+ */
+public interface RMpPassRateYMapper extends BaseMapper<RMpPassRateY> {
+
+    /**
+     * 获取年稳态指标合格率明细表
+     * @param baseParam
+     * @return
+     */
+    List<RStatOrgIndexVO> getYearPassRate(@Param("param") StatSubstationBizBaseParam baseParam);
+}
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RMpSurplusHarmonicDetailDMapper.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RMpSurplusHarmonicDetailDMapper.java
new file mode 100644
index 000000000..495de0a14
--- /dev/null
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RMpSurplusHarmonicDetailDMapper.java
@@ -0,0 +1,16 @@
+package com.njcn.harmonic.mapper;
+
+import com.njcn.harmonic.pojo.po.RMpSurplusHarmonicDetailD;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author rui.wu
+ * @since 2022-10-24
+ */
+public interface RMpSurplusHarmonicDetailDMapper extends BaseMapper<RMpSurplusHarmonicDetailD> {
+
+}
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RMpSurplusHarmonicDetailMMapper.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RMpSurplusHarmonicDetailMMapper.java
new file mode 100644
index 000000000..81b88ed28
--- /dev/null
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RMpSurplusHarmonicDetailMMapper.java
@@ -0,0 +1,27 @@
+package com.njcn.harmonic.mapper;
+
+import com.njcn.harmonic.pojo.param.StatSubstationBizBaseParam;
+import com.njcn.harmonic.pojo.po.RMpSurplusHarmonicDetailM;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.njcn.harmonic.pojo.vo.RMpPartHarmonicDetailVO;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author rui.wu
+ * @since 2022-10-24
+ */
+public interface RMpSurplusHarmonicDetailMMapper extends BaseMapper<RMpSurplusHarmonicDetailM> {
+
+    /**
+     * 稳态指标超标明细表
+     * @param param
+     * @return
+     */
+    List<RMpPartHarmonicDetailVO> getRMpPartHarmonicDetail(@Param("param") StatSubstationBizBaseParam param);
+}
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RStatAbnormalDMapper.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RStatAbnormalDMapper.java
new file mode 100644
index 000000000..47464fd72
--- /dev/null
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RStatAbnormalDMapper.java
@@ -0,0 +1,14 @@
+package com.njcn.harmonic.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.njcn.harmonic.pojo.po.RStatAbnormalD;
+
+/**
+ * RStatAbnormalDMapper
+ *
+ * @author qijian
+ * @date 2022/10/26
+ */
+public interface RStatAbnormalDMapper extends BaseMapper<RStatAbnormalD> {
+
+}
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RStatHarmonicDMapper.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RStatHarmonicDMapper.java
new file mode 100644
index 000000000..b9989aaaa
--- /dev/null
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RStatHarmonicDMapper.java
@@ -0,0 +1,16 @@
+package com.njcn.harmonic.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.njcn.harmonic.pojo.po.RStatHarmonicD;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author rui.wu
+ * @since 2022-10-12
+ */
+public interface RStatHarmonicDMapper extends BaseMapper<RStatHarmonicD> {
+
+}
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RStatHarmonicMMapper.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RStatHarmonicMMapper.java
new file mode 100644
index 000000000..905c69b80
--- /dev/null
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RStatHarmonicMMapper.java
@@ -0,0 +1,17 @@
+package com.njcn.harmonic.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.njcn.harmonic.pojo.po.RStatHarmonicM;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author rui.wu
+ * @since 2022-10-09
+ */
+public interface RStatHarmonicMMapper extends BaseMapper<RStatHarmonicM> {
+
+
+}
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RStatHarmonicQMapper.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RStatHarmonicQMapper.java
new file mode 100644
index 000000000..68f032f90
--- /dev/null
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RStatHarmonicQMapper.java
@@ -0,0 +1,16 @@
+package com.njcn.harmonic.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.njcn.harmonic.pojo.po.RStatHarmonicQ;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author rui.wu
+ * @since 2022-10-12
+ */
+public interface RStatHarmonicQMapper extends BaseMapper<RStatHarmonicQ> {
+
+}
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RStatHarmonicVoltageDMapper.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RStatHarmonicVoltageDMapper.java
new file mode 100644
index 000000000..60d596b03
--- /dev/null
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RStatHarmonicVoltageDMapper.java
@@ -0,0 +1,16 @@
+package com.njcn.harmonic.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.njcn.harmonic.pojo.po.RStatHarmonicVoltageD;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author rui.wu
+ * @since 2022-10-10
+ */
+public interface RStatHarmonicVoltageDMapper extends BaseMapper<RStatHarmonicVoltageD> {
+
+}
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RStatHarmonicVoltageMMapper.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RStatHarmonicVoltageMMapper.java
new file mode 100644
index 000000000..ad0a48b40
--- /dev/null
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RStatHarmonicVoltageMMapper.java
@@ -0,0 +1,16 @@
+package com.njcn.harmonic.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.njcn.harmonic.pojo.po.RStatHarmonicVoltageM;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author rui.wu
+ * @since 2022-10-10
+ */
+public interface RStatHarmonicVoltageMMapper extends BaseMapper<RStatHarmonicVoltageM> {
+
+}
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RStatHarmonicYMapper.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RStatHarmonicYMapper.java
new file mode 100644
index 000000000..173f9bb36
--- /dev/null
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RStatHarmonicYMapper.java
@@ -0,0 +1,16 @@
+package com.njcn.harmonic.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.njcn.harmonic.pojo.po.RStatHarmonicY;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author rui.wu
+ * @since 2022-10-12
+ */
+public interface RStatHarmonicYMapper extends BaseMapper<RStatHarmonicY> {
+
+}
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RStatLoadTypeMMapper.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RStatLoadTypeMMapper.java
new file mode 100644
index 000000000..20df48f53
--- /dev/null
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RStatLoadTypeMMapper.java
@@ -0,0 +1,27 @@
+package com.njcn.harmonic.mapper;
+
+import com.njcn.harmonic.pojo.param.StatSubstationBizBaseParam;
+import com.njcn.harmonic.pojo.po.RStatLoadTypeM;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.njcn.harmonic.pojo.vo.RStatLoadTypeVO;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author rui.wu
+ * @since 2022-10-19
+ */
+public interface RStatLoadTypeMMapper extends BaseMapper<RStatLoadTypeM> {
+
+    /**
+     * 获取月区域暂态指标分类统计表
+     * @param param
+     * @return
+     */
+    List<RStatLoadTypeVO> getMonthStatLoadType(@Param("param") StatSubstationBizBaseParam param);
+}
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RStatLoadTypeQMapper.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RStatLoadTypeQMapper.java
new file mode 100644
index 000000000..8ef60dd32
--- /dev/null
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RStatLoadTypeQMapper.java
@@ -0,0 +1,27 @@
+package com.njcn.harmonic.mapper;
+
+import com.njcn.harmonic.pojo.param.StatSubstationBizBaseParam;
+import com.njcn.harmonic.pojo.po.RStatLoadTypeQ;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.njcn.harmonic.pojo.vo.RStatLoadTypeVO;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author rui.wu
+ * @since 2022-10-19
+ */
+public interface RStatLoadTypeQMapper extends BaseMapper<RStatLoadTypeQ> {
+
+    /**
+     * 获取季区域暂态指标分类统计表
+     * @param param
+     * @return
+     */
+    List<RStatLoadTypeVO> getQuarterStatLoadType(@Param("param") StatSubstationBizBaseParam param);
+}
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RStatLoadTypeYMapper.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RStatLoadTypeYMapper.java
new file mode 100644
index 000000000..fb8112ea0
--- /dev/null
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RStatLoadTypeYMapper.java
@@ -0,0 +1,26 @@
+package com.njcn.harmonic.mapper;
+
+import com.njcn.harmonic.pojo.param.StatSubstationBizBaseParam;
+import com.njcn.harmonic.pojo.po.RStatLoadTypeY;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.njcn.harmonic.pojo.vo.RStatLoadTypeVO;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author rui.wu
+ * @since 2022-10-19
+ */
+public interface RStatLoadTypeYMapper extends BaseMapper<RStatLoadTypeY> {
+
+    /**
+     * 获取年区域暂态指标分类统计表
+     * @return
+     */
+    List<RStatLoadTypeVO> getYearStatLoadType(@Param("param") StatSubstationBizBaseParam param);
+}
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RStatOrgBusbarVoltageMMapper.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RStatOrgBusbarVoltageMMapper.java
new file mode 100644
index 000000000..79230efca
--- /dev/null
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RStatOrgBusbarVoltageMMapper.java
@@ -0,0 +1,16 @@
+package com.njcn.harmonic.mapper;
+
+import com.njcn.harmonic.pojo.po.RStatOrgBusbarVoltageM;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author rui.wu
+ * @since 2022-10-19
+ */
+public interface RStatOrgBusbarVoltageMMapper extends BaseMapper<RStatOrgBusbarVoltageM> {
+
+}
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RStatOrgBusbarVoltageQMapper.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RStatOrgBusbarVoltageQMapper.java
new file mode 100644
index 000000000..56d148af9
--- /dev/null
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RStatOrgBusbarVoltageQMapper.java
@@ -0,0 +1,16 @@
+package com.njcn.harmonic.mapper;
+
+import com.njcn.harmonic.pojo.po.RStatOrgBusbarVoltageQ;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author rui.wu
+ * @since 2022-10-19
+ */
+public interface RStatOrgBusbarVoltageQMapper extends BaseMapper<RStatOrgBusbarVoltageQ> {
+
+}
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RStatOrgBusbarVoltageYMapper.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RStatOrgBusbarVoltageYMapper.java
new file mode 100644
index 000000000..3f9d9f557
--- /dev/null
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RStatOrgBusbarVoltageYMapper.java
@@ -0,0 +1,16 @@
+package com.njcn.harmonic.mapper;
+
+import com.njcn.harmonic.pojo.po.RStatOrgBusbarVoltageY;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author rui.wu
+ * @since 2022-10-19
+ */
+public interface RStatOrgBusbarVoltageYMapper extends BaseMapper<RStatOrgBusbarVoltageY> {
+
+}
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RStatOrgMMapper.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RStatOrgMMapper.java
new file mode 100644
index 000000000..38553399d
--- /dev/null
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RStatOrgMMapper.java
@@ -0,0 +1,39 @@
+package com.njcn.harmonic.mapper;
+
+import com.njcn.harmonic.pojo.param.StatSubstationBizBaseParam;
+import com.njcn.harmonic.pojo.po.RStatOrgM;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.njcn.harmonic.pojo.vo.RStatOrgIndexVO;
+import com.njcn.harmonic.pojo.vo.RStatSubstationOrgVO;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 区域分类统计月表 Mapper 接口
+ * </p>
+ *
+ * @author rui.wu
+ * @since 2022-10-17
+ */
+public interface RStatOrgMMapper extends BaseMapper<RStatOrgM> {
+
+    /**
+     * 区域稳态指标超标分类统计表--月表数据
+     * @param param
+     * @param dataType
+     * @return
+     */
+    List<RStatSubstationOrgVO> getMonthRStatHarmonicOrgInfo(@Param("param") StatSubstationBizBaseParam param
+                                                            ,@Param("dataType") String dataType);
+
+    /**
+     * 获取月区域稳态指标合格率统计表
+     * @param param
+     * @param dataType
+     * @return
+     */
+    List<RStatOrgIndexVO.RStatOrgIndexInfoVO> getMonthRStatOrgIndex(@Param("param") StatSubstationBizBaseParam param
+                                                    ,@Param("dataType") String dataType);
+}
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RStatOrgQMapper.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RStatOrgQMapper.java
new file mode 100644
index 000000000..231d2898c
--- /dev/null
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RStatOrgQMapper.java
@@ -0,0 +1,39 @@
+package com.njcn.harmonic.mapper;
+
+import com.njcn.harmonic.pojo.param.StatSubstationBizBaseParam;
+import com.njcn.harmonic.pojo.po.RStatOrgQ;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.njcn.harmonic.pojo.vo.RStatOrgIndexVO;
+import com.njcn.harmonic.pojo.vo.RStatSubstationOrgVO;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 区域分类统计季表 Mapper 接口
+ * </p>
+ *
+ * @author rui.wu
+ * @since 2022-10-17
+ */
+public interface RStatOrgQMapper extends BaseMapper<RStatOrgQ> {
+
+    /**
+     * 区域稳态指标超标分类统计表--年表数据
+     * @param param
+     * @param dataType
+     * @return
+     */
+    List<RStatSubstationOrgVO> getQuarterRStatHarmonicOrgInfo(@Param("param") StatSubstationBizBaseParam param
+                                                                ,@Param("dataType") String dataType);
+
+    /**
+     * 获取季区域稳态指标合格率统计表
+     * @param param
+     * @param dataType
+     * @return
+     */
+    List<RStatOrgIndexVO.RStatOrgIndexInfoVO> getQuarterRStatOrgIndex(@Param("param") StatSubstationBizBaseParam param
+                                                            ,@Param("dataType") String dataType);
+}
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RStatOrgYMapper.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RStatOrgYMapper.java
new file mode 100644
index 000000000..678e96efd
--- /dev/null
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RStatOrgYMapper.java
@@ -0,0 +1,39 @@
+package com.njcn.harmonic.mapper;
+
+import com.njcn.harmonic.pojo.param.StatSubstationBizBaseParam;
+import com.njcn.harmonic.pojo.po.RStatOrgY;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.njcn.harmonic.pojo.vo.RStatOrgIndexVO;
+import com.njcn.harmonic.pojo.vo.RStatSubstationOrgVO;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 区域分类统计年表 Mapper 接口
+ * </p>
+ *
+ * @author rui.wu
+ * @since 2022-10-17
+ */
+public interface RStatOrgYMapper extends BaseMapper<RStatOrgY> {
+
+    /**
+     * 区域稳态指标超标分类统计表--年表数据
+     * @param param
+     * @param dataType
+     * @return
+     */
+    List<RStatSubstationOrgVO> getYearRStatHarmonicOrgInfo(@Param("param") StatSubstationBizBaseParam param
+                                                ,@Param("dataType") String dataType);
+
+    /**
+     *  获取年区域稳态指标合格率统计表
+     * @param param
+     * @param dataType
+     * @return
+     */
+    List<RStatOrgIndexVO.RStatOrgIndexInfoVO> getYearRStatOrgIndex(@Param("param") StatSubstationBizBaseParam param
+                                                ,@Param("dataType") String dataType);
+}
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RStatSubstationMMapper.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RStatSubstationMMapper.java
new file mode 100644
index 000000000..4a117373d
--- /dev/null
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RStatSubstationMMapper.java
@@ -0,0 +1,35 @@
+package com.njcn.harmonic.mapper;
+
+import com.njcn.harmonic.pojo.param.StatSubstationBizBaseParam;
+import com.njcn.harmonic.pojo.po.RStatSubstationM;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.njcn.harmonic.pojo.vo.RSubstationIcon2VO;
+import com.njcn.harmonic.pojo.vo.RSubstationIconVO;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author rui.wu
+ * @since 2022-10-18
+ */
+public interface RStatSubstationMMapper extends BaseMapper<RStatSubstationM> {
+
+    /**
+     * 变电站稳态指标超标分布（按超标天数）
+     * @param param
+     * @return
+     */
+    RSubstationIconVO getStatSubstationIconM(@Param("param") StatSubstationBizBaseParam param);
+
+    /**
+     * 变电站稳态指标平均超标天数
+     * @param param
+     * @return
+     */
+    List<RSubstationIcon2VO> getStatSubstationIcon2M(@Param("param") StatSubstationBizBaseParam param);
+}
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RStatSubstationQMapper.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RStatSubstationQMapper.java
new file mode 100644
index 000000000..fb624d72f
--- /dev/null
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RStatSubstationQMapper.java
@@ -0,0 +1,35 @@
+package com.njcn.harmonic.mapper;
+
+import com.njcn.harmonic.pojo.param.StatSubstationBizBaseParam;
+import com.njcn.harmonic.pojo.po.RStatSubstationQ;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.njcn.harmonic.pojo.vo.RSubstationIcon2VO;
+import com.njcn.harmonic.pojo.vo.RSubstationIconVO;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author rui.wu
+ * @since 2022-10-18
+ */
+public interface RStatSubstationQMapper extends BaseMapper<RStatSubstationQ> {
+
+    /**
+     * 变电站稳态指标超标分布（按超标天数）
+     * @param param
+     * @return
+     */
+    RSubstationIconVO getStatSubstationIconQ(@Param("param") StatSubstationBizBaseParam param);
+
+    /**
+     * 变电站稳态指标平均超标天数
+     * @param param
+     * @return
+     */
+    List<RSubstationIcon2VO> getStatSubstationIcon2Q(@Param("param") StatSubstationBizBaseParam param);
+}
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RStatSubstationVoltageMMapper.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RStatSubstationVoltageMMapper.java
new file mode 100644
index 000000000..b5eeddc7f
--- /dev/null
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RStatSubstationVoltageMMapper.java
@@ -0,0 +1,30 @@
+package com.njcn.harmonic.mapper;
+
+import com.njcn.common.pojo.param.StatisticsBizBaseParam;
+import com.njcn.harmonic.pojo.param.StatSubstationBizBaseParam;
+import com.njcn.harmonic.pojo.po.RStatSubstationVoltageM;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.njcn.harmonic.pojo.vo.RSubstationIconVO;
+import com.njcn.harmonic.pojo.vo.RVoltageIconVO;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author rui.wu
+ * @since 2022-10-18
+ */
+public interface RStatSubstationVoltageMMapper extends BaseMapper<RStatSubstationVoltageM> {
+
+    /**
+     * 变电站稳态指标超标分布（按电压等级）
+     * @param param
+     * @return
+     */
+    List<RVoltageIconVO> getStatSubstationIcon(@Param("param") StatSubstationBizBaseParam param);
+
+}
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RStatSubstationYMapper.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RStatSubstationYMapper.java
new file mode 100644
index 000000000..25e927eb0
--- /dev/null
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RStatSubstationYMapper.java
@@ -0,0 +1,36 @@
+package com.njcn.harmonic.mapper;
+
+import com.njcn.harmonic.pojo.param.StatSubstationBizBaseParam;
+import com.njcn.harmonic.pojo.po.RStatSubstationY;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.njcn.harmonic.pojo.vo.RSubstationIcon2VO;
+import com.njcn.harmonic.pojo.vo.RSubstationIconVO;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author rui.wu
+ * @since 2022-10-18
+ */
+public interface RStatSubstationYMapper extends BaseMapper<RStatSubstationY> {
+
+    /**
+     * 变电站稳态指标超标分布（按超标天数）
+     * @param param
+     * @return
+     */
+    RSubstationIconVO getStatSubstationIconY(@Param("param") StatSubstationBizBaseParam param);
+
+
+    /**
+     * 变电站稳态指标平均超标天数
+     * @param param
+     * @return
+     */
+    List<RSubstationIcon2VO> getStatSubstationIcon2Y(@Param("param") StatSubstationBizBaseParam param);
+}
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RMpBenchmarkLevelMMapper.xml b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RMpBenchmarkLevelMMapper.xml
new file mode 100644
index 000000000..e9f73200b
--- /dev/null
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RMpBenchmarkLevelMMapper.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.njcn.harmonic.mapper.RMpBenchmarkLevelMMapper">
+
+    <resultMap id="BaseResultMap" type="com.njcn.harmonic.pojo.po.RMpBenchmarkLevelM">
+            <id property="measurementPointId" column="measurement_point_id" jdbcType="VARCHAR"/>
+            <id property="dataDate" column="data_date" jdbcType="DATE"/>
+            <result property="voltageAvg" column="voltage_avg" jdbcType="FLOAT"/>
+            <result property="voltageSd" column="voltage_sd" jdbcType="FLOAT"/>
+            <result property="unbalanceAvg" column="unbalance_avg" jdbcType="FLOAT"/>
+            <result property="unbalanceSd" column="unbalance_sd" jdbcType="FLOAT"/>
+            <result property="vthdAvg" column="vthd_avg" jdbcType="FLOAT"/>
+            <result property="vthdSd" column="vthd_sd" jdbcType="FLOAT"/>
+            <result property="flickerAvg" column="flicker_avg" jdbcType="FLOAT"/>
+            <result property="flickerSd" column="flicker_sd" jdbcType="FLOAT"/>
+    </resultMap>
+
+    <sql id="Base_Column_List">
+        measurement_point_id,data_date,voltage_avg,
+        voltage_sd,unbalance_avg,unbalance_sd,
+        vthd_avg,vthd_sd,flicker_avg,
+        flicker_sd
+    </sql>
+</mapper>
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RMpBenchmarkLevelQMapper.xml b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RMpBenchmarkLevelQMapper.xml
new file mode 100644
index 000000000..e07939dfb
--- /dev/null
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RMpBenchmarkLevelQMapper.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.njcn.harmonic.mapper.RMpBenchmarkLevelQMapper">
+
+    <resultMap id="BaseResultMap" type="com.njcn.harmonic.pojo.po.RMpBenchmarkLevelQ">
+            <id property="measurementPointId" column="measurement_point_id" jdbcType="VARCHAR"/>
+            <id property="dataDate" column="data_date" jdbcType="DATE"/>
+            <result property="voltageAvg" column="voltage_avg" jdbcType="FLOAT"/>
+            <result property="voltageSd" column="voltage_sd" jdbcType="FLOAT"/>
+            <result property="unbalanceAvg" column="unbalance_avg" jdbcType="FLOAT"/>
+            <result property="unbalanceSd" column="unbalance_sd" jdbcType="FLOAT"/>
+            <result property="vthdAvg" column="vthd_avg" jdbcType="FLOAT"/>
+            <result property="vthdSd" column="vthd_sd" jdbcType="FLOAT"/>
+            <result property="flickerAvg" column="flicker_avg" jdbcType="FLOAT"/>
+            <result property="flickerSd" column="flicker_sd" jdbcType="FLOAT"/>
+    </resultMap>
+
+    <sql id="Base_Column_List">
+        measurement_point_id,data_date,voltage_avg,
+        voltage_sd,unbalance_avg,unbalance_sd,
+        vthd_avg,vthd_sd,flicker_avg,
+        flicker_sd
+    </sql>
+</mapper>
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RMpBenchmarkLevelYMapper.xml b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RMpBenchmarkLevelYMapper.xml
new file mode 100644
index 000000000..9dcf0e43a
--- /dev/null
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RMpBenchmarkLevelYMapper.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.njcn.harmonic.mapper.RMpBenchmarkLevelYMapper">
+
+    <resultMap id="BaseResultMap" type="com.njcn.harmonic.pojo.po.RMpBenchmarkLevelY">
+            <id property="measurementPointId" column="measurement_point_id" jdbcType="VARCHAR"/>
+            <id property="dataDate" column="data_date" jdbcType="DATE"/>
+            <result property="voltageAvg" column="voltage_avg" jdbcType="FLOAT"/>
+            <result property="voltageSd" column="voltage_sd" jdbcType="FLOAT"/>
+            <result property="unbalanceAvg" column="unbalance_avg" jdbcType="FLOAT"/>
+            <result property="unbalanceSd" column="unbalance_sd" jdbcType="FLOAT"/>
+            <result property="vthdAvg" column="vthd_avg" jdbcType="FLOAT"/>
+            <result property="vthdSd" column="vthd_sd" jdbcType="FLOAT"/>
+            <result property="flickerAvg" column="flicker_avg" jdbcType="FLOAT"/>
+            <result property="flickerSd" column="flicker_sd" jdbcType="FLOAT"/>
+    </resultMap>
+
+    <sql id="Base_Column_List">
+        measurement_point_id,data_date,voltage_avg,
+        voltage_sd,unbalance_avg,unbalance_sd,
+        vthd_avg,vthd_sd,flicker_avg,
+        flicker_sd
+    </sql>
+</mapper>
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RMpHarmonicIMagReportDMapper.xml b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RMpHarmonicIMagReportDMapper.xml
new file mode 100644
index 000000000..efd105bad
--- /dev/null
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RMpHarmonicIMagReportDMapper.xml
@@ -0,0 +1,303 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.njcn.harmonic.mapper.RMpHarmonicIMagReportDMapper">
+
+    <resultMap id="BaseResultMap" type="com.njcn.harmonic.pojo.po.RMpHarmonicIMagReportD">
+            <id property="measurementPointId" column="measurement_point_id" jdbcType="VARCHAR"/>
+            <id property="dataDate" column="data_date" jdbcType="DATE"/>
+            <id property="phase" column="phase" jdbcType="VARCHAR"/>
+            <result property="fundamentalCurrentMax" column="fundamental_current_max" jdbcType="FLOAT"/>
+            <result property="fundamentalCurrentMin" column="fundamental_current_min" jdbcType="FLOAT"/>
+            <result property="fundamentalCurrentAvg" column="fundamental_current_avg" jdbcType="FLOAT"/>
+            <result property="fundamentalCurrent95" column="fundamental_current_95" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentThdMax" column="harmonic_current_thd_max" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentThdMin" column="harmonic_current_thd_min" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentThdAvg" column="harmonic_current_thd_avg" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentThd95" column="harmonic_current_thd_95" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective2Max" column="harmonic_current_effective_2_max" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective2Min" column="harmonic_current_effective_2_min" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective2Avg" column="harmonic_current_effective_2_avg" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective295" column="harmonic_current_effective_2_95" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective3Max" column="harmonic_current_effective_3_max" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective3Min" column="harmonic_current_effective_3_min" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective3Avg" column="harmonic_current_effective_3_avg" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective395" column="harmonic_current_effective_3_95" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective4Max" column="harmonic_current_effective_4_max" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective4Min" column="harmonic_current_effective_4_min" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective4Avg" column="harmonic_current_effective_4_avg" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective495" column="harmonic_current_effective_4_95" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective5Max" column="harmonic_current_effective_5_max" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective5Min" column="harmonic_current_effective_5_min" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective5Avg" column="harmonic_current_effective_5_avg" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective595" column="harmonic_current_effective_5_95" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective6Max" column="harmonic_current_effective_6_max" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective6Min" column="harmonic_current_effective_6_min" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective6Avg" column="harmonic_current_effective_6_avg" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective695" column="harmonic_current_effective_6_95" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective7Max" column="harmonic_current_effective_7_max" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective7Min" column="harmonic_current_effective_7_min" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective7Avg" column="harmonic_current_effective_7_avg" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective795" column="harmonic_current_effective_7_95" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective8Max" column="harmonic_current_effective_8_max" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective8Min" column="harmonic_current_effective_8_min" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective8Avg" column="harmonic_current_effective_8_avg" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective895" column="harmonic_current_effective_8_95" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective9Max" column="harmonic_current_effective_9_max" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective9Min" column="harmonic_current_effective_9_min" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective9Avg" column="harmonic_current_effective_9_avg" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective995" column="harmonic_current_effective_9_95" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective10Max" column="harmonic_current_effective_10_max" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective10Min" column="harmonic_current_effective_10_min" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective10Avg" column="harmonic_current_effective_10_avg" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective1095" column="harmonic_current_effective_10_95" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective11Max" column="harmonic_current_effective_11_max" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective11Min" column="harmonic_current_effective_11_min" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective11Avg" column="harmonic_current_effective_11_avg" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective1195" column="harmonic_current_effective_11_95" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective12Max" column="harmonic_current_effective_12_max" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective12Min" column="harmonic_current_effective_12_min" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective12Avg" column="harmonic_current_effective_12_avg" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective1295" column="harmonic_current_effective_12_95" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective13Max" column="harmonic_current_effective_13_max" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective13Min" column="harmonic_current_effective_13_min" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective13Avg" column="harmonic_current_effective_13_avg" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective1395" column="harmonic_current_effective_13_95" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective14Max" column="harmonic_current_effective_14_max" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective14Min" column="harmonic_current_effective_14_min" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective14Avg" column="harmonic_current_effective_14_avg" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective1495" column="harmonic_current_effective_14_95" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective15Max" column="harmonic_current_effective_15_max" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective15Min" column="harmonic_current_effective_15_min" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective15Avg" column="harmonic_current_effective_15_avg" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective1595" column="harmonic_current_effective_15_95" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective16Max" column="harmonic_current_effective_16_max" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective16Min" column="harmonic_current_effective_16_min" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective16Avg" column="harmonic_current_effective_16_avg" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective1695" column="harmonic_current_effective_16_95" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective17Max" column="harmonic_current_effective_17_max" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective17Min" column="harmonic_current_effective_17_min" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective17Avg" column="harmonic_current_effective_17_avg" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective1795" column="harmonic_current_effective_17_95" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective18Max" column="harmonic_current_effective_18_max" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective18Min" column="harmonic_current_effective_18_min" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective18Avg" column="harmonic_current_effective_18_avg" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective1895" column="harmonic_current_effective_18_95" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective19Max" column="harmonic_current_effective_19_max" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective19Min" column="harmonic_current_effective_19_min" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective19Avg" column="harmonic_current_effective_19_avg" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective1995" column="harmonic_current_effective_19_95" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective20Max" column="harmonic_current_effective_20_max" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective20Min" column="harmonic_current_effective_20_min" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective20Avg" column="harmonic_current_effective_20_avg" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective2095" column="harmonic_current_effective_20_95" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective21Max" column="harmonic_current_effective_21_max" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective21Min" column="harmonic_current_effective_21_min" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective21Avg" column="harmonic_current_effective_21_avg" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective2195" column="harmonic_current_effective_21_95" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective22Max" column="harmonic_current_effective_22_max" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective22Min" column="harmonic_current_effective_22_min" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective22Avg" column="harmonic_current_effective_22_avg" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective2295" column="harmonic_current_effective_22_95" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective23Max" column="harmonic_current_effective_23_max" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective23Min" column="harmonic_current_effective_23_min" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective23Avg" column="harmonic_current_effective_23_avg" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective2395" column="harmonic_current_effective_23_95" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective24Max" column="harmonic_current_effective_24_max" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective24Min" column="harmonic_current_effective_24_min" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective24Avg" column="harmonic_current_effective_24_avg" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective2495" column="harmonic_current_effective_24_95" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective25Max" column="harmonic_current_effective_25_max" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective25Min" column="harmonic_current_effective_25_min" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective25Avg" column="harmonic_current_effective_25_avg" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective2595" column="harmonic_current_effective_25_95" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective26Max" column="harmonic_current_effective_26_max" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective26Min" column="harmonic_current_effective_26_min" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective26Avg" column="harmonic_current_effective_26_avg" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective2695" column="harmonic_current_effective_26_95" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective27Max" column="harmonic_current_effective_27_max" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective27Min" column="harmonic_current_effective_27_min" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective27Avg" column="harmonic_current_effective_27_avg" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective2795" column="harmonic_current_effective_27_95" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective28Max" column="harmonic_current_effective_28_max" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective28Min" column="harmonic_current_effective_28_min" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective28Avg" column="harmonic_current_effective_28_avg" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective2895" column="harmonic_current_effective_28_95" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective29Max" column="harmonic_current_effective_29_max" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective29Min" column="harmonic_current_effective_29_min" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective29Avg" column="harmonic_current_effective_29_avg" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective2995" column="harmonic_current_effective_29_95" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective30Max" column="harmonic_current_effective_30_max" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective30Min" column="harmonic_current_effective_30_min" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective30Avg" column="harmonic_current_effective_30_avg" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective3095" column="harmonic_current_effective_30_95" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective31Max" column="harmonic_current_effective_31_max" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective31Min" column="harmonic_current_effective_31_min" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective31Avg" column="harmonic_current_effective_31_avg" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective3195" column="harmonic_current_effective_31_95" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective32Max" column="harmonic_current_effective_32_max" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective32Min" column="harmonic_current_effective_32_min" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective32Avg" column="harmonic_current_effective_32_avg" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective3295" column="harmonic_current_effective_32_95" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective33Max" column="harmonic_current_effective_33_max" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective33Min" column="harmonic_current_effective_33_min" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective33Avg" column="harmonic_current_effective_33_avg" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective3395" column="harmonic_current_effective_33_95" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective34Max" column="harmonic_current_effective_34_max" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective34Min" column="harmonic_current_effective_34_min" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective34Avg" column="harmonic_current_effective_34_avg" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective3495" column="harmonic_current_effective_34_95" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective35Max" column="harmonic_current_effective_35_max" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective35Min" column="harmonic_current_effective_35_min" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective35Avg" column="harmonic_current_effective_35_avg" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective3595" column="harmonic_current_effective_35_95" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective36Max" column="harmonic_current_effective_36_max" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective36Min" column="harmonic_current_effective_36_min" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective36Avg" column="harmonic_current_effective_36_avg" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective3695" column="harmonic_current_effective_36_95" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective37Max" column="harmonic_current_effective_37_max" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective37Min" column="harmonic_current_effective_37_min" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective37Avg" column="harmonic_current_effective_37_avg" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective3795" column="harmonic_current_effective_37_95" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective38Max" column="harmonic_current_effective_38_max" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective38Min" column="harmonic_current_effective_38_min" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective38Avg" column="harmonic_current_effective_38_avg" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective3895" column="harmonic_current_effective_38_95" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective39Max" column="harmonic_current_effective_39_max" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective39Min" column="harmonic_current_effective_39_min" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective39Avg" column="harmonic_current_effective_39_avg" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective3995" column="harmonic_current_effective_39_95" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective40Max" column="harmonic_current_effective_40_max" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective40Min" column="harmonic_current_effective_40_min" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective40Avg" column="harmonic_current_effective_40_avg" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective4095" column="harmonic_current_effective_40_95" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective41Max" column="harmonic_current_effective_41_max" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective41Min" column="harmonic_current_effective_41_min" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective41Avg" column="harmonic_current_effective_41_avg" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective4195" column="harmonic_current_effective_41_95" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective42Max" column="harmonic_current_effective_42_max" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective42Min" column="harmonic_current_effective_42_min" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective42Avg" column="harmonic_current_effective_42_avg" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective4295" column="harmonic_current_effective_42_95" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective43Max" column="harmonic_current_effective_43_max" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective43Min" column="harmonic_current_effective_43_min" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective43Avg" column="harmonic_current_effective_43_avg" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective4395" column="harmonic_current_effective_43_95" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective44Max" column="harmonic_current_effective_44_max" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective44Min" column="harmonic_current_effective_44_min" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective44Avg" column="harmonic_current_effective_44_avg" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective4495" column="harmonic_current_effective_44_95" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective45Max" column="harmonic_current_effective_45_max" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective45Min" column="harmonic_current_effective_45_min" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective45Avg" column="harmonic_current_effective_45_avg" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective4595" column="harmonic_current_effective_45_95" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective46Max" column="harmonic_current_effective_46_max" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective46Min" column="harmonic_current_effective_46_min" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective46Avg" column="harmonic_current_effective_46_avg" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective4695" column="harmonic_current_effective_46_95" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective47Max" column="harmonic_current_effective_47_max" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective47Min" column="harmonic_current_effective_47_min" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective47Avg" column="harmonic_current_effective_47_avg" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective4795" column="harmonic_current_effective_47_95" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective48Max" column="harmonic_current_effective_48_max" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective48Min" column="harmonic_current_effective_48_min" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective48Avg" column="harmonic_current_effective_48_avg" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective4895" column="harmonic_current_effective_48_95" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective49Max" column="harmonic_current_effective_49_max" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective49Min" column="harmonic_current_effective_49_min" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective49Avg" column="harmonic_current_effective_49_avg" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective4995" column="harmonic_current_effective_49_95" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective50Max" column="harmonic_current_effective_50_max" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective50Min" column="harmonic_current_effective_50_min" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective50Avg" column="harmonic_current_effective_50_avg" jdbcType="FLOAT"/>
+            <result property="harmonicCurrentEffective5095" column="harmonic_current_effective_50_95" jdbcType="FLOAT"/>
+    </resultMap>
+
+    <sql id="Base_Column_List">
+        measurement_point_id,data_date,phase,
+        fundamental_current_max,fundamental_current_min,fundamental_current_avg,
+        fundamental_current_95,harmonic_current_thd_max,harmonic_current_thd_min,
+        harmonic_current_thd_avg,harmonic_current_thd_95,harmonic_current_effective_2_max,
+        harmonic_current_effective_2_min,harmonic_current_effective_2_avg,harmonic_current_effective_2_95,
+        harmonic_current_effective_3_max,harmonic_current_effective_3_min,harmonic_current_effective_3_avg,
+        harmonic_current_effective_3_95,harmonic_current_effective_4_max,harmonic_current_effective_4_min,
+        harmonic_current_effective_4_avg,harmonic_current_effective_4_95,harmonic_current_effective_5_max,
+        harmonic_current_effective_5_min,harmonic_current_effective_5_avg,harmonic_current_effective_5_95,
+        harmonic_current_effective_6_max,harmonic_current_effective_6_min,harmonic_current_effective_6_avg,
+        harmonic_current_effective_6_95,harmonic_current_effective_7_max,harmonic_current_effective_7_min,
+        harmonic_current_effective_7_avg,harmonic_current_effective_7_95,harmonic_current_effective_8_max,
+        harmonic_current_effective_8_min,harmonic_current_effective_8_avg,harmonic_current_effective_8_95,
+        harmonic_current_effective_9_max,harmonic_current_effective_9_min,harmonic_current_effective_9_avg,
+        harmonic_current_effective_9_95,harmonic_current_effective_10_max,harmonic_current_effective_10_min,
+        harmonic_current_effective_10_avg,harmonic_current_effective_10_95,harmonic_current_effective_11_max,
+        harmonic_current_effective_11_min,harmonic_current_effective_11_avg,harmonic_current_effective_11_95,
+        harmonic_current_effective_12_max,harmonic_current_effective_12_min,harmonic_current_effective_12_avg,
+        harmonic_current_effective_12_95,harmonic_current_effective_13_max,harmonic_current_effective_13_min,
+        harmonic_current_effective_13_avg,harmonic_current_effective_13_95,harmonic_current_effective_14_max,
+        harmonic_current_effective_14_min,harmonic_current_effective_14_avg,harmonic_current_effective_14_95,
+        harmonic_current_effective_15_max,harmonic_current_effective_15_min,harmonic_current_effective_15_avg,
+        harmonic_current_effective_15_95,harmonic_current_effective_16_max,harmonic_current_effective_16_min,
+        harmonic_current_effective_16_avg,harmonic_current_effective_16_95,harmonic_current_effective_17_max,
+        harmonic_current_effective_17_min,harmonic_current_effective_17_avg,harmonic_current_effective_17_95,
+        harmonic_current_effective_18_max,harmonic_current_effective_18_min,harmonic_current_effective_18_avg,
+        harmonic_current_effective_18_95,harmonic_current_effective_19_max,harmonic_current_effective_19_min,
+        harmonic_current_effective_19_avg,harmonic_current_effective_19_95,harmonic_current_effective_20_max,
+        harmonic_current_effective_20_min,harmonic_current_effective_20_avg,harmonic_current_effective_20_95,
+        harmonic_current_effective_21_max,harmonic_current_effective_21_min,harmonic_current_effective_21_avg,
+        harmonic_current_effective_21_95,harmonic_current_effective_22_max,harmonic_current_effective_22_min,
+        harmonic_current_effective_22_avg,harmonic_current_effective_22_95,harmonic_current_effective_23_max,
+        harmonic_current_effective_23_min,harmonic_current_effective_23_avg,harmonic_current_effective_23_95,
+        harmonic_current_effective_24_max,harmonic_current_effective_24_min,harmonic_current_effective_24_avg,
+        harmonic_current_effective_24_95,harmonic_current_effective_25_max,harmonic_current_effective_25_min,
+        harmonic_current_effective_25_avg,harmonic_current_effective_25_95,harmonic_current_effective_26_max,
+        harmonic_current_effective_26_min,harmonic_current_effective_26_avg,harmonic_current_effective_26_95,
+        harmonic_current_effective_27_max,harmonic_current_effective_27_min,harmonic_current_effective_27_avg,
+        harmonic_current_effective_27_95,harmonic_current_effective_28_max,harmonic_current_effective_28_min,
+        harmonic_current_effective_28_avg,harmonic_current_effective_28_95,harmonic_current_effective_29_max,
+        harmonic_current_effective_29_min,harmonic_current_effective_29_avg,harmonic_current_effective_29_95,
+        harmonic_current_effective_30_max,harmonic_current_effective_30_min,harmonic_current_effective_30_avg,
+        harmonic_current_effective_30_95,harmonic_current_effective_31_max,harmonic_current_effective_31_min,
+        harmonic_current_effective_31_avg,harmonic_current_effective_31_95,harmonic_current_effective_32_max,
+        harmonic_current_effective_32_min,harmonic_current_effective_32_avg,harmonic_current_effective_32_95,
+        harmonic_current_effective_33_max,harmonic_current_effective_33_min,harmonic_current_effective_33_avg,
+        harmonic_current_effective_33_95,harmonic_current_effective_34_max,harmonic_current_effective_34_min,
+        harmonic_current_effective_34_avg,harmonic_current_effective_34_95,harmonic_current_effective_35_max,
+        harmonic_current_effective_35_min,harmonic_current_effective_35_avg,harmonic_current_effective_35_95,
+        harmonic_current_effective_36_max,harmonic_current_effective_36_min,harmonic_current_effective_36_avg,
+        harmonic_current_effective_36_95,harmonic_current_effective_37_max,harmonic_current_effective_37_min,
+        harmonic_current_effective_37_avg,harmonic_current_effective_37_95,harmonic_current_effective_38_max,
+        harmonic_current_effective_38_min,harmonic_current_effective_38_avg,harmonic_current_effective_38_95,
+        harmonic_current_effective_39_max,harmonic_current_effective_39_min,harmonic_current_effective_39_avg,
+        harmonic_current_effective_39_95,harmonic_current_effective_40_max,harmonic_current_effective_40_min,
+        harmonic_current_effective_40_avg,harmonic_current_effective_40_95,harmonic_current_effective_41_max,
+        harmonic_current_effective_41_min,harmonic_current_effective_41_avg,harmonic_current_effective_41_95,
+        harmonic_current_effective_42_max,harmonic_current_effective_42_min,harmonic_current_effective_42_avg,
+        harmonic_current_effective_42_95,harmonic_current_effective_43_max,harmonic_current_effective_43_min,
+        harmonic_current_effective_43_avg,harmonic_current_effective_43_95,harmonic_current_effective_44_max,
+        harmonic_current_effective_44_min,harmonic_current_effective_44_avg,harmonic_current_effective_44_95,
+        harmonic_current_effective_45_max,harmonic_current_effective_45_min,harmonic_current_effective_45_avg,
+        harmonic_current_effective_45_95,harmonic_current_effective_46_max,harmonic_current_effective_46_min,
+        harmonic_current_effective_46_avg,harmonic_current_effective_46_95,harmonic_current_effective_47_max,
+        harmonic_current_effective_47_min,harmonic_current_effective_47_avg,harmonic_current_effective_47_95,
+        harmonic_current_effective_48_max,harmonic_current_effective_48_min,harmonic_current_effective_48_avg,
+        harmonic_current_effective_48_95,harmonic_current_effective_49_max,harmonic_current_effective_49_min,
+        harmonic_current_effective_49_avg,harmonic_current_effective_49_95,harmonic_current_effective_50_max,
+        harmonic_current_effective_50_min,harmonic_current_effective_50_avg,harmonic_current_effective_50_95
+    </sql>
+    <select id="getListByCond" resultType="com.njcn.harmonic.pojo.po.RMpHarmonicIMagReportD">
+        select <include refid="Base_Column_List"/>
+        from r_mp_harmonic_i_mag_report_d
+        where 1 = 1
+        <if test="startTime != null and startTime != ''">
+            AND DATE_FORMAT(data_date, '%Y-%m-%d') >=  #{startTime, jdbcType=VARCHAR}
+        </if>
+        <if test="endTime != null and endTime != ''">
+            AND DATE_FORMAT(data_date, '%Y-%m-%d') &lt;=  #{endTime, jdbcType=VARCHAR}
+        </if>
+        and measurement_point_id IN
+        <foreach collection="monitorIdList" open="(" close=")" separator="," item="id">
+            #{id}
+        </foreach>
+    </select>
+</mapper>
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RMpHarmonicIRateReportDMapper.xml b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RMpHarmonicIRateReportDMapper.xml
new file mode 100644
index 000000000..b75cc55dd
--- /dev/null
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RMpHarmonicIRateReportDMapper.xml
@@ -0,0 +1,294 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.njcn.harmonic.mapper.RMpHarmonicIRateReportDMapper">
+
+    <resultMap id="BaseResultMap" type="com.njcn.harmonic.pojo.po.RMpHarmonicIRateReportD">
+            <id property="measurementPointId" column="measurement_point_id" jdbcType="VARCHAR"/>
+            <id property="dataDate" column="data_date" jdbcType="DATE"/>
+            <id property="phase" column="phase" jdbcType="VARCHAR"/>
+            <result property="i2Max" column="i_2_max" jdbcType="FLOAT"/>
+            <result property="i2Min" column="i_2_min" jdbcType="FLOAT"/>
+            <result property="i2Avg" column="i_2_avg" jdbcType="FLOAT"/>
+            <result property="i2Cp95" column="i_2_cp95" jdbcType="FLOAT"/>
+            <result property="i3Max" column="i_3_max" jdbcType="FLOAT"/>
+            <result property="i3Min" column="i_3_min" jdbcType="FLOAT"/>
+            <result property="i3Avg" column="i_3_avg" jdbcType="FLOAT"/>
+            <result property="i3Cp95" column="i_3_cp95" jdbcType="FLOAT"/>
+            <result property="i4Max" column="i_4_max" jdbcType="FLOAT"/>
+            <result property="i4Min" column="i_4_min" jdbcType="FLOAT"/>
+            <result property="i4Avg" column="i_4_avg" jdbcType="FLOAT"/>
+            <result property="i4Cp95" column="i_4_cp95" jdbcType="FLOAT"/>
+            <result property="i5Max" column="i_5_max" jdbcType="FLOAT"/>
+            <result property="i5Min" column="i_5_min" jdbcType="FLOAT"/>
+            <result property="i5Avg" column="i_5_avg" jdbcType="FLOAT"/>
+            <result property="i5Cp95" column="i_5_cp95" jdbcType="FLOAT"/>
+            <result property="i6Max" column="i_6_max" jdbcType="FLOAT"/>
+            <result property="i6Min" column="i_6_min" jdbcType="FLOAT"/>
+            <result property="i6Avg" column="i_6_avg" jdbcType="FLOAT"/>
+            <result property="i6Cp95" column="i_6_cp95" jdbcType="FLOAT"/>
+            <result property="i7Max" column="i_7_max" jdbcType="FLOAT"/>
+            <result property="i7Min" column="i_7_min" jdbcType="FLOAT"/>
+            <result property="i7Avg" column="i_7_avg" jdbcType="FLOAT"/>
+            <result property="i7Cp95" column="i_7_cp95" jdbcType="FLOAT"/>
+            <result property="i8Max" column="i_8_max" jdbcType="FLOAT"/>
+            <result property="i8Min" column="i_8_min" jdbcType="FLOAT"/>
+            <result property="i8Avg" column="i_8_avg" jdbcType="FLOAT"/>
+            <result property="i8Cp95" column="i_8_cp95" jdbcType="FLOAT"/>
+            <result property="i9Max" column="i_9_max" jdbcType="FLOAT"/>
+            <result property="i9Min" column="i_9_min" jdbcType="FLOAT"/>
+            <result property="i9Avg" column="i_9_avg" jdbcType="FLOAT"/>
+            <result property="i9Cp95" column="i_9_cp95" jdbcType="FLOAT"/>
+            <result property="i10Max" column="i_10_max" jdbcType="FLOAT"/>
+            <result property="i10Min" column="i_10_min" jdbcType="FLOAT"/>
+            <result property="i10Avg" column="i_10_avg" jdbcType="FLOAT"/>
+            <result property="i10Cp95" column="i_10_cp95" jdbcType="FLOAT"/>
+            <result property="i11Max" column="i_11_max" jdbcType="FLOAT"/>
+            <result property="i11Min" column="i_11_min" jdbcType="FLOAT"/>
+            <result property="i11Avg" column="i_11_avg" jdbcType="FLOAT"/>
+            <result property="i11Cp95" column="i_11_cp95" jdbcType="FLOAT"/>
+            <result property="i12Max" column="i_12_max" jdbcType="FLOAT"/>
+            <result property="i12Min" column="i_12_min" jdbcType="FLOAT"/>
+            <result property="i12Avg" column="i_12_avg" jdbcType="FLOAT"/>
+            <result property="i12Cp95" column="i_12_cp95" jdbcType="FLOAT"/>
+            <result property="i13Max" column="i_13_max" jdbcType="FLOAT"/>
+            <result property="i13Min" column="i_13_min" jdbcType="FLOAT"/>
+            <result property="i13Avg" column="i_13_avg" jdbcType="FLOAT"/>
+            <result property="i13Cp95" column="i_13_cp95" jdbcType="FLOAT"/>
+            <result property="i14Max" column="i_14_max" jdbcType="FLOAT"/>
+            <result property="i14Min" column="i_14_min" jdbcType="FLOAT"/>
+            <result property="i14Avg" column="i_14_avg" jdbcType="FLOAT"/>
+            <result property="i14Cp95" column="i_14_cp95" jdbcType="FLOAT"/>
+            <result property="i15Max" column="i_15_max" jdbcType="FLOAT"/>
+            <result property="i15Min" column="i_15_min" jdbcType="FLOAT"/>
+            <result property="i15Avg" column="i_15_avg" jdbcType="FLOAT"/>
+            <result property="i15Cp95" column="i_15_cp95" jdbcType="FLOAT"/>
+            <result property="i16Max" column="i_16_max" jdbcType="FLOAT"/>
+            <result property="i16Min" column="i_16_min" jdbcType="FLOAT"/>
+            <result property="i16Avg" column="i_16_avg" jdbcType="FLOAT"/>
+            <result property="i16Cp95" column="i_16_cp95" jdbcType="FLOAT"/>
+            <result property="i17Max" column="i_17_max" jdbcType="FLOAT"/>
+            <result property="i17Min" column="i_17_min" jdbcType="FLOAT"/>
+            <result property="i17Avg" column="i_17_avg" jdbcType="FLOAT"/>
+            <result property="i17Cp95" column="i_17_cp95" jdbcType="FLOAT"/>
+            <result property="i18Max" column="i_18_max" jdbcType="FLOAT"/>
+            <result property="i18Min" column="i_18_min" jdbcType="FLOAT"/>
+            <result property="i18Avg" column="i_18_avg" jdbcType="FLOAT"/>
+            <result property="i18Cp95" column="i_18_cp95" jdbcType="FLOAT"/>
+            <result property="i19Max" column="i_19_max" jdbcType="FLOAT"/>
+            <result property="i19Min" column="i_19_min" jdbcType="FLOAT"/>
+            <result property="i19Avg" column="i_19_avg" jdbcType="FLOAT"/>
+            <result property="i19Cp95" column="i_19_cp95" jdbcType="FLOAT"/>
+            <result property="i20Max" column="i_20_max" jdbcType="FLOAT"/>
+            <result property="i20Min" column="i_20_min" jdbcType="FLOAT"/>
+            <result property="i20Avg" column="i_20_avg" jdbcType="FLOAT"/>
+            <result property="i20Cp95" column="i_20_cp95" jdbcType="FLOAT"/>
+            <result property="i21Max" column="i_21_max" jdbcType="FLOAT"/>
+            <result property="i21Min" column="i_21_min" jdbcType="FLOAT"/>
+            <result property="i21Avg" column="i_21_avg" jdbcType="FLOAT"/>
+            <result property="i21Cp95" column="i_21_cp95" jdbcType="FLOAT"/>
+            <result property="i22Max" column="i_22_max" jdbcType="FLOAT"/>
+            <result property="i22Min" column="i_22_min" jdbcType="FLOAT"/>
+            <result property="i22Avg" column="i_22_avg" jdbcType="FLOAT"/>
+            <result property="i22Cp95" column="i_22_cp95" jdbcType="FLOAT"/>
+            <result property="i23Max" column="i_23_max" jdbcType="FLOAT"/>
+            <result property="i23Min" column="i_23_min" jdbcType="FLOAT"/>
+            <result property="i23Avg" column="i_23_avg" jdbcType="FLOAT"/>
+            <result property="i23Cp95" column="i_23_cp95" jdbcType="FLOAT"/>
+            <result property="i24Max" column="i_24_max" jdbcType="FLOAT"/>
+            <result property="i24Min" column="i_24_min" jdbcType="FLOAT"/>
+            <result property="i24Avg" column="i_24_avg" jdbcType="FLOAT"/>
+            <result property="i24Cp95" column="i_24_cp95" jdbcType="FLOAT"/>
+            <result property="i25Max" column="i_25_max" jdbcType="FLOAT"/>
+            <result property="i25Min" column="i_25_min" jdbcType="FLOAT"/>
+            <result property="i25Avg" column="i_25_avg" jdbcType="FLOAT"/>
+            <result property="i25Cp95" column="i_25_cp95" jdbcType="FLOAT"/>
+            <result property="i26Max" column="i_26_max" jdbcType="FLOAT"/>
+            <result property="i26Min" column="i_26_min" jdbcType="FLOAT"/>
+            <result property="i26Avg" column="i_26_avg" jdbcType="FLOAT"/>
+            <result property="i26Cp95" column="i_26_cp95" jdbcType="FLOAT"/>
+            <result property="i27Max" column="i_27_max" jdbcType="FLOAT"/>
+            <result property="i27Min" column="i_27_min" jdbcType="FLOAT"/>
+            <result property="i27Avg" column="i_27_avg" jdbcType="FLOAT"/>
+            <result property="i27Cp95" column="i_27_cp95" jdbcType="FLOAT"/>
+            <result property="i28Max" column="i_28_max" jdbcType="FLOAT"/>
+            <result property="i28Min" column="i_28_min" jdbcType="FLOAT"/>
+            <result property="i28Avg" column="i_28_avg" jdbcType="FLOAT"/>
+            <result property="i28Cp95" column="i_28_cp95" jdbcType="FLOAT"/>
+            <result property="i29Max" column="i_29_max" jdbcType="FLOAT"/>
+            <result property="i29Min" column="i_29_min" jdbcType="FLOAT"/>
+            <result property="i29Avg" column="i_29_avg" jdbcType="FLOAT"/>
+            <result property="i29Cp95" column="i_29_cp95" jdbcType="FLOAT"/>
+            <result property="i30Max" column="i_30_max" jdbcType="FLOAT"/>
+            <result property="i30Min" column="i_30_min" jdbcType="FLOAT"/>
+            <result property="i30Avg" column="i_30_avg" jdbcType="FLOAT"/>
+            <result property="i30Cp95" column="i_30_cp95" jdbcType="FLOAT"/>
+            <result property="i31Max" column="i_31_max" jdbcType="FLOAT"/>
+            <result property="i31Min" column="i_31_min" jdbcType="FLOAT"/>
+            <result property="i31Avg" column="i_31_avg" jdbcType="FLOAT"/>
+            <result property="i31Cp95" column="i_31_cp95" jdbcType="FLOAT"/>
+            <result property="i32Max" column="i_32_max" jdbcType="FLOAT"/>
+            <result property="i32Min" column="i_32_min" jdbcType="FLOAT"/>
+            <result property="i32Avg" column="i_32_avg" jdbcType="FLOAT"/>
+            <result property="i32Cp95" column="i_32_cp95" jdbcType="FLOAT"/>
+            <result property="i33Max" column="i_33_max" jdbcType="FLOAT"/>
+            <result property="i33Min" column="i_33_min" jdbcType="FLOAT"/>
+            <result property="i33Avg" column="i_33_avg" jdbcType="FLOAT"/>
+            <result property="i33Cp95" column="i_33_cp95" jdbcType="FLOAT"/>
+            <result property="i34Max" column="i_34_max" jdbcType="FLOAT"/>
+            <result property="i34Min" column="i_34_min" jdbcType="FLOAT"/>
+            <result property="i34Avg" column="i_34_avg" jdbcType="FLOAT"/>
+            <result property="i34Cp95" column="i_34_cp95" jdbcType="FLOAT"/>
+            <result property="i35Max" column="i_35_max" jdbcType="FLOAT"/>
+            <result property="i35Min" column="i_35_min" jdbcType="FLOAT"/>
+            <result property="i35Avg" column="i_35_avg" jdbcType="FLOAT"/>
+            <result property="i35Cp95" column="i_35_cp95" jdbcType="FLOAT"/>
+            <result property="i36Max" column="i_36_max" jdbcType="FLOAT"/>
+            <result property="i36Min" column="i_36_min" jdbcType="FLOAT"/>
+            <result property="i36Avg" column="i_36_avg" jdbcType="FLOAT"/>
+            <result property="i36Cp95" column="i_36_cp95" jdbcType="FLOAT"/>
+            <result property="i37Max" column="i_37_max" jdbcType="FLOAT"/>
+            <result property="i37Min" column="i_37_min" jdbcType="FLOAT"/>
+            <result property="i37Avg" column="i_37_avg" jdbcType="FLOAT"/>
+            <result property="i37Cp95" column="i_37_cp95" jdbcType="FLOAT"/>
+            <result property="i38Max" column="i_38_max" jdbcType="FLOAT"/>
+            <result property="i38Min" column="i_38_min" jdbcType="FLOAT"/>
+            <result property="i38Avg" column="i_38_avg" jdbcType="FLOAT"/>
+            <result property="i38Cp95" column="i_38_cp95" jdbcType="FLOAT"/>
+            <result property="i39Max" column="i_39_max" jdbcType="FLOAT"/>
+            <result property="i39Min" column="i_39_min" jdbcType="FLOAT"/>
+            <result property="i39Avg" column="i_39_avg" jdbcType="FLOAT"/>
+            <result property="i39Cp95" column="i_39_cp95" jdbcType="FLOAT"/>
+            <result property="i40Max" column="i_40_max" jdbcType="FLOAT"/>
+            <result property="i40Min" column="i_40_min" jdbcType="FLOAT"/>
+            <result property="i40Avg" column="i_40_avg" jdbcType="FLOAT"/>
+            <result property="i40Cp95" column="i_40_cp95" jdbcType="FLOAT"/>
+            <result property="i41Max" column="i_41_max" jdbcType="FLOAT"/>
+            <result property="i41Min" column="i_41_min" jdbcType="FLOAT"/>
+            <result property="i41Avg" column="i_41_avg" jdbcType="FLOAT"/>
+            <result property="i41Cp95" column="i_41_cp95" jdbcType="FLOAT"/>
+            <result property="i42Max" column="i_42_max" jdbcType="FLOAT"/>
+            <result property="i42Min" column="i_42_min" jdbcType="FLOAT"/>
+            <result property="i42Avg" column="i_42_avg" jdbcType="FLOAT"/>
+            <result property="i42Cp95" column="i_42_cp95" jdbcType="FLOAT"/>
+            <result property="i43Max" column="i_43_max" jdbcType="FLOAT"/>
+            <result property="i43Min" column="i_43_min" jdbcType="FLOAT"/>
+            <result property="i43Avg" column="i_43_avg" jdbcType="FLOAT"/>
+            <result property="i43Cp95" column="i_43_cp95" jdbcType="FLOAT"/>
+            <result property="i44Max" column="i_44_max" jdbcType="FLOAT"/>
+            <result property="i44Min" column="i_44_min" jdbcType="FLOAT"/>
+            <result property="i44Avg" column="i_44_avg" jdbcType="FLOAT"/>
+            <result property="i44Cp95" column="i_44_cp95" jdbcType="FLOAT"/>
+            <result property="i45Max" column="i_45_max" jdbcType="FLOAT"/>
+            <result property="i45Min" column="i_45_min" jdbcType="FLOAT"/>
+            <result property="i45Avg" column="i_45_avg" jdbcType="FLOAT"/>
+            <result property="i45Cp95" column="i_45_cp95" jdbcType="FLOAT"/>
+            <result property="i46Max" column="i_46_max" jdbcType="FLOAT"/>
+            <result property="i46Min" column="i_46_min" jdbcType="FLOAT"/>
+            <result property="i46Avg" column="i_46_avg" jdbcType="FLOAT"/>
+            <result property="i46Cp95" column="i_46_cp95" jdbcType="FLOAT"/>
+            <result property="i47Max" column="i_47_max" jdbcType="FLOAT"/>
+            <result property="i47Min" column="i_47_min" jdbcType="FLOAT"/>
+            <result property="i47Avg" column="i_47_avg" jdbcType="FLOAT"/>
+            <result property="i47Cp95" column="i_47_cp95" jdbcType="FLOAT"/>
+            <result property="i48Max" column="i_48_max" jdbcType="FLOAT"/>
+            <result property="i48Min" column="i_48_min" jdbcType="FLOAT"/>
+            <result property="i48Avg" column="i_48_avg" jdbcType="FLOAT"/>
+            <result property="i48Cp95" column="i_48_cp95" jdbcType="FLOAT"/>
+            <result property="i49Max" column="i_49_max" jdbcType="FLOAT"/>
+            <result property="i49Min" column="i_49_min" jdbcType="FLOAT"/>
+            <result property="i49Avg" column="i_49_avg" jdbcType="FLOAT"/>
+            <result property="i49Cp95" column="i_49_cp95" jdbcType="FLOAT"/>
+            <result property="i50Max" column="i_50_max" jdbcType="FLOAT"/>
+            <result property="i50Min" column="i_50_min" jdbcType="FLOAT"/>
+            <result property="i50Avg" column="i_50_avg" jdbcType="FLOAT"/>
+            <result property="i50Cp95" column="i_50_cp95" jdbcType="FLOAT"/>
+    </resultMap>
+
+    <sql id="Base_Column_List">
+        measurement_point_id,data_date,phase,
+        i_2_max,i_2_min,i_2_avg,
+        i_2_cp95,i_3_max,i_3_min,
+        i_3_avg,i_3_cp95,i_4_max,
+        i_4_min,i_4_avg,i_4_cp95,
+        i_5_max,i_5_min,i_5_avg,
+        i_5_cp95,i_6_max,i_6_min,
+        i_6_avg,i_6_cp95,i_7_max,
+        i_7_min,i_7_avg,i_7_cp95,
+        i_8_max,i_8_min,i_8_avg,
+        i_8_cp95,i_9_max,i_9_min,
+        i_9_avg,i_9_cp95,i_10_max,
+        i_10_min,i_10_avg,i_10_cp95,
+        i_11_max,i_11_min,i_11_avg,
+        i_11_cp95,i_12_max,i_12_min,
+        i_12_avg,i_12_cp95,i_13_max,
+        i_13_min,i_13_avg,i_13_cp95,
+        i_14_max,i_14_min,i_14_avg,
+        i_14_cp95,i_15_max,i_15_min,
+        i_15_avg,i_15_cp95,i_16_max,
+        i_16_min,i_16_avg,i_16_cp95,
+        i_17_max,i_17_min,i_17_avg,
+        i_17_cp95,i_18_max,i_18_min,
+        i_18_avg,i_18_cp95,i_19_max,
+        i_19_min,i_19_avg,i_19_cp95,
+        i_20_max,i_20_min,i_20_avg,
+        i_20_cp95,i_21_max,i_21_min,
+        i_21_avg,i_21_cp95,i_22_max,
+        i_22_min,i_22_avg,i_22_cp95,
+        i_23_max,i_23_min,i_23_avg,
+        i_23_cp95,i_24_max,i_24_min,
+        i_24_avg,i_24_cp95,i_25_max,
+        i_25_min,i_25_avg,i_25_cp95,
+        i_26_max,i_26_min,i_26_avg,
+        i_26_cp95,i_27_max,i_27_min,
+        i_27_avg,i_27_cp95,i_28_max,
+        i_28_min,i_28_avg,i_28_cp95,
+        i_29_max,i_29_min,i_29_avg,
+        i_29_cp95,i_30_max,i_30_min,
+        i_30_avg,i_30_cp95,i_31_max,
+        i_31_min,i_31_avg,i_31_cp95,
+        i_32_max,i_32_min,i_32_avg,
+        i_32_cp95,i_33_max,i_33_min,
+        i_33_avg,i_33_cp95,i_34_max,
+        i_34_min,i_34_avg,i_34_cp95,
+        i_35_max,i_35_min,i_35_avg,
+        i_35_cp95,i_36_max,i_36_min,
+        i_36_avg,i_36_cp95,i_37_max,
+        i_37_min,i_37_avg,i_37_cp95,
+        i_38_max,i_38_min,i_38_avg,
+        i_38_cp95,i_39_max,i_39_min,
+        i_39_avg,i_39_cp95,i_40_max,
+        i_40_min,i_40_avg,i_40_cp95,
+        i_41_max,i_41_min,i_41_avg,
+        i_41_cp95,i_42_max,i_42_min,
+        i_42_avg,i_42_cp95,i_43_max,
+        i_43_min,i_43_avg,i_43_cp95,
+        i_44_max,i_44_min,i_44_avg,
+        i_44_cp95,i_45_max,i_45_min,
+        i_45_avg,i_45_cp95,i_46_max,
+        i_46_min,i_46_avg,i_46_cp95,
+        i_47_max,i_47_min,i_47_avg,
+        i_47_cp95,i_48_max,i_48_min,
+        i_48_avg,i_48_cp95,i_49_max,
+        i_49_min,i_49_avg,i_49_cp95,
+        i_50_max,i_50_min,i_50_avg,
+        i_50_cp95
+    </sql>
+    <select id="getListByCond" resultType="com.njcn.harmonic.pojo.po.RMpHarmonicIRateReportD">
+        select <include refid="Base_Column_List"/>
+        from r_mp_harmonic_i_rate_report_d
+        where 1 = 1
+        <if test="startTime != null and startTime != ''">
+            AND DATE_FORMAT(data_date, '%Y-%m-%d') >=  #{startTime, jdbcType=VARCHAR}
+        </if>
+        <if test="endTime != null and endTime != ''">
+            AND DATE_FORMAT(data_date, '%Y-%m-%d') &lt;= #{endTime, jdbcType=VARCHAR}
+        </if>
+        and measurement_point_id IN
+        <foreach collection="monitorIdList" open="(" close=")" separator="," item="id">
+            #{id}
+        </foreach>
+    </select>
+
+</mapper>
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RMpHarmonicVRateReportDMapper.xml b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RMpHarmonicVRateReportDMapper.xml
new file mode 100644
index 000000000..a7eb55b29
--- /dev/null
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RMpHarmonicVRateReportDMapper.xml
@@ -0,0 +1,303 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.njcn.harmonic.mapper.RMpHarmonicVRateReportDMapper">
+
+    <resultMap id="BaseResultMap" type="com.njcn.harmonic.pojo.po.RMpHarmonicVRateReportD">
+            <id property="measurementPointId" column="measurement_point_id" jdbcType="VARCHAR"/>
+            <id property="dataDate" column="data_date" jdbcType="DATE"/>
+            <id property="phase" column="phase" jdbcType="VARCHAR"/>
+            <result property="voltageHarmonicThdMax" column="voltage_harmonic_thd_max" jdbcType="FLOAT"/>
+            <result property="voltageHarmonicThdMin" column="voltage_harmonic_thd_min" jdbcType="FLOAT"/>
+            <result property="voltageHarmonicThdAvg" column="voltage_harmonic_thd_avg" jdbcType="FLOAT"/>
+            <result property="voltageHarmonicThd95" column="voltage_harmonic_thd_95" jdbcType="FLOAT"/>
+            <result property="fundamentalVoltageMax" column="fundamental_voltage_max" jdbcType="FLOAT"/>
+            <result property="fundamentalVoltageMin" column="fundamental_voltage_min" jdbcType="FLOAT"/>
+            <result property="fundamentalVoltageAvg" column="fundamental_voltage_avg" jdbcType="FLOAT"/>
+            <result property="fundamentalVoltage95" column="fundamental_voltage_95" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent2Max" column="harmonic_voltage_content_2_max" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent2Min" column="harmonic_voltage_content_2_min" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent2Avg" column="harmonic_voltage_content_2_avg" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent295" column="harmonic_voltage_content_2_95" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent3Max" column="harmonic_voltage_content_3_max" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent3Min" column="harmonic_voltage_content_3_min" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent3Avg" column="harmonic_voltage_content_3_avg" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent395" column="harmonic_voltage_content_3_95" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent4Max" column="harmonic_voltage_content_4_max" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent4Min" column="harmonic_voltage_content_4_min" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent4Avg" column="harmonic_voltage_content_4_avg" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent495" column="harmonic_voltage_content_4_95" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent5Max" column="harmonic_voltage_content_5_max" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent5Min" column="harmonic_voltage_content_5_min" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent5Avg" column="harmonic_voltage_content_5_avg" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent595" column="harmonic_voltage_content_5_95" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent6Max" column="harmonic_voltage_content_6_max" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent6Min" column="harmonic_voltage_content_6_min" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent6Avg" column="harmonic_voltage_content_6_avg" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent695" column="harmonic_voltage_content_6_95" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent7Max" column="harmonic_voltage_content_7_max" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent7Min" column="harmonic_voltage_content_7_min" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent7Avg" column="harmonic_voltage_content_7_avg" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent795" column="harmonic_voltage_content_7_95" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent8Max" column="harmonic_voltage_content_8_max" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent8Min" column="harmonic_voltage_content_8_min" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent8Avg" column="harmonic_voltage_content_8_avg" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent895" column="harmonic_voltage_content_8_95" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent9Max" column="harmonic_voltage_content_9_max" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent9Min" column="harmonic_voltage_content_9_min" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent9Avg" column="harmonic_voltage_content_9_avg" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent995" column="harmonic_voltage_content_9_95" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent10Max" column="harmonic_voltage_content_10_max" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent10Min" column="harmonic_voltage_content_10_min" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent10Avg" column="harmonic_voltage_content_10_avg" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent1095" column="harmonic_voltage_content_10_95" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent11Max" column="harmonic_voltage_content_11_max" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent11Min" column="harmonic_voltage_content_11_min" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent11Avg" column="harmonic_voltage_content_11_avg" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent1195" column="harmonic_voltage_content_11_95" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent12Max" column="harmonic_voltage_content_12_max" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent12Min" column="harmonic_voltage_content_12_min" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent12Avg" column="harmonic_voltage_content_12_avg" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent1295" column="harmonic_voltage_content_12_95" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent13Max" column="harmonic_voltage_content_13_max" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent13Min" column="harmonic_voltage_content_13_min" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent13Avg" column="harmonic_voltage_content_13_avg" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent1395" column="harmonic_voltage_content_13_95" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent14Max" column="harmonic_voltage_content_14_max" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent14Min" column="harmonic_voltage_content_14_min" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent14Avg" column="harmonic_voltage_content_14_avg" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent1495" column="harmonic_voltage_content_14_95" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent15Max" column="harmonic_voltage_content_15_max" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent15Min" column="harmonic_voltage_content_15_min" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent15Avg" column="harmonic_voltage_content_15_avg" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent1595" column="harmonic_voltage_content_15_95" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent16Max" column="harmonic_voltage_content_16_max" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent16Min" column="harmonic_voltage_content_16_min" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent16Avg" column="harmonic_voltage_content_16_avg" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent1695" column="harmonic_voltage_content_16_95" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent17Max" column="harmonic_voltage_content_17_max" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent17Min" column="harmonic_voltage_content_17_min" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent17Avg" column="harmonic_voltage_content_17_avg" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent1795" column="harmonic_voltage_content_17_95" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent18Max" column="harmonic_voltage_content_18_max" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent18Min" column="harmonic_voltage_content_18_min" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent18Avg" column="harmonic_voltage_content_18_avg" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent1895" column="harmonic_voltage_content_18_95" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent19Max" column="harmonic_voltage_content_19_max" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent19Min" column="harmonic_voltage_content_19_min" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent19Avg" column="harmonic_voltage_content_19_avg" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent1995" column="harmonic_voltage_content_19_95" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent20Max" column="harmonic_voltage_content_20_max" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent20Min" column="harmonic_voltage_content_20_min" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent20Avg" column="harmonic_voltage_content_20_avg" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent2095" column="harmonic_voltage_content_20_95" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent21Max" column="harmonic_voltage_content_21_max" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent21Min" column="harmonic_voltage_content_21_min" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent21Avg" column="harmonic_voltage_content_21_avg" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent2195" column="harmonic_voltage_content_21_95" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent22Max" column="harmonic_voltage_content_22_max" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent22Min" column="harmonic_voltage_content_22_min" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent22Avg" column="harmonic_voltage_content_22_avg" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent2295" column="harmonic_voltage_content_22_95" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent23Max" column="harmonic_voltage_content_23_max" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent23Min" column="harmonic_voltage_content_23_min" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent23Avg" column="harmonic_voltage_content_23_avg" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent2395" column="harmonic_voltage_content_23_95" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent24Max" column="harmonic_voltage_content_24_max" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent24Min" column="harmonic_voltage_content_24_min" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent24Avg" column="harmonic_voltage_content_24_avg" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent2495" column="harmonic_voltage_content_24_95" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent25Max" column="harmonic_voltage_content_25_max" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent25Min" column="harmonic_voltage_content_25_min" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent25Avg" column="harmonic_voltage_content_25_avg" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent2595" column="harmonic_voltage_content_25_95" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent26Max" column="harmonic_voltage_content_26_max" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent26Min" column="harmonic_voltage_content_26_min" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent26Avg" column="harmonic_voltage_content_26_avg" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent2695" column="harmonic_voltage_content_26_95" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent27Max" column="harmonic_voltage_content_27_max" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent27Min" column="harmonic_voltage_content_27_min" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent27Avg" column="harmonic_voltage_content_27_avg" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent2795" column="harmonic_voltage_content_27_95" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent28Max" column="harmonic_voltage_content_28_max" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent28Min" column="harmonic_voltage_content_28_min" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent28Avg" column="harmonic_voltage_content_28_avg" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent2895" column="harmonic_voltage_content_28_95" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent29Max" column="harmonic_voltage_content_29_max" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent29Min" column="harmonic_voltage_content_29_min" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent29Avg" column="harmonic_voltage_content_29_avg" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent2995" column="harmonic_voltage_content_29_95" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent30Max" column="harmonic_voltage_content_30_max" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent30Min" column="harmonic_voltage_content_30_min" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent30Avg" column="harmonic_voltage_content_30_avg" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent3095" column="harmonic_voltage_content_30_95" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent31Max" column="harmonic_voltage_content_31_max" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent31Min" column="harmonic_voltage_content_31_min" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent31Avg" column="harmonic_voltage_content_31_avg" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent3195" column="harmonic_voltage_content_31_95" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent32Max" column="harmonic_voltage_content_32_max" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent32Min" column="harmonic_voltage_content_32_min" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent32Avg" column="harmonic_voltage_content_32_avg" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent3295" column="harmonic_voltage_content_32_95" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent33Max" column="harmonic_voltage_content_33_max" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent33Min" column="harmonic_voltage_content_33_min" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent33Avg" column="harmonic_voltage_content_33_avg" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent3395" column="harmonic_voltage_content_33_95" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent34Max" column="harmonic_voltage_content_34_max" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent34Min" column="harmonic_voltage_content_34_min" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent34Avg" column="harmonic_voltage_content_34_avg" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent3495" column="harmonic_voltage_content_34_95" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent35Max" column="harmonic_voltage_content_35_max" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent35Min" column="harmonic_voltage_content_35_min" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent35Avg" column="harmonic_voltage_content_35_avg" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent3595" column="harmonic_voltage_content_35_95" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent36Max" column="harmonic_voltage_content_36_max" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent36Min" column="harmonic_voltage_content_36_min" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent36Avg" column="harmonic_voltage_content_36_avg" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent3695" column="harmonic_voltage_content_36_95" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent37Max" column="harmonic_voltage_content_37_max" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent37Min" column="harmonic_voltage_content_37_min" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent37Avg" column="harmonic_voltage_content_37_avg" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent3795" column="harmonic_voltage_content_37_95" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent38Max" column="harmonic_voltage_content_38_max" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent38Min" column="harmonic_voltage_content_38_min" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent38Avg" column="harmonic_voltage_content_38_avg" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent3895" column="harmonic_voltage_content_38_95" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent39Max" column="harmonic_voltage_content_39_max" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent39Min" column="harmonic_voltage_content_39_min" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent39Avg" column="harmonic_voltage_content_39_avg" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent3995" column="harmonic_voltage_content_39_95" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent40Max" column="harmonic_voltage_content_40_max" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent40Min" column="harmonic_voltage_content_40_min" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent40Avg" column="harmonic_voltage_content_40_avg" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent4095" column="harmonic_voltage_content_40_95" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent41Max" column="harmonic_voltage_content_41_max" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent41Min" column="harmonic_voltage_content_41_min" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent41Avg" column="harmonic_voltage_content_41_avg" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent4195" column="harmonic_voltage_content_41_95" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent42Max" column="harmonic_voltage_content_42_max" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent42Min" column="harmonic_voltage_content_42_min" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent42Avg" column="harmonic_voltage_content_42_avg" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent4295" column="harmonic_voltage_content_42_95" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent43Max" column="harmonic_voltage_content_43_max" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent43Min" column="harmonic_voltage_content_43_min" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent43Avg" column="harmonic_voltage_content_43_avg" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent4395" column="harmonic_voltage_content_43_95" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent44Max" column="harmonic_voltage_content_44_max" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent44Min" column="harmonic_voltage_content_44_min" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent44Avg" column="harmonic_voltage_content_44_avg" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent4495" column="harmonic_voltage_content_44_95" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent45Max" column="harmonic_voltage_content_45_max" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent45Min" column="harmonic_voltage_content_45_min" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent45Avg" column="harmonic_voltage_content_45_avg" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent4595" column="harmonic_voltage_content_45_95" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent46Max" column="harmonic_voltage_content_46_max" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent46Min" column="harmonic_voltage_content_46_min" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent46Avg" column="harmonic_voltage_content_46_avg" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent4695" column="harmonic_voltage_content_46_95" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent47Max" column="harmonic_voltage_content_47_max" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent47Min" column="harmonic_voltage_content_47_min" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent47Avg" column="harmonic_voltage_content_47_avg" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent4795" column="harmonic_voltage_content_47_95" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent48Max" column="harmonic_voltage_content_48_max" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent48Min" column="harmonic_voltage_content_48_min" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent48Avg" column="harmonic_voltage_content_48_avg" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent4895" column="harmonic_voltage_content_48_95" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent49Max" column="harmonic_voltage_content_49_max" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent49Min" column="harmonic_voltage_content_49_min" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent49Avg" column="harmonic_voltage_content_49_avg" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent4995" column="harmonic_voltage_content_49_95" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent50Max" column="harmonic_voltage_content_50_max" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent50Min" column="harmonic_voltage_content_50_min" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent50Avg" column="harmonic_voltage_content_50_avg" jdbcType="FLOAT"/>
+            <result property="harmonicVoltageContent5095" column="harmonic_voltage_content_50_95" jdbcType="FLOAT"/>
+    </resultMap>
+
+    <sql id="Base_Column_List">
+        measurement_point_id,data_date,phase,
+        voltage_harmonic_thd_max,voltage_harmonic_thd_min,voltage_harmonic_thd_avg,
+        voltage_harmonic_thd_95,fundamental_voltage_max,fundamental_voltage_min,
+        fundamental_voltage_avg,fundamental_voltage_95,harmonic_voltage_content_2_max,
+        harmonic_voltage_content_2_min,harmonic_voltage_content_2_avg,harmonic_voltage_content_2_95,
+        harmonic_voltage_content_3_max,harmonic_voltage_content_3_min,harmonic_voltage_content_3_avg,
+        harmonic_voltage_content_3_95,harmonic_voltage_content_4_max,harmonic_voltage_content_4_min,
+        harmonic_voltage_content_4_avg,harmonic_voltage_content_4_95,harmonic_voltage_content_5_max,
+        harmonic_voltage_content_5_min,harmonic_voltage_content_5_avg,harmonic_voltage_content_5_95,
+        harmonic_voltage_content_6_max,harmonic_voltage_content_6_min,harmonic_voltage_content_6_avg,
+        harmonic_voltage_content_6_95,harmonic_voltage_content_7_max,harmonic_voltage_content_7_min,
+        harmonic_voltage_content_7_avg,harmonic_voltage_content_7_95,harmonic_voltage_content_8_max,
+        harmonic_voltage_content_8_min,harmonic_voltage_content_8_avg,harmonic_voltage_content_8_95,
+        harmonic_voltage_content_9_max,harmonic_voltage_content_9_min,harmonic_voltage_content_9_avg,
+        harmonic_voltage_content_9_95,harmonic_voltage_content_10_max,harmonic_voltage_content_10_min,
+        harmonic_voltage_content_10_avg,harmonic_voltage_content_10_95,harmonic_voltage_content_11_max,
+        harmonic_voltage_content_11_min,harmonic_voltage_content_11_avg,harmonic_voltage_content_11_95,
+        harmonic_voltage_content_12_max,harmonic_voltage_content_12_min,harmonic_voltage_content_12_avg,
+        harmonic_voltage_content_12_95,harmonic_voltage_content_13_max,harmonic_voltage_content_13_min,
+        harmonic_voltage_content_13_avg,harmonic_voltage_content_13_95,harmonic_voltage_content_14_max,
+        harmonic_voltage_content_14_min,harmonic_voltage_content_14_avg,harmonic_voltage_content_14_95,
+        harmonic_voltage_content_15_max,harmonic_voltage_content_15_min,harmonic_voltage_content_15_avg,
+        harmonic_voltage_content_15_95,harmonic_voltage_content_16_max,harmonic_voltage_content_16_min,
+        harmonic_voltage_content_16_avg,harmonic_voltage_content_16_95,harmonic_voltage_content_17_max,
+        harmonic_voltage_content_17_min,harmonic_voltage_content_17_avg,harmonic_voltage_content_17_95,
+        harmonic_voltage_content_18_max,harmonic_voltage_content_18_min,harmonic_voltage_content_18_avg,
+        harmonic_voltage_content_18_95,harmonic_voltage_content_19_max,harmonic_voltage_content_19_min,
+        harmonic_voltage_content_19_avg,harmonic_voltage_content_19_95,harmonic_voltage_content_20_max,
+        harmonic_voltage_content_20_min,harmonic_voltage_content_20_avg,harmonic_voltage_content_20_95,
+        harmonic_voltage_content_21_max,harmonic_voltage_content_21_min,harmonic_voltage_content_21_avg,
+        harmonic_voltage_content_21_95,harmonic_voltage_content_22_max,harmonic_voltage_content_22_min,
+        harmonic_voltage_content_22_avg,harmonic_voltage_content_22_95,harmonic_voltage_content_23_max,
+        harmonic_voltage_content_23_min,harmonic_voltage_content_23_avg,harmonic_voltage_content_23_95,
+        harmonic_voltage_content_24_max,harmonic_voltage_content_24_min,harmonic_voltage_content_24_avg,
+        harmonic_voltage_content_24_95,harmonic_voltage_content_25_max,harmonic_voltage_content_25_min,
+        harmonic_voltage_content_25_avg,harmonic_voltage_content_25_95,harmonic_voltage_content_26_max,
+        harmonic_voltage_content_26_min,harmonic_voltage_content_26_avg,harmonic_voltage_content_26_95,
+        harmonic_voltage_content_27_max,harmonic_voltage_content_27_min,harmonic_voltage_content_27_avg,
+        harmonic_voltage_content_27_95,harmonic_voltage_content_28_max,harmonic_voltage_content_28_min,
+        harmonic_voltage_content_28_avg,harmonic_voltage_content_28_95,harmonic_voltage_content_29_max,
+        harmonic_voltage_content_29_min,harmonic_voltage_content_29_avg,harmonic_voltage_content_29_95,
+        harmonic_voltage_content_30_max,harmonic_voltage_content_30_min,harmonic_voltage_content_30_avg,
+        harmonic_voltage_content_30_95,harmonic_voltage_content_31_max,harmonic_voltage_content_31_min,
+        harmonic_voltage_content_31_avg,harmonic_voltage_content_31_95,harmonic_voltage_content_32_max,
+        harmonic_voltage_content_32_min,harmonic_voltage_content_32_avg,harmonic_voltage_content_32_95,
+        harmonic_voltage_content_33_max,harmonic_voltage_content_33_min,harmonic_voltage_content_33_avg,
+        harmonic_voltage_content_33_95,harmonic_voltage_content_34_max,harmonic_voltage_content_34_min,
+        harmonic_voltage_content_34_avg,harmonic_voltage_content_34_95,harmonic_voltage_content_35_max,
+        harmonic_voltage_content_35_min,harmonic_voltage_content_35_avg,harmonic_voltage_content_35_95,
+        harmonic_voltage_content_36_max,harmonic_voltage_content_36_min,harmonic_voltage_content_36_avg,
+        harmonic_voltage_content_36_95,harmonic_voltage_content_37_max,harmonic_voltage_content_37_min,
+        harmonic_voltage_content_37_avg,harmonic_voltage_content_37_95,harmonic_voltage_content_38_max,
+        harmonic_voltage_content_38_min,harmonic_voltage_content_38_avg,harmonic_voltage_content_38_95,
+        harmonic_voltage_content_39_max,harmonic_voltage_content_39_min,harmonic_voltage_content_39_avg,
+        harmonic_voltage_content_39_95,harmonic_voltage_content_40_max,harmonic_voltage_content_40_min,
+        harmonic_voltage_content_40_avg,harmonic_voltage_content_40_95,harmonic_voltage_content_41_max,
+        harmonic_voltage_content_41_min,harmonic_voltage_content_41_avg,harmonic_voltage_content_41_95,
+        harmonic_voltage_content_42_max,harmonic_voltage_content_42_min,harmonic_voltage_content_42_avg,
+        harmonic_voltage_content_42_95,harmonic_voltage_content_43_max,harmonic_voltage_content_43_min,
+        harmonic_voltage_content_43_avg,harmonic_voltage_content_43_95,harmonic_voltage_content_44_max,
+        harmonic_voltage_content_44_min,harmonic_voltage_content_44_avg,harmonic_voltage_content_44_95,
+        harmonic_voltage_content_45_max,harmonic_voltage_content_45_min,harmonic_voltage_content_45_avg,
+        harmonic_voltage_content_45_95,harmonic_voltage_content_46_max,harmonic_voltage_content_46_min,
+        harmonic_voltage_content_46_avg,harmonic_voltage_content_46_95,harmonic_voltage_content_47_max,
+        harmonic_voltage_content_47_min,harmonic_voltage_content_47_avg,harmonic_voltage_content_47_95,
+        harmonic_voltage_content_48_max,harmonic_voltage_content_48_min,harmonic_voltage_content_48_avg,
+        harmonic_voltage_content_48_95,harmonic_voltage_content_49_max,harmonic_voltage_content_49_min,
+        harmonic_voltage_content_49_avg,harmonic_voltage_content_49_95,harmonic_voltage_content_50_max,
+        harmonic_voltage_content_50_min,harmonic_voltage_content_50_avg,harmonic_voltage_content_50_95
+    </sql>
+    <select id="getListByCond" resultType="com.njcn.harmonic.pojo.po.RMpHarmonicVRateReportD" parameterType="java.util.Map">
+        select <include refid="Base_Column_List"/>
+        from r_mp_harmonic_v_rate_report_d
+        where 1 = 1
+        <if test="startTime != null and startTime != ''">
+            AND DATE_FORMAT(data_date, '%Y-%m-%d') >=  #{startTime, jdbcType=VARCHAR}
+        </if>
+        <if test="endTime != null and endTime != ''">
+            AND DATE_FORMAT(data_date, '%Y-%m-%d') &lt;=  #{endTime, jdbcType=VARCHAR}
+        </if>
+        and measurement_point_id IN
+        <foreach collection="monitorIdList" open="(" close=")" separator="," item="id">
+            #{id}
+        </foreach>
+    </select>
+</mapper>
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RMpInharmonicIRateReportDMapper.xml b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RMpInharmonicIRateReportDMapper.xml
new file mode 100644
index 000000000..c72224277
--- /dev/null
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RMpInharmonicIRateReportDMapper.xml
@@ -0,0 +1,293 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.njcn.harmonic.mapper.RMpInharmonicIRateReportDMapper">
+
+    <resultMap id="BaseResultMap" type="com.njcn.harmonic.pojo.po.RMpInharmonicIRateReportD">
+            <id property="measurementPointId" column="measurement_point_id" jdbcType="VARCHAR"/>
+            <id property="dataDate" column="data_date" jdbcType="DATE"/>
+            <id property="phase" column="phase" jdbcType="VARCHAR"/>
+            <result property="inharmI2Max" column="inharm_i_2_max" jdbcType="FLOAT"/>
+            <result property="inharmI2Min" column="inharm_i_2_min" jdbcType="FLOAT"/>
+            <result property="inharmI2Avg" column="inharm_i_2_avg" jdbcType="FLOAT"/>
+            <result property="inharmI2Cp95" column="inharm_i_2_cp95" jdbcType="FLOAT"/>
+            <result property="inharmI3Max" column="inharm_i_3_max" jdbcType="FLOAT"/>
+            <result property="inharmI3Min" column="inharm_i_3_min" jdbcType="FLOAT"/>
+            <result property="inharmI3Avg" column="inharm_i_3_avg" jdbcType="FLOAT"/>
+            <result property="inharmI3Cp95" column="inharm_i_3_cp95" jdbcType="FLOAT"/>
+            <result property="inharmI4Max" column="inharm_i_4_max" jdbcType="FLOAT"/>
+            <result property="inharmI4Min" column="inharm_i_4_min" jdbcType="FLOAT"/>
+            <result property="inharmI4Avg" column="inharm_i_4_avg" jdbcType="FLOAT"/>
+            <result property="inharmI4Cp95" column="inharm_i_4_cp95" jdbcType="FLOAT"/>
+            <result property="inharmI5Max" column="inharm_i_5_max" jdbcType="FLOAT"/>
+            <result property="inharmI5Min" column="inharm_i_5_min" jdbcType="FLOAT"/>
+            <result property="inharmI5Avg" column="inharm_i_5_avg" jdbcType="FLOAT"/>
+            <result property="inharmI5Cp95" column="inharm_i_5_cp95" jdbcType="FLOAT"/>
+            <result property="inharmI6Max" column="inharm_i_6_max" jdbcType="FLOAT"/>
+            <result property="inharmI6Min" column="inharm_i_6_min" jdbcType="FLOAT"/>
+            <result property="inharmI6Avg" column="inharm_i_6_avg" jdbcType="FLOAT"/>
+            <result property="inharmI6Cp95" column="inharm_i_6_cp95" jdbcType="FLOAT"/>
+            <result property="inharmI7Max" column="inharm_i_7_max" jdbcType="FLOAT"/>
+            <result property="inharmI7Min" column="inharm_i_7_min" jdbcType="FLOAT"/>
+            <result property="inharmI7Avg" column="inharm_i_7_avg" jdbcType="FLOAT"/>
+            <result property="inharmI7Cp95" column="inharm_i_7_cp95" jdbcType="FLOAT"/>
+            <result property="inharmI8Max" column="inharm_i_8_max" jdbcType="FLOAT"/>
+            <result property="inharmI8Min" column="inharm_i_8_min" jdbcType="FLOAT"/>
+            <result property="inharmI8Avg" column="inharm_i_8_avg" jdbcType="FLOAT"/>
+            <result property="inharmI8Cp95" column="inharm_i_8_cp95" jdbcType="FLOAT"/>
+            <result property="inharmI9Max" column="inharm_i_9_max" jdbcType="FLOAT"/>
+            <result property="inharmI9Min" column="inharm_i_9_min" jdbcType="FLOAT"/>
+            <result property="inharmI9Avg" column="inharm_i_9_avg" jdbcType="FLOAT"/>
+            <result property="inharmI9Cp95" column="inharm_i_9_cp95" jdbcType="FLOAT"/>
+            <result property="inharmI10Max" column="inharm_i_10_max" jdbcType="FLOAT"/>
+            <result property="inharmI10Min" column="inharm_i_10_min" jdbcType="FLOAT"/>
+            <result property="inharmI10Avg" column="inharm_i_10_avg" jdbcType="FLOAT"/>
+            <result property="inharmI10Cp95" column="inharm_i_10_cp95" jdbcType="FLOAT"/>
+            <result property="inharmI11Max" column="inharm_i_11_max" jdbcType="FLOAT"/>
+            <result property="inharmI11Min" column="inharm_i_11_min" jdbcType="FLOAT"/>
+            <result property="inharmI11Avg" column="inharm_i_11_avg" jdbcType="FLOAT"/>
+            <result property="inharmI11Cp95" column="inharm_i_11_cp95" jdbcType="FLOAT"/>
+            <result property="inharmI12Max" column="inharm_i_12_max" jdbcType="FLOAT"/>
+            <result property="inharmI12Min" column="inharm_i_12_min" jdbcType="FLOAT"/>
+            <result property="inharmI12Avg" column="inharm_i_12_avg" jdbcType="FLOAT"/>
+            <result property="inharmI12Cp95" column="inharm_i_12_cp95" jdbcType="FLOAT"/>
+            <result property="inharmI13Max" column="inharm_i_13_max" jdbcType="FLOAT"/>
+            <result property="inharmI13Min" column="inharm_i_13_min" jdbcType="FLOAT"/>
+            <result property="inharmI13Avg" column="inharm_i_13_avg" jdbcType="FLOAT"/>
+            <result property="inharmI13Cp95" column="inharm_i_13_cp95" jdbcType="FLOAT"/>
+            <result property="inharmI14Max" column="inharm_i_14_max" jdbcType="FLOAT"/>
+            <result property="inharmI14Min" column="inharm_i_14_min" jdbcType="FLOAT"/>
+            <result property="inharmI14Avg" column="inharm_i_14_avg" jdbcType="FLOAT"/>
+            <result property="inharmI14Cp95" column="inharm_i_14_cp95" jdbcType="FLOAT"/>
+            <result property="inharmI15Max" column="inharm_i_15_max" jdbcType="FLOAT"/>
+            <result property="inharmI15Min" column="inharm_i_15_min" jdbcType="FLOAT"/>
+            <result property="inharmI15Avg" column="inharm_i_15_avg" jdbcType="FLOAT"/>
+            <result property="inharmI15Cp95" column="inharm_i_15_cp95" jdbcType="FLOAT"/>
+            <result property="inharmI16Max" column="inharm_i_16_max" jdbcType="FLOAT"/>
+            <result property="inharmI16Min" column="inharm_i_16_min" jdbcType="FLOAT"/>
+            <result property="inharmI16Avg" column="inharm_i_16_avg" jdbcType="FLOAT"/>
+            <result property="inharmI16Cp95" column="inharm_i_16_cp95" jdbcType="FLOAT"/>
+            <result property="inharmI17Max" column="inharm_i_17_max" jdbcType="FLOAT"/>
+            <result property="inharmI17Min" column="inharm_i_17_min" jdbcType="FLOAT"/>
+            <result property="inharmI17Avg" column="inharm_i_17_avg" jdbcType="FLOAT"/>
+            <result property="inharmI17Cp95" column="inharm_i_17_cp95" jdbcType="FLOAT"/>
+            <result property="inharmI18Max" column="inharm_i_18_max" jdbcType="FLOAT"/>
+            <result property="inharmI18Min" column="inharm_i_18_min" jdbcType="FLOAT"/>
+            <result property="inharmI18Avg" column="inharm_i_18_avg" jdbcType="FLOAT"/>
+            <result property="inharmI18Cp95" column="inharm_i_18_cp95" jdbcType="FLOAT"/>
+            <result property="inharmI19Max" column="inharm_i_19_max" jdbcType="FLOAT"/>
+            <result property="inharmI19Min" column="inharm_i_19_min" jdbcType="FLOAT"/>
+            <result property="inharmI19Avg" column="inharm_i_19_avg" jdbcType="FLOAT"/>
+            <result property="inharmI19Cp95" column="inharm_i_19_cp95" jdbcType="FLOAT"/>
+            <result property="inharmI20Max" column="inharm_i_20_max" jdbcType="FLOAT"/>
+            <result property="inharmI20Min" column="inharm_i_20_min" jdbcType="FLOAT"/>
+            <result property="inharmI20Avg" column="inharm_i_20_avg" jdbcType="FLOAT"/>
+            <result property="inharmI20Cp95" column="inharm_i_20_cp95" jdbcType="FLOAT"/>
+            <result property="inharmI21Max" column="inharm_i_21_max" jdbcType="FLOAT"/>
+            <result property="inharmI21Min" column="inharm_i_21_min" jdbcType="FLOAT"/>
+            <result property="inharmI21Avg" column="inharm_i_21_avg" jdbcType="FLOAT"/>
+            <result property="inharmI21Cp95" column="inharm_i_21_cp95" jdbcType="FLOAT"/>
+            <result property="inharmI22Max" column="inharm_i_22_max" jdbcType="FLOAT"/>
+            <result property="inharmI22Min" column="inharm_i_22_min" jdbcType="FLOAT"/>
+            <result property="inharmI22Avg" column="inharm_i_22_avg" jdbcType="FLOAT"/>
+            <result property="inharmI22Cp95" column="inharm_i_22_cp95" jdbcType="FLOAT"/>
+            <result property="inharmI23Max" column="inharm_i_23_max" jdbcType="FLOAT"/>
+            <result property="inharmI23Min" column="inharm_i_23_min" jdbcType="FLOAT"/>
+            <result property="inharmI23Avg" column="inharm_i_23_avg" jdbcType="FLOAT"/>
+            <result property="inharmI23Cp95" column="inharm_i_23_cp95" jdbcType="FLOAT"/>
+            <result property="inharmI24Max" column="inharm_i_24_max" jdbcType="FLOAT"/>
+            <result property="inharmI24Min" column="inharm_i_24_min" jdbcType="FLOAT"/>
+            <result property="inharmI24Avg" column="inharm_i_24_avg" jdbcType="FLOAT"/>
+            <result property="inharmI24Cp95" column="inharm_i_24_cp95" jdbcType="FLOAT"/>
+            <result property="inharmI25Max" column="inharm_i_25_max" jdbcType="FLOAT"/>
+            <result property="inharmI25Min" column="inharm_i_25_min" jdbcType="FLOAT"/>
+            <result property="inharmI25Avg" column="inharm_i_25_avg" jdbcType="FLOAT"/>
+            <result property="inharmI25Cp95" column="inharm_i_25_cp95" jdbcType="FLOAT"/>
+            <result property="inharmI26Max" column="inharm_i_26_max" jdbcType="FLOAT"/>
+            <result property="inharmI26Min" column="inharm_i_26_min" jdbcType="FLOAT"/>
+            <result property="inharmI26Avg" column="inharm_i_26_avg" jdbcType="FLOAT"/>
+            <result property="inharmI26Cp95" column="inharm_i_26_cp95" jdbcType="FLOAT"/>
+            <result property="inharmI27Max" column="inharm_i_27_max" jdbcType="FLOAT"/>
+            <result property="inharmI27Min" column="inharm_i_27_min" jdbcType="FLOAT"/>
+            <result property="inharmI27Avg" column="inharm_i_27_avg" jdbcType="FLOAT"/>
+            <result property="inharmI27Cp95" column="inharm_i_27_cp95" jdbcType="FLOAT"/>
+            <result property="inharmI28Max" column="inharm_i_28_max" jdbcType="FLOAT"/>
+            <result property="inharmI28Min" column="inharm_i_28_min" jdbcType="FLOAT"/>
+            <result property="inharmI28Avg" column="inharm_i_28_avg" jdbcType="FLOAT"/>
+            <result property="inharmI28Cp95" column="inharm_i_28_cp95" jdbcType="FLOAT"/>
+            <result property="inharmI29Max" column="inharm_i_29_max" jdbcType="FLOAT"/>
+            <result property="inharmI29Min" column="inharm_i_29_min" jdbcType="FLOAT"/>
+            <result property="inharmI29Avg" column="inharm_i_29_avg" jdbcType="FLOAT"/>
+            <result property="inharmI29Cp95" column="inharm_i_29_cp95" jdbcType="FLOAT"/>
+            <result property="inharmI30Max" column="inharm_i_30_max" jdbcType="FLOAT"/>
+            <result property="inharmI30Min" column="inharm_i_30_min" jdbcType="FLOAT"/>
+            <result property="inharmI30Avg" column="inharm_i_30_avg" jdbcType="FLOAT"/>
+            <result property="inharmI30Cp95" column="inharm_i_30_cp95" jdbcType="FLOAT"/>
+            <result property="inharmI31Max" column="inharm_i_31_max" jdbcType="FLOAT"/>
+            <result property="inharmI31Min" column="inharm_i_31_min" jdbcType="FLOAT"/>
+            <result property="inharmI31Avg" column="inharm_i_31_avg" jdbcType="FLOAT"/>
+            <result property="inharmI31Cp95" column="inharm_i_31_cp95" jdbcType="FLOAT"/>
+            <result property="inharmI32Max" column="inharm_i_32_max" jdbcType="FLOAT"/>
+            <result property="inharmI32Min" column="inharm_i_32_min" jdbcType="FLOAT"/>
+            <result property="inharmI32Avg" column="inharm_i_32_avg" jdbcType="FLOAT"/>
+            <result property="inharmI32Cp95" column="inharm_i_32_cp95" jdbcType="FLOAT"/>
+            <result property="inharmI33Max" column="inharm_i_33_max" jdbcType="FLOAT"/>
+            <result property="inharmI33Min" column="inharm_i_33_min" jdbcType="FLOAT"/>
+            <result property="inharmI33Avg" column="inharm_i_33_avg" jdbcType="FLOAT"/>
+            <result property="inharmI33Cp95" column="inharm_i_33_cp95" jdbcType="FLOAT"/>
+            <result property="inharmI34Max" column="inharm_i_34_max" jdbcType="FLOAT"/>
+            <result property="inharmI34Min" column="inharm_i_34_min" jdbcType="FLOAT"/>
+            <result property="inharmI34Avg" column="inharm_i_34_avg" jdbcType="FLOAT"/>
+            <result property="inharmI34Cp95" column="inharm_i_34_cp95" jdbcType="FLOAT"/>
+            <result property="inharmI35Max" column="inharm_i_35_max" jdbcType="FLOAT"/>
+            <result property="inharmI35Min" column="inharm_i_35_min" jdbcType="FLOAT"/>
+            <result property="inharmI35Avg" column="inharm_i_35_avg" jdbcType="FLOAT"/>
+            <result property="inharmI35Cp95" column="inharm_i_35_cp95" jdbcType="FLOAT"/>
+            <result property="inharmI36Max" column="inharm_i_36_max" jdbcType="FLOAT"/>
+            <result property="inharmI36Min" column="inharm_i_36_min" jdbcType="FLOAT"/>
+            <result property="inharmI36Avg" column="inharm_i_36_avg" jdbcType="FLOAT"/>
+            <result property="inharmI36Cp95" column="inharm_i_36_cp95" jdbcType="FLOAT"/>
+            <result property="inharmI37Max" column="inharm_i_37_max" jdbcType="FLOAT"/>
+            <result property="inharmI37Min" column="inharm_i_37_min" jdbcType="FLOAT"/>
+            <result property="inharmI37Avg" column="inharm_i_37_avg" jdbcType="FLOAT"/>
+            <result property="inharmI37Cp95" column="inharm_i_37_cp95" jdbcType="FLOAT"/>
+            <result property="inharmI38Max" column="inharm_i_38_max" jdbcType="FLOAT"/>
+            <result property="inharmI38Min" column="inharm_i_38_min" jdbcType="FLOAT"/>
+            <result property="inharmI38Avg" column="inharm_i_38_avg" jdbcType="FLOAT"/>
+            <result property="inharmI38Cp95" column="inharm_i_38_cp95" jdbcType="FLOAT"/>
+            <result property="inharmI39Max" column="inharm_i_39_max" jdbcType="FLOAT"/>
+            <result property="inharmI39Min" column="inharm_i_39_min" jdbcType="FLOAT"/>
+            <result property="inharmI39Avg" column="inharm_i_39_avg" jdbcType="FLOAT"/>
+            <result property="inharmI39Cp95" column="inharm_i_39_cp95" jdbcType="FLOAT"/>
+            <result property="inharmI40Max" column="inharm_i_40_max" jdbcType="FLOAT"/>
+            <result property="inharmI40Min" column="inharm_i_40_min" jdbcType="FLOAT"/>
+            <result property="inharmI40Avg" column="inharm_i_40_avg" jdbcType="FLOAT"/>
+            <result property="inharmI40Cp95" column="inharm_i_40_cp95" jdbcType="FLOAT"/>
+            <result property="inharmI41Max" column="inharm_i_41_max" jdbcType="FLOAT"/>
+            <result property="inharmI41Min" column="inharm_i_41_min" jdbcType="FLOAT"/>
+            <result property="inharmI41Avg" column="inharm_i_41_avg" jdbcType="FLOAT"/>
+            <result property="inharmI41Cp95" column="inharm_i_41_cp95" jdbcType="FLOAT"/>
+            <result property="inharmI42Max" column="inharm_i_42_max" jdbcType="FLOAT"/>
+            <result property="inharmI42Min" column="inharm_i_42_min" jdbcType="FLOAT"/>
+            <result property="inharmI42Avg" column="inharm_i_42_avg" jdbcType="FLOAT"/>
+            <result property="inharmI42Cp95" column="inharm_i_42_cp95" jdbcType="FLOAT"/>
+            <result property="inharmI43Max" column="inharm_i_43_max" jdbcType="FLOAT"/>
+            <result property="inharmI43Min" column="inharm_i_43_min" jdbcType="FLOAT"/>
+            <result property="inharmI43Avg" column="inharm_i_43_avg" jdbcType="FLOAT"/>
+            <result property="inharmI43Cp95" column="inharm_i_43_cp95" jdbcType="FLOAT"/>
+            <result property="inharmI44Max" column="inharm_i_44_max" jdbcType="FLOAT"/>
+            <result property="inharmI44Min" column="inharm_i_44_min" jdbcType="FLOAT"/>
+            <result property="inharmI44Avg" column="inharm_i_44_avg" jdbcType="FLOAT"/>
+            <result property="inharmI44Cp95" column="inharm_i_44_cp95" jdbcType="FLOAT"/>
+            <result property="inharmI45Max" column="inharm_i_45_max" jdbcType="FLOAT"/>
+            <result property="inharmI45Min" column="inharm_i_45_min" jdbcType="FLOAT"/>
+            <result property="inharmI45Avg" column="inharm_i_45_avg" jdbcType="FLOAT"/>
+            <result property="inharmI45Cp95" column="inharm_i_45_cp95" jdbcType="FLOAT"/>
+            <result property="inharmI46Max" column="inharm_i_46_max" jdbcType="FLOAT"/>
+            <result property="inharmI46Min" column="inharm_i_46_min" jdbcType="FLOAT"/>
+            <result property="inharmI46Avg" column="inharm_i_46_avg" jdbcType="FLOAT"/>
+            <result property="inharmI46Cp95" column="inharm_i_46_cp95" jdbcType="FLOAT"/>
+            <result property="inharmI47Max" column="inharm_i_47_max" jdbcType="FLOAT"/>
+            <result property="inharmI47Min" column="inharm_i_47_min" jdbcType="FLOAT"/>
+            <result property="inharmI47Avg" column="inharm_i_47_avg" jdbcType="FLOAT"/>
+            <result property="inharmI47Cp95" column="inharm_i_47_cp95" jdbcType="FLOAT"/>
+            <result property="inharmI48Max" column="inharm_i_48_max" jdbcType="FLOAT"/>
+            <result property="inharmI48Min" column="inharm_i_48_min" jdbcType="FLOAT"/>
+            <result property="inharmI48Avg" column="inharm_i_48_avg" jdbcType="FLOAT"/>
+            <result property="inharmI48Cp95" column="inharm_i_48_cp95" jdbcType="FLOAT"/>
+            <result property="inharmI49Max" column="inharm_i_49_max" jdbcType="FLOAT"/>
+            <result property="inharmI49Min" column="inharm_i_49_min" jdbcType="FLOAT"/>
+            <result property="inharmI49Avg" column="inharm_i_49_avg" jdbcType="FLOAT"/>
+            <result property="inharmI49Cp95" column="inharm_i_49_cp95" jdbcType="FLOAT"/>
+            <result property="inharmI50Max" column="inharm_i_50_max" jdbcType="FLOAT"/>
+            <result property="inharmI50Min" column="inharm_i_50_min" jdbcType="FLOAT"/>
+            <result property="inharmI50Avg" column="inharm_i_50_avg" jdbcType="FLOAT"/>
+            <result property="inharmI50Cp95" column="inharm_i_50_cp95" jdbcType="FLOAT"/>
+    </resultMap>
+
+    <sql id="Base_Column_List">
+        measurement_point_id,data_date,phase,
+        inharm_i_2_max,inharm_i_2_min,inharm_i_2_avg,
+        inharm_i_2_cp95,inharm_i_3_max,inharm_i_3_min,
+        inharm_i_3_avg,inharm_i_3_cp95,inharm_i_4_max,
+        inharm_i_4_min,inharm_i_4_avg,inharm_i_4_cp95,
+        inharm_i_5_max,inharm_i_5_min,inharm_i_5_avg,
+        inharm_i_5_cp95,inharm_i_6_max,inharm_i_6_min,
+        inharm_i_6_avg,inharm_i_6_cp95,inharm_i_7_max,
+        inharm_i_7_min,inharm_i_7_avg,inharm_i_7_cp95,
+        inharm_i_8_max,inharm_i_8_min,inharm_i_8_avg,
+        inharm_i_8_cp95,inharm_i_9_max,inharm_i_9_min,
+        inharm_i_9_avg,inharm_i_9_cp95,inharm_i_10_max,
+        inharm_i_10_min,inharm_i_10_avg,inharm_i_10_cp95,
+        inharm_i_11_max,inharm_i_11_min,inharm_i_11_avg,
+        inharm_i_11_cp95,inharm_i_12_max,inharm_i_12_min,
+        inharm_i_12_avg,inharm_i_12_cp95,inharm_i_13_max,
+        inharm_i_13_min,inharm_i_13_avg,inharm_i_13_cp95,
+        inharm_i_14_max,inharm_i_14_min,inharm_i_14_avg,
+        inharm_i_14_cp95,inharm_i_15_max,inharm_i_15_min,
+        inharm_i_15_avg,inharm_i_15_cp95,inharm_i_16_max,
+        inharm_i_16_min,inharm_i_16_avg,inharm_i_16_cp95,
+        inharm_i_17_max,inharm_i_17_min,inharm_i_17_avg,
+        inharm_i_17_cp95,inharm_i_18_max,inharm_i_18_min,
+        inharm_i_18_avg,inharm_i_18_cp95,inharm_i_19_max,
+        inharm_i_19_min,inharm_i_19_avg,inharm_i_19_cp95,
+        inharm_i_20_max,inharm_i_20_min,inharm_i_20_avg,
+        inharm_i_20_cp95,inharm_i_21_max,inharm_i_21_min,
+        inharm_i_21_avg,inharm_i_21_cp95,inharm_i_22_max,
+        inharm_i_22_min,inharm_i_22_avg,inharm_i_22_cp95,
+        inharm_i_23_max,inharm_i_23_min,inharm_i_23_avg,
+        inharm_i_23_cp95,inharm_i_24_max,inharm_i_24_min,
+        inharm_i_24_avg,inharm_i_24_cp95,inharm_i_25_max,
+        inharm_i_25_min,inharm_i_25_avg,inharm_i_25_cp95,
+        inharm_i_26_max,inharm_i_26_min,inharm_i_26_avg,
+        inharm_i_26_cp95,inharm_i_27_max,inharm_i_27_min,
+        inharm_i_27_avg,inharm_i_27_cp95,inharm_i_28_max,
+        inharm_i_28_min,inharm_i_28_avg,inharm_i_28_cp95,
+        inharm_i_29_max,inharm_i_29_min,inharm_i_29_avg,
+        inharm_i_29_cp95,inharm_i_30_max,inharm_i_30_min,
+        inharm_i_30_avg,inharm_i_30_cp95,inharm_i_31_max,
+        inharm_i_31_min,inharm_i_31_avg,inharm_i_31_cp95,
+        inharm_i_32_max,inharm_i_32_min,inharm_i_32_avg,
+        inharm_i_32_cp95,inharm_i_33_max,inharm_i_33_min,
+        inharm_i_33_avg,inharm_i_33_cp95,inharm_i_34_max,
+        inharm_i_34_min,inharm_i_34_avg,inharm_i_34_cp95,
+        inharm_i_35_max,inharm_i_35_min,inharm_i_35_avg,
+        inharm_i_35_cp95,inharm_i_36_max,inharm_i_36_min,
+        inharm_i_36_avg,inharm_i_36_cp95,inharm_i_37_max,
+        inharm_i_37_min,inharm_i_37_avg,inharm_i_37_cp95,
+        inharm_i_38_max,inharm_i_38_min,inharm_i_38_avg,
+        inharm_i_38_cp95,inharm_i_39_max,inharm_i_39_min,
+        inharm_i_39_avg,inharm_i_39_cp95,inharm_i_40_max,
+        inharm_i_40_min,inharm_i_40_avg,inharm_i_40_cp95,
+        inharm_i_41_max,inharm_i_41_min,inharm_i_41_avg,
+        inharm_i_41_cp95,inharm_i_42_max,inharm_i_42_min,
+        inharm_i_42_avg,inharm_i_42_cp95,inharm_i_43_max,
+        inharm_i_43_min,inharm_i_43_avg,inharm_i_43_cp95,
+        inharm_i_44_max,inharm_i_44_min,inharm_i_44_avg,
+        inharm_i_44_cp95,inharm_i_45_max,inharm_i_45_min,
+        inharm_i_45_avg,inharm_i_45_cp95,inharm_i_46_max,
+        inharm_i_46_min,inharm_i_46_avg,inharm_i_46_cp95,
+        inharm_i_47_max,inharm_i_47_min,inharm_i_47_avg,
+        inharm_i_47_cp95,inharm_i_48_max,inharm_i_48_min,
+        inharm_i_48_avg,inharm_i_48_cp95,inharm_i_49_max,
+        inharm_i_49_min,inharm_i_49_avg,inharm_i_49_cp95,
+        inharm_i_50_max,inharm_i_50_min,inharm_i_50_avg,
+        inharm_i_50_cp95
+    </sql>
+    <select id="getListByCond" resultType="com.njcn.harmonic.pojo.po.RMpInharmonicIRateReportD">
+        select <include refid="Base_Column_List"/>
+        from r_mp_inharmonic_i_rate_report_d
+        where 1 = 1
+        <if test="startTime != null and startTime != ''">
+            AND DATE_FORMAT(data_date, '%Y-%m-%d') >=  #{startTime, jdbcType=VARCHAR}
+        </if>
+        <if test="endTime != null and endTime != ''">
+            AND DATE_FORMAT(data_date, '%Y-%m-%d') &lt;=  #{endTime, jdbcType=VARCHAR}
+        </if>
+        and measurement_point_id IN
+        <foreach collection="monitorIdList" open="(" close=")" separator="," item="id">
+            #{id}
+        </foreach>
+    </select>
+</mapper>
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RMpInharmonicVRateReportDMapper.xml b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RMpInharmonicVRateReportDMapper.xml
new file mode 100644
index 000000000..ceb89eba0
--- /dev/null
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RMpInharmonicVRateReportDMapper.xml
@@ -0,0 +1,298 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.njcn.harmonic.mapper.RMpInharmonicVRateReportDMapper">
+
+    <resultMap id="BaseResultMap" type="com.njcn.harmonic.pojo.po.RMpInharmonicVRateReportD">
+            <id property="measurementPointId" column="measurement_point_id" jdbcType="VARCHAR"/>
+            <id property="dataDate" column="data_date" jdbcType="DATE"/>
+            <id property="phase" column="phase" jdbcType="VARCHAR"/>
+            <result property="inharmV1Max" column="inharm_v_1_max" jdbcType="FLOAT"/>
+            <result property="inharmV1Min" column="inharm_v_1_min" jdbcType="FLOAT"/>
+            <result property="inharmV1Avg" column="inharm_v_1_avg" jdbcType="FLOAT"/>
+            <result property="inharmV1Cp95" column="inharm_v_1_cp95" jdbcType="FLOAT"/>
+            <result property="inharmV2Max" column="inharm_v_2_max" jdbcType="FLOAT"/>
+            <result property="inharmV2Min" column="inharm_v_2_min" jdbcType="FLOAT"/>
+            <result property="inharmV2Avg" column="inharm_v_2_avg" jdbcType="FLOAT"/>
+            <result property="inharmV2Cp95" column="inharm_v_2_cp95" jdbcType="FLOAT"/>
+            <result property="inharmV3Max" column="inharm_v_3_max" jdbcType="FLOAT"/>
+            <result property="inharmV3Min" column="inharm_v_3_min" jdbcType="FLOAT"/>
+            <result property="inharmV3Avg" column="inharm_v_3_avg" jdbcType="FLOAT"/>
+            <result property="inharmV3Cp95" column="inharm_v_3_cp95" jdbcType="FLOAT"/>
+            <result property="inharmV4Max" column="inharm_v_4_max" jdbcType="FLOAT"/>
+            <result property="inharmV4Min" column="inharm_v_4_min" jdbcType="FLOAT"/>
+            <result property="inharmV4Avg" column="inharm_v_4_avg" jdbcType="FLOAT"/>
+            <result property="inharmV4Cp95" column="inharm_v_4_cp95" jdbcType="FLOAT"/>
+            <result property="inharmV5Max" column="inharm_v_5_max" jdbcType="FLOAT"/>
+            <result property="inharmV5Min" column="inharm_v_5_min" jdbcType="FLOAT"/>
+            <result property="inharmV5Avg" column="inharm_v_5_avg" jdbcType="FLOAT"/>
+            <result property="inharmV5Cp95" column="inharm_v_5_cp95" jdbcType="FLOAT"/>
+            <result property="inharmV6Max" column="inharm_v_6_max" jdbcType="FLOAT"/>
+            <result property="inharmV6Min" column="inharm_v_6_min" jdbcType="FLOAT"/>
+            <result property="inharmV6Avg" column="inharm_v_6_avg" jdbcType="FLOAT"/>
+            <result property="inharmV6Cp95" column="inharm_v_6_cp95" jdbcType="FLOAT"/>
+            <result property="inharmV7Max" column="inharm_v_7_max" jdbcType="FLOAT"/>
+            <result property="inharmV7Min" column="inharm_v_7_min" jdbcType="FLOAT"/>
+            <result property="inharmV7Avg" column="inharm_v_7_avg" jdbcType="FLOAT"/>
+            <result property="inharmV7Cp95" column="inharm_v_7_cp95" jdbcType="FLOAT"/>
+            <result property="inharmV8Max" column="inharm_v_8_max" jdbcType="FLOAT"/>
+            <result property="inharmV8Min" column="inharm_v_8_min" jdbcType="FLOAT"/>
+            <result property="inharmV8Avg" column="inharm_v_8_avg" jdbcType="FLOAT"/>
+            <result property="inharmV8Cp95" column="inharm_v_8_cp95" jdbcType="FLOAT"/>
+            <result property="inharmV9Max" column="inharm_v_9_max" jdbcType="FLOAT"/>
+            <result property="inharmV9Min" column="inharm_v_9_min" jdbcType="FLOAT"/>
+            <result property="inharmV9Avg" column="inharm_v_9_avg" jdbcType="FLOAT"/>
+            <result property="inharmV9Cp95" column="inharm_v_9_cp95" jdbcType="FLOAT"/>
+            <result property="inharmV10Max" column="inharm_v_10_max" jdbcType="FLOAT"/>
+            <result property="inharmV10Min" column="inharm_v_10_min" jdbcType="FLOAT"/>
+            <result property="inharmV10Avg" column="inharm_v_10_avg" jdbcType="FLOAT"/>
+            <result property="inharmV10Cp95" column="inharm_v_10_cp95" jdbcType="FLOAT"/>
+            <result property="inharmV11Max" column="inharm_v_11_max" jdbcType="FLOAT"/>
+            <result property="inharmV11Min" column="inharm_v_11_min" jdbcType="FLOAT"/>
+            <result property="inharmV11Avg" column="inharm_v_11_avg" jdbcType="FLOAT"/>
+            <result property="inharmV11Cp95" column="inharm_v_11_cp95" jdbcType="FLOAT"/>
+            <result property="inharmV12Max" column="inharm_v_12_max" jdbcType="FLOAT"/>
+            <result property="inharmV12Min" column="inharm_v_12_min" jdbcType="FLOAT"/>
+            <result property="inharmV12Avg" column="inharm_v_12_avg" jdbcType="FLOAT"/>
+            <result property="inharmV12Cp95" column="inharm_v_12_cp95" jdbcType="FLOAT"/>
+            <result property="inharmV13Max" column="inharm_v_13_max" jdbcType="FLOAT"/>
+            <result property="inharmV13Min" column="inharm_v_13_min" jdbcType="FLOAT"/>
+            <result property="inharmV13Avg" column="inharm_v_13_avg" jdbcType="FLOAT"/>
+            <result property="inharmV13Cp95" column="inharm_v_13_cp95" jdbcType="FLOAT"/>
+            <result property="inharmV14Max" column="inharm_v_14_max" jdbcType="FLOAT"/>
+            <result property="inharmV14Min" column="inharm_v_14_min" jdbcType="FLOAT"/>
+            <result property="inharmV14Avg" column="inharm_v_14_avg" jdbcType="FLOAT"/>
+            <result property="inharmV14Cp95" column="inharm_v_14_cp95" jdbcType="FLOAT"/>
+            <result property="inharmV15Max" column="inharm_v_15_max" jdbcType="FLOAT"/>
+            <result property="inharmV15Min" column="inharm_v_15_min" jdbcType="FLOAT"/>
+            <result property="inharmV15Avg" column="inharm_v_15_avg" jdbcType="FLOAT"/>
+            <result property="inharmV15Cp95" column="inharm_v_15_cp95" jdbcType="FLOAT"/>
+            <result property="inharmV16Max" column="inharm_v_16_max" jdbcType="FLOAT"/>
+            <result property="inharmV16Min" column="inharm_v_16_min" jdbcType="FLOAT"/>
+            <result property="inharmV16Avg" column="inharm_v_16_avg" jdbcType="FLOAT"/>
+            <result property="inharmV16Cp95" column="inharm_v_16_cp95" jdbcType="FLOAT"/>
+            <result property="inharmV17Max" column="inharm_v_17_max" jdbcType="FLOAT"/>
+            <result property="inharmV17Min" column="inharm_v_17_min" jdbcType="FLOAT"/>
+            <result property="inharmV17Avg" column="inharm_v_17_avg" jdbcType="FLOAT"/>
+            <result property="inharmV17Cp95" column="inharm_v_17_cp95" jdbcType="FLOAT"/>
+            <result property="inharmV18Max" column="inharm_v_18_max" jdbcType="FLOAT"/>
+            <result property="inharmV18Min" column="inharm_v_18_min" jdbcType="FLOAT"/>
+            <result property="inharmV18Avg" column="inharm_v_18_avg" jdbcType="FLOAT"/>
+            <result property="inharmV18Cp95" column="inharm_v_18_cp95" jdbcType="FLOAT"/>
+            <result property="inharmV19Max" column="inharm_v_19_max" jdbcType="FLOAT"/>
+            <result property="inharmV19Min" column="inharm_v_19_min" jdbcType="FLOAT"/>
+            <result property="inharmV19Avg" column="inharm_v_19_avg" jdbcType="FLOAT"/>
+            <result property="inharmV19Cp95" column="inharm_v_19_cp95" jdbcType="FLOAT"/>
+            <result property="inharmV20Max" column="inharm_v_20_max" jdbcType="FLOAT"/>
+            <result property="inharmV20Min" column="inharm_v_20_min" jdbcType="FLOAT"/>
+            <result property="inharmV20Avg" column="inharm_v_20_avg" jdbcType="FLOAT"/>
+            <result property="inharmV20Cp95" column="inharm_v_20_cp95" jdbcType="FLOAT"/>
+            <result property="inharmV21Max" column="inharm_v_21_max" jdbcType="FLOAT"/>
+            <result property="inharmV21Min" column="inharm_v_21_min" jdbcType="FLOAT"/>
+            <result property="inharmV21Avg" column="inharm_v_21_avg" jdbcType="FLOAT"/>
+            <result property="inharmV21Cp95" column="inharm_v_21_cp95" jdbcType="FLOAT"/>
+            <result property="inharmV22Max" column="inharm_v_22_max" jdbcType="FLOAT"/>
+            <result property="inharmV22Min" column="inharm_v_22_min" jdbcType="FLOAT"/>
+            <result property="inharmV22Avg" column="inharm_v_22_avg" jdbcType="FLOAT"/>
+            <result property="inharmV22Cp95" column="inharm_v_22_cp95" jdbcType="FLOAT"/>
+            <result property="inharmV23Max" column="inharm_v_23_max" jdbcType="FLOAT"/>
+            <result property="inharmV23Min" column="inharm_v_23_min" jdbcType="FLOAT"/>
+            <result property="inharmV23Avg" column="inharm_v_23_avg" jdbcType="FLOAT"/>
+            <result property="inharmV23Cp95" column="inharm_v_23_cp95" jdbcType="FLOAT"/>
+            <result property="inharmV24Max" column="inharm_v_24_max" jdbcType="FLOAT"/>
+            <result property="inharmV24Min" column="inharm_v_24_min" jdbcType="FLOAT"/>
+            <result property="inharmV24Avg" column="inharm_v_24_avg" jdbcType="FLOAT"/>
+            <result property="inharmV24Cp95" column="inharm_v_24_cp95" jdbcType="FLOAT"/>
+            <result property="inharmV25Max" column="inharm_v_25_max" jdbcType="FLOAT"/>
+            <result property="inharmV25Min" column="inharm_v_25_min" jdbcType="FLOAT"/>
+            <result property="inharmV25Avg" column="inharm_v_25_avg" jdbcType="FLOAT"/>
+            <result property="inharmV25Cp95" column="inharm_v_25_cp95" jdbcType="FLOAT"/>
+            <result property="inharmV26Max" column="inharm_v_26_max" jdbcType="FLOAT"/>
+            <result property="inharmV26Min" column="inharm_v_26_min" jdbcType="FLOAT"/>
+            <result property="inharmV26Avg" column="inharm_v_26_avg" jdbcType="FLOAT"/>
+            <result property="inharmV26Cp95" column="inharm_v_26_cp95" jdbcType="FLOAT"/>
+            <result property="inharmV27Max" column="inharm_v_27_max" jdbcType="FLOAT"/>
+            <result property="inharmV27Min" column="inharm_v_27_min" jdbcType="FLOAT"/>
+            <result property="inharmV27Avg" column="inharm_v_27_avg" jdbcType="FLOAT"/>
+            <result property="inharmV27Cp95" column="inharm_v_27_cp95" jdbcType="FLOAT"/>
+            <result property="inharmV28Max" column="inharm_v_28_max" jdbcType="FLOAT"/>
+            <result property="inharmV28Min" column="inharm_v_28_min" jdbcType="FLOAT"/>
+            <result property="inharmV28Avg" column="inharm_v_28_avg" jdbcType="FLOAT"/>
+            <result property="inharmV28Cp95" column="inharm_v_28_cp95" jdbcType="FLOAT"/>
+            <result property="inharmV29Max" column="inharm_v_29_max" jdbcType="FLOAT"/>
+            <result property="inharmV29Min" column="inharm_v_29_min" jdbcType="FLOAT"/>
+            <result property="inharmV29Avg" column="inharm_v_29_avg" jdbcType="FLOAT"/>
+            <result property="inharmV29Cp95" column="inharm_v_29_cp95" jdbcType="FLOAT"/>
+            <result property="inharmV30Max" column="inharm_v_30_max" jdbcType="FLOAT"/>
+            <result property="inharmV30Min" column="inharm_v_30_min" jdbcType="FLOAT"/>
+            <result property="inharmV30Avg" column="inharm_v_30_avg" jdbcType="FLOAT"/>
+            <result property="inharmV30Cp95" column="inharm_v_30_cp95" jdbcType="FLOAT"/>
+            <result property="inharmV31Max" column="inharm_v_31_max" jdbcType="FLOAT"/>
+            <result property="inharmV31Min" column="inharm_v_31_min" jdbcType="FLOAT"/>
+            <result property="inharmV31Avg" column="inharm_v_31_avg" jdbcType="FLOAT"/>
+            <result property="inharmV31Cp95" column="inharm_v_31_cp95" jdbcType="FLOAT"/>
+            <result property="inharmV32Max" column="inharm_v_32_max" jdbcType="FLOAT"/>
+            <result property="inharmV32Min" column="inharm_v_32_min" jdbcType="FLOAT"/>
+            <result property="inharmV32Avg" column="inharm_v_32_avg" jdbcType="FLOAT"/>
+            <result property="inharmV32Cp95" column="inharm_v_32_cp95" jdbcType="FLOAT"/>
+            <result property="inharmV33Max" column="inharm_v_33_max" jdbcType="FLOAT"/>
+            <result property="inharmV33Min" column="inharm_v_33_min" jdbcType="FLOAT"/>
+            <result property="inharmV33Avg" column="inharm_v_33_avg" jdbcType="FLOAT"/>
+            <result property="inharmV33Cp95" column="inharm_v_33_cp95" jdbcType="FLOAT"/>
+            <result property="inharmV34Max" column="inharm_v_34_max" jdbcType="FLOAT"/>
+            <result property="inharmV34Min" column="inharm_v_34_min" jdbcType="FLOAT"/>
+            <result property="inharmV34Avg" column="inharm_v_34_avg" jdbcType="FLOAT"/>
+            <result property="inharmV34Cp95" column="inharm_v_34_cp95" jdbcType="FLOAT"/>
+            <result property="inharmV35Max" column="inharm_v_35_max" jdbcType="FLOAT"/>
+            <result property="inharmV35Min" column="inharm_v_35_min" jdbcType="FLOAT"/>
+            <result property="inharmV35Avg" column="inharm_v_35_avg" jdbcType="FLOAT"/>
+            <result property="inharmV35Cp95" column="inharm_v_35_cp95" jdbcType="FLOAT"/>
+            <result property="inharmV36Max" column="inharm_v_36_max" jdbcType="FLOAT"/>
+            <result property="inharmV36Min" column="inharm_v_36_min" jdbcType="FLOAT"/>
+            <result property="inharmV36Avg" column="inharm_v_36_avg" jdbcType="FLOAT"/>
+            <result property="inharmV36Cp95" column="inharm_v_36_cp95" jdbcType="FLOAT"/>
+            <result property="inharmV37Max" column="inharm_v_37_max" jdbcType="FLOAT"/>
+            <result property="inharmV37Min" column="inharm_v_37_min" jdbcType="FLOAT"/>
+            <result property="inharmV37Avg" column="inharm_v_37_avg" jdbcType="FLOAT"/>
+            <result property="inharmV37Cp95" column="inharm_v_37_cp95" jdbcType="FLOAT"/>
+            <result property="inharmV38Max" column="inharm_v_38_max" jdbcType="FLOAT"/>
+            <result property="inharmV38Min" column="inharm_v_38_min" jdbcType="FLOAT"/>
+            <result property="inharmV38Avg" column="inharm_v_38_avg" jdbcType="FLOAT"/>
+            <result property="inharmV38Cp95" column="inharm_v_38_cp95" jdbcType="FLOAT"/>
+            <result property="inharmV39Max" column="inharm_v_39_max" jdbcType="FLOAT"/>
+            <result property="inharmV39Min" column="inharm_v_39_min" jdbcType="FLOAT"/>
+            <result property="inharmV39Avg" column="inharm_v_39_avg" jdbcType="FLOAT"/>
+            <result property="inharmV39Cp95" column="inharm_v_39_cp95" jdbcType="FLOAT"/>
+            <result property="inharmV40Max" column="inharm_v_40_max" jdbcType="FLOAT"/>
+            <result property="inharmV40Min" column="inharm_v_40_min" jdbcType="FLOAT"/>
+            <result property="inharmV40Avg" column="inharm_v_40_avg" jdbcType="FLOAT"/>
+            <result property="inharmV40Cp95" column="inharm_v_40_cp95" jdbcType="FLOAT"/>
+            <result property="inharmV41Max" column="inharm_v_41_max" jdbcType="FLOAT"/>
+            <result property="inharmV41Min" column="inharm_v_41_min" jdbcType="FLOAT"/>
+            <result property="inharmV41Avg" column="inharm_v_41_avg" jdbcType="FLOAT"/>
+            <result property="inharmV41Cp95" column="inharm_v_41_cp95" jdbcType="FLOAT"/>
+            <result property="inharmV42Max" column="inharm_v_42_max" jdbcType="FLOAT"/>
+            <result property="inharmV42Min" column="inharm_v_42_min" jdbcType="FLOAT"/>
+            <result property="inharmV42Avg" column="inharm_v_42_avg" jdbcType="FLOAT"/>
+            <result property="inharmV42Cp95" column="inharm_v_42_cp95" jdbcType="FLOAT"/>
+            <result property="inharmV43Max" column="inharm_v_43_max" jdbcType="FLOAT"/>
+            <result property="inharmV43Min" column="inharm_v_43_min" jdbcType="FLOAT"/>
+            <result property="inharmV43Avg" column="inharm_v_43_avg" jdbcType="FLOAT"/>
+            <result property="inharmV43Cp95" column="inharm_v_43_cp95" jdbcType="FLOAT"/>
+            <result property="inharmV44Max" column="inharm_v_44_max" jdbcType="FLOAT"/>
+            <result property="inharmV44Min" column="inharm_v_44_min" jdbcType="FLOAT"/>
+            <result property="inharmV44Avg" column="inharm_v_44_avg" jdbcType="FLOAT"/>
+            <result property="inharmV44Cp95" column="inharm_v_44_cp95" jdbcType="FLOAT"/>
+            <result property="inharmV45Max" column="inharm_v_45_max" jdbcType="FLOAT"/>
+            <result property="inharmV45Min" column="inharm_v_45_min" jdbcType="FLOAT"/>
+            <result property="inharmV45Avg" column="inharm_v_45_avg" jdbcType="FLOAT"/>
+            <result property="inharmV45Cp95" column="inharm_v_45_cp95" jdbcType="FLOAT"/>
+            <result property="inharmV46Max" column="inharm_v_46_max" jdbcType="FLOAT"/>
+            <result property="inharmV46Min" column="inharm_v_46_min" jdbcType="FLOAT"/>
+            <result property="inharmV46Avg" column="inharm_v_46_avg" jdbcType="FLOAT"/>
+            <result property="inharmV46Cp95" column="inharm_v_46_cp95" jdbcType="FLOAT"/>
+            <result property="inharmV47Max" column="inharm_v_47_max" jdbcType="FLOAT"/>
+            <result property="inharmV47Min" column="inharm_v_47_min" jdbcType="FLOAT"/>
+            <result property="inharmV47Avg" column="inharm_v_47_avg" jdbcType="FLOAT"/>
+            <result property="inharmV47Cp95" column="inharm_v_47_cp95" jdbcType="FLOAT"/>
+            <result property="inharmV48Max" column="inharm_v_48_max" jdbcType="FLOAT"/>
+            <result property="inharmV48Min" column="inharm_v_48_min" jdbcType="FLOAT"/>
+            <result property="inharmV48Avg" column="inharm_v_48_avg" jdbcType="FLOAT"/>
+            <result property="inharmV48Cp95" column="inharm_v_48_cp95" jdbcType="FLOAT"/>
+            <result property="inharmV49Max" column="inharm_v_49_max" jdbcType="FLOAT"/>
+            <result property="inharmV49Min" column="inharm_v_49_min" jdbcType="FLOAT"/>
+            <result property="inharmV49Avg" column="inharm_v_49_avg" jdbcType="FLOAT"/>
+            <result property="inharmV49Cp95" column="inharm_v_49_cp95" jdbcType="FLOAT"/>
+            <result property="inharmV50Max" column="inharm_v_50_max" jdbcType="FLOAT"/>
+            <result property="inharmV50Min" column="inharm_v_50_min" jdbcType="FLOAT"/>
+            <result property="inharmV50Avg" column="inharm_v_50_avg" jdbcType="FLOAT"/>
+            <result property="inharmV50Cp95" column="inharm_v_50_cp95" jdbcType="FLOAT"/>
+    </resultMap>
+
+    <sql id="Base_Column_List">
+        measurement_point_id,data_date,phase,
+        inharm_v_1_max,inharm_v_1_min,inharm_v_1_avg,
+        inharm_v_1_cp95,inharm_v_2_max,inharm_v_2_min,
+        inharm_v_2_avg,inharm_v_2_cp95,inharm_v_3_max,
+        inharm_v_3_min,inharm_v_3_avg,inharm_v_3_cp95,
+        inharm_v_4_max,inharm_v_4_min,inharm_v_4_avg,
+        inharm_v_4_cp95,inharm_v_5_max,inharm_v_5_min,
+        inharm_v_5_avg,inharm_v_5_cp95,inharm_v_6_max,
+        inharm_v_6_min,inharm_v_6_avg,inharm_v_6_cp95,
+        inharm_v_7_max,inharm_v_7_min,inharm_v_7_avg,
+        inharm_v_7_cp95,inharm_v_8_max,inharm_v_8_min,
+        inharm_v_8_avg,inharm_v_8_cp95,inharm_v_9_max,
+        inharm_v_9_min,inharm_v_9_avg,inharm_v_9_cp95,
+        inharm_v_10_max,inharm_v_10_min,inharm_v_10_avg,
+        inharm_v_10_cp95,inharm_v_11_max,inharm_v_11_min,
+        inharm_v_11_avg,inharm_v_11_cp95,inharm_v_12_max,
+        inharm_v_12_min,inharm_v_12_avg,inharm_v_12_cp95,
+        inharm_v_13_max,inharm_v_13_min,inharm_v_13_avg,
+        inharm_v_13_cp95,inharm_v_14_max,inharm_v_14_min,
+        inharm_v_14_avg,inharm_v_14_cp95,inharm_v_15_max,
+        inharm_v_15_min,inharm_v_15_avg,inharm_v_15_cp95,
+        inharm_v_16_max,inharm_v_16_min,inharm_v_16_avg,
+        inharm_v_16_cp95,inharm_v_17_max,inharm_v_17_min,
+        inharm_v_17_avg,inharm_v_17_cp95,inharm_v_18_max,
+        inharm_v_18_min,inharm_v_18_avg,inharm_v_18_cp95,
+        inharm_v_19_max,inharm_v_19_min,inharm_v_19_avg,
+        inharm_v_19_cp95,inharm_v_20_max,inharm_v_20_min,
+        inharm_v_20_avg,inharm_v_20_cp95,inharm_v_21_max,
+        inharm_v_21_min,inharm_v_21_avg,inharm_v_21_cp95,
+        inharm_v_22_max,inharm_v_22_min,inharm_v_22_avg,
+        inharm_v_22_cp95,inharm_v_23_max,inharm_v_23_min,
+        inharm_v_23_avg,inharm_v_23_cp95,inharm_v_24_max,
+        inharm_v_24_min,inharm_v_24_avg,inharm_v_24_cp95,
+        inharm_v_25_max,inharm_v_25_min,inharm_v_25_avg,
+        inharm_v_25_cp95,inharm_v_26_max,inharm_v_26_min,
+        inharm_v_26_avg,inharm_v_26_cp95,inharm_v_27_max,
+        inharm_v_27_min,inharm_v_27_avg,inharm_v_27_cp95,
+        inharm_v_28_max,inharm_v_28_min,inharm_v_28_avg,
+        inharm_v_28_cp95,inharm_v_29_max,inharm_v_29_min,
+        inharm_v_29_avg,inharm_v_29_cp95,inharm_v_30_max,
+        inharm_v_30_min,inharm_v_30_avg,inharm_v_30_cp95,
+        inharm_v_31_max,inharm_v_31_min,inharm_v_31_avg,
+        inharm_v_31_cp95,inharm_v_32_max,inharm_v_32_min,
+        inharm_v_32_avg,inharm_v_32_cp95,inharm_v_33_max,
+        inharm_v_33_min,inharm_v_33_avg,inharm_v_33_cp95,
+        inharm_v_34_max,inharm_v_34_min,inharm_v_34_avg,
+        inharm_v_34_cp95,inharm_v_35_max,inharm_v_35_min,
+        inharm_v_35_avg,inharm_v_35_cp95,inharm_v_36_max,
+        inharm_v_36_min,inharm_v_36_avg,inharm_v_36_cp95,
+        inharm_v_37_max,inharm_v_37_min,inharm_v_37_avg,
+        inharm_v_37_cp95,inharm_v_38_max,inharm_v_38_min,
+        inharm_v_38_avg,inharm_v_38_cp95,inharm_v_39_max,
+        inharm_v_39_min,inharm_v_39_avg,inharm_v_39_cp95,
+        inharm_v_40_max,inharm_v_40_min,inharm_v_40_avg,
+        inharm_v_40_cp95,inharm_v_41_max,inharm_v_41_min,
+        inharm_v_41_avg,inharm_v_41_cp95,inharm_v_42_max,
+        inharm_v_42_min,inharm_v_42_avg,inharm_v_42_cp95,
+        inharm_v_43_max,inharm_v_43_min,inharm_v_43_avg,
+        inharm_v_43_cp95,inharm_v_44_max,inharm_v_44_min,
+        inharm_v_44_avg,inharm_v_44_cp95,inharm_v_45_max,
+        inharm_v_45_min,inharm_v_45_avg,inharm_v_45_cp95,
+        inharm_v_46_max,inharm_v_46_min,inharm_v_46_avg,
+        inharm_v_46_cp95,inharm_v_47_max,inharm_v_47_min,
+        inharm_v_47_avg,inharm_v_47_cp95,inharm_v_48_max,
+        inharm_v_48_min,inharm_v_48_avg,inharm_v_48_cp95,
+        inharm_v_49_max,inharm_v_49_min,inharm_v_49_avg,
+        inharm_v_49_cp95,inharm_v_50_max,inharm_v_50_min,
+        inharm_v_50_avg,inharm_v_50_cp95
+    </sql>
+    <select id="getListByCond" resultType="com.njcn.harmonic.pojo.po.RMpInharmonicVRateReportD">
+        select <include refid="Base_Column_List"/>
+        from r_mp_inharmonic_v_rate_report_d
+        where 1 = 1
+        <if test="startTime != null and startTime != ''">
+            AND DATE_FORMAT(data_date, '%Y-%m-%d') >=  #{startTime, jdbcType=VARCHAR}
+        </if>
+        <if test="endTime != null and endTime != ''">
+            AND DATE_FORMAT(data_date, '%Y-%m-%d') &lt;=  #{endTime, jdbcType=VARCHAR}
+        </if>
+        and measurement_point_id IN
+        <foreach collection="monitorIdList" open="(" close=")" separator="," item="id">
+            #{id}
+        </foreach>
+    </select>
+</mapper>
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RMpMeasurePhaseReportDMapper.xml b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RMpMeasurePhaseReportDMapper.xml
new file mode 100644
index 000000000..0ce316427
--- /dev/null
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RMpMeasurePhaseReportDMapper.xml
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.njcn.harmonic.mapper.RMpMeasurePhaseReportDMapper">
+
+    <resultMap id="BaseResultMap" type="com.njcn.harmonic.pojo.po.RMpMeasurePhaseReportD">
+            <id property="measurementPointId" column="measurement_point_id" jdbcType="VARCHAR"/>
+            <id property="dataDate" column="data_date" jdbcType="DATE"/>
+            <id property="phase" column="phase" jdbcType="VARCHAR"/>
+            <result property="phaseVoltageEffectiveMax" column="phase_voltage_effective_max" jdbcType="FLOAT"/>
+            <result property="phaseVoltageEffectiveMin" column="phase_voltage_effective_min" jdbcType="FLOAT"/>
+            <result property="phaseVoltageEffectiveAvg" column="phase_voltage_effective_avg" jdbcType="FLOAT"/>
+            <result property="phaseVoltageEffective95" column="phase_voltage_effective_95" jdbcType="FLOAT"/>
+            <result property="lineVoltageEffectiveMax" column="line_voltage_effective_max" jdbcType="FLOAT"/>
+            <result property="lineVoltageEffectiveMin" column="line_voltage_effective_min" jdbcType="FLOAT"/>
+            <result property="lineVoltageEffectiveAvg" column="line_voltage_effective_avg" jdbcType="FLOAT"/>
+            <result property="lineVoltageEffective95" column="line_voltage_effective_95" jdbcType="FLOAT"/>
+            <result property="vDeUpMax" column="v_de_up_max" jdbcType="FLOAT"/>
+            <result property="vDeUpMin" column="v_de_up_min" jdbcType="FLOAT"/>
+            <result property="vDeUpAvg" column="v_de_up_avg" jdbcType="FLOAT"/>
+            <result property="vDeUp95" column="v_de_up_95" jdbcType="FLOAT"/>
+            <result property="vDeLowMax" column="v_de_low_max" jdbcType="FLOAT"/>
+            <result property="vDeLowMin" column="v_de_low_min" jdbcType="FLOAT"/>
+            <result property="vDeLowAvg" column="v_de_low_avg" jdbcType="FLOAT"/>
+            <result property="vDeLow95" column="v_de_low_95" jdbcType="FLOAT"/>
+            <result property="currentEffectiveMax" column="current_effective_max" jdbcType="FLOAT"/>
+            <result property="currentEffectiveMin" column="current_effective_min" jdbcType="FLOAT"/>
+            <result property="currentEffectiveAvg" column="current_effective_avg" jdbcType="FLOAT"/>
+            <result property="currentEffective95" column="current_effective_95" jdbcType="FLOAT"/>
+            <result property="spActivePowerMax" column="sp_active_power_max" jdbcType="FLOAT"/>
+            <result property="spActivePowerMin" column="sp_active_power_min" jdbcType="FLOAT"/>
+            <result property="spActivePowerAvg" column="sp_active_power_avg" jdbcType="FLOAT"/>
+            <result property="spActivePower95" column="sp_active_power_95" jdbcType="FLOAT"/>
+            <result property="spReactivePowerMax" column="sp_reactive_power_max" jdbcType="FLOAT"/>
+            <result property="spReactivePowerMin" column="sp_reactive_power_min" jdbcType="FLOAT"/>
+            <result property="spReactivePowerAvg" column="sp_reactive_power_avg" jdbcType="FLOAT"/>
+            <result property="spReactivePower95" column="sp_reactive_power_95" jdbcType="FLOAT"/>
+            <result property="spApparentPowerMax" column="sp_apparent_power_max" jdbcType="FLOAT"/>
+            <result property="spApparentPowerMin" column="sp_apparent_power_min" jdbcType="FLOAT"/>
+            <result property="spApparentPowerAvg" column="sp_apparent_power_avg" jdbcType="FLOAT"/>
+            <result property="spApparentPower95" column="sp_apparent_power_95" jdbcType="FLOAT"/>
+            <result property="spPowerFactorMax" column="sp_power_factor_max" jdbcType="FLOAT"/>
+            <result property="spPowerFactorMin" column="sp_power_factor_min" jdbcType="FLOAT"/>
+            <result property="spPowerFactorAvg" column="sp_power_factor_avg" jdbcType="FLOAT"/>
+            <result property="spPowerFactor95" column="sp_power_factor_95" jdbcType="FLOAT"/>
+            <result property="spFundamentalPowerFactorMax" column="sp_fundamental_power_factor_max" jdbcType="FLOAT"/>
+            <result property="spFundamentalPowerFactorMin" column="sp_fundamental_power_factor_min" jdbcType="FLOAT"/>
+            <result property="spFundamentalPowerFactorAvg" column="sp_fundamental_power_factor_avg" jdbcType="FLOAT"/>
+            <result property="spFundamentalPowerFactor95" column="sp_fundamental_power_factor_95" jdbcType="FLOAT"/>
+    </resultMap>
+
+    <sql id="Base_Column_List">
+        measurement_point_id,data_date,phase,
+        phase_voltage_effective_max,phase_voltage_effective_min,phase_voltage_effective_avg,
+        phase_voltage_effective_95,line_voltage_effective_max,line_voltage_effective_min,
+        line_voltage_effective_avg,line_voltage_effective_95,v_de_up_max,
+        v_de_up_min,v_de_up_avg,v_de_up_95,
+        v_de_low_max,v_de_low_min,v_de_low_avg,
+        v_de_low_95,current_effective_max,current_effective_min,
+        current_effective_avg,current_effective_95,sp_active_power_max,
+        sp_active_power_min,sp_active_power_avg,sp_active_power_95,
+        sp_reactive_power_max,sp_reactive_power_min,sp_reactive_power_avg,
+        sp_reactive_power_95,sp_apparent_power_max,sp_apparent_power_min,
+        sp_apparent_power_avg,sp_apparent_power_95,sp_power_factor_max,
+        sp_power_factor_min,sp_power_factor_avg,sp_power_factor_95,
+        sp_fundamental_power_factor_max,sp_fundamental_power_factor_min,sp_fundamental_power_factor_avg,
+        sp_fundamental_power_factor_95
+    </sql>
+    <select id="getListByCond" resultType="com.njcn.harmonic.pojo.po.RMpMeasurePhaseReportD" parameterType="java.util.Map">
+        select <include refid="Base_Column_List"/>
+        from r_mp_measure_phase_report_d
+        where 1 = 1
+        <if test="startTime != null and startTime != ''">
+            AND DATE_FORMAT(data_date, '%Y-%m-%d') >=  #{startTime, jdbcType=VARCHAR}
+        </if>
+        <if test="endTime != null and endTime != ''">
+            AND DATE_FORMAT(data_date, '%Y-%m-%d') &lt;=  #{endTime, jdbcType=VARCHAR}
+        </if>
+        and measurement_point_id IN
+        <foreach collection="monitorIdList" open="(" close=")" separator="," item="id">
+            #{id}
+        </foreach>
+    </select>
+</mapper>
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RMpMeasureReportDMapper.xml b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RMpMeasureReportDMapper.xml
new file mode 100644
index 000000000..4212bd859
--- /dev/null
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RMpMeasureReportDMapper.xml
@@ -0,0 +1,153 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.njcn.harmonic.mapper.RMpMeasureReportDMapper">
+
+    <resultMap id="BaseResultMap" type="com.njcn.harmonic.pojo.po.RMpMeasureReportD">
+            <id property="measurementPointId" column="measurement_point_id" jdbcType="VARCHAR"/>
+            <id property="dataDate" column="data_date" jdbcType="DATE"/>
+            <result property="frequencyMax" column="frequency_max" jdbcType="FLOAT"/>
+            <result property="frequencyMin" column="frequency_min" jdbcType="FLOAT"/>
+            <result property="frequencyAvg" column="frequency_avg" jdbcType="FLOAT"/>
+            <result property="frequency95" column="frequency_95" jdbcType="FLOAT"/>
+            <result property="frequencyDeviationMax" column="frequency_deviation_max" jdbcType="FLOAT"/>
+            <result property="frequencyDeviationMin" column="frequency_deviation_min" jdbcType="FLOAT"/>
+            <result property="frequencyDeviationAvg" column="frequency_deviation_avg" jdbcType="FLOAT"/>
+            <result property="frequencyDeviation95" column="frequency_deviation_95" jdbcType="FLOAT"/>
+            <result property="totalActivePowerMax" column="total_active_power_max" jdbcType="FLOAT"/>
+            <result property="totalActivePowerMin" column="total_active_power_min" jdbcType="FLOAT"/>
+            <result property="totalActivePowerAvg" column="total_active_power_avg" jdbcType="FLOAT"/>
+            <result property="totalActivePower95" column="total_active_power_95" jdbcType="FLOAT"/>
+            <result property="totalReactivePowerMax" column="total_reactive_power_max" jdbcType="FLOAT"/>
+            <result property="totalReactivePowerMin" column="total_reactive_power_min" jdbcType="FLOAT"/>
+            <result property="totalReactivePowerAvg" column="total_reactive_power_avg" jdbcType="FLOAT"/>
+            <result property="totalReactivePower95" column="total_reactive_power_95" jdbcType="FLOAT"/>
+            <result property="totalApparentPowerMax" column="total_apparent_power_max" jdbcType="FLOAT"/>
+            <result property="totalApparentPowerMin" column="total_apparent_power_min" jdbcType="FLOAT"/>
+            <result property="totalApparentPowerAvg" column="total_apparent_power_avg" jdbcType="FLOAT"/>
+            <result property="totalApparentPower95" column="total_apparent_power_95" jdbcType="FLOAT"/>
+            <result property="tpPowerFactorMax" column="tp_power_factor_max" jdbcType="FLOAT"/>
+            <result property="tpPowerFactorMin" column="tp_power_factor_min" jdbcType="FLOAT"/>
+            <result property="tpPowerFactorAvg" column="tp_power_factor_avg" jdbcType="FLOAT"/>
+            <result property="tpPowerFactor95" column="tp_power_factor_95" jdbcType="FLOAT"/>
+            <result property="fundamentalPowerFactorMax" column="fundamental_power_factor_max" jdbcType="FLOAT"/>
+            <result property="fundamentalPowerFactorMin" column="fundamental_power_factor_min" jdbcType="FLOAT"/>
+            <result property="fundamentalPowerFactorAvg" column="fundamental_power_factor_avg" jdbcType="FLOAT"/>
+            <result property="fundamentalPowerFactor95" column="fundamental_power_factor_95" jdbcType="FLOAT"/>
+            <result property="positiveSequenceVoltageMax" column="positive_sequence_voltage_max" jdbcType="FLOAT"/>
+            <result property="positiveSequenceVoltageMin" column="positive_sequence_voltage_min" jdbcType="FLOAT"/>
+            <result property="positiveSequenceVoltageAvg" column="positive_sequence_voltage_avg" jdbcType="FLOAT"/>
+            <result property="positiveSequenceVoltage95" column="positive_sequence_voltage_95" jdbcType="FLOAT"/>
+            <result property="negativeSequenceVoltageMax" column="negative_sequence_voltage_max" jdbcType="FLOAT"/>
+            <result property="negativeSequenceVoltageMin" column="negative_sequence_voltage_min" jdbcType="FLOAT"/>
+            <result property="negativeSequenceVoltageAvg" column="negative_sequence_voltage_avg" jdbcType="FLOAT"/>
+            <result property="negativeSequenceVoltage95" column="negative_sequence_voltage_95" jdbcType="FLOAT"/>
+            <result property="zeroSequenceVoltageMax" column="zero_sequence_voltage_max" jdbcType="FLOAT"/>
+            <result property="zeroSequenceVoltageMin" column="zero_sequence_voltage_min" jdbcType="FLOAT"/>
+            <result property="zeroSequenceVoltageAvg" column="zero_sequence_voltage_avg" jdbcType="FLOAT"/>
+            <result property="zeroSequenceVoltage95" column="zero_sequence_voltage_95" jdbcType="FLOAT"/>
+            <result property="negativeSequenceVoltageUnbalanceMax" column="negative_sequence_voltage_unbalance_max" jdbcType="FLOAT"/>
+            <result property="negativeSequenceVoltageUnbalanceMin" column="negative_sequence_voltage_unbalance_min" jdbcType="FLOAT"/>
+            <result property="negativeSequenceVoltageUnbalanceAvg" column="negative_sequence_voltage_unbalance_avg" jdbcType="FLOAT"/>
+            <result property="negativeSequenceVoltageUnbalance95" column="negative_sequence_voltage_unbalance_95" jdbcType="FLOAT"/>
+            <result property="zeroSequenceVoltageUnbalanceMax" column="zero_sequence_voltage_unbalance_max" jdbcType="FLOAT"/>
+            <result property="zeroSequenceVoltageUnbalanceMin" column="zero_sequence_voltage_unbalance_min" jdbcType="FLOAT"/>
+            <result property="zeroSequenceVoltageUnbalanceAvg" column="zero_sequence_voltage_unbalance_avg" jdbcType="FLOAT"/>
+            <result property="zeroSequenceVoltageUnbalance95" column="zero_sequence_voltage_unbalance_95" jdbcType="FLOAT"/>
+            <result property="positiveSequenceCurrentMax" column="positive_sequence_current_max" jdbcType="FLOAT"/>
+            <result property="positiveSequenceCurrentMin" column="positive_sequence_current_min" jdbcType="FLOAT"/>
+            <result property="positiveSequenceCurrentAvg" column="positive_sequence_current_avg" jdbcType="FLOAT"/>
+            <result property="positiveSequenceCurrent95" column="positive_sequence_current_95" jdbcType="FLOAT"/>
+            <result property="negativeSequenceCurrentMax" column="negative_sequence_current_max" jdbcType="FLOAT"/>
+            <result property="negativeSequenceCurrentMin" column="negative_sequence_current_min" jdbcType="FLOAT"/>
+            <result property="negativeSequenceCurrentAvg" column="negative_sequence_current_avg" jdbcType="FLOAT"/>
+            <result property="negativeSequenceCurrent95" column="negative_sequence_current_95" jdbcType="FLOAT"/>
+            <result property="zeroSequenceCurrentMax" column="zero_sequence_current_max" jdbcType="FLOAT"/>
+            <result property="zeroSequenceCurrentMin" column="zero_sequence_current_min" jdbcType="FLOAT"/>
+            <result property="zeroSequenceCurrentAvg" column="zero_sequence_current_avg" jdbcType="FLOAT"/>
+            <result property="zeroSequenceCurrent95" column="zero_sequence_current_95" jdbcType="FLOAT"/>
+            <result property="negativeSequenceCurrentUnbalanceMax" column="negative_sequence_current_unbalance_max" jdbcType="FLOAT"/>
+            <result property="negativeSequenceCurrentUnbalanceMin" column="negative_sequence_current_unbalance_min" jdbcType="FLOAT"/>
+            <result property="negativeSequenceCurrentUnbalanceAvg" column="negative_sequence_current_unbalance_avg" jdbcType="FLOAT"/>
+            <result property="negativeSequenceCurrentUnbalance95" column="negative_sequence_current_unbalance_95" jdbcType="FLOAT"/>
+            <result property="zeroSequenceCurrentImbalanceMax" column="zero_sequence_current_imbalance_max" jdbcType="FLOAT"/>
+            <result property="zeroSequenceCurrentImbalanceMin" column="zero_sequence_current_imbalance_min" jdbcType="FLOAT"/>
+            <result property="zeroSequenceCurrentImbalanceAvg" column="zero_sequence_current_imbalance_avg" jdbcType="FLOAT"/>
+            <result property="zeroSequenceCurrentImbalance95" column="zero_sequence_current_imbalance_95" jdbcType="FLOAT"/>
+            <result property="equivalentApparentPowerMax" column="equivalent_apparent_power_max" jdbcType="FLOAT"/>
+            <result property="equivalentApparentPowerMin" column="equivalent_apparent_power_min" jdbcType="FLOAT"/>
+            <result property="equivalentApparentPowerAvg" column="equivalent_apparent_power_avg" jdbcType="FLOAT"/>
+            <result property="equivalentApparentPower95" column="equivalent_apparent_power_95" jdbcType="FLOAT"/>
+            <result property="equivalentPowerFactorMax" column="equivalent_power_factor_max" jdbcType="FLOAT"/>
+            <result property="equivalentPowerFactorMin" column="equivalent_power_factor_min" jdbcType="FLOAT"/>
+            <result property="equivalentPowerFactorAvg" column="equivalent_power_factor_avg" jdbcType="FLOAT"/>
+            <result property="equivalentPowerFactor95" column="equivalent_power_factor_95" jdbcType="FLOAT"/>
+            <result property="fundamentalWaveRateoMax" column="fundamental_wave_rateo_max" jdbcType="FLOAT"/>
+            <result property="fundamentalWaveRateoMin" column="fundamental_wave_rateo_min" jdbcType="FLOAT"/>
+            <result property="fundamentalWaveRateoAvg" column="fundamental_wave_rateo_avg" jdbcType="FLOAT"/>
+            <result property="fundamentalWaveRateo95" column="fundamental_wave_rateo_95" jdbcType="FLOAT"/>
+            <result property="fundamentalWaveApparentMax" column="fundamental_wave_apparent_max" jdbcType="FLOAT"/>
+            <result property="fundamentalWaveApparentMin" column="fundamental_wave_apparent_min" jdbcType="FLOAT"/>
+            <result property="fundamentalWaveApparentAvg" column="fundamental_wave_apparent_avg" jdbcType="FLOAT"/>
+            <result property="fundamentalWaveApparent95" column="fundamental_wave_apparent_95" jdbcType="FLOAT"/>
+            <result property="nonfundamentalWaveRateoMax" column="nonfundamental_wave_rateo_max" jdbcType="FLOAT"/>
+            <result property="nonfundamentalWaveRateoMin" column="nonfundamental_wave_rateo_min" jdbcType="FLOAT"/>
+            <result property="nonfundamentalWaveRateoAvg" column="nonfundamental_wave_rateo_avg" jdbcType="FLOAT"/>
+            <result property="nonfundamentalWaveRateo95" column="nonfundamental_wave_rateo_95" jdbcType="FLOAT"/>
+            <result property="unbalancedApparentPowerMax" column="unbalanced_apparent_power_max" jdbcType="FLOAT"/>
+            <result property="unbalancedApparentPowerMin" column="unbalanced_apparent_power_min" jdbcType="FLOAT"/>
+            <result property="unbalancedApparentPowerAvg" column="unbalanced_apparent_power_avg" jdbcType="FLOAT"/>
+            <result property="unbalancedApparentPower95" column="unbalanced_apparent_power_95" jdbcType="FLOAT"/>
+    </resultMap>
+
+    <sql id="Base_Column_List">
+        measurement_point_id,data_date,frequency_max,
+        frequency_min,frequency_avg,frequency_95,
+        frequency_deviation_max,frequency_deviation_min,frequency_deviation_avg,
+        frequency_deviation_95,total_active_power_max,total_active_power_min,
+        total_active_power_avg,total_active_power_95,total_reactive_power_max,
+        total_reactive_power_min,total_reactive_power_avg,total_reactive_power_95,
+        total_apparent_power_max,total_apparent_power_min,total_apparent_power_avg,
+        total_apparent_power_95,tp_power_factor_max,tp_power_factor_min,
+        tp_power_factor_avg,tp_power_factor_95,fundamental_power_factor_max,
+        fundamental_power_factor_min,fundamental_power_factor_avg,fundamental_power_factor_95,
+        positive_sequence_voltage_max,positive_sequence_voltage_min,positive_sequence_voltage_avg,
+        positive_sequence_voltage_95,negative_sequence_voltage_max,negative_sequence_voltage_min,
+        negative_sequence_voltage_avg,negative_sequence_voltage_95,zero_sequence_voltage_max,
+        zero_sequence_voltage_min,zero_sequence_voltage_avg,zero_sequence_voltage_95,
+        negative_sequence_voltage_unbalance_max,negative_sequence_voltage_unbalance_min,negative_sequence_voltage_unbalance_avg,
+        negative_sequence_voltage_unbalance_95,zero_sequence_voltage_unbalance_max,zero_sequence_voltage_unbalance_min,
+        zero_sequence_voltage_unbalance_avg,zero_sequence_voltage_unbalance_95,positive_sequence_current_max,
+        positive_sequence_current_min,positive_sequence_current_avg,positive_sequence_current_95,
+        negative_sequence_current_max,negative_sequence_current_min,negative_sequence_current_avg,
+        negative_sequence_current_95,zero_sequence_current_max,zero_sequence_current_min,
+        zero_sequence_current_avg,zero_sequence_current_95,negative_sequence_current_unbalance_max,
+        negative_sequence_current_unbalance_min,negative_sequence_current_unbalance_avg,negative_sequence_current_unbalance_95,
+        zero_sequence_current_imbalance_max,zero_sequence_current_imbalance_min,zero_sequence_current_imbalance_avg,
+        zero_sequence_current_imbalance_95,equivalent_apparent_power_max,equivalent_apparent_power_min,
+        equivalent_apparent_power_avg,equivalent_apparent_power_95,equivalent_power_factor_max,
+        equivalent_power_factor_min,equivalent_power_factor_avg,equivalent_power_factor_95,
+        fundamental_wave_rateo_max,fundamental_wave_rateo_min,fundamental_wave_rateo_avg,
+        fundamental_wave_rateo_95,fundamental_wave_apparent_max,fundamental_wave_apparent_min,
+        fundamental_wave_apparent_avg,fundamental_wave_apparent_95,nonfundamental_wave_rateo_max,
+        nonfundamental_wave_rateo_min,nonfundamental_wave_rateo_avg,nonfundamental_wave_rateo_95,
+        unbalanced_apparent_power_max,unbalanced_apparent_power_min,unbalanced_apparent_power_avg,
+        unbalanced_apparent_power_95
+    </sql>
+    <select id="getListByCond" resultType="com.njcn.harmonic.pojo.po.RMpMeasureReportD" parameterType="java.util.Map">
+        select <include refid="Base_Column_List"/>
+        from r_mp_measure_report_d
+        where 1 = 1
+        <if test="startTime != null and startTime != ''">
+            AND DATE_FORMAT(data_date, '%Y-%m-%d') >=  #{startTime, jdbcType=VARCHAR}
+        </if>
+        <if test="endTime != null and endTime != ''">
+            AND DATE_FORMAT(data_date, '%Y-%m-%d') &lt;=  #{endTime, jdbcType=VARCHAR}
+        </if>
+        and measurement_point_id IN
+        <foreach collection="monitorIdList" open="(" close=")" separator="," item="id">
+            #{id}
+        </foreach>
+    </select>
+</mapper>
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RMpPartHarmonicDetailDMapper.xml b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RMpPartHarmonicDetailDMapper.xml
new file mode 100644
index 000000000..93b22a26e
--- /dev/null
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RMpPartHarmonicDetailDMapper.xml
@@ -0,0 +1,154 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.njcn.harmonic.mapper.RMpPartHarmonicDetailDMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.njcn.harmonic.pojo.po.RMpPartHarmonicDetailD">
+        <id column="measurement_point_id" property="measurementPointId" />
+        <result column="data_date" property="dataDate" />
+        <result column="is_harmonic" property="isHarmonic" />
+        <result column="is_freq" property="isFreq" />
+        <result column="freq_times" property="freqTimes" />
+        <result column="is_v_dev_up" property="isVDevUp" />
+        <result column="is_v_dev_low" property="isVDevLow" />
+        <result column="is_v_dev" property="isVDev" />
+        <result column="is_v_thd" property="isVThd" />
+        <result column="v_dev_times" property="vDevTimes" />
+        <result column="is_v" property="isV" />
+        <result column="v_times" property="vTimes" />
+        <result column="is_i" property="isI" />
+        <result column="i_times" property="iTimes" />
+        <result column="is_v_2" property="isV2" />
+        <result column="is_v_3" property="isV3" />
+        <result column="is_v_4" property="isV4" />
+        <result column="is_v_5" property="isV5" />
+        <result column="is_v_6" property="isV6" />
+        <result column="is_v_7" property="isV7" />
+        <result column="is_v_8" property="isV8" />
+        <result column="is_v_9" property="isV9" />
+        <result column="is_v_10" property="isV10" />
+        <result column="is_v_11" property="isV11" />
+        <result column="is_v_12" property="isV12" />
+        <result column="is_v_13" property="isV13" />
+        <result column="is_v_14" property="isV14" />
+        <result column="is_v_15" property="isV15" />
+        <result column="is_v_16" property="isV16" />
+        <result column="is_v_17" property="isV17" />
+        <result column="is_v_18" property="isV18" />
+        <result column="is_v_19" property="isV19" />
+        <result column="is_v_20" property="isV20" />
+        <result column="is_v_21" property="isV21" />
+        <result column="is_v_22" property="isV22" />
+        <result column="is_v_23" property="isV23" />
+        <result column="is_v_24" property="isV24" />
+        <result column="is_v_25" property="isV25" />
+        <result column="is_v_26" property="isV26" />
+        <result column="is_v_27" property="isV27" />
+        <result column="is_v_28" property="isV28" />
+        <result column="is_v_29" property="isV29" />
+        <result column="is_v_30" property="isV30" />
+        <result column="is_v_31" property="isV31" />
+        <result column="is_v_32" property="isV32" />
+        <result column="is_v_33" property="isV33" />
+        <result column="is_v_34" property="isV34" />
+        <result column="is_v_35" property="isV35" />
+        <result column="is_v_36" property="isV36" />
+        <result column="is_v_37" property="isV37" />
+        <result column="is_v_38" property="isV38" />
+        <result column="is_v_39" property="isV39" />
+        <result column="is_v_40" property="isV40" />
+        <result column="is_v_41" property="isV41" />
+        <result column="is_v_42" property="isV42" />
+        <result column="is_v_43" property="isV43" />
+        <result column="is_v_44" property="isV44" />
+        <result column="is_v_45" property="isV45" />
+        <result column="is_v_46" property="isV46" />
+        <result column="is_v_47" property="isV47" />
+        <result column="is_v_48" property="isV48" />
+        <result column="is_v_49" property="isV49" />
+        <result column="is_v_50" property="isV50" />
+        <result column="is_i_2" property="isI2" />
+        <result column="is_i_3" property="isI3" />
+        <result column="is_i_4" property="isI4" />
+        <result column="is_i_5" property="isI5" />
+        <result column="is_i_6" property="isI6" />
+        <result column="is_i_7" property="isI7" />
+        <result column="is_i_8" property="isI8" />
+        <result column="is_i_9" property="isI9" />
+        <result column="is_i_10" property="isI10" />
+        <result column="is_i_11" property="isI11" />
+        <result column="is_i_12" property="isI12" />
+        <result column="is_i_13" property="isI13" />
+        <result column="is_i_14" property="isI14" />
+        <result column="is_i_15" property="isI15" />
+        <result column="is_i_16" property="isI16" />
+        <result column="is_i_17" property="isI17" />
+        <result column="is_i_18" property="isI18" />
+        <result column="is_i_19" property="isI19" />
+        <result column="is_i_20" property="isI20" />
+        <result column="is_i_21" property="isI21" />
+        <result column="is_i_22" property="isI22" />
+        <result column="is_i_23" property="isI23" />
+        <result column="is_i_24" property="isI24" />
+        <result column="is_i_25" property="isI25" />
+        <result column="is_i_26" property="isI26" />
+        <result column="is_i_27" property="isI27" />
+        <result column="is_i_28" property="isI28" />
+        <result column="is_i_29" property="isI29" />
+        <result column="is_i_30" property="isI30" />
+        <result column="is_i_31" property="isI31" />
+        <result column="is_i_32" property="isI32" />
+        <result column="is_i_33" property="isI33" />
+        <result column="is_i_34" property="isI34" />
+        <result column="is_i_35" property="isI35" />
+        <result column="is_i_36" property="isI36" />
+        <result column="is_i_37" property="isI37" />
+        <result column="is_i_38" property="isI38" />
+        <result column="is_i_39" property="isI39" />
+        <result column="is_i_40" property="isI40" />
+        <result column="is_i_41" property="isI41" />
+        <result column="is_i_42" property="isI42" />
+        <result column="is_i_43" property="isI43" />
+        <result column="is_i_44" property="isI44" />
+        <result column="is_i_45" property="isI45" />
+        <result column="is_i_46" property="isI46" />
+        <result column="is_i_47" property="isI47" />
+        <result column="is_i_48" property="isI48" />
+        <result column="is_i_49" property="isI49" />
+        <result column="is_i_50" property="isI50" />
+        <result column="is_unbalance" property="isUnbalance" />
+        <result column="is_i_neg" property="isINeg" />
+        <result column="unbalance_times" property="unbalanceTimes" />
+        <result column="i_neg_times" property="iNegTimes" />
+    </resultMap>
+    <select id="getRMpPartHarmonicDetailIcon"
+            resultType="com.njcn.harmonic.pojo.vo.RMpPartHarmonicDetailIconVO">
+        SELECT
+            rmphd.data_date,
+            rmphd.freq_times,
+            rmphd.v_dev_times,
+            rmphd.v_times,
+            rmphd.i_times,
+            rmphd.unbalance_times,
+            rmphd.i_neg_times,
+            rmshd.flicker_times,
+            rmshd.inuharm_times
+        FROM
+            r_mp_part_harmonic_detail_d rmphd
+            LEFT JOIN r_mp_surplus_harmonic_detail_d rmshd ON rmshd.measurement_point_id = rmphd.measurement_point_id
+            AND rmshd.data_date = rmphd.data_date
+        <where>
+            <if test="param != null and  param.id">
+                AND  rmphd.measurement_point_id = #{param.id}
+            </if>
+            <if test="param!=null and param.startTime != null and param.startTime !=''">
+                AND  rmphd.data_date >= #{param.startTime} AND rmshd.data_date >= #{param.startTime}
+            </if>
+            <if test="param!=null and param.endTime != null and param.endTime != ''">
+                AND  rmphd.data_date &lt;= #{param.endTime}  AND  rmshd.data_date &lt;= #{param.endTime}
+            </if>
+        </where>
+
+    </select>
+
+</mapper>
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RMpPartHarmonicDetailMMapper.xml b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RMpPartHarmonicDetailMMapper.xml
new file mode 100644
index 000000000..dca90b662
--- /dev/null
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RMpPartHarmonicDetailMMapper.xml
@@ -0,0 +1,122 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.njcn.harmonic.mapper.RMpPartHarmonicDetailMMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.njcn.harmonic.pojo.po.RMpPartHarmonicDetailM">
+        <id column="measurement_point_id" property="measurementPointId" />
+        <result column="data_date" property="dataDate" />
+        <result column="measurement_over_day" property="measurementOverDay" />
+        <result column="freq_over_day" property="freqOverDay" />
+        <result column="v_dev_up_over_day" property="vDevUpOverDay" />
+        <result column="v_dev_low_over_day" property="vDevLowOverDay" />
+        <result column="v_dev_over_day" property="vDevOverDay" />
+        <result column="v_thd_over_day" property="vThdOverDay" />
+        <result column="v_over_day" property="vOverDay" />
+        <result column="i_over_day" property="iOverDay" />
+        <result column="v_2_over_day" property="v2OverDay" />
+        <result column="v_3_over_day" property="v3OverDay" />
+        <result column="v_4_over_day" property="v4OverDay" />
+        <result column="v_5_over_day" property="v5OverDay" />
+        <result column="v_6_over_day" property="v6OverDay" />
+        <result column="v_7_over_day" property="v7OverDay" />
+        <result column="v_8_over_day" property="v8OverDay" />
+        <result column="v_9_over_day" property="v9OverDay" />
+        <result column="v_10_over_day" property="v10OverDay" />
+        <result column="v_11_over_day" property="v11OverDay" />
+        <result column="v_12_over_day" property="v12OverDay" />
+        <result column="v_13_over_day" property="v13OverDay" />
+        <result column="v_14_over_day" property="v14OverDay" />
+        <result column="v_15_over_day" property="v15OverDay" />
+        <result column="v_16_over_day" property="v16OverDay" />
+        <result column="v_17_over_day" property="v17OverDay" />
+        <result column="v_18_over_day" property="v18OverDay" />
+        <result column="v_19_over_day" property="v19OverDay" />
+        <result column="v_20_over_day" property="v20OverDay" />
+        <result column="v_21_over_day" property="v21OverDay" />
+        <result column="v_22_over_day" property="v22OverDay" />
+        <result column="v_23_over_day" property="v23OverDay" />
+        <result column="v_24_over_day" property="v24OverDay" />
+        <result column="v_25_over_day" property="v25OverDay" />
+        <result column="v_26_over_day" property="v26OverDay" />
+        <result column="v_27_over_day" property="v27OverDay" />
+        <result column="v_28_over_day" property="v28OverDay" />
+        <result column="v_29_over_day" property="v29OverDay" />
+        <result column="v_30_over_day" property="v30OverDay" />
+        <result column="v_31_over_day" property="v31OverDay" />
+        <result column="v_32_over_day" property="v32OverDay" />
+        <result column="v_33_over_day" property="v33OverDay" />
+        <result column="v_34_over_day" property="v34OverDay" />
+        <result column="v_35_over_day" property="v35OverDay" />
+        <result column="v_36_over_day" property="v36OverDay" />
+        <result column="v_37_over_day" property="v37OverDay" />
+        <result column="v_38_over_day" property="v38OverDay" />
+        <result column="v_39_over_day" property="v39OverDay" />
+        <result column="v_40_over_day" property="v40OverDay" />
+        <result column="v_41_over_day" property="v41OverDay" />
+        <result column="v_42_over_day" property="v42OverDay" />
+        <result column="v_43_over_day" property="v43OverDay" />
+        <result column="v_44_over_day" property="v44OverDay" />
+        <result column="v_45_over_day" property="v45OverDay" />
+        <result column="v_46_over_day" property="v46OverDay" />
+        <result column="v_47_over_day" property="v47OverDay" />
+        <result column="v_48_over_day" property="v48OverDay" />
+        <result column="v_49_over_day" property="v49OverDay" />
+        <result column="v_50_over_day" property="v50OverDay" />
+        <result column="i_2_over_day" property="i2OverDay" />
+        <result column="i_3_over_day" property="i3OverDay" />
+        <result column="i_4_over_day" property="i4OverDay" />
+        <result column="i_5_over_day" property="i5OverDay" />
+        <result column="i_6_over_day" property="i6OverDay" />
+        <result column="i_7_over_day" property="i7OverDay" />
+        <result column="i_8_over_day" property="i8OverDay" />
+        <result column="i_9_over_day" property="i9OverDay" />
+        <result column="i_10_over_day" property="i10OverDay" />
+        <result column="i_11_over_day" property="i11OverDay" />
+        <result column="i_12_over_day" property="i12OverDay" />
+        <result column="i_13_over_day" property="i13OverDay" />
+        <result column="i_14_over_day" property="i14OverDay" />
+        <result column="i_15_over_day" property="i15OverDay" />
+        <result column="i_16_over_day" property="i16OverDay" />
+        <result column="i_17_over_day" property="i17OverDay" />
+        <result column="i_18_over_day" property="i18OverDay" />
+        <result column="i_19_over_day" property="i19OverDay" />
+        <result column="i_20_over_day" property="i20OverDay" />
+        <result column="i_21_over_day" property="i21OverDay" />
+        <result column="i_22_over_day" property="i22OverDay" />
+        <result column="i_23_over_day" property="i23OverDay" />
+        <result column="i_24_over_day" property="i24OverDay" />
+        <result column="i_25_over_day" property="i25OverDay" />
+        <result column="i_26_over_day" property="i26OverDay" />
+        <result column="i_27_over_day" property="i27OverDay" />
+        <result column="i_28_over_day" property="i28OverDay" />
+        <result column="i_29_over_day" property="i29OverDay" />
+        <result column="i_30_over_day" property="i30OverDay" />
+        <result column="i_31_over_day" property="i31OverDay" />
+        <result column="i_32_over_day" property="i32OverDay" />
+        <result column="i_33_over_day" property="i33OverDay" />
+        <result column="i_34_over_day" property="i34OverDay" />
+        <result column="i_35_over_day" property="i35OverDay" />
+        <result column="i_36_over_day" property="i36OverDay" />
+        <result column="i_37_over_day" property="i37OverDay" />
+        <result column="i_38_over_day" property="i38OverDay" />
+        <result column="i_39_over_day" property="i39OverDay" />
+        <result column="i_40_over_day" property="i40OverDay" />
+        <result column="i_41_over_day" property="i41OverDay" />
+        <result column="i_42_over_day" property="i42OverDay" />
+        <result column="i_43_over_day" property="i43OverDay" />
+        <result column="i_44_over_day" property="i44OverDay" />
+        <result column="i_45_over_day" property="i45OverDay" />
+        <result column="i_46_over_day" property="i46OverDay" />
+        <result column="i_47_over_day" property="i47OverDay" />
+        <result column="i_48_over_day" property="i48OverDay" />
+        <result column="i_49_over_day" property="i49OverDay" />
+        <result column="i_50_over_day" property="i50OverDay" />
+        <result column="unbalance_over_day" property="unbalanceOverDay" />
+        <result column="i_neg_over_day" property="iNegOverDay" />
+        <result column="i_neg_over_day" property="iNegOverDay" />
+        <result column="i_neg_over_day" property="iNegOverDay" />
+        <result column="i_neg_over_day" property="iNegOverDay" />
+    </resultMap>
+
+</mapper>
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RMpPassRateMMapper.xml b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RMpPassRateMMapper.xml
new file mode 100644
index 000000000..1f787c4a1
--- /dev/null
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RMpPassRateMMapper.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.njcn.harmonic.mapper.RMpPassRateMMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.njcn.harmonic.pojo.po.RMpPassRateM">
+        <id column="measurement_point_id" property="measurementPointId" />
+        <result column="data_date" property="dataDate" />
+        <result column="freq_pass_rate" property="freqPassRate" />
+        <result column="v_dev_pass_rate" property="vDevPassRate" />
+        <result column="flicker_pass_rate" property="flickerPassRate" />
+    </resultMap>
+    <select id="getMonthPassRate" resultType="com.njcn.harmonic.pojo.vo.RStatOrgIndexVO">
+        SELECT
+            measurement_point_id,
+            data_date,
+            freq_pass_rate,
+            v_dev_pass_rate,
+            flicker_pass_rate
+        FROM
+            r_mp_pass_rate_m
+        <where>
+            <if test="param != null and  param.ids != null and param.ids.size > 0">
+                AND measurement_point_id IN
+                <foreach collection='param.ids' item='item' index="index" open='(' separator=',' close=')'>
+                    #{item}
+                </foreach>
+            </if>
+            <if test="param!=null and param.startTime != null and param.startTime !=''">
+                AND  data_date >= #{param.startTime}
+            </if>
+            <if test="param!=null and param.endTime != null and param.endTime != ''">
+                AND   data_date &lt;= #{param.endTime}
+            </if>
+        </where>
+    </select>
+
+</mapper>
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RMpPassRateQMapper.xml b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RMpPassRateQMapper.xml
new file mode 100644
index 000000000..83f16baaa
--- /dev/null
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RMpPassRateQMapper.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.njcn.harmonic.mapper.RMpPassRateQMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.njcn.harmonic.pojo.po.RMpPassRateQ">
+        <id column="measurement_point_id" property="measurementPointId" />
+        <result column="data_date" property="dataDate" />
+        <result column="freq_pass_rate" property="freqPassRate" />
+        <result column="v_dev_pass_rate" property="vDevPassRate" />
+        <result column="flicker_pass_rate" property="flickerPassRate" />
+    </resultMap>
+    <select id="getQuarterPassRate" resultType="com.njcn.harmonic.pojo.vo.RStatOrgIndexVO">
+        SELECT
+            measurement_point_id,
+            data_date,
+            freq_pass_rate,
+            v_dev_pass_rate,
+            flicker_pass_rate
+        FROM
+            r_mp_pass_rate_q
+        <where>
+            <if test="param != null and  param.ids != null and param.ids.size > 0">
+                AND measurement_point_id IN
+                <foreach collection='param.ids' item='item' index="index" open='(' separator=',' close=')'>
+                    #{item}
+                </foreach>
+            </if>
+            <if test="param!=null and param.startTime != null and param.startTime !=''">
+                AND  data_date >= #{param.startTime}
+            </if>
+            <if test="param!=null and param.endTime != null and param.endTime != ''">
+                AND   data_date &lt;= #{param.endTime}
+            </if>
+        </where>
+    </select>
+
+</mapper>
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RMpPassRateYMapper.xml b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RMpPassRateYMapper.xml
new file mode 100644
index 000000000..4a088189f
--- /dev/null
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RMpPassRateYMapper.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.njcn.harmonic.mapper.RMpPassRateYMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.njcn.harmonic.pojo.po.RMpPassRateY">
+        <id column="measurement_point_id" property="measurementPointId" />
+        <result column="data_date" property="dataDate" />
+        <result column="freq_pass_rate" property="freqPassRate" />
+        <result column="v_dev_pass_rate" property="vDevPassRate" />
+        <result column="flicker_pass_rate" property="flickerPassRate" />
+    </resultMap>
+    <select id="getYearPassRate" resultType="com.njcn.harmonic.pojo.vo.RStatOrgIndexVO">
+        SELECT
+            measurement_point_id,
+            data_date,
+            freq_pass_rate,
+            v_dev_pass_rate,
+            flicker_pass_rate
+        FROM
+            r_mp_pass_rate_y
+        <where>
+            <if test="param != null and  param.ids != null and param.ids.size > 0">
+                AND measurement_point_id IN
+                <foreach collection='param.ids' item='item' index="index" open='(' separator=',' close=')'>
+                    #{item}
+                </foreach>
+            </if>
+            <if test="param!=null and param.startTime != null and param.startTime !=''">
+                AND  data_date >= #{param.startTime}
+            </if>
+            <if test="param!=null and param.endTime != null and param.endTime != ''">
+                AND   data_date &lt;= #{param.endTime}
+            </if>
+        </where>
+    </select>
+
+</mapper>
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RMpSurplusHarmonicDetailDMapper.xml b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RMpSurplusHarmonicDetailDMapper.xml
new file mode 100644
index 000000000..68830faff
--- /dev/null
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RMpSurplusHarmonicDetailDMapper.xml
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.njcn.harmonic.mapper.RMpSurplusHarmonicDetailDMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.njcn.harmonic.pojo.po.RMpSurplusHarmonicDetailD">
+        <id column="measurement_point_id" property="measurementPointId" />
+        <result column="data_date" property="dataDate" />
+        <result column="flicker_times" property="flickerTimes" />
+        <result column="is_flicker" property="isFlicker" />
+        <result column="inuharm_times" property="inuharmTimes" />
+        <result column="is_inuharm" property="isInuharm" />
+        <result column="is_inuharm_1" property="isInuharm1" />
+        <result column="is_inuharm_2" property="isInuharm2" />
+        <result column="is_inuharm_3" property="isInuharm3" />
+        <result column="is_inuharm_4" property="isInuharm4" />
+        <result column="is_inuharm_5" property="isInuharm5" />
+        <result column="is_inuharm_6" property="isInuharm6" />
+        <result column="is_inuharm_7" property="isInuharm7" />
+        <result column="is_inuharm_8" property="isInuharm8" />
+        <result column="is_inuharm_9" property="isInuharm9" />
+        <result column="is_inuharm_10" property="isInuharm10" />
+        <result column="is_inuharm_11" property="isInuharm11" />
+        <result column="is_inuharm_12" property="isInuharm12" />
+        <result column="is_inuharm_13" property="isInuharm13" />
+        <result column="is_inuharm_14" property="isInuharm14" />
+        <result column="is_inuharm_15" property="isInuharm15" />
+        <result column="is_inuharm_16" property="isInuharm16" />
+        <result column="is_inuharm_17" property="isInuharm17" />
+        <result column="is_inuharm_18" property="isInuharm18" />
+        <result column="is_inuharm_19" property="isInuharm19" />
+        <result column="is_inuharm_20" property="isInuharm20" />
+        <result column="is_inuharm_21" property="isInuharm21" />
+        <result column="is_inuharm_22" property="isInuharm22" />
+        <result column="is_inuharm_23" property="isInuharm23" />
+        <result column="is_inuharm_24" property="isInuharm24" />
+        <result column="is_inuharm_25" property="isInuharm25" />
+        <result column="is_inuharm_26" property="isInuharm26" />
+        <result column="is_inuharm_27" property="isInuharm27" />
+        <result column="is_inuharm_28" property="isInuharm28" />
+        <result column="is_inuharm_29" property="isInuharm29" />
+        <result column="is_inuharm_30" property="isInuharm30" />
+        <result column="is_inuharm_31" property="isInuharm31" />
+        <result column="is_inuharm_32" property="isInuharm32" />
+        <result column="is_inuharm_33" property="isInuharm33" />
+        <result column="is_inuharm_34" property="isInuharm34" />
+        <result column="is_inuharm_35" property="isInuharm35" />
+        <result column="is_inuharm_36" property="isInuharm36" />
+        <result column="is_inuharm_37" property="isInuharm37" />
+        <result column="is_inuharm_38" property="isInuharm38" />
+        <result column="is_inuharm_39" property="isInuharm39" />
+        <result column="is_inuharm_40" property="isInuharm40" />
+        <result column="is_inuharm_41" property="isInuharm41" />
+        <result column="is_inuharm_42" property="isInuharm42" />
+        <result column="is_inuharm_43" property="isInuharm43" />
+        <result column="is_inuharm_44" property="isInuharm44" />
+        <result column="is_inuharm_45" property="isInuharm45" />
+        <result column="is_inuharm_46" property="isInuharm46" />
+        <result column="is_inuharm_47" property="isInuharm47" />
+        <result column="is_inuharm_48" property="isInuharm48" />
+        <result column="is_inuharm_49" property="isInuharm49" />
+        <result column="is_inuharm_50" property="isInuharm50" />
+    </resultMap>
+
+</mapper>
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RMpSurplusHarmonicDetailMMapper.xml b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RMpSurplusHarmonicDetailMMapper.xml
new file mode 100644
index 000000000..867ddf4b6
--- /dev/null
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RMpSurplusHarmonicDetailMMapper.xml
@@ -0,0 +1,170 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.njcn.harmonic.mapper.RMpSurplusHarmonicDetailMMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.njcn.harmonic.pojo.po.RMpSurplusHarmonicDetailM">
+        <id column="measurement_point_id" property="measurementPointId" />
+        <result column="data_date" property="dataDate" />
+        <result column="inuharm_over_day" property="inuharmOverDay" />
+        <result column="inuharm_1_over_day" property="inuharm1OverDay" />
+        <result column="inuharm_2_over_day" property="inuharm2OverDay" />
+        <result column="inuharm_3_over_day" property="inuharm3OverDay" />
+        <result column="inuharm_4_over_day" property="inuharm4OverDay" />
+        <result column="inuharm_5_over_day" property="inuharm5OverDay" />
+        <result column="inuharm_6_over_day" property="inuharm6OverDay" />
+        <result column="inuharm_7_over_day" property="inuharm7OverDay" />
+        <result column="inuharm_8_over_day" property="inuharm8OverDay" />
+        <result column="inuharm_9_over_day" property="inuharm9OverDay" />
+        <result column="inuharm_10_over_day" property="inuharm10OverDay" />
+        <result column="inuharm_11_over_day" property="inuharm11OverDay" />
+        <result column="inuharm_12_over_day" property="inuharm12OverDay" />
+        <result column="inuharm_13_over_day" property="inuharm13OverDay" />
+        <result column="inuharm_14_over_day" property="inuharm14OverDay" />
+        <result column="inuharm_15_over_day" property="inuharm15OverDay" />
+        <result column="inuharm_16_over_day" property="inuharm16OverDay" />
+        <result column="inuharm_17_over_day" property="inuharm17OverDay" />
+        <result column="inuharm_18_over_day" property="inuharm18OverDay" />
+        <result column="inuharm_19_over_day" property="inuharm19OverDay" />
+        <result column="inuharm_20_over_day" property="inuharm20OverDay" />
+        <result column="inuharm_21_over_day" property="inuharm21OverDay" />
+        <result column="inuharm_22_over_day" property="inuharm22OverDay" />
+        <result column="inuharm_23_over_day" property="inuharm23OverDay" />
+        <result column="inuharm_24_over_day" property="inuharm24OverDay" />
+        <result column="inuharm_25_over_day" property="inuharm25OverDay" />
+        <result column="inuharm_26_over_day" property="inuharm26OverDay" />
+        <result column="inuharm_27_over_day" property="inuharm27OverDay" />
+        <result column="inuharm_28_over_day" property="inuharm28OverDay" />
+        <result column="inuharm_29_over_day" property="inuharm29OverDay" />
+        <result column="inuharm_30_over_day" property="inuharm30OverDay" />
+        <result column="inuharm_31_over_day" property="inuharm31OverDay" />
+        <result column="inuharm_32_over_day" property="inuharm32OverDay" />
+        <result column="inuharm_33_over_day" property="inuharm33OverDay" />
+        <result column="inuharm_34_over_day" property="inuharm34OverDay" />
+        <result column="inuharm_35_over_day" property="inuharm35OverDay" />
+        <result column="inuharm_36_over_day" property="inuharm36OverDay" />
+        <result column="inuharm_37_over_day" property="inuharm37OverDay" />
+        <result column="inuharm_38_over_day" property="inuharm38OverDay" />
+        <result column="inuharm_39_over_day" property="inuharm39OverDay" />
+        <result column="inuharm_40_over_day" property="inuharm40OverDay" />
+        <result column="inuharm_41_over_day" property="inuharm41OverDay" />
+        <result column="inuharm_42_over_day" property="inuharm42OverDay" />
+        <result column="inuharm_43_over_day" property="inuharm43OverDay" />
+        <result column="inuharm_44_over_day" property="inuharm44OverDay" />
+        <result column="inuharm_45_over_day" property="inuharm45OverDay" />
+        <result column="inuharm_46_over_day" property="inuharm46OverDay" />
+        <result column="inuharm_47_over_day" property="inuharm47OverDay" />
+        <result column="inuharm_48_over_day" property="inuharm48OverDay" />
+        <result column="inuharm_49_over_day" property="inuharm49OverDay" />
+        <result column="inuharm_50_over_day" property="inuharm50OverDay" />
+        <result column="flicker_over_day" property="flickerOverDay" />
+    </resultMap>
+    <select id="getRMpPartHarmonicDetail" resultType="com.njcn.harmonic.pojo.vo.RMpPartHarmonicDetailVO">
+        select
+            rms.measurement_point_id,
+            rmphdm.data_date,
+            rms.inuharm_over_day,
+            rms.inuharm_1_over_day,
+            rms.inuharm_2_over_day,
+            rms.inuharm_3_over_day,
+            rms.inuharm_4_over_day,
+            rms.inuharm_5_over_day,
+            rms.inuharm_6_over_day,
+            rms.inuharm_7_over_day,
+            rms.inuharm_8_over_day,
+            rms.inuharm_9_over_day,
+            rms.inuharm_10_over_day,
+            rms.inuharm_11_over_day,
+            rms.inuharm_12_over_day,
+            rms.inuharm_13_over_day,
+            rms.inuharm_14_over_day,
+            rms.inuharm_15_over_day,
+            rms.inuharm_16_over_day,
+            rms.inuharm_17_over_day,
+            rms.inuharm_18_over_day,
+            rms.inuharm_19_over_day,
+            rms.inuharm_20_over_day,
+            rms.inuharm_21_over_day,
+            rms.inuharm_22_over_day,
+            rms.inuharm_23_over_day,
+            rms.inuharm_24_over_day,
+            rms.flicker_over_day,
+            rmphdm.measurement_point_id,
+            rmphdm.measurement_over_day,
+            rmphdm.freq_over_day,
+            rmphdm.v_dev_up_over_day,
+            rmphdm.v_dev_low_over_day,
+            rmphdm.v_dev_over_day,
+            rmphdm.v_thd_over_day,
+            rmphdm.v_over_day,
+            rmphdm.i_over_day,
+            rmphdm.v_2_over_day,
+            rmphdm.v_3_over_day,
+            rmphdm.v_4_over_day,
+            rmphdm.v_5_over_day,
+            rmphdm.v_6_over_day,
+            rmphdm.v_7_over_day,
+            rmphdm.v_8_over_day,
+            rmphdm.v_9_over_day,
+            rmphdm.v_10_over_day,
+            rmphdm.v_11_over_day,
+            rmphdm.v_12_over_day,
+            rmphdm.v_13_over_day,
+            rmphdm.v_14_over_day,
+            rmphdm.v_15_over_day,
+            rmphdm.v_16_over_day,
+            rmphdm.v_17_over_day,
+            rmphdm.v_18_over_day,
+            rmphdm.v_19_over_day,
+            rmphdm.v_20_over_day,
+            rmphdm.v_21_over_day,
+            rmphdm.v_22_over_day,
+            rmphdm.v_23_over_day,
+            rmphdm.v_24_over_day,
+            rmphdm.v_25_over_day,
+            rmphdm.i_2_over_day,
+            rmphdm.i_3_over_day,
+            rmphdm.i_4_over_day,
+            rmphdm.i_5_over_day,
+            rmphdm.i_6_over_day,
+            rmphdm.i_7_over_day,
+            rmphdm.i_8_over_day,
+            rmphdm.i_9_over_day,
+            rmphdm.i_10_over_day,
+            rmphdm.i_11_over_day,
+            rmphdm.i_12_over_day,
+            rmphdm.i_13_over_day,
+            rmphdm.i_14_over_day,
+            rmphdm.i_15_over_day,
+            rmphdm.i_16_over_day,
+            rmphdm.i_17_over_day,
+            rmphdm.i_18_over_day,
+            rmphdm.i_19_over_day,
+            rmphdm.i_20_over_day,
+            rmphdm.i_21_over_day,
+            rmphdm.i_22_over_day,
+            rmphdm.i_23_over_day,
+            rmphdm.i_24_over_day,
+            rmphdm.i_25_over_day,
+            rmphdm.unbalance_over_day,
+            rmphdm.i_neg_over_day
+        from r_mp_surplus_harmonic_detail_m rms
+        right join r_mp_part_harmonic_detail_m rmphdm on rms.measurement_point_id = rmphdm.measurement_point_id
+        and rms.data_date=rmphdm.data_date
+        <where>
+            <if test="param != null and  param.ids != null and param.ids.size > 0">
+                AND rmphdm.measurement_point_id IN
+                <foreach collection='param.ids' item='item' index="index" open='(' separator=',' close=')'>
+                    #{item}
+                </foreach>
+            </if>
+            <if test="param!=null and param.startTime != null and param.startTime !=''">
+                AND  rmphdm.data_date >= #{param.startTime} AND rms.data_date >= #{param.startTime}
+            </if>
+            <if test="param!=null and param.endTime != null and param.endTime != ''">
+                AND   rmphdm.data_date &lt;= #{param.endTime}  AND  rms.data_date &lt;= #{param.endTime}
+            </if>
+        </where>
+    </select>
+
+</mapper>
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RStatHarmonicDMapper.xml b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RStatHarmonicDMapper.xml
new file mode 100644
index 000000000..a06087370
--- /dev/null
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RStatHarmonicDMapper.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.njcn.harmonic.mapper.RStatHarmonicDMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.njcn.harmonic.pojo.po.RStatHarmonicD">
+        <id column="org_no" property="orgNo" />
+        <result column="data_date" property="dataDate" />
+        <result column="measurement_type_class" property="measurementTypeClass" />
+        <result column="harmonic_type" property="harmonicType" />
+        <result column="over_limit_measurement" property="overLimitMeasurement" />
+        <result column="over_limit_measurement_ratio" property="overLimitMeasurementRatio" />
+        <result column="data_type" property="dataType" />
+    </resultMap>
+
+</mapper>
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RStatHarmonicMMapper.xml b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RStatHarmonicMMapper.xml
new file mode 100644
index 000000000..8a82b2adf
--- /dev/null
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RStatHarmonicMMapper.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.njcn.harmonic.mapper.RStatHarmonicMMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.njcn.harmonic.pojo.po.RStatHarmonicM">
+        <id column="org_no" property="orgNo" />
+        <result column="data_date" property="dataDate" />
+        <result column="measurement_type_class" property="measurementTypeClass" />
+        <result column="harmonic_type" property="harmonicType" />
+        <result column="over_limit_measurement_average" property="overLimitMeasurementAverage" />
+        <result column="over_limit_measurement_accrued" property="overLimitMeasurementAccrued" />
+        <result column="over_day" property="overDay" />
+        <result column="over_limit_measurement_ratio_average" property="overLimitMeasurementRatioAverage" />
+        <result column="over_limit_measurement_ratio_accrued" property="overLimitMeasurementRatioAccrued" />
+        <result column="data_type" property="dataType" />
+    </resultMap>
+
+</mapper>
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RStatHarmonicQMapper.xml b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RStatHarmonicQMapper.xml
new file mode 100644
index 000000000..2c8892e91
--- /dev/null
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RStatHarmonicQMapper.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.njcn.harmonic.mapper.RStatHarmonicQMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.njcn.harmonic.pojo.po.RStatHarmonicQ">
+        <id column="org_no" property="orgNo" />
+        <result column="data_date" property="dataDate" />
+        <result column="measurement_type_class" property="measurementTypeClass" />
+        <result column="harmonic_type" property="harmonicType" />
+        <result column="over_limit_measurement_average" property="overLimitMeasurementAverage" />
+        <result column="over_limit_measurement_accrued" property="overLimitMeasurementAccrued" />
+        <result column="average_over_day" property="averageOverDay" />
+        <result column="over_limit_measurement_ratio_average" property="overLimitMeasurementRatioAverage" />
+        <result column="over_limit_measurement_ratio_accrued" property="overLimitMeasurementRatioAccrued" />
+        <result column="data_type" property="dataType" />
+    </resultMap>
+
+</mapper>
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RStatHarmonicVoltageDMapper.xml b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RStatHarmonicVoltageDMapper.xml
new file mode 100644
index 000000000..e4a264b2b
--- /dev/null
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RStatHarmonicVoltageDMapper.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.njcn.harmonic.mapper.RStatHarmonicVoltageDMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.njcn.harmonic.pojo.po.RStatHarmonicVoltageD">
+        <id column="org_no" property="orgNo" />
+        <result column="data_date" property="dataDate" />
+        <result column="measurement_type_class" property="measurementTypeClass" />
+        <result column="harmonic_type" property="harmonicType" />
+        <result column="voltage_type" property="voltageType" />
+        <result column="over_limit_measurement_average" property="overLimitMeasurementAverage" />
+        <result column="over_limit_measurement_ratio_average" property="overLimitMeasurementRatioAverage" />
+        <result column="data_type" property="dataType" />
+    </resultMap>
+
+</mapper>
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RStatHarmonicVoltageMMapper.xml b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RStatHarmonicVoltageMMapper.xml
new file mode 100644
index 000000000..489f0a6da
--- /dev/null
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RStatHarmonicVoltageMMapper.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.njcn.harmonic.mapper.RStatHarmonicVoltageMMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.njcn.harmonic.pojo.po.RStatHarmonicVoltageM">
+        <id column="org_no" property="orgNo" />
+        <result column="data_date" property="dataDate" />
+        <result column="measurement_type_class" property="measurementTypeClass" />
+        <result column="harmonic_type" property="harmonicType" />
+        <result column="voltage_type" property="voltageType" />
+        <result column="over_limit_measurement_average" property="overLimitMeasurementAverage" />
+        <result column="over_limit_measurement_accrued" property="overLimitMeasurementAccrued" />
+        <result column="over_day" property="overDay" />
+        <result column="over_limit_measurement_ratio_average" property="overLimitMeasurementRatioAverage" />
+        <result column="over_limit_measurement_ratio_accrued" property="overLimitMeasurementRatioAccrued" />
+        <result column="data_type" property="dataType" />
+    </resultMap>
+
+</mapper>
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RStatHarmonicYMapper.xml b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RStatHarmonicYMapper.xml
new file mode 100644
index 000000000..84ff5edb0
--- /dev/null
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RStatHarmonicYMapper.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.njcn.harmonic.mapper.RStatHarmonicYMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.njcn.harmonic.pojo.po.RStatHarmonicY">
+        <id column="org_no" property="orgNo" />
+        <result column="data_date" property="dataDate" />
+        <result column="measurement_type_class" property="measurementTypeClass" />
+        <result column="harmonic_type" property="harmonicType" />
+        <result column="over_limit_measurement_average" property="overLimitMeasurementAverage" />
+        <result column="over_limit_measurement_accrued" property="overLimitMeasurementAccrued" />
+        <result column="average_over_day" property="averageOverDay" />
+        <result column="over_limit_measurement_ratio_average" property="overLimitMeasurementRatioAverage" />
+        <result column="over_limit_measurement_ratio_accrued" property="overLimitMeasurementRatioAccrued" />
+        <result column="data_type" property="dataType" />
+    </resultMap>
+
+</mapper>
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RStatLoadTypeMMapper.xml b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RStatLoadTypeMMapper.xml
new file mode 100644
index 000000000..e16d27e83
--- /dev/null
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RStatLoadTypeMMapper.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.njcn.harmonic.mapper.RStatLoadTypeMMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.njcn.harmonic.pojo.po.RStatLoadTypeM">
+        <id column="org_no" property="orgNo" />
+        <result column="data_date" property="dataDate" />
+        <result column="load_type" property="loadType" />
+        <result column="effective_measurement" property="effectiveMeasurement" />
+        <result column="v_average" property="vAverage" />
+        <result column="v_count" property="vCount" />
+        <result column="i_average" property="iAverage" />
+        <result column="i_count" property="iCount" />
+        <result column="unbalance_average" property="unbalanceAverage" />
+        <result column="unbalance_count" property="unbalanceCount" />
+        <result column="i_neg_average" property="iNegAverage" />
+        <result column="i_neg_count" property="iNegCount" />
+        <result column="flicker_average" property="flickerAverage" />
+        <result column="flicker_count" property="flickerCount" />
+    </resultMap>
+    <select id="getMonthStatLoadType" resultType="com.njcn.harmonic.pojo.vo.RStatLoadTypeVO">
+        select
+            org_no,
+            load_type,
+            v_average,
+            v_count/effective_measurement as vAccrued,
+            i_average,
+            i_count/effective_measurement as iAccrued,
+            unbalance_average,
+            unbalance_count/effective_measurement as unbalanceAccrued,
+            i_neg_average,
+            i_neg_count/effective_measurement as iNegAccrued,
+            flicker_average,
+            flicker_count/effective_measurement as flickerAccrued
+        from
+            r_stat_load_type_m
+        <where>
+            <if test="param != null and  param.ids != null and param.ids.size > 0">
+                AND org_no IN
+                <foreach collection='param.ids' item='item' index="index" open='(' separator=',' close=')'>
+                    #{item}
+                </foreach>
+            </if>
+            <if test="param!=null and param.startTime != null and param.startTime !=''">
+                AND  data_date >= #{param.startTime}
+            </if>
+            <if test="param!=null and param.endTime != null and param.endTime != ''">
+                AND   data_date &lt;= #{param.endTime}
+            </if>
+        </where>
+    </select>
+
+</mapper>
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RStatLoadTypeQMapper.xml b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RStatLoadTypeQMapper.xml
new file mode 100644
index 000000000..01c1743bb
--- /dev/null
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RStatLoadTypeQMapper.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.njcn.harmonic.mapper.RStatLoadTypeQMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.njcn.harmonic.pojo.po.RStatLoadTypeQ">
+        <id column="org_no" property="orgNo" />
+        <result column="data_date" property="dataDate" />
+        <result column="load_type" property="loadType" />
+        <result column="effective_measurement" property="effectiveMeasurement" />
+        <result column="v_average" property="vAverage" />
+        <result column="v_count" property="vCount" />
+        <result column="i_average" property="iAverage" />
+        <result column="i_count" property="iCount" />
+        <result column="unbalance_average" property="unbalanceAverage" />
+        <result column="unbalance_count" property="unbalanceCount" />
+        <result column="i_neg_average" property="iNegAverage" />
+        <result column="i_neg_count" property="iNegCount" />
+        <result column="flicker_average" property="flickerAverage" />
+        <result column="flicker_count" property="flickerCount" />
+    </resultMap>
+    <select id="getQuarterStatLoadType" resultType="com.njcn.harmonic.pojo.vo.RStatLoadTypeVO">
+        select
+            org_no,
+            load_type,
+            v_average,
+            v_count/effective_measurement as vAccrued,
+            i_average,
+            i_count/effective_measurement as iAccrued,
+            unbalance_average,
+            unbalance_count/effective_measurement as unbalanceAccrued,
+            i_neg_average,
+            i_neg_count/effective_measurement as iNegAccrued,
+            flicker_average,
+            flicker_count/effective_measurement as flickerAccrued
+        from
+            r_stat_load_type_q
+        <where>
+            <if test="param != null and  param.ids != null and param.ids.size > 0">
+                AND org_no IN
+                <foreach collection='param.ids' item='item' index="index" open='(' separator=',' close=')'>
+                    #{item}
+                </foreach>
+            </if>
+            <if test="param!=null and param.startTime != null and param.startTime !=''">
+                AND  data_date >= #{param.startTime}
+            </if>
+            <if test="param!=null and param.endTime != null and param.endTime != ''">
+                AND   data_date &lt;= #{param.endTime}
+            </if>
+        </where>
+    </select>
+
+</mapper>
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RStatLoadTypeYMapper.xml b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RStatLoadTypeYMapper.xml
new file mode 100644
index 000000000..1ae5791d0
--- /dev/null
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RStatLoadTypeYMapper.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.njcn.harmonic.mapper.RStatLoadTypeYMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.njcn.harmonic.pojo.po.RStatLoadTypeY">
+        <id column="org_no" property="orgNo" />
+        <result column="data_date" property="dataDate" />
+        <result column="load_type" property="loadType" />
+        <result column="effective_measurement" property="effectiveMeasurement" />
+        <result column="v_average" property="vAverage" />
+        <result column="v_count" property="vCount" />
+        <result column="i_average" property="iAverage" />
+        <result column="i_count" property="iCount" />
+        <result column="unbalance_average" property="unbalanceAverage" />
+        <result column="unbalance_count" property="unbalanceCount" />
+        <result column="i_neg_average" property="iNegAverage" />
+        <result column="i_neg_count" property="iNegCount" />
+        <result column="flicker_average" property="flickerAverage" />
+        <result column="flicker_count" property="flickerCount" />
+    </resultMap>
+    <select id="getYearStatLoadType" resultType="com.njcn.harmonic.pojo.vo.RStatLoadTypeVO">
+        select
+            org_no,
+            load_type,
+            v_average,
+            v_count/effective_measurement as vAccrued,
+            i_average,
+            i_count/effective_measurement as iAccrued,
+            unbalance_average,
+            unbalance_count/effective_measurement as unbalanceAccrued,
+            i_neg_average,
+            i_neg_count/effective_measurement as iNegAccrued,
+            flicker_average,
+            flicker_count/effective_measurement as flickerAccrued
+        from
+            r_stat_load_type_y
+        <where>
+            <if test="param != null and  param.ids != null and param.ids.size > 0">
+                AND org_no IN
+                <foreach collection='param.ids' item='item' index="index" open='(' separator=',' close=')'>
+                    #{item}
+                </foreach>
+            </if>
+            <if test="param!=null and param.startTime != null and param.startTime !=''">
+                AND  data_date >= #{param.startTime}
+            </if>
+            <if test="param!=null and param.endTime != null and param.endTime != ''">
+                AND   data_date &lt;= #{param.endTime}
+            </if>
+        </where>
+    </select>
+
+</mapper>
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RStatOrgBusbarVoltageMMapper.xml b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RStatOrgBusbarVoltageMMapper.xml
new file mode 100644
index 000000000..3ba556921
--- /dev/null
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RStatOrgBusbarVoltageMMapper.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.njcn.harmonic.mapper.RStatOrgBusbarVoltageMMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.njcn.harmonic.pojo.po.RStatOrgBusbarVoltageM">
+        <id column="org_no" property="orgNo" />
+        <result column="data_date" property="dataDate" />
+        <result column="busbar_id" property="busbarId" />
+        <result column="measurement_count" property="measurementCount" />
+        <result column="v_average" property="vAverage" />
+        <result column="v_accrued" property="vAccrued" />
+        <result column="unbalance_average" property="unbalanceAverage" />
+        <result column="unbalance_accrued" property="unbalanceAccrued" />
+        <result column="flicker_average" property="flickerAverage" />
+        <result column="flicker_accrued" property="flickerAccrued" />
+    </resultMap>
+
+</mapper>
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RStatOrgBusbarVoltageQMapper.xml b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RStatOrgBusbarVoltageQMapper.xml
new file mode 100644
index 000000000..55c0f0e5a
--- /dev/null
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RStatOrgBusbarVoltageQMapper.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.njcn.harmonic.mapper.RStatOrgBusbarVoltageQMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.njcn.harmonic.pojo.po.RStatOrgBusbarVoltageQ">
+        <id column="org_no" property="orgNo" />
+        <result column="data_date" property="dataDate" />
+        <result column="busbar_id" property="busbarId" />
+        <result column="measurement_count" property="measurementCount" />
+        <result column="v_average" property="vAverage" />
+        <result column="v_accrued" property="vAccrued" />
+        <result column="unbalance_average" property="unbalanceAverage" />
+        <result column="unbalance_accrued" property="unbalanceAccrued" />
+        <result column="flicker_average" property="flickerAverage" />
+        <result column="flicker_accrued" property="flickerAccrued" />
+    </resultMap>
+
+</mapper>
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RStatOrgBusbarVoltageYMapper.xml b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RStatOrgBusbarVoltageYMapper.xml
new file mode 100644
index 000000000..c905a571a
--- /dev/null
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RStatOrgBusbarVoltageYMapper.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.njcn.harmonic.mapper.RStatOrgBusbarVoltageYMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.njcn.harmonic.pojo.po.RStatOrgBusbarVoltageY">
+        <id column="org_no" property="orgNo" />
+        <result column="data_date" property="dataDate" />
+        <result column="busbar_id" property="busbarId" />
+        <result column="measurement_count" property="measurementCount" />
+        <result column="v_average" property="vAverage" />
+        <result column="v_accrued" property="vAccrued" />
+        <result column="unbalance_average" property="unbalanceAverage" />
+        <result column="unbalance_accrued" property="unbalanceAccrued" />
+        <result column="flicker_average" property="flickerAverage" />
+        <result column="flicker_accrued" property="flickerAccrued" />
+    </resultMap>
+
+</mapper>
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RStatOrgMMapper.xml b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RStatOrgMMapper.xml
new file mode 100644
index 000000000..c7b0aa3c8
--- /dev/null
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RStatOrgMMapper.xml
@@ -0,0 +1,164 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.njcn.harmonic.mapper.RStatOrgMMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.njcn.harmonic.pojo.po.RStatOrgM">
+        <id column="org_no" property="orgNo" />
+        <result column="data_date" property="dataDate" />
+        <result column="measurement_type_class" property="measurementTypeClass" />
+        <result column="all_count" property="allCount" />
+        <result column="effective_measurement_average" property="effectiveMeasurementAverage" />
+        <result column="effective_measurement_accrued" property="effectiveMeasurementAccrued" />
+        <result column="harmonic_measurement_average" property="harmonicMeasurementAverage" />
+        <result column="harmonic_measurement_accrued" property="harmonicMeasurementAccrued" />
+        <result column="harmonic_measurement_ratio_average" property="harmonicMeasurementRatioAverage" />
+        <result column="over_day_accrued" property="overDayAccrued" />
+        <result column="freq_pass_rate" property="freqPassRate" />
+        <result column="v_dev_pass_rate" property="vDevPassRate" />
+        <result column="flicker_pass_rate" property="flickerPassRate" />
+        <result column="event_measurement_average" property="eventMeasurementAverage" />
+        <result column="event_measurement_accrued" property="eventMeasurementAccrued" />
+        <result column="event_measurement_ratio_average" property="eventMeasurementRatioAverage" />
+        <result column="event_freq" property="eventFreq" />
+        <result column="event_count" property="eventCount" />
+        <result column="should_count" property="shouldCount" />
+        <result column="warn_count" property="warnCount" />
+        <result column="data_type" property="dataType" />
+    </resultMap>
+    <select id="getMonthRStatHarmonicOrgInfo" resultType="com.njcn.harmonic.pojo.vo.RStatSubstationOrgVO">
+        SELECT
+           	rso.org_no AS orgNo,
+            rso.data_date AS dataDate,
+            rso.effective_measurement_average AS effectiveMeasurementAverage,
+            rso.effective_measurement_accrued AS effectiveMeasurementAccrued,
+            rso.harmonic_measurement_average AS harmonicMeasurementAverage,
+            rso.harmonic_measurement_accrued AS harmonicMeasurementAccrued,
+            rso.harmonic_measurement_ratio_average as harmonicMeasurementRatioAverage,
+            TRUNCATE(rso.event_measurement_accrued/rso.effective_measurement_accrued ,2)as harmonicMeasurementRatioAccrued,
+            c.harmonic_type,
+            c.over_limit_measurement_average,
+            c.over_limit_measurement_accrued,
+            c.over_limit_measurement_ratio_average,
+            c.over_limit_measurement_ratio_accrued,
+        (
+                SELECT
+                    over_limit_measurement_average
+                FROM
+                    r_stat_harmonic_org_m a
+                WHERE
+                    a.org_no=c.org_no and
+                    a.harmonic_type=c.harmonic_type
+                <if test="param!=null and param.startTime != null and param.startTime !=''">
+                    AND (data_date >= date(
+                        DATE_ADD( #{param.startTime}, INTERVAL - 1 YEAR )))
+                </if>
+                <if test="param!=null and param.endTime != null and param.endTime !=''">
+                    AND (data_date &lt;= date(
+                    DATE_ADD( #{param.endTime}, INTERVAL - 1 YEAR )))
+                </if>
+
+        ) chainAverage ,
+        (
+                SELECT
+                    over_limit_measurement_accrued
+                FROM
+                    r_stat_harmonic_org_m a
+                WHERE
+                    a.org_no=c.org_no and
+                    a.harmonic_type=c.harmonic_type
+                    <if test="param!=null and param.startTime != null and param.startTime !=''">
+                        AND (data_date >= date(
+                        DATE_ADD( #{param.startTime}, INTERVAL - 1 YEAR )))
+                    </if>
+                    <if test="param!=null and param.endTime != null and param.endTime !=''">
+                        AND (data_date &lt;= date(
+                        DATE_ADD( #{param.endTime}, INTERVAL - 1 YEAR )))
+                    </if>
+        ) chainAccrued ,
+        (
+                SELECT
+                    over_limit_measurement_accrued
+                FROM
+                    r_stat_harmonic_org_m a
+                WHERE
+                    a.org_no=c.org_no and
+                    a.harmonic_type=c.harmonic_type
+                    <if test="param!=null and param.startTime != null and param.startTime !=''">
+                        AND (data_date >= date(
+                        DATE_ADD( #{param.startTime}, INTERVAL - 1 MONTH )))
+                    </if>
+                    <if test="param!=null and param.endTime != null and param.endTime !=''">
+                        AND (data_date &lt;= date(
+                        DATE_ADD( #{param.endTime}, INTERVAL - 1 MONTH )))
+                    </if>
+        ) sameAverage,
+        (
+                SELECT
+                    over_limit_measurement_accrued
+                FROM
+                    r_stat_harmonic_org_m a
+                WHERE
+                    a.org_no=c.org_no and
+                    a.harmonic_type=c.harmonic_type
+                    <if test="param!=null and param.startTime != null and param.startTime !=''">
+                        AND (data_date >= date(
+                        DATE_ADD( #{param.startTime}, INTERVAL - 1 MONTH )))
+                    </if>
+                    <if test="param!=null and param.endTime != null and param.endTime !=''">
+                        AND (data_date &lt;= date(
+                        DATE_ADD( #{param.endTime}, INTERVAL - 1 MONTH )))
+                    </if>
+
+        ) sameAccrued ,
+        TRUNCATE( c.over_day / c.over_limit_measurement_accrued, 2)as averageOverDay
+        FROM
+        r_stat_harmonic_org_m c
+        RIGHT JOIN r_stat_org_m AS rso ON rso.org_no = c.org_no
+        <where>
+            c.data_Type=#{dataType} and rso.data_Type=#{dataType}
+            <if test="param != null and  param.ids != null and param.ids.size > 0">
+                AND rso.org_no IN
+                <foreach collection='param.ids' item='item' index="index" open='(' separator=',' close=')'>
+                    #{item}
+                </foreach>
+            </if>
+            <if test="param!=null and param.startTime != null and param.startTime !=''">
+                AND  rso.data_date >= #{param.startTime} AND c.data_date >= #{param.startTime}
+            </if>
+            <if test="param!=null and param.endTime != null and param.endTime != ''">
+                AND   rso.data_date &lt;= #{param.endTime}  AND c.data_date &lt;= #{param.endTime}
+            </if>
+        </where>
+    </select>
+    <select id="getMonthRStatOrgIndex" resultType="com.njcn.harmonic.pojo.vo.RStatOrgIndexVO$RStatOrgIndexInfoVO">
+        select
+            rso.org_no,
+            rso.effective_measurement_accrued as allCount,
+            rso.freq_pass_rate,
+            ry.freq_pass_rate as freqPassRateYear,
+            rso.v_dev_pass_rate,
+            ry.v_dev_pass_rate as vDevPassRateYear,
+            rso.flicker_pass_rate,
+            ry.flicker_pass_rate as flickerPassRateYear
+        from
+            r_stat_org_m rso
+        LEFT JOIN r_stat_org_y ry on rso.org_no=ry.org_no
+        <where>
+            and rso.data_Type=#{dataType} and ry.data_Type=#{dataType}
+            <if test="param != null and  param.ids != null and param.ids.size > 0">
+                AND rso.org_no IN
+                <foreach collection='param.ids' item='item' index="index" open='(' separator=',' close=')'>
+                    #{item}
+                </foreach>
+            </if>
+            <if test="param!=null and param.startTime != null and param.startTime !=''">
+                AND  rso.data_date >= #{param.startTime} AND YEAR(ry.data_Date) = YEAR(#{param.startTime})
+            </if>
+            <if test="param!=null and param.endTime != null and param.endTime != ''">
+                AND   rso.data_date &lt;= #{param.endTime} AND YEAR(ry.data_Date) = YEAR(#{param.endTime})
+            </if>
+        </where>
+    </select>
+
+</mapper>
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RStatOrgQMapper.xml b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RStatOrgQMapper.xml
new file mode 100644
index 000000000..21a65cdfe
--- /dev/null
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RStatOrgQMapper.xml
@@ -0,0 +1,164 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.njcn.harmonic.mapper.RStatOrgQMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.njcn.harmonic.pojo.po.RStatOrgQ">
+        <id column="org_no" property="orgNo" />
+        <result column="data_date" property="dataDate" />
+        <result column="measurement_type_class" property="measurementTypeClass" />
+        <result column="all_count" property="allCount" />
+        <result column="effective_measurement_average" property="effectiveMeasurementAverage" />
+        <result column="effective_measurement_accrued" property="effectiveMeasurementAccrued" />
+        <result column="harmonic_measurement_average" property="harmonicMeasurementAverage" />
+        <result column="harmonic_measurement_accrued" property="harmonicMeasurementAccrued" />
+        <result column="harmonic_measurement_ratio_average" property="harmonicMeasurementRatioAverage" />
+        <result column="average_over_day" property="averageOverDay" />
+        <result column="freq_pass_rate" property="freqPassRate" />
+        <result column="v_dev_pass_rate" property="vDevPassRate" />
+        <result column="flicker_pass_rate" property="flickerPassRate" />
+        <result column="event_measurement_average" property="eventMeasurementAverage" />
+        <result column="event_measurement_accrued" property="eventMeasurementAccrued" />
+        <result column="event_measurement_ratio_average" property="eventMeasurementRatioAverage" />
+        <result column="event_freq" property="eventFreq" />
+        <result column="event_count" property="eventCount" />
+        <result column="should_count" property="shouldCount" />
+        <result column="warn_count" property="warnCount" />
+        <result column="data_type" property="dataType" />
+    </resultMap>
+    <select id="getQuarterRStatHarmonicOrgInfo" resultType="com.njcn.harmonic.pojo.vo.RStatSubstationOrgVO">
+        SELECT
+            rso.org_no AS orgNo,
+            rso.data_date AS dataDate,
+            rso.effective_measurement_average AS effectiveMeasurementAverage,
+            rso.effective_measurement_accrued AS effectiveMeasurementAccrued,
+            rso.harmonic_measurement_average AS harmonicMeasurementAverage,
+            rso.harmonic_measurement_accrued AS harmonicMeasurementAccrued,
+            rso.harmonic_measurement_ratio_average as harmonicMeasurementRatioAverage,
+            TRUNCATE(rso.event_measurement_accrued/rso.effective_measurement_accrued ,2)as harmonicMeasurementRatioAccrued,
+            c.harmonic_type,
+            c.over_limit_measurement_average,
+            c.over_limit_measurement_accrued,
+            c.over_limit_measurement_ratio_average,
+            c.over_limit_measurement_ratio_accrued,
+        (
+            SELECT
+            over_limit_measurement_average
+            FROM
+            r_stat_harmonic_org_q a
+            WHERE
+            a.org_no=c.org_no and
+            a.harmonic_type=c.harmonic_type
+            <if test="param!=null and param.startTime != null and param.startTime !=''">
+                AND (data_date >= date(
+                DATE_ADD( #{param.startTime}, INTERVAL - 1 YEAR )))
+            </if>
+            <if test="param!=null and param.endTime != null and param.endTime !=''">
+                AND (data_date &lt;= date(
+                DATE_ADD( #{param.endTime}, INTERVAL - 1 YEAR )))
+            </if>
+
+        ) chainAverage ,
+        (
+            SELECT
+            over_limit_measurement_accrued
+            FROM
+            r_stat_harmonic_org_q a
+            WHERE
+            a.org_no=c.org_no and
+            a.harmonic_type=c.harmonic_type
+            <if test="param!=null and param.startTime != null and param.startTime !=''">
+                AND (data_date >= date(
+                DATE_ADD( #{param.startTime}, INTERVAL - 1 YEAR )))
+            </if>
+            <if test="param!=null and param.endTime != null and param.endTime !=''">
+                AND (data_date &lt;= date(
+                DATE_ADD( #{param.endTime}, INTERVAL - 1 YEAR )))
+            </if>
+        ) chainAccrued ,
+        (
+            SELECT
+            over_limit_measurement_accrued
+            FROM
+            r_stat_harmonic_org_q a
+            WHERE
+            a.org_no=c.org_no and
+            a.harmonic_type=c.harmonic_type
+            <if test="param!=null and param.startTime != null and param.startTime !=''">
+                AND (data_date >= date(
+                DATE_ADD( #{param.startTime}, INTERVAL - 3 MONTH )))
+            </if>
+            <if test="param!=null and param.endTime != null and param.endTime !=''">
+                AND (data_date &lt;= date(
+                DATE_ADD( #{param.endTime}, INTERVAL - 3 MONTH )))
+            </if>
+        ) sameAverage,
+        (
+            SELECT
+            over_limit_measurement_accrued
+            FROM
+            r_stat_harmonic_org_q a
+            WHERE
+            a.org_no=c.org_no and
+            a.harmonic_type=c.harmonic_type
+            <if test="param!=null and param.startTime != null and param.startTime !=''">
+                AND (data_date >= date(
+                DATE_ADD( #{param.startTime}, INTERVAL - 3 MONTH )))
+            </if>
+            <if test="param!=null and param.endTime != null and param.endTime !=''">
+                AND (data_date &lt;= date(
+                DATE_ADD( #{param.endTime}, INTERVAL - 3 MONTH )))
+            </if>
+
+        ) sameAccrued,
+        c.average_over_day
+        FROM
+            r_stat_harmonic_org_q c
+        RIGHT JOIN r_stat_org_q AS rso ON rso.org_no = c.org_no
+        <where>
+            c.data_Type=#{dataType} and rso.data_Type=#{dataType}
+            <if test="param != null and  param.ids != null and param.ids.size > 0">
+                AND rso.org_no IN
+                <foreach collection='param.ids' item='item' index="index" open='(' separator=',' close=')'>
+                    #{item}
+                </foreach>
+            </if>
+            <if test="param!=null and param.startTime != null and param.startTime !=''">
+                AND  rso.data_date >= #{param.startTime} AND c.data_date >= #{param.startTime}
+            </if>
+            <if test="param!=null and param.endTime != null and param.endTime != ''">
+                AND   rso.data_date &lt;= #{param.endTime}  AND c.data_date &lt;= #{param.endTime}
+            </if>
+        </where>
+    </select>
+    <select id="getQuarterRStatOrgIndex" resultType="com.njcn.harmonic.pojo.vo.RStatOrgIndexVO$RStatOrgIndexInfoVO">
+        select
+            rso.org_no,
+            rso.effective_measurement_accrued as allCount,
+            rso.freq_pass_rate,
+            ry.freq_pass_rate as freqPassRateYear,
+            rso.v_dev_pass_rate,
+            ry.v_dev_pass_rate as vDevPassRateYear,
+            rso.flicker_pass_rate,
+            ry.flicker_pass_rate as flickerPassRateYear
+        from
+             r_stat_org_q rso
+        LEFT JOIN r_stat_org_y ry on rso.org_no=ry.org_no
+        <where>
+            and rso.data_Type=#{dataType} and ry.data_Type=#{dataType}
+            <if test="param != null and  param.ids != null and param.ids.size > 0">
+                AND rso.org_no IN
+                <foreach collection='param.ids' item='item' index="index" open='(' separator=',' close=')'>
+                    #{item}
+                </foreach>
+            </if>
+            <if test="param!=null and param.startTime != null and param.startTime !=''">
+                AND  rso.data_date >= #{param.startTime} AND YEAR(ry.data_Date) = YEAR(#{param.startTime})
+            </if>
+            <if test="param!=null and param.endTime != null and param.endTime != ''">
+                AND  rso.data_date &lt;= #{param.endTime} AND YEAR(ry.data_Date) = YEAR(#{param.endTime})
+            </if>
+        </where>
+    </select>
+
+</mapper>
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RStatOrgYMapper.xml b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RStatOrgYMapper.xml
new file mode 100644
index 000000000..3b6bec94d
--- /dev/null
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RStatOrgYMapper.xml
@@ -0,0 +1,164 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.njcn.harmonic.mapper.RStatOrgYMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.njcn.harmonic.pojo.po.RStatOrgY">
+        <id column="org_no" property="orgNo" />
+        <result column="data_date" property="dataDate" />
+        <result column="measurement_type_class" property="measurementTypeClass" />
+        <result column="all_count" property="allCount" />
+        <result column="effective_measurement_average" property="effectiveMeasurementAverage" />
+        <result column="effective_measurement_accrued" property="effectiveMeasurementAccrued" />
+        <result column="over_limit_measurement_average" property="overLimitMeasurementAverage" />
+        <result column="over_limit_measurement_accrued" property="overLimitMeasurementAccrued" />
+        <result column="harmonic_measurement_ratio_average" property="harmonicMeasurementRatioAverage" />
+        <result column="average_over_day" property="averageOverDay" />
+        <result column="freq_pass_rate" property="freqPassRate" />
+        <result column="v_dev_pass_rate" property="vDevPassRate" />
+        <result column="flicker_pass_rate" property="flickerPassRate" />
+        <result column="event_measurement_average" property="eventMeasurementAverage" />
+        <result column="event_measurement_accrued" property="eventMeasurementAccrued" />
+        <result column="event_measurement_ratio_average" property="eventMeasurementRatioAverage" />
+        <result column="event_freq" property="eventFreq" />
+        <result column="event_count" property="eventCount" />
+        <result column="should_count" property="shouldCount" />
+        <result column="warn_count" property="warnCount" />
+        <result column="data_type" property="dataType" />
+    </resultMap>
+    <select id="getYearRStatHarmonicOrgInfo" resultType="com.njcn.harmonic.pojo.vo.RStatSubstationOrgVO">
+        SELECT
+            rso.org_no AS orgNo,
+            rso.data_date AS dataDate,
+            rso.effective_measurement_average AS effectiveMeasurementAverage,
+            rso.effective_measurement_accrued AS effectiveMeasurementAccrued,
+            rso.over_limit_measurement_average AS harmonicMeasurementAverage,
+            rso.over_limit_measurement_accrued AS harmonicMeasurementAccrued,
+            rso.harmonic_measurement_ratio_average as harmonicMeasurementRatioAverage,
+            TRUNCATE(rso.event_measurement_accrued/rso.effective_measurement_accrued ,2)as harmonicMeasurementRatioAccrued,
+            c.harmonic_type,
+            c.over_limit_measurement_average,
+            c.over_limit_measurement_accrued,
+            c.over_limit_measurement_ratio_average,
+            c.over_limit_measurement_ratio_accrued,
+        (
+            SELECT
+            over_limit_measurement_average
+            FROM
+            r_stat_harmonic_org_y a
+            WHERE
+            a.org_no=c.org_no and
+            a.harmonic_type=c.harmonic_type
+            <if test="param!=null and param.startTime != null and param.startTime !=''">
+                AND (data_date >= date(
+                DATE_ADD( #{param.startTime}, INTERVAL - 1 YEAR )))
+            </if>
+            <if test="param!=null and param.endTime != null and param.endTime !=''">
+                AND (data_date &lt;= date(
+                DATE_ADD( #{param.endTime}, INTERVAL - 1 YEAR )))
+            </if>
+
+        ) chainAverage ,
+        (
+            SELECT
+            over_limit_measurement_accrued
+            FROM
+            r_stat_harmonic_org_y a
+            WHERE
+            a.org_no=c.org_no and
+            a.harmonic_type=c.harmonic_type
+            <if test="param!=null and param.startTime != null and param.startTime !=''">
+                AND (data_date >= date(
+                DATE_ADD( #{param.startTime}, INTERVAL - 1 YEAR )))
+            </if>
+            <if test="param!=null and param.endTime != null and param.endTime !=''">
+                AND (data_date &lt;= date(
+                DATE_ADD( #{param.endTime}, INTERVAL - 1 YEAR )))
+            </if>
+        ) chainAccrued ,
+        (
+            SELECT
+            over_limit_measurement_accrued
+            FROM
+            r_stat_harmonic_org_y a
+            WHERE
+            a.org_no=c.org_no and
+            a.harmonic_type=c.harmonic_type
+            <if test="param!=null and param.startTime != null and param.startTime !=''">
+                AND (data_date >= date(
+                DATE_ADD( #{param.startTime}, INTERVAL - 1 YEAR )))
+            </if>
+            <if test="param!=null and param.endTime != null and param.endTime !=''">
+                AND (data_date &lt;= date(
+                DATE_ADD( #{param.endTime}, INTERVAL - 1 YEAR )))
+            </if>
+        ) sameAverage,
+        (
+            SELECT
+            over_limit_measurement_accrued
+            FROM
+            r_stat_harmonic_org_y a
+            WHERE
+            a.org_no=c.org_no and
+            a.harmonic_type=c.harmonic_type
+            <if test="param!=null and param.startTime != null and param.startTime !=''">
+                AND (data_date >= date(
+                DATE_ADD( #{param.startTime}, INTERVAL - 1 YEAR )))
+            </if>
+            <if test="param!=null and param.endTime != null and param.endTime !=''">
+                AND (data_date &lt;= date(
+                DATE_ADD( #{param.endTime}, INTERVAL - 1 YEAR )))
+            </if>
+
+        ) sameAccrued,
+        c.average_over_day
+        FROM
+            r_stat_harmonic_org_y c
+        RIGHT JOIN r_stat_org_y AS rso ON rso.org_no = c.org_no
+        <where>
+                c.data_Type=#{dataType} and rso.data_Type=#{dataType}
+            <if test="param != null and  param.ids != null and param.ids.size > 0">
+                AND rso.org_no IN
+                <foreach collection='param.ids' item='item' index="index" open='(' separator=',' close=')'>
+                    #{item}
+                </foreach>
+            </if>
+            <if test="param!=null and param.startTime != null and param.startTime !=''">
+                AND  rso.data_date >= #{param.startTime} and c.data_date >= #{param.startTime}
+            </if>
+            <if test="param!=null and param.endTime != null and param.endTime != ''">
+                AND   rso.data_date &lt;= #{param.endTime} and c.data_date &lt;= #{param.endTime}
+            </if>
+        </where>
+
+    </select>
+    <select id="getYearRStatOrgIndex" resultType="com.njcn.harmonic.pojo.vo.RStatOrgIndexVO$RStatOrgIndexInfoVO">
+        select
+            org_no,
+            effective_measurement_accrued as allCount,
+            freq_pass_rate,
+            freq_pass_rate as freqPassRateYear,
+            v_dev_pass_rate,
+            v_dev_pass_rate as vDevPassRateYear,
+            flicker_pass_rate,
+            flicker_pass_rate as flickerPassRateYear
+        from
+            r_stat_org_y rso
+        <where>
+            and rso.data_Type=#{dataType}
+            <if test="param != null and  param.ids != null and param.ids.size > 0">
+                AND rso.org_no IN
+                <foreach collection='param.ids' item='item' index="index" open='(' separator=',' close=')'>
+                    #{item}
+                </foreach>
+            </if>
+            <if test="param!=null and param.startTime != null and param.startTime !=''">
+                AND  rso.data_date >= #{param.startTime}
+            </if>
+            <if test="param!=null and param.endTime != null and param.endTime != ''">
+                AND   rso.data_date &lt;= #{param.endTime}
+            </if>
+        </where>
+    </select>
+
+</mapper>
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RStatSubstationMMapper.xml b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RStatSubstationMMapper.xml
new file mode 100644
index 000000000..f85c3830a
--- /dev/null
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RStatSubstationMMapper.xml
@@ -0,0 +1,113 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.njcn.harmonic.mapper.RStatSubstationMMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.njcn.harmonic.pojo.po.RStatSubstationM">
+        <id column="data_date" property="dataDate" />
+        <result column="substation_id" property="substationId" />
+        <result column="effective_measurement_average" property="effectiveMeasurementAverage" />
+        <result column="effective_measurement_accrued" property="effectiveMeasurementAccrued" />
+        <result column="harmonic_over_day" property="harmonicOverDay" />
+        <result column="harmonic_count" property="harmonicCount" />
+        <result column="freq_over_day" property="freqOverDay" />
+        <result column="freq_count" property="freqCount" />
+        <result column="v_dev_over_day" property="vDevOverDay" />
+        <result column="v_dev_count" property="vDevCount" />
+        <result column="v_over_day" property="vOverDay" />
+        <result column="v_count" property="vCount" />
+        <result column="i_over_day" property="iOverDay" />
+        <result column="i_count" property="iCount" />
+        <result column="unbalance_over_day" property="unbalanceOverDay" />
+        <result column="unbalance_count" property="unbalanceCount" />
+        <result column="i_neg_over_day" property="iNegOverDay" />
+        <result column="i_neg_count" property="iNegCount" />
+        <result column="flicker_over_day" property="flickerOverDay" />
+        <result column="flicker_count" property="flickerCount" />
+        <result column="inuharm_over_day" property="inuharmOverDay" />
+        <result column="inuharm_count" property="inuharmCount" />
+        <result column="event_count" property="eventCount" />
+        <result column="event_freq" property="eventFreq" />
+        <result column="sag_count" property="sagCount" />
+        <result column="sag_freq" property="sagFreq" />
+        <result column="swell_count" property="swellCount" />
+        <result column="swell_freq" property="swellFreq" />
+        <result column="interrupt_count" property="interruptCount" />
+        <result column="interrupt_freq" property="interruptFreq" />
+    </resultMap>
+    <select id="getStatSubstationIconM" resultType="com.njcn.harmonic.pojo.vo.RSubstationIconVO">
+        SELECT
+            COALESCE( sum( CASE WHEN X.harmonic_over_day BETWEEN 0 AND 10 THEN 1 ELSE 0 END ), 0 ) "num_1",
+            COALESCE ( sum( CASE WHEN X.harmonic_over_day BETWEEN 11 AND 20 THEN 1 ELSE 0 END ), 0 ) "num_2" ,
+            COALESCE ( sum( CASE WHEN X.harmonic_over_day BETWEEN 21 AND 30 THEN 1 ELSE 0 END ), 0 ) "num_3" ,
+            COALESCE ( sum( CASE WHEN X.harmonic_over_day BETWEEN 31 AND 40 THEN 1 ELSE 0 END ), 0 ) "num_4" ,
+            COALESCE ( sum( CASE WHEN X.harmonic_over_day BETWEEN 41 AND 50 THEN 1 ELSE 0 END ), 0 ) "num_5" ,
+            COALESCE ( sum( CASE WHEN X.harmonic_over_day BETWEEN 51 AND 60 THEN 1 ELSE 0 END ), 0 ) "num_6" ,
+            COALESCE ( sum( CASE WHEN X.harmonic_over_day BETWEEN 61 AND 70 THEN 1 ELSE 0 END ), 0 ) "num_7" ,
+            COALESCE ( sum( CASE WHEN X.harmonic_over_day BETWEEN 71 AND 80 THEN 1 ELSE 0 END ), 0 ) "num_8" ,
+            COALESCE ( sum( CASE WHEN X.harmonic_over_day BETWEEN 81 AND 90 THEN 1 ELSE 0 END ), 0 ) "num_9" ,
+            COALESCE ( sum( CASE WHEN X.harmonic_over_day BETWEEN 91 AND 100 THEN 1 ELSE 0 END ), 0 ) "num_10" ,
+            COALESCE ( round(sum(CASE WHEN X.harmonic_over_day BETWEEN 0 AND 10 THEN 1 ELSE 0 END) / COUNT(X.substation_id),4)*100 , 0 )   "upRatio_1",
+            COALESCE ( round(sum(CASE WHEN X.harmonic_over_day BETWEEN 11 AND 20 THEN 1 ELSE 0 END) / COUNT(X.substation_id),4)*100 , 0 )  "upRatio_2",
+            COALESCE ( round(sum(CASE WHEN X.harmonic_over_day BETWEEN 21 AND 30  THEN 1 ELSE 0 END) / COUNT(X.substation_id),4)*100 , 0 ) "upRatio_3",
+            COALESCE ( round(sum(CASE WHEN X.harmonic_over_day BETWEEN 31 AND 40  THEN 1 ELSE 0 END) / COUNT(X.substation_id),4)*100 , 0 ) "upRatio_4",
+            COALESCE ( round(sum(CASE WHEN X.harmonic_over_day BETWEEN 41 AND 50  THEN 1 ELSE 0 END) / COUNT(X.substation_id),4)*100 , 0 ) "upRatio_5",
+            COALESCE ( round(sum(CASE WHEN X.harmonic_over_day BETWEEN 51 AND 60  THEN 1 ELSE 0 END) / COUNT(X.substation_id),4)*100 , 0 ) "upRatio_6",
+            COALESCE ( round(sum(CASE WHEN X.harmonic_over_day BETWEEN 61 AND 70  THEN 1 ELSE 0 END) / COUNT(X.substation_id),4)*100 , 0 ) "upRatio_7",
+            COALESCE ( round(sum(CASE WHEN X.harmonic_over_day BETWEEN 71 AND 80  THEN 1 ELSE 0 END) / COUNT(X.substation_id),4)*100 , 0 ) "upRatio_8",
+            COALESCE ( round(sum(CASE WHEN X.harmonic_over_day BETWEEN 81 AND 90  THEN 1 ELSE 0 END) / COUNT(X.substation_id),4)*100 , 0 ) "upRatio_9",
+            COALESCE ( round(sum(CASE WHEN X.harmonic_over_day BETWEEN 91 AND 100 THEN 1 ELSE 0 END) / COUNT(X.substation_id),4)*100 , 0 ) "upRatio_10"
+        FROM
+            (
+                SELECT
+                        substation_id,
+                        harmonic_over_day
+                FROM
+                        r_stat_substation_m
+                        <where>
+                            <if test="param != null and param.ids != null and param.ids.size > 0">
+                                AND substation_id IN
+                                <foreach collection='param.ids' item='item' index="index" open='(' separator=',' close=')'>
+                                    #{item}
+                                </foreach>
+                            </if>
+                            <if test="param!=null and param.startTime != null and param.startTime !=''">
+                                AND  data_date >= #{param.startTime}
+                            </if>
+                            <if test="param!=null and param.endTime != null and param.endTime != ''">
+                                AND  #{param.endTime}>= data_date
+                            </if>
+                        </where>
+            ) X
+    </select>
+    <select id="getStatSubstationIcon2M" resultType="com.njcn.harmonic.pojo.vo.RSubstationIcon2VO">
+        SELECT
+            substation_id,
+            effective_measurement_accrued,
+            freq_over_day / freq_count as 'freqAverageOverDay',
+            v_dev_over_day / v_dev_count as 'vDevAverageOverDay',
+            v_over_day / v_count as 'vAverageOverDay',
+            i_over_day / i_count as 'iAverageOverDay',
+            unbalance_over_day / unbalance_count as 'unbalanceAverageOverDay',
+            i_neg_over_day / i_neg_count as 'iNegAverageOverDay',
+            flicker_over_day / flicker_count as 'flickerAverageOverDay',
+            inuharm_over_day / inuharm_count as 'inuharmAverageOverDay'
+        FROM
+            r_stat_substation_m
+        <where>
+            <if test="param != null and  param.ids != null and param.ids.size > 0">
+                AND substation_id IN
+                <foreach collection='param.ids' item='item' index="index" open='(' separator=',' close=')'>
+                    #{item}
+                </foreach>
+            </if>
+            <if test="param!=null and param.startTime != null and param.startTime !=''">
+                AND data_date >= #{param.startTime}
+            </if>
+            <if test="param!=null and param.endTime != null and param.endTime != ''">
+                AND #{param.endTime}>= data_date
+            </if>
+        </where>
+    </select>
+
+</mapper>
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RStatSubstationQMapper.xml b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RStatSubstationQMapper.xml
new file mode 100644
index 000000000..42f5e7765
--- /dev/null
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RStatSubstationQMapper.xml
@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.njcn.harmonic.mapper.RStatSubstationQMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.njcn.harmonic.pojo.po.RStatSubstationQ">
+        <id column="data_date" property="dataDate" />
+        <result column="substation_id" property="substationId" />
+        <result column="effective_measurement_average" property="effectiveMeasurementAverage" />
+        <result column="effective_measurement_accrued" property="effectiveMeasurementAccrued" />
+        <result column="harmonic_average_over_day" property="harmonicAverageOverDay" />
+        <result column="freq_average_over_day" property="freqAverageOverDay" />
+        <result column="v_dev_average_over_day" property="vDevAverageOverDay" />
+        <result column="v_average_over_day" property="vAverageOverDay" />
+        <result column="i_average_over_day" property="iAverageOverDay" />
+        <result column="unbalance_average_over_day" property="unbalanceAverageOverDay" />
+        <result column="i_neg_average_over_day" property="iNegAverageOverDay" />
+        <result column="flicker_average_over_day" property="flickerAverageOverDay" />
+        <result column="inuharm_average_over_day" property="inuharmAverageOverDay" />
+        <result column="event_count" property="eventCount" />
+        <result column="event_freq" property="eventFreq" />
+        <result column="sag_count" property="sagCount" />
+        <result column="sag_freq" property="sagFreq" />
+        <result column="swell_count" property="swellCount" />
+        <result column="swell_freq" property="swellFreq" />
+        <result column="interrupt_count" property="interruptCount" />
+        <result column="interrupt_freq" property="interruptFreq" />
+    </resultMap>
+    <select id="getStatSubstationIconQ" resultType="com.njcn.harmonic.pojo.vo.RSubstationIconVO">
+        SELECT
+            COALESCE( sum( CASE WHEN X.harmonic_average_over_day BETWEEN 0 AND 10 THEN 1 ELSE 0 END ), 0 ) "num_1",
+            COALESCE ( sum( CASE WHEN X.harmonic_average_over_day BETWEEN 11 AND 20 THEN 1 ELSE 0 END ), 0 ) "num_2" ,
+            COALESCE ( sum( CASE WHEN X.harmonic_average_over_day BETWEEN 21 AND 30 THEN 1 ELSE 0 END ), 0 ) "num_3" ,
+            COALESCE ( sum( CASE WHEN X.harmonic_average_over_day BETWEEN 31 AND 40 THEN 1 ELSE 0 END ), 0 ) "num_4" ,
+            COALESCE ( sum( CASE WHEN X.harmonic_average_over_day BETWEEN 41 AND 50 THEN 1 ELSE 0 END ), 0 ) "num_5" ,
+            COALESCE ( sum( CASE WHEN X.harmonic_average_over_day BETWEEN 51 AND 60 THEN 1 ELSE 0 END ), 0 ) "num_6" ,
+            COALESCE ( sum( CASE WHEN X.harmonic_average_over_day BETWEEN 61 AND 70 THEN 1 ELSE 0 END ), 0 ) "num_7" ,
+            COALESCE ( sum( CASE WHEN X.harmonic_average_over_day BETWEEN 71 AND 80 THEN 1 ELSE 0 END ), 0 ) "num_8" ,
+            COALESCE ( sum( CASE WHEN X.harmonic_average_over_day BETWEEN 81 AND 90 THEN 1 ELSE 0 END ), 0 ) "num_9" ,
+            COALESCE ( sum( CASE WHEN X.harmonic_average_over_day BETWEEN 91 AND 100 THEN 1 ELSE 0 END ), 0 ) "num_10" ,
+            COALESCE ( round(sum(CASE WHEN X.harmonic_average_over_day BETWEEN 0 AND 10 THEN 1 ELSE 0 END) / COUNT(X.substation_id),4)*100 , 0 )   "upRatio_1",
+            COALESCE ( round(sum(CASE WHEN X.harmonic_average_over_day BETWEEN 11 AND 20 THEN 1 ELSE 0 END) / COUNT(X.substation_id),4)*100 , 0 )  "upRatio_2",
+            COALESCE ( round(sum(CASE WHEN X.harmonic_average_over_day BETWEEN 21 AND 30  THEN 1 ELSE 0 END) / COUNT(X.substation_id),4)*100 , 0 ) "upRatio_3",
+            COALESCE ( round(sum(CASE WHEN X.harmonic_average_over_day BETWEEN 31 AND 40  THEN 1 ELSE 0 END) / COUNT(X.substation_id),4)*100 , 0 ) "upRatio_4",
+            COALESCE ( round(sum(CASE WHEN X.harmonic_average_over_day BETWEEN 41 AND 50  THEN 1 ELSE 0 END) / COUNT(X.substation_id),4)*100 , 0 ) "upRatio_5",
+            COALESCE ( round(sum(CASE WHEN X.harmonic_average_over_day BETWEEN 51 AND 60  THEN 1 ELSE 0 END) / COUNT(X.substation_id),4)*100 , 0 ) "upRatio_6",
+            COALESCE ( round(sum(CASE WHEN X.harmonic_average_over_day BETWEEN 61 AND 70  THEN 1 ELSE 0 END) / COUNT(X.substation_id),4)*100 , 0 ) "upRatio_7",
+            COALESCE ( round(sum(CASE WHEN X.harmonic_average_over_day BETWEEN 71 AND 80  THEN 1 ELSE 0 END) / COUNT(X.substation_id),4)*100 , 0 ) "upRatio_8",
+            COALESCE ( round(sum(CASE WHEN X.harmonic_average_over_day BETWEEN 81 AND 90  THEN 1 ELSE 0 END) / COUNT(X.substation_id),4)*100 , 0 ) "upRatio_9",
+            COALESCE ( round(sum(CASE WHEN X.harmonic_average_over_day BETWEEN 91 AND 100 THEN 1 ELSE 0 END) / COUNT(X.substation_id),4)*100 , 0 ) "upRatio_10"
+        FROM
+        (
+                    SELECT
+                        substation_id,
+                        harmonic_average_over_day
+                    FROM
+                        r_stat_substation_q
+                <where>
+                    <if test="param != null and  param.ids != null and param.ids.size > 0">
+                        AND substation_id IN
+                        <foreach collection='param.ids' item='item' index="index" open='(' separator=',' close=')'>
+                            #{item}
+                        </foreach>
+                    </if>
+                    <if test="param!=null and param.startTime != null and param.startTime !=''">
+                        AND data_date >= #{param.startTime}
+                    </if>
+                    <if test="param!=null and param.endTime != null and param.endTime != ''">
+                        AND #{param.endTime}>= data_date
+                    </if>
+                </where>
+
+        ) X
+
+    </select>
+    <select id="getStatSubstationIcon2Q" resultType="com.njcn.harmonic.pojo.vo.RSubstationIcon2VO">
+        SELECT
+            substation_id,
+            effective_measurement_accrued,
+            freq_average_over_day,
+            v_dev_average_over_day,
+            v_average_over_day,
+            i_average_over_day,
+            unbalance_average_over_day,
+            i_neg_average_over_day,
+            flicker_average_over_day,
+            inuharm_average_over_day
+        FROM
+            r_stat_substation_q
+        <where>
+            <if test="param != null and  param.ids != null and param.ids.size > 0">
+                AND substation_id IN
+                <foreach collection='param.ids' item='item' index="index" open='(' separator=',' close=')'>
+                    #{item}
+                </foreach>
+            </if>
+            <if test="param!=null and param.startTime != null and param.startTime !=''">
+                AND data_date >= #{param.startTime}
+            </if>
+            <if test="param!=null and param.endTime != null and param.endTime != ''">
+                AND #{param.endTime}>= data_date
+            </if>
+        </where>
+    </select>
+
+</mapper>
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RStatSubstationVoltageMMapper.xml b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RStatSubstationVoltageMMapper.xml
new file mode 100644
index 000000000..b53c75846
--- /dev/null
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RStatSubstationVoltageMMapper.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.njcn.harmonic.mapper.RStatSubstationVoltageMMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.njcn.harmonic.pojo.po.RStatSubstationVoltageM">
+        <id column="org_no" property="orgNo" />
+        <result column="data_date" property="dataDate" />
+        <result column="substation_voltage" property="substationVoltage" />
+        <result column="substation_count" property="substationCount" />
+        <result column="harmonic_count" property="harmonicCount" />
+        <result column="event_count" property="eventCount" />
+    </resultMap>
+    <select id="getStatSubstationIcon" resultType="com.njcn.harmonic.pojo.vo.RVoltageIconVO">
+        SELECT
+        substation_voltage as 'substationVoltage',
+        sum( substation_count ) as 'substationCount',
+        sum( harmonic_count ) as 'harmonicCount'
+        FROM
+        r_stat_substation_voltage_m
+        <where>
+            <if test="param != null and param.ids != null and param.ids.size > 0">
+                AND org_no IN
+                <foreach collection='param.ids' item='item' index="index" open='(' separator=',' close=')'>
+                    #{item}
+                </foreach>
+            </if>
+            <if test="param!=null and param.startTime != null and param.startTime !=''">
+                AND  data_date >= #{param.startTime}
+            </if>
+            <if test="param!=null and param.endTime != null and param.endTime !=''">
+                AND  #{param.endTime} >= data_date
+            </if>
+        </where>
+        GROUP BY substation_voltage
+    </select>
+
+
+</mapper>
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RStatSubstationYMapper.xml b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RStatSubstationYMapper.xml
new file mode 100644
index 000000000..4c1121da5
--- /dev/null
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RStatSubstationYMapper.xml
@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.njcn.harmonic.mapper.RStatSubstationYMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.njcn.harmonic.pojo.po.RStatSubstationY">
+        <id column="data_date" property="dataDate" />
+        <result column="substation_id" property="substationId" />
+        <result column="effective_measurement_average" property="effectiveMeasurementAverage" />
+        <result column="effective_measurement_accrued" property="effectiveMeasurementAccrued" />
+        <result column="harmonic_over_day" property="harmonicOverDay" />
+        <result column="freq_average_over_day" property="freqAverageOverDay" />
+        <result column="v_dev_average_over_day" property="vDevAverageOverDay" />
+        <result column="v_average_over_day" property="vAverageOverDay" />
+        <result column="i_average_over_day" property="iAverageOverDay" />
+        <result column="unbalance_average_over_day" property="unbalanceAverageOverDay" />
+        <result column="i_neg_average_over_day" property="iNegAverageOverDay" />
+        <result column="flicker_average_over_day" property="flickerAverageOverDay" />
+        <result column="inuharm_average_over_day" property="inuharmAverageOverDay" />
+        <result column="event_count" property="eventCount" />
+        <result column="event_freq" property="eventFreq" />
+        <result column="sag_count" property="sagCount" />
+        <result column="sag_freq" property="sagFreq" />
+        <result column="swell_count" property="swellCount" />
+        <result column="swell_freq" property="swellFreq" />
+        <result column="interrupt_count" property="interruptCount" />
+        <result column="interrupt_freq" property="interruptFreq" />
+    </resultMap>
+    <select id="getStatSubstationIconY" resultType="com.njcn.harmonic.pojo.vo.RSubstationIconVO">
+        SELECT
+                COALESCE( sum( CASE WHEN X.harmonic_over_day BETWEEN 0 AND 10 THEN 1 ELSE 0 END ), 0 ) "num_1",
+                COALESCE ( sum( CASE WHEN X.harmonic_over_day BETWEEN 11 AND 20 THEN 1 ELSE 0 END ), 0 ) "num_2" ,
+                COALESCE ( sum( CASE WHEN X.harmonic_over_day BETWEEN 21 AND 30 THEN 1 ELSE 0 END ), 0 ) "num_3" ,
+                COALESCE ( sum( CASE WHEN X.harmonic_over_day BETWEEN 31 AND 40 THEN 1 ELSE 0 END ), 0 ) "num_4" ,
+                COALESCE ( sum( CASE WHEN X.harmonic_over_day BETWEEN 41 AND 50 THEN 1 ELSE 0 END ), 0 ) "num_5" ,
+                COALESCE ( sum( CASE WHEN X.harmonic_over_day BETWEEN 51 AND 60 THEN 1 ELSE 0 END ), 0 ) "num_6" ,
+                COALESCE ( sum( CASE WHEN X.harmonic_over_day BETWEEN 61 AND 70 THEN 1 ELSE 0 END ), 0 ) "num_7" ,
+                COALESCE ( sum( CASE WHEN X.harmonic_over_day BETWEEN 71 AND 80 THEN 1 ELSE 0 END ), 0 ) "num_8" ,
+                COALESCE ( sum( CASE WHEN X.harmonic_over_day BETWEEN 81 AND 90 THEN 1 ELSE 0 END ), 0 ) "num_9" ,
+                COALESCE ( sum( CASE WHEN X.harmonic_over_day BETWEEN 91 AND 100 THEN 1 ELSE 0 END ), 0 ) "num_10" ,
+                COALESCE ( round(sum(CASE WHEN X.harmonic_over_day BETWEEN 0 AND 10 THEN 1 ELSE 0 END) / COUNT(X.substation_id),4)*100 , 0 )   "upRatio_1",
+                COALESCE ( round(sum(CASE WHEN X.harmonic_over_day BETWEEN 11 AND 20 THEN 1 ELSE 0 END) / COUNT(X.substation_id),4)*100 , 0 )  "upRatio_2",
+                COALESCE ( round(sum(CASE WHEN X.harmonic_over_day BETWEEN 21 AND 30  THEN 1 ELSE 0 END) / COUNT(X.substation_id),4)*100 , 0 ) "upRatio_3",
+                COALESCE ( round(sum(CASE WHEN X.harmonic_over_day BETWEEN 31 AND 40  THEN 1 ELSE 0 END) / COUNT(X.substation_id),4)*100 , 0 ) "upRatio_4",
+                COALESCE ( round(sum(CASE WHEN X.harmonic_over_day BETWEEN 41 AND 50  THEN 1 ELSE 0 END) / COUNT(X.substation_id),4)*100 , 0 ) "upRatio_5",
+                COALESCE ( round(sum(CASE WHEN X.harmonic_over_day BETWEEN 51 AND 60  THEN 1 ELSE 0 END) / COUNT(X.substation_id),4)*100 , 0 ) "upRatio_6",
+                COALESCE ( round(sum(CASE WHEN X.harmonic_over_day BETWEEN 61 AND 70  THEN 1 ELSE 0 END) / COUNT(X.substation_id),4)*100 , 0 ) "upRatio_7",
+                COALESCE ( round(sum(CASE WHEN X.harmonic_over_day BETWEEN 71 AND 80  THEN 1 ELSE 0 END) / COUNT(X.substation_id),4)*100 , 0 ) "upRatio_8",
+                COALESCE ( round(sum(CASE WHEN X.harmonic_over_day BETWEEN 81 AND 90  THEN 1 ELSE 0 END) / COUNT(X.substation_id),4)*100 , 0 ) "upRatio_9",
+                COALESCE ( round(sum(CASE WHEN X.harmonic_over_day BETWEEN 91 AND 100 THEN 1 ELSE 0 END) / COUNT(X.substation_id),4)*100 , 0 ) "upRatio_10"
+        FROM
+        (
+                    SELECT
+                        substation_id,
+                        harmonic_over_day
+                    FROM
+                         r_stat_substation_y
+                    <where>
+                        <if test="param != null and param.ids != null and param.ids.size > 0">
+                            AND substation_id IN
+                            <foreach collection='param.ids' item='item' index="index" open='(' separator=',' close=')'>
+                                #{item}
+                            </foreach>
+                        </if>
+                        <if test="param!=null and param.startTime != null and param.startTime !=''">
+                            AND  data_date >= #{param.startTime}
+                        </if>
+                        <if test="param!=null and param.endTime != null and param.endTime != ''">
+                            AND  #{param.endTime}>= data_date
+                        </if>
+                    </where>
+
+        ) X
+
+    </select>
+    <select id="getStatSubstationIcon2Y" resultType="com.njcn.harmonic.pojo.vo.RSubstationIcon2VO">
+        SELECT
+            substation_id,
+            effective_measurement_accrued,
+            freq_average_over_day,
+            v_dev_average_over_day,
+            v_average_over_day,
+            i_average_over_day,
+            unbalance_average_over_day,
+            i_neg_average_over_day,
+            flicker_average_over_day,
+            inuharm_average_over_day
+        FROM
+            r_stat_substation_y
+        <where>
+            <if test="param != null and param.ids != null and param.ids.size > 0">
+                AND substation_id IN
+                <foreach collection='param.ids' item='item' index="index" open='(' separator=',' close=')'>
+                    #{item}
+                </foreach>
+            </if>
+            <if test="param!=null and param.startTime != null and param.startTime !=''">
+                AND  data_date >= #{param.startTime}
+            </if>
+            <if test="param!=null and param.endTime != null and param.endTime != ''">
+                AND  #{param.endTime}>= data_date
+            </if>
+        </where>
+    </select>
+
+</mapper>
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/DataExceptionService.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/DataExceptionService.java
new file mode 100644
index 000000000..3fe269b18
--- /dev/null
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/DataExceptionService.java
@@ -0,0 +1,20 @@
+package com.njcn.harmonic.service;
+
+import com.njcn.harmonic.pojo.param.AlgorithmSearchParam;
+
+/**
+ * 数据是否异常
+ *
+ * @author qijian
+ * @version 1.0.0
+ * @createTime 2022/10/26 - 10:09
+ */
+public interface DataExceptionService {
+
+    /**
+     * 监测点数据是否异常
+     * @author qijian
+     * @date 2022/10/26
+     */
+    boolean lineDataException(AlgorithmSearchParam algorithmSearchParam);
+}
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/DataIntegrityRateService.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/DataIntegrityRateService.java
new file mode 100644
index 000000000..8fcbec654
--- /dev/null
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/DataIntegrityRateService.java
@@ -0,0 +1,20 @@
+package com.njcn.harmonic.service;
+
+import com.njcn.harmonic.pojo.param.AlgorithmSearchParam;
+
+/**
+ * 数据完整率算法
+ *
+ * @author qijian
+ * @version 1.0.0
+ * @createTime 2022/10/26 - 10:09
+ */
+public interface DataIntegrityRateService {
+
+    /**
+     * 监测点日数据完整率
+     * @author qijian
+     * @date 2022/10/26
+     */
+    boolean lineDataIntegrityRate(AlgorithmSearchParam algorithmSearchParam);
+}
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/RMpBenchmarkLevelMService.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/RMpBenchmarkLevelMService.java
new file mode 100644
index 000000000..9921cd9c2
--- /dev/null
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/RMpBenchmarkLevelMService.java
@@ -0,0 +1,25 @@
+package com.njcn.harmonic.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.njcn.harmonic.pojo.param.RMpBenchmarkLevelParam;
+import com.njcn.harmonic.pojo.po.RMpBenchmarkLevelM;
+import com.njcn.harmonic.pojo.vo.RMpBenchmarkLevelVO;
+
+import java.util.List;
+
+/**
+* @author jianghf
+* @description 针对表【r_mp_benchmark_level_m】的数据库操作Service
+* @createDate 2022-10-11 10:32:18
+*/
+public interface RMpBenchmarkLevelMService extends IService<RMpBenchmarkLevelM> {
+
+    /***
+     * 查询区域稳态电能质量水平(月)
+     * @author jianghaifei
+     * @date 2022-10-11 11:26
+     * @param rMpBenchmarkLevelParam
+     * @return java.util.List<com.njcn.device.pms.pojo.po.RMpBenchmarkLevelM>
+     */
+    List<RMpBenchmarkLevelVO> getRMpBenchmarkLevelList(RMpBenchmarkLevelParam rMpBenchmarkLevelParam);
+}
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/RMpBenchmarkLevelQService.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/RMpBenchmarkLevelQService.java
new file mode 100644
index 000000000..b2d95f482
--- /dev/null
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/RMpBenchmarkLevelQService.java
@@ -0,0 +1,18 @@
+package com.njcn.harmonic.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.njcn.harmonic.pojo.param.RMpBenchmarkLevelParam;
+import com.njcn.harmonic.pojo.po.RMpBenchmarkLevelQ;
+import com.njcn.harmonic.pojo.vo.RMpBenchmarkLevelVO;
+
+import java.util.List;
+
+/**
+* @author jianghf
+* @description 针对表【r_mp_benchmark_level_q】的数据库操作Service
+* @createDate 2022-10-11 10:32:18
+*/
+public interface RMpBenchmarkLevelQService extends IService<RMpBenchmarkLevelQ> {
+
+    List<RMpBenchmarkLevelVO> getRMpBenchmarkLevelList(RMpBenchmarkLevelParam rMpBenchmarkLevelParam);
+}
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/RMpBenchmarkLevelYService.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/RMpBenchmarkLevelYService.java
new file mode 100644
index 000000000..944e64cb4
--- /dev/null
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/RMpBenchmarkLevelYService.java
@@ -0,0 +1,18 @@
+package com.njcn.harmonic.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.njcn.harmonic.pojo.param.RMpBenchmarkLevelParam;
+import com.njcn.harmonic.pojo.po.RMpBenchmarkLevelY;
+import com.njcn.harmonic.pojo.vo.RMpBenchmarkLevelVO;
+
+import java.util.List;
+
+/**
+* @author jianghf
+* @description 针对表【r_mp_benchmark_level_y】的数据库操作Service
+* @createDate 2022-10-11 10:32:18
+*/
+public interface RMpBenchmarkLevelYService extends IService<RMpBenchmarkLevelY> {
+
+    List<RMpBenchmarkLevelVO> getRMpBenchmarkLevelList(RMpBenchmarkLevelParam rMpBenchmarkLevelParam);
+}
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/RMpHarmonicIMagReportDService.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/RMpHarmonicIMagReportDService.java
new file mode 100644
index 000000000..31610da31
--- /dev/null
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/RMpHarmonicIMagReportDService.java
@@ -0,0 +1,17 @@
+package com.njcn.harmonic.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.njcn.harmonic.pojo.po.RMpHarmonicIMagReportD;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+* @author Administrator
+* @description 针对表【r_mp_harmonic_i_mag_report_d(稳态监测点指标日报-日表(主配网表)  /各次谐波电流有效值)】的数据库操作Service
+* @createDate 2022-10-20 18:38:15
+*/
+public interface RMpHarmonicIMagReportDService extends IService<RMpHarmonicIMagReportD> {
+
+    List<RMpHarmonicIMagReportD> getListByCond(Map<String, Object> condMap);
+}
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/RMpHarmonicIRateReportDService.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/RMpHarmonicIRateReportDService.java
new file mode 100644
index 000000000..52ae3ca8a
--- /dev/null
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/RMpHarmonicIRateReportDService.java
@@ -0,0 +1,18 @@
+package com.njcn.harmonic.service;
+
+import com.njcn.harmonic.pojo.po.RMpHarmonicIRateReportD;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+* @author Administrator
+* @description 针对表【r_mp_harmonic_i_rate_report_d(稳态监测点指标日报-日表(主网表)  /各次谐波电流含有率)】的数据库操作Service
+* @createDate 2022-10-20 18:43:52
+*/
+public interface RMpHarmonicIRateReportDService extends IService<RMpHarmonicIRateReportD> {
+
+    List<RMpHarmonicIRateReportD> getListByCond(Map<String, Object> condMap);
+}
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/RMpHarmonicReportDService.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/RMpHarmonicReportDService.java
new file mode 100644
index 000000000..04e0bc05f
--- /dev/null
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/RMpHarmonicReportDService.java
@@ -0,0 +1,18 @@
+package com.njcn.harmonic.service;
+
+import com.njcn.harmonic.pojo.param.RMpHarmonicReportDParam;
+import com.njcn.harmonic.pojo.vo.RMpHarmonicReportDVO;
+
+import java.util.List;
+
+/**
+ * @Title RMpHarmonicReportDService
+ * @Package com.njcn.harmonic.service
+ * @Author jianghaifei
+ * @Date 2022-10-20 19:18
+ * @Version V1.0
+ */
+public interface RMpHarmonicReportDService {
+
+    List<RMpHarmonicReportDVO> getMonitorStatisticsD(RMpHarmonicReportDParam rMpHarmonicReportDParam);
+}
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/RMpHarmonicVRateReportDService.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/RMpHarmonicVRateReportDService.java
new file mode 100644
index 000000000..f6b5a3a8d
--- /dev/null
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/RMpHarmonicVRateReportDService.java
@@ -0,0 +1,17 @@
+package com.njcn.harmonic.service;
+
+import com.njcn.harmonic.pojo.po.RMpHarmonicVRateReportD;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+* @author jianghf
+* @description 针对表【r_mp_harmonic_v_rate_report_d(稳态监测点指标日报-日表(主配网表)  /各次谐波电压含有率 )】的数据库操作Service
+* @createDate 2022-10-20 18:34:05
+*/
+public interface RMpHarmonicVRateReportDService extends IService<RMpHarmonicVRateReportD> {
+
+    List<RMpHarmonicVRateReportD> getListByCond(Map<String, Object> map);
+}
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/RMpInharmonicIRateReportDService.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/RMpInharmonicIRateReportDService.java
new file mode 100644
index 000000000..35187b653
--- /dev/null
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/RMpInharmonicIRateReportDService.java
@@ -0,0 +1,18 @@
+package com.njcn.harmonic.service;
+
+import com.njcn.harmonic.pojo.po.RMpInharmonicIRateReportD;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+* @author Administrator
+* @description 针对表【r_mp_inharmonic_i_rate_report_d(稳态监测点指标日报-日表(主网表)  /各次间谐波电流含有率)】的数据库操作Service
+* @createDate 2022-10-20 18:45:58
+*/
+public interface RMpInharmonicIRateReportDService extends IService<RMpInharmonicIRateReportD> {
+
+    List<RMpInharmonicIRateReportD> getListByCond(Map<String, Object> condMap);
+}
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/RMpInharmonicVRateReportDService.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/RMpInharmonicVRateReportDService.java
new file mode 100644
index 000000000..781529df6
--- /dev/null
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/RMpInharmonicVRateReportDService.java
@@ -0,0 +1,18 @@
+package com.njcn.harmonic.service;
+
+import com.njcn.harmonic.pojo.po.RMpInharmonicVRateReportD;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+* @author Administrator
+* @description 针对表【r_mp_inharmonic_v_rate_report_d】的数据库操作Service
+* @createDate 2022-10-20 18:45:36
+*/
+public interface RMpInharmonicVRateReportDService extends IService<RMpInharmonicVRateReportD> {
+
+    List<RMpInharmonicVRateReportD> getListByCond(Map<String, Object> condMap);
+}
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/RMpMeasurePhaseReportDService.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/RMpMeasurePhaseReportDService.java
new file mode 100644
index 000000000..a0a6d9f32
--- /dev/null
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/RMpMeasurePhaseReportDService.java
@@ -0,0 +1,17 @@
+package com.njcn.harmonic.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.njcn.harmonic.pojo.po.RMpMeasurePhaseReportD;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+* @author Administrator
+* @description 针对表【r_mp_measure_phase_report_d】的数据库操作Service
+* @createDate 2022-10-20 18:20:08
+*/
+public interface RMpMeasurePhaseReportDService extends IService<RMpMeasurePhaseReportD> {
+
+    List<RMpMeasurePhaseReportD> getListByCond(Map<String, Object> condMap);
+}
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/RMpMeasureReportDService.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/RMpMeasureReportDService.java
new file mode 100644
index 000000000..a975455d9
--- /dev/null
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/RMpMeasureReportDService.java
@@ -0,0 +1,17 @@
+package com.njcn.harmonic.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.njcn.harmonic.pojo.po.RMpMeasureReportD;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+* @author jianghf
+* @description 针对表【r_mp_measure_report_d】的数据库操作Service
+* @createDate 2022-10-20 16:32:37
+*/
+public interface RMpMeasureReportDService extends IService<RMpMeasureReportD> {
+
+    List<RMpMeasureReportD> getListByCond(Map<String, Object> condMap);
+}
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/RMpPartHarmonicDetailDService.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/RMpPartHarmonicDetailDService.java
new file mode 100644
index 000000000..e4480c8d9
--- /dev/null
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/RMpPartHarmonicDetailDService.java
@@ -0,0 +1,26 @@
+package com.njcn.harmonic.service;
+
+import com.njcn.common.pojo.param.StatisticsBizBaseParam;
+import com.njcn.harmonic.pojo.po.RMpPartHarmonicDetailD;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.njcn.harmonic.pojo.vo.RMpPartHarmonicDetailIconVO;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author rui.wu
+ * @since 2022-10-24
+ */
+public interface RMpPartHarmonicDetailDService extends IService<RMpPartHarmonicDetailD> {
+
+    /**
+     * 稳态指标超标明细表-指标趋势图
+     * @param param
+     * @return
+     */
+    List<RMpPartHarmonicDetailIconVO> getRMpPartHarmonicDetailIcon(StatisticsBizBaseParam param);
+}
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/RMpPartHarmonicDetailMService.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/RMpPartHarmonicDetailMService.java
new file mode 100644
index 000000000..d7f9ee831
--- /dev/null
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/RMpPartHarmonicDetailMService.java
@@ -0,0 +1,28 @@
+package com.njcn.harmonic.service;
+
+import com.njcn.common.pojo.param.StatisticsBizBaseParam;
+import com.njcn.harmonic.pojo.param.RStatOrgParam;
+import com.njcn.harmonic.pojo.param.StatSubstationBizBaseParam;
+import com.njcn.harmonic.pojo.po.RMpPartHarmonicDetailM;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.njcn.harmonic.pojo.vo.RMpPartHarmonicDetailVO;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author rui.wu
+ * @since 2022-10-24
+ */
+public interface RMpPartHarmonicDetailMService extends IService<RMpPartHarmonicDetailM> {
+
+    /**
+     * 稳态指标超标明细表
+     * @param param
+     * @return
+     */
+    List<RMpPartHarmonicDetailVO> getRMpPartHarmonicDetail(RStatOrgParam param);
+}
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/RMpPassRateService.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/RMpPassRateService.java
new file mode 100644
index 000000000..e12b04882
--- /dev/null
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/RMpPassRateService.java
@@ -0,0 +1,28 @@
+package com.njcn.harmonic.service;
+
+import com.njcn.common.pojo.param.StatisticsBizBaseParam;
+import com.njcn.harmonic.pojo.param.RStatOrgParam;
+import com.njcn.harmonic.pojo.param.StatSubstationBizBaseParam;
+import com.njcn.harmonic.pojo.po.RMpPassRateQ;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.njcn.harmonic.pojo.vo.RStatOrgIndexVO;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author rui.wu
+ * @since 2022-10-24
+ */
+public interface RMpPassRateService extends IService<RMpPassRateQ> {
+
+    /**
+     * 稳态指标合格率明细表
+     * @param param
+     * @return
+     */
+    List<RStatOrgIndexVO> getRMpPassRateInfo(RStatOrgParam param);
+}
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/RStatHarmonicMService.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/RStatHarmonicMService.java
new file mode 100644
index 000000000..24932b88c
--- /dev/null
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/RStatHarmonicMService.java
@@ -0,0 +1,42 @@
+package com.njcn.harmonic.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.njcn.common.pojo.param.StatisticsBizBaseParam;
+import com.njcn.harmonic.pojo.param.RStatHarmonicMParam;
+import com.njcn.harmonic.pojo.po.RStatHarmonicM;
+import com.njcn.harmonic.pojo.vo.RArrayVO;
+import com.njcn.harmonic.pojo.vo.RHarmonicPolylineVO;
+import com.njcn.harmonic.pojo.vo.RIconVO;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author rui.wu
+ * @since 2022-10-09
+ */
+public interface RStatHarmonicMService extends IService<RStatHarmonicM> {
+
+    /**
+     * 查询查询监测点稳态指标 日/月点数
+     * @param param
+     * @return
+     */
+    List<RArrayVO> getRStatHarmonicMAll(StatisticsBizBaseParam param);
+
+    /**
+     * 稳态电铁-频率偏差-电压统计图
+     * @return
+     */
+    List<RIconVO> getRStatHarmonicIcon(RStatHarmonicMParam param);
+
+    /**
+     * 稳态电铁-频率偏差-越线日期统计图
+     * @return
+     */
+    List<RHarmonicPolylineVO> getRStatHarmonicIcon2(RStatHarmonicMParam param);
+
+}
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/RStatHarmonicOrgMService.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/RStatHarmonicOrgMService.java
new file mode 100644
index 000000000..24f13696c
--- /dev/null
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/RStatHarmonicOrgMService.java
@@ -0,0 +1,35 @@
+package com.njcn.harmonic.service;
+
+import com.njcn.common.pojo.param.StatisticsBizBaseParam;
+import com.njcn.harmonic.pojo.param.RStatHarmonicMParam;
+import com.njcn.harmonic.pojo.po.RStatHarmonicOrgM;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.njcn.harmonic.pojo.vo.RArrayVO;
+import com.njcn.harmonic.pojo.vo.RIconVO;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author rui.wu
+ * @since 2022-10-14
+ */
+public interface RStatHarmonicOrgMService extends IService<RStatHarmonicOrgM> {
+
+    /**
+     * 查询查询各单位稳态指标 日/月点数（月）
+     * @param param
+     * @return
+     */
+    List<RArrayVO> getRStatHarmonicMAll(StatisticsBizBaseParam param);
+
+    /**
+     * 查询各单位累计超标监测点数统计图-月数据
+     * @param param
+     * @return
+     */
+    List<RIconVO> getRStatHarmonicOrgMIcon(RStatHarmonicMParam param);
+}
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/RStatHarmonicOrgQService.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/RStatHarmonicOrgQService.java
new file mode 100644
index 000000000..ae38d9820
--- /dev/null
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/RStatHarmonicOrgQService.java
@@ -0,0 +1,35 @@
+package com.njcn.harmonic.service;
+
+import com.njcn.common.pojo.param.StatisticsBizBaseParam;
+import com.njcn.harmonic.pojo.param.RStatHarmonicMParam;
+import com.njcn.harmonic.pojo.po.RStatHarmonicOrgQ;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.njcn.harmonic.pojo.vo.RArrayVO;
+import com.njcn.harmonic.pojo.vo.RIconVO;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author rui.wu
+ * @since 2022-10-14
+ */
+public interface RStatHarmonicOrgQService extends IService<RStatHarmonicOrgQ> {
+
+    /**
+     * 查询查询各单位稳态指标 日/月点数（季）
+     * @param param
+     * @return
+     */
+    List<RArrayVO> getRStatHarmonicQAll(StatisticsBizBaseParam param);
+
+    /**
+     * 查询各单位累计超标监测点数统计图-季数据
+     * @param param
+     * @return
+     */
+    List<RIconVO> getRStatHarmonicOrgQIcon(RStatHarmonicMParam param);
+}
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/RStatHarmonicOrgYService.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/RStatHarmonicOrgYService.java
new file mode 100644
index 000000000..1f11bbffb
--- /dev/null
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/RStatHarmonicOrgYService.java
@@ -0,0 +1,35 @@
+package com.njcn.harmonic.service;
+
+import com.njcn.common.pojo.param.StatisticsBizBaseParam;
+import com.njcn.harmonic.pojo.param.RStatHarmonicMParam;
+import com.njcn.harmonic.pojo.po.RStatHarmonicOrgY;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.njcn.harmonic.pojo.vo.RArrayVO;
+import com.njcn.harmonic.pojo.vo.RIconVO;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author rui.wu
+ * @since 2022-10-14
+ */
+public interface RStatHarmonicOrgYService extends IService<RStatHarmonicOrgY> {
+
+    /**
+     * 查询查询各单位稳态指标 日/月点数（年）
+     * @param param
+     * @return
+     */
+    List<RArrayVO> getRStatHarmonicYAll(StatisticsBizBaseParam param);
+
+    /**
+     * 查询各单位累计超标监测点数统计图-年数据
+     * @param param
+     * @return
+     */
+    List<RIconVO> getRStatHarmonicOrgYIcon(RStatHarmonicMParam param);
+}
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/RStatHarmonicQService.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/RStatHarmonicQService.java
new file mode 100644
index 000000000..61ef84a07
--- /dev/null
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/RStatHarmonicQService.java
@@ -0,0 +1,27 @@
+package com.njcn.harmonic.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.njcn.common.pojo.param.StatisticsBizBaseParam;
+import com.njcn.harmonic.pojo.po.RStatHarmonicQ;
+import com.njcn.harmonic.pojo.vo.RArrayVO;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author rui.wu
+ * @since 2022-10-12
+ */
+public interface RStatHarmonicQService extends IService<RStatHarmonicQ> {
+
+    /**
+     * 查询查询监测点稳态指标 日/月点数
+     * @param param
+     * @return
+     */
+    List<RArrayVO> getRStatHarmonicQAll(StatisticsBizBaseParam param);
+
+}
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/RStatHarmonicYService.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/RStatHarmonicYService.java
new file mode 100644
index 000000000..9d03689cb
--- /dev/null
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/RStatHarmonicYService.java
@@ -0,0 +1,26 @@
+package com.njcn.harmonic.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.njcn.common.pojo.param.StatisticsBizBaseParam;
+import com.njcn.harmonic.pojo.po.RStatHarmonicY;
+import com.njcn.harmonic.pojo.vo.RArrayVO;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author rui.wu
+ * @since 2022-10-12
+ */
+public interface RStatHarmonicYService extends IService<RStatHarmonicY> {
+
+    /**
+     * 查询查询监测点稳态指标 日/月点数
+     * @param param
+     * @return
+     */
+    List<RArrayVO> getRStatHarmonicYAll(StatisticsBizBaseParam param);
+}
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/RStatLoadTypeService.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/RStatLoadTypeService.java
new file mode 100644
index 000000000..e8e0a356c
--- /dev/null
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/RStatLoadTypeService.java
@@ -0,0 +1,26 @@
+package com.njcn.harmonic.service;
+
+import com.njcn.common.pojo.param.StatisticsBizBaseParam;
+import com.njcn.harmonic.pojo.po.RStatLoadTypeM;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.njcn.harmonic.pojo.vo.RArrayVO;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author rui.wu
+ * @since 2022-10-19
+ */
+public interface RStatLoadTypeService extends IService<RStatLoadTypeM> {
+
+    /**
+     * 区域干扰源电流类指标超标统计
+     * @param param
+     * @return
+     */
+    List<RArrayVO> getRStatLoadType(StatisticsBizBaseParam param);
+}
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/RStatOrgBusbarVoltageService.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/RStatOrgBusbarVoltageService.java
new file mode 100644
index 000000000..5ceaae9cd
--- /dev/null
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/RStatOrgBusbarVoltageService.java
@@ -0,0 +1,26 @@
+package com.njcn.harmonic.service;
+
+import com.njcn.common.pojo.param.StatisticsBizBaseParam;
+import com.njcn.harmonic.pojo.po.RStatOrgBusbarVoltageM;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.njcn.harmonic.pojo.vo.RStatOrgBusbarVoltageVO;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author rui.wu
+ * @since 2022-10-19
+ */
+public interface RStatOrgBusbarVoltageService extends IService<RStatOrgBusbarVoltageM> {
+
+    /**
+     * 区域电站母线电压类指标超标计
+     * @param param
+     * @return
+     */
+    List<RStatOrgBusbarVoltageVO> getRStatOrgBusbarVoltage(StatisticsBizBaseParam param);
+}
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/RStatOrgMService.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/RStatOrgMService.java
new file mode 100644
index 000000000..4cf920878
--- /dev/null
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/RStatOrgMService.java
@@ -0,0 +1,26 @@
+package com.njcn.harmonic.service;
+
+import com.njcn.common.pojo.param.StatisticsBizBaseParam;
+import com.njcn.harmonic.pojo.po.RStatOrgM;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.njcn.harmonic.pojo.vo.RStatOrgVO;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 区域分类统计月表 服务类
+ * </p>
+ *
+ * @author rui.wu
+ * @since 2022-10-17
+ */
+public interface RStatOrgMService extends IService<RStatOrgM> {
+
+    /**
+     * 查询区域超标统计-月数据
+     * @param param
+     * @return
+     */
+    List<RStatOrgVO> getRStatHarmonicMAll(StatisticsBizBaseParam param);
+}
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/RStatOrgQService.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/RStatOrgQService.java
new file mode 100644
index 000000000..30930b510
--- /dev/null
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/RStatOrgQService.java
@@ -0,0 +1,26 @@
+package com.njcn.harmonic.service;
+
+import com.njcn.common.pojo.param.StatisticsBizBaseParam;
+import com.njcn.harmonic.pojo.po.RStatOrgQ;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.njcn.harmonic.pojo.vo.RStatOrgVO;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 区域分类统计季表 服务类
+ * </p>
+ *
+ * @author rui.wu
+ * @since 2022-10-17
+ */
+public interface RStatOrgQService extends IService<RStatOrgQ> {
+
+    /**
+     * 查询区域超标统计-季数据
+     * @param param
+     * @return
+     */
+    List<RStatOrgVO> getRStatHarmonicQAll(StatisticsBizBaseParam param);
+}
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/RStatOrgYService.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/RStatOrgYService.java
new file mode 100644
index 000000000..5773e3ada
--- /dev/null
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/RStatOrgYService.java
@@ -0,0 +1,50 @@
+package com.njcn.harmonic.service;
+
+import com.njcn.common.pojo.param.StatisticsBizBaseParam;
+import com.njcn.harmonic.pojo.param.StatSubstationBizBaseParam;
+import com.njcn.harmonic.pojo.po.RStatOrgY;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.njcn.harmonic.pojo.vo.*;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 区域分类统计年表 服务类
+ * </p>
+ *
+ * @author rui.wu
+ * @since 2022-10-17
+ */
+public interface RStatOrgYService extends IService<RStatOrgY> {
+
+    /**
+     * 查询区域超标统计-年数据
+     * @param param
+     * @return
+     */
+    List<RStatOrgVO> getRStatHarmonicYAll(StatisticsBizBaseParam param);
+
+    /**
+     * 区域稳态指标超标分类统计表
+     * @param param
+     * @return
+     */
+    List<RStatSubstationOrg2VO> getRStatSubstationOrg(StatisticsBizBaseParam param);
+
+    /**
+     * 变电站（换流站）稳态指标超标分类统计表
+     * @param param
+     * @return
+     */
+    List<RSubstationIcon2VO.RSubstationInfoVO> getRStatSubstation(StatSubstationBizBaseParam param);
+
+    /**
+     * 区域稳态指标合格率统计表
+     * @param param
+     * @return
+     */
+    List<RStatOrgIndexVO.RStatOrgIndexInfoVO> getRStatOrgIndex(StatisticsBizBaseParam param);
+
+
+}
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/RStatSubstationMService.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/RStatSubstationMService.java
new file mode 100644
index 000000000..0d5932588
--- /dev/null
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/RStatSubstationMService.java
@@ -0,0 +1,34 @@
+package com.njcn.harmonic.service;
+
+import com.njcn.common.pojo.param.StatisticsBizBaseParam;
+import com.njcn.harmonic.pojo.po.RStatSubstationM;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.njcn.harmonic.pojo.vo.RSubstationIcon2VO;
+import com.njcn.harmonic.pojo.vo.RSubstationIconVO;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author rui.wu
+ * @since 2022-10-18
+ */
+public interface RStatSubstationMService extends IService<RStatSubstationM> {
+
+    /**
+     * 变电站稳态指标超标分布（按超标天数）
+     * @param param
+     * @return
+     */
+    RSubstationIconVO getStatSubstationIcon(StatisticsBizBaseParam param);
+
+    /**
+     * 变电站稳态指标平均超标天数
+     * @param param
+     * @return
+     */
+    List<RSubstationIcon2VO> getStatSubstationIcon2(StatisticsBizBaseParam param);
+}
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/RStatSubstationVoltageMService.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/RStatSubstationVoltageMService.java
new file mode 100644
index 000000000..88d72bc20
--- /dev/null
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/RStatSubstationVoltageMService.java
@@ -0,0 +1,28 @@
+package com.njcn.harmonic.service;
+
+import com.njcn.common.pojo.param.StatisticsBizBaseParam;
+import com.njcn.harmonic.pojo.po.RStatSubstationVoltageM;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.njcn.harmonic.pojo.vo.RVoltageIconVO;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author rui.wu
+ * @since 2022-10-18
+ */
+public interface RStatSubstationVoltageMService extends IService<RStatSubstationVoltageM> {
+
+    /**
+     * 变电站稳态指标超标分布（按电压等级）
+     * @param param
+     * @return
+     */
+    List<RVoltageIconVO> getStatSubstationIcon(StatisticsBizBaseParam param);
+
+
+}
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/CustomReportServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/CustomReportServiceImpl.java
index 10e442ead..40b88d042 100644
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/CustomReportServiceImpl.java
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/CustomReportServiceImpl.java
@@ -314,18 +314,17 @@ public class CustomReportServiceImpl implements CustomReportService {
 
     @Override
     public List<ReportTreeVO> reportChooseTree() {
-        long a = System.currentTimeMillis();
         LambdaQueryWrapper<EleEpdPqd> lambdaQueryWrapper = new LambdaQueryWrapper<>();
         lambdaQueryWrapper.isNotNull(EleEpdPqd::getOtherName);
         lambdaQueryWrapper.orderByAsc(EleEpdPqd::getSort);
         List<EleEpdPqd> list = eleEpdMapper.selectList(lambdaQueryWrapper);
-        Map<String, List<EleEpdPqd>> map = list.stream().collect(Collectors.groupingBy(EleEpdPqd::getOtherName));
+        Map<String, List<EleEpdPqd>> map = list.stream().collect(Collectors.groupingBy(EleEpdPqd::getName));
 
         List<ReportTreeVO> tree = new ArrayList<>();
         map.forEach((key, value) -> {
 
             ReportTreeVO reportTreeVO = new ReportTreeVO();
-            reportTreeVO.setName(key);
+            reportTreeVO.setName(value.get(0).getOtherName());
             reportTreeVO.setShowName(value.get(0).getShowName());
 
             //存在1-50次 2-50次情况
@@ -341,13 +340,10 @@ public class CustomReportServiceImpl implements CustomReportService {
                 }
                 reportTreeVO.setChildren(reHarm);
             } else {
-                assPhase(value, reportTreeVO, key);
+                assPhase(value, reportTreeVO, value.get(0).getOtherName());
             }
             tree.add(reportTreeVO);
         });
-
-        long b = System.currentTimeMillis();
-        System.out.println(b - a);
         return tree;
     }
 
@@ -364,6 +360,7 @@ public class CustomReportServiceImpl implements CustomReportService {
                 assStatMethod(item, statTree, key, item.getPhase());
                 reportTreePhase.setChildren(statTree);
                 phaseTree.add(reportTreePhase);
+                reportTreeItem.setChildren(phaseTree);
 
             } else {
                 List<ReportTreeVO> statTree = new ArrayList<>();
@@ -371,7 +368,6 @@ public class CustomReportServiceImpl implements CustomReportService {
                 reportTreeItem.setChildren(statTree);
             }
         });
-        reportTreeItem.setChildren(phaseTree);
 
     }
 
@@ -430,7 +426,6 @@ public class CustomReportServiceImpl implements CustomReportService {
      * @return 结果
      */
     private void assSql(ReportTemplateDTO data, StringBuilder sql, List<ReportTemplateDTO> endList, String method, ReportSearchParam reportSearchParam) {
-        InfluxDbUtils influxDBUtil = new InfluxDbUtils(influxDbConfig.getUserName(), influxDbConfig.getPassword(), influxDbConfig.getInfluxDBUrl(), influxDbConfig.getDatabase(), "");
         //sql拼接示例：select MAX(IHA2) as IHA2 from power_quality_data where Phase = 'A' and LineId='1324564568' and Stat_Method='max' tz('Asia/Shanghai')
         if (InfluxDBTableConstant.NO_PHASE.equals(data.getPhase())) {
             sql.append(method).append(InfluxDBSqlConstant.LBK).append(data.getTemplateName()).append(InfluxDBSqlConstant.RBK).append(InfluxDBSqlConstant.AS_VALUE)
@@ -448,7 +443,7 @@ public class CustomReportServiceImpl implements CustomReportService {
         }
 
         //根据不同的库表赋值
-        QueryResult queryResult = influxDBUtil.query(String.valueOf(sql));
+        QueryResult queryResult = influxDbUtils.query(String.valueOf(sql));
 
         //剖析influx数据，填入value
         List<QueryResult.Result> results = queryResult.getResults();
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/DataExceptionServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/DataExceptionServiceImpl.java
new file mode 100644
index 000000000..c4ec703d6
--- /dev/null
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/DataExceptionServiceImpl.java
@@ -0,0 +1,182 @@
+package com.njcn.harmonic.service.impl;
+
+import cn.hutool.core.date.DateUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.njcn.common.pojo.exception.BusinessException;
+import com.njcn.device.pq.api.LineFeignClient;
+import com.njcn.device.pq.pojo.vo.LineDetailDataVO;
+import com.njcn.harmonic.constant.Param;
+import com.njcn.harmonic.enums.HarmonicResponseEnum;
+import com.njcn.harmonic.mapper.PmsAbnormalRulesMapper;
+import com.njcn.harmonic.mapper.RStatAbnormalDMapper;
+import com.njcn.harmonic.pojo.param.AlgorithmSearchParam;
+import com.njcn.harmonic.pojo.po.DataV;
+import com.njcn.harmonic.pojo.po.PmsAbnormalRules;
+import com.njcn.harmonic.pojo.po.RStatAbnormalD;
+import com.njcn.harmonic.service.DataExceptionService;
+import com.njcn.influxdb.config.InfluxDbConfig;
+import com.njcn.influxdb.param.InfluxDBPublicParam;
+import com.njcn.influxdb.param.InfluxDBSqlConstant;
+import com.njcn.influxdb.param.InfluxDBTableConstant;
+import com.njcn.influxdb.utils.InfluxDbUtils;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.influxdb.dto.QueryResult;
+import org.influxdb.impl.InfluxDBResultMapper;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.Objects;
+
+/**
+ * 数据是否异常
+ *
+ * @author qijian
+ * @version 1.0.0
+ * @createTime 2022/10/26 - 10:09
+ */
+@Service
+@RequiredArgsConstructor
+@Slf4j
+public class DataExceptionServiceImpl implements DataExceptionService {
+
+    private final InfluxDbUtils influxDbUtils;
+
+    private final LineFeignClient lineFeignClient;
+
+    private final PmsAbnormalRulesMapper pmsAbnormalRulesMapper;
+
+    private final RStatAbnormalDMapper rStatAbnormalDMapper;
+
+    @Resource
+    private InfluxDbConfig influxDbConfig;
+
+    /**
+     * 监测点数据是否异常
+     * @author qijian
+     * @date 2022/10/26
+     */
+    @Override
+    public boolean lineDataException(AlgorithmSearchParam algorithmSearchParam) {
+        //测试
+//        InfluxDbUtils influxDBUtil = new InfluxDbUtils("admin", "njcnpqs", "http://192.168.1.18:8086", "pqsbase", "");
+        //初始化
+        InfluxDBResultMapper resultMapper = new InfluxDBResultMapper();
+        String searchSql;
+        String sql;
+        QueryResult query;
+        DataV dataV;
+        Date date = DateUtil.parse(algorithmSearchParam.getDatadate());
+        String lineId = algorithmSearchParam.getId();
+
+        //入库数据初始化
+        RStatAbnormalD rStatAbnormalD = new RStatAbnormalD();
+        rStatAbnormalD.setDataDate(date);
+        rStatAbnormalD.setMeasurementPointId(lineId);
+        rStatAbnormalD.setValueAlarm(0);
+
+        //1、取出规则
+        List<PmsAbnormalRules> pmsAbnormalRules = pmsAbnormalRulesMapper.selectList(null);
+
+        //2、取出电压
+        List<String> lineIds = new ArrayList<>();
+        lineIds.add(lineId);
+        List<LineDetailDataVO> lineDetailList = lineFeignClient.getLineDetailList(lineIds).getData();
+        if (lineDetailList.size() == 0){
+            throw new BusinessException(HarmonicResponseEnum.ALGORITHM_LINE_EMPTY);
+        }
+        String scale = lineDetailList.get(0).getScale().replace("kV","");
+
+        //3、根据规则表进行判断
+        //取前四项进行比较（相别为A）
+        searchSql = "MAX(freq) as freq_max,MIN(freq) as freq_min,MAX(rms) as rms_max,MIN(rms) as rms_min,MAX(rms_lvr) as rms_lvr_max,MIN(rms_lvr) as rms_lvr_min,MAX(v_thd) as v_thd_max,MIN(v_thd) as v_thd_min ";
+        sql = getAppend(lineId, date, searchSql, "A");
+        query = influxDbUtils.query(sql);
+        dataV = resultMapper.toPOJO(query, DataV.class).get(0);
+
+        //开始判断业务
+        HarmonicResponseEnum harmonicResponseEnum = null;
+        for (PmsAbnormalRules pmsAbnormalRule : pmsAbnormalRules) {
+            //每项数据进行上下限比较（MAX和MIN），若有一项不在数据范围内，则为异常
+            switch (pmsAbnormalRule.getTarget()) {
+                case Param.TARGET_FREQ:
+                    //频率：正常比较
+                    if (dataV.getFrepMIN() < pmsAbnormalRule.getLowerLimit() || dataV.getFrepMAX() > pmsAbnormalRule.getUpperLimit()){
+                        harmonicResponseEnum = HarmonicResponseEnum.ALGORITHM_FREP_RULE;
+                    }
+                    break;
+                case Param.TARGET_RMS:
+                    //相电压有效值特殊处理：在【0.85p.u.，1.2p.u.】之间；p.u=电压等级/1.732
+                    pmsAbnormalRule.setLowerLimit((pmsAbnormalRule.getLowerLimit() * (Double.parseDouble(scale) / 1.732)));
+                    pmsAbnormalRule.setUpperLimit((pmsAbnormalRule.getUpperLimit() * (Double.parseDouble(scale) / 1.732)));
+                    if (dataV.getRmsMIN() < pmsAbnormalRule.getLowerLimit() || dataV.getRmsMAX() > pmsAbnormalRule.getUpperLimit()){
+                        harmonicResponseEnum = HarmonicResponseEnum.ALGORITHM_RMS_RULE;
+                    }
+                    break;
+                case Param.TARGET_RMS_LVR:
+                    //线电压有效值特殊处理：在【0.85p.u.，1.2p.u.】之间；p.u=电压等级
+                    pmsAbnormalRule.setLowerLimit((pmsAbnormalRule.getLowerLimit() * Double.parseDouble(scale)));
+                    pmsAbnormalRule.setUpperLimit((pmsAbnormalRule.getUpperLimit() * Double.parseDouble(scale)));
+                    if (dataV.getRmsLvrMIN() < pmsAbnormalRule.getLowerLimit() || dataV.getRmsLvrMAX() > pmsAbnormalRule.getUpperLimit()){
+                        harmonicResponseEnum = HarmonicResponseEnum.ALGORITHM_RMS_LVR_RULE;
+                    }
+                    break;
+                case Param.TARGET_V_THD:
+                    //电压总谐波畸变率：正常比较
+                    if (dataV.getVThdMIN() < pmsAbnormalRule.getLowerLimit() || dataV.getVThdMAX() > pmsAbnormalRule.getUpperLimit()){
+                        harmonicResponseEnum = HarmonicResponseEnum.ALGORITHM_V_THD_RULE;
+                    }
+                    break;
+                case Param.TARGET_V_UNBALANCE:
+                    //三相不平衡度：正常比较（相别为T）
+                    searchSql = "MAX(v_unbalance) as v_unbalance_max,MIN(v_unbalance) as v_unbalance_min ";
+                    sql = getAppend(lineId, date, searchSql, "T");
+                    query = influxDbUtils.query(sql);
+                    dataV = resultMapper.toPOJO(query, DataV.class).get(0);
+                    if (dataV.getVUnbalanceMIN() < pmsAbnormalRule.getLowerLimit() || dataV.getVUnbalanceMAX() > pmsAbnormalRule.getUpperLimit()){
+                        harmonicResponseEnum = HarmonicResponseEnum.ALGORITHM_V_UNBALANCE_RULE;
+                    }
+                    break;
+                default:
+                    break;
+            }
+
+            if (harmonicResponseEnum != null){
+                //入库
+                LambdaQueryWrapper<RStatAbnormalD> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+                lambdaQueryWrapper.eq(RStatAbnormalD::getMeasurementPointId, lineId).eq(RStatAbnormalD::getDataDate, date);
+                RStatAbnormalD rStatAbnormalDOne = rStatAbnormalDMapper.selectOne(lambdaQueryWrapper);
+                if (Objects.isNull(rStatAbnormalDOne)){
+                    rStatAbnormalDMapper.insert(rStatAbnormalD);
+                }
+                throw new BusinessException(harmonicResponseEnum);
+            }
+
+        }
+        return true;
+    }
+
+    /**
+     * 拼装sql
+     * @param id,date,searchSql,tableName 参数
+     * @return 结果
+     */
+    private String getAppend(String id, Date date, String searchSql,String type) {
+        StringBuilder stringBuilder = new StringBuilder();
+        stringBuilder.append(InfluxDBSqlConstant.SELECT).append(searchSql)
+                .append(InfluxDBSqlConstant.FROM).append(InfluxDBPublicParam.DATA_V)
+                .append(InfluxDBSqlConstant.WHERE).append(InfluxDBPublicParam.TIME).append(InfluxDBSqlConstant.GE).append(InfluxDBSqlConstant.QM).append(DateUtil.beginOfDay(date)).append(InfluxDBSqlConstant.QM)
+                .append(InfluxDBSqlConstant.AND).append(InfluxDBPublicParam.TIME).append(InfluxDBSqlConstant.LE).append(InfluxDBSqlConstant.QM).append(DateUtil.endOfDay(date)).append(InfluxDBSqlConstant.QM)
+                .append(InfluxDBSqlConstant.AND).append(InfluxDBPublicParam.LINE_ID).append(InfluxDBSqlConstant.EQ).append(InfluxDBSqlConstant.QM).append(id).append(InfluxDBSqlConstant.QM)
+                .append(InfluxDBSqlConstant.AND).append(InfluxDBPublicParam.VALUE_TYPE).append(InfluxDBSqlConstant.EQ).append(InfluxDBSqlConstant.QM).append(InfluxDBTableConstant.AVG).append(InfluxDBSqlConstant.QM);
+        if (InfluxDBTableConstant.PHASE_TYPE_T.equals(type)){
+            stringBuilder.append(InfluxDBSqlConstant.AND).append(InfluxDBPublicParam.PHASIC_TYPE).append(InfluxDBSqlConstant.EQ).append(InfluxDBSqlConstant.QM).append(InfluxDBTableConstant.PHASE_TYPE_T).append(InfluxDBSqlConstant.QM);
+        }else{
+            stringBuilder.append(InfluxDBSqlConstant.AND).append(InfluxDBPublicParam.PHASIC_TYPE).append(InfluxDBSqlConstant.EQ).append(InfluxDBSqlConstant.QM).append(InfluxDBTableConstant.PHASE_TYPE_A).append(InfluxDBSqlConstant.QM);
+        }
+        return stringBuilder.toString();
+    }
+}
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/DataIntegrityRateServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/DataIntegrityRateServiceImpl.java
new file mode 100644
index 000000000..8a7cdfa40
--- /dev/null
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/DataIntegrityRateServiceImpl.java
@@ -0,0 +1,192 @@
+package com.njcn.harmonic.service.impl;
+
+import cn.hutool.core.date.DateUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.njcn.common.pojo.exception.BusinessException;
+import com.njcn.device.pq.api.LineFeignClient;
+import com.njcn.device.pq.pojo.vo.LineDetailDataVO;
+import com.njcn.harmonic.enums.HarmonicResponseEnum;
+import com.njcn.harmonic.mapper.RMpIntegrityDMapper;
+import com.njcn.harmonic.pojo.param.AlgorithmSearchParam;
+import com.njcn.harmonic.pojo.po.RMpIntegrityD;
+import com.njcn.harmonic.service.DataIntegrityRateService;
+import com.njcn.influxdb.config.InfluxDbConfig;
+import com.njcn.influxdb.param.InfluxDBPublicParam;
+import com.njcn.influxdb.param.InfluxDBSqlConstant;
+import com.njcn.influxdb.param.InfluxDBTableConstant;
+import com.njcn.influxdb.utils.InfluxDbUtils;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.influxdb.dto.QueryResult;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.text.DecimalFormat;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.Objects;
+
+/**
+ * 数据完整率算法
+ *
+ * @author qijian
+ * @version 1.0.0
+ * @createTime 2022/10/26 - 10:09
+ */
+@Service
+@RequiredArgsConstructor
+@Slf4j
+public class DataIntegrityRateServiceImpl implements DataIntegrityRateService {
+
+    private final InfluxDbUtils influxDbUtils;
+
+    private final RMpIntegrityDMapper rMpIntegrityDMapper;
+
+    private final LineFeignClient lineFeignClient;
+
+    @Resource
+    private InfluxDbConfig influxDbConfig;
+
+    /**
+     * 监测点日数据完整率
+     * @author qijian
+     * @date 2022/10/26
+     */
+    @Override
+    public boolean lineDataIntegrityRate(AlgorithmSearchParam algorithmSearchParam) {
+        //测试
+//        InfluxDbUtils influxDBUtil = new InfluxDbUtils("admin", "njcnpqs", "http://192.168.1.18:8086", "pqsbase", "");
+        //初始化
+        String searchSql;
+        String tableName;
+        String sql;
+        QueryResult query;
+        QueryResult.Series series;
+        List<String> columns;
+        List<List<Object>> values;
+        RMpIntegrityD rMpIntegrityD = new RMpIntegrityD();
+        Date date = DateUtil.parse(algorithmSearchParam.getDatadate());
+
+        //1、有效接入分钟数量：根据监测点编号获取统计间隔，1440 / 统计间隔 = 有效接入分钟数量
+        List<String> lineIds = new ArrayList<>();
+        lineIds.add(algorithmSearchParam.getId());
+        List<LineDetailDataVO> lineDetailList = lineFeignClient.getLineDetailList(lineIds).getData();
+        if (lineDetailList.size() == 0){
+            throw new BusinessException(HarmonicResponseEnum.ALGORITHM_LINE_EMPTY);
+        }
+        Integer effectiveMinuteCount = 1440 / lineDetailList.get(0).getTimeInterval();
+        rMpIntegrityD.setEffectiveMinuteCount(effectiveMinuteCount);
+
+        //2、根据data_v表获取五项稳态指标日数量（count）
+        searchSql = "count(freq) as freqCount,count(rms) as phaseVoltageCount,count(rms_lvr) as lineVoltageCount,count(v_thd) as vThdCount,count(v_unbalance) as unbalanceCount ";
+        tableName = InfluxDBPublicParam.DATA_V;
+        sql = getAppend(algorithmSearchParam.getId(), date, searchSql, tableName);
+        query = influxDbUtils.query(sql);
+        series = getSeries(query);
+
+        if (Objects.nonNull(series.getColumns())){
+            columns = series.getColumns();
+            values = series.getValues();
+            for (List<Object> columnValue : values) {
+                for (int i = 0; i < columnValue.size(); i++) {
+                    if (columns.get(i).equals("freqCount")) {
+                        rMpIntegrityD.setFreqCount(Integer.parseInt(convertDoubleToString(columnValue.get(i))));
+                    }else if (columns.get(i).equals("phaseVoltageCount")) {
+                        rMpIntegrityD.setPhaseVoltageCount(Integer.parseInt(convertDoubleToString(columnValue.get(i))));
+                    }else if (columns.get(i).equals("lineVoltageCount")) {
+                        rMpIntegrityD.setLineVoltageCount(Integer.parseInt(convertDoubleToString(columnValue.get(i))));
+                    }else if (columns.get(i).equals("vThdCount")) {
+                        rMpIntegrityD.setVThdCount(Integer.parseInt(convertDoubleToString(columnValue.get(i))));
+                    }else if (columns.get(i).equals("unbalanceCount")) {
+                        rMpIntegrityD.setUnbalanceCount(Integer.parseInt(convertDoubleToString(columnValue.get(i))));
+                    }
+                }
+            }
+        }
+
+        //3、根据day_flicker表获取两项闪变指标数量（count）
+        searchSql = "count(pst) as pstCount,count(plt) as pltCount ";
+        tableName = InfluxDBPublicParam.DATA_FLICKER;
+        sql = getAppend(algorithmSearchParam.getId(), date, searchSql, tableName);
+        query = influxDbUtils.query(sql);
+        series = getSeries(query);
+
+        if (Objects.nonNull(series.getColumns())){
+            columns = series.getColumns();
+            values = series.getValues();
+            for (List<Object> columnValue : values) {
+                for (int i = 0; i < columnValue.size(); i++) {
+                    if (columns.get(i).equals("pstCount")) {
+                        rMpIntegrityD.setPstCount(Integer.parseInt(convertDoubleToString(columnValue.get(i))));
+                    }else if (columns.get(i).equals("pltCount")) {
+                        rMpIntegrityD.setPltCount(Integer.parseInt(convertDoubleToString(columnValue.get(i))));
+                    }
+                }
+            }
+        }
+
+        //4、存库
+        LambdaQueryWrapper<RMpIntegrityD> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+        lambdaQueryWrapper.eq(RMpIntegrityD::getMeasurementPointId, algorithmSearchParam.getId()).eq(RMpIntegrityD::getDataDate, date);
+        RMpIntegrityD rMpIntegrityDOne = rMpIntegrityDMapper.selectOne(lambdaQueryWrapper);
+        if (Objects.nonNull(rMpIntegrityDOne)){
+            rMpIntegrityDMapper.update(rMpIntegrityD,lambdaQueryWrapper);
+        }else{
+            rMpIntegrityD.setMeasurementPointId(algorithmSearchParam.getId());
+            rMpIntegrityD.setDataDate(date);
+            rMpIntegrityDMapper.insert(rMpIntegrityD);
+        }
+
+        return true;
+    }
+
+    /**
+     * Double转String
+     * @param val 参数
+     * @return 结果
+     */
+    private String convertDoubleToString(Object val) {
+        DecimalFormat decimalFormat = new DecimalFormat("###################.###########");
+        return decimalFormat.format(val);
+    }
+
+    /**
+     * 取series
+     * @param query 参数
+     * @return 结果
+     */
+    private QueryResult.Series getSeries(QueryResult query) {
+        QueryResult.Series series = new QueryResult.Series();
+        List<QueryResult.Result> results = query.getResults();
+        if (results.size() != 0) {
+            QueryResult.Result result = results.get(0);
+            if (result.getSeries() != null){
+                List<QueryResult.Series> seriess = result.getSeries();
+                if (seriess.size() != 0) {
+                    series = seriess.get(0);
+                }
+            }
+        }
+        return series;
+    }
+
+    /**
+     * 拼装sql
+     * @param id,date,searchSql,tableName 参数
+     * @return 结果
+     */
+    private String getAppend(String id, Date date, String searchSql,String tableName) {
+        StringBuilder stringBuilder = new StringBuilder();
+        stringBuilder.append(InfluxDBSqlConstant.SELECT).append(searchSql)
+                .append(InfluxDBSqlConstant.FROM).append(tableName)
+                .append(InfluxDBSqlConstant.WHERE).append(InfluxDBPublicParam.TIME).append(InfluxDBSqlConstant.GE).append(InfluxDBSqlConstant.QM).append(DateUtil.beginOfDay(date)).append(InfluxDBSqlConstant.QM)
+                .append(InfluxDBSqlConstant.AND).append(InfluxDBPublicParam.TIME).append(InfluxDBSqlConstant.LE).append(InfluxDBSqlConstant.QM).append(DateUtil.endOfDay(date)).append(InfluxDBSqlConstant.QM)
+                .append(InfluxDBSqlConstant.AND).append(InfluxDBPublicParam.LINE_ID).append(InfluxDBSqlConstant.EQ).append(InfluxDBSqlConstant.QM).append(id).append(InfluxDBSqlConstant.QM)
+                .append(InfluxDBSqlConstant.AND).append(InfluxDBPublicParam.PHASIC_TYPE).append(InfluxDBSqlConstant.EQ).append(InfluxDBSqlConstant.QM).append(InfluxDBTableConstant.PHASE_TYPE_A).append(InfluxDBSqlConstant.QM);
+        if (InfluxDBPublicParam.DATA_V.equals(tableName)){
+            stringBuilder.append(InfluxDBSqlConstant.AND).append(InfluxDBPublicParam.VALUE_TYPE).append(InfluxDBSqlConstant.EQ).append(InfluxDBSqlConstant.QM).append(InfluxDBTableConstant.AVG).append(InfluxDBSqlConstant.QM);
+        }
+        return stringBuilder.toString();
+    }
+}
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/HistoryResultServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/HistoryResultServiceImpl.java
index dd986bac1..990dcc241 100644
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/HistoryResultServiceImpl.java
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/HistoryResultServiceImpl.java
@@ -78,7 +78,7 @@ public class HistoryResultServiceImpl implements HistoryResultService {
             List<EventDetailVO> eventDetailVOList = new ArrayList<>();
             if (!eventDetailList.isEmpty()) {
                 for (EventDetail eventdetail : eventDetailList) {
-                    Instant now = eventdetail.getTimeId();
+                    Instant now = eventdetail.getTimeId().plusMillis(TimeUnit.HOURS.toMillis(8));
                     Long time = now.toEpochMilli();
                     String timeText = format.format(time);
                     EventDetailVO eventDetailVO = new EventDetailVO();
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/PollutionSubstationServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/PollutionSubstationServiceImpl.java
index abed34803..a4ace95cb 100644
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/PollutionSubstationServiceImpl.java
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/PollutionSubstationServiceImpl.java
@@ -3,6 +3,8 @@ package com.njcn.harmonic.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.njcn.common.config.GeneralInfo;
+import com.njcn.common.pojo.enums.response.CommonResponseEnum;
+import com.njcn.common.pojo.exception.BusinessException;
 import com.njcn.device.pq.api.GeneralDeviceInfoClient;
 import com.njcn.device.pq.api.LineFeignClient;
 import com.njcn.device.pq.api.SubstationFeignClient;
@@ -19,11 +21,13 @@ import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
 
 import java.util.*;
 import java.util.stream.Collectors;
 
 /**
+ * 
  * Description:
  * 接口文档访问地址：http://serverIP:port/swagger-ui.html
  * Date: 2022/10/13  8:56【需求编号】
@@ -59,58 +63,62 @@ public class PollutionSubstationServiceImpl extends ServiceImpl<RStatPollutionSu
     @Override
     public List<PollutionSubstationVO> getPollutionSubstationData(PollutionSubstationQuryParam pollutionSubstationQuryParam) {
 
-        List<PollutionSubstationVO> pollutionSubstationVOList = new ArrayList<>();
+        List<PollutionSubstationVO> pollutionSubstationVOList = new ArrayList<> ();
         /*根据部门获取变电站详情*/
         HarmonicPublicParam harmonicPublicParam = new HarmonicPublicParam();
-        BeanUtils.copyProperties(pollutionSubstationQuryParam, harmonicPublicParam);
+        BeanUtils.copyProperties (pollutionSubstationQuryParam, harmonicPublicParam);
         harmonicPublicParam.setServerName(generalInfo.getMicroServiceName());
         List<PollutionSubstationDTO> pollutionSubstationDTOList = new ArrayList<>();
         List<GeneralDeviceDTO> sub = generalDeviceInfoClient.getPracticalRunDeviceInfoAsSubstation(harmonicPublicParam).getData();
-
-        sub.forEach(item -> {
+        
+        sub.forEach(item->{
             PollutionSubstationDTO pollutionSubstationDTO = lineFeignClient.getSubstationInfo(item.getIndex()).getData();
 
             pollutionSubstationDTOList.add(pollutionSubstationDTO);
         });
-        List<String> collect = pollutionSubstationDTOList.stream().map(PollutionSubstationDTO::getId).collect(Collectors.toList());
-        List<SubstationDTO> locationData = substationFeignClient.getSubstationById(collect).getData();
+        List<String> collect = pollutionSubstationDTOList.stream ( ).map (PollutionSubstationDTO::getId).collect (Collectors.toList ( ));
+        List<SubstationDTO> locationData = substationFeignClient.getSubstationById (collect).getData ( );
         /*todo 后期可以把locationData存入redis*/
         /*把所有的变电站的污染指数查出来*/
-        QueryWrapper<RStatPollutionSubstationM> wrapper = new QueryWrapper<>();
-        wrapper.in("substation_id", collect).
-                eq("pollution_type", pollutionSubstationQuryParam.getPollutionStatis().getId()).
-                apply("DATE_FORMAT( data_date ,'%Y-%m') = '" + pollutionSubstationQuryParam.getLocalDate() + "'");
-        List<RStatPollutionSubstationM> rStatPollutionSubstationMList = pollutionSubstationMMapper.selectList(wrapper);
+        QueryWrapper<RStatPollutionSubstationM> wrapper = new QueryWrapper<> ();
+        wrapper.in ("substation_id",collect).
+                eq ("pollution_type", pollutionSubstationQuryParam.getPollutionStatis ().getId ()).
+                apply("DATE_FORMAT( data_date ,'%Y-%m') = '"+pollutionSubstationQuryParam.getLocalDate ()+"'");
+        List<RStatPollutionSubstationM> rStatPollutionSubstationMList = pollutionSubstationMMapper.selectList (wrapper);
 
-        pollutionSubstationDTOList.forEach(substationInfo -> {
+        pollutionSubstationDTOList.forEach (substationInfo ->{
 
-            PollutionSubstationVO pollutionSubstationVO = new PollutionSubstationVO();
-            pollutionSubstationVO.setSubstationId(substationInfo.getId());
-            pollutionSubstationVO.setSubstationName(substationInfo.getName());
+            PollutionSubstationVO pollutionSubstationVO =new PollutionSubstationVO ();
+            pollutionSubstationVO.setSubstationId (substationInfo.getId ());
+            pollutionSubstationVO.setSubstationName (substationInfo.getName ());
             /*todo 添加经纬度接口返回数据暂时没有*/
-            SubstationDTO substationDTO = locationData
-                    .stream()
-                    .filter(temp -> Objects.equals(substationInfo.getId(), temp.getId()))
-                    .collect(Collectors.toList())
-                    .get(0);
+            List<SubstationDTO> substationDTOList = locationData.stream ( )
+                    .filter (temp -> Objects.equals (substationInfo.getId ( ), temp.getId ( )))
+                    .collect (Collectors.toList ( ));
 
-            pollutionSubstationVO.setLatitude(substationDTO.getLat());
-            pollutionSubstationVO.setLongitude(substationDTO.getLng());
+            SubstationDTO substationDTO = new SubstationDTO ();
+            if(CollectionUtils.isEmpty (substationDTOList)){
+                throw new BusinessException (CommonResponseEnum.INTERNAL_ERROR);
+            }else{
+                substationDTO = substationDTOList.get (0);
+            }
 
+            pollutionSubstationVO.setLatitude (substationDTO.getLat ());
+            pollutionSubstationVO.setLongitude (substationDTO.getLng ());
 
-            Double value = Optional.ofNullable(
-                    rStatPollutionSubstationMList
-                            .stream()
-                            .filter(temp -> Objects.equals(substationInfo.getId(), temp.getSubstationId()))
-                            .collect(Collectors.toList())
-                            .get(0)
-                            .getValue()
-            ).orElse(new Double("0.00"));
-            pollutionSubstationVO.setPollutionData(value);
-            pollutionSubstationVO.setPollutionStatis(pollutionSubstationQuryParam.getStatisticalType().getName());
-            pollutionSubstationVOList.add(pollutionSubstationVO);
+            List<RStatPollutionSubstationM> rStatPollutionSubstationMS = rStatPollutionSubstationMList.stream ( ).
+                    filter (temp -> Objects.equals (substationInfo.getId ( ), temp.getSubstationId ( )))
+                    .collect (Collectors.toList ( ));
+
+            Double value = 3.14159;
+            if(!CollectionUtils.isEmpty (rStatPollutionSubstationMS)){
+                value = rStatPollutionSubstationMS.get (0).getValue ();
+            }
+            pollutionSubstationVO.setPollutionData (value);
+            pollutionSubstationVO.setPollutionStatis ( pollutionSubstationQuryParam.getStatisticalType ().getName ());
+            pollutionSubstationVOList.add (pollutionSubstationVO);
         });
-        List<PollutionSubstationVO> result = pollutionSubstationVOList.stream().sorted(Comparator.comparing(PollutionSubstationVO::getPollutionData).reversed()).collect(Collectors.toList());
+        List<PollutionSubstationVO> result = pollutionSubstationVOList.stream ( ).sorted (Comparator.comparing (PollutionSubstationVO::getPollutionData).reversed ( )).collect (Collectors.toList ( ));
 
         return result;
     }
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/RMpBenchmarkLevelMServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/RMpBenchmarkLevelMServiceImpl.java
new file mode 100644
index 000000000..bbee3dd02
--- /dev/null
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/RMpBenchmarkLevelMServiceImpl.java
@@ -0,0 +1,129 @@
+package com.njcn.harmonic.service.impl;
+
+import cn.hutool.core.collection.CollUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.njcn.common.pojo.dto.SimpleDTO;
+import com.njcn.common.pojo.enums.response.CommonResponseEnum;
+import com.njcn.common.pojo.exception.BusinessException;
+import com.njcn.device.pms.api.MonitorClient;
+import com.njcn.device.pms.api.PmsGeneralDeviceInfoClient;
+import com.njcn.device.pms.pojo.dto.PmsGeneralDeviceDTO;
+import com.njcn.device.pms.pojo.dto.PmsMonitorInfoDTO;
+import com.njcn.device.pms.pojo.param.PmsDeviceInfoParam;
+import com.njcn.device.pms.pojo.param.PmsMonitorInfoParam;
+import com.njcn.harmonic.mapper.RMpBenchmarkLevelMMapper;
+import com.njcn.harmonic.pojo.param.RMpBenchmarkLevelParam;
+import com.njcn.harmonic.pojo.po.RMpBenchmarkLevelM;
+import com.njcn.harmonic.pojo.vo.RMpBenchmarkLevelVO;
+import com.njcn.harmonic.service.RMpBenchmarkLevelMService;
+import com.njcn.system.api.DicDataFeignClient;
+import com.njcn.system.enums.DicDataTypeEnum;
+import com.njcn.system.pojo.po.DictData;
+import lombok.RequiredArgsConstructor;
+import org.apache.commons.lang.StringUtils;
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+/**
+* @author jianghf
+* @description 针对表【r_mp_benchmark_level_m】的数据库操作Service实现
+* @createDate 2022-10-11 10:32:18
+*/
+@Service
+@RequiredArgsConstructor
+public class RMpBenchmarkLevelMServiceImpl extends ServiceImpl<RMpBenchmarkLevelMMapper, RMpBenchmarkLevelM>
+implements RMpBenchmarkLevelMService {
+
+    private final DicDataFeignClient dicDataFeignClient;
+
+    private final PmsGeneralDeviceInfoClient pmsGeneralDeviceInfoClient;
+
+    private final MonitorClient monitorClient;
+
+    @Override
+    public List<RMpBenchmarkLevelVO> getRMpBenchmarkLevelList(RMpBenchmarkLevelParam rMpBenchmarkLevelParam) {
+        //提取查询条件
+        String id = rMpBenchmarkLevelParam.getId(); //单位id
+        if (StringUtils.isBlank(id)) {
+            throw new BusinessException(CommonResponseEnum.NO_DATA, "单位id不可为空");
+        }
+        String startTime = rMpBenchmarkLevelParam.getStartTime(); //开始时间
+        String endTime = rMpBenchmarkLevelParam.getEndTime(); //截止时间
+        String benchmarkIndicator = rMpBenchmarkLevelParam.getBenchmarkIndicator(); //评价指标
+        List <String> voltageLevelParamList = StringUtils.isNotBlank(rMpBenchmarkLevelParam.getVoltageLevel()) ? Arrays.asList(rMpBenchmarkLevelParam.getVoltageLevel().split(",")) : null; //电压等级
+
+        //获取电压等级的字典
+        List<DictData> voltageLevelList = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.DEV_VOLTAGE.getCode()).getData();
+        //将电压信息转成map，key：id  value：name
+        Map<String, String> voltageLevelMap = voltageLevelList.stream().collect(Collectors.toMap(DictData::getId, DictData::getName));
+        //获取基准水平评价指标字典
+        List<DictData> benchmarkIndicatorList = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.BENCHMARK_INDICATORS.getCode()).getData();
+        //将基准水平评价指标信息转成map，key：id  value：name
+        Map<String, String> benchmarkIndicatorMap = benchmarkIndicatorList.stream().collect(Collectors.toMap(DictData::getId, DictData::getName));
+
+        //查询所有子单位下的所有监测点
+        PmsDeviceInfoParam pmsDeviceInfoParam = new PmsDeviceInfoParam(id);
+        pmsDeviceInfoParam.setStatisticalType(new SimpleDTO());
+        if (CollUtil.isNotEmpty(voltageLevelParamList)) {
+            //查询条件：电压等级（筛选电压等级为voltageLevel的监测点）
+            List<SimpleDTO> simpleDTOList = voltageLevelParamList.stream().map(item -> {
+                SimpleDTO simpleDTO = new SimpleDTO();
+                simpleDTO.setId(item);
+                return simpleDTO;
+            }).collect(Collectors.toList());
+            pmsDeviceInfoParam.setVoltageLevel(simpleDTOList);
+        }
+        //获取到该部门的所有子部门的监测点idList
+        List<PmsGeneralDeviceDTO> pmsDeviceInfoWithInOrg = pmsGeneralDeviceInfoClient.getPmsDeviceInfoWithInOrg(pmsDeviceInfoParam).getData();
+        //过滤出业务需要的监测点id集合
+        List<String> firstMonitorIdList = new ArrayList<>(); //只用于合并多个部门的监测点id
+        pmsDeviceInfoWithInOrg.forEach(item -> firstMonitorIdList.addAll(item.getMonitorIdList()));
+        List<String> lastMonitorIdList = firstMonitorIdList.stream().distinct().collect(Collectors.toList()); //最终的监测点id集合
+        //如果没有监测点id信息，直接返回空集合
+        if (CollUtil.isEmpty(lastMonitorIdList)) {
+            return new ArrayList<>();
+        }
+        //查询对应的监测点完整信息 并转为key：监测点id value：监测点实体的map集合
+//        LambdaQueryWrapper<Monitor> monitorWrapper = new LambdaQueryWrapper<>();
+//        monitorWrapper.in(Monitor::getId, lastMonitorIdList);
+        PmsMonitorInfoParam pmsMonitorInfoParam = new PmsMonitorInfoParam();
+        pmsMonitorInfoParam.setMonitorIds(lastMonitorIdList);
+        Map<String, PmsMonitorInfoDTO> monitorMap = monitorClient.getMonitorInfo(pmsMonitorInfoParam).getData().stream().collect(Collectors.toMap(PmsMonitorInfoDTO::getMonitorId, monitor -> monitor));
+        //查询【基准水平-月】数据
+        /*组装条件：where measurement_point_id in (monitorIdList) and data_date >= startTime
+                   and data_date <= endTime and voltage_level
+        */
+        LambdaQueryWrapper<RMpBenchmarkLevelM> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+        lambdaQueryWrapper.in(CollUtil.isNotEmpty(lastMonitorIdList), RMpBenchmarkLevelM::getMeasurementPointId, lastMonitorIdList)
+                .ge(StringUtils.isNotBlank(startTime), RMpBenchmarkLevelM::getDataDate, startTime)
+                .le(StringUtils.isNotBlank(endTime), RMpBenchmarkLevelM::getDataDate, endTime);
+        List<RMpBenchmarkLevelM> list = this.list(lambdaQueryWrapper);
+        List<RMpBenchmarkLevelVO> resultList = list.stream().map(item -> {
+            //封装前端需要的对象
+            RMpBenchmarkLevelVO rMpBenchmarkLevelVO = new RMpBenchmarkLevelVO();
+            BeanUtils.copyProperties(item, rMpBenchmarkLevelVO);
+            PmsGeneralDeviceDTO pmsGeneralDeviceDTO = pmsDeviceInfoWithInOrg.stream().filter(dto -> dto.getMonitorIdList().contains(item.getMeasurementPointId()))
+                    .collect(Collectors.toList()).get(0);
+            //单位信息
+            rMpBenchmarkLevelVO.setOrgNo(pmsGeneralDeviceDTO.getIndex()); //单位id
+            rMpBenchmarkLevelVO.setOrgName(pmsGeneralDeviceDTO.getName()); //单位名称
+            //基准水平评价指标
+            rMpBenchmarkLevelVO.setBenchmarkIndicator(benchmarkIndicator); //基准水平评价指标id
+            rMpBenchmarkLevelVO.setBenchmarkIndicatorName(benchmarkIndicatorMap.get(benchmarkIndicator)); //基准水平评价指标
+            //监测点信息
+            rMpBenchmarkLevelVO.setMeasurementPointName(monitorMap.get(item.getMeasurementPointId()).getMonitorName()); //监测点名称
+            //电压等级
+            rMpBenchmarkLevelVO.setVoltageLevel(monitorMap.get(item.getMeasurementPointId()).getMonitorVoltageLevel());
+            rMpBenchmarkLevelVO.setVoltageLevelName(voltageLevelMap.get(monitorMap.get(item.getMeasurementPointId()).getMonitorVoltageLevel()));
+            return rMpBenchmarkLevelVO;
+        }).collect(Collectors.toList());
+        return resultList;
+    }
+}
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/RMpBenchmarkLevelQServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/RMpBenchmarkLevelQServiceImpl.java
new file mode 100644
index 000000000..b47c36f71
--- /dev/null
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/RMpBenchmarkLevelQServiceImpl.java
@@ -0,0 +1,129 @@
+package com.njcn.harmonic.service.impl;
+
+import cn.hutool.core.collection.CollUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.njcn.common.pojo.dto.SimpleDTO;
+import com.njcn.common.pojo.enums.response.CommonResponseEnum;
+import com.njcn.common.pojo.exception.BusinessException;
+import com.njcn.device.pms.api.MonitorClient;
+import com.njcn.device.pms.api.PmsGeneralDeviceInfoClient;
+import com.njcn.device.pms.pojo.dto.PmsGeneralDeviceDTO;
+import com.njcn.device.pms.pojo.dto.PmsMonitorInfoDTO;
+import com.njcn.device.pms.pojo.param.PmsDeviceInfoParam;
+import com.njcn.device.pms.pojo.param.PmsMonitorInfoParam;
+import com.njcn.harmonic.mapper.RMpBenchmarkLevelQMapper;
+import com.njcn.harmonic.pojo.param.RMpBenchmarkLevelParam;
+import com.njcn.harmonic.pojo.po.RMpBenchmarkLevelQ;
+import com.njcn.harmonic.pojo.vo.RMpBenchmarkLevelVO;
+import com.njcn.harmonic.service.RMpBenchmarkLevelQService;
+import com.njcn.system.api.DicDataFeignClient;
+import com.njcn.system.enums.DicDataTypeEnum;
+import com.njcn.system.pojo.po.DictData;
+import lombok.RequiredArgsConstructor;
+import org.apache.commons.lang.StringUtils;
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+/**
+* @author jianghf
+* @description 针对表【r_mp_benchmark_level_q】的数据库操作Service实现
+* @createDate 2022-10-11 10:32:18
+*/
+@Service
+@RequiredArgsConstructor
+public class RMpBenchmarkLevelQServiceImpl extends ServiceImpl<RMpBenchmarkLevelQMapper, RMpBenchmarkLevelQ>
+implements RMpBenchmarkLevelQService {
+
+    private final DicDataFeignClient dicDataFeignClient;
+
+    private final PmsGeneralDeviceInfoClient pmsGeneralDeviceInfoClient;
+
+    private final MonitorClient monitorClient;
+
+    @Override
+    public List<RMpBenchmarkLevelVO> getRMpBenchmarkLevelList(RMpBenchmarkLevelParam rMpBenchmarkLevelParam) {
+        //提取查询条件
+        String id = rMpBenchmarkLevelParam.getId(); //单位id
+        if (StringUtils.isBlank(id)) {
+            throw new BusinessException(CommonResponseEnum.NO_DATA, "单位id不可为空");
+        }
+        String startTime = rMpBenchmarkLevelParam.getStartTime(); //开始时间
+        String endTime = rMpBenchmarkLevelParam.getEndTime(); //截止时间
+        String benchmarkIndicator = rMpBenchmarkLevelParam.getBenchmarkIndicator(); //评价指标
+        List <String> voltageLevelParamList = StringUtils.isNotBlank(rMpBenchmarkLevelParam.getVoltageLevel()) ? Arrays.asList(rMpBenchmarkLevelParam.getVoltageLevel().split(",")) : null; //电压等级
+
+        //获取电压等级的字典
+        List<DictData> voltageLevelList = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.DEV_VOLTAGE.getCode()).getData();
+        //将电压信息转成map，key：id  value：name
+        Map<String, String> voltageLevelMap = voltageLevelList.stream().collect(Collectors.toMap(DictData::getId, DictData::getName));
+        //获取基准水平评价指标字典
+        List<DictData> benchmarkIndicatorList = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.BENCHMARK_INDICATORS.getCode()).getData();
+        //将基准水平评价指标信息转成map，key：id  value：name
+        Map<String, String> benchmarkIndicatorMap = benchmarkIndicatorList.stream().collect(Collectors.toMap(DictData::getId, DictData::getName));
+
+        //查询所有子单位下的所有监测点
+        PmsDeviceInfoParam pmsDeviceInfoParam = new PmsDeviceInfoParam(id);
+        pmsDeviceInfoParam.setStatisticalType(new SimpleDTO());
+        if (CollUtil.isNotEmpty(voltageLevelParamList)) {
+            //查询条件：电压等级（筛选电压等级为voltageLevel的监测点）
+            List<SimpleDTO> simpleDTOList = voltageLevelParamList.stream().map(item -> {
+                SimpleDTO simpleDTO = new SimpleDTO();
+                simpleDTO.setId(item);
+                return simpleDTO;
+            }).collect(Collectors.toList());
+            pmsDeviceInfoParam.setVoltageLevel(simpleDTOList);
+        }
+        //获取到该部门的所有子部门的监测点idList
+        List<PmsGeneralDeviceDTO> pmsDeviceInfoWithInOrg = pmsGeneralDeviceInfoClient.getPmsDeviceInfoWithInOrg(pmsDeviceInfoParam).getData();
+        //过滤出业务需要的监测点id集合
+        List<String> firstMonitorIdList = new ArrayList<>(); //只用于合并多个部门的监测点id
+        pmsDeviceInfoWithInOrg.forEach(item -> firstMonitorIdList.addAll(item.getMonitorIdList()));
+        List<String> lastMonitorIdList = firstMonitorIdList.stream().distinct().collect(Collectors.toList()); //最终的监测点id集合
+        //如果没有监测点id信息，直接返回空集合
+        if (CollUtil.isEmpty(lastMonitorIdList)) {
+            return new ArrayList<>();
+        }
+        //查询对应的监测点完整信息 并转为key：监测点id value：监测点实体的map集合
+//        LambdaQueryWrapper<Monitor> monitorWrapper = new LambdaQueryWrapper<>();
+//        monitorWrapper.in(Monitor::getId, lastMonitorIdList);
+        PmsMonitorInfoParam pmsMonitorInfoParam = new PmsMonitorInfoParam();
+        pmsMonitorInfoParam.setMonitorIds(lastMonitorIdList);
+        Map<String, PmsMonitorInfoDTO> monitorMap = monitorClient.getMonitorInfo(pmsMonitorInfoParam).getData().stream().collect(Collectors.toMap(PmsMonitorInfoDTO::getMonitorId, monitor -> monitor));
+        //查询【基准水平-月】数据
+        /*组装条件：where measurement_point_id in (monitorIdList) and data_date >= startTime
+                   and data_date <= endTime and voltage_level
+        */
+        LambdaQueryWrapper<RMpBenchmarkLevelQ> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+        lambdaQueryWrapper.in(CollUtil.isNotEmpty(lastMonitorIdList), RMpBenchmarkLevelQ::getMeasurementPointId, lastMonitorIdList)
+                .ge(StringUtils.isNotBlank(startTime), RMpBenchmarkLevelQ::getDataDate, startTime)
+                .le(StringUtils.isNotBlank(endTime), RMpBenchmarkLevelQ::getDataDate, endTime);
+        List<RMpBenchmarkLevelQ> list = this.list(lambdaQueryWrapper);
+        List<RMpBenchmarkLevelVO> resultList = list.stream().map(item -> {
+            //封装前端需要的对象
+            RMpBenchmarkLevelVO rMpBenchmarkLevelVO = new RMpBenchmarkLevelVO();
+            BeanUtils.copyProperties(item, rMpBenchmarkLevelVO);
+            PmsGeneralDeviceDTO pmsGeneralDeviceDTO = pmsDeviceInfoWithInOrg.stream().filter(dto -> dto.getMonitorIdList().contains(item.getMeasurementPointId()))
+                    .collect(Collectors.toList()).get(0);
+            //单位信息
+            rMpBenchmarkLevelVO.setOrgNo(pmsGeneralDeviceDTO.getIndex()); //单位id
+            rMpBenchmarkLevelVO.setOrgName(pmsGeneralDeviceDTO.getName()); //单位名称
+            //基准水平评价指标
+            rMpBenchmarkLevelVO.setBenchmarkIndicator(benchmarkIndicator); //基准水平评价指标id
+            rMpBenchmarkLevelVO.setBenchmarkIndicatorName(benchmarkIndicatorMap.get(benchmarkIndicator)); //基准水平评价指标
+            //监测点信息
+            rMpBenchmarkLevelVO.setMeasurementPointName(monitorMap.get(item.getMeasurementPointId()).getMonitorName()); //监测点名称
+            //电压等级
+            rMpBenchmarkLevelVO.setVoltageLevel(monitorMap.get(item.getMeasurementPointId()).getMonitorVoltageLevel());
+            rMpBenchmarkLevelVO.setVoltageLevelName(voltageLevelMap.get(monitorMap.get(item.getMeasurementPointId()).getMonitorVoltageLevel()));
+            return rMpBenchmarkLevelVO;
+        }).collect(Collectors.toList());
+        return resultList;
+    }
+}
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/RMpBenchmarkLevelYServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/RMpBenchmarkLevelYServiceImpl.java
new file mode 100644
index 000000000..5e56ad239
--- /dev/null
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/RMpBenchmarkLevelYServiceImpl.java
@@ -0,0 +1,129 @@
+package com.njcn.harmonic.service.impl;
+
+import cn.hutool.core.collection.CollUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.njcn.common.pojo.dto.SimpleDTO;
+import com.njcn.common.pojo.enums.response.CommonResponseEnum;
+import com.njcn.common.pojo.exception.BusinessException;
+import com.njcn.device.pms.api.MonitorClient;
+import com.njcn.device.pms.api.PmsGeneralDeviceInfoClient;
+import com.njcn.device.pms.pojo.dto.PmsGeneralDeviceDTO;
+import com.njcn.device.pms.pojo.dto.PmsMonitorInfoDTO;
+import com.njcn.device.pms.pojo.param.PmsDeviceInfoParam;
+import com.njcn.device.pms.pojo.param.PmsMonitorInfoParam;
+import com.njcn.harmonic.mapper.RMpBenchmarkLevelYMapper;
+import com.njcn.harmonic.pojo.param.RMpBenchmarkLevelParam;
+import com.njcn.harmonic.pojo.po.RMpBenchmarkLevelY;
+import com.njcn.harmonic.pojo.vo.RMpBenchmarkLevelVO;
+import com.njcn.harmonic.service.RMpBenchmarkLevelYService;
+import com.njcn.system.api.DicDataFeignClient;
+import com.njcn.system.enums.DicDataTypeEnum;
+import com.njcn.system.pojo.po.DictData;
+import lombok.RequiredArgsConstructor;
+import org.apache.commons.lang.StringUtils;
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+/**
+* @author jianghf
+* @description 针对表【r_mp_benchmark_level_y】的数据库操作Service实现
+* @createDate 2022-10-11 10:32:18
+*/
+@Service
+@RequiredArgsConstructor
+public class RMpBenchmarkLevelYServiceImpl extends ServiceImpl<RMpBenchmarkLevelYMapper, RMpBenchmarkLevelY>
+implements RMpBenchmarkLevelYService {
+
+    private final DicDataFeignClient dicDataFeignClient;
+
+    private final PmsGeneralDeviceInfoClient pmsGeneralDeviceInfoClient;
+
+    private final MonitorClient monitorClient;
+
+    @Override
+    public List<RMpBenchmarkLevelVO> getRMpBenchmarkLevelList(RMpBenchmarkLevelParam rMpBenchmarkLevelParam) {
+        //提取查询条件
+        String id = rMpBenchmarkLevelParam.getId(); //单位id
+        if (StringUtils.isBlank(id)) {
+            throw new BusinessException(CommonResponseEnum.NO_DATA, "单位id不可为空");
+        }
+        String startTime = rMpBenchmarkLevelParam.getStartTime(); //开始时间
+        String endTime = rMpBenchmarkLevelParam.getEndTime(); //截止时间
+        String benchmarkIndicator = rMpBenchmarkLevelParam.getBenchmarkIndicator(); //评价指标
+        List <String> voltageLevelParamList = StringUtils.isNotBlank(rMpBenchmarkLevelParam.getVoltageLevel()) ? Arrays.asList(rMpBenchmarkLevelParam.getVoltageLevel().split(",")) : null; //电压等级
+
+        //获取电压等级的字典
+        List<DictData> voltageLevelList = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.DEV_VOLTAGE.getCode()).getData();
+        //将电压信息转成map，key：id  value：name
+        Map<String, String> voltageLevelMap = voltageLevelList.stream().collect(Collectors.toMap(DictData::getId, DictData::getName));
+        //获取基准水平评价指标字典
+        List<DictData> benchmarkIndicatorList = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.BENCHMARK_INDICATORS.getCode()).getData();
+        //将基准水平评价指标信息转成map，key：id  value：name
+        Map<String, String> benchmarkIndicatorMap = benchmarkIndicatorList.stream().collect(Collectors.toMap(DictData::getId, DictData::getName));
+
+        //查询所有子单位下的所有监测点
+        PmsDeviceInfoParam pmsDeviceInfoParam = new PmsDeviceInfoParam(id);
+        pmsDeviceInfoParam.setStatisticalType(new SimpleDTO());
+        if (CollUtil.isNotEmpty(voltageLevelParamList)) {
+            //查询条件：电压等级（筛选电压等级为voltageLevel的监测点）
+            List<SimpleDTO> simpleDTOList = voltageLevelParamList.stream().map(item -> {
+                SimpleDTO simpleDTO = new SimpleDTO();
+                simpleDTO.setId(item);
+                return simpleDTO;
+            }).collect(Collectors.toList());
+            pmsDeviceInfoParam.setVoltageLevel(simpleDTOList);
+        }
+        //获取到该部门的所有子部门的监测点idList
+        List<PmsGeneralDeviceDTO> pmsDeviceInfoWithInOrg = pmsGeneralDeviceInfoClient.getPmsDeviceInfoWithInOrg(pmsDeviceInfoParam).getData();
+        //过滤出业务需要的监测点id集合
+        List<String> firstMonitorIdList = new ArrayList<>(); //只用于合并多个部门的监测点id
+        pmsDeviceInfoWithInOrg.forEach(item -> firstMonitorIdList.addAll(item.getMonitorIdList()));
+        List<String> lastMonitorIdList = firstMonitorIdList.stream().distinct().collect(Collectors.toList()); //最终的监测点id集合
+        //如果没有监测点id信息，直接返回空集合
+        if (CollUtil.isEmpty(lastMonitorIdList)) {
+            return new ArrayList<>();
+        }
+        //查询对应的监测点完整信息 并转为key：监测点id value：监测点实体的map集合
+//        LambdaQueryWrapper<Monitor> monitorWrapper = new LambdaQueryWrapper<>();
+//        monitorWrapper.in(Monitor::getId, lastMonitorIdList);
+        PmsMonitorInfoParam pmsMonitorInfoParam = new PmsMonitorInfoParam();
+        pmsMonitorInfoParam.setMonitorIds(lastMonitorIdList);
+        Map<String, PmsMonitorInfoDTO> monitorMap = monitorClient.getMonitorInfo(pmsMonitorInfoParam).getData().stream().collect(Collectors.toMap(PmsMonitorInfoDTO::getMonitorId, monitor -> monitor));
+        //查询【基准水平-月】数据
+        /*组装条件：where measurement_point_id in (monitorIdList) and data_date >= startTime
+                   and data_date <= endTime and voltage_level
+        */
+        LambdaQueryWrapper<RMpBenchmarkLevelY> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+        lambdaQueryWrapper.in(CollUtil.isNotEmpty(lastMonitorIdList), RMpBenchmarkLevelY::getMeasurementPointId, lastMonitorIdList)
+                .ge(StringUtils.isNotBlank(startTime), RMpBenchmarkLevelY::getDataDate, startTime)
+                .le(StringUtils.isNotBlank(endTime), RMpBenchmarkLevelY::getDataDate, endTime);
+        List<RMpBenchmarkLevelY> list = this.list(lambdaQueryWrapper);
+        List<RMpBenchmarkLevelVO> resultList = list.stream().map(item -> {
+            //封装前端需要的对象
+            RMpBenchmarkLevelVO rMpBenchmarkLevelVO = new RMpBenchmarkLevelVO();
+            BeanUtils.copyProperties(item, rMpBenchmarkLevelVO);
+            PmsGeneralDeviceDTO pmsGeneralDeviceDTO = pmsDeviceInfoWithInOrg.stream().filter(dto -> dto.getMonitorIdList().contains(item.getMeasurementPointId()))
+                    .collect(Collectors.toList()).get(0);
+            //单位信息
+            rMpBenchmarkLevelVO.setOrgNo(pmsGeneralDeviceDTO.getIndex()); //单位id
+            rMpBenchmarkLevelVO.setOrgName(pmsGeneralDeviceDTO.getName()); //单位名称
+            //基准水平评价指标
+            rMpBenchmarkLevelVO.setBenchmarkIndicator(benchmarkIndicator); //基准水平评价指标id
+            rMpBenchmarkLevelVO.setBenchmarkIndicatorName(benchmarkIndicatorMap.get(benchmarkIndicator)); //基准水平评价指标
+            //监测点信息
+            rMpBenchmarkLevelVO.setMeasurementPointName(monitorMap.get(item.getMeasurementPointId()).getMonitorName()); //监测点名称
+            //电压等级
+            rMpBenchmarkLevelVO.setVoltageLevel(monitorMap.get(item.getMeasurementPointId()).getMonitorVoltageLevel());
+            rMpBenchmarkLevelVO.setVoltageLevelName(voltageLevelMap.get(monitorMap.get(item.getMeasurementPointId()).getMonitorVoltageLevel()));
+            return rMpBenchmarkLevelVO;
+        }).collect(Collectors.toList());
+        return resultList;
+    }
+}
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/RMpHarmonicIMagReportDServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/RMpHarmonicIMagReportDServiceImpl.java
new file mode 100644
index 000000000..e2f7a7073
--- /dev/null
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/RMpHarmonicIMagReportDServiceImpl.java
@@ -0,0 +1,29 @@
+package com.njcn.harmonic.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.njcn.harmonic.pojo.po.RMpHarmonicIMagReportD;
+import com.njcn.harmonic.service.RMpHarmonicIMagReportDService;
+import com.njcn.harmonic.mapper.RMpHarmonicIMagReportDMapper;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+* @author Administrator
+* @description 针对表【r_mp_harmonic_i_mag_report_d(稳态监测点指标日报-日表(主配网表)  /各次谐波电流有效值)】的数据库操作Service实现
+* @createDate 2022-10-20 18:38:15
+*/
+@Service
+public class RMpHarmonicIMagReportDServiceImpl extends ServiceImpl<RMpHarmonicIMagReportDMapper, RMpHarmonicIMagReportD>
+    implements RMpHarmonicIMagReportDService{
+
+    @Override
+    public List<RMpHarmonicIMagReportD> getListByCond(Map<String, Object> condMap) {
+        return this.baseMapper.getListByCond(condMap);
+    }
+}
+
+
+
+
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/RMpHarmonicIRateReportDServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/RMpHarmonicIRateReportDServiceImpl.java
new file mode 100644
index 000000000..034e8706e
--- /dev/null
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/RMpHarmonicIRateReportDServiceImpl.java
@@ -0,0 +1,29 @@
+package com.njcn.harmonic.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.njcn.harmonic.pojo.po.RMpHarmonicIRateReportD;
+import com.njcn.harmonic.service.RMpHarmonicIRateReportDService;
+import com.njcn.harmonic.mapper.RMpHarmonicIRateReportDMapper;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+* @author Administrator
+* @description 针对表【r_mp_harmonic_i_rate_report_d(稳态监测点指标日报-日表(主网表)  /各次谐波电流含有率)】的数据库操作Service实现
+* @createDate 2022-10-20 18:43:52
+*/
+@Service
+public class RMpHarmonicIRateReportDServiceImpl extends ServiceImpl<RMpHarmonicIRateReportDMapper, RMpHarmonicIRateReportD>
+    implements RMpHarmonicIRateReportDService{
+
+    @Override
+    public List<RMpHarmonicIRateReportD> getListByCond(Map<String, Object> condMap) {
+        return this.baseMapper.getListByCond(condMap);
+    }
+}
+
+
+
+
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/RMpHarmonicReportDServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/RMpHarmonicReportDServiceImpl.java
new file mode 100644
index 000000000..d0ff5c0f5
--- /dev/null
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/RMpHarmonicReportDServiceImpl.java
@@ -0,0 +1,241 @@
+package com.njcn.harmonic.service.impl;
+
+import com.njcn.device.pms.api.MonitorClient;
+import com.njcn.device.pms.api.StatationStatClient;
+import com.njcn.device.pms.pojo.dto.PmsMonitorDTO;
+import com.njcn.device.pms.pojo.dto.PmsStatationStatInfoDTO;
+import com.njcn.device.pms.pojo.param.PmsMonitorParam;
+import com.njcn.device.pms.pojo.param.PmsStatationStatInfoParam;
+import com.njcn.device.pq.pojo.po.Overlimit;
+import com.njcn.harmonic.pojo.param.RMpHarmonicReportDParam;
+import com.njcn.harmonic.pojo.po.*;
+import com.njcn.harmonic.pojo.vo.RMpHarmonicReportDVO;
+import com.njcn.harmonic.service.*;
+import com.njcn.system.api.DicDataFeignClient;
+import com.njcn.system.enums.DicDataTypeEnum;
+import com.njcn.system.pojo.po.DictData;
+import lombok.RequiredArgsConstructor;
+import org.apache.commons.lang.StringUtils;
+import org.springframework.stereotype.Service;
+
+import java.util.*;
+import java.util.stream.Collectors;
+
+/**
+ * @Title RMpHarmonicReportDServiceImpl
+ * @Package com.njcn.harmonic.service.impl
+ * @Author jianghaifei
+ * @Date 2022-10-20 19:19
+ * @Version V1.0
+ */
+@Service
+@RequiredArgsConstructor
+public class RMpHarmonicReportDServiceImpl implements RMpHarmonicReportDService {
+
+    private final MonitorClient monitorClient; //监测点服务
+
+    private final DicDataFeignClient dicDataFeignClient; //字典服务
+
+    private final StatationStatClient statationStatClient; //变电站服务
+
+    private final RMpMeasureReportDService rMpMeasureReportDService; //【稳态监测点非谐波不带相位指标日报-日表(主配网表)】
+
+    private final RMpMeasurePhaseReportDService  rMpMeasurePhaseReportDService; //【稳态监测点非谐波带相位指标日报-日表(主配网表)】
+
+    //r_mp_harmonic_v_rate_report_d
+    private final RMpHarmonicVRateReportDService rMpHarmonicVRateReportDService; //【稳态监测点指标日报-日表(主配网表)  /各次谐波电压含有率】
+
+    //r_mp_harmonic_i_mag_report_d
+    private final RMpHarmonicIMagReportDService rMpHarmonicIMagReportDService; //【各相各次谐波电流有效值】
+
+    //r_mp_harmonic_i_rate_report_d
+    private final RMpHarmonicIRateReportDService rMpHarmonicIRateReportDService; //【各相各次谐波电流含有率】
+
+    //r_mp_inharmonic_v_rate_report_d
+    private final RMpInharmonicVRateReportDService rMpInharmonicVRateReportDService; //【各相各次间谐波电压含有率】
+
+    //r_mp_inharmonic_i_rate_report_d
+    private final RMpInharmonicIRateReportDService rMpInharmonicIRateReportDService; //【各相各次间谐波电流含有率】
+
+    @Override
+    public List<RMpHarmonicReportDVO> getMonitorStatisticsD(RMpHarmonicReportDParam rMpHarmonicReportDParam) {
+//
+//        Overlimit data = lineFeignClient.getOverLimitData("064b948a81090b80860483994f2a8e75").getData();
+//        System.out.println(data);
+        //提取查询参数
+//        String monitorName = rMpHarmonicReportDParam.getMonitorName(); //监测点名称
+        String startTime = rMpHarmonicReportDParam.getStartTime();
+        String endTime = rMpHarmonicReportDParam.getEndTime();
+        String monitorId = rMpHarmonicReportDParam.getMonitorId(); //监测点id
+        List<String> monitorIds = StringUtils.isNotBlank(monitorId) ? Arrays.asList(monitorId.split(",")) : null;
+        //获取所有的条件筛选后的监测点信息
+        PmsMonitorParam pmsMonitorParam = new PmsMonitorParam();
+//        pmsMonitorParam.setMonitorName(monitorName); //监测点名称(模糊查询)
+        pmsMonitorParam.setMonitorIds(monitorIds); //监测点id集合
+        List<PmsMonitorDTO> monitors = monitorClient.getMonitorInfoListByCond(pmsMonitorParam).getData();
+
+        //提取出监测点的id集合
+        List<String> monitorIdList = monitors.stream().map(PmsMonitorDTO::getId).collect(Collectors.toList());
+        //提取出变电站id集合
+        List<String> stationIdList = monitors.stream().map(PmsMonitorDTO::getPowerrId).collect(Collectors.toList());
+        PmsStatationStatInfoParam stationParam = new PmsStatationStatInfoParam();
+        stationParam.setPowerIds(stationIdList);
+        List<PmsStatationStatInfoDTO> stationList = statationStatClient.getStatationStatInfo(stationParam).getData();
+        Map<String, PmsStatationStatInfoDTO> stationMap = stationList.stream().collect(Collectors.toMap(PmsStatationStatInfoDTO::getPowerId, dto -> dto));
+
+        //获取电压等级的字典
+        List<DictData> voltageLevelList = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.DEV_VOLTAGE.getCode()).getData();
+        //将电压信息转成map，key：id  value：name
+        Map<String, String> voltageLevelMap = voltageLevelList.stream().collect(Collectors.toMap(DictData::getId, DictData::getName));
+
+        //获取监测点的各相限值（不出意外的情况下前端只会传1个ID，这里防止有多个ID所以服务里都是用的id集合）
+        List<Overlimit> overlimitList = new ArrayList<>();
+        for (String id : monitorIdList) {
+            Overlimit overlimit = monitorClient.getOverLimitData(id).getData();
+            overlimitList.add(overlimit);
+        }
+        Map<String, Overlimit> overLimitMap = overlimitList.stream().collect(Collectors.toMap(Overlimit::getId, o -> o));
+
+        /************查询每个检测点的日统计信息**************/
+        //设置查询条件(通用于以下几张表的查询)
+        HashMap<String, Object> condMap = new HashMap<>();
+        condMap.put("startTime", startTime);
+        condMap.put("endTime", endTime);
+        condMap.put("monitorIdList", monitorIdList);
+        //1.r_mp_measure_report_d【稳态监测点非谐波不带相位指标日报-日表(主配网表)】
+//        LambdaQueryWrapper<RMpMeasureReportD> rMpMeasureReportDWrapper = new LambdaQueryWrapper<>();
+//        rMpMeasureReportDWrapper.in(RMpMeasureReportD::getMeasurementPointId, monitorIdList)
+//                .ge(RMpMeasureReportD::getDataDate, startTime).le(RMpMeasureReportD::getDataDate, endTime);
+        List<RMpMeasureReportD> RMpMeasureReportDList = rMpMeasureReportDService.getListByCond(condMap);
+        //1.1转成map，key：监测点id  value：实体
+        Map<String, RMpMeasureReportD> RMpMeasureReportDMap = RMpMeasureReportDList.stream().collect(Collectors.toMap(RMpMeasureReportD::getMeasurementPointId, entity -> entity));
+
+        //2.r_mp_measure_phase_report_d【稳态监测点非谐波带相位指标日报-日表(主配网表)】
+//        LambdaQueryWrapper<RMpMeasurePhaseReportD> rMpMeasurePhaseReportDWrapper = new LambdaQueryWrapper<>();
+//        rMpMeasurePhaseReportDWrapper.in(RMpMeasurePhaseReportD::getMeasurementPointId, monitorIdList)
+//                .ge(RMpMeasurePhaseReportD::getDataDate, startTime).le(RMpMeasurePhaseReportD::getDataDate, endTime);
+        List<RMpMeasurePhaseReportD> RMpMeasurePhaseReportDList = rMpMeasurePhaseReportDService.getListByCond(condMap);
+
+        //3.r_mp_harmonic_v_rate_report_d【稳态监测点指标日报-日表(主配网表)  /各次谐波电压含有率】
+//        LambdaQueryWrapper<RMpHarmonicVRateReportD> rMpHarmonicVRateReportWrapper = new LambdaQueryWrapper<>();
+//        rMpHarmonicVRateReportWrapper.in(RMpHarmonicVRateReportD::getMeasurementPointId, monitorIdList)
+//                .ge(RMpHarmonicVRateReportD::getDataDate, startTime).le(RMpHarmonicVRateReportD::getDataDate, endTime);
+
+        List<RMpHarmonicVRateReportD> rMpHarmonicVRateReportDList = rMpHarmonicVRateReportDService.getListByCond(condMap);
+
+        //4.r_mp_harmonic_i_mag_report_d【各相各次谐波电流有效值】
+//        LambdaQueryWrapper<RMpHarmonicIMagReportD> rMpHarmonicIMagReportDWrapper = new LambdaQueryWrapper<>();
+//        rMpHarmonicIMagReportDWrapper.in(RMpHarmonicIMagReportD::getMeasurementPointId, monitorIdList)
+//                .ge(RMpHarmonicIMagReportD::getDataDate, startTime).le(RMpHarmonicIMagReportD::getDataDate, endTime);
+        List<RMpHarmonicIMagReportD> rMpHarmonicIMagReportDList = rMpHarmonicIMagReportDService.getListByCond(condMap);
+
+        //5.r_mp_harmonic_i_rate_report_d【各相各次谐波电流含有率】
+//        LambdaQueryWrapper<RMpHarmonicIRateReportD> rMpHarmonicIRateReportDWrapper = new LambdaQueryWrapper<>();
+//        rMpHarmonicIRateReportDWrapper.in(RMpHarmonicIRateReportD::getMeasurementPointId, monitorIdList)
+//                .ge(RMpHarmonicIRateReportD::getDataDate, startTime).le(RMpHarmonicIRateReportD::getDataDate, endTime);
+        List<RMpHarmonicIRateReportD> rMpHarmonicIRateReportDList = rMpHarmonicIRateReportDService.getListByCond(condMap);
+
+        //6.r_mp_inharmonic_v_rate_report_d【各相各次间谐波电压含有率】
+//        LambdaQueryWrapper<RMpInharmonicVRateReportD> rMpInharmonicVRateReportDWrapper = new LambdaQueryWrapper<>();
+//        rMpInharmonicVRateReportDWrapper.in(RMpInharmonicVRateReportD::getMeasurementPointId, monitorIdList)
+//                .ge(RMpInharmonicVRateReportD::getDataDate, startTime).le(RMpInharmonicVRateReportD::getDataDate, endTime);
+        List<RMpInharmonicVRateReportD> rMpInharmonicVRateReportDList = rMpInharmonicVRateReportDService.getListByCond(condMap);
+
+        //7.r_mp_inharmonic_i_rate_report_d【各相各次间谐波电流含有率】
+//        LambdaQueryWrapper<RMpInharmonicIRateReportD> rMpInharmonicIRateReportDWrapper = new LambdaQueryWrapper<>();
+//        rMpInharmonicIRateReportDWrapper.in(RMpInharmonicIRateReportD::getMeasurementPointId, monitorIdList)
+//                .ge(RMpInharmonicIRateReportD::getDataDate, startTime).le(RMpInharmonicIRateReportD::getDataDate, endTime);
+        List<RMpInharmonicIRateReportD> rMpInharmonicIRateReportDList = rMpInharmonicIRateReportDService.getListByCond(condMap);
+
+        /*************整理返回数据**************/
+        List<RMpHarmonicReportDVO> RMpHarmonicReportDVOList = monitors.stream().map(item -> {
+            RMpHarmonicReportDVO rMpHarmonicReportDVO = new RMpHarmonicReportDVO();
+            rMpHarmonicReportDVO.setOrgNo(item.getOrgId()); //单位id
+            rMpHarmonicReportDVO.setOrgName(item.getOrgName()); //单位名称
+            rMpHarmonicReportDVO.setPowerId(item.getPowerrId()); //变电站id
+            rMpHarmonicReportDVO.setPowerName(item.getPowerrName()); //变电站名称
+            rMpHarmonicReportDVO.setMeasurementPointId(item.getId()); //监测点ID
+            rMpHarmonicReportDVO.setMeasurementPointName(item.getName()); //监测点名称
+            rMpHarmonicReportDVO.setMinShortCircuitCapacity(item.getMinShortCircuitCapacity()); //最小短路容量
+            rMpHarmonicReportDVO.setVoltageLevel(stationMap.get(item.getPowerrId()).getPowerVoltageLevel()); //变电站电压等级id
+            rMpHarmonicReportDVO.setVoltageLevelName(voltageLevelMap.get(stationMap.get(item.getPowerrId()).getPowerVoltageLevel()));//变电站电压等级
+            rMpHarmonicReportDVO.setDataDate(startTime); //监测日期
+            /****r_mp_measure_report_d数据****/
+            rMpHarmonicReportDVO.setRMpMeasureReportD(RMpMeasureReportDMap.get(item.getId()));
+//            //总有功功率
+//            rMpHarmonicReportDVO.setTotalActivePowerMax(RMpMeasureReportDMap.get(item.getId()).getTotalActivePowerMax());
+//            rMpHarmonicReportDVO.setTotalActivePowerMin(RMpMeasureReportDMap.get(item.getId()).getTotalActivePowerMin());
+//            rMpHarmonicReportDVO.setTotalActivePowerAvg(RMpMeasureReportDMap.get(item.getId()).getTotalActivePowerAvg());
+//            rMpHarmonicReportDVO.setTotalActivePower95(RMpMeasureReportDMap.get(item.getId()).getTotalActivePower95());
+            Double frequencyDeviationMax = RMpMeasureReportDMap.get(item.getId()).getFrequencyDeviationMax(); //频率偏差-最大值
+            Double freqDev = Double.parseDouble(String.valueOf(overLimitMap.get(item.getId()).getFreqDev())); //频率偏差限值
+            rMpHarmonicReportDVO.setFrequencyDeviationMaxResult((frequencyDeviationMax > freqDev) ? "越限" : "正常"); // 频率偏差-最大值限值结论
+//            //总无功功率
+//            rMpHarmonicReportDVO.setTotalReactivePowerMax(RMpMeasureReportDMap.get(item.getId()).getTotalReactivePowerMax());
+//            rMpHarmonicReportDVO.setTotalReactivePowerMin(RMpMeasureReportDMap.get(item.getId()).getTotalReactivePowerMin());
+//            rMpHarmonicReportDVO.setTotalReactivePowerAvg(RMpMeasureReportDMap.get(item.getId()).getTotalReactivePowerAvg());
+//            rMpHarmonicReportDVO.setTotalReactivePower95(RMpMeasureReportDMap.get(item.getId()).getTotalReactivePower95());
+//            //负序电压（三相电压）不平衡度
+//            rMpHarmonicReportDVO.setNegativeSequenceVoltageUnbalanceMax(RMpMeasureReportDMap.get(item.getId()).getNegativeSequenceVoltageUnbalanceMax());
+//            rMpHarmonicReportDVO.setNegativeSequenceVoltageUnbalanceMin(RMpMeasureReportDMap.get(item.getId()).getNegativeSequenceVoltageUnbalanceMin());
+//            rMpHarmonicReportDVO.setNegativeSequenceVoltageUnbalanceAvg(RMpMeasureReportDMap.get(item.getId()).getNegativeSequenceVoltageUnbalanceAvg());
+//            rMpHarmonicReportDVO.setNegativeSequenceVoltageUnbalance95(RMpMeasureReportDMap.get(item.getId()).getNegativeSequenceVoltageUnbalance95());
+            Double unb = Double.parseDouble(String.valueOf(overLimitMap.get(item.getId()).getUbalance())); //限值
+            Double unbalance95 = RMpMeasureReportDMap.get(item.getId()).getNegativeSequenceVoltageUnbalance95(); //负序电压不平衡度95值
+            rMpHarmonicReportDVO.setNegativeSequenceVoltageUnbalance95Result((unbalance95 > unb) ? "越限" : "正常"); //负序电压（三相电压）不平衡度-95值限值结论
+            Double unbalanceMax = RMpMeasureReportDMap.get(item.getId()).getNegativeSequenceVoltageUnbalanceMax();//负序电压不平衡度最大值
+            rMpHarmonicReportDVO.setNegativeSequenceVoltageUnbalanceMaxResult((unbalanceMax > unb) ? "越限" : "正常"); //负序电压（三相电压）不平衡度-95值限值结论
+
+//            //负序电流
+//            rMpHarmonicReportDVO.setNegativeSequenceCurrentMax(RMpMeasureReportDMap.get(item.getId()).getNegativeSequenceCurrentMax());
+//            rMpHarmonicReportDVO.setNegativeSequenceCurrentMin(RMpMeasureReportDMap.get(item.getId()).getNegativeSequenceCurrentMin());
+//            rMpHarmonicReportDVO.setNegativeSequenceCurrentAvg(RMpMeasureReportDMap.get(item.getId()).getNegativeSequenceCurrentAvg());
+//            rMpHarmonicReportDVO.setNegativeSequenceCurrent95(RMpMeasureReportDMap.get(item.getId()).getNegativeSequenceCurrent95());
+            Double iNeg = Double.parseDouble(String.valueOf(overLimitMap.get(item.getId()).getINeg()));//负序电流限值
+            Double current95 = RMpMeasureReportDMap.get(item.getId()).getNegativeSequenceCurrent95(); //负序电流95值
+            rMpHarmonicReportDVO.setNegativeSequenceCurrent95Result((current95 > iNeg) ? "越限" : "正常"); //负序电流-95值限值结论
+            Double currentMax = RMpMeasureReportDMap.get(item.getId()).getNegativeSequenceCurrentMax(); //负序电流值
+            rMpHarmonicReportDVO.setNegativeSequenceCurrentMaxResult((currentMax > iNeg) ? "越限" : "正常"); //负序电流最大值限值结论
+
+
+            /**********三相数据**********/
+            //r_mp_measure_phase_report_d
+            Map<String, RMpMeasurePhaseReportD> phaseReportDMap = RMpMeasurePhaseReportDList.stream().filter(phaseReportD -> phaseReportD.getMeasurementPointId().equals(item.getId()))
+                    .collect(Collectors.toMap(RMpMeasurePhaseReportD::getPhase, phaseReportD -> phaseReportD));
+            rMpHarmonicReportDVO.setPhaseReportD(phaseReportDMap);
+
+            //r_mp_harmonic_v_rate_report_d
+            Map<String, RMpHarmonicVRateReportD> vRateReportDMap = rMpHarmonicVRateReportDList.stream().filter(reportD -> reportD.getMeasurementPointId().equals(item.getId()))
+                    .collect(Collectors.toMap(RMpHarmonicVRateReportD::getPhase, reportD -> reportD));
+            rMpHarmonicReportDVO.setRMpHarmonicVRateReportDMap(vRateReportDMap);
+            //电压总谐波畸变率-95限值结论
+            Double uaberrance = Double.parseDouble(String.valueOf(overLimitMap.get(item.getId()).getUaberrance()));//电压总谐波畸变率限值
+            Map<String, String> wave95ResultMap = rMpHarmonicVRateReportDList.stream().filter(reportD -> reportD.getMeasurementPointId().equals(item.getId()))
+                    .collect(Collectors.toMap(RMpHarmonicVRateReportD::getPhase, reportD -> reportD.getVoltageHarmonicThd95() > uaberrance ? "越限" : "正常"));
+            rMpHarmonicReportDVO.setVoltageHarmonicWave95ResultMap(wave95ResultMap);
+
+            //r_mp_harmonic_i_mag_report_d
+            Map<String, RMpHarmonicIMagReportD> iMagReportDMap = rMpHarmonicIMagReportDList.stream().filter(reportD -> reportD.getMeasurementPointId().equals(item.getId()))
+                    .collect(Collectors.toMap(RMpHarmonicIMagReportD::getPhase, reportD -> reportD));
+            rMpHarmonicReportDVO.setRMpHarmonicIMagReportDMap(iMagReportDMap);
+
+            //r_mp_harmonic_i_rate_report_d
+            Map<String, RMpHarmonicIRateReportD> iRateReportDMap = rMpHarmonicIRateReportDList.stream().filter(reportD -> reportD.getMeasurementPointId().equals(item.getId()))
+                    .collect(Collectors.toMap(RMpHarmonicIRateReportD::getPhase, reportD -> reportD));
+            rMpHarmonicReportDVO.setRMpHarmonicIRateReportDMap(iRateReportDMap);
+
+            //r_mp_inharmonic_v_rate_report_d
+            Map<String, RMpInharmonicVRateReportD> rMpInharmonicVRateReportD = rMpInharmonicVRateReportDList.stream().filter(reportD -> reportD.getMeasurementPointId().equals(item.getId()))
+                    .collect(Collectors.toMap(RMpInharmonicVRateReportD::getPhase, reportD -> reportD));
+            rMpHarmonicReportDVO.setRMpInharmonicVRateReportDMap(rMpInharmonicVRateReportD);
+
+            //r_mp_inharmonic_i_rate_report_d
+            Map<String, RMpInharmonicIRateReportD> rMpInharmonicIRateReportD = rMpInharmonicIRateReportDList.stream().filter(reportD -> reportD.getMeasurementPointId().equals(item.getId()))
+                    .collect(Collectors.toMap(RMpInharmonicIRateReportD::getPhase, reportD -> reportD));
+            rMpHarmonicReportDVO.setRMpInharmonicIRateReportDMap(rMpInharmonicIRateReportD);
+
+            return rMpHarmonicReportDVO;
+        }).collect(Collectors.toList());
+        return RMpHarmonicReportDVOList;
+    }
+}
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/RMpHarmonicVRateReportDServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/RMpHarmonicVRateReportDServiceImpl.java
new file mode 100644
index 000000000..fd671849c
--- /dev/null
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/RMpHarmonicVRateReportDServiceImpl.java
@@ -0,0 +1,30 @@
+package com.njcn.harmonic.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.njcn.harmonic.pojo.po.RMpHarmonicVRateReportD;
+import com.njcn.harmonic.service.RMpHarmonicVRateReportDService;
+import com.njcn.harmonic.mapper.RMpHarmonicVRateReportDMapper;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+* @author jianghf
+* @description 针对表【r_mp_harmonic_v_rate_report_d(稳态监测点指标日报-日表(主配网表)  /各次谐波电压含有率 )】的数据库操作Service实现
+* @createDate 2022-10-20 18:34:05
+*/
+@Service
+public class RMpHarmonicVRateReportDServiceImpl extends ServiceImpl<RMpHarmonicVRateReportDMapper, RMpHarmonicVRateReportD>
+    implements RMpHarmonicVRateReportDService{
+
+    @Override
+    public List<RMpHarmonicVRateReportD> getListByCond(Map<String, Object> map) {
+        return this.baseMapper.getListByCond(map);
+    }
+}
+
+
+
+
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/RMpInharmonicIRateReportDServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/RMpInharmonicIRateReportDServiceImpl.java
new file mode 100644
index 000000000..e1840ca18
--- /dev/null
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/RMpInharmonicIRateReportDServiceImpl.java
@@ -0,0 +1,29 @@
+package com.njcn.harmonic.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.njcn.harmonic.pojo.po.RMpInharmonicIRateReportD;
+import com.njcn.harmonic.service.RMpInharmonicIRateReportDService;
+import com.njcn.harmonic.mapper.RMpInharmonicIRateReportDMapper;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+* @author Administrator
+* @description 针对表【r_mp_inharmonic_i_rate_report_d(稳态监测点指标日报-日表(主网表)  /各次间谐波电流含有率)】的数据库操作Service实现
+* @createDate 2022-10-20 18:45:58
+*/
+@Service
+public class RMpInharmonicIRateReportDServiceImpl extends ServiceImpl<RMpInharmonicIRateReportDMapper, RMpInharmonicIRateReportD>
+    implements RMpInharmonicIRateReportDService{
+
+    @Override
+    public List<RMpInharmonicIRateReportD> getListByCond(Map<String, Object> condMap) {
+        return this.baseMapper.getListByCond(condMap);
+    }
+}
+
+
+
+
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/RMpInharmonicVRateReportDServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/RMpInharmonicVRateReportDServiceImpl.java
new file mode 100644
index 000000000..c65827852
--- /dev/null
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/RMpInharmonicVRateReportDServiceImpl.java
@@ -0,0 +1,29 @@
+package com.njcn.harmonic.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.njcn.harmonic.pojo.po.RMpInharmonicVRateReportD;
+import com.njcn.harmonic.service.RMpInharmonicVRateReportDService;
+import com.njcn.harmonic.mapper.RMpInharmonicVRateReportDMapper;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+* @author Administrator
+* @description 针对表【r_mp_inharmonic_v_rate_report_d】的数据库操作Service实现
+* @createDate 2022-10-20 18:45:36
+*/
+@Service
+public class RMpInharmonicVRateReportDServiceImpl extends ServiceImpl<RMpInharmonicVRateReportDMapper, RMpInharmonicVRateReportD>
+    implements RMpInharmonicVRateReportDService{
+
+    @Override
+    public List<RMpInharmonicVRateReportD> getListByCond(Map<String, Object> condMap) {
+        return this.baseMapper.getListByCond(condMap);
+    }
+}
+
+
+
+
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/RMpMeasurePhaseReportDServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/RMpMeasurePhaseReportDServiceImpl.java
new file mode 100644
index 000000000..7c738ca9d
--- /dev/null
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/RMpMeasurePhaseReportDServiceImpl.java
@@ -0,0 +1,29 @@
+package com.njcn.harmonic.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.njcn.harmonic.mapper.RMpMeasurePhaseReportDMapper;
+import com.njcn.harmonic.pojo.po.RMpMeasurePhaseReportD;
+import com.njcn.harmonic.service.RMpMeasurePhaseReportDService;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+* @author Administrator
+* @description 针对表【r_mp_measure_phase_report_d】的数据库操作Service实现
+* @createDate 2022-10-20 18:20:08
+*/
+@Service
+public class RMpMeasurePhaseReportDServiceImpl extends ServiceImpl<RMpMeasurePhaseReportDMapper, RMpMeasurePhaseReportD>
+    implements RMpMeasurePhaseReportDService{
+
+    @Override
+    public List<RMpMeasurePhaseReportD> getListByCond(Map<String, Object> condMap) {
+        return this.baseMapper.getListByCond(condMap);
+    }
+}
+
+
+
+
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/RMpMeasureReportDServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/RMpMeasureReportDServiceImpl.java
new file mode 100644
index 000000000..61e566f90
--- /dev/null
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/RMpMeasureReportDServiceImpl.java
@@ -0,0 +1,25 @@
+package com.njcn.harmonic.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.njcn.harmonic.mapper.RMpMeasureReportDMapper;
+import com.njcn.harmonic.pojo.po.RMpMeasureReportD;
+import com.njcn.harmonic.service.RMpMeasureReportDService;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+* @author Administrator
+* @description 针对表【r_mp_measure_report_d】的数据库操作Service实现
+* @createDate 2022-10-20 16:32:37
+*/
+@Service
+public class RMpMeasureReportDServiceImpl extends ServiceImpl<RMpMeasureReportDMapper, RMpMeasureReportD>
+implements RMpMeasureReportDService{
+
+    @Override
+    public List<RMpMeasureReportD> getListByCond(Map<String, Object> condMap) {
+        return this.baseMapper.getListByCond(condMap);
+    }
+}
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/RMpPartHarmonicDetailDServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/RMpPartHarmonicDetailDServiceImpl.java
new file mode 100644
index 000000000..688d596ae
--- /dev/null
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/RMpPartHarmonicDetailDServiceImpl.java
@@ -0,0 +1,33 @@
+package com.njcn.harmonic.service.impl;
+
+import com.njcn.common.pojo.param.StatisticsBizBaseParam;
+import com.njcn.harmonic.pojo.po.RMpPartHarmonicDetailD;
+import com.njcn.harmonic.mapper.RMpPartHarmonicDetailDMapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.njcn.harmonic.pojo.vo.RMpPartHarmonicDetailIconVO;
+import com.njcn.harmonic.service.RMpPartHarmonicDetailDService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author rui.wu
+ * @since 2022-10-24
+ */
+@Service
+@RequiredArgsConstructor
+public class RMpPartHarmonicDetailDServiceImpl extends ServiceImpl<RMpPartHarmonicDetailDMapper, RMpPartHarmonicDetailD> implements RMpPartHarmonicDetailDService {
+
+    private final RMpPartHarmonicDetailDMapper rMpPartHarmonicDetailDMapper;
+
+
+    @Override
+    public List<RMpPartHarmonicDetailIconVO> getRMpPartHarmonicDetailIcon(StatisticsBizBaseParam param) {
+        return rMpPartHarmonicDetailDMapper.getRMpPartHarmonicDetailIcon(param);
+    }
+}
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/RMpPartHarmonicDetailMServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/RMpPartHarmonicDetailMServiceImpl.java
new file mode 100644
index 000000000..6bdfeeabb
--- /dev/null
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/RMpPartHarmonicDetailMServiceImpl.java
@@ -0,0 +1,106 @@
+package com.njcn.harmonic.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.collection.CollectionUtil;
+import com.njcn.common.pojo.dto.SimpleDTO;
+import com.njcn.common.pojo.param.StatisticsBizBaseParam;
+import com.njcn.device.pms.api.MonitorClient;
+import com.njcn.device.pms.api.PmsGeneralDeviceInfoClient;
+import com.njcn.device.pms.pojo.dto.PmsGeneralDeviceDTO;
+import com.njcn.device.pms.pojo.dto.PmsMonitorDTO;
+import com.njcn.device.pms.pojo.param.PmsDeviceInfoParam;
+import com.njcn.device.pms.pojo.param.PmsMonitorParam;
+import com.njcn.harmonic.mapper.RMpSurplusHarmonicDetailMMapper;
+import com.njcn.harmonic.pojo.param.RStatOrgParam;
+import com.njcn.harmonic.pojo.param.StatSubstationBizBaseParam;
+import com.njcn.harmonic.pojo.po.RMpPartHarmonicDetailM;
+import com.njcn.harmonic.mapper.RMpPartHarmonicDetailMMapper;
+import com.njcn.harmonic.pojo.vo.RMpPartHarmonicDetailVO;
+import com.njcn.harmonic.service.RMpPartHarmonicDetailMService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.njcn.system.api.DicDataFeignClient;
+import com.njcn.system.enums.DicDataTypeEnum;
+import com.njcn.system.pojo.po.DictData;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author rui.wu
+ * @since 2022-10-24
+ */
+@Service
+@RequiredArgsConstructor
+public class RMpPartHarmonicDetailMServiceImpl extends ServiceImpl<RMpPartHarmonicDetailMMapper, RMpPartHarmonicDetailM> implements RMpPartHarmonicDetailMService {
+
+    private final RMpSurplusHarmonicDetailMMapper rMpSurplusHarmonicDetailMMapper;
+    private final PmsGeneralDeviceInfoClient pmsGeneralDeviceInfoClient;
+    private final MonitorClient monitorClient;
+    private final DicDataFeignClient dicDataFeignClient;
+
+    @Override
+    public List<RMpPartHarmonicDetailVO> getRMpPartHarmonicDetail(RStatOrgParam param) {
+        //根据部门获取监测点信息(根据部门过滤基本信息)
+        PmsDeviceInfoParam pms=new PmsDeviceInfoParam();
+        pms.setDeptIndex(param.getId());
+        pms.setStatisticalType(new SimpleDTO());
+        List<PmsGeneralDeviceDTO> data = pmsGeneralDeviceInfoClient.getPmsDeviceInfoWithInOrg(pms).getData();
+        List<String> addIds=new ArrayList<>();
+        data.stream().forEach(e-> addIds.addAll(e.getMonitorIdList()));
+
+        if(CollectionUtil.isNotEmpty(addIds)){
+            //根据监测点ids获取监测点相关详细信息(变电站id，电压id，监测点名称)
+            PmsMonitorParam dto=BeanUtil.copyProperties(param,PmsMonitorParam.class);
+            dto.setMonitorIds(addIds);
+            dto.setMonitorName(param.getMonitorName());
+            dto.setVoltageLevels(param.getVoltageLevels());
+            dto.setPowerrIds(param.getPowerrIds());
+            List<PmsMonitorDTO> pmsMonitorDTOS = monitorClient.getMonitorInfoListByCond(dto).getData();
+            Map<String, PmsMonitorDTO> pmsMonitorDTOMap = pmsMonitorDTOS.stream()
+                    .collect(Collectors.toMap(PmsMonitorDTO::getId, Function.identity()));
+            //获取电压等级
+            List<DictData> devVoltageData = dicDataFeignClient.getDicDataByTypeCode(
+                    DicDataTypeEnum.DEV_VOLTAGE.getCode()).getData();
+            Map<String, DictData> devVoltageMap = devVoltageData.stream()
+                    .collect(Collectors.toMap(DictData::getId,  Function.identity()));
+            //获取最新过滤的监测点id
+            List<String> ids = pmsMonitorDTOS.stream().map(PmsMonitorDTO::getId).collect(Collectors.toList());
+            //筛选出数据库对应监测点
+            StatSubstationBizBaseParam baseParam= BeanUtil.copyProperties(param,StatSubstationBizBaseParam.class);
+            baseParam.setIds(ids);
+            List<RMpPartHarmonicDetailVO> rMpPartHarmonicDetail = rMpSurplusHarmonicDetailMMapper.getRMpPartHarmonicDetail(baseParam);
+            if(CollectionUtil.isNotEmpty(rMpPartHarmonicDetail)){
+                //因为只有月表，数据进行查询可能出现重复数据。进行分组
+                Map<String, List<RMpPartHarmonicDetailVO>> detailVOMap = rMpPartHarmonicDetail.stream()
+                        .collect(Collectors.groupingBy(RMpPartHarmonicDetailVO::getMeasurementPointId));
+                detailVOMap.forEach((Key,value)->{
+                    if(pmsMonitorDTOMap.containsKey(Key)){
+                        PmsMonitorDTO dto1 = pmsMonitorDTOMap.get(Key);
+                        for (RMpPartHarmonicDetailVO rmp : value) {
+                            rmp.setOrgName(dto1.getOrgName());
+                            rmp.setPowerrName(dto1.getPowerrName());
+                            rmp.setMeasurementPointName(dto1.getName());
+                            //获取字典电压等级名称
+                            if(devVoltageMap.containsKey(dto1.getVoltageLevel())){
+                                DictData data1 = devVoltageMap.get(dto1.getVoltageLevel());
+                                rmp.setMonitorVoltageName(data1.getName());
+                            }
+                        }
+
+                    }
+                });
+             }
+            return rMpPartHarmonicDetail;
+        }
+        return null;
+    }
+}
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/RMpPassRateServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/RMpPassRateServiceImpl.java
new file mode 100644
index 000000000..85da8c4c9
--- /dev/null
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/RMpPassRateServiceImpl.java
@@ -0,0 +1,131 @@
+package com.njcn.harmonic.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.collection.CollectionUtil;
+import com.njcn.common.pojo.constant.BizParamConstant;
+import com.njcn.common.pojo.dto.SimpleDTO;
+import com.njcn.common.pojo.param.StatisticsBizBaseParam;
+import com.njcn.device.pms.api.MonitorClient;
+import com.njcn.device.pms.api.PmsGeneralDeviceInfoClient;
+import com.njcn.device.pms.pojo.dto.PmsGeneralDeviceDTO;
+import com.njcn.device.pms.pojo.dto.PmsMonitorDTO;
+import com.njcn.device.pms.pojo.param.PmsDeviceInfoParam;
+import com.njcn.device.pms.pojo.param.PmsMonitorParam;
+import com.njcn.harmonic.mapper.RMpPassRateMMapper;
+import com.njcn.harmonic.mapper.RMpPassRateYMapper;
+import com.njcn.harmonic.pojo.param.RStatOrgParam;
+import com.njcn.harmonic.pojo.param.StatSubstationBizBaseParam;
+import com.njcn.harmonic.pojo.po.RMpPassRateQ;
+import com.njcn.harmonic.mapper.RMpPassRateQMapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.njcn.harmonic.pojo.vo.RStatOrgIndexVO;
+import com.njcn.harmonic.service.RMpPassRateService;
+import com.njcn.system.api.DicDataFeignClient;
+import com.njcn.system.enums.DicDataTypeEnum;
+import com.njcn.system.pojo.po.DictData;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author rui.wu
+ * @since 2022-10-24
+ */
+@Service
+@RequiredArgsConstructor
+public class RMpPassRateServiceImpl extends ServiceImpl<RMpPassRateQMapper, RMpPassRateQ> implements RMpPassRateService {
+
+    private final RMpPassRateYMapper rMpPassRateYMapper;
+    private final RMpPassRateQMapper rMpPassRateQMapper;
+    private final RMpPassRateMMapper rMpPassRateMMapper;
+    private final PmsGeneralDeviceInfoClient pmsGeneralDeviceInfoClient;
+    private final MonitorClient monitorClient;
+    private final DicDataFeignClient dicDataFeignClient;
+
+    @Override
+    public List<RStatOrgIndexVO> getRMpPassRateInfo(RStatOrgParam param) {
+        //初始化对象
+        List<RStatOrgIndexVO> temp=new ArrayList<>();
+        //根据部门获取监测点信息
+        PmsDeviceInfoParam pms=new PmsDeviceInfoParam();
+        pms.setDeptIndex(param.getId());
+        pms.setStatisticalType(new SimpleDTO());
+        List<PmsGeneralDeviceDTO> data = pmsGeneralDeviceInfoClient.getPmsDeviceInfoWithInOrg(pms).getData();
+        List<String> addIds=new ArrayList<>();
+        data.stream().forEach(e-> addIds.addAll(e.getMonitorIdList()));
+
+        if(CollectionUtil.isNotEmpty(addIds)){
+            //根据监测点ids获取监测点相关详细信息(变电站id，电压id，监测点名称)
+            PmsMonitorParam dto=BeanUtil.copyProperties(param,PmsMonitorParam.class);
+            dto.setMonitorIds(addIds);
+            dto.setMonitorName(param.getMonitorName());
+            dto.setVoltageLevels(param.getVoltageLevels());
+            dto.setPowerrIds(param.getPowerrIds());
+            List<PmsMonitorDTO> pmsMonitorDTOS = monitorClient.getMonitorInfoListByCond(dto).getData();
+            Map<String, PmsMonitorDTO> pmsMonitorDTOMap = pmsMonitorDTOS.stream()
+                    .collect(Collectors.toMap(PmsMonitorDTO::getId, Function.identity()));
+            //获取电压等级
+            List<DictData> devVoltageData = dicDataFeignClient.getDicDataByTypeCode(
+                    DicDataTypeEnum.DEV_VOLTAGE.getCode()).getData();
+            Map<String, DictData> devVoltageMap = devVoltageData.stream()
+                    .collect(Collectors.toMap(DictData::getId,  Function.identity()));
+
+            //获取最新过滤的监测点id
+            List<String> ids = pmsMonitorDTOS.stream().map(PmsMonitorDTO::getId).collect(Collectors.toList());
+            StatSubstationBizBaseParam baseParam= BeanUtil.copyProperties(param,StatSubstationBizBaseParam.class);
+            baseParam.setIds(ids);
+
+            if (CollectionUtil.isNotEmpty(addIds)) {
+                // 类型（1年 2季度 3月份
+                switch (param.getType().toString()) {
+                    case BizParamConstant.STAT_BIZ_YEAR:
+                        // 获取年稳态指标合格率明细表
+                        temp = rMpPassRateYMapper.getYearPassRate(baseParam);
+                        break;
+                    case BizParamConstant.STAT_BIZ_QUARTER:
+                        // 获取季稳态指标合格率明细表
+                        temp = rMpPassRateQMapper.getQuarterPassRate(baseParam);
+                        break;
+                    case BizParamConstant.STAT_BIZ_MONTH:
+                        // 获取月稳态指标合格率明细表
+                        temp = rMpPassRateMMapper.getMonthPassRate(baseParam);
+                        break;
+                    default:
+                        break;
+
+                }
+            }
+            if(CollectionUtil.isNotEmpty(temp)){
+                Map<String, RStatOrgIndexVO> collect = temp.stream()
+                        .collect(Collectors.toMap(RStatOrgIndexVO::getMeasurementPointId, Function.identity()));
+                collect.forEach((Key,value)->{
+                    if(pmsMonitorDTOMap.containsKey(Key)){
+                        //根据监测点信息，进行属性赋值
+                        PmsMonitorDTO dto1 = pmsMonitorDTOMap.get(Key);
+                        value.setOrgNo(dto1.getOrgId());
+                        value.setOrgName(dto1.getOrgName());
+                        value.setMeasurementPointName(dto1.getName());
+                        value.setPowerrName(dto1.getPowerrName());
+                        //获取电压字典的名称
+                        if(devVoltageMap.containsKey(dto1.getVoltageLevel())){
+                            DictData data1 = devVoltageMap.get(dto1.getVoltageLevel());
+                            value.setMonitorVoltageName(data1.getName());
+                        }
+                    }
+                });
+                return new ArrayList<>(collect.values());
+            }
+
+        }
+        return new ArrayList<>();
+    }
+}
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/RStatHarmonicMServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/RStatHarmonicMServiceImpl.java
new file mode 100644
index 000000000..08c53d8e3
--- /dev/null
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/RStatHarmonicMServiceImpl.java
@@ -0,0 +1,427 @@
+package com.njcn.harmonic.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.date.LocalDateTimeUtil;
+import cn.hutool.core.lang.Assert;
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.njcn.common.pojo.param.StatisticsBizBaseParam;
+import com.njcn.harmonic.mapper.RStatHarmonicDMapper;
+import com.njcn.harmonic.mapper.RStatHarmonicMMapper;
+import com.njcn.harmonic.mapper.RStatHarmonicVoltageMMapper;
+import com.njcn.harmonic.pojo.param.RStatHarmonicMParam;
+import com.njcn.harmonic.pojo.po.RStatHarmonicD;
+import com.njcn.harmonic.pojo.po.RStatHarmonicM;
+import com.njcn.harmonic.pojo.po.RStatHarmonicVoltageM;
+import com.njcn.harmonic.pojo.vo.RArrayVO;
+import com.njcn.harmonic.pojo.vo.RHarmonicPolylineVO;
+import com.njcn.harmonic.pojo.vo.RIconVO;
+import com.njcn.harmonic.pojo.vo.RStatHarmonicMVO;
+import com.njcn.harmonic.service.RStatHarmonicMService;
+import com.njcn.device.pq.utils.PublicDateUtil;
+import com.njcn.system.api.DicDataFeignClient;
+import com.njcn.system.enums.DicDataEnum;
+import com.njcn.system.enums.DicDataTypeEnum;
+import com.njcn.system.pojo.po.DictData;
+import lombok.RequiredArgsConstructor;
+import lombok.SneakyThrows;
+import org.springframework.stereotype.Service;
+
+import java.text.DecimalFormat;
+import java.text.SimpleDateFormat;
+import java.time.LocalDate;
+import java.util.*;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author rui.wu
+ * @since 2022-10-09
+ */
+@Service
+@RequiredArgsConstructor
+public class RStatHarmonicMServiceImpl extends ServiceImpl<RStatHarmonicMMapper, RStatHarmonicM> implements RStatHarmonicMService {
+
+    private final RStatHarmonicMMapper rStatHarmonicMMapper;
+    private final DicDataFeignClient dicDataFeignClient;
+    private final RStatHarmonicVoltageMMapper rStatHarmonicVoltageMMapper;
+    private final RStatHarmonicDMapper rStatHarmonicDMapper;
+
+    @Override
+    public List<RArrayVO> getRStatHarmonicMAll(StatisticsBizBaseParam param) {
+
+        //子节点 获取所有得干扰源类型（监测点类型）
+        List<DictData> interferenceSourceTypeData = dicDataFeignClient.getDicDataByTypeCode(
+                DicDataTypeEnum.MONITORING_LABELS.getCode()).getData();
+        Map<String, DictData> interferenceMap = interferenceSourceTypeData.stream().collect(Collectors.toMap(DictData::getId, Function.identity()));
+
+        //对象主节点 获取所有得指标类型
+        List<DictData> lineTypeData = dicDataFeignClient.getDicDataByTypeCode(
+                DicDataTypeEnum.STEADY_STATIS.getCode()).getData();
+        Map<String, DictData> lineTypeMap = lineTypeData.stream()
+                .collect(Collectors.toMap(DictData::getId, Function.identity()));
+
+        //获取主网id信息
+        DictData mainnetData = dicDataFeignClient.getDicDataByCode(DicDataEnum.MAINNET_POINT.getCode()).getData();
+
+        //数据库查询
+        List<RStatHarmonicM> list = rStatHarmonicMMapper.selectList(new LambdaQueryWrapper<RStatHarmonicM>()
+                .eq(RStatHarmonicM::getDataType,mainnetData.getId())
+                .ge(StrUtil.isNotBlank(param.getStartTime()), RStatHarmonicM::getDataDate, param.getStartTime())
+                .le(StrUtil.isNotBlank(param.getEndTime()), RStatHarmonicM::getDataDate, param.getEndTime()));
+
+        //初始化指标类型（横向）
+        List<RArrayVO> arrayVOList=new ArrayList<>();
+        List<RStatHarmonicMVO> rm=new ArrayList<>();
+        for (DictData lineTypeDatum : interferenceSourceTypeData) {
+            RStatHarmonicMVO r = new RStatHarmonicMVO();
+            r.setHarmonicName(lineTypeDatum.getName());
+            r.setSort(lineTypeDatum.getSort());
+            r.setOverLimitMeasurementAverage(0);
+            r.setOverLimitMeasurementAccrued(0);
+            r.setAverageOverDay(0.0F);
+            r.setOverDay(0);
+            r.setOverLimitMeasurementRatioAverage(0.0F);
+            r.setOverLimitMeasurementRatioAccrued(0.0F);
+            rm.add(r);
+        }
+        for (DictData lineTypeDatum : lineTypeData) {
+            RArrayVO r = new RArrayVO();
+            r.setRowName(lineTypeDatum.getName());
+            r.setSort(lineTypeDatum.getSort());
+            r.setColumns(rm);
+            arrayVOList.add(r);
+        }
+        //根据检测点对象分组
+        Map<String, List<RStatHarmonicM>> MeasurementTypeClassMap = list.stream().collect(Collectors.groupingBy(RStatHarmonicM::getHarmonicType));
+        //重新生成数据结构
+        MeasurementTypeClassMap.forEach((key, value) -> {
+            if(lineTypeMap.containsKey(key)){
+                RArrayVO arrayVO=new RArrayVO();
+                DictData data = lineTypeMap.get(key);
+                arrayVO.setRowName(data.getName());
+                arrayVO.setSort(data.getSort());
+                List<RStatHarmonicMVO> b=new ArrayList<>();
+                b.addAll(rm);
+                for (RStatHarmonicM rStatHarmonicM : value) {
+                    RStatHarmonicMVO r = BeanUtil.copyProperties(rStatHarmonicM, RStatHarmonicMVO.class);
+                    DictData data1 = interferenceMap.get(rStatHarmonicM.getMeasurementTypeClass());
+                    r.setHarmonicName(data1.getName());
+                    r.setSort(data1.getSort());
+                    DecimalFormat df = new DecimalFormat("###.00");
+                    Float averageOverDay = Float.parseFloat(
+                            df.format(r.getOverDay()/(r.getOverLimitMeasurementAccrued()*1.0)));
+                    r.setAverageOverDay(averageOverDay);
+                    b.add(r);
+                }
+                Map<String,RStatHarmonicMVO> linkedHashMap=new LinkedHashMap<>();
+                for (RStatHarmonicMVO harmonicMVO : b) {
+                    linkedHashMap.put(harmonicMVO.getHarmonicName(),harmonicMVO);
+                }
+                List<RStatHarmonicMVO> aa=new ArrayList<>(linkedHashMap.values());
+                aa.sort(Comparator.comparing(rStatHarmonicMVO -> rStatHarmonicMVO.getSort()));
+                arrayVO.setColumns(aa);
+                arrayVOList.add(arrayVO);
+            }
+        });
+        Map<String,RArrayVO> linkedHashMap=new LinkedHashMap<>();
+        for (RArrayVO rStatHarmonicMVO : arrayVOList) {
+            linkedHashMap.put(rStatHarmonicMVO.getRowName(),rStatHarmonicMVO);
+        }
+        List<RArrayVO> aa=new ArrayList<>(linkedHashMap.values());
+        aa.sort(Comparator.comparing(rArrayVO -> rArrayVO.getSort()));
+        return aa;
+    }
+
+    @Override
+    public List<RIconVO> getRStatHarmonicIcon(RStatHarmonicMParam param) {
+        //干扰数据类型（监测对象）
+        DictData measurementDate =null;
+        //指标对象类型属性
+        DictData harmonicDate =null;
+        //判断是是否传入检测点信息值（电压）
+        if(StrUtil.isBlank(param.getStasisID())&&StrUtil.isBlank(param.getMonitorID())){
+            //干扰数据类型（监测对象）
+            List<DictData> interferenceSourceTypeData = dicDataFeignClient.getDicDataByTypeCode(
+                    DicDataTypeEnum.MONITORING_LABELS.getCode()).getData();
+            interferenceSourceTypeData.sort(Comparator.comparing(data -> data.getSort()));
+            measurementDate =interferenceSourceTypeData.get(0);
+            //指标对象类型
+            List<DictData> indicatorTypeDate = dicDataFeignClient.getDicDataByTypeCode(
+                    DicDataTypeEnum.STEADY_STATIS.getCode()).getData();
+            indicatorTypeDate.sort(Comparator.comparing(data -> data.getSort()));
+            harmonicDate =indicatorTypeDate.get(0);
+        }else{
+            //获取检测点对象（电压）
+            measurementDate = dicDataFeignClient.getDicDataById(
+                    param.getMonitorID()).getData();
+            //获取指标对象（频率偏差）
+            harmonicDate= dicDataFeignClient.getDicDataById(
+                    param.getStasisID()).getData();
+        }
+        //反防止参数查询数据报错
+        Assert.isTrue(
+                ObjectUtil.isNotNull(measurementDate)||ObjectUtil.isNotNull(harmonicDate)
+                , "干扰源类型或者指标类型为空,请检查入参是否准确");
+        //获取电压字典
+        List<DictData> devVoltageData = dicDataFeignClient.getDicDataByTypeCode(
+                DicDataTypeEnum.DEV_VOLTAGE.getCode()).getData();
+        Map<String, DictData> devVoltageMap = devVoltageData.stream()
+                .collect(Collectors.toMap(DictData::getId,  Function.identity()));
+        //获取主网id信息
+        DictData mainnetData = dicDataFeignClient.getDicDataByCode(DicDataEnum.MAINNET_POINT.getCode()).getData();
+
+        //初始化对象
+        List<RIconVO> arrayVOList=new ArrayList<>();
+        List<RStatHarmonicVoltageM> rStatHarmonicVoltageMS = rStatHarmonicVoltageMMapper.selectList(new LambdaQueryWrapper<RStatHarmonicVoltageM>()
+                .eq(RStatHarmonicVoltageM::getDataType,mainnetData.getId())
+                .eq(RStatHarmonicVoltageM::getMeasurementTypeClass, measurementDate.getId())
+                .eq(RStatHarmonicVoltageM::getHarmonicType, harmonicDate.getId())
+                .ge(StrUtil.isNotBlank(param.getStartTime()), RStatHarmonicVoltageM::getDataDate, param.getStartTime())
+                .le(StrUtil.isNotBlank(param.getEndTime()), RStatHarmonicVoltageM::getDataDate, param.getEndTime())
+        );
+        //将数据转换为map进行便利
+        Map<String, RStatHarmonicVoltageM> voltageMMap = rStatHarmonicVoltageMS.stream()
+                .collect(Collectors.toMap(RStatHarmonicVoltageM::getVoltageType, Function.identity()));
+        //对象
+        if (CollUtil.isNotEmpty(rStatHarmonicVoltageMS)){
+            voltageMMap.forEach((key, value) -> {
+                if(devVoltageMap.containsKey(key)){
+                    DictData data = devVoltageMap.get(key);
+                    RIconVO rIconVO = new RIconVO();
+                    rIconVO.setRowName(data.getName());
+                    rIconVO.setSort(data.getSort());
+                    rIconVO.setOverLimitMeasurementAccrued(value.getOverLimitMeasurementAccrued());
+                    rIconVO.setOverLimitMeasurementAverage(value.getOverLimitMeasurementAverage());
+                    rIconVO.setOverLimitMeasurementRatioAccrued(value.getOverLimitMeasurementRatioAccrued());
+                    rIconVO.setOverLimitMeasurementRatioAverage(value.getOverLimitMeasurementRatioAverage());
+                    DecimalFormat df = new DecimalFormat("###.00");
+                    Float averageOverDay = Float.parseFloat(
+                            df.format(value.getOverDay()/(value.getOverLimitMeasurementAccrued()*1.0)));
+                    rIconVO.setAverageOverDay(averageOverDay);
+                    arrayVOList.add(rIconVO);
+                }
+            });
+        }
+        arrayVOList.sort(Comparator.comparing(rIconVO -> rIconVO.getSort()));
+        return arrayVOList;
+    }
+
+    @SneakyThrows
+    @Override
+    public List<RHarmonicPolylineVO> getRStatHarmonicIcon2(RStatHarmonicMParam param) {
+        //初始化对象
+        List<RHarmonicPolylineVO> iconList=new ArrayList<>();
+        DictData measurementDate =null;
+        //指标对象类型属性
+        DictData harmonicDate =null;
+        //判断是是否传入检测点信息值（电压）
+        if(StrUtil.isBlank(param.getStasisID())&&StrUtil.isBlank(param.getMonitorID())){
+            //干扰数据类型（监测对象）
+            List<DictData> interferenceSourceTypeData = dicDataFeignClient.getDicDataByTypeCode(
+                    DicDataTypeEnum.MONITORING_LABELS.getCode()).getData();
+            interferenceSourceTypeData.sort(Comparator.comparing(data -> data.getSort()));
+            measurementDate =interferenceSourceTypeData.get(0);
+            //指标对象类型
+            List<DictData> indicatorTypeDate = dicDataFeignClient.getDicDataByTypeCode(
+                    DicDataTypeEnum.STEADY_STATIS.getCode()).getData();
+            indicatorTypeDate.sort(Comparator.comparing(data -> data.getSort()));
+            harmonicDate =indicatorTypeDate.get(0);
+        }else{
+            //获取检测点对象（电压）
+            measurementDate = dicDataFeignClient.getDicDataById(
+                    param.getMonitorID()).getData();
+            //获取指标对象（频率偏差）
+            harmonicDate= dicDataFeignClient.getDicDataById(
+                    param.getStasisID()).getData();
+        }
+        //反防止参数查询数据报错
+        Assert.isTrue(
+                ObjectUtil.isNotNull(measurementDate)||ObjectUtil.isNotNull(harmonicDate)
+                , "干扰源类型或者指标类型为空,请检查入参是否准确");
+
+        //获取主网id信息
+        DictData mainnetData = dicDataFeignClient.getDicDataByCode(DicDataEnum.MAINNET_POINT.getCode()).getData();
+
+        List<RStatHarmonicD> rStatHarmonicVoltageMS = rStatHarmonicDMapper.selectList(new LambdaQueryWrapper<RStatHarmonicD>()
+                .eq(RStatHarmonicD::getDataType,mainnetData.getId())
+                .eq(RStatHarmonicD::getMeasurementTypeClass, measurementDate.getId())
+                .eq(RStatHarmonicD::getHarmonicType, harmonicDate.getId())
+                .ge(StrUtil.isNotBlank(param.getStartTime()), RStatHarmonicD::getDataDate, param.getStartTime())
+                .le(StrUtil.isNotBlank(param.getEndTime()), RStatHarmonicD::getDataDate, param.getEndTime())
+        );
+        Map<LocalDate, List<RStatHarmonicD>> collect =
+                rStatHarmonicVoltageMS.stream().collect(Collectors.groupingBy(RStatHarmonicD::getDataDate));
+
+        //获取月份
+        List<String> intervalTime = this.getIntervalTime(param.getStartTime(), param.getEndTime());
+        for (String interTime : intervalTime) {
+            //生成初始时间
+            String startTime = PublicDateUtil.getFisrtDayOfMonth(Integer.parseInt(interTime.substring(0, 4)), Integer.parseInt(interTime.substring(5)));
+            String endTime = PublicDateUtil.getLastDayOfMonth(Integer.parseInt(interTime.substring(0, 4)), Integer.parseInt(interTime.substring(5)));
+            SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
+            Date dt = simpleDateFormat.parse(startTime);
+            Date dtDate = simpleDateFormat.parse(endTime);
+            Integer year = Integer.valueOf(String.format("%tY", dt));
+            Integer mon = Integer.valueOf(String.format("%tm", dt));
+            Integer day = Integer.valueOf(String.format("%td", dtDate));
+            //生成月份数据
+            List<String> dayTime = this.getIntervalDateTime(year, mon,day);
+            for (String s : dayTime) {
+                RHarmonicPolylineVO rPolylineVO=new RHarmonicPolylineVO();
+                rPolylineVO.setDate(s);
+                if(collect.containsKey(LocalDateTimeUtil.parseDate(s,"yyyy-MM-dd"))){
+                    List<RStatHarmonicD> rSd = collect.get(LocalDateTimeUtil.parseDate(s, "yyyy-MM-dd"));
+                    rPolylineVO.setNum(rSd.get(0).getOverLimitMeasurement());
+                    rPolylineVO.setOverLimitMeasurementRatioAverage(rSd.get(0).getOverLimitMeasurementRatio());
+                    rPolylineVO.setAverageOverDay(1);
+                }else{
+                    rPolylineVO.setNum(0);
+                    rPolylineVO.setAverageOverDay(0);
+                    rPolylineVO.setOverLimitMeasurementRatioAverage(0.0f);
+                }
+                iconList.add(rPolylineVO);
+            }
+
+        }
+        return iconList;
+    }
+
+    /**
+        * 根据用户选择的时间区间返回月份日期
+     */
+    @SneakyThrows
+    private List<String> getIntervalTime(String startTime, String endTime) {
+        List<String> times = new ArrayList<>();
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM");
+        Date start = sdf.parse(startTime);
+        Date end = sdf.parse(endTime);
+        // 同月
+        if (start.getTime() == end.getTime()) {
+            String time = startTime.substring(0, 7);
+            times.add(time);
+        } else if (start.getYear() == end.getYear()) {
+            // 同年
+            int startM = start.getMonth() + 1;
+            int endM = end.getMonth() + 1;
+            int temp = endM - startM;
+            for (int i = 0; i <= temp; i++) {
+                String time = start.getYear() + 1900 + "";
+                int month = startM + i;
+                if (month < 10) {
+                    time = time + "-0" + month;
+                } else {
+                    time = time + "-" + month;
+                }
+                times.add(time);
+            }
+        } else {
+            // 不同年!!!!这里忽略了年份之间跨年的情况
+            int startY = start.getYear() + 1900;
+            int startM = start.getMonth() + 1;
+            int endY = end.getYear() + 1900;
+            int endM = end.getMonth() + 1;
+            int tempS = 12 - startM;
+            // 连续的年份
+            if (endY - startY == 1) {
+                // 第一年的时间获取
+                for (int i = 0; i <= tempS; i++) {
+                    int month = startM + i;
+                    String time = startY + "-";
+                    if (month < 10) {
+                        time = time + "0" + month;
+                    } else {
+                        time = time + month;
+                    }
+                    times.add(time);
+                }
+                // 第二年的时间获取
+
+                for (int i = 1; i <= endM; i++) {
+                    String time = endY + "-";
+                    if (i < 10) {
+                        time = time + "0" + i;
+                    } else {
+                        time = time + i;
+                    }
+                    times.add(time);
+                }
+            } else {
+                // 不连续的年份
+                // 第一年的时间获取
+                for (int i = 0; i <= tempS; i++) {
+                    int month = startM + i;
+                    String time = startY + "-";
+                    if (month < 10) {
+                        time = time + "0" + month;
+                    } else {
+                        time = time + month;
+                    }
+                    times.add(time);
+                }
+                int tempY = endY - startY;
+                // 中间年份的时间
+                for (int i = 1; i < tempY; i++) {
+                    for (int j = 1; j <= 12; j++) {
+                        String time = startY + i + "-";
+                        if (j < 10) {
+                            time = time + "0" + j;
+                        } else {
+                            time = time + j;
+                        }
+                        times.add(time);
+                    }
+                }
+                // 最后一年的时间获取
+                for (int i = 1; i <= endM; i++) {
+                    String time = endY + "-";
+                    if (i < 10) {
+                        time = time + "0" + i;
+                    } else {
+                        time = time + i;
+                    }
+                    times.add(time);
+                }
+            }
+
+        }
+        return times;
+    }
+
+    @SneakyThrows
+    private List<String> getIntervalDateTime(Integer startTime, Integer endTime, Integer dd) {
+        List<String> list = new ArrayList<>();
+        Calendar calendar = Calendar.getInstance(Locale.CHINA);
+        calendar.set(startTime, endTime - 1, 1);
+        //年份
+        int year = calendar.get(Calendar.YEAR);
+        //月份
+        int month = calendar.get(Calendar.MONTH) + 1;
+        for (int i = 1; i <= dd; i++) {
+            String date = null;
+            if (month < 10 && i < 10) {
+                date = year + "-0" + month + "-0" + i;
+            }
+            if (month < 10 && i >= 10) {
+                date = year + "-0" + month + "-" + i;
+            }
+            if (month >= 10 && i < 10) {
+                date = year + "-" + month + "-0" + i;
+            }
+            if (month >= 10 && i >= 10) {
+                date = year + "-" + month + "-" + i;
+            }
+
+            list.add(date);
+        }
+        return list;
+    }
+
+}
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/RStatHarmonicOrgMServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/RStatHarmonicOrgMServiceImpl.java
new file mode 100644
index 000000000..88ae82484
--- /dev/null
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/RStatHarmonicOrgMServiceImpl.java
@@ -0,0 +1,202 @@
+package com.njcn.harmonic.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.lang.Assert;
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.njcn.common.pojo.param.StatisticsBizBaseParam;
+import com.njcn.harmonic.pojo.param.RStatHarmonicMParam;
+import com.njcn.harmonic.pojo.po.RStatHarmonicOrgM;
+import com.njcn.harmonic.mapper.StatHarmonicOrgMMapper;
+import com.njcn.harmonic.pojo.vo.RArrayVO;
+import com.njcn.harmonic.pojo.vo.RIconVO;
+import com.njcn.harmonic.pojo.vo.RStatHarmonicMVO;
+import com.njcn.harmonic.service.RStatHarmonicOrgMService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.njcn.system.api.DicDataFeignClient;
+import com.njcn.system.enums.DicDataEnum;
+import com.njcn.system.enums.DicDataTypeEnum;
+import com.njcn.system.pojo.po.DictData;
+import com.njcn.user.api.DeptFeignClient;
+import com.njcn.user.pojo.dto.DeptDTO;
+import com.njcn.web.utils.WebUtil;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+
+import java.text.DecimalFormat;
+import java.util.*;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author rui.wu
+ * @since 2022-10-14
+ */
+@Service
+@RequiredArgsConstructor
+public class RStatHarmonicOrgMServiceImpl extends ServiceImpl<StatHarmonicOrgMMapper, RStatHarmonicOrgM> implements RStatHarmonicOrgMService {
+
+    private final DeptFeignClient deptFeignClient;
+    private final DicDataFeignClient dicDataFeignClient;
+    private final StatHarmonicOrgMMapper statHarmonicOrgMMapper;
+
+    @Override
+    public List<RArrayVO> getRStatHarmonicMAll(StatisticsBizBaseParam param) {
+        //子节点 获取所有得各单位类型
+        List<DeptDTO> deptDTOList = deptFeignClient.getDeptDescendantIndexes(param.getId(), WebUtil.filterDeptType()).getData();
+        //获取部门id集合
+        List<String> deptIds = deptDTOList.stream().map(DeptDTO::getId).collect(Collectors.toList());
+        Map<String, DeptDTO> deptMap = deptDTOList.stream().collect(Collectors.toMap(DeptDTO::getId, Function.identity()));
+
+        //对象主节点 获取所有得指标类型
+        List<DictData> lineTypeData = dicDataFeignClient.getDicDataByTypeCode
+                (DicDataTypeEnum.STEADY_STATIS.getCode()).getData();
+        Map<String, DictData> lineTypeMap = lineTypeData.stream()
+                .collect(Collectors.toMap(DictData::getId, Function.identity()));
+        //获取主网id信息
+        DictData mainnetData = dicDataFeignClient.getDicDataByCode(DicDataEnum.MAINNET_POINT.getCode()).getData();
+
+        //数据库查询
+        List<RStatHarmonicOrgM> list = statHarmonicOrgMMapper.selectList(new LambdaQueryWrapper<RStatHarmonicOrgM>()
+                .eq(RStatHarmonicOrgM::getDataType,mainnetData.getId())
+                .in(RStatHarmonicOrgM::getOrgNo,deptIds)
+                .ge(StrUtil.isNotBlank(param.getStartTime()), RStatHarmonicOrgM::getDataDate, param.getStartTime())
+                .le(StrUtil.isNotBlank(param.getEndTime()), RStatHarmonicOrgM::getDataDate, param.getEndTime()));
+
+        //初始化指标类型（横向）
+        List<RArrayVO> arrayVOList=new ArrayList<>();
+        List<RStatHarmonicMVO> rm=new ArrayList<>();
+        for (DeptDTO deptDTO : deptDTOList) {
+            RStatHarmonicMVO r = new RStatHarmonicMVO();
+            r.setHarmonicName(deptDTO.getName());
+            r.setOverLimitMeasurementAverage(0);
+            r.setOverLimitMeasurementAccrued(0);
+            r.setAverageOverDay(0.0F);
+            r.setOverDay(0);
+            r.setOverLimitMeasurementRatioAverage(0.0F);
+            r.setOverLimitMeasurementRatioAccrued(0.0F);
+            rm.add(r);
+        }
+        for (DictData lineTypeDatum : lineTypeData) {
+            RArrayVO r = new RArrayVO();
+            r.setRowName(lineTypeDatum.getName());
+            r.setColumns(rm);
+            r.setSort(lineTypeDatum.getSort());
+            arrayVOList.add(r);
+        }
+        //根据检测点对象分组
+        Map<String, List<RStatHarmonicOrgM>> MeasurementTypeClassMap = list.stream().collect(Collectors.groupingBy(RStatHarmonicOrgM::getHarmonicType));
+        //重新生成数据结构
+        MeasurementTypeClassMap.forEach((key, value) -> {
+            if(lineTypeMap.containsKey(key)){
+                RArrayVO arrayVO=new RArrayVO();
+                DictData data = lineTypeMap.get(key);
+                arrayVO.setRowName(data.getName());
+                arrayVO.setSort(data.getSort());
+                List<RStatHarmonicMVO> b=new ArrayList<>();
+                b.addAll(rm);
+                for (RStatHarmonicOrgM orgY : value) {
+                    RStatHarmonicMVO r = BeanUtil.copyProperties(orgY, RStatHarmonicMVO.class);
+                    DeptDTO data1 = deptMap.get(orgY.getOrgNo());
+                    if (ObjectUtil.isNotNull(data1)){
+                        r.setHarmonicName(data1.getName());
+                        DecimalFormat df = new DecimalFormat("###.00");
+                        Float averageOverDay = Float.parseFloat(
+                                df.format(r.getOverDay()/(r.getOverLimitMeasurementAccrued()*1.0)));
+                        r.setAverageOverDay(averageOverDay);
+                        b.add(r);
+                    }
+                }
+                Map<String,RStatHarmonicMVO> linkedHashMap=new LinkedHashMap<>();
+                for (RStatHarmonicMVO harmonicMVO : b) {
+                    linkedHashMap.put(harmonicMVO.getHarmonicName(),harmonicMVO);
+                }
+                List<RStatHarmonicMVO> aa=new ArrayList<>(linkedHashMap.values());
+                aa.sort(Comparator.comparing(rStatHarmonicMVO -> rStatHarmonicMVO.getHarmonicName()));
+                arrayVO.setColumns(aa);
+                arrayVOList.add(arrayVO);
+            }
+
+        });
+        Map<String,RArrayVO> linkedHashMap=new LinkedHashMap<>();
+        for (RArrayVO rStatHarmonicMVO : arrayVOList) {
+            linkedHashMap.put(rStatHarmonicMVO.getRowName(),rStatHarmonicMVO);
+        }
+        List<RArrayVO> aa=new ArrayList<>(linkedHashMap.values());
+        arrayVOList.sort(Comparator.comparing(rArrayVO -> rArrayVO.getRowName()));
+        return aa;
+    }
+
+    @Override
+    public List<RIconVO> getRStatHarmonicOrgMIcon(RStatHarmonicMParam param) {
+        //各单位类型
+        List<DeptDTO> deptDTOList = deptFeignClient.getDeptDescendantIndexes(param.getId(), WebUtil.filterDeptType()).getData();
+        Map<String, DeptDTO> deptMap = deptDTOList.stream().collect(Collectors.toMap(DeptDTO::getId, Function.identity()));
+        //获取部门id集合
+        List<String> deptIds = deptDTOList.stream().map(DeptDTO::getId).collect(Collectors.toList());
+        //指标对象类型属性
+        DictData harmonicDate =null;
+        //判断是是否传入检测点信息值（电压）
+        if(StrUtil.isBlank(param.getStasisID())&&StrUtil.isBlank(param.getMonitorID())){
+            //指标对象类型
+            List<DictData> indicatorTypeDate = dicDataFeignClient.getDicDataByTypeCode(
+                    DicDataTypeEnum.STEADY_STATIS.getCode()).getData();
+            indicatorTypeDate.sort(Comparator.comparing(data -> data.getSort()));
+            harmonicDate =indicatorTypeDate.get(0);
+        }else{
+            //获取指标对象（频率偏差）
+            harmonicDate= dicDataFeignClient.getDicDataById(
+                    param.getStasisID()).getData();
+        }
+        //反防止参数查询数据报错
+        Assert.isTrue(
+                CollUtil.isNotEmpty(deptDTOList)||ObjectUtil.isNotNull(harmonicDate)
+                , "各单位或者指标类型为空,请检查入参是否准确");
+        //获取主网id信息
+        DictData mainnetData = dicDataFeignClient.getDicDataByCode(DicDataEnum.MAINNET_POINT.getCode()).getData();
+
+        //初始化对象
+        List<RIconVO> arrayVOList=new ArrayList<>();
+        List<RStatHarmonicOrgM> rStatHarmonicVoltageMS = statHarmonicOrgMMapper.selectList(new LambdaQueryWrapper<RStatHarmonicOrgM>()
+                .eq(RStatHarmonicOrgM::getDataType,mainnetData.getId())
+                .in(RStatHarmonicOrgM::getOrgNo,deptIds)
+                .eq(RStatHarmonicOrgM::getHarmonicType, harmonicDate.getId())
+                .ge(StrUtil.isNotBlank(param.getStartTime()), RStatHarmonicOrgM::getDataDate, param.getStartTime())
+                .le(StrUtil.isNotBlank(param.getEndTime()), RStatHarmonicOrgM::getDataDate, param.getEndTime())
+        );
+        //将数据转换为map进行便利
+        Map<String, List<RStatHarmonicOrgM>> voltageMMap = rStatHarmonicVoltageMS.stream()
+                .collect(Collectors.groupingBy(RStatHarmonicOrgM::getOrgNo));
+        //对象
+        if (CollUtil.isNotEmpty(rStatHarmonicVoltageMS)){
+            voltageMMap.forEach((key, value) -> {
+                if(deptMap.containsKey(key)){
+                    DeptDTO data = deptMap.get(key);
+                    for (RStatHarmonicOrgM orgM : value) {
+                        RIconVO rIconVO = new RIconVO();
+                        rIconVO.setRowName(data.getName());
+//                    rIconVO.setSort(data.getSort());
+                        rIconVO.setOverLimitMeasurementAccrued(orgM.getOverLimitMeasurementAccrued());
+                        rIconVO.setOverLimitMeasurementAverage(orgM.getOverLimitMeasurementAverage());
+                        rIconVO.setOverLimitMeasurementRatioAccrued(orgM.getOverLimitMeasurementRatioAccrued());
+                        rIconVO.setOverLimitMeasurementRatioAverage(orgM.getOverLimitMeasurementRatioAverage());
+                        DecimalFormat df = new DecimalFormat("###.00");
+                        Float averageOverDay = Float.parseFloat(
+                                df.format(orgM.getOverDay()/(orgM.getOverLimitMeasurementAccrued()*1.0)));
+                        rIconVO.setAverageOverDay(averageOverDay);
+                        arrayVOList.add(rIconVO);
+                    }
+
+                }
+            });
+        }
+        arrayVOList.sort(Comparator.comparing(rIconVO -> rIconVO.getRowName()));
+        return arrayVOList;
+    }
+}
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/RStatHarmonicOrgQServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/RStatHarmonicOrgQServiceImpl.java
new file mode 100644
index 000000000..e4589dcd9
--- /dev/null
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/RStatHarmonicOrgQServiceImpl.java
@@ -0,0 +1,194 @@
+package com.njcn.harmonic.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.lang.Assert;
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.njcn.common.pojo.param.StatisticsBizBaseParam;
+import com.njcn.harmonic.pojo.param.RStatHarmonicMParam;
+import com.njcn.harmonic.pojo.po.RStatHarmonicOrgQ;
+import com.njcn.harmonic.mapper.StatHarmonicOrgQMapper;
+import com.njcn.harmonic.pojo.vo.RArrayVO;
+import com.njcn.harmonic.pojo.vo.RIconVO;
+import com.njcn.harmonic.pojo.vo.RStatHarmonicMVO;
+import com.njcn.harmonic.service.RStatHarmonicOrgQService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.njcn.system.api.DicDataFeignClient;
+import com.njcn.system.enums.DicDataEnum;
+import com.njcn.system.enums.DicDataTypeEnum;
+import com.njcn.system.pojo.po.DictData;
+import com.njcn.user.api.DeptFeignClient;
+import com.njcn.user.pojo.dto.DeptDTO;
+import com.njcn.web.utils.WebUtil;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+
+import java.util.*;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author rui.wu
+ * @since 2022-10-14
+ */
+@Service
+@RequiredArgsConstructor
+public class RStatHarmonicOrgQServiceImpl extends ServiceImpl<StatHarmonicOrgQMapper, RStatHarmonicOrgQ> implements RStatHarmonicOrgQService {
+
+    private final DeptFeignClient deptFeignClient;
+    private final DicDataFeignClient dicDataFeignClient;
+    private final StatHarmonicOrgQMapper statHarmonicOrgQMapper;
+    @Override
+    public List<RArrayVO> getRStatHarmonicQAll(StatisticsBizBaseParam param) {
+        //子节点 获取所有得各单位类型
+        List<DeptDTO> deptDTOList = deptFeignClient.getDeptDescendantIndexes(param.getId(), WebUtil.filterDeptType()).getData();
+        //获取部门id集合
+        List<String> deptIds = deptDTOList.stream().map(DeptDTO::getId).collect(Collectors.toList());
+        Map<String, DeptDTO> deptMap = deptDTOList.stream().collect(Collectors.toMap(DeptDTO::getId, Function.identity()));
+
+        //对象主节点 获取所有得指标类型
+        List<DictData> lineTypeData = dicDataFeignClient.getDicDataByTypeCode
+                (DicDataTypeEnum.STEADY_STATIS.getCode()).getData();
+        Map<String, DictData> lineTypeMap = lineTypeData.stream()
+                .collect(Collectors.toMap(DictData::getId, Function.identity()));
+        //获取主网id信息
+        DictData mainnetData = dicDataFeignClient.getDicDataByCode(DicDataEnum.MAINNET_POINT.getCode()).getData();
+
+        //数据库查询
+        List<RStatHarmonicOrgQ> list = statHarmonicOrgQMapper.selectList(new LambdaQueryWrapper<RStatHarmonicOrgQ>()
+                .eq(RStatHarmonicOrgQ::getDataType,mainnetData.getId())
+                .in(RStatHarmonicOrgQ::getOrgNo,deptIds)
+                .ge(StrUtil.isNotBlank(param.getStartTime()), RStatHarmonicOrgQ::getDataDate, param.getStartTime())
+                .le(StrUtil.isNotBlank(param.getEndTime()), RStatHarmonicOrgQ::getDataDate, param.getEndTime()));
+
+        //初始化指标类型（横向）
+        List<RArrayVO> arrayVOList=new ArrayList<>();
+        List<RStatHarmonicMVO> rm=new ArrayList<>();
+        for (DeptDTO deptDTO : deptDTOList) {
+            RStatHarmonicMVO r = new RStatHarmonicMVO();
+            r.setHarmonicName(deptDTO.getName());
+            r.setOverLimitMeasurementAverage(0);
+            r.setOverLimitMeasurementAccrued(0);
+            r.setAverageOverDay(0.0F);
+            r.setOverDay(0);
+            r.setOverLimitMeasurementRatioAverage(0.0F);
+            r.setOverLimitMeasurementRatioAccrued(0.0F);
+            rm.add(r);
+        }
+        for (DictData lineTypeDatum : lineTypeData) {
+            RArrayVO r = new RArrayVO();
+            r.setRowName(lineTypeDatum.getName());
+            r.setColumns(rm);
+            r.setSort(lineTypeDatum.getSort());
+            arrayVOList.add(r);
+        }
+        //根据检测点对象分组
+        Map<String, List<RStatHarmonicOrgQ>> MeasurementTypeClassMap = list.stream().collect(Collectors.groupingBy(RStatHarmonicOrgQ::getHarmonicType));
+        //重新生成数据结构
+        MeasurementTypeClassMap.forEach((key, value) -> {
+            if(lineTypeMap.containsKey(key)){
+                RArrayVO arrayVO=new RArrayVO();
+                DictData data = lineTypeMap.get(key);
+                arrayVO.setRowName(data.getName());
+                arrayVO.setSort(data.getSort());
+                List<RStatHarmonicMVO> b=new ArrayList<>();
+                b.addAll(rm);
+                for (RStatHarmonicOrgQ orgY : value) {
+                    RStatHarmonicMVO r = BeanUtil.copyProperties(orgY, RStatHarmonicMVO.class);
+                    DeptDTO data1 = deptMap.get(orgY.getOrgNo());
+                    if (ObjectUtil.isNotNull(data1)){
+                        r.setHarmonicName(data1.getName());
+                        r.setOverDay(0);
+                        b.add(r);
+                    }
+                }
+                Map<String,RStatHarmonicMVO> linkedHashMap=new LinkedHashMap<>();
+                for (RStatHarmonicMVO harmonicMVO : b) {
+                    linkedHashMap.put(harmonicMVO.getHarmonicName(),harmonicMVO);
+                }
+                List<RStatHarmonicMVO> aa=new ArrayList<>(linkedHashMap.values());
+                aa.sort(Comparator.comparing(rStatHarmonicMVO -> rStatHarmonicMVO.getHarmonicName()));
+                arrayVO.setColumns(aa);
+                arrayVOList.add(arrayVO);
+            }
+
+        });
+        Map<String,RArrayVO> linkedHashMap=new LinkedHashMap<>();
+        for (RArrayVO rStatHarmonicMVO : arrayVOList) {
+            linkedHashMap.put(rStatHarmonicMVO.getRowName(),rStatHarmonicMVO);
+        }
+        List<RArrayVO> aa=new ArrayList<>(linkedHashMap.values());
+        arrayVOList.sort(Comparator.comparing(rArrayVO -> rArrayVO.getRowName()));
+        return aa;
+    }
+
+    @Override
+    public List<RIconVO> getRStatHarmonicOrgQIcon(RStatHarmonicMParam param) {
+        //各单位类型
+        List<DeptDTO> deptDTOList = deptFeignClient.getDeptDescendantIndexes(param.getId(), WebUtil.filterDeptType()).getData();
+        Map<String, DeptDTO> deptMap = deptDTOList.stream().collect(Collectors.toMap(DeptDTO::getId, Function.identity()));
+        //获取部门id集合
+        List<String> deptIds = deptDTOList.stream().map(DeptDTO::getId).collect(Collectors.toList());
+        //指标对象类型属性
+        DictData harmonicDate =null;
+        //判断是是否传入检测点信息值（电压）
+        if(StrUtil.isBlank(param.getStasisID())&&StrUtil.isBlank(param.getMonitorID())){
+            //指标对象类型
+            List<DictData> indicatorTypeDate = dicDataFeignClient.getDicDataByTypeCode(
+                    DicDataTypeEnum.STEADY_STATIS.getCode()).getData();
+            indicatorTypeDate.sort(Comparator.comparing(data -> data.getSort()));
+            harmonicDate =indicatorTypeDate.get(0);
+        }else{
+            //获取指标对象（频率偏差）
+            harmonicDate= dicDataFeignClient.getDicDataById(
+                    param.getStasisID()).getData();
+        }
+        //反防止参数查询数据报错
+        Assert.isTrue(
+                CollUtil.isNotEmpty(deptDTOList)||ObjectUtil.isNotNull(harmonicDate)
+                , "各单位或者指标类型为空,请检查入参是否准确");
+        //获取主网id信息
+        DictData mainnetData = dicDataFeignClient.getDicDataByCode(DicDataEnum.MAINNET_POINT.getCode()).getData();
+
+        //初始化对象
+        List<RIconVO> arrayVOList=new ArrayList<>();
+        List<RStatHarmonicOrgQ> rStatHarmonicVoltageMS = statHarmonicOrgQMapper.selectList(new LambdaQueryWrapper<RStatHarmonicOrgQ>()
+                .eq(RStatHarmonicOrgQ::getDataType,mainnetData.getId())
+                .in(RStatHarmonicOrgQ::getOrgNo,deptIds)
+                .eq(RStatHarmonicOrgQ::getHarmonicType, harmonicDate.getId())
+                .ge(StrUtil.isNotBlank(param.getStartTime()), RStatHarmonicOrgQ::getDataDate, param.getStartTime())
+                .le(StrUtil.isNotBlank(param.getEndTime()), RStatHarmonicOrgQ::getDataDate, param.getEndTime())
+        );
+        //将数据转换为map进行便利
+        Map<String, List<RStatHarmonicOrgQ>> voltageMMap = rStatHarmonicVoltageMS.stream()
+                .collect(Collectors.groupingBy(RStatHarmonicOrgQ::getOrgNo));
+        //对象
+        if (CollUtil.isNotEmpty(rStatHarmonicVoltageMS)){
+            voltageMMap.forEach((key, value) -> {
+                if(deptMap.containsKey(key)){
+                    DeptDTO data = deptMap.get(key);
+                    for (RStatHarmonicOrgQ orgQ : value) {
+                        RIconVO rIconVO = new RIconVO();
+                        rIconVO.setRowName(data.getName());
+//                    rIconVO.setSort(data.getSort());
+                        rIconVO.setOverLimitMeasurementAccrued(orgQ.getOverLimitMeasurementAccrued());
+                        rIconVO.setOverLimitMeasurementAverage(orgQ.getOverLimitMeasurementAverage());
+                        rIconVO.setOverLimitMeasurementRatioAccrued(orgQ.getOverLimitMeasurementRatioAccrued());
+                        rIconVO.setOverLimitMeasurementRatioAverage(orgQ.getOverLimitMeasurementRatioAverage());
+                        rIconVO.setAverageOverDay(orgQ.getAverageOverDay());
+                        arrayVOList.add(rIconVO);
+                    }
+
+                }
+            });
+        }
+        arrayVOList.sort(Comparator.comparing(rIconVO -> rIconVO.getRowName()));
+        return arrayVOList;
+    }
+}
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/RStatHarmonicOrgYServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/RStatHarmonicOrgYServiceImpl.java
new file mode 100644
index 000000000..5513a49a4
--- /dev/null
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/RStatHarmonicOrgYServiceImpl.java
@@ -0,0 +1,197 @@
+package com.njcn.harmonic.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.lang.Assert;
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.njcn.common.pojo.param.StatisticsBizBaseParam;
+import com.njcn.harmonic.pojo.param.RStatHarmonicMParam;
+import com.njcn.harmonic.pojo.po.RStatHarmonicOrgY;
+import com.njcn.harmonic.mapper.StatHarmonicOrgYMapper;
+import com.njcn.harmonic.pojo.vo.RArrayVO;
+import com.njcn.harmonic.pojo.vo.RIconVO;
+import com.njcn.harmonic.pojo.vo.RStatHarmonicMVO;
+import com.njcn.harmonic.service.RStatHarmonicOrgYService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.njcn.system.api.DicDataFeignClient;
+import com.njcn.system.enums.DicDataEnum;
+import com.njcn.system.enums.DicDataTypeEnum;
+import com.njcn.system.pojo.po.DictData;
+import com.njcn.user.api.DeptFeignClient;
+import com.njcn.user.pojo.dto.DeptDTO;
+import com.njcn.web.utils.WebUtil;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+
+import java.util.*;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author rui.wu
+ * @since 2022-10-14
+ */
+@Service
+@RequiredArgsConstructor
+public class RStatHarmonicOrgYServiceImpl extends ServiceImpl<StatHarmonicOrgYMapper, RStatHarmonicOrgY> implements RStatHarmonicOrgYService {
+
+    private final DicDataFeignClient dicDataFeignClient;
+    private final DeptFeignClient deptFeignClient;
+    private final StatHarmonicOrgYMapper statHarmonicOrgYMapper;
+
+    @Override
+    public List<RArrayVO> getRStatHarmonicYAll(StatisticsBizBaseParam param) {
+        //子节点 获取所有得各单位类型
+        List<DeptDTO> deptDTOList = deptFeignClient.getDeptDescendantIndexes(param.getId(), WebUtil.filterDeptType()).getData();
+        //获取部门id集合
+        List<String> deptIds = deptDTOList.stream().map(DeptDTO::getId).collect(Collectors.toList());
+        Map<String, DeptDTO> deptMap = deptDTOList.stream().collect(Collectors.toMap(DeptDTO::getId, Function.identity()));
+
+        //对象主节点 获取所有得指标类型
+        List<DictData> lineTypeData = dicDataFeignClient.getDicDataByTypeCode
+                (DicDataTypeEnum.STEADY_STATIS.getCode()).getData();
+        Map<String, DictData> lineTypeMap = lineTypeData.stream()
+                .collect(Collectors.toMap(DictData::getId, Function.identity()));
+        //获取主网id信息
+        DictData mainnetData = dicDataFeignClient.getDicDataByCode(DicDataEnum.MAINNET_POINT.getCode()).getData();
+
+        //数据库查询
+        List<RStatHarmonicOrgY> list = statHarmonicOrgYMapper.selectList(new LambdaQueryWrapper<RStatHarmonicOrgY>()
+                .eq(RStatHarmonicOrgY::getDataType,mainnetData.getId())
+                .in(RStatHarmonicOrgY::getOrgNo,deptIds)
+                .ge(StrUtil.isNotBlank(param.getStartTime()), RStatHarmonicOrgY::getDataDate, param.getStartTime())
+                .le(StrUtil.isNotBlank(param.getEndTime()), RStatHarmonicOrgY::getDataDate, param.getEndTime()));
+
+        //初始化指标类型（横向）
+        List<RArrayVO> arrayVOList=new ArrayList<>();
+        List<RStatHarmonicMVO> rm=new ArrayList<>();
+        for (DeptDTO deptDTO : deptDTOList) {
+            RStatHarmonicMVO r = new RStatHarmonicMVO();
+            r.setHarmonicName(deptDTO.getName());
+            r.setOverLimitMeasurementAverage(0);
+            r.setOverLimitMeasurementAccrued(0);
+            r.setAverageOverDay(0.0F);
+            r.setOverDay(0);
+            r.setOverLimitMeasurementRatioAverage(0.0F);
+            r.setOverLimitMeasurementRatioAccrued(0.0F);
+            rm.add(r);
+        }
+        for (DictData lineTypeDatum : lineTypeData) {
+            RArrayVO r = new RArrayVO();
+            r.setRowName(lineTypeDatum.getName());
+            r.setColumns(rm);
+            r.setSort(lineTypeDatum.getSort());
+            arrayVOList.add(r);
+        }
+        //根据检测点对象分组
+        Map<String, List<RStatHarmonicOrgY>> MeasurementTypeClassMap = list.stream().collect(Collectors.groupingBy(RStatHarmonicOrgY::getHarmonicType));
+        //重新生成数据结构
+        MeasurementTypeClassMap.forEach((key, value) -> {
+            if(lineTypeMap.containsKey(key)){
+                RArrayVO arrayVO=new RArrayVO();
+                DictData data = lineTypeMap.get(key);
+                arrayVO.setRowName(data.getName());
+                arrayVO.setSort(data.getSort());
+                List<RStatHarmonicMVO> b=new ArrayList<>();
+                b.addAll(rm);
+                for (RStatHarmonicOrgY orgY : value) {
+                    RStatHarmonicMVO r = BeanUtil.copyProperties(orgY, RStatHarmonicMVO.class);
+                    DeptDTO data1 = deptMap.get(orgY.getOrgNo());
+                    if (ObjectUtil.isNotNull(data1)){
+                        r.setHarmonicName(data1.getName());
+                        r.setOverDay(0);
+                        b.add(r);
+                    }
+                }
+                Map<String,RStatHarmonicMVO> linkedHashMap=new LinkedHashMap<>();
+                for (RStatHarmonicMVO harmonicMVO : b) {
+                    linkedHashMap.put(harmonicMVO.getHarmonicName(),harmonicMVO);
+                }
+                List<RStatHarmonicMVO> aa=new ArrayList<>(linkedHashMap.values());
+                aa.sort(Comparator.comparing(rStatHarmonicMVO -> rStatHarmonicMVO.getHarmonicName()));
+                arrayVO.setColumns(aa);
+                arrayVOList.add(arrayVO);
+            }
+
+        });
+        Map<String,RArrayVO> linkedHashMap=new LinkedHashMap<>();
+        for (RArrayVO rStatHarmonicMVO : arrayVOList) {
+            linkedHashMap.put(rStatHarmonicMVO.getRowName(),rStatHarmonicMVO);
+        }
+        List<RArrayVO> aa=new ArrayList<>(linkedHashMap.values());
+        arrayVOList.sort(Comparator.comparing(rArrayVO -> rArrayVO.getRowName()));
+        return aa;
+    }
+
+    @Override
+    public List<RIconVO> getRStatHarmonicOrgYIcon(RStatHarmonicMParam param) {
+        //各单位类型
+        List<DeptDTO> deptDTOList = deptFeignClient.getDeptDescendantIndexes(param.getId(), WebUtil.filterDeptType()).getData();
+        Map<String, DeptDTO> deptMap = deptDTOList.stream().collect(Collectors.toMap(DeptDTO::getId, Function.identity()));
+        //获取部门id集合
+        List<String> deptIds = deptDTOList.stream().map(DeptDTO::getId).collect(Collectors.toList());
+        //指标对象类型属性
+        DictData harmonicDate =null;
+        //判断是是否传入检测点信息值（电压）
+        if(StrUtil.isBlank(param.getStasisID())&&StrUtil.isBlank(param.getMonitorID())){
+            //指标对象类型
+            List<DictData> indicatorTypeDate = dicDataFeignClient.getDicDataByTypeCode(
+                    DicDataTypeEnum.STEADY_STATIS.getCode()).getData();
+            indicatorTypeDate.sort(Comparator.comparing(data -> data.getSort()));
+            harmonicDate =indicatorTypeDate.get(0);
+        }else{
+            //获取指标对象（频率偏差）
+            harmonicDate= dicDataFeignClient.getDicDataById(
+                    param.getStasisID()).getData();
+        }
+        //反防止参数查询数据报错
+        Assert.isTrue(
+                CollUtil.isNotEmpty(deptDTOList)||ObjectUtil.isNotNull(harmonicDate)
+                , "各单位或者指标类型为空,请检查入参是否准确");
+
+        //获取主网id信息
+        DictData mainnetData = dicDataFeignClient.getDicDataByCode(DicDataEnum.MAINNET_POINT.getCode()).getData();
+
+        //初始化对象
+        List<RIconVO> arrayVOList=new ArrayList<>();
+        List<RStatHarmonicOrgY> rStatHarmonicVoltageMS = statHarmonicOrgYMapper.selectList(new LambdaQueryWrapper<RStatHarmonicOrgY>()
+                .eq(RStatHarmonicOrgY::getDataType,mainnetData.getId())
+                .in(RStatHarmonicOrgY::getOrgNo,deptIds)
+                .eq(RStatHarmonicOrgY::getHarmonicType, harmonicDate.getId())
+                .ge(StrUtil.isNotBlank(param.getStartTime()), RStatHarmonicOrgY::getDataDate, param.getStartTime())
+                .le(StrUtil.isNotBlank(param.getEndTime()), RStatHarmonicOrgY::getDataDate, param.getEndTime())
+        );
+        //将数据转换为map进行便利
+        Map<String, List<RStatHarmonicOrgY>> voltageMMap = rStatHarmonicVoltageMS.stream()
+                .collect(Collectors.groupingBy(RStatHarmonicOrgY::getOrgNo));
+        //对象
+        if (CollUtil.isNotEmpty(rStatHarmonicVoltageMS)){
+            voltageMMap.forEach((key, value) -> {
+                if(deptMap.containsKey(key)){
+                    DeptDTO data = deptMap.get(key);
+                    for (RStatHarmonicOrgY orgY : value) {
+                        RIconVO rIconVO = new RIconVO();
+                        rIconVO.setRowName(data.getName());
+//                    rIconVO.setSort(data.getSort());
+                        rIconVO.setOverLimitMeasurementAccrued(orgY.getOverLimitMeasurementAccrued());
+                        rIconVO.setOverLimitMeasurementAverage(orgY.getOverLimitMeasurementAverage());
+                        rIconVO.setOverLimitMeasurementRatioAccrued(orgY.getOverLimitMeasurementRatioAccrued());
+                        rIconVO.setOverLimitMeasurementRatioAverage(orgY.getOverLimitMeasurementRatioAverage());
+                        rIconVO.setAverageOverDay(orgY.getAverageOverDay());
+                        arrayVOList.add(rIconVO);
+                    }
+
+                }
+            });
+        }
+        arrayVOList.sort(Comparator.comparing(rIconVO -> rIconVO.getRowName()));
+        return arrayVOList;
+    }
+
+}
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/RStatHarmonicQServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/RStatHarmonicQServiceImpl.java
new file mode 100644
index 000000000..cc82740a2
--- /dev/null
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/RStatHarmonicQServiceImpl.java
@@ -0,0 +1,122 @@
+package com.njcn.harmonic.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.njcn.common.pojo.param.StatisticsBizBaseParam;
+import com.njcn.harmonic.mapper.RStatHarmonicQMapper;
+import com.njcn.harmonic.pojo.po.RStatHarmonicQ;
+import com.njcn.harmonic.pojo.vo.RArrayVO;
+import com.njcn.harmonic.pojo.vo.RStatHarmonicMVO;
+import com.njcn.harmonic.service.RStatHarmonicQService;
+import com.njcn.system.api.DicDataFeignClient;
+import com.njcn.system.enums.DicDataEnum;
+import com.njcn.system.enums.DicDataTypeEnum;
+import com.njcn.system.pojo.po.DictData;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+
+import java.util.*;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author rui.wu
+ * @since 2022-10-12
+ */
+@Service
+@RequiredArgsConstructor
+public class RStatHarmonicQServiceImpl extends ServiceImpl<RStatHarmonicQMapper, RStatHarmonicQ> implements RStatHarmonicQService {
+
+    private final RStatHarmonicQMapper rStatHarmonicQMapper;
+    private final DicDataFeignClient dicDataFeignClient;
+
+    @Override
+    public List<RArrayVO> getRStatHarmonicQAll(StatisticsBizBaseParam param) {
+        //子节点 获取所有得干扰源类型（监测点类型）
+        List<DictData> interferenceSourceTypeData = dicDataFeignClient.getDicDataByTypeCode(
+                DicDataTypeEnum.MONITORING_LABELS.getCode()).getData();
+        Map<String, DictData> interferenceMap = interferenceSourceTypeData.stream().collect(Collectors.toMap(DictData::getId, Function.identity()));
+
+        //对象主节点 获取所有得指标类型
+        List<DictData> lineTypeData = dicDataFeignClient.getDicDataByTypeCode(
+                DicDataTypeEnum.STEADY_STATIS.getCode()).getData();
+        Map<String, DictData> lineTypeMap = lineTypeData.stream()
+                .collect(Collectors.toMap(DictData::getId, Function.identity()));
+
+        //获取主网id信息
+        DictData mainnetData = dicDataFeignClient.getDicDataByCode(DicDataEnum.MAINNET_POINT.getCode()).getData();
+
+        //数据库查询
+        List<RStatHarmonicQ> list = rStatHarmonicQMapper.selectList(new LambdaQueryWrapper<RStatHarmonicQ>()
+                .eq(RStatHarmonicQ::getDataType,mainnetData.getId())
+                .ge(StrUtil.isNotBlank(param.getStartTime()), RStatHarmonicQ::getDataDate, param.getStartTime())
+                .le(StrUtil.isNotBlank(param.getEndTime()), RStatHarmonicQ::getDataDate, param.getEndTime()));
+
+        //初始化指标类型（横向）
+        List<RArrayVO> arrayVOList=new ArrayList<>();
+        List<RStatHarmonicMVO> rm=new ArrayList<>();
+        for (DictData lineTypeDatum : interferenceSourceTypeData) {
+            RStatHarmonicMVO r = new RStatHarmonicMVO();
+            r.setHarmonicName(lineTypeDatum.getName());
+            r.setSort(lineTypeDatum.getSort());
+            r.setOverLimitMeasurementAverage(0);
+            r.setOverLimitMeasurementAccrued(0);
+            r.setAverageOverDay(0.0F);
+            r.setOverDay(0);
+            r.setOverLimitMeasurementRatioAverage(0.0F);
+            r.setOverLimitMeasurementRatioAccrued(0.0F);
+            rm.add(r);
+        }
+        for (DictData lineTypeDatum : lineTypeData) {
+            RArrayVO r = new RArrayVO();
+            r.setRowName(lineTypeDatum.getName());
+            r.setSort(lineTypeDatum.getSort());
+            r.setColumns(rm);
+            arrayVOList.add(r);
+        }
+        //根据检测点对象分组
+        Map<String, List<RStatHarmonicQ>> MeasurementTypeClassMap = list.stream().collect(Collectors.groupingBy(RStatHarmonicQ::getHarmonicType));
+        //重新生成数据结构
+        MeasurementTypeClassMap.forEach((key, value) -> {
+
+            if(lineTypeMap.containsKey(key)){
+                RArrayVO arrayVO=new RArrayVO();
+                DictData data = lineTypeMap.get(key);
+                arrayVO.setRowName(data.getName());
+                arrayVO.setSort(data.getSort());
+                List<RStatHarmonicMVO> b=new ArrayList<>();
+                b.addAll(rm);
+                for (RStatHarmonicQ rStatHarmonicQ : value) {
+                    RStatHarmonicMVO r = BeanUtil.copyProperties(rStatHarmonicQ, RStatHarmonicMVO.class);
+                    DictData data1 = interferenceMap.get(rStatHarmonicQ.getMeasurementTypeClass());
+                    r.setHarmonicName(data1.getName());
+                    r.setSort(data1.getSort());
+                    r.setOverDay(0);
+                    b.add(r);
+                }
+                Map<String,RStatHarmonicMVO> linkedHashMap=new LinkedHashMap<>();
+                for (RStatHarmonicMVO harmonicMVO : b) {
+                    linkedHashMap.put(harmonicMVO.getHarmonicName(),harmonicMVO);
+                }
+                List<RStatHarmonicMVO> aa=new ArrayList<>(linkedHashMap.values());
+                aa.sort(Comparator.comparing(rStatHarmonicMVO -> rStatHarmonicMVO.getSort()));
+                arrayVO.setColumns(aa);
+                arrayVOList.add(arrayVO);
+            }
+
+        });
+        Map<String,RArrayVO> linkedHashMap=new LinkedHashMap<>();
+        for (RArrayVO rStatHarmonicMVO : arrayVOList) {
+            linkedHashMap.put(rStatHarmonicMVO.getRowName(),rStatHarmonicMVO);
+        }
+        List<RArrayVO> aa=new ArrayList<>(linkedHashMap.values());
+        arrayVOList.sort(Comparator.comparing(rArrayVO -> rArrayVO.getSort()));
+        return aa;
+    }
+}
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/RStatHarmonicYServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/RStatHarmonicYServiceImpl.java
new file mode 100644
index 000000000..bdf0437a4
--- /dev/null
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/RStatHarmonicYServiceImpl.java
@@ -0,0 +1,120 @@
+package com.njcn.harmonic.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.njcn.common.pojo.param.StatisticsBizBaseParam;
+import com.njcn.harmonic.mapper.RStatHarmonicYMapper;
+import com.njcn.harmonic.pojo.po.RStatHarmonicY;
+import com.njcn.harmonic.pojo.vo.RArrayVO;
+import com.njcn.harmonic.pojo.vo.RStatHarmonicMVO;
+import com.njcn.harmonic.service.RStatHarmonicYService;
+import com.njcn.system.api.DicDataFeignClient;
+import com.njcn.system.enums.DicDataEnum;
+import com.njcn.system.enums.DicDataTypeEnum;
+import com.njcn.system.pojo.po.DictData;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+
+import java.util.*;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author rui.wu
+ * @since 2022-10-12
+ */
+@Service
+@RequiredArgsConstructor
+public class RStatHarmonicYServiceImpl extends ServiceImpl<RStatHarmonicYMapper, RStatHarmonicY> implements RStatHarmonicYService {
+
+    private final RStatHarmonicYMapper rStatHarmonicYMapper;
+    private final DicDataFeignClient dicDataFeignClient;
+
+    @Override
+    public List<RArrayVO> getRStatHarmonicYAll(StatisticsBizBaseParam param) {
+        //子节点 获取所有得干扰源类型（监测点类型）
+        List<DictData> interferenceSourceTypeData = dicDataFeignClient.getDicDataByTypeCode(
+                DicDataTypeEnum.MONITORING_LABELS.getCode()).getData();
+        Map<String, DictData> interferenceMap = interferenceSourceTypeData.stream().collect(Collectors.toMap(DictData::getId, Function.identity()));
+
+        //对象主节点 获取所有得指标类型
+        List<DictData> lineTypeData = dicDataFeignClient.getDicDataByTypeCode
+                (DicDataTypeEnum.STEADY_STATIS.getCode()).getData();
+        Map<String, DictData> lineTypeMap = lineTypeData.stream()
+                .collect(Collectors.toMap(DictData::getId, Function.identity()));
+        //获取主网id信息
+        DictData mainnetData = dicDataFeignClient.getDicDataByCode(DicDataEnum.MAINNET_POINT.getCode()).getData();
+
+        //数据库查询
+        List<RStatHarmonicY> list = rStatHarmonicYMapper.selectList(new LambdaQueryWrapper<RStatHarmonicY>()
+                .eq(RStatHarmonicY::getDataType,mainnetData.getId())
+                .ge(StrUtil.isNotBlank(param.getStartTime()), RStatHarmonicY::getDataDate, param.getStartTime())
+                .le(StrUtil.isNotBlank(param.getEndTime()), RStatHarmonicY::getDataDate, param.getEndTime()));
+
+        //初始化指标类型（横向）
+        List<RArrayVO> arrayVOList=new ArrayList<>();
+        List<RStatHarmonicMVO> rm=new ArrayList<>();
+        for (DictData lineTypeDatum : interferenceSourceTypeData) {
+            RStatHarmonicMVO r = new RStatHarmonicMVO();
+            r.setHarmonicName(lineTypeDatum.getName());
+            r.setSort(lineTypeDatum.getSort());
+            r.setOverLimitMeasurementAverage(0);
+            r.setOverLimitMeasurementAccrued(0);
+            r.setAverageOverDay(0.0F);
+            r.setOverDay(0);
+            r.setOverLimitMeasurementRatioAverage(0.0F);
+            r.setOverLimitMeasurementRatioAccrued(0.0F);
+            rm.add(r);
+        }
+        for (DictData lineTypeDatum : lineTypeData) {
+            RArrayVO r = new RArrayVO();
+            r.setRowName(lineTypeDatum.getName());
+            r.setColumns(rm);
+            r.setSort(lineTypeDatum.getSort());
+            arrayVOList.add(r);
+        }
+        //根据检测点对象分组
+        Map<String, List<RStatHarmonicY>> MeasurementTypeClassMap = list.stream().collect(Collectors.groupingBy(RStatHarmonicY::getHarmonicType));
+        //重新生成数据结构
+        MeasurementTypeClassMap.forEach((key, value) -> {
+            if(lineTypeMap.containsKey(key)){
+                RArrayVO arrayVO=new RArrayVO();
+                DictData data = lineTypeMap.get(key);
+                arrayVO.setRowName(data.getName());
+                arrayVO.setSort(data.getSort());
+                List<RStatHarmonicMVO> b=new ArrayList<>();
+                b.addAll(rm);
+                for (RStatHarmonicY rStatHarmonicY : value) {
+                    RStatHarmonicMVO r = BeanUtil.copyProperties(rStatHarmonicY, RStatHarmonicMVO.class);
+                    DictData data1 = interferenceMap.get(rStatHarmonicY.getMeasurementTypeClass());
+                    r.setHarmonicName(data1.getName());
+                    r.setSort(data1.getSort());
+                    r.setOverDay(0);
+                    b.add(r);
+                }
+                Map<String,RStatHarmonicMVO> linkedHashMap=new LinkedHashMap<>();
+                for (RStatHarmonicMVO harmonicMVO : b) {
+                    linkedHashMap.put(harmonicMVO.getHarmonicName(),harmonicMVO);
+                }
+                List<RStatHarmonicMVO> aa=new ArrayList<>(linkedHashMap.values());
+                aa.sort(Comparator.comparing(rStatHarmonicMVO -> rStatHarmonicMVO.getSort()));
+                arrayVO.setColumns(aa);
+                arrayVOList.add(arrayVO);
+            }
+
+        });
+        Map<String,RArrayVO> linkedHashMap=new LinkedHashMap<>();
+        for (RArrayVO rStatHarmonicMVO : arrayVOList) {
+            linkedHashMap.put(rStatHarmonicMVO.getRowName(),rStatHarmonicMVO);
+        }
+        List<RArrayVO> aa=new ArrayList<>(linkedHashMap.values());
+        arrayVOList.sort(Comparator.comparing(rArrayVO -> rArrayVO.getSort()));
+        return aa;
+    }
+}
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/RStatLoadTypeServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/RStatLoadTypeServiceImpl.java
new file mode 100644
index 000000000..6e3b6c41f
--- /dev/null
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/RStatLoadTypeServiceImpl.java
@@ -0,0 +1,136 @@
+package com.njcn.harmonic.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.collection.CollectionUtil;
+import com.njcn.common.pojo.constant.BizParamConstant;
+import com.njcn.common.pojo.param.StatisticsBizBaseParam;
+import com.njcn.harmonic.mapper.*;
+import com.njcn.harmonic.pojo.param.StatSubstationBizBaseParam;
+import com.njcn.harmonic.pojo.po.*;
+import com.njcn.harmonic.pojo.vo.RArrayVO;
+import com.njcn.harmonic.pojo.vo.RStatLoadTypeVO;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.njcn.harmonic.service.RStatLoadTypeService;
+import com.njcn.system.api.DicDataFeignClient;
+import com.njcn.system.enums.DicDataTypeEnum;
+import com.njcn.system.pojo.po.DictData;
+import com.njcn.user.api.DeptFeignClient;
+import com.njcn.user.pojo.dto.DeptDTO;
+import com.njcn.web.utils.WebUtil;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author rui.wu
+ * @since 2022-10-19
+ */
+@Service
+@RequiredArgsConstructor
+public class RStatLoadTypeServiceImpl extends ServiceImpl<RStatLoadTypeMMapper, RStatLoadTypeM> implements RStatLoadTypeService {
+
+    private final DeptFeignClient deptFeignClient;
+    private final DicDataFeignClient dicDataFeignClient;
+    private final RStatLoadTypeYMapper rStatLoadTypeYMapper;
+    private final RStatLoadTypeQMapper rStatLoadTypeQMapper;
+    private final RStatLoadTypeMMapper rStatLoadTypeMMapper;
+
+    @Override
+    public List<RArrayVO> getRStatLoadType(StatisticsBizBaseParam param) {
+        //获取部门信息
+        List<DeptDTO> data = deptFeignClient.getDeptDescendantIndexes(param.getId(), WebUtil.filterDeptType()).getData();
+        List<String> deptIds = data.stream().map(DeptDTO::getId).collect(Collectors.toList());
+        //获取字典信息
+        List<DictData> data1 = dicDataFeignClient.getDicDataByTypeCode(
+                DicDataTypeEnum.MONITORING_LABELS.getCode()).getData();
+        List<DictData>  dictData = data1.stream().filter(dictdatas -> dictdatas.getLevel() == 1).collect(Collectors.toList());
+        dictData.sort(Comparator.comparing(r ->r.getSort()));
+        //初始化对象
+        List<RArrayVO> info = new ArrayList<>();
+        List<RStatLoadTypeVO> temp = new ArrayList<>();
+        //根据部门进行筛选
+        StatSubstationBizBaseParam baseParam=BeanUtil.copyProperties(param,StatSubstationBizBaseParam.class);
+        baseParam.setIds(deptIds);
+        if (CollectionUtil.isNotEmpty(data)) {
+            // 类型（1年 2季度 3月份
+            switch (param.getType().toString()) {
+                case BizParamConstant.STAT_BIZ_YEAR:
+                    // 获取年区域暂态指标分类统计表
+                    temp = rStatLoadTypeYMapper.getYearStatLoadType(baseParam);
+                    break;
+                case BizParamConstant.STAT_BIZ_QUARTER:
+                    // 获取季区域暂态指标分类统计表
+                    temp = rStatLoadTypeQMapper.getQuarterStatLoadType(baseParam);
+                    break;
+                case BizParamConstant.STAT_BIZ_MONTH:
+                    // 获取月区域暂态指标分类统计表
+                    temp = rStatLoadTypeMMapper.getMonthStatLoadType(baseParam);
+                    break;
+                default:
+                    break;
+
+            }
+            // 匹配单位名称
+            for (DeptDTO dto : data) {
+                for (RStatLoadTypeVO vo : temp) {
+                    if (dto.getId().equals(vo.getOrgNo())) {
+                        vo.setOrgName(dto.getName());
+                    }
+                }
+            }
+            //根据部门id进行分组
+            Map<String, List<RStatLoadTypeVO>> map = temp
+                    .stream().collect(Collectors.groupingBy(RStatLoadTypeVO::getOrgNo));
+            map.forEach((key, value) -> {
+                RArrayVO arrayVO=new RArrayVO();
+                arrayVO.setRowName(value.get(0).getOrgName());
+                //属性赋值监测点名称
+                for (DictData dictDatum : dictData) {
+                    for (RStatLoadTypeVO rStatLoadTypeVO : value) {
+                        if(dictDatum.getId().equals(rStatLoadTypeVO.getLoadType())){
+                            rStatLoadTypeVO.setLoadName(dictDatum.getName());
+                            rStatLoadTypeVO.setSort(dictDatum.getSort());
+
+                        }
+                    }
+                }
+                //获取差集（数据在字典里面没有的集合）
+                Map<String, List<RStatLoadTypeVO>> listMap = value.stream().collect(Collectors.groupingBy(RStatLoadTypeVO::getLoadType));
+                List<DictData> differenceList = dictData.stream().filter(r -> !listMap.containsKey(r.getId()))
+                        .collect(Collectors.toList());
+                for (DictData data4 : differenceList) {
+                    RStatLoadTypeVO vo=new RStatLoadTypeVO();
+                    vo.setSort(data4.getSort());
+                    vo.setOrgNo(key);
+                    vo.setOrgName(value.get(0).getOrgName());
+                    vo.setLoadType(data4.getId());
+                    vo.setLoadName(data4.getName());
+                    vo.setVAverage(0.0f);
+                    vo.setVAccrued(0.0f);
+                    vo.setIAverage(0.0f);
+                    vo.setIAccrued(0.0f);
+                    vo.setUnbalanceAverage(0.0f);
+                    vo.setUnbalanceAccrued(0.0f);
+                    vo.setINegAverage(0.0f);
+                    vo.setINegAccrued(0.0f);
+                    vo.setFlickerAverage(0.0f);
+                    vo.setFlickerAccrued(0.0f);
+                    value.add(vo);
+                }
+                value.sort(Comparator.comparing(r ->r.getSort()));
+                arrayVO.setColumns(value);
+                info.add(arrayVO);
+            });
+        }
+        return info;
+    }
+}
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/RStatOrgBusbarVoltageServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/RStatOrgBusbarVoltageServiceImpl.java
new file mode 100644
index 000000000..2b6652b9a
--- /dev/null
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/RStatOrgBusbarVoltageServiceImpl.java
@@ -0,0 +1,100 @@
+package com.njcn.harmonic.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.njcn.common.pojo.constant.BizParamConstant;
+import com.njcn.common.pojo.param.StatisticsBizBaseParam;
+import com.njcn.harmonic.mapper.RStatOrgBusbarVoltageQMapper;
+import com.njcn.harmonic.mapper.RStatOrgBusbarVoltageYMapper;
+import com.njcn.harmonic.pojo.param.StatSubstationBizBaseParam;
+import com.njcn.harmonic.pojo.po.RStatHarmonicOrgQ;
+import com.njcn.harmonic.pojo.po.RStatOrgBusbarVoltageM;
+import com.njcn.harmonic.mapper.RStatOrgBusbarVoltageMMapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.njcn.harmonic.pojo.po.RStatOrgBusbarVoltageQ;
+import com.njcn.harmonic.pojo.po.RStatOrgBusbarVoltageY;
+import com.njcn.harmonic.pojo.vo.RStatOrgBusbarVoltageVO;
+import com.njcn.harmonic.pojo.vo.RStatSubstationOrg2VO;
+import com.njcn.harmonic.pojo.vo.RStatSubstationOrgVO;
+import com.njcn.harmonic.service.RStatOrgBusbarVoltageService;
+import com.njcn.system.enums.DicDataTypeEnum;
+import com.njcn.system.pojo.po.DictData;
+import com.njcn.user.api.DeptFeignClient;
+import com.njcn.user.pojo.dto.DeptDTO;
+import com.njcn.web.utils.WebUtil;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author rui.wu
+ * @since 2022-10-19
+ */
+@Service
+@RequiredArgsConstructor
+public class RStatOrgBusbarVoltageServiceImpl extends ServiceImpl<RStatOrgBusbarVoltageMMapper, RStatOrgBusbarVoltageM> implements RStatOrgBusbarVoltageService {
+
+    private final DeptFeignClient deptFeignClient;
+    private final RStatOrgBusbarVoltageYMapper rStatOrgBusbarVoltageYMapper;
+    private final RStatOrgBusbarVoltageQMapper rStatOrgBusbarVoltageQMapper;
+    private final RStatOrgBusbarVoltageMMapper rStatOrgBusbarVoltageMMapper;
+
+    @Override
+    public List<RStatOrgBusbarVoltageVO> getRStatOrgBusbarVoltage(StatisticsBizBaseParam param) {
+        //获取部门信息
+        List<DeptDTO> data = deptFeignClient.getDeptDescendantIndexes(param.getId(), WebUtil.filterDeptType()).getData();
+        List<String> deptIds = data.stream().map(DeptDTO::getId).collect(Collectors.toList());
+
+        List<RStatOrgBusbarVoltageVO> info = new ArrayList<>();
+        List<RStatOrgBusbarVoltageVO> temp = new ArrayList<>();
+        if (CollectionUtil.isNotEmpty(data)) {
+//            List<RStatOrgBusbarVoltageVO> temp = new ArrayList<>();
+            // 类型（1年 2季度 3月份
+            switch (param.getType().toString()) {
+                case BizParamConstant.STAT_BIZ_YEAR:
+                    // 获取年区域暂态指标分类统计表
+                    List<RStatOrgBusbarVoltageY> rStatOrgBusbarVoltageYS = rStatOrgBusbarVoltageYMapper.selectList(new LambdaQueryWrapper<RStatOrgBusbarVoltageY>()
+                            .in(RStatOrgBusbarVoltageY::getOrgNo, deptIds)
+                            .ge(StrUtil.isNotBlank(param.getStartTime()), RStatOrgBusbarVoltageY::getDataDate, param.getStartTime())
+                            .le(StrUtil.isNotBlank(param.getEndTime()), RStatOrgBusbarVoltageY::getDataDate, param.getEndTime()));
+                    temp=BeanUtil.copyToList(rStatOrgBusbarVoltageYS, RStatOrgBusbarVoltageVO.class);
+                    break;
+                case BizParamConstant.STAT_BIZ_QUARTER:
+                    // 获取季区域暂态指标分类统计表
+                    List<RStatOrgBusbarVoltageQ> rStatOrgBusbarVoltageQS = rStatOrgBusbarVoltageQMapper.selectList(new LambdaQueryWrapper<RStatOrgBusbarVoltageQ>()
+                            .in(RStatOrgBusbarVoltageQ::getOrgNo, deptIds)
+                            .ge(StrUtil.isNotBlank(param.getStartTime()), RStatOrgBusbarVoltageQ::getDataDate, param.getStartTime())
+                            .le(StrUtil.isNotBlank(param.getEndTime()), RStatOrgBusbarVoltageQ::getDataDate, param.getEndTime()));
+                    temp=BeanUtil.copyToList(rStatOrgBusbarVoltageQS, RStatOrgBusbarVoltageVO.class);
+                    break;
+                case BizParamConstant.STAT_BIZ_MONTH:
+                    // 获取月区域暂态指标分类统计表
+                    List<RStatOrgBusbarVoltageM> rStatOrgBusbarVoltageMS = rStatOrgBusbarVoltageMMapper.selectList(new LambdaQueryWrapper<RStatOrgBusbarVoltageM>()
+                            .in(RStatOrgBusbarVoltageM::getOrgNo, deptIds)
+                            .ge(StrUtil.isNotBlank(param.getStartTime()), RStatOrgBusbarVoltageM::getDataDate, param.getStartTime())
+                            .le(StrUtil.isNotBlank(param.getEndTime()), RStatOrgBusbarVoltageM::getDataDate, param.getEndTime()));
+                    temp=BeanUtil.copyToList(rStatOrgBusbarVoltageMS, RStatOrgBusbarVoltageVO.class);
+                    break;
+                default:
+                    break;
+
+            }
+
+//            Map<String, List<RStatSubstationOrgVO>> map = temp
+//                    .stream().collect(Collectors.groupingBy(RStatSubstationOrgVO::getOrgNo));
+        }
+        return temp;
+    }
+
+
+}
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/RStatOrgMServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/RStatOrgMServiceImpl.java
new file mode 100644
index 000000000..cebe8d804
--- /dev/null
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/RStatOrgMServiceImpl.java
@@ -0,0 +1,87 @@
+package com.njcn.harmonic.service.impl;
+
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.njcn.common.pojo.param.StatisticsBizBaseParam;
+import com.njcn.harmonic.pojo.po.RStatOrgM;
+import com.njcn.harmonic.mapper.RStatOrgMMapper;
+import com.njcn.harmonic.pojo.po.RStatOrgQ;
+import com.njcn.harmonic.pojo.vo.RStatOrgVO;
+import com.njcn.harmonic.service.RStatOrgMService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.njcn.system.api.DicDataFeignClient;
+import com.njcn.system.enums.DicDataEnum;
+import com.njcn.system.pojo.po.DictData;
+import com.njcn.user.api.DeptFeignClient;
+import com.njcn.user.pojo.dto.DeptDTO;
+import com.njcn.web.utils.WebUtil;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+
+import java.text.DecimalFormat;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+
+/**
+ * <p>
+ * 区域分类统计月表 服务实现类
+ * </p>
+ *
+ * @author rui.wu
+ * @since 2022-10-17
+ */
+@Service
+@RequiredArgsConstructor
+public class RStatOrgMServiceImpl extends ServiceImpl<RStatOrgMMapper, RStatOrgM> implements RStatOrgMService {
+
+    private final DeptFeignClient deptFeignClient;
+    private final DicDataFeignClient dicDataFeignClient;
+    private final RStatOrgMMapper rStatOrgMMapper;
+
+    @Override
+    public List<RStatOrgVO> getRStatHarmonicMAll(StatisticsBizBaseParam param) {
+        List<DeptDTO> deptDTOList = deptFeignClient.getDeptDescendantIndexes(param.getId(), WebUtil.filterDeptType()).getData();
+        //获取部门id集合
+        List<String> deptIds = deptDTOList.stream().map(DeptDTO::getId).collect(Collectors.toList());
+        Map<String, DeptDTO> deptMap = deptDTOList.stream().collect(Collectors.toMap(DeptDTO::getId, Function.identity()));
+        //获取主网id信息
+        DictData mainnetData = dicDataFeignClient.getDicDataByCode(DicDataEnum.MAINNET_POINT.getCode()).getData();
+        //数据库查询
+        List<RStatOrgM> list = rStatOrgMMapper.selectList(new LambdaQueryWrapper<RStatOrgM>()
+                .eq(RStatOrgM::getDataType,mainnetData.getId())
+                .in(RStatOrgM::getOrgNo,deptIds)
+                .ge(StrUtil.isNotBlank(param.getStartTime()), RStatOrgM::getDataDate, param.getStartTime())
+                .le(StrUtil.isNotBlank(param.getEndTime()), RStatOrgM::getDataDate, param.getEndTime()));
+        Map<String, List<RStatOrgM>> collect = list.stream().collect(Collectors.groupingBy(RStatOrgM::getOrgNo));
+
+        List<RStatOrgVO> newList=new ArrayList<>();
+        collect.forEach((key, value) -> {
+            if(deptMap.containsKey(key)){
+                for (RStatOrgM rStatOrgM : value) {
+                    DecimalFormat df = new DecimalFormat("###.00");
+                    DeptDTO deptDTO = deptMap.get(key);
+                    RStatOrgVO rStatOrgVO = new RStatOrgVO();
+                    rStatOrgVO.setOrgName(deptDTO.getName());
+                    Float averageOverDay = Float.parseFloat(
+                            df.format(rStatOrgM.getOverDayAccrued() / (rStatOrgM.getEffectiveMeasurementAccrued()*1.0)));
+                    rStatOrgVO.setAverageOverDay(averageOverDay);
+                    rStatOrgVO.setEffectiveMeasurementAverage(rStatOrgM.getEffectiveMeasurementAverage());
+                    rStatOrgVO.setEffectiveMeasurementAccrued(rStatOrgM.getEffectiveMeasurementAccrued());
+                    rStatOrgVO.setOverLimitMeasurementAverage(rStatOrgM.getHarmonicMeasurementAverage());
+                    rStatOrgVO.setOverLimitMeasurementAccrued(rStatOrgM.getHarmonicMeasurementAccrued());
+                    Float harmonicMeasurementRatioAverage = Float.parseFloat(
+                            df.format(rStatOrgM.getHarmonicMeasurementAverage() / (rStatOrgM.getEffectiveMeasurementAverage()*1.0)));
+                    rStatOrgVO.setHarmonicMeasurementRatioAverage(harmonicMeasurementRatioAverage);
+                    Float harmonicMeasurementRatioAccrued = Float.parseFloat(
+                            df.format(rStatOrgM.getHarmonicMeasurementAccrued() / (rStatOrgM.getEffectiveMeasurementAccrued()*1.0)));
+                    rStatOrgVO.setHarmonicMeasurementRatioAccrued(harmonicMeasurementRatioAccrued);
+                    newList.add(rStatOrgVO);
+                }
+            }
+        });
+        return newList;
+    }
+}
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/RStatOrgQServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/RStatOrgQServiceImpl.java
new file mode 100644
index 000000000..74e7b632b
--- /dev/null
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/RStatOrgQServiceImpl.java
@@ -0,0 +1,86 @@
+package com.njcn.harmonic.service.impl;
+
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.njcn.common.pojo.param.StatisticsBizBaseParam;
+import com.njcn.harmonic.pojo.po.RStatOrgQ;
+import com.njcn.harmonic.mapper.RStatOrgQMapper;
+import com.njcn.harmonic.pojo.vo.RStatOrgVO;
+import com.njcn.harmonic.service.RStatOrgQService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.njcn.system.api.DicDataFeignClient;
+import com.njcn.system.enums.DicDataEnum;
+import com.njcn.system.pojo.po.DictData;
+import com.njcn.user.api.DeptFeignClient;
+import com.njcn.user.pojo.dto.DeptDTO;
+import com.njcn.web.utils.WebUtil;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+
+import java.text.DecimalFormat;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+
+/**
+ * <p>
+ * 区域分类统计季表 服务实现类
+ * </p>
+ *
+ * @author rui.wu
+ * @since 2022-10-17
+ */
+@Service
+@RequiredArgsConstructor
+public class RStatOrgQServiceImpl extends ServiceImpl<RStatOrgQMapper, RStatOrgQ> implements RStatOrgQService {
+
+    private final DeptFeignClient deptFeignClient;
+    private final DicDataFeignClient dicDataFeignClient;
+    private final RStatOrgQMapper rStatOrgQMapper;
+
+    @Override
+    public List<RStatOrgVO> getRStatHarmonicQAll(StatisticsBizBaseParam param) {
+        List<DeptDTO> deptDTOList = deptFeignClient.getDeptDescendantIndexes(param.getId(), WebUtil.filterDeptType()).getData();
+        //获取部门id集合
+        List<String> deptIds = deptDTOList.stream().map(DeptDTO::getId).collect(Collectors.toList());
+        Map<String, DeptDTO> deptMap = deptDTOList.stream().collect(Collectors.toMap(DeptDTO::getId, Function.identity()));
+
+        //获取主网id信息
+        DictData mainnetData = dicDataFeignClient.getDicDataByCode(DicDataEnum.MAINNET_POINT.getCode()).getData();
+
+        //数据库查询
+        List<RStatOrgQ> list = rStatOrgQMapper.selectList(new LambdaQueryWrapper<RStatOrgQ>()
+                .eq(RStatOrgQ::getDataType,mainnetData.getId())
+                .in(RStatOrgQ::getOrgNo,deptIds)
+                .ge(StrUtil.isNotBlank(param.getStartTime()), RStatOrgQ::getDataDate, param.getStartTime())
+                .le(StrUtil.isNotBlank(param.getEndTime()), RStatOrgQ::getDataDate, param.getEndTime()));
+        Map<String, List<RStatOrgQ>> collect = list.stream().collect(Collectors.groupingBy(RStatOrgQ::getOrgNo));
+
+        List<RStatOrgVO> newList=new ArrayList<>();
+        collect.forEach((key, value) -> {
+            if(deptMap.containsKey(key)){
+                for (RStatOrgQ rStatOrgQ : value) {
+                    DeptDTO deptDTO = deptMap.get(key);
+                    RStatOrgVO rStatOrgVO = new RStatOrgVO();
+                    rStatOrgVO.setOrgName(deptDTO.getName());
+                    rStatOrgVO.setAverageOverDay(rStatOrgQ.getAverageOverDay());
+                    rStatOrgVO.setEffectiveMeasurementAverage(rStatOrgQ.getEffectiveMeasurementAverage());
+                    rStatOrgVO.setEffectiveMeasurementAccrued(rStatOrgQ.getEffectiveMeasurementAccrued());
+                    rStatOrgVO.setOverLimitMeasurementAverage(rStatOrgQ.getHarmonicMeasurementAverage());
+                    rStatOrgVO.setOverLimitMeasurementAccrued(rStatOrgQ.getHarmonicMeasurementAccrued());
+                    DecimalFormat df = new DecimalFormat("###.00");
+                    Float harmonicMeasurementRatioAverage = Float.parseFloat(
+                            df.format(rStatOrgQ.getHarmonicMeasurementAverage() / (rStatOrgQ.getEffectiveMeasurementAverage()*1.0)));
+                    rStatOrgVO.setHarmonicMeasurementRatioAverage(harmonicMeasurementRatioAverage);
+                    Float harmonicMeasurementRatioAccrued = Float.parseFloat(
+                            df.format(rStatOrgQ.getHarmonicMeasurementAccrued() / (rStatOrgQ.getEffectiveMeasurementAccrued()*1.0)));
+                    rStatOrgVO.setHarmonicMeasurementRatioAccrued(harmonicMeasurementRatioAccrued);
+                    newList.add(rStatOrgVO);
+                }
+            }
+        });
+        return newList;
+    }
+}
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/RStatOrgYServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/RStatOrgYServiceImpl.java
new file mode 100644
index 000000000..3cd5eb309
--- /dev/null
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/RStatOrgYServiceImpl.java
@@ -0,0 +1,387 @@
+package com.njcn.harmonic.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.lang.Console;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.njcn.common.pojo.constant.BizParamConstant;
+import com.njcn.common.pojo.dto.SimpleDTO;
+import com.njcn.common.pojo.param.StatisticsBizBaseParam;
+import com.njcn.device.pms.api.MonitorClient;
+import com.njcn.device.pms.api.PmsGeneralDeviceInfoClient;
+import com.njcn.device.pms.api.StatationStatClient;
+import com.njcn.device.pms.pojo.dto.PmsGeneralDeviceDTO;
+import com.njcn.device.pms.pojo.dto.PmsMonitorDTO;
+import com.njcn.device.pms.pojo.dto.PmsStatationStatInfoDTO;
+import com.njcn.device.pms.pojo.param.PmsDeviceInfoParam;
+import com.njcn.device.pms.pojo.param.PmsMonitorParam;
+import com.njcn.device.pms.pojo.param.PmsStatationStatInfoParam;
+import com.njcn.harmonic.mapper.*;
+import com.njcn.harmonic.pojo.param.StatSubstationBizBaseParam;
+import com.njcn.harmonic.pojo.po.RStatOrgY;
+import com.njcn.harmonic.pojo.vo.*;
+import com.njcn.harmonic.service.RStatOrgYService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.njcn.system.api.DicDataFeignClient;
+import com.njcn.system.enums.DicDataEnum;
+import com.njcn.system.enums.DicDataTypeEnum;
+import com.njcn.system.pojo.po.DictData;
+import com.njcn.user.api.DeptFeignClient;
+import com.njcn.user.pojo.dto.DeptDTO;
+import com.njcn.web.utils.WebUtil;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+
+import java.text.DecimalFormat;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+
+/**
+ * <p>
+ * 区域分类统计年表 服务实现类
+ * </p>
+ *
+ * @author rui.wu
+ * @since 2022-10-17
+ */
+@Service
+@RequiredArgsConstructor
+public class RStatOrgYServiceImpl extends ServiceImpl<RStatOrgYMapper, RStatOrgY> implements RStatOrgYService {
+
+    private final DeptFeignClient deptFeignClient;
+    private final DicDataFeignClient dicDataFeignClient;
+    private final RStatOrgYMapper rStatOrgYMapper;
+    private final RStatOrgQMapper rStatOrgQMapper;
+    private final RStatOrgMMapper rStatOrgMMapper;
+    private final RStatSubstationMMapper rStatSubstationMMapper;
+    private final RStatSubstationQMapper rStatSubstationQMapper;
+    private final RStatSubstationYMapper rStatSubstationYMapper;
+    private final MonitorClient monitorClient;
+    private final PmsGeneralDeviceInfoClient pmsGeneralDeviceInfoClient;
+
+    @Override
+    public List<RStatOrgVO> getRStatHarmonicYAll(StatisticsBizBaseParam param) {
+        List<DeptDTO> deptDTOList = deptFeignClient.getDeptDescendantIndexes(param.getId(), WebUtil.filterDeptType()).getData();
+        //获取部门id集合
+        List<String> deptIds = deptDTOList.stream().map(DeptDTO::getId).collect(Collectors.toList());
+        Map<String, DeptDTO> deptMap = deptDTOList.stream().collect(Collectors.toMap(DeptDTO::getId, Function.identity()));
+
+        //获取主网id信息
+        DictData mainnetData = dicDataFeignClient.getDicDataByCode(DicDataEnum.MAINNET_POINT.getCode()).getData();
+
+        //数据库查询
+        List<RStatOrgY> list = rStatOrgYMapper.selectList(new LambdaQueryWrapper<RStatOrgY>()
+                .eq(RStatOrgY::getDataType,mainnetData.getId())
+                .in(RStatOrgY::getOrgNo,deptIds)
+                .ge(StrUtil.isNotBlank(param.getStartTime()), RStatOrgY::getDataDate, param.getStartTime())
+                .le(StrUtil.isNotBlank(param.getEndTime()), RStatOrgY::getDataDate, param.getEndTime()));
+        Map<String, List<RStatOrgY>> collect = list.stream().collect(Collectors.groupingBy(RStatOrgY::getOrgNo));
+
+        List<RStatOrgVO> newList=new ArrayList<>();
+        collect.forEach((key, value) -> {
+            if(deptMap.containsKey(key)){
+                for (RStatOrgY rStatOrgY : value) {
+                    DeptDTO deptDTO = deptMap.get(key);
+                    RStatOrgVO rStatOrgVO = new RStatOrgVO();
+                    rStatOrgVO.setOrgName(deptDTO.getName());
+                    rStatOrgVO.setAverageOverDay(rStatOrgY.getAverageOverDay());
+                    rStatOrgVO.setEffectiveMeasurementAverage(rStatOrgY.getEffectiveMeasurementAverage());
+                    rStatOrgVO.setEffectiveMeasurementAccrued(rStatOrgY.getEffectiveMeasurementAccrued());
+                    rStatOrgVO.setOverLimitMeasurementAverage(rStatOrgY.getOverLimitMeasurementAverage());
+                    rStatOrgVO.setOverLimitMeasurementAccrued(rStatOrgY.getOverLimitMeasurementAccrued());
+                    DecimalFormat df = new DecimalFormat("###.00");
+                    Float harmonicMeasurementRatioAverage = Float.parseFloat(
+                            df.format(rStatOrgY.getOverLimitMeasurementAverage() / (rStatOrgY.getEffectiveMeasurementAverage()*1.0)));
+                    rStatOrgVO.setHarmonicMeasurementRatioAverage(harmonicMeasurementRatioAverage);
+                    Float harmonicMeasurementRatioAccrued = Float.parseFloat(
+                            df.format(rStatOrgY.getOverLimitMeasurementAccrued() / (rStatOrgY.getEffectiveMeasurementAccrued()*1.0)));
+                    rStatOrgVO.setHarmonicMeasurementRatioAccrued(harmonicMeasurementRatioAccrued);
+                    newList.add(rStatOrgVO);
+                }
+            }
+        });
+        return newList;
+    }
+
+    @Override
+    public List<RStatSubstationOrg2VO> getRStatSubstationOrg(StatisticsBizBaseParam param) {
+        // 获取当前用户的部门的子部门信息
+        List<DeptDTO> data = deptFeignClient.getDeptDescendantIndexes(param.getId(), WebUtil.filterDeptType()).getData();
+        List<RStatSubstationOrg2VO> info = new ArrayList<>();
+        if (CollectionUtil.isNotEmpty(data)) {
+            // 根据暂态指标枚举查询暂态指标
+            List<DictData> eventStatis = dicDataFeignClient.getDicDataByTypeCode(
+                    DicDataTypeEnum.STEADY_STATIS.getCode()).getData();
+            List<RStatSubstationOrgVO> temp = new ArrayList<>();
+            // 过滤出部门id
+            List<String> deptIds = data.stream().map(DeptDTO::getId).collect(Collectors.toList());
+            StatSubstationBizBaseParam baseParam = BeanUtil.copyProperties(param,StatSubstationBizBaseParam.class);
+            baseParam.setIds(deptIds);
+            //获取主网id信息
+            DictData mainnetData = dicDataFeignClient.getDicDataByCode(DicDataEnum.MAINNET_POINT.getCode()).getData();
+
+            // 类型（1年 2季度 3月份 4日
+            switch (param.getType().toString()) {
+                case BizParamConstant.STAT_BIZ_YEAR:
+                    // 获取年区域暂态指标分类统计表
+                    temp = rStatOrgYMapper.getYearRStatHarmonicOrgInfo(baseParam,mainnetData.getId());
+                    break;
+                case  BizParamConstant.STAT_BIZ_QUARTER:
+                    // 获取季区域暂态指标分类统计表
+                    temp = rStatOrgQMapper.getQuarterRStatHarmonicOrgInfo(baseParam,mainnetData.getId());
+                    break;
+                case  BizParamConstant.STAT_BIZ_MONTH:
+                    // 获取月区域暂态指标分类统计表
+                    temp = rStatOrgMMapper.getMonthRStatHarmonicOrgInfo(baseParam,mainnetData.getId());
+                    break;
+                default:
+                    break;
+            }
+            Map<String, List<RStatSubstationOrgVO>> map = temp
+                    .stream().collect(Collectors.groupingBy(RStatSubstationOrgVO::getOrgNo));
+            map.forEach((key, value) -> {
+                RStatSubstationOrg2VO vo=new RStatSubstationOrg2VO();
+                vo.setOrgNo(value.get(0).getOrgNo());
+                vo.setOrgName(value.get(0).getOrgName());
+                vo.setDataDate(value.get(0).getDataDate());
+                vo.setEffectiveMeasurementAverage(value.get(0).getEffectiveMeasurementAverage());
+                vo.setEffectiveMeasurementAccrued(value.get(0).getEffectiveMeasurementAccrued());
+                vo.setHarmonicMeasurementAverage(value.get(0).getHarmonicMeasurementAverage());
+                vo.setHarmonicMeasurementAccrued(value.get(0).getHarmonicMeasurementAccrued());
+                vo.setHarmonicMeasurementRatioAverage(value.get(0).getHarmonicMeasurementRatioAverage());
+                vo.setHarmonicMeasurementRatioAccrued(value.get(0).getHarmonicMeasurementRatioAccrued());
+                //遍历赋值
+                for (RStatSubstationOrgVO orgVO : value) {
+                    for (DictData eventStati : eventStatis) {
+                        if (eventStati.getId().equals(orgVO.getHarmonicType())) {
+                            if (eventStati.getCode().equals(RStatSubstationOrg2VO.FREQUENCY_DEV)) {
+                                vo.setTAverage(orgVO.getOverLimitMeasurementAverage());
+                                vo.setTAccrued(orgVO.getOverLimitMeasurementAccrued());
+                                vo.setOAverage(orgVO.getOverLimitMeasurementRatioAverage());
+                                vo.setOAccrued(orgVO.getOverLimitMeasurementRatioAccrued());
+                                vo.setChainAverage(orgVO.getChainAverage());
+                                vo.setChainAccrued(orgVO.getChainAccrued());
+                                vo.setSameAverage(orgVO.getSameAverage());
+                                vo.setSameAccrued(orgVO.getSameAccrued());
+                                vo.setAverageOverDay(orgVO.getAverageOverDay());
+                            }
+                            if (eventStati.getCode().equals(RStatSubstationOrg2VO.VOLTAGE_DEV)) {
+                                vo.setTAverage1(orgVO.getOverLimitMeasurementAverage());
+                                vo.setTAccrued1(orgVO.getOverLimitMeasurementAccrued());
+                                vo.setOAverage1(orgVO.getOverLimitMeasurementRatioAverage());
+                                vo.setOAccrued1(orgVO.getOverLimitMeasurementRatioAccrued());
+                                vo.setChainAverage1(orgVO.getChainAverage());
+                                vo.setChainAccrued1(orgVO.getChainAccrued());
+                                vo.setSameAverage1(orgVO.getSameAverage());
+                                vo.setSameAccrued1(orgVO.getSameAccrued());
+                                vo.setAverageOverDay1(orgVO.getAverageOverDay());
+                            }
+                            if (eventStati.getCode().equals(RStatSubstationOrg2VO.FLICKER)) {
+                                vo.setTAverage2(orgVO.getOverLimitMeasurementAverage());
+                                vo.setTAccrued2(orgVO.getOverLimitMeasurementAccrued());
+                                vo.setOAverage2(orgVO.getOverLimitMeasurementRatioAverage());
+                                vo.setOAccrued2(orgVO.getOverLimitMeasurementRatioAccrued());
+                                vo.setChainAverage2(orgVO.getChainAverage());
+                                vo.setChainAccrued2(orgVO.getChainAccrued());
+                                vo.setSameAverage2(orgVO.getSameAverage());
+                                vo.setSameAccrued2(orgVO.getSameAccrued());
+                                vo.setAverageOverDay2(orgVO.getAverageOverDay());
+                            }
+                            if (eventStati.getCode().equals(RStatSubstationOrg2VO.HARMONIC_VOLTAGE)) {
+                                vo.setTAverage3(orgVO.getOverLimitMeasurementAverage());
+                                vo.setTAccrued3(orgVO.getOverLimitMeasurementAccrued());
+                                vo.setOAverage3(orgVO.getOverLimitMeasurementRatioAverage());
+                                vo.setOAccrued3(orgVO.getOverLimitMeasurementRatioAccrued());
+                                vo.setChainAverage3(orgVO.getChainAverage());
+                                vo.setChainAccrued3(orgVO.getChainAccrued());
+                                vo.setSameAverage3(orgVO.getSameAverage());
+                                vo.setSameAccrued3(orgVO.getSameAccrued());
+                                vo.setAverageOverDay3(orgVO.getAverageOverDay());
+                            }
+                            if (eventStati.getCode().equals(RStatSubstationOrg2VO.HARMONIC_CURRENT)) {
+                                vo.setTAverage4(orgVO.getOverLimitMeasurementAverage());
+                                vo.setTAccrued4(orgVO.getOverLimitMeasurementAccrued());
+                                vo.setOAverage4(orgVO.getOverLimitMeasurementRatioAverage());
+                                vo.setOAccrued4(orgVO.getOverLimitMeasurementRatioAccrued());
+                                vo.setChainAverage4(orgVO.getChainAverage());
+                                vo.setChainAccrued4(orgVO.getChainAccrued());
+                                vo.setSameAverage4(orgVO.getSameAverage());
+                                vo.setSameAccrued4(orgVO.getSameAccrued());
+                                vo.setAverageOverDay4(orgVO.getAverageOverDay());
+                            }
+                            if (eventStati.getCode().equals(RStatSubstationOrg2VO.INTERHARMONIC_VOLTAGE)) {
+                                vo.setTAverage5(orgVO.getOverLimitMeasurementAverage());
+                                vo.setTAccrued5(orgVO.getOverLimitMeasurementAccrued());
+                                vo.setOAverage5(orgVO.getOverLimitMeasurementRatioAverage());
+                                vo.setOAccrued5(orgVO.getOverLimitMeasurementRatioAccrued());
+                                vo.setChainAverage5(orgVO.getChainAverage());
+                                vo.setChainAccrued5(orgVO.getChainAccrued());
+                                vo.setSameAverage5(orgVO.getSameAverage());
+                                vo.setSameAccrued5(orgVO.getSameAccrued());
+                                vo.setAverageOverDay5(orgVO.getAverageOverDay());
+                            }
+                            if (eventStati.getCode().equals(RStatSubstationOrg2VO.PHASE_VOLTAGE)) {
+                                vo.setTAverage6(orgVO.getOverLimitMeasurementAverage());
+                                vo.setTAccrued6(orgVO.getOverLimitMeasurementAccrued());
+                                vo.setOAverage6(orgVO.getOverLimitMeasurementRatioAverage());
+                                vo.setOAccrued6(orgVO.getOverLimitMeasurementRatioAccrued());
+                                vo.setChainAverage6(orgVO.getChainAverage());
+                                vo.setChainAccrued6(orgVO.getChainAccrued());
+                                vo.setSameAverage6(orgVO.getSameAverage());
+                                vo.setSameAccrued6(orgVO.getSameAccrued());
+                                vo.setAverageOverDay6(orgVO.getAverageOverDay());
+                            }
+                            if (eventStati.getCode().equals(RStatSubstationOrg2VO.NEG_CURRENT)) {
+                                vo.setTAverage7(orgVO.getOverLimitMeasurementAverage());
+                                vo.setTAccrued7(orgVO.getOverLimitMeasurementAccrued());
+                                vo.setOAverage7(orgVO.getOverLimitMeasurementRatioAverage());
+                                vo.setOAccrued7(orgVO.getOverLimitMeasurementRatioAccrued());
+                                vo.setChainAverage7(orgVO.getChainAverage());
+                                vo.setChainAccrued7(orgVO.getChainAccrued());
+                                vo.setSameAverage7(orgVO.getSameAverage());
+                                vo.setSameAccrued7(orgVO.getSameAccrued());
+                                vo.setAverageOverDay7(orgVO.getAverageOverDay());
+                            }
+                            if (eventStati.getCode().equals(RStatSubstationOrg2VO.TOTAL_INDICATOR)) {
+                                vo.setTAverage8(orgVO.getOverLimitMeasurementAverage());
+                                vo.setTAccrued8(orgVO.getOverLimitMeasurementAccrued());
+                                vo.setOAverage8(orgVO.getOverLimitMeasurementRatioAverage());
+                                vo.setOAccrued8(orgVO.getOverLimitMeasurementRatioAccrued());
+                                vo.setChainAverage8(orgVO.getChainAverage());
+                                vo.setChainAccrued8(orgVO.getChainAccrued());
+                                vo.setSameAverage8(orgVO.getSameAverage());
+                                vo.setSameAccrued8(orgVO.getSameAccrued());
+                                vo.setAverageOverDay8(orgVO.getAverageOverDay());
+                            }
+
+                        }
+
+                    }
+                }
+                info.add(vo);
+            });
+            // 匹配单位名称
+            for (DeptDTO dto : data) {
+                for (RStatSubstationOrg2VO vo : info) {
+                    if (dto.getId().equals(vo.getOrgNo())) {
+                        vo.setOrgName(dto.getName());
+                    }
+                }
+            }
+        }
+        return info;
+    }
+
+    @Override
+    public List<RSubstationIcon2VO.RSubstationInfoVO> getRStatSubstation(StatSubstationBizBaseParam param) {
+        PmsDeviceInfoParam pms=new PmsDeviceInfoParam();
+        pms.setDeptIndex(param.getId());
+        pms.setStatisticalType(new SimpleDTO());
+        List<PmsGeneralDeviceDTO> data = pmsGeneralDeviceInfoClient.getPmsDeviceInfoWithInOrg(pms).getData();
+        //生成变电站id集合
+        List<String> pAddIds=new ArrayList<>();
+        data.stream().forEach(e-> pAddIds.addAll(e.getPowerrIdList()));
+        List<RSubstationIcon2VO> rSubstationIconVO = new ArrayList<>();
+        //根据监测点id获取变电站信息
+        PmsMonitorParam dto=new PmsMonitorParam();
+        List<String> mAddIds=new ArrayList<>();
+        data.stream().forEach(e-> mAddIds.addAll(e.getMonitorIdList()));
+        dto.setMonitorIds(mAddIds);
+        dto.setPowerrIds(param.getIds());
+        //根据变电站分组
+        List<PmsMonitorDTO> pmsMonitorDTOS = monitorClient.getMonitorInfoListByCond(dto).getData();
+        Map<String, PmsMonitorDTO> pmsMonitorDTOMap = pmsMonitorDTOS.stream()
+                .collect(Collectors.toMap(PmsMonitorDTO::getPowerrId, Function.identity()));
+
+        if(CollUtil.isNotEmpty(pmsMonitorDTOS)){
+            //获取最新过滤的变电站id
+            List<String> ids = pmsMonitorDTOS.stream().map(PmsMonitorDTO::getPowerrId).collect(Collectors.toList());
+            //根据id进行筛选
+            StatSubstationBizBaseParam baseParam= BeanUtil.copyProperties(param,StatSubstationBizBaseParam.class);
+            baseParam.setIds(ids);
+            String string = param.getType().toString();
+            switch (string) {
+                //查询变电站稳态指标平均超标天数-年数据
+                case BizParamConstant.STAT_BIZ_YEAR:
+                    rSubstationIconVO =rStatSubstationYMapper.getStatSubstationIcon2Y(baseParam);
+                    break;
+                //查询变电站稳态指标平均超标天数-季数据
+                case BizParamConstant.STAT_BIZ_QUARTER:
+                    rSubstationIconVO = rStatSubstationQMapper.getStatSubstationIcon2Q(baseParam);
+                    break;
+                //查询变电站稳态指标平均超标天数-月数据
+                case BizParamConstant.STAT_BIZ_MONTH:
+                    rSubstationIconVO = rStatSubstationMMapper.getStatSubstationIcon2M(baseParam);
+                    break;
+                default:
+                    break;
+            }
+            List<RSubstationIcon2VO.RSubstationInfoVO> rSubstationInfoVOS = BeanUtil.copyToList(rSubstationIconVO, RSubstationIcon2VO.RSubstationInfoVO.class);
+            if(CollectionUtil.isNotEmpty(rSubstationInfoVOS)){
+                Map<String, RSubstationIcon2VO.RSubstationInfoVO> detailVOMap = rSubstationInfoVOS.stream()
+                        .collect(Collectors.toMap(RSubstationIcon2VO.RSubstationInfoVO::getSubstationId,Function.identity()));
+                detailVOMap.forEach((Key,value)->{
+                    if(pmsMonitorDTOMap.containsKey(Key)){
+                        PmsMonitorDTO dto1 = pmsMonitorDTOMap.get(Key);
+                        value.setCityName(dto1.getOrgName());
+                        value.setSubstationName(dto1.getPowerrName());
+                        //获取省级公司
+//                        value.setProvinceName(deptFeignClient.getAreaIdByDeptId());
+                    }
+                });
+            }
+          return  rSubstationInfoVOS;
+        }
+        return null;
+    }
+
+    @Override
+    public List<RStatOrgIndexVO.RStatOrgIndexInfoVO> getRStatOrgIndex(StatisticsBizBaseParam param) {
+        // 获取当前用户的部门的子部门信息
+        List<DeptDTO> data = deptFeignClient.getDeptDescendantIndexes(param.getId(), WebUtil.filterDeptType()).getData();
+        List<RStatOrgIndexVO.RStatOrgIndexInfoVO> info = new ArrayList<>();
+        //获取主网id信息
+        DictData mainnetData = dicDataFeignClient.getDicDataByCode(DicDataEnum.MAINNET_POINT.getCode()).getData();
+
+        if (CollectionUtil.isNotEmpty(data)) {
+            // 过滤出部门id
+            List<String> deptIds = data.stream().map(DeptDTO::getId).collect(Collectors.toList());
+            StatSubstationBizBaseParam baseParam = BeanUtil.copyProperties(param, StatSubstationBizBaseParam.class);
+            baseParam.setIds(deptIds);
+            // 类型（1年 2季度 3月份 4日
+            switch (param.getType().toString()) {
+                case BizParamConstant.STAT_BIZ_YEAR:
+                    // 获取年区域稳态指标合格率统计表
+                    info = rStatOrgYMapper.getYearRStatOrgIndex(baseParam,mainnetData.getId());
+                    break;
+                case BizParamConstant.STAT_BIZ_QUARTER:
+                    // 获取季区域稳态指标合格率统计表
+                    info = rStatOrgQMapper.getQuarterRStatOrgIndex(baseParam,mainnetData.getId());
+                    break;
+                case BizParamConstant.STAT_BIZ_MONTH:
+                    // 获取月区域稳态指标合格率统计表
+                    info = rStatOrgMMapper.getMonthRStatOrgIndex(baseParam,mainnetData.getId());
+                    break;
+                default:
+                    break;
+            }
+        }
+        //匹配名称
+        for (DeptDTO dto : data) {
+            for (RStatOrgIndexVO vo : info) {
+                if (dto.getId().equals(vo.getOrgNo())) {
+                    vo.setOrgNo(dto.getId());
+                    vo.setOrgName(dto.getName());
+                }
+            }
+        }
+        return info;
+    }
+
+
+}
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/RStatSubstationMServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/RStatSubstationMServiceImpl.java
new file mode 100644
index 000000000..ab04037d5
--- /dev/null
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/RStatSubstationMServiceImpl.java
@@ -0,0 +1,131 @@
+package com.njcn.harmonic.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.collection.CollUtil;
+import com.njcn.common.pojo.constant.BizParamConstant;
+import com.njcn.common.pojo.dto.SimpleDTO;
+import com.njcn.common.pojo.param.StatisticsBizBaseParam;
+import com.njcn.device.pms.api.PmsGeneralDeviceInfoClient;
+import com.njcn.device.pms.api.StatationStatClient;
+import com.njcn.device.pms.pojo.dto.PmsGeneralDeviceDTO;
+import com.njcn.device.pms.pojo.dto.PmsStatationStatInfoDTO;
+import com.njcn.device.pms.pojo.param.PmsDeviceInfoParam;
+import com.njcn.device.pms.pojo.param.PmsStatationStatInfoParam;
+import com.njcn.harmonic.mapper.RStatSubstationQMapper;
+import com.njcn.harmonic.mapper.RStatSubstationYMapper;
+import com.njcn.harmonic.pojo.param.StatSubstationBizBaseParam;
+import com.njcn.harmonic.pojo.po.RStatSubstationM;
+import com.njcn.harmonic.mapper.RStatSubstationMMapper;
+import com.njcn.harmonic.pojo.vo.RSubstationIcon2VO;
+import com.njcn.harmonic.pojo.vo.RSubstationIconVO;
+import com.njcn.harmonic.service.RStatSubstationMService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.njcn.user.api.DeptFeignClient;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author rui.wu
+ * @since 2022-10-18
+ */
+@Service
+@RequiredArgsConstructor
+public class RStatSubstationMServiceImpl extends ServiceImpl<RStatSubstationMMapper, RStatSubstationM> implements RStatSubstationMService {
+
+    private final RStatSubstationMMapper rStatSubstationMMapper;
+    private final RStatSubstationQMapper rStatSubstationQMapper;
+    private final RStatSubstationYMapper rStatSubstationYMapper;
+    private final StatationStatClient statationStatClient;
+    private final PmsGeneralDeviceInfoClient pmsGeneralDeviceInfoClient;
+
+    @Override
+    public RSubstationIconVO getStatSubstationIcon(StatisticsBizBaseParam param) {
+        RSubstationIconVO rSubstationIconVO = new RSubstationIconVO();
+        StatSubstationBizBaseParam baseParam= BeanUtil.copyProperties(param,StatSubstationBizBaseParam.class);
+        //根据部门获取变电站信息
+//        baseParam.setIds(this.powerrIdList(param.getId()));
+        String string = param.getType().toString();
+        switch (string) {
+            //查询变电站稳态指标超标分布（按超标天数）-年数据
+            case BizParamConstant.STAT_BIZ_YEAR:
+                rSubstationIconVO = rStatSubstationYMapper.getStatSubstationIconY(baseParam);
+                break;
+            //查询变电站稳态指标超标分布（按超标天数）-季数据
+            case BizParamConstant.STAT_BIZ_QUARTER:
+                rSubstationIconVO = rStatSubstationQMapper.getStatSubstationIconQ(baseParam);
+                break;
+            //查询变电站稳态指标超标分布（按超标天数）-月数据
+            case BizParamConstant.STAT_BIZ_MONTH:
+                rSubstationIconVO = rStatSubstationMMapper.getStatSubstationIconM(baseParam);
+                break;
+            default:
+                break;
+        }
+        return rSubstationIconVO;
+    }
+
+    @Override
+    public List<RSubstationIcon2VO> getStatSubstationIcon2(StatisticsBizBaseParam param) {
+        //生成变电站id集合
+        List<RSubstationIcon2VO> rSubstationIconVO = new ArrayList<>();
+        StatSubstationBizBaseParam baseParam= BeanUtil.copyProperties(param,StatSubstationBizBaseParam.class);
+        //根据id进行筛选
+//        baseParam.setIds(this.powerrIdList(param.getId()));
+        String string = param.getType().toString();
+        switch (string) {
+            //查询变电站稳态指标平均超标天数-年数据
+            case BizParamConstant.STAT_BIZ_YEAR:
+                rSubstationIconVO = rStatSubstationYMapper.getStatSubstationIcon2Y(baseParam);
+                break;
+            //查询变电站稳态指标平均超标天数-季数据
+            case BizParamConstant.STAT_BIZ_QUARTER:
+                rSubstationIconVO = rStatSubstationQMapper.getStatSubstationIcon2Q(baseParam);
+                break;
+            //查询变电站稳态指标平均超标天数-月数据
+            case BizParamConstant.STAT_BIZ_MONTH:
+                rSubstationIconVO = rStatSubstationMMapper.getStatSubstationIcon2M(baseParam);
+                break;
+            default:
+                break;
+        }
+
+        //获取变电站名称属性替换
+        if(CollUtil.isNotEmpty(rSubstationIconVO)){
+            List<String> ids = rSubstationIconVO.stream().map(RSubstationIcon2VO::getSubstationId).collect(Collectors.toList());
+            if(CollUtil.isNotEmpty(ids)){
+                PmsStatationStatInfoParam pmsParam=new PmsStatationStatInfoParam();
+                pmsParam.setPowerIds(ids);
+                List<PmsStatationStatInfoDTO> data1 = statationStatClient.getStatationStatInfo(pmsParam).getData();
+                if (CollUtil.isNotEmpty(data1)){
+                    for (PmsStatationStatInfoDTO dto : data1) {
+                        for (RSubstationIcon2VO vo : rSubstationIconVO) {
+                            if (dto.getPowerId().equals(vo.getSubstationId())) {
+                                vo.setSubstationName(dto.getPowerName());
+                            }
+                        }
+                    }
+                }
+            }
+        }
+        return rSubstationIconVO;
+    }
+
+    private List<String> powerrIdList(String id){
+        //获取部门下面监测点信息
+        PmsDeviceInfoParam pms=new PmsDeviceInfoParam();
+        pms.setDeptIndex(id);
+        pms.setStatisticalType(new SimpleDTO());
+        List<PmsGeneralDeviceDTO> data = pmsGeneralDeviceInfoClient.getPmsDeviceInfoWithInOrg(pms).getData();
+        List<String> addids=new ArrayList<>();
+        data.stream().forEach(e-> addids.addAll(e.getPowerrIdList()));
+        return addids;
+    }
+}
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/RStatSubstationVoltageMServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/RStatSubstationVoltageMServiceImpl.java
new file mode 100644
index 000000000..ffbcdf2a8
--- /dev/null
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/RStatSubstationVoltageMServiceImpl.java
@@ -0,0 +1,56 @@
+package com.njcn.harmonic.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.njcn.common.pojo.dto.SimpleDTO;
+import com.njcn.common.pojo.param.StatisticsBizBaseParam;
+import com.njcn.device.pms.api.PmsGeneralDeviceInfoClient;
+import com.njcn.device.pms.pojo.dto.PmsGeneralDeviceDTO;
+import com.njcn.device.pms.pojo.param.PmsDeviceInfoParam;
+import com.njcn.harmonic.pojo.param.StatSubstationBizBaseParam;
+import com.njcn.harmonic.pojo.po.RStatSubstationVoltageM;
+import com.njcn.harmonic.mapper.RStatSubstationVoltageMMapper;
+import com.njcn.harmonic.pojo.vo.RVoltageIconVO;
+import com.njcn.harmonic.service.RStatSubstationVoltageMService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.njcn.user.api.DeptFeignClient;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author rui.wu
+ * @since 2022-10-18
+ */
+@Service
+@RequiredArgsConstructor
+public class RStatSubstationVoltageMServiceImpl extends ServiceImpl<RStatSubstationVoltageMMapper, RStatSubstationVoltageM> implements RStatSubstationVoltageMService {
+
+    private final DeptFeignClient deptFeignClient;
+    private final RStatSubstationVoltageMMapper rStatSubstationVoltageMMapper;
+    private final PmsGeneralDeviceInfoClient pmsGeneralDeviceInfoClient;
+
+    @Override
+    public List<RVoltageIconVO> getStatSubstationIcon(StatisticsBizBaseParam param) {
+        //获取部门id集合
+        StatSubstationBizBaseParam baseParam= BeanUtil.copyProperties(param,StatSubstationBizBaseParam.class);
+//        baseParam.setIds(this.powerrIdList(param.getId()));
+        return rStatSubstationVoltageMMapper.getStatSubstationIcon(baseParam);
+    }
+    //根据部门获取监测点id信息
+    private List<String> powerrIdList(String id){
+        //获取部门下面监测点信息
+        PmsDeviceInfoParam pms=new PmsDeviceInfoParam();
+        pms.setDeptIndex(id);
+        pms.setStatisticalType(new SimpleDTO());
+        List<PmsGeneralDeviceDTO> data = pmsGeneralDeviceInfoClient.getPmsDeviceInfoWithInOrg(pms).getData();
+        List<String> addids=new ArrayList<>();
+        data.stream().forEach(e-> addids.addAll(e.getPowerrIdList()));
+        return addids;
+    }
+}
diff --git a/pqs-job/job-executor.zip b/pqs-job/job-executor.zip
new file mode 100644
index 0000000000000000000000000000000000000000..c0034f1bcba198c8ce7fd594d2c11cfd70ce44bd
GIT binary patch
literal 73767
zcmd?QbChMlo;8@ZZB}Mh+O}=mwpnT0b|tFPwr$(Cv(lPdZ(hHi{${#oy8ry<uCpUz
z#oe*bJtyLaIO|*mX;3gUpuZpNBw5veH2zt@18OUKBU)1rQ)5>bdnbB@e^Q}<&Qj=A
zv8$?;8Ud7R05Jbos))U@wW*VtrH!d+TrEtW0Fua?z^9>PL5$;~6b+alI4o)eOr)00
z6l*Kib>AV$-m>@F?@79e4(xPK6na7RipYCc7Pw9L-xWnh+gUQD2BRi6wKJ9@h!`=8
zCED=;`n^wPv*fGQd!h{i!U{7vfpSP(!=2q84o>fO=+)*k*YK~x+tN+Q22|*gFg3s7
zmpHM9O4Vo<MfZzRgU_>7Qj@?;sB0DirKs)UhSgv-4sh1=HE@RrZzfwvnn#}W{{2c}
zvv^fEd8Zhk!GM5p0hjsrR{e*Y;$Uw}=V5EJsj(V0FM#ET`A%qbD=D)V5<U=4Qn(X>
z*(Fyxe`S#w!5nc(61evRcB?HAw(xDQjU>F;FFMQZ$DRI-G`V^fi*2XE+rrD#w)?~c
zJ0n|DR;p99gJ4EyL7kGeqGEWAX3Sa)d<y7WbJ;l+?&M$;Tv&ZSSUXJkx{<JHpKH!T
z+m^_1cqK99E_5N|*38qz*6-?BHUEsksN@q0*QI7~**{v9sY_b;Rux*cM#a7s$FV;Q
z3L{jkU@=$IO&$cDJE2y&vBc<z@PYlABnoM*5`Tp{;Z#tU{4wJQM_rFmBL;U&TS9hg
zUY0rjrGQvpR#4hdVG_hV4UA$YJINPqD~w3lDWq63nG#?v9G6<_-8tMnYr<-TA1$&Z
z0WT@N@X83nm(l?Js51oXkHcn#;{5sH{Wa%uyjLG`O8xnfadqMHG}JmZ(eQOrRRD=%
z$#sLg;IGDjNXn2#6F?~KaD;RtB*G?@;Vcm>OxwrW%M%;XIyD1}O_oWw2frtl=_!`j
zOn`-4D~4yZoS&iW(D`RHoJ$S-4fP7TPxW9X(BwF>>yJl6R71E^VK=A=3uWJS7_Ldy
zgc{@i0bz(<`RC7`EHq~bTj%IK{`fbtva*JCH3z4VMKu-Icc^u}by5s`vXSWO+!HZ>
zE}T@wdfosIldL`cc5Y$xfZZ0xLqjmZ&~bhO{RP>DDs4UQ@uM$B5hK*C^ml5QbmE5%
zCe=7C-cH?8wmLWPG>b@zL4<gefC>zXUETBz6;83xT=FcZnyKd^N{&$6#5FIY;TdJS
zvP?nC)?i5W)^XkufjT-Aa$6hEMzD3FE=nD&shTdEj4m1LTCdF+(y5lna$kvgS83j%
z4xiYhijUia<pi=&)4a9LU-$2Vt8pCrR8_CUvdgp&ST|zRzCsuHn|R|vx6I@Z3CdQV
zGXbsosB-bUTwyuOM(^QjrW2R^!4UW&O6u?`DlcyFeDlV?SAy{dDWw?@Q%9f<`VB@R
zX_H|xvPX#VGpRJvuosQX2RCSHP^!Kg8JjIz_V0iHnYRtD5Pb3n`V*t=lzn0Rvf7*L
zW&w*&h$EV7zgfzGA397>l|uXy;ncQb2<vMKr#6qs>!rq;pg!dnX6l=|zGNYaLanGm
zUzAcKU&pY@L+M)bl8j|2TR%duYeWNcfQW;n6cElvkAfM<ZCJE^J-!f!-<O(yA$D(&
zzr#uDqP3}56R{pV!7a40gDZ!n!tUKD=myizX#z>TT@eG4mI$JH>{gWTW6SHxpQq=a
zG3A@)&SM7EhAD?dN$#m2;W<{lY2f*o@}d#7Oa?jB#~-VZIm5^8)BNzDO@yp_fq=`$
zaLMt{A|i*g2^zR?2#3upZDUSLp}oUeYcOx;XFcZU`km|_8;Ni#J%8#5tCZw4=Gr{K
z42kut4<iu!Aei8H=>*fwXHxlR$TE!2#cg%=1O0@gs^2564_RV>E8)~Dq5W|o7T0hr
zm)gU~XdI7sJh$PQxBK;${Rt&mbrxc&x3$^lCM)#&`NC*OX{m|-CZsu6-1eA4*N>J&
zHxmyXi_r@=BSWu}w}TuPs=<438f-X7+$n@`e(aH)`}=EsOpyd0W;qK%-eWzttIiXh
z4s5i?Ay$P6G1jjmCIyq#!=^8%yMr5veaq^Nhy33TCrBDJM81RhNJ${ZPWavX{-nl?
z-Jt*GDS`eG69CTfUms*Z>pyr(XD8!-g^>R{9pnFrZfj_1_g{>`{ZGeO8M+z%7Xu0Z
z>w(7hw*ST8Z~yOu?W~OdtKUug|54#TiM-n*OW<a}KtN3(KtK}zT`4JhBhh~bbU_CP
z8%twD7fX9Py1zFpMrl$Clo6>5^A#be^par66&);U2l0UjN+@oRIICp6p`Dp{v?<c#
z3BJSQ0lwo|;E{8}F0HIV!dap(?K;c;nOtlnV+37-E}<k*f%m(nXVZsW>H2K3;d#Lh
z)4rz1-55%nkq^tDVdv8_S`%k#T*l2>0kfKNY+(2gp!6Ftte+POFt0x?GK{IE8V$Jn
zqgVH9fTv?98!8UlEkrCdnPOb^G#Axcpb)v$6TsC;O@3NbxX5u3C7_>`b?IYhCAiBH
zy*X}N3c#87I`m<X%d~2I*9vep)pZC2m0{2nB;7?XlFan|;rlIYyg7|Ux2vmP&?ymb
zIr_uyxFUino1aqD``mMYF%`aR88&&csZfT)wLP;iNLhm#_jBnR2__BQXF>)QtWJE0
z140!iZiC;RI=n~OzJHBY9qdnp;p_(}sRBxz*R|Ixg5XKr>LcNHHi+n^LW_1pHrYR~
z)DO<KI8FBdxy7*jcjwaB-p<U@{9jA;|IEu6M|sU7K!Jb;p@D!z|A&ei9yWk=BK!~e
ze=Lm@HEnBDK{Q{)1AaI`2j!6g-0wJ1?$P0BfJx8V9OY`u&@?l56@`fuEB~d~TZoP<
zSirXus3p4gYJNd}sr(ga?(XJn={C+qJbICR?c;nj;cm7x8-v>>8sDp(uFH-^&d10z
z3eLu1t#qzXt3Wf8+8+|l&}F}W-T|y82%!PA@*HWOw;KZ+n?J#Yt&Q-I(^^ww&Hki2
zY~E^`U`tc#0?K1=4=mCkThKg0OJ}zOF`E&U1rzBy)UrT!2&cbf8)tKlTP1^{kKm0D
z+V<tfMPNFDI;))g>uf-z)}I{7<Tr?>5LFmMQE1#rZpRS#9q%?No2a+j<(B?xV|CrJ
zfJGGsthm_sDDYwHl?8#&%62-X7gZ=1NS=Jbcy?FG_%Xb?#ce~DL`fUu-w+Lk2zaxp
z#14b5-=uQX)*LBTO*U;5A-YS5s-!ngl{{URV3{V6BMrn+7u<Y8f#ajzAq+EgKqc5_
z1w7jJ8CD8tnpU!-BnR^b(X#Ft6e*&Dxjf&6p<@{p$Q3O{gn_6WTs&#1VHo5CI4P2d
z5^EG<N_^L4;b8@iQD>lmfF1L=DySD@inHA$i1=}22pXM=>=unAjmI)|sAUn>QgMPL
zehn1g6?B;&sq6=ZA(J*M-L4@SmeIRK@NgCS**4%gA%D-Xs?~9B{q8G!%Ct=5D*jWB
zU<d6)26iwN(#J)iW=-Mt$dR`^_}5_I#3@rDt8LVC;y#TXk)C{wN|Q(3DOgqPRgG+Z
zj5>4g-u2GBj{Sq_&Bgw9`%_@ZcJKPjj-mJdr;q)E_VxMx)rZ@SgQfGK<%}lWl`mAT
zk06<=xe8pCw;8zIIEJ|$v@19L(r3r{B(Fd*7wKJM5nJ?QDq#if*Ttsx*{22q#!+BK
z-sUw!@BHh+(O5f2qM(T4IzB|*9hZfl-rK$J4@);^(<;Q1=1fVvKAFDg^`!nK;2x9>
z=d&Y|HCjwS@;4L@2cj#1v(*74q3u|i3B-hLhqBujDtpy}`cz`Q*us9LSYAS7iPi|o
zR6pyxq^)~0#TVGn*W_YuwtU^R|HHc$izfq-%btzEbqG|+T0uI@8R8r26_Oj6B?@u4
zW<UW0=apc?{L_zYANP{sI!q%?zfbCuiKWsZa@-9t_1%Sn2t0=*rh7E>DxTq0&8ZxS
zj?|o^s*12-J#1~m2XeB!1<5}{NWLXs!2j+&By=VI!*-4JziaCjhIS@4rvK}<?wp?g
z@Cy)Jwg4{Vza3ouO;XU(N!i88(8bi;6W~Yw;X!^V%L6t@Xx*51_@TVTqIz!QTahzL
zYAPCNWkfW*G8EOP4M`as85NXKL|$58gF)W2<&cPhn8+V|Y;TM{mUZi9%UsYI{MS#u
z-R#$$-*jj^f@RXN{^(fr;E5hZhhQ%k2(901=}8Yo)W#-win09^z>13J{B3Y>p`7Wx
zoDZKQhD%G#=nTq};85g1M7!JCZ{dk(S`;Q#=q9_(qt3vd)Cl&Yp?{;dUWb<@>FpOv
zL;J2eBk1xP$5qj6<MEJqhKCUbgMyX8PZtZ9GaK@gzGkALC^g}-k}zkilx_Hd6{xuZ
zDSTPlxZ99gSPAIZAzIYn0^;<ls-wn0xnb*C1nJz;^Va9rx4XBjy>-#s+ws@@X=Zlj
z)CdQyOJOPG^DFoEUc(vQ@6&;azq(@skF0&Qw!0#hrRpLQ1EB}!lWoazn0lwA$i;&C
z_-S2Bl$;0M)WUZC&cx&=m#R@NuWv&)^xB!0k#lgc>&W};mx&kqR}U9^&5&}PbTN2J
zQ0m)l+KGvT#IuI8rFNUWWv7W+e4g&7-=Y>@$`_CCsZIw=5z7hfqn5ir$()$XHnb9d
z4gQ*v;_AL~#^U4RBiKM%%^`tGD5sqdnxVK$3cAHtn|j-~ElCUHW;Fg(q+_7WN;7=B
z2t`VkJr;}gU8hKe{eugp%6UfC>G!X73k9^PEup%J<c+O_00a~%2m~bmKV7%NHuiR=
z3Xab5b~cuFrb>X-_HS$L5ZBy(UF?sy|9e<@07en*d}14Kuot-EuIhS@K3pW%sLOXH
za?0T|pt&42+qurU6t+!^Y!H0Q93sCVoR@{}8F%+@andNo9HNj38pHeE*IQk>DJiH<
z*rbEMBwkYsr9CjIS=SkgWi{!oR<b#~4o;98l~`r6Km`koPLvi`nDQ&Mn=01lB5l@J
z7StWFujND>BR#}bYg9H<56Y-$e{u1JF4pmt|JG=3@2xkBY$B#T$H_-tXni=uLaQ*Y
z*Fmgpv_PwEG8<=mWGI|t%ElMgT5U2DY{{&m@@Fi^_EKUQ+OYEBF4LQ{Y99nKEH6qe
z=J}CFJu$az2gRzrNQ3xkc!vSDy}4LK8>GO-NNm5atL<f@?mhDzZ&(XGE2mc%SGukW
zH=lTM245!jCw5Apqfq8jgJr$VBuZr_E4WFVzd*Zz@93PAyRD@40X-z+L>)yU^@Pm3
zxz#E5sv4U*oN99=odR0^_*0nGN=3C%d5LRaAlKx6m>}Jls=B4(v#n6Af^s8?g)O|b
zMy(~OXMPgc;jFC99+}N*OFC9ZH3XV$mF7yK*{MBJe_3Xk9$khLcpl3HYN9EqYk!q`
zEsHf!Izqq-dJq?Bj};NSBgR<_G{cgO(y5U5jrLtEjiS45f-LOxHC2n$h}?ic1+w%m
zXLyxysAj??L$p?}Qm&ZKMJc#&0&8F=g1sY<y#JpUqZ?RbUyhQ*fea;PS%q|w?|c>I
zZg}aEP6b(5`#?nLH9C%}R_VYW8sEO9q-QIn2zKYLS1rI~mQ}=arD?`)4yu~%q<PZA
zCS#ZSrr$BJ@%a3K!V#;?d(<ZEbg1zwY5aQ4Q|GtR@#%DYU0(V;T|)GZiR-rgaO`w_
zJPi7v*UsaQ3dSwvv(jI))_-ntyxbg$(r=vVUVT55Id9$0n(kilIK@OhVa!AvVfCJ8
zn6;~<J2zEp43dSliDOdIlB%Z~9EcrMV9S||-Q;#79NXaZUCueUUzsIEocRXYo%<xj
znfWW0;I|SyaX9?A5KAfK9qR%2AG8GQUeM2WP}g5YXLX?<o|wM_Xz=2Y&sO3we6Ib`
zFAyz+-xvEm{mIM?B_fh`Ii!z-NkH9#w-^^l&LHT+N48jEk}zPzh!vrY5TQ(0lYrmx
zm@Jz_lqH5KW*aQWTwzjBMbh+R$4~?i6o*4HH5$+gHc$7#N=L#IYJT~H0bN{Q6frgJ
zhKLD=Cpo|flHKh$V7ySlE$(9L>fq60%--(rr;N3j!h=&zjo~as)kUB+GaN1{ifITb
zIr#q=1h1)~{my66EBwR9*GpBV;5ja8T>5;N+czi6*T?u}1p*XjvPdEG<9r0TG)rG&
zq<V6ij(!r@2T`#8Ln0GCJoA#ux~aWpm0-^7TBe}=n&QhCTavDJ--IZ|avqN5uq8^w
z4<wZoh{!WK4n#!#zy>L6zntvb#?d(&*<xn3%4OS*N9Xs%lY=<^I*lETM4JS6Oi(W~
zS@3E(ct)|8eayu9f=IbA0sMeM{|ttF+;L!ua<zOKQ{^tM2T6JNcS@|#P*Z$OY@(e%
zc}gL0FtudQ6gYEUzK*{8D|csmf4s&}i%>Z?FgdAcC@^Z^86N-4pRi>+!XqPXeV1Ng
zfmg<|(tj@VJo35!(6{gSa=yPWk10R4>$o@cwzm&gK8%aF%={h3#}iazX2_1~UWZE`
zm*4nsy7&N30!@M5NJPmAbuaDgxHH{DO&_|Mga{f$aHh58Jo`&Jm`n6bsGK#&CFh0Y
zUMpcikS!Gy`!GWy`p<L-u%o7mbTQfsGh{$wqB8gn<>dM<zWRg<Ls)~1&r?cFIf7yi
z=?`DVerBN*m$pFjE{|s$EWRz)-#S2Ae-6=EU?x4Q4Z+kQ{Y4yy<KsJFhxDF`Hu*DL
zxOk;LMf!js*hNFB1T_CxfbT+WqXGQ}%E<7~8>Nhd8caZDoT@eT|HBMVM}^cL5y+K^
z90p1gi4ezFrFSAC7DK^^BVQ^_K{N~yF47MNCBU`L`>1rh>U>P2Z>rJ_OmMs3SDt*L
zOCo+sQJ$2iW7+Q9@cBULmp;i+Xt1G}$tJq%Bc>}Qi=vQXMNvc+9<B*i!BwAWiK~sD
z{b_>)XU9Iuc2pi(*ZRvU6UHoC#0iqXBia00t45JaU!j;YwXG7l-D>A1_mw~=7WE$!
znyl#BpW-NL{PWes%t5#e^NS7vFThM4B;%0*)4L*QhkmU!;2YW~TUDc(gZPDd;2UUr
zQC^9PRLEsU^pnn^Bi|h|3~9^S1RxTkUW&t(j|U^VBu?l;{t$($z%wk%?&JkYu_5WR
zSEEpAlEc@*@9Y^C%2jY$a~s&|4~#O{$w-+ZTpvW`64n-k&cJVH?94eF77avbV`i*|
zBM!?Iva-oIg(+#8BSX(AidGE`UO%@`)PAR|a1Eg66vQBHXkmIivF^|#KdRp`PDY&U
z=T&GBw(<SscJb5;`-QQ-Jl#y+vBdGAWc?N5@lB)Nbs_0&#0DWn_NN-SLLsZa(*s61
zDh%u&v$IZ?HA$rPiZ{?^dUXfR%Zvq!F*ouo3J3fcZy~9hw$KPwZbxK-2|*IqA==Z3
zU@R{}sIVp8KW@?*e9Rgi9%uRWDhiS)eFH4XV0n3kcw^zve@+PJ5)wAvwrdS_-sVg-
zP-R02mqF81k|OtO2aO5lSpAcrSy$tgBobPL#hZ(J#Y@#A8YaG3>G+=RjFs1{t$Um|
z22q>m_w+Gh^FdE{*!6?0Utr{!P=E;NG9nU-j5-L)P??(hF^yD=nZ{XExld>M{~{>N
zkd#V#rf`MgBN0+Y3YNrQC<Zn{elk1hLG(V&aL%US>Rm6)0P-bArhvaDC5>=WIN5y}
zp^o8TmOY94J=7$!t)bJDN0fuGK9W$;2Cn;oM>om}kCy|tm_sb$vce~1?gwj;%;FLr
zEXtHaUKDmMc|i{?CLRQj@<msUJiJ!;InZg%;(2$`550#W!qfgCJjvD4iSqrRn-Kkn
zm{{J<4}ULGLOx|2*NX&&qR-A9wNjgp665W~NadYe&lZ9M=SgALm#o_fKA%#*@ok}`
zTbD{gv8E#g28XK8QVkae<%fkKKYqMdxCp-9Hz07;VH2y)JdsV@3VwFzY*C>`t65q(
zaK3~T*<qF~n}rN-hw~DJ3SHD`&qC?Sgr?^*Ypzu-p_LEa>f=O&t0bsw9fAc$Ui}k(
zYJ7<6pqkA*b57@n>O5=TSI7O0r^z^d!*WDO^({*s?{>#qZa1Uy&L`*lpn3(nPY-0b
z65P@!`;G@??`!I&1GoJb>&g0RAdNdV-a&$rV*8<)*Y2sQ&R!J%feMeXe$LZ9_iB8Q
zl0D$>H=EEmnZTAF_I=sFr5g<OG}PSX1y?2KGnYzDEXhU}2>rW#j9Z9sK?wuE4Gbrt
z0|L0P&=cF1^+=Ql!LTSo$FB~{G_et3G)Ciz<GrRUbYVI|!-DH+dG_zO551qh`-`xX
z>RrUvPxN2F!+J^=C*!>ju#@IbLt$cpvhZE?D14<Tn&CeV(TaqwS*WC)tr%Uz7#&*u
zFY6{oFt}?`{7g(WOJ_X7-k~PS5+<>xHCH3Q2|TTZ+!FpM*b`yr+~b%kkX>CXIxi)-
z|EMT{_yx|+!GZa{V6L%2HAHdpxMmUieh59X8+k<dI=BcDenv*7x9A);X1={Ugqg>t
z_tD|{DYYN7oUXaPtZ#Rvk4JFs<hHok965$$%X#KahxFYR$172`0uuXBn+xQ0z{$ng
zcyj=Y&6wOdr=QXdx%($*gi$0RGY(-GTOTBpD{R(8RCvvSF%jR&t=%0QDF)f1t+nuO
z`NG9c1mrysZ|yLeIH7rs!)NgjZfU>5dymZi+3z8C^Of6XhU9r<VO8s|%Oi@skb)IU
zj)j!!+8)ERsq)L5rtd+x<u{3u+3zmaI=&yy`!n!JCb#Y^haCa>DKbAvz@}Z=8TI06
zxuW$wEo_b5JRNU$i{CF?9M*X~piP(-%n)+EZA&`82Z@{oo@Ooi57&)TfTX0TqWnV2
z27?p}Vfs^jpkfetE`)Z9Ir*`7`fV=JgrBm4f4BNkcSvx(>rUlHqf?|Cn$Ix2EPPjD
zJRo%M>XK;wsjmscco(G2Fc(80L_$x~*Fp2fF*9;KBk80#uxfXa$GOpS30o(r_xZEh
zQE`zqU(SmT=`Qq{BR}l3A0w{Ki)p&>+US4{sNEo0cq-)Ql{lfLw}}KBJ$05GJu*%Z
zgI6>jZ%!L6%|Y4``<(+D_fbRgIvu`ft<z5audhM(Q>(hL5zcSzFrWl2?}_S{k%O3r
zf!T5G*&*VZ*>xuAjx_fqVZl+j@q`eQTNgCMS)k<O$5siPJC);o4bqXXdtXGu5cz?g
z4aPX8pbZ&qxUeM82phA3kt9uMOo4L?kucuFov1bI)wb3|kZ1Aw_9TY()?a-a8y*k!
zY!&X=+{<0Qo*kZ7v@MNdJi26I=rW5{{kl#0<@fE@4=Wl*GrL5AqTt5}>zl?IG;Q|p
zSMBX4c3(S{^Cydh!~qsewIFm(_b)5_>kgLdPOD@-*)eC7t5e}NmW+_Y>NRQ?F;XYe
zi<z_&ll(#`eim&=Am%FAeRn9(NKDo43C~)h?gPfdh3UmgBq~csR7EI=DOr?}Qufq8
zsorCTkSbm23}C*=Gwvn3JqZs}9_R@?Y@2IIE1H(z`Sw>lSE>IDtmZlVB0<mDSY@q@
zL}59=ffFV7K<d(<s4qYVwIf{$DIiYJn^dR$73R+VS*)qo>hE4dE=x}nj?!6<bBj7v
z_meZ=6Fz{mpeGc{7tN>;eZB@heGJ;D)KGXtC|MvE!tBY;%;I}Un^cMu*1b9T^AqO3
zJ$8Wt0@smHRp>=6HzoxFf};Qd68N8PUquZ6^=#xqch&A*1g%Sa4`0Skf;in{bckHa
zvR5Hr0cu?KfZWd7VSndav1tNQ`-=Mjxd2E&ive;L5|LggM#~<0IySwt4Fz9QQWIs%
z>(>zTea>pvE#~pWs7t;(;fy<6f%SF7$6Nc4Sq_G_{e;W#cCT)8?5Pw?J%?TJqpcn{
zF+35v$BQnGn(O9KS3i!qH&RDo!Wg(xzpz?kJRR)jQ|vdhWh6+%$k!gU<;kvEvvlqc
z^l_HgpFo7y;p<~vw0cayCXdaPw}SRjk4Ebo$gHVdzSbdRNpKKtKd)b&&)J5wQ&%_h
zJtf8V6D;9_#I6c|GraHgpj<awy5j{sTAJWR4|pR~WL;F^!dn|~%<p~%M|pMI$NfpL
zeBzb1GhX%9egxgCGo|I`?nmdkpK6gNr-UHBM4=lfXsq0#x0~C>Gvem%jSs|5SK7c`
z-E)2Y)!uHH^)br;JO~7R*c=Cce1l-j(Nt0(k&FIkSahopu|snIdAEo0je9+qYM*%B
zQvfe90q60=!62NPE#P6)ORB+u1*O6iTbFAxdKe8Oi!}4}C+PdfYZo0;;pi(iPC2Bm
zu|RpJ6Nph#>}-o3A+~i>eQ8`DR&$0lxyfAP0zNkacBV&ZtNF$vJH;B;pQHP0k)_db
z`qqO!*kI{k{_c;%>8IS+{WQ$a_rqd8-yd-YtuM=G`?FP-P>}n=o!$Fpm$*~$a02lI
zWg4#aZLxw}vRN1hWi<MF?K)*JiC!TCWAxoOf!3=eq}9NX2V7kW^c@C0cB}=~r~L&E
zoxTznEjLh?zXg0p8m^Pvf^F-owS`W^P$y<=*;h$Or~}dE<ZEHdA*{nGK(nkj+iP{s
zYUQ?1wyKKBnip`Fx@;eV@r^|w#59)1rTZ+FYYA~+b{hr7X<GP;ru%1Auh!bc4C+Lj
zgUds@ZsTh%I9`c`b(Hnmoa&HqO<`~`=@f3se^3~FmmxW2kz{~|(-cjssFBt0Xfi53
zoFjf|y-3xjJAVkqweK*pzmD9k0Xx^8rTw`*k6&=EuXA}^D`#<WS!5l|HTwW8Y^-tx
z;=;+$>F)XxTO7&IdXu_t*LgqmyLg#?d%e}RazBtRiArekgS`>5L(ley?z)a{>*dlp
zG@oO-Q>x=wLBLo9X-ZNU6{&GbN~D7I>=!C`qFcw-9*MD&m<)N<BSz$io=}A%5cU(8
zbD#uEDus5|y3h*=(R3lF&L(a&!uXb!zE<HA?pHu_hIc!h=nskcE^trC8kxFGYO-eH
zPtdTDbHgN^7=g~+fdC~itc_mc1BZ^mwr}bJxi1bD7e4RrA2dARzKgwh!E24HZ`HbV
z9}lDE!}J|r!_|a@ydT(}KRLV(BlerSUXGVB<M^KwO+H^ft%vzLZjMp;vpRRoayP!h
z59)5Kyo(RXGL71>Di3NMoW`4Ig|A_SBNk3Nb0WO|a1LOl?go{3l)8;unO`<>+i3!l
z6o&mJg6gRem7L+NqS3B!my22PkSI9IwF;bAWA4ueg6{kM?Q0*u_uFdm?ykG1tn1H*
zhh<drSw=DAQo<bU-kQ+RuTVx?;=6O{kVJ(_z246h58Yc<$!ZW-&DO#tk}oMoy*>O4
z-1{OoKJ$ae>x}hv^w)DQCvmkuV;H|1VQ!Y^pDuC-4h;piRmZcRu+(CW_KWJ&perB;
zL|dX+P`?qcT;nquxTV3GYLdxIJd}M&m#LMf&FT|}kRX!sE?3A@r3HF%ggz#r!;lL~
zswbwESDA?&+|5a+6*5<&qFsF3t(7r%{B5I0POFP@wv@PBee#2`62`gi#q^d71x-JX
zCd_e14b9`_(68%d_SU&NvA6l_^&l!gp8s{Gc%e(|WEN8?ueoI{V9k+Mq9dj>g1nr)
zC_Q_mV0UJ?y$QB#K<s5@q1Ix4xUkiD_F1FBGgefZAnGWvF4{DP=aLWLt;7$2M_N4k
zaPg<pkFh$blElvf@&%g|<J#xLWTZzuI;rhz^sKr_@!gZcB$0tx#)0e?ayomf_*mMZ
zqf!FdbmF;n3<kv~nUC9&JsU>~A$r0MOG2h5*DTEjP{|BfEya$gRPxsvnCD`#%n}*d
zG~S5&SJU~3@%E=6<?l~-JnwVio7H@nbaV!2mQ^-#ji~J6WCkx$OZFa7Ga}cO<pwX2
z>vfcCGmNO%NR?|j4XN1VO{mxa{bmC+=PDb51pJMZ^GM0{nmdwyC>~22DM@OXLhRTy
zCdr!2zZG#afYfO`nfQR6F{QLDVKPi=;uXmw7G4)@aK7{?v3cZMgpZ4zO}EOKJXZ*y
zuuS$gSS=|KGVUf(XNjj%tgFXZgzZ3s@MtJDPw{r^Cz*F{<PUt8Un#FWfd0TaZ$4~P
z#K?(rbKw^(I*_<`FUfm;f##d1OM|ji%qCkBk(oSSg|OSOGfwX&o+XA!0`WQA)jStJ
z?di2}OZ_=U**$rQ`}DeN-dERqIe)URdOknQi`DbY`awnB)xV$Cb!X_4bQ*8Ym`CnT
zn2^^q`uy}Zjo10AgN7pmJ^FqgmKV$C*Xvp?>JX3?p!zb7J51<{Hkd#s)>Lcds(0qK
zo1fK7-;QVZAOQ5lFSC*Md!S?AH+EZ7K;@TS*i~T3`f{tCjTY}6vNx1+t~y;X6b5$1
z{@r*SzsLJYmU=9~7pv-E;(95=H`{8H1&)nW3HN}vPAALhi?n9^{a!LdPvv|}bpBG|
zK3I*aJOi?+t$5Q!b^guTNBq=d-TL<rx$PCh){C)m+?6WU_PaZ=cHY$Cs*VmvKk4QZ
zwOH-GdA*nZP~&=%r@6_-K!Wx(yDN?nSNc&vuq3Kb1>fey!i2iFQbJf(i+tI<PELJ?
zV{W0Ul?xeX;wU?w(Na*O+%-bCR(+hL5b<Fs<-ZTqcW!iGv}bP7_FTt=bvaHJh+k_7
zaZvpwcju=R^VY`7#>EmUNOYs!piPhAhUd+L)P%4KzrpB@{*=T8s>;!Ix1&M9ts0hN
zE4?i_TR-)qd9#hna{o#&YHPl@KyX_zc&^xRj*d2gdwh%ZrLQQnTEEM=b)Gyw%uSL(
zY=J8~QE;E=d+=jVC&>qt{bLlOl17Fb@}rN^ukal(XgVcF1Hfb8(Z&&0MmY6vu@^Dx
zc5RgtZyLy0dM1u=j$|Ky?i-}a@{Q6BDhh{oo1QyM2}P0@#v`aHX#=FrO7^9s?tcPM
z_)jDzC#MdlBp(d{keiSgdc+>obf`SnQ8`&sROXSJ?DCRZub|}FmPqBSqJ*yew>6fL
ztTI(zG{B&vC?k0YM#lU4(*6@MPqw^>RRs<;`uvw;3$5=pw%4D6h3QCZO6owPGt+^^
zWOR|kWK*#R0KijB$tkHo2gp)Phgnn1@)q|kEz0V77>|?}Hzp^^%Uy5rM$eqyLhIvI
zP1`D#j=q<>%BZEB)|Htgs*+V#p!7S4GHR-#n7Eq$RF$SKgIB>sjm`p`wbEcVf!H;M
zFGK6+1X`o&{@K_#NX)}{5X-QF?L*Wl8U3y5GW|mm-tJhn{uIjYTmb&UCAr6M>Ji`H
zSv$oF8JwZ!jztu+d?T_UW3(Kgc2p{Sk7M%M%@nnqvT~A7N8~&8&D>du?1Mt1jAZJi
z)Skw%Qd<MbIyqGbR^(*r_f(vKDM3?qa?MO^e`E=_Q@y@QolK~8Uu8{b4>FrWx?(fE
zl@l^*6<OqOs3HV~uBI>CI!~atPtITlJXe#WQ%j5r(mcAYCO8{wSVtJH?vOJ|?NsQ6
z!$s^*z~$rcY&H~WM(SwUJnqV>b0@0p4AQFMM|yRFexrkm#*9|dHx#U{C@!|#hIE9x
z+pO7Q@PzbVOzl7z*}FTdfb!iW{V`nqEcT;Cny6y!G_=`vQ{HaHdZgJ5t~@Mj?sc#?
zU1Zj~O{r|A>&3BGtGa__6HEe$eVr)72Ax7vC}pptxxLl;8}n#-xvs(3bxwK#H)<~B
zkLMjR>u(|Zr&*3GM_$JKtI<3q4pH2Xq2Dw47J_M(o^nh`AB#YT{K{*SY<dWM{d+@W
zT%vdpfrGf+y~Bb1I6%zYUpz;Lu7pu*+T*?<qf*Prt_wx15{k<VwMdGCctC@W1JM{8
zfcvAvRe;n)23P~>^!K;|RT=L<0I@STp!#QFwSf1~!qKP_Q>&s8kRY2XCKBTvDk>4-
znJOs(T1sVt9AhOaVGhaizkzqZ|5QTlQ<N*l2>w|y7O#qJs+tNQsv>M=e=n~C*##6Z
zfWisBPf_iV>n{f$N?bD~3n{jas`)Q5pn~dqc_bKs6A1?>q$FGv)zHxa>=YaTo5~fy
zR>c9Z%UFm3Y)inY%V0EB71dOs0UTBAzXdp;Se(hC94pfba!6KfL;&bmf&T3z2S}9B
z0wgL0)vQr9OwA>rKwr5Zd$SK;=>|q)1H8E}Vcs}Yk>7<;cGy$dsV@Y(_a3O$I5>`k
zRzQ~3`%w~nO*TmKgvNH2K~CbUo+3wDMCN7&<f^QjtK3-b4lUgY-sOcP$#L1~?5(JC
zxUV-g9?awXkffM8KB^8~FQ>e@t<T5VJyHv%1tps<4<FjqKG^mNgGBBWbG()=K0{?~
z5XOt=P`IIo@DhCzAJ5U$J&xLH?KSr9USAViL_MQ_7#!4J&FY$UlQMiUGrE!{7eId`
zx9+Zxwp(i-7F!a;j?@{UTU-cxkrbyW{U-SqTejzJ6VXnma10)ovB1<qhrws2l!d`O
z3M|-gtz%5yNMgo>VTu_S#1dp{>UMYp-ad9QHVMm?vYL{GxvC6d*_>@p*`8Kfw~9ni
zol#?HJ!Ke0Y;Rp}OM}K3{XEoH!5FR8784>GYq-EP#9(#I8On%~hNa4uiTO{Y71=br
zM<>&=Y{6+I$*<luv1QevGlsO(P2wo0E3IO1mMDy4DgVkjPw%rxHc(mDFjLt8U{k{^
zu|u&(leaZQEa%XWDzE3z&W<gFy6?>)B#X6!zPOLp$s;e7u|uBwY4^u`|Gf;B&oD}X
z(*LEL^SHqufg%3bX`fdcjBqxUgEz{`;+fjIvf<JMo8IN(w7$`i%F#L4;iNUb$yNiK
zChm3Cs@mbaOb$G5U@Gl`%6&tGm^O{FV(tgF!okTOB0%y722{D&e=7(AB7e;>Al9c|
zkd<9vE3^L}Tax@Y7a3}y;mDcVdu*;Fd=tQa^G#DU#PdTY7Jk2GMDx};2KD|-C)%Rc
zVh4tMAr^0As-yf*p^!7gQn+cnIy<k+`~mvYOJ$`sHGB0I<Kn%#(cUqaT8Ol;pWJ}!
zkG4bg*25e5FqsGcq0QWeu!zqoYE1UBA#Db1V{4xB(JgVx`lkdi)sUPx${@GGThMP!
zq;)+K2s#EVAAULp=2#m$v?<ZV2obO{Q(Zl&*U<De$+f7nm)dR31e%5{uyl->x7}#9
zFShj44FgKoj1+W?WcMhfS!TOrsaE$~ZP$bD6st`4%_OU=^gquh=}FQG5{YSFrYk$C
z<!z_!N(R%s_NVHpny%w7x$SeEZ1+5yN*hv+`6tCO#cC^`2sf5~dQHSENl;<Si{M00
z;1Hh>iy(?q?4aM7bl<?EcNN^9;o`U}cavr37+Y)%b_#)keid$Ie+cehc{)MNMqROu
zJJZke^lmlQoy1i~U3_7?Gjsb5ZQk#`y!cg>FuOiRw`cJ30@#lC@BGX2np|!}n-h9D
zj!!ymE*s#YQeXDt=QO(P`*vpClP%gDwhE<_Em`x%%vV!8RS6+xUiL9x`Iq%t&z3O!
zvZE=w2EB6>dw#9f#SUF)Q)&07KBpHDeukaKC8;m<cYQbfMsWn&U<J3`cKq9<IUd?y
z`~5j`C)OpNh)iQohkx^$$CSCfm2dCV#q|VPF8g=*%`O}4jSc$rx(B4mEe9sNG7;Kz
zpS4mHMU<X#NMogxp4wTm%8{T^4zd{!J%xCgbt7Szj;14C(a6m@@1QYq63R|_Yf17d
zPVDSiWoThwyJbx0#DbhErU{5}du#CzCq#CwCt*-I@g)<!3$lEU8J(M}DkU67km?zl
zaVw(*Oi?}?2+NTbkk=05dr$;6+}{sqCmQKlT0@hzNFzBv`vx!}AKx+Eqa*Ll0f&Nz
z<L873pn!wKJf227o`xEHVFnyuPxt0M;zN5hnIs3My+V3m#LhkAzGu_b=7cwMascEa
z-OTY7_@}uc-!Pe%+H-)J@*5hP`yo_q0dC6C4lRhD1LQRisNUKsUdJ)%PH_(RPO&an
zM?6w8oVzEV?CAQMO{Nl9$4(~Gw0~N1rV}5C-dZbwF4_YdAuxJ(68~?v0GPg|Y=U`*
zthg*Y4sg1wf1DBpEcZelo+l%#Wdh*hsFVRhRLp;csGR>@NIKL%?QsH_{*oEW!!nJ6
zHiKm6kRR)&Zacw0COE(pD3!4Wqz48<4OnBahZU&GaEA+Mnb85%9~Y|yx<?jn17rsS
zBDE|&g$f2SA-wMUC{pa*cS@vKCd%JPu}+kWfB>#sCd@Hby5R4StoR#x_j{=lEFkcj
zj+8~$QAz&|@?myz$*P(GfViv~0w`J`{$>OC0L~%A-)unkZ#JO)H@*v~p(m?~1_C&u
zp@4$yTN@xH_?tUO{mmUx{^kx;e{%=b%)ji0zqvz5McMcAvcI`Q+27ou>~FeZbux)&
zs#^IsPtXFSD5{Ns6s6n>kfNw9{!LMqh{`DlZszDf^dkM!?s0F7_)R!+1kd8C&2g@U
z-r5qVHbRJlEHHCfzYH+dF2C59$cW8Mc0NNQVLGpD>qYFdiXrT*YIG@c0<Ssd%7Z@&
zdhvLM01J9jUT0u($9L~#U~<Fl=?p(7#>H+g1To8SFNMM?6r0XxX5!CIl0fzdD<(xI
zm#HJn167dD0ct5=rI5>s0wK`J-9z_`lE}dl`t`Gr%Rj?2>pY)i1rwzT<X8lbqsrz!
z_ACD~*331(gI2jZGE@FVk`Af<>jmuIMDbTh+@YaR5=C+tHl4>eL;^@=s81L}@Po&u
z4;v@&S(Y!BVr!?o(xIyf*?u#7cQ!_9qfiINEcpoq3`Xtec;XUCPm<7dLu7_zDua=S
zrYR))12u=TU7@aHmM*PGg95)*PIr8YK%&S`7~+ES*?Xu22??a35lSJDZy-qYw;weG
zVD3Ffk1oxVa4Jw-^)W6hYdKr>4~RoT^!i^u2fOF|_16JE`ZNTfUv&J@A*g%C3_w?~
zE`Yd$P<tYJ@q6%ty#2i)5P=Zk2!IK&X}BBeem={PG=7idc=#U5!Acp+;YtbZXr;_G
z@LT>Axm3(lAe$=%+0jaMwoIv<DqOj|3;-(t&H%_nDphL~&emEa01zMteyidmm#V>6
z;xt+Xax_{+0uTy7EC2w>MS!I0Ie=g*kge4SkX)QCQ!b|i$W#Gf2f!5oxd6#dfaC)}
za`CSuAz%cmR;N)FOJ}86C0gTLnN@M3-l_28`Mv&i%HwM1+~<>?rC*MoC1K}WhT3ue
zDfwf+>{W>$=L;hL(d*2PSlge5Ht!RQ#AjZYesaq^cf`&Ja!dWSZ<oy*-!`3qCgt=P
zP{tq>PAy$QzqgU{`Qx~WXMkFuZq9Z!aIe|7akm|UW#V@pv?taftN7?_!bR4FPv?i4
zDjvbDiD)*^(?&gJ(MR$5oEzD3L{5F-(qV8<nkjv>y7p5_5%Xo^qzYy9TcQ@vbTy!@
ziBl%)!~FO~8^X8Ih4$)e&Y4C~Jj1U6^TWR%>VL2Ka+|G>E2N0bRYm80x}v@G<TLF)
z_<YDcj^Dh;^S$;&SU&Ycn7z+F)#1yzlIGt$fOttu`nu^amWRKJk(MuSr;W`G+s0tO
z@I>%z9?UxNL@4H+HXP@jriGljH~=RtumMWRRb%%rJl+NUWjLM0>CZNMk0<4w+h5|H
zt1XwmIxF2pO^GWwIJ`KSf8zNJXSH%~GL<j;hbL?<_qgUI_jtb9>oD}^$$R&%k@~z1
z`C^_ndp1C=|My?D?0>2W|Ka&^n|5yTJMxnTG!3TjPmfU{h4?THLV96pm{x$;Ah>&`
zcEB8r93UNrcL;WJdqI0ZgT(#CA;u9ZFTV37Nzg`;$ni!J%gIKP%IQi8Wv?Y8IG!nc
z4g6NbMk<vv70K38Z75qPgV|dsqXGa204@N?0Zae#uX%|B%nKM`UgCfb;c~IcOd`3;
zOcDTy0U(vD)Di+%69T|k0FtV>fDyI;N!Nz6g)&%x3^f3_0B{390U%ueH7|hV13+>S
zAh{T<Rt=bu!sCcs^LpOtVaz;zUcaP|*f)0P+|un_k7VWh>>kRa-fqjSyKKI*udF+r
zQzj3B@s5}N>4+_s77#k#%Bwy0IXvIn^>34&uRE*F)jvF+x~%D)<@QU6COCPUU+Ipe
z=1tVPXrABcvdD`|7iE)9Y@S&x=T>Pl$gQVs<dh5Y>;CdajsQH2TACNP0-J0!LUnfe
z!i?SfB1z_YliUj449>}rK%=8S8)HEk)UrwSFQZveFOv1ON`7{mJ`ooo(`n?Z<B2bI
zk7tK06flKp^Ukv!2Q2jSx(1$iOuT;cd*F1BW_>^1Um(5H*fnZ-Q2zJvje3Jjo!`U;
zP>{!)NK@%o?JNDbjX00QXoj~*QukF!QjJAuVyfMaHAmC<-*=9rgJ3u3=Fh4eNsV@w
zTP^`#Z?Rrs04l=)r|9rQZMC|c`*xemWPo|ek{IpI7wHZpa>_O#)#AaD{*|)V@6@=v
z6k6q=<g2pF6&dI|mTV6vbI!FPHsZtpoHSg+ci@{o-O#tmAt`_tyeA{U;L~3drOCKA
zg+(5(Wia9t8%V^j_4ysG(Y3*2#JTnL!7n93^JOq_ci7s)+-Cr;fo%hX8-#CQ?f}BU
z*aF&O?11Pny#u@x&`a7w8e|%#=7yFhS%e{qTuLyAR7yUGTuMhqEN3ef#_>SOySMNQ
zE?l{k31A{rTB=s6-~ih}2LK)bd;m}Zmf!{mG;09cIrHaeEF%SU6sZ1GlLeTDEFjoS
z0_sUXO$#tEtuR3B0!Ws@14gg`B)PO)trh{2ivY<*faD@Ta`CUEJAkkSkbDJ5o&hAS
zgv!-pHDZx#MF#3d!w)Ch+tsJxFAP2ZTwPrz+Zn#Z=G>*^`PsDxn7*dh`V~Kf*qw?c
z*I91>W`@q5RChP6x$$)D=Wr?gWNWuy%aMaA4y&|#wT%4WQA$X=!q|}nAY3_rD@5lL
zxB8h9;%qWGI>v&WYNwl#8<|5botB>rpSZVwMlN|k<&(H@L<LJRnrWP3Nlvrb%*2bn
zt_IVbn+%`)>U>Tv9Zcm@w-5?ojAt^ZSc=hXHUJpjY8Hh|n}1U5G&6F$c4Jdk2RG$s
zYxNKHWt5G&$K*L4%d`89yT{0Q0FB{)Hgx*_)lhHMKYX(`v{8>>FkLqsdv!0Dxh{68
zA9KG*V<^4^JPb7+l1o{_Y$?{38>_PY>+dUK7((=ynqZWf{7M}@49DhvP|YjX%9`%_
zCe?8&d1-CpMKFX+C#V@p9pP#ErPsM6jr~!%P}FQ&DYA+G>ntQmWOkE^RMQhVC6@?G
zXf_J~SAnYn!=CZ4>!kFlYXIm|jKB6L7q2Uqlp489*`+JBaGH9(hI%WTVY>5+4o@Zf
zG0H^bP}VYs?A0<K(hzVf`}Wl`lev{_ME&hO^xMw3`)FifD-lVrt79;=%yeq5a%T2c
zzH0I^yOQH9*k(q5Z@0csXnkv`6)%2hv^zCRsvG}1uT>7D>bvSKl};%W+q61<RZi@7
zV{X4Uc(LD9Fzh%evnT+*aWZK{?U~0irP5?7>A{@ZUAe%fbZj%JR^9ZpFsUv;36Ot?
zMEHcrC#$_k9f@fAb=@`QI4@fgK@^@;)2I*$>=DC&p&<*gpiz>5k%5aAiHJzyJOhbH
zPCqH$U`|y09MD_!;Bh0!(t!~edluwrt1y?NI}e=F4iWFu7d>?@L`{8ny+?z<lGZVl
zGNcg-(e#TBaTPkQ?IYc-CmGOe;YvSl>|>_cv>&AU(+Y{WogzD+z0=Nw7<wH^kJm+A
z;P71a+`rq70uy#E_5Gh6!F{{!ARXWyQCRlB%S>8|X}73-_|adh7YYbkOp*C$c<4Jc
zq%gf3ufDgTRJ%2H^wI64dKfmNZIHbC7;*1l<PgHf1ye{DN=M4cH<TZqLhq!u<R%Ad
z2YbySw1^&$1Ag0NqE%`kD%yjSXCz1qS=IOA9gKp)22i`%m--tCkB0A^N-lkg-FCTs
zKz0$-GL$W%zZfq4wO#mVc~JCdDIKI!^<k%LT&6L~XO0PYI<(o4?E>6kJG2XTZ|rVE
z``b+k;I1(|npJK9-Q#ZF&40KU?14AuoZ3uT(!;MS$^*69f+T^=YK7qjjC|=~s%L!8
zfh$?s-(?JDUKUftUa{%zU9Y`+`<Cn~4N819@HNbTC}hCod47y_*ljV~TNTZiZ@X1)
zzKnaNox`Fl;C$-?W9icu;FhGzM^@fjnhw?xs!x!XeYBO%K!1#(1V(uq>`msBmCu;^
znZ?w%<Xo@J?&G<|l|i|Ttx_7@LX0JoQGbwp%Cpf*NqR=hhD)#J9X)q=v*(k=RH`#9
zp2N8(h8QCdL@~Fs3u&UO9|rO1>-X;SgRU)&*?TJ|m(q(Jccs0+CNr);m`-of!{}BN
z8`Lzqk=i)Dz014xQKy8~lo>`MI^mDiC*g?6N>NVMGBEGvO-4p{2Y(lSEV;e+gA}~Q
zXpSGm*hTA#JZb`06*47h^ZqAyr!|4f*jggG2L9{}eqlxS&U0+ZoTjd}52E~dn0Qa(
z<nxT&<l|*EHgDrE(<k`K16>Uvg^aJyE4GXGLVLe|e}RV-@V_ajQ7G0A2p}L-JRl&+
z|LF@nqBf?Ic7VS)Ia#{=>rI|Z&Gl+nK`g(tXF@T3o8OeK5!OHDsHu)QII85CHgo2g
zW!$aZFk&PIXu+Tb2grhva&-cOce)D>N4s~jR<AlQIq9IGlbqYynY*vKwx1@aY_ihB
zB$7zxEe+rDEsedRGjm<Qa*3M;e`~P&ZM}O|EV>0p2iQ<$;%~SiaHTh3S2=1mli9+M
zb7xUnuNh}6YFEL2ufO=ACC%jli%dIgX6Cwl0K`*Y+Uh=GWiVe`s)@S%;M~YqLMV>x
zk?6=iaIGdU`3!jRhtLJhToBZnvDQ``WfTwhntQ03D<(XYyE4=nN}Z!RyaX1eMahGF
zB{9@LArS_*-N$QCkf+#}G@LZEAU41)3j)#l$%bSud-aMzyNy%<hr!4vOkC8Q!j(5y
zsMWUj;;4a$)@uPdtOhnyS=?<6EshhY{x@%?&>MD5wz6_7t%Hk%b37h#i|7H|)<CAJ
zRUO9edE!qLywKA8uz9KkmwHm5yn$yU4EPh31Vb+&|3VK;>)B1VBrRXZ*}|9m8IlF>
zmoE3WiP9%b?`wL$HwWC;_s^JtB<5Iw;SPk_EZ=2hDjfz8+J5O<rS5SwG#908MN7-y
zDmscfO?b50t!}G0ta{n}_CIqCTS5_n-fWU5@|GWQvNJ{w23!?+Oo=9D9E+I(A+C5q
zKxSF$p~Z28!Pod&o15+h8tclP^4r=&+45P-mtsnOEucQnoh=GOp-={Dyjy~aCI@GJ
z^THEiE)pT)YT-Yqo0S(P6;DD~-=nahyY7GO;@x9_g%`u|JTzXgKeZ5^|1<@yJDr{Q
zm2fVg&BRzcP&boGYpq?`Sd}$i9rYZ8EN2@9WdgyD+sC(2REOXwV3UO7NWu)%qJm=v
zXB%AfW}TAr0)oTC!PsiMoLca6aqJT`DGTvApKKh);`bN3N>I4{51$S`Rotu%HSl){
zW@&ySb4o)C%cA1q*^*SV+Qx<sf3+&bFHrQ1@=j$XbZ#&<=-<*kp}zSBKO`qILHsvC
zM}Qd<Tat@nPlhw7mxnP%n5?+PfBW}*>wybzf{YXUWmG^<TLqcLhEXKNVrEyln2Jw&
zkUo9>9-gWHLjK*6S5P}X8M!IGsohSVVJai5;S21bP&%js*DghYS~=baomfKLc<keQ
zq*m=p=hyT2eOMm9-kZ;^)Aj!1w7LEdFYj9KU6ZG)kgc5ZO?FK0(k(`7e*r(bv2f-r
zAxH^aHE)NV6-WOiTGDE+<V8zY5Irv;>w#>>^rA|#!<nsLgA=06vz_)%J}imIjT|A7
z8*RnllfbP>D0VbCpfzWT#*<~hJ)au}Mw(*L<S{(J`1N3M(-u_;%v8`&QN;owA4VV+
zcB?mWO0>9Xz>^nZU)<QrhF@A;J=BZ(X$%gx_V3O57H9C!uOC-0)LdwY8VvNCxb$sl
zdEotn1Ls<7ONr+)UZONb7_A-{rkVk3_29NdI}DHpc4cgOxa;6=tcZAZtM!$gB4e~9
zactMw*#ZfYCns<=I`JywHlCnb>DqW!Ega2Az0~>qO?q(wRlO3*9D2B{TqB5EIx<Ns
zC6d4AyVv7=M2EuA$NX<wkO%jU#m&9cryjQS&$rs&9;RB8m5nNH(a@vYOb^b=^DGj0
zSkFIm&M8uBRrGzRNHq^;Zm2LFr_tIRzK@OnAEdowkYrugCS10yF5B+1ZQHhO+qT(d
z+vu{pY@^He<b6Ny%sVmPpD$)2GBVD(u7#bE8E2ndd#|-ygVR#x?Pn*yHk~f53M{#~
zDkNFz=~nVX(HsvsK3Uc{pvcoE{WL0S6ISpCd-~}rAzFz@<l^Hf8MSa5#?58oj_(gz
zuBLzI=Wo4xUD#ysuVL8qvC5aGJxMp;vo*`uUNrKg#a$yyn6B2nPlR{Q>Mi;3&mh-H
zXD?gDf&CgLYs(FWk~is8N&41!jlM-v@fuvFU7psOhk9T0QZw}L%~BmLNaDtr#tb@<
zl>Zgy=cv4FD!uVN@zmG&nK@BLF@RZ+(>HxEZiV6HkI*8DSxitDV|k!#KiwzocNTs$
zTUqdBF`@?EuJr9aX@C8;$WYGzMs)wWR(ch?vXv~~%j3b-j`VKsyw<ikVA=v?ewHB5
zTs^Sn3rz_t{+yOw-9PU^tol;j6$ia=rHr9KC@Az52Hu~mh&1BHVVK~*7~^E^rZhs(
z##@0v&4|EAqpr|-7R*Y6YR9+22mF!<X~CZ-en1y5c5_}}u)Kq$fa}*J9eA~M$YiHj
z7-uB7Vt|`LbE-*QuzSPnm&2|)$Byy#t3-5^&#pl1ub;3FSe0nKppF$OVpa>$CsAq{
zA?2}niUVm_e_5**cPqDp+$NJ#NB5h<E;Hua9_I^6@b97-N3Rek9c+TxgD_@Z7T?4P
zUqtM;pWv|jDkmm6B4?et91Bdj4tI@bnOV@&1$ILd<l=9|37`Zq&A*T+F`&4C)g_*<
z|9g%_1<bLYuvVKCfUZd@us}dk{||HQ|F^s|Rc$(MkrAo4uKC*FF$K_M2}J0Fwy3#)
z&Wg%NFlcc?woDgur53NeStv&U1UitzK}aG37X@-SmEe|HpyL)MCbvxT4br1clIMQf
z<QUgGhY0qn5kElyzTz)r(jZpQDy1x9CLH*w^M>|@whyDq`k?@di@i|zuR2OxCofF_
zZ5aAJ2o?u$5BX&<NXr>pcKFz$Ox;g2Z}7ay+KAtV;Sf@8p7HFP-P@HNXXL@F4#?BD
zZGWqw2;#vnX)ZK{v*=BgsE6RxleY1rt9~V~L9v}ybTw0ps6G?J5i)ZjBvg?>#lTxg
zlFak2mA^k_38q|48_N`THEUf$bq>ooc<4G>7Qs_OQl1wV9yhN1u>pEc>6IplflkSU
z3tUDUG*K$(kj;<9V#DIv5|0e%tSMap4XfZ8MV5}QMq0-KZ&*If*ggbpC-b}u%Ow$S
zZ5u;o{(SL#JD-1^l`qfF|NOdxF^&8nj-D=DFu{}0_)AuVd<s=15VvUjpg|17Y9O=B
zQi)fk;wE>6$1fU}&*gpI{O8)nUe`tEz&DSOk732y+ZxLq3{iqm11)jzd?YIQo!u-5
z6dSKF#-+m~2rV6dZzQ#SnOxg%nKZkmL8C1ls#<aCQ%44)T0JN<<SD5|mztto^NwUh
zxDnz!l@8j39b*ObjJ!>kcyBvtnMT$D&$cBljA(6xn;R=9wn*t!=eTYZY%IYNr3A6d
z8T&HO(x5a0u7462oQe?S0GzY==g%JJ4zJ?B$$uu)-q)vlTGqWDX9V9T1VOmGHYt85
zeYYT+_~A~Q8Gk#~_}0X|#9FF-QOrsa%}<QV&}1vue2}e7K<DRh8T-?KzOMK@$J%m$
zIWLUbE^Ms{6<(=TWPuxO(@Y^Z%(pkLcaD=d_c~<g5Q3PVns1FZ#GNzl19Q0Fw|{Cv
znL-+bp`RzS7Gl&>E;9=J%=3-y%g`2XZ5NQmI0|;jC*MK}zl>nm`S7_jdb``I3)csH
zA2K`sFSl=74~uPQ_rLqLd!-GzL&XyRZXR(gEAAdNgbd?kFMNWJqAV~V!F#}j&D%(;
zx0oe&^UVf4p8ayl1P{mm$;ja~&@n9*4R4;tC%I#w!Qk5WyGR(e!EOb&mD?9;3fv}|
zaIi01>)Qp(_#IkT7STiF&elaU6L+r~XHBAe7B2PRN`S;O(^BlTv4Puld`{OrdMlUf
ztTZDUso8oQ68yOqk54jw{G)aKS(o{Xwsj=^m=8*V;<-C}We#b@He7TUJ)TNjtf=u-
z!ACKWu`!70*FZpXzQ_tXJ|1eF3iU=Y-#+q$W1ip0oEEvwAQV^)d$#F%11aqv8d%@a
z)RS7+dKW__j4-|JVI@ypnqm;Ls8G*@Y}%z^&i-21b(_Nx1|n44rn|-d<1XCmCq(yG
zg8#l9{nIMJCp*yD2@(kC4bU{`|GKXM;E~_h#mUlG*zlkJDF5~~sL|An2i%PO#P|6#
zx)X#h=p&?c_O*sVj@H2kP@PcSv&k^yV6_pT!S;~|5dx8*0tF-@Fn0sBZ_JU7JoXtF
zTeF)ivoYYTP`u50XY+1fH1e^2kI{;Tofx>!I56dwi$#0G{fx9;PpQ#vH`oK2yyYE5
zX8l<>-PEwh1jFAd3vcI1zm3y_f0))&n=b~7bDNTx6j?~uX4rN-%{A5uZ;c^8er@|$
zbLSio)Ql@~2RWjy<>R+K>a3^R2<06XdEu2K@fCh@nXAXU+`wCY^<ya8)|(|8K0u&f
zb27m247u<=hZz&n&3FVa52LRk;<uS`9QpGN#$fC*->j1-qkt4l$p&b?=9Nt_a(Ldu
zDia<M<)a5+*W&}>u~H@S*;FDbnDcH}dEsc;22}Y5?=ez>)T9Q&i1HlozFAgEQ`({G
zazs3Z?#w!8?4YMuG!tQndH;*x$^;u6s8l2>MBHx>$-YjL@j-A4=(~8xyVv`xE`7}2
zuU?;~`@c*dU+vGwzhl*NPcZ$rJ44cBU21jSd{4&Xs~G%vd%ivoI`sARp~))SBbz-I
zjmH>q&o@Gl1tuxd80u;(YB5y*gu=2*`VX++2zy*Vz7B%>RoQ7nFx#MjStucyr8T5R
zWC)gn+k=7YxCjNX(x$IcqQ{I$g_`-ta%`4LePEy2C>8#)w#3nrWOL8VyP;(fR$+kt
zRiWKz7zol7$WEA^_t$cvg*`>8MvY0f+4#5CZ%te<ElXV+IG_q^lrX{=EKEH}Wka&O
zQXTLNLDxd`vyuIbj52(xrLrfyoJ`u{iKs}@306#J0jfY>!Wi5r0~5&lVN{0@BLu;h
zA2JNfm1>1O>6@+7;&E47e$B1!vr}<Srm_rzfr(|1=skyC@2;B=Y;*;K)<_NT$DCu&
za!PJ!M(G8~vKe;~uur)2M(}j1B*5~vOhGYaS<6-A0V?qLEL6getu}v9Ox(4B^$}4$
zdx98>dmcG~w%d`{=7QKugw-7Q1%lJ2U3W8&?b#CYX1-Tpo;-XOZauXzm!-DmqG5qR
z<D|_iK<l>pHw1&q44Rqlh8!Bxa1}=Pnyigkj7#W-y=%teT<_!bVAL6SCj{msk6V1|
z`$}srFv{hiRe^x@M4nx3e<I~Ew<uwgxwKQv^_P?FT}c|TKDHZMue{Oal_LKX$0;C|
zNlz5^F_Z%e7gn>uYX^;5u<v9=(vmX3yiaFE>#A-8GA|hd38e+f)_{zEB;rD-Rz})Z
zXmha?>q`#`#R%+0!BuebqIqMdBG-(d*)mRDjy1K^nkuTMQxTjDTidv-9Ool}(Dg~_
z99C%_gH{jHZ1<VYii{*~J@kpI5j`BOr-0B<+E{Jja>;p*QwTicOb{eHUx8@00zuhm
zObs0qX&`sU;q9)d5Vd9@3NU?S?M{aY4zVfyRo@id>RRv8E&5kr<%vy_5aMeJJB0@M
zI5d!WSKO~z%uw3Ms+cL5*e8G}(F7~axL$bJZeW;ZKfOLjbP2)YJFY6=z0PDhlL;y=
zLa)Y6kN4y2jM{1ye~%wO_kzcNp7Yt1m1HBdmUOcjq*>6{IKMt%LY<fUrXHr^1#cP>
zIW3F$a}LFmkh}Ujh*n2mlbuK!)XaR<5P5X`En{=6fsqj3C_>RQ9uo_+LgYu?u<nmc
z70274BJhzS_=L?eA;f4#0$Zr6Kl%E6?%SJkdA%6)ShcXcFZ`r7_87{eJZ0AWSAE~U
z-<Ngn1Y8WYpMGy0_pis-U5I`?exE0ko}Q%G$%w4z)iWx&s@{A1?^R>^ubFI)!U5-z
z&+y|Iv<P6X8fgy?M2aB~t#-*{@Q-Px*?U%7UG>Lw&luv?2N~zwdt`{+;D4hJLK%AJ
z!t82<CFhKm0yWF5Z-I{~ht2shfo-}m`NTF%U4m9Uvv;RBVAmd)bxb@T$z<isNGgIf
zRYYx|c+Q2^LeVJ%S_V+ZOwsg`cF)FZyq|5d@q-17qCx%`+i{`sIxM(FuODX!vp|H=
zV|FAxymZc+Tkz-lGLsu#{}NDkE^J#uO_rXx=<s~7(OVC0DUt7EF}HwbCOb*X1ER$T
zv4X^xU*AkNKn;n?sq~(4cD~~Q{1_cUBII10gXLXdTDrQ$)}4l!)ur<DP=Qs&H0KvO
z2O~KGxxB6tPUsRF_cJrNOz8xT+=Hm^>dB-K>ZU&7F^@ZcR<2shyyeYTYqr{+fifi>
zFyVpG>pw-02(avBMJ&D~QO-1oBPtkC*hP2#6ykAIF3|~OAA`VRUPIACfR8s0)s0^0
z)^T=`lyx%<Su`DLti%Qj4Q8_z=lw}6aZI8GY+o`6VdrUb*slyedjs0KFrf_rW9wst
zTFhXmpprilGC9YP(GYEJOF5y~;ULVUaxXF7_4AlEmAxfLV`ajMa)L<mMecBEed%gT
zS<&c+Av$L?Tw=){h|zXI@9HGc`U(?Tbl;qVhEuFDOUzi;;a>Ld7nUcHuhE~K7oTod
zcE|qvz3P{9ef}RG_ebU}D^ZEVeW&PtUm*WIucrcP@lak;BeC#-fVhx=fyDlA|7OTo
z+FH8&?;T|R>blzxiJ*NGL|z+E14D--+>cQz%%_2bV}VOyf2-JCw1%-#Nor|@4R0&|
zC3`}`ZAgD%oEy;h0k`Aei`RDBs#j{^eE;x%zS{D*-g3U`JgVK?uk{|4a&KDi@GMn+
zbn8jI6l_!9a^SAAt#jY5EYI<Z>g)J(36BM(YvacKr{-!}*JbMradW1C>ly(<ug*EP
z?dmcwy-f4b?E}58)7ARV)?HQl`;Tj*S^ev&R^K|7ggvV4KZ0#sJGO0YkbZ3}*H4?%
z(HON#$+oUl>X#lpt$k-K<d&9H9_8A+(V%zS)|Z!Ce@to5v-<Qx55J0zG@WQjRtF#P
z_RWvm(l@?fD!XE!Bv-G(Won1q9bc~Oy1bk*)yq%zxZu0D1Ruk;o=mrnq<fyyR#1n+
zd$e4+bFcbGY_S!Xv)tUBJG`Y`JGb(#YM#v<pPyRQ6-Y`6BN)zatonM)c653${Fx=%
z+VG>$T7kZq&Ni^!>l>MN9=U^i!9;<QPSowadwQ(9zudG#ggh_n`OrK=yU<y2hMwEJ
z{LFpfT~pn)+uWsF;z=JngL~-exHd%V5pbH7U>0JbHtf7<+A}5jtrT>)`!j`IBKp?0
z9IHx-=U>jeox5nZG3cLo5caibi`^5sZ|JX{*tY~x4(z>DCCF{}k!uDtb7Xj?)LOlH
zNnKrm=k-@^JDPcUUc<8jAO(!aoqvX3E?g=S&GKGUE6X#@FeCJRoZY0p`+uJ`4CUv&
z+@Gi`;7|9>ZQ<Lvc#mE^<!xw|Yg(v1D}rJbXjLs+EW=QH@9w=}n@zLMy3T;ZgRUm0
z#pdUGpHpEb2}Ui{BhI^e736zOU}XLpmD;#`j-70{YlldUDT{Q3tgQ?5Q#iRS;4z-Q
zZnq_2*M;Y2_Z&f!iAF+kqbZQIkS+evhgeBp;@rtPAE)xE#Pvuqfrc8<zWAsf>uQe#
zqe+b$9IN--+KWtJso@m-Rp9jid9s+uW!gL+>liqHYsXUN&Fdb|lS7?KBl50G@8PxW
zS>1jZz_#pwl2DqLM*cK6%c-v8ICK8X@vJmCJ3IOFON3KtyL#h^tIBRx16xlA=~y+f
z+U2H>P!U@(qUNbb(2^{OKD6ZLjI6$LE!Ic4x{mA7VCi5vrtD6;%byWxG#7*lEVehA
zYG4{nJwMKFH@l}_Gz>x>l^JFjoYNTvWhzR_^uH<-{xnmEEe`r`Mx9PbL*@jUoWqZi
z_7P%HswNG4!Gk7j;yHyRpkymq{e3O)45=uFz)UW{HCi{01uO-WE)rAsoIjtiw?TN9
z7UVc(PEiA@qF7vdAFAvKb`Yr&{#d+QAgGXAJg&+&8)|TtSX)U_CZ)iFLGL;^v8eca
zXR7?J7P<S_Fs>OfF@Iv9=c8v&;T^4$wsCD^b$nR%hK%p=x>*<R`~Eoo0=@px`!+T3
zGycc+`%peV|JQGMh9AC9SJ!<XUN4*B;rgF0FN?U4_TBCeuNz}-A@vGGC8d%Tvc#Or
z)graby}}ctbY!sYG=5#1m#w^Q#t*>MO!XdrWdDwMd@3zr*3$RW9H-Iuo@ddNVNx3s
z%r7jCcxFbyz9p_alov*Ad6qk7L5f`dee~MWTb*O@d;cA+Ptg5(|1~TBdAm6&p6@?n
zJCOHt^~yDg&e-F!_a`e-5z%<<EIWCOmTl69Tz%t0F{*wjS{d6}^W3#ar~U#uRmqCt
zcy-U*q5k8_GWE*=F)IU&ohf#zR`f2zV44>?<DbS*I*Z6hPZ(?RhBE{*9b_A}qKp`4
zr0g4Z82n`fWTZ~#*d$AmoeDi%zW}WoH-xW<Gpa+GYNbY$PWtd8Qdi9~=vcgqe(4IN
zCW6}Gva%TZPI5j-5b&@srMA96$ucEnhL#(a)+Em67*=LYwXDW<bI`!C#1e_6T-8sf
zz5Y%ssLVBzk+O_3$Q(5mmSqs|ESnW9!Cl|t`Cg$(1}6UQ&g~03`@-6+HJZ>yIXNQ+
zqZV5AP!F(VL*thS5)MSN6Mca&)J~rFzs&MX?NHc11}(zUZ}4c+Kb!?#t5*x?AdAzA
zsnSG8UOtFt_R>jisdVBn(B6<Hh3joFcJ=f{SPT}o27iJ4`B5X_;AnEg1k0py)oD7@
z2HC8VoaV*kbZvj@HG<|>xv?=^6<n~7VT$bSB!iHUX490k=P3Pmw-cPr&7y<$yZsS<
zqNd3Smbw9%>b7&HaYKy$!?BCOV$-Yyx%Oc>UeiKhN3En6^SN6)nhJf1ctr2;60d2=
z!70FC20Rlxip(^0@{p=nJV?B{SxMzljgjWVa32xYfAwW(fWY-*zMnw$W1e^y=M{`+
z<|Ho~Z}*cRzf`_C7QE76U5YV#=h-V5NOkYLqiew`Ul(GW@mRo^;}r6@qhIIuX)a`$
zf7g2+_QTKUFARjd@BQ7#*{}#_<M~*V#V|T*XTtTNw6wUQC?Qp~=4M^dvU+N(E#*Wi
zq_v^27-wa%H59&*U|A-~n*v3I4;O`SB&K{q4c2#1duOLr{Xg2>J=XI|%4c+=Tt*rU
z1rO+C@Mc-B6~(@mnjI5R6}ImjOVeib=k?m!baZco>^e*#TLl}4f|6%(bAKZP^p?=G
ze34U<uHdG(k><JMlH>U-LcMzO;{7V{aAJ+;f3p2nmdM9fz#)NggP^pTXVEzi50gG-
zHKKFS2<=z+#NE0%51K<t0K!mXGj&p(Y_1<H&O+~R$&>+tFx!+sQQ`f;HKB&8te5N}
zY?$Q|x{4#vq<8izSNtB(SdSHb4+gmRWTf;j6BeLmC26KiDJFx1v6EF;qjIDa6p}-c
zRw@UTWfAVq6@by%2AMGySXsfaUQ^1_6c`pWE*enyPT*=zjiN-@brZ6iNK6^{4PAP}
zp4wU>aY;B+g}^)hiDy|GGeB<vV^RW3EDckr1D-la(Tf0-651K5K@%%akI5|m^}BfC
zfw2V5UV$hq7DLiJFQ@A9%~^m=+}InR_Q3&p&Hkl!q8i&F4VF}D1wNAjQD-%UN|HdU
zN>l$QtNT}|HAK*u9?Ow{9e(+P(4pP!A;Jn5Aeh<M;JM^Bm)<K^V>pc+3avfj^`HXk
zcqN#gCD|3K8hIH7^(q6QU}?X+faehm6K{j|WYpF=dl#ARlwIWJ&_?~+8DRfb#Wh@c
zFU#%Q%<u&_YTdO=_rJo}c~??#Z&S|O%;*I-Zr!y_cW)Cw2O!W?T@z~VfV+m0q=Gjm
zk=Nvi(wM4OJk=@4Y8Pt7F4s$1FH0>^LV>An{rQtb<Jn5<*-Grm9?=sGU%MuK3gnf?
zih?~#=>Pqd$iMxzw|g6ou<ZloYq)#b)HbML^6;)uor+2l)bvzMy3$HZGXFAUA8$j{
zvR_BogJPDL9`4XWtmmz|P*oLW@u?zNm$0BY4P!5gtXSO5UNGtNRFdN3-EF)N?rr+J
zC{h+RoZK~w)ncJUGMc;qql8dmny@8k2|<ZM;zDp8YQZc4;wZC)5M0m-q7uEtEg|U+
zMd=0YuQqFg<^EiWTrz}g7OUkv*isN0SS5CeTEe>EIhZA{1g_vZ+(H3Q)BkkHN*PZx
z!j6xclAx3Icflx~y~}0QG*_2>)ihbRb(IVyOE-9|1-qk_c*X5-JyK_dQwWY-jS8ga
zg9vjVM@nFpcZKJ-3j&|##c6aoVz1ZxO^5wczK_lKSv;bi_u<WWIJ1v;AZ^5AU5l}D
zl1O8$Bo`Cvbqh8w+@O}vya+={c}8!)=Zfv_7bUd*#NQ0_{2D*x<b4xp4ows}HF~+$
zfMmKolau{JC=N~(IXQYcSK#u_5M^G>@~{A9;lawpXl3R8N~*o3sgX*u-K8W4tD}7|
zD-gBQzzocaBV!1Wsel;lvENf@Of05TcT}(jkr|rIX0H$6^`cWY*iAmvpd7?zaWR^F
zHNfY@X08Av3Y1l33J0L$0%;MI!3MCZM4UrmvL4SkS|lu!2rhs`$<C1v&JY-e8~YcU
zTTAf5ePxZX{EutEMRdj*z@9bYEFy!G*-Q(E)X6)2Dv<Z(I1kRRit0(*a7mvn^^5ut
zj;P{B{Zj`NN()3TEkwC?9@G|?LVJ*EWiBu-Aem&Zgw0MV=Nv@N6}nu<43Zrz2M0y2
z!v?_yhJ%eP#|ay66~)0ylH;h6J>jHID7EkW<X)W!h}cYEkT$;$CXmXAd=dTiLlue^
znI*Gx44`5VoiWZT#^;X?B0elr#(MW!g|s9(W#UBwP!|*iKwSSotN>{JUq~7N2>_tE
z>PVSJnc%~F^+IToDH9x0fWB;D6VW0ez`cbQpq30iX;we9j1Ca-Ux@1;$ce|lMa^{v
zSPuQY+G29o@t`)X-`|wsXOUiY>4OobXK{N|?1l(WjO7^5ii93(=!Xn=pH8snJjz`Y
z+J{r@iKzD2tlG^aTM6b5B7X4!d25vm5r0rWSAbTTV*}CQio(sL=?~0oAwO9F1mV;`
zcDSMhfJhWoG<f!`Vd7qWE=39FnWV^)<tKrZr<6*~?_Rek<!H?+mDpap?a}Bknp7;a
zefT({u%k79p~>;d<B7(N(5iBY&k|r}+F6w$UVTy3uh07TeJ@F`{cWLZU15^8t)hDz
z9HpjMKc+7ZhQ7%YH<aFWANp+{y3^<H@|{=y)b|eO%WINxk2O6$hbLR(E93DSoGTNK
zcjDW(L$s}D`dbdiIN06v?}F_aF#nrt5lxwWhJebQ9qz&}ZiK#M`R7feHeLbq@j~<c
zyrC5AE_$-UojpmYx~0Uq>r=_qGL*c0tZZ%y5+fUzuiKBh2gW#ly$`7A893vHk=(2y
z27ECJbLlmZ2*UXx8*WLVr-zx8kNt3c4xGFRAa!Zmq?B3Ig5x0u)zsEOY2Yl|c}Gd=
z!BV%GYVbCgUl(QJ6R`gJF$&8e2HoJ=pkdD{#YCln-Ep+kLc4KP;#zQ)<B9CT>rN#@
z32}Iu=3||BYX)OscxxtOWq4~wV`+HMR&X#@FtiZ{fgsjm^<^N|qV;JY*5dW8AQvL_
zaUk091{W|kBtf>6_0v$TmHn;68lrufiGD1q&JZH?0)eq|jLLy6#2V6pEhHM+fv&_F
zj(r2|d^fV33q}&san0BZX(T_wRF;}%5?nbO2NK{p8^;r5IU7e3=$M!b5$CFKz%l;u
z!$zX<fA|p(tP!tw1#d+jU`Jau1KUtB&_=E<*+F>&0v|)yKpFr6XXhG_0bh<XpaWly
zGq43`U$AHPohy_cLz1yq^&ltgQQgZ-cu)&94_eSh-;O*;y=x4V0x;|vXEiXh5VQb(
zt)R4x*+=LA>{%+x1e4|+D+3zFlmV1Ru<)<B0R?3WFMJMIXk(pVQIl!jM9fB<=Q-ss
zLa?S5IvRqliZn#Dsb$2YC3*}o44%&Dwpi1>j16^+sI@*68@0$h7$Ux^Qes}<k|O7R
zaZxXy@P|qgQ~mS>cIrE47V0}?rcrN8!0U_G+mhOvwO0Vx@FR#FI!fVi(_WZZegKc@
zCh<O5gQ9*YKZg5Z20s$NjhV0z6TWkA9)@<T^SBL?(%}!k`7eGSOYV`ajG@@y2%Qfp
zt2X5}bM|Ide{beF!$y>%OdLfUVbCLct5;T~N=TAw(8iAeACwx!H@~pKTvD7=oGNJu
zeVj^#)T=Xi^qBHT;<;4fxlZDFXq1S2=-g^(DT$IWl~OQ`Qn5nfsU-@|Mvse#6}709
zlc*I2zzcR+L!FFxNt#j#hI)xwA@RIBH4g5oiwFo?sZ7BrI?NJGD$LT0QJ@xIM}QW6
ze>yB04JOhU_}zG^8)?9JdX<JcNCrs99Ve>5r7Tc1gL=akSUs52(LH6rdMOaQeyve1
zi~;Q7#EBYEi#{-3ug-`UMnES9mo{a~p%OP{!3@B|Gl;^ska=5KnvNABDC>(8`h_vj
zxyh*w+@B=rOS1rSfRi8a0=)3KycJqbmA>$E`;)5GZNL>>g-u(k;`GXw_8DwnQtcZ4
zLvWw)M>AS<9ZO$f(Es?c&nWCG+#IeVOJCn%1W$}M`h;hB_?hw^3JCs=3n(Y7`Y)qp
zlYfmY?~kaLcNm5Jg*#xir0HAw47q$dq8@)v&Fv`Iwa>J4W#N{xvK6H;;^eaanU}0U
zO%18+fEPzkeR!l`Uy2kHq9L28C`#=8(h1{Il&~ll!B$0ESjq2Ipm>AIO`$A~;(L3e
z0jofD4SD=W;(B|F2B|=`4T=3nVt;$P0IEPW4VnH&Vt#w8<zI@VA5@b{Q541W^|dFk
z5=A%U`UNG9srtYof?lY`id<G4>EJRi!Y|B<Y$b|JB%%E^FN*vLrzlc^&Kp8#`z4Oa
z3s6NYR9iv{YDQ%2tSHPUvVv+U3PmdU5jZaj`w2HMRDn(wLU;)uLoan|9)TiMb4mzi
znQq`RFUT+Kf@CEMP9*UTUK|bchFuh-K!XD%xXy{C%Q`oU1RtWMC}2_c89Xlv3<xPu
zf&Lk6w$6{G`!G9;^ck$B$p0Vm^8-$izXJX8KV&n2yabSZ{~=!iBwq#k)_+JB0J$~k
zf&u??-TX}Co#VT7Y60pk)MN<TPEwCC5ko#7N}+zjh%S#ulQ4Jz=BRPWDHE?FD&9)V
zsDqiZPJv#VE`21i>IJEsE{!G_1@_2k$!YB$1$VB06q*!jJGJP;Nz`u#W;-=%;iB^t
zYQwZ@xx{PtNebZ`bg(h_3w2~$bl~H3M#4plX&{a)rL8)&tU9v(@sTK|hH$Q&yW|v@
zrB#n1UcXOLHjh>O_CX0h9-zgna1h~!a;r?3MkfuI3SEBSeuEdE3{@tj6Hg1QN}dyT
z5A3o1TT(=g>`OfDlp0lT2o#tH^N@6~8ij&Xx&mOa7Y39^;Do}Y9!Zfzb~O>Qcq0ll
zi_IAcWV7@`F<-ZgC?`x9!~=g^QpA{qFLIR1@-<%MfF9R2*3{SrHoHcT!KmBDat1**
z8wD>@%>p!hI-A2ww##z9>}W{6k07t+Y4{6K|3}Z`@>l#dP1f@Gdb6CMthcUtrX93A
z8{-6l?0qAA#(Is<!z1oHKVRwNbXlj^<Y@1jih3LEl7*(vf@-sDxF-dm3IwvsP5SHh
ziN#`nkpu{xZf(wDd=<;KLR-l^1|mFg1Si=v-^UvwJG3R6bx1LK)6LGz_Qb3t*EwhM
z<(XhI<GNx<!?=J9-jGt&ZDYtVg>QiAT>@qeazIYUne&}J{L_`&^Oc4tw9)Y-SM0dJ
zBF!<6qgj#Zmo`pu)`ztkd#$$BXCNgjE0j>8n>@jVhDCNV`5#{VJJOk;9F2^Z6FiXd
zsm^W7gjE|$0x0a$!`p_017jj+2OrwQ7mcz1NWXsz#l?r>5x`nv0XTs4^)o(n)Bhp1
z_}!1w<Giw1zb}Kw>#pmwT<_-JoNBaLjI)9XC>>0?+YLH`z5mnlo;gF&wd4<;Z_%@x
z4#cyeoxblB{H#7!f#@>WGMYBKE?fWlw&rEG6^4o*-Cx^Z%Fkb4pUDqX<4$9*Lhj!6
zfoZK>-n7<}mmS%MF%l#noIa14!S?vv-Ou6tdcF?dXW_{P&9qnW4$=vKKl87*zjv8B
z<K&2YW~fKuqd(8qf>(AVh}CcRqW+V56xA03YmtPkFK;&N_-zJbEPP>86LAkZg@(b*
zgU*6RJcX^s-Ux=_*f0IQ%QGgu^#vg&J2Deo!pgGY=Z&7bvJ$_o*vUaGg)6SURYRvz
zw;&Q(6CHjF?W9A(c?w9Wpq~Bm{dPmU7Q;5rj}1aQEA<C6$q62l>*@z$D(J?@@EO<d
z*`12KV?;Dhqzu<bxF?@sRRCAstL=iT+j^D@&|U*%#Ut|70)i%CAy6IiVyZoPJgQ)C
zqBsw1j0ZD1`y*6{@Hi4-z&=z<nP3h+G%`=))s0M&aH05Ro!uS&CYjRf2{jdS0r6Ml
zS|-euH*}lNr7czNFUYFv0_x@_#J<(=inH3?uI@V4z>Q10wy+bB#MUx;G4e&aSo`lk
z_N{9>2QxS}c2oW49|j*5_SaBHZE^Kxg{QsTx@m}c>b9S}yjMIvFQ0%|%G4u#3&_(g
zm(JB<s0&XL&%<)4rqMOl^X6gg2Vc`i!50<qD&o+CL2T~Tb=_2{s`W+)chCPx?@peW
zzCbco7Hk|dfo!nuW5B*|rLrn#2>OAF%FL;G2hgF#W)pLd&@SEFu8NV_sN78%Vhr*M
z8i#7cPN%L1#7zGg&#ao?AS>~W(1iJTAoIOv^?x1gn-wVJ%o`CQdf72ALApoIr0R?t
z+%Y&OI+DdyX%wy>54sq6)|xqkyxxhvdcOX8{WeK1`i2C0l&8HQg<Gt@xwVoSGKiU0
zMn0}gX_hb11>{S+r`A{|b5d9S`b;8ca>SlrXf`)3iCrw5S=VZGnt2(<RoB+`xm;y+
z_{ZPkoCnHORTItcw6Ei+8LCv#Tg~|RjBw&!`U7$tELu0DG3a=>R4r>*xRniwD7aKF
z*DSJ((UL*_`BXv0Y=S?!%Ze_jVtqfp-6zq$%vqO2X%9rwRGLq3gQSMMVr>7cs!7`X
zNi~suwAYbS{E=YEBr5qeT8dWFZ-J>a?Bn<oInGvXSSvRo7e|{CKAWjk!5EgTS>ao3
zGG(0nGj^G>?*~^HSy5NuqIYd1nb+mjr#rs@`xwVTOoJw|8P(>!FY!($)&>Q9G*hd*
z=xTY$ye3q&+WKk2Q=ECR?U;Gm?^X+&=qN4J*B5Fp`jOQ)2YseJ-aZOL_fh*yR@#Bp
ztC-7~m)Hg9jokTOMPizQQz|~mE@8V~k8^)B$D)fLJ|4r889BE~;zLj|vNK~c2wbFR
z1U8PNG`Xlv9L2h4BHLdvbO<~91)p=q!7S_?{w?lyRkomlSbpdSG>|ID<0sJ=I=|<D
ze=?EMJxsh5kSZ(Dti};N995;NB_h64yixInU<E~%PM!R*Y9xqhOjf7O+3|mJPFYlx
z^VgSiv%b``9~@M$mywdsHoeT|H!MA%UsEdM@H+dxS?EKTZ4`fctURW>OzhD=AEh10
z);JlrsVgegWexXqFS4QTp3u!9?f0?|+|<-hpQqKEQFrV0o;*67&)Lz%ZlaM%s~a$J
z(_VCaIM@o$ua9*mGq0ogN%K1>8kC`Ir&!a8ppLCGyARLm<?D0k&2qZZ%gp9$acNo3
zVQjfh4_S@%7cbm2L@M|O{E2AErTBx8MuWaDMYjc-prTCEF0a)5?_Xf#RGe`q^Je+V
z4|EK_J?s4|9s8-W+)}|xzZrlFy^c*hGvYAkV}p(JE>lTXYgY`Sdd<uyXO%iDiCq#J
z@eAQf<0xIj76eitge{4sk_(%WN=FpdBNogke~6qhrqCC;U`shfF%D3TKoe3Fa1b3T
zVB;+jg-`4i0CTEfK+294-f>t6BBYKB;yP96AaErJn>x>h;!)=dXUr0%&Kd%7s_=z-
z2$tP(RtqBlWKgFHAB5}#W#)YJHz_E6s)tmhUZqnSBA?PZb)grj!n%-~R3UxnJ(|#7
zltFbEU$T%ow09{ieX6Ha#$KhrG=@H<tLlR<QVn$>x2Z<@&<8Xly(pvVQNCm`|9=%z
z>M$~2b5L_#v+21P)6hC4V?JpsugIAonoGj6hc)Jsvg}Zdg#eE)k}>dfm6zm9V$CIS
z0AfC=6F`jeu*h#wPQ-D-mT;Pm<$$B)Hk!<URLW&Cn+KYd+hjHgbSjTdX%g<~Hy%^6
z$NOC+uM81;dM&A~=7N6}`lMAgLuRBeJNHDrCNRM2zUP~Aq)ZBa?|=MVkcQ34`|<n*
z#V5DiwBdqPHQ{pc{=8xCb06cxr77Ct6Y=TcSo8CkdbUydc>m)txL;xx(wOs}x~p{c
zL`W>(D}8}L-xn8tGgX7XGE^K^IhkNYa>=+xi_P_EL`r@9_Rv@E5m4`9*c^HFvF+fo
zFF!qnpAsKURsXXft@r9XqbA`!`L(<ChmqAxv1xZ)a*)4mTSVWZ*|k_Xkfij}>`a|{
zjaRC9-NYoMn-UMcM6cifc8p0kVD0&Q*Ty{=3kaxv=Ko<&*}rSgDuzzxrY`?;PuZpJ
ziPMD$+Se@HH6ah^>Mm4W6s!YF2x&k@2pH6(yjVl3$nNSW*`|WoX%9jVd=Ff1VcVV|
zVW@sL$VN$Oscy}(BOKh!=7lP!w_D#<(|ay&tJ;q?zpAby%g3j<?atEeg`Pz{-#L5t
zN87eP7G7J?Gdu@VEFZaYT^r^?HwNWf3*495>o@IxF1l)Zd(WTV_1aux+m3R3DKpFW
zF5g_`uQ$uOe(3ApX>Xh6_5I1Rf77eVCzp@1eAsxi>RQ8l_;j=WbJ@uaYfW=!liS+c
zc;TA;6*mhbSwuG2W&7D(f@Bj(FLJRW94jrck+rdP=fU;4Z079H*$}8@wz#wK!>6~N
zDPDe&*#)Uu;A`Q}fY@T4afM~3K`^VgA<;@<li}@RdG;Hftx9ff`1#Va-18%@{LeZY
zd!0QtZasBce5}B$R;|n4=&U@z4I%3?H}<LKO{a--W$S#J#QGHByj~WSxL(JCz^ksq
za;r!`nlDqLs|#HSMmxYCH+!(uuCKRe{Ym>%FA5DqqQn2O|Kdvb;1NPL5v_X}?n0O}
zeG9>sm3-&I<#TzN{4e$OliRae4`ia(<(J;?#gh$%YH(W~HpnY6$_*PY*QKd;0+z$}
z)_8h|g~AWItJ<oAxUi?idkp!N9t0(CWbu8ika=x~_ifY5tGEq<G@_B5-yIP)m3*ge
zM6ABkJGZsgubbVvtVCc<pz=UCF(+4GyBoSehe7u<-1l&oJeN0B`H1?yyYcx1{2#C5
zeSV(kdL%0hj*y?1ZtC2;tIpcmhbVYwyb(&EUXl!n(ykR<*M)DEV&jbT^$bAh@EVv|
z7@htDndUk{bjW3f;sXaIZ26vIkn!R*+b-U`bj;xW^95UxR@DRitKwbtJhqGW9kR9-
zDu9zivCvNplEG&N<-k3SoGX{{_z<0Sg~9;a*ztaSpqs>;z=%W*ZrZ-X!^4OK9K&k)
zcWw0cl*8kq3)Lm^YozOa8yTfEX`$v>lsBijcd@Trc6z@Y+w>|7qi!YbUWsBdxjJqv
zu`3ESkzE}-d*9fbd3u)3&(*f?59a2=diUrM71?jwdeww&{5c;OsJzKSAmYlHJlEsP
zs>FwSFu)C=s1O{i{z*5Zt4wM2kv&PHUZYFY-Nop>_%>mBAz}f6)`Id%Q4PF!K}*NE
zLO)Zd(*ks)Y=}e65ld7cMy*8h;}_9@RfgzvZQ=K3l*x!RoLq25r!UWvyrS^DBlD8A
z1knDmNjOSnX6(}D7)1~X^l_Y1mE0(n*=^zI)6bR<&BQhBXYXk4+%LVnb1Jl(3M2nS
zCgD+Od3Wzqo-ttPqO&0;g{j2zhCYiSM&5R7DM!VK6dEX_pn+X8rJezZ+Bn4+o%?Gn
zE4r{;#Vtmk682#}6+PTVC+>W1ulLX3-}>Ahp9lPYp4Q(3&xrcoPrDnx5wG8G>-7KG
zjgTJC=YJiq@6YY?RXkMZ&-d{<9sF~L|84)r7-69X2NCJ~aG6{T-gGUNI&kj5_~`U+
z^i5u$&Uw3^ylthAKuZ#y@;ibE(JPbUJtn@>ntD2YHb+@U9W6$y;v(Kkx#cBsPb76`
zvq9)x7xb63h!N{+7j7F{^@aLxSF`E8oE{hHpZa-U_pj=4y)Qu<LArJPr>*;R#h%l7
zm`EXGq-(dYT5>e0^uymyGU^Ll^NJZmj10}zH~REz4C7HTr7MMI%X$tsKR>3YiQhB=
z4jNA}eike%iTD9GxPsPKmIh<7&c5*wSr3~g|A>+fHHsY@E}8B(8eFV!P~gr0KIsye
z#Km|>m?+%^O_3_aeqdsi7Yr{FY&_a?Bw9kvpG<*ZeJHF<R~T+4sGT=6Z(-*d)q_MU
z67dh+*bvh+LltIdAYJ0Rr4bQVVy>mhRK8{s?&sL&G;%dp)kncumLhaI!&l3uWVLk2
z%*sTk%MduY<Vp#A+nrknq`~t%58l+;cu)IlJ6#wEjCyW_4n<jE&XkE74Q$x65T(H|
z2M+g@S95mvUQaMRP=jH~ipk-`J@8{2gtqg6L+`_4S_Nv-Sd?udmR@|&S$ue@_(CT$
z!9)3m#RzlQVRq{~@eu-kv;~{NXt=h+39i>)G6g{$KgCe1XZsc{5lS%xUwzi-xzl#m
z1r#RI=hRuW$SMgvjNU$Qi`1c?yT(=4g$8jpx3bUU=<%89RxUeLxbnPF%j~$;z_&qf
zJsG><*e+2A`=_?K@}xG`vZ<|1c5d4m&qGVeoCURc^W^Sn0J(%DTEj>+l#La6s9o$=
zAgN$ZZOliuMob71K)f-|hlldnJSd70pg$;z60p(g4CV)@KY?QkxVwLspN!>BEd|hI
z9D<GB@YZdVD~VoJySY0hnTNAN7r~L*fqpCeJwAbq+xB(1oNe>x@z|RTrr<}k(_us#
zm1wnGO|kS70;CjJ52(s!BSvVGwU|tesHG?}jV4qQo$8X5tk}r(WnJP|)!s4$$dd-<
zl8JD0Vww1KQQm#+PX-IJAG87ci}r+=4a4QC5Y-uUr^!Olyk;aLWhZom2IhF0-8@{V
zS<$-VL|v&9O6!vRL)XKpb`i)S0-&1~9E7UyTQvZOpN>?k!AK#cgQSRAVT6cr4Vpj}
z@JJR+jVJ8EqfHn>CjA!3$J_A$hJr#!-fNG@pC!73NNhX2Gr=e9kV%?MJ1)AzNMtZi
zZHx2~rIuGriS$vWmVZ=_@S&^nNks@wVg=3dmq^2z1{u~|bt&0Pl%1v0tv(tu)Grw-
z;jsBBTGA5X{lg#UWpOwk<E#1B9NS;*#vI*$*~qo9sql&&=e5vvZ|fmrM5KbU$M0u6
zC6g%M?ahET;!wh$`4jta5$xD;@jZ${=i^=@A3IY_qiLbw43B|x)~NjkC7GD8qOt90
z$7ng72GsS5k&rF2T9s(L#Yh?4ATyW<nzv9fp1FqTQMbx=>!e}gNZBN2Novx{q!KX{
zg(9kgN<ro1G7MSUtTaolLd(=Lm3+njMjLvuVDh2f$t7u%R!OOnON5fBC9Oz-$+AGQ
za9G(at>%}?EHlf{v(zl59s#F&{|A+NbX0^(I7^IqnKK9{=WbptoJN@ZTR(_U^|yW$
zfylxQj`+9O;c5(?cA_!2lg@F#sr}CgFrAKFP_C;nCLLn%6-Z}X#?z=}w-U+SDB7~C
zAlMk}A-<P~%VLIn&X>2`p_9HX|MS~Vb3RUw&-tNpd^M<1V2Mj7BazbvR#<r3H(4y}
znP)RIZ;P<r?J-QVp$-V$4un{Lk5pXIb3h@H>iC5f4iA4wjIu)_^G3Fl0y$<1r<wve
zK?)}hr8L6Ceo*5m%*1|hqZp{^q~My4!jp#JnvcShMZtuVf+>B)orYlQYr#Zu;IA=3
z)%F5vV{p~I;9oHizo;QqkAi;1p{t}K{^G)^$ih>Jh5f~@rohHmv2IZyAQ=af(q1oM
zS=}xWi3pb>CIZ1s2<l^E&^;CagpGx)32_2~<zsT-$`C*#z+My#%<O^He@KE`7Y{50
z+=$!*moP95gh8<8@dMrfIwAJdDgdq*qW*Pk^uiWMJHQ68oM+;|A&?nw(@hUa2@6ng
z34qgsthh;xUAYEA2YBE`Oc;0sQsryB<svAc284JAW_}?k7!_yNLj+p_8xwmFjDh2e
zP~5Le`+X6NMK<8&DMBzjwi}EU0C36|0sOyIh$0+fRv?)~nBtIqkw}6OjWPh^eiVdL
z1`Ojr7XOUX7ikEE5O*GuiTQ;vY#I=SV7MN9jFfL|%QA5y*#24-N}=eM@au{it1Ya)
zG-tTpl^i|e0ezGf#CT#L1DY`zM&b=-2raPT(4ZPDLlT_WH#9M_f7OZ64P>eWB%yaO
z2q=(hav%lOfE?Z90eu+=N=6i+ED4CEGN8C__lbm2l{3TYAJy32pz`?sr9%U&f1EPD
z!OZjogGM{Cj`tU_bo3Y1p=b<82tbGs23j})i|UgVL?D|wKnN`00?LBs)uBm^M6h{4
z5?r9kF$Eq}K_ajeA=-dQKZC}>5qwkoiNsO{ega9J7&rk7>ysJ$V~QlOAe^C7FsBZU
z1~BagOK?FY$0P)ph5$^}fk}Ns$H5^0ri1`feIUtjLnmNCeKNv`l`?D}2$C}v8G5AC
zDlibHA~?R_#0PA0Odx=50KhhXK;jK98TR9qI*>nxGI-X2)HiG#{KF?TfB@jioH2=S
z=n%xWSE>M!WMY>EOEMqenNOdpUwz>c+u(w73^E^{|B3-6@z0o_5J8L<%h6=9$bAb0
z<$J~nk=}ixe$}rj5h6xqgsEL1Tz`>8G*IQt1R;Yoyo_;R_OH`2GKex}hR}W+PR3|Z
zn~y{}Z8#ZIFPOm8qkbEN`de|{Nh1SlnrtKuQH1I#fB}?+C_o_)6{Kn+P?e*9lmNaa
zDzLKJS;&Bmvz{7q^@XIEjfpY!NDc}v<#5aj&*T6xIVcG$Yoaq;5Y)+{V0gd{g-MwZ
zq8#m~>1m?};Xi5h{c<X~2qn1G!pYtLq}3ai(Bws^@+Rg?|0}KDZWYB{gr;qJ%FIC;
zaFUoK62mq^p%~S~?1J5m((f!SN4%Z2pFugIgWU;N3%&bFPJ!%QQ&K=fQ;je#b+en7
ze>Qj%O7N8Lr)eu00TKD~YP4>a);_)5iW{jv**-wxW^Bu*mtA=Bg|>bXPk_(sa|yX%
z<^OSW_!X~D(DV89B~L)voSs|SV`J#uP-BWx15qbmHoZ!c03+-EFrEF*&s+0>THMI7
z-=9@QYeU~`DA!yVWKFRnaXO$7di;8yYrfaM(f54zdCjkGktc;={R=Alg!#_kLIJj6
z5}@`lpcU!{GrDbDQt8)svb{TTFcGVsdgUhWZW5@Snq0H$P+P5CUpVFQ+;XvX+^-$1
zErY4lYP9MopWJh*U^#$K*>Ti?>uj0%fx(dMtg2N;{=gl)KYTwGV2ruamhIaP+0$tW
zR=W5?_{-hvOjhn}<uXpIJ46=NB3br`qbO_Z>vhoH#CwKc{|(EjIw-ZswZ?%Tfql$+
za5Th7SazJ<7u%Yp>{2+nqmZ~u0L+_<E7k{<!q7FzscOS+wyu~cZMNnpB*;daAiYFr
ze7Kh*`#~k^x-$W9o{xaTek^_8CnR+cFM=neaqj~!YSEIlMva35&uo>=q>((C&9o6C
zxy7WBJ-NlS(Ue>}ZCowGMwDFJv{5zFCU$(;q_JQ)L{O3%o_Ilk+E%2bv<Gr3qPh7y
z06j77iLjnzVSx|q2moLTk`dEgiYvrQNPD9!5iczCvJ(4RO1v)sAzNDN<ID$AUP=$e
zNJzgg)c;HVjd0P@=Nh^Xw;wZ+CAXe1p(D2*H?bwBsj<%-Pcv;qC)Z9KSIe|fCD%4?
zY++qn{Q&l7rcQ-Gwj@kt2YA>9H51WV_wSDa#6wyI#2^TA0szqkD1dR1REU+7@<Lnv
z8#=L<wZzvl05C>|*i(U&r&2=z>1(O+U!+VvzZNM6dQ`HqCjvxj&V(~#`=Lr+upoK)
z9o~~e9NbtY_CJ)_#6M^z3uo$y0lBQ)5ht-T8t-fZ#r7rk+YhV;9&9iC48Z#vKA=Mu
zwim(bKi34qaD-c!ohc!AgS3oNnZz?`N7Zm1#QK}{;9#5#r0yan*vf69oBn^Ni{Jfu
zJ>JfWcY3>TPAjjU^Zn+_ulE<s%-EVA#HpfK{lA{}P8bIANd{uW?r)9=PL~PzeU=Ak
z+Fc)rYn7cxHX!JIgeSJ&%oew}RJlA3K0nK^-w(pe$I_xh3sj!WDtX<Y`xe0L<10e_
z_i#nOd@c(=&G92)n{p54cfJ^&|N6ghXjcCw4VFCsZQ<v4zZuPT91q(-+%W+6mxGkT
zTo2eHo1WNWQ$q5MvST3dwp6CsL}VUD(t|#aQaifq=~C9;5opxmy2*xbPq`MImFP8$
zwAePZ{Lz~LuSSzU*~I4cu?0%@aRm$)*PBA_0V>Fhg^avlX3*MXkYOmn*n>g&-nql!
zYFCS-Bb+`~Ru+1rb)^HZ#;C5~VLZ_wMPqUEL$JPE1{l>&GY1oOUwvlRy?!chfmjvl
zl3WQ`t5*hhvQU?&1oi90G6v2OequJUs*93if?m&`vjZ;|crJFK0|%kT3fCLQa-3FG
zr_b}~m+1C;xt*|K(`HMwbo9OTO{hY!8Udst%=%`F1?=)8AI?#_Zc}6R(aZ|R`Ymi@
zEkA$xRxkVx0hIRR$6j6p8n&k^5p_C#E{@-LjvsE)#L)Zv`kkJ6h3inV!wcEbDJ7cC
zD{PZ!OMk%5`9vzsYrUH&kKx4&xL2rg51(0h*mP50dx+R{@am2N(%lsYFVSc5A_{aN
zu^zFY=9pYe`q(rT3sEwr{q(HSIEA=keF>H1xTUd_5{0-@vU#ywQ~Y>@*YQQBq@}Cn
zCBL||LkJBLYRcE|3g|RmBBzBS+}VQrX4%r)_4Cqa>!&qHf=$TT=WD=8AR?lPEB(Xz
zR<0l}Xs3C#Im~mzDJi3ZQm-5|dv3A1-6`&lUz;H2scd~(O`^kTg>P#fe|e}>b(!3!
z@7~y)t)o52T!+x3S7^V?DQPmmRn$}j^Ze~h(U%OAXlO&$1*y#Q8@_*<a}ud@QuHg%
zq+}o3Fddaq{e<oqf1PDYD()AV;U5*4A<Ycu=?<J>=7IR;KPlc-%@Af-=Z$<so#)Zz
zHQkM&5|+i5>Q}IKzL-(<0DmOV;Yp+tFg+7-`f!G&Q2HWGm(6HxpFR1!?ucqwlDt_=
z$z*mINy#jmBGuylgoKt1jr!t5!O8U#BPYCDvbzg3ml3GjY5Lv{Pw;AXp2=)P=7Gtd
z=8M!9l(D1&Rg|%`#A`-7$YPUHldK)M<n_VktM{=ploC{i;rfCZ6SQ>Mh@d)i=;afd
zh0h1tlIati5CBr{%v_j$*eF6R$(HofcHxyO-nbb)gUI)JefW;HAg;n~z8HpPoOUrx
zHoVGbo*vGCxXOFDCd)eOJT{3iOS;G!`^l|bw1*7u<K{WRqMY}7eK&R6x030!kdjP3
zF8RQ@x=J4!lkugmgT}WZ6(=7MQ#RXdMjS!)<CFXJl;8;SMdZRi&hU$0zS*twi$2TS
zeZvow-F5b2;nj(1lQV)9JY?Nw=<52n+3(Xsn90hvu2_8AE6#T7bNo(z9tM;MhdV8o
ziw)1d>&vOBsGm;DAX^UcC3+Js*;DO}j?wDjsXGrnX2N;sXDi&nejEpfQ5FA#yLXJT
zq}jHH%eJlVvTfUTmu*{J?y~JJ+qR7^+cvt(_;x?%Jcr+V?|9F>zup>SXYQ<wT)D?w
zGiI!aj96*wx!m#;z#(nCU2AQvy(XfjM46t(hexmv#|{^744X|WZ`vKXt~eXOhIMGE
z>Ceto;{RjNr6t1U3*uTdPewNI8?=}Z;+h(DKFKQvNL(4GGjltWU+001!_Qp1t2&F^
z3_aNNV^2qRFY3IU`YK##+1{>PDlM5f3}w*>(pke&^IB0YYjj$Zxa7L<WPtXIib|^%
z6qbE2B%4)I{sAII!kSx9015RAh?F-(AtoLiRJlZaG{m2DKHqq-2jf(+&Pd_+)>r`<
zur*OY2W(9hPyt&rVe{#bcwSrqK>2L=o1hBg=@3f5RnsBAubmE|olp3Y?L(}`3FCbL
z`!uGwO|3Vg9u1=RB-G`I_Be)lo0Q+9-W6Mo2i|oX?0rCSokYJ+E$(0K&8Wvo<$VwV
zxMYXAEYzxp%3Ji8y{txXbqPTga``p-LO-h!de?W)mXL}*brr;=MAgUe(;b|87(GSa
zFHUMZ)Or)@(SICx0S*8brvI>Tq4|de-ajlfnvr%{D$0}QQLH0#SxGC)Lg*#HyeP_&
z0d}BDvKW9JtdcAnV27$CYtluA&Q_34<t<AUDZ#4xl&+!?XIXZ`TFPLgpGMk6Md}LY
z3_bBBj2Ki0L|EN$R3N2iJ}H%HhLpjTwCVRLoiIkgslb%lLrYwrn>qiSQ7q0bDbVxv
z>-YHj^NPyqNgb!BT`k44y{m2o#-+yXm%-$$Leitv!Kb8hj4Ik)B(u0h9^Fvs4PPHz
z^@3s>k!X3*tK;i(Ubp@WkEh)DyNku5?qGX5u;%S0jv69CoocNwZW!UK_6%&a<EQ9O
zOI&wnR_v8@w??&Gk)d9+Xvumu{a?JEz90mzYV&qOR`=ftl=Dr~(RsA%D(7fxQ61x!
z*q{O%FM>6|-aayuVGNA8H2)Y8ug@*Hvuxh5>ref#_uInf40B;s+upA6v3$XBYW<!Z
zUWTPo(bGlp_2V7l?~Cr30E_7@k-fW^5rKg4U4Z`cMRy8z*48f07IwCOf9#<Ncx^k9
zFJkOR&9!uiK%wkuUFJ|p449(9ux(bsMS`GY!$c4ndc4vF2JP&3^_fqUo_gkUxSbKY
zCvQeLqbJIMsbOv&;p5|B=)-aPt0bIv4yJBq-T0U3*3wZ<O44HRK7mV9Y%IE)iMaUE
z?2j&zR%LY#``iA3kcm-Ewi?+A%9m8|X?8hBg-w0*6zSey)U;MJ%SO^&KFf7g<}B=B
zcF!lltF9>UoYX+8v{;<H)>W0^OaEwmQkD*b(aGY+!vOJ%gx68V;hUG!QN^*A5Y<-Z
z&Y0xdnrUP$99$ZC_x6cCAENx4RdzC#Gvp<BGbx+IUv6Y9>?)O(!Xn%J`JCiqyU4Rz
z_rY1kC%-CZ&rHQ-$UIH|s|9uzL<=rT96MkNjk~fAb@qY!wVk{OyH-_Hv`hW@T!FnQ
zX?bl|1$DZ~kOZ=S>fM8jvC*0D%6W;RlD&+}MP7V_Qadd!^6e3$VP}4cEJY)_W)dz&
zs|39LYza>d9qz5<O2fXX<&6xcd5O|+qO5Q9E4*c@jqndGtB?j_{tDb9_c;*fjaAF>
z*GvRM9C$+Yql)>YNBB{#BeSH%j&%jL&o#u}_r9I^tiT?Mc4NJF1)R5`*pLq6w$5;%
zbfY;+Z2NQRhP4BWTw0*b(hPzLk(Hz+IAJVZH54o|nyWzSDkT`Pj7C9fBZRx>k30R4
zh`Ig81f@omXArCB)<1lXKgqN(p*%wS1`t?EB}WcGE1thS?}^lYTsom9z2oNOhMlUE
zej^=1Bxnh3@P0hQp!7x*pY8><LHU59nqY}r8x%Ot6R*{T;#1Jm@g8Ko))DQM1ETEZ
zBUTzdgQ^K{#>``!$s%EGxw8CW*q_sH{*sjf=vj5Y?N`5DRsY=bEBxrIe?!c6nTnpH
zf0&65#<hC+!YlZaQ;U~W8&ObBEjxg;=h$M7^!7Ec$fbELOzso<{SU>0QN(=g{@A9G
zCkr~a0cC8$?)Qy@cSJ(l?q}tz!lV2=E+riZs7hjbV~~rFpCT+Jjvy37=$qYyT^(<;
z^_}E&zkHv_aO@^yr;7vfH_3W|C5wdGU4QM~bE{JxHkQ-h`@ZcwCsB89@kLQiYD&uL
zCG&S}y<8|6YGx;Dmu|oN?1}p&J<$2B_&t!I+2T2y@w$k1-n)H7<xu|Yw)6hc{?k;(
zr8mW?E)FCGPpj5mk5{&DdeLGO<L4(1zDaN%*R&Lxu<;dM9PgFb)lBZ1v~-XgE#_f%
zbGH$X4HCN(thn)Dx>Leq88772KGR_tUs?8O$tV}O+Wn~ZBFPp{LVms;FK)mp>g+zR
zoUc4~hDRf!B!k~LmFh>I(BEcbMBU(B`R`ZVI${0XnHZRA&PZdDSFse8d{lX&av{L9
z6z}XEHhM@3l3&#WP=xS;1&{V=Sw!dEAKOUwqy#~Oi@1D|YB5H>nn!z&g0GL7mPo*Z
z-`C`7%bOLZPDwFlC8ZLP_8q=+ShR@u3djeM57%;LQb(?F)bhA}4!nZEJ^<!mTL~jD
z&1`_{oP)?+sr0v6O!vr1C1&S_x7M)#26EE^ou19l`8beNW25Pe?bWc~WK$Mj)e$Jt
zct@t2OIsY$KDy7Q{O#wkfk^cZ+AP<u*+>?*Qb9BxB#G>OKGsR-<Uls=V1w;r8fV4{
zDMQvzW=HmwpGpNMiNAQqr7dXX3BU_(zFT`aw8@D>jaDV*>)eE3XY(I4yg!EGuXvX%
z^UbrgCRzKD&iZ=E?5*fZT6x`Kkw+0GR1s!5`}1NS!Sr5xF{iC&%%oCf5UQ@l>^XNN
zor|-Q)li0P0j4|hH~IOUK8wo>H_!XsWB|j0^b_%fAkV1SukUK1%;aZtNs&-^L^6~d
zEDYl8CZC%5m&@q#ZN;f1d`j7ej&W$^>2<t!<OD%}SHMrWwF$ekg}T;}ycm(T$_zA$
zA$8PnFC;EyQlI$rK@0LeFwu9jFgMQGRT?OMiw%cFGun#+f5q2iWg?|vQ8K8xIXxIQ
z>QGWhd44nt)<s}x5dPB2aP!UJ*vHI(KZSyzAFh!l;-#I1`>g-)`<O4Cf)@|_JV@5M
zGB_9C=F4T;=CHhto^R2^XwI4)zbIr$XZ6-O?^~GRbf8Z6?Nej9-iz)0R|73&CWZbd
z$9Y~c7*JDIh&gt3jP@Z`@7c`q=b75H7blMazSb7!+xf7O`a5RCN;-VKLLoP34;Dc`
z654BfD_GdZBqJwj@}oOJ2jLLSSW!(T?vM`Phk+IW-0>IqUS>5`8%4z(0+dSl_Ds$C
zPfL2wg>EOm{I=TQ*eT3^>^gS41J|**?e4E`sXxnmpUI_xkpUjmYd%a}vb>1d=L+K1
zEig9pw&HFo515Oj;5wNWU6q}+u_hDZj(fn*Inn4NXXSZd$;(Zd%W`FnB2%9<?6K4p
z6W>vA1bRI5B%ZK<6TbjMdfyeekqgLt8m$G!|Fv^-xnqwYG1*Wlq8!~Cm=zE@aRwnC
z41v;BV=TNNyF$&S7I9sCc3fp4(*2A6)i%fdf~uf1wznOob6noT$@)t7xceQSB`?j7
zj)xI;4X+bh_|uB&Nw>Yj%gOYY%1x(f0kP*TLi(TGoz54hn434!)u8%Ud(+D{^qdE#
z>*x3A-?OYUj#NuBYLkp$hY#ia9fq&;v_xbrtQw`M;o_nl(B(w~*YjErEKiW=lm;4?
zNR=&G%uEr8OS=67>nj4CLLI-Y_lW+YMS&`pLLJbL#v`mD`f9*n!-f<_sUooWX*~~H
zIc`W@Us1$LM+xCz$XoS7Tk30PZ8tu=T<L77JHph9Hnf!oFq1d8^L-#CW;RwjIS<gC
zi^6=D6TwPjmYw+Sp%g3jl4^QdiHF5mBy&3s1MXp5a>}L7?)vV?Cz|mDY#TzEl8@P}
zDRNUoYP@=^wL(AE_+J}m92HkOw&EQzlVd$^iA9PJ4W?UjU>{#9m@gIS*e`dpT<vx_
z<U$oKbSh^CVV`l1c8ariV6{)=f|0yGM0UxBGd=Qb>@3IFF-DP_zA>#^L~g?6)aO(P
z9zFJ<$4SMp5TEJ>b>M>TPi2>P?8PlyPMAJ@!^>$Col`B9fa56pSU^9_I{tWfm-GHY
z(|hvq-r^2g&;)8*cf`(&ib{ZvZ6Aj$ynzAd(pObQBXe+kPG;1)Bp|ybCj~N>Wyej*
z_`wSL<&dQKkh$ZFKGJ0*6br^zuBd*9Xo4_E>Y5%HnHnJyjW}>M;{bHjUMZRy6x51D
zC^b|6q%{2lks27-iaxON&jGS^J!EP631RxG7#c~?YO-LcWE$puV5oAb5<{q|?jX4G
zfPI=f2`)V+S`Y|ob<dD=G(_IW0Cn9>Jg5)_<BgPc$9^i(m`n!~pa@M63~F^Bpa`5n
zd>H%akTe29-q=7npzNNo@lfbUG$JD>pNM}LdCedHK@|m4{yZG2p}&j1>^^!!jFILp
z%BJh+{f(4NH!MnhEOsaC$(DGF_OQLsyE*ep?RI0-yE#3S0EG>h4Y>)#T69^eCdr_@
zhYcEcBn-6%x+bg!U7xy7ZT0HpdpDJs<{rTmjzL~h3hQ&sW}k5!jm1PF8CCxIHQNY+
z6?R?UDxGN{>$<6>@Wi_%JNa2TaxhZp5|fD+S^*NsXySoltRd8AWmj=QDdJceO?+_5
zPyr?rC$s_-z{x?y*ij^jqVuQ#6=9;4I<|0>sYOfddRAO<s2$^pS?f&u@yXPz6^@;u
z3`XjDhrSDTBR12$pbYyVnu#Ik=H1AZlqgi&5$t+8T=Ml~W>al8xfV{diMsP>`t@vP
zQ+2>0uh~Qyz>e2csw}|HeI{c>9l#E!(Y^6r(Aph^6^`1X3a*K?7rplFM-Hkc#qEn%
zr=4H0i^z?~kJ5}dxE;R;sj1-eiO=*4vIz9Qbc4~yI9cigGP7p1VtPf660<15l}iR!
zCF9ZI@v=M^l(jxb&wgJs)P!V-F^~)2*fz$pUA>NR+x{Ntl1TtPlj6p~>$5WA2DA}r
zJ9Q!0mN(AEG&ecf1rLcFo9*6)Kf&}=CH3y^jJ%tL+kx3^g{Mm3F#j#zmP_14bxa}R
z5m;7fBakOhKFGAVt<ADGaCuvWq}Q2SaReXYHjSkxkOeA*h?w_#A2RwT300(LPcIS*
z{gDL}Hiv!V9u4F@<2C{_J&%VAs<};~XOy`Orun4K!;~@6gY~!V^F2+8<7iDo{@vWp
zQNj1nSvY^UYgFr5r|3GEU703DG3)x_Wz&Xt12gMDLbL57Y_}qq=ojoE&SZZbhM)L7
z)cKl)yd%^TkRcn(-MClZY`Ioa)+{s*$Toi%#VSH9Vpq0BnBXgEYBJ%M)n+_J`+(0o
zcOfu8<f(W3fRnh!vOxMJWA7h^X)HvN<2;C^!3d%z6GA)CgF&JXJ6bb{wQLAx&4}HE
z2C5zYm6o(W*+_pJx#qxlSqjdY6r?F0jvE`48ylEA4Ng1Czf!D6Ex{l-ti?U`8_c&b
zw2|643~WFGL|LT0*g=YYv>h_E-B?(~5lRv{iXmdm{8(kMEQN4kI#J@{Z`^r!p<kkf
z=*+N&-GW~c7Be@XKlv%m=f6mKIlK~j4qV!czu)J3Fh{+vm9gUd+=2*vH(3~C*oHjO
z!8-@#vW({!#@p{-u(ke*NV{P~%m4Wmnjsle68jNm<_hT6|2q!ybR{{#B24|m%d}3B
zTh8_%d?%*wS?68KN2TKRSCJUazG*x-{sP9=T^y8C4|nRUMUpJH%OBs|&afOoJw2Fb
z>OGDib?p-#9dY^ZIMu%v(j&Y=kA4{@!D7>jyC<K!rlZreAuBiZ?%MD#=2&fD6(dkS
zbY=zJMO#qok(R}`c<Egkg>jG4QIL#OcU&R`YlOMc+Lop+QHWH&&NgV}($}FZOh-|n
zCQlW=3(A!v&HHICk3Vl<Jh`6~QUc%IFAU-6oZNLhZPxLUI$O(Qapke!p)mbXGnd3;
zOXIOt(mVdV+5GLa>q`91%zgc2iPXK#<a)zt0RITh`O2PHFHpoE1KJ0gCk9r#y+Sz7
z+QG=E#cWn)Flevl3eM({^J+U_JxSHq)PQ(6;Q=pXw}*L!jx_p}0Lcj?+j+|u-TJI9
zPn*j*4z$|&`T}kq0{E-=)>sI-Ho+4kMW9CYZL~qx6sqq#<lnpH^MLt?Iaj|rc%gxS
zJ`?^A(poDxIQ?5%>q^bhsoxnlKiwdND1!{X(!QuEn){Quj(G}N>?RAOqYZ<PIT~Po
zQ>6h3`U;AI$rh&i)g7C{eit2UO)|4G59<4ee1|u4Hg?RgQL|ktWE7oX(Ng~<@Z8`&
z1ta7{zI*qM7DC>5k$eW<<mE5kF*GO`-swS~tFMqIOJ*VC*BF6}LK`*(($RF|vl{y~
zHYn@-K~Y^%?8|hT!sk`(tF>X{;n#*(?$GI61|b(B*A?q1KFj^}jsi_<4iMs%Y?y6E
zZVt-xXBP|KwM1svOMbxKlsCbxM%&o#*ocaNnsWQHj3DSr_r(ynTm#2M2t%iY#pT0Y
z@tsyYte$<FBX{QE$t1LHsTzhe^|BQxHOH%7x<}Ye-<vmI(wig?N04Dqf&kg;n>W}x
znc)B0eAgV{-hf+*rl~K}Jjl~ArhoWOn|;C54MYkA{-zBXgwTxaw;d@gn1MR_DGoQv
z*Svw|9qDM9U^yCGZA}i(kcm+O^-)Hs&Wb<J81)9bmMr9B0jS6b&U<%nVK<}T`eoj=
z9p9eAaUdVEcKU1kaEMQUx)+d>0W!K0lo?nBsHc+|@+JrHpz9E>uyYW<J|0_*y}AZC
zp9LPPWKO+Ka^UimS@=A>*rI!bSq;n3CGt9&;O7NW($u865zGkAT(pKE+T5+3)z*eY
z$b1H-17Lkoq<qZP!F*^^pRTHj?l1_V^KJz@b6d-EtHn7U7;jT_??T*h^m;1uoL_|Q
zvBG^=PG*zoeDIS(TY5gPzE=}VF)3Ys9j|9|yygiP)KS1|SBlQg3@qza)?6|rh?`%>
z++pNL$xz`Yp>k+c(#lj0>C)S=l8$Jz_;cK*v-oTZp}4Q3Ua`kkW>|f+^swN1EpL1p
z4q~^0YE}x_aD~o=hg%1r2(AzM83<07t9Eil;KW=>NMec=v;&D07Z_PeW#KtTJw+Oo
zAS`W6`6=JHuxHIqQ7|Yxm+NU0W9FR)?v<~;#l)A#W&n>u2HmdQwxpGP3)c@*BTB&&
zWR;4_15#!6(F~WXdZ$96gQaa1A*~`;A=`yA=vmej#qcI0irc$mod=Bq#@oVkNMR`X
zR+x}01&KGmlcQfDQ_bcCHJurSd!&J()og1~-8}zbHuO}<hPSH)A!@3jf!qX5Y<$fm
zDFnp~_84Sg3Rfvw;Dys@;|YD>X1m@|+GuNS*V$yYb;$bi*<7wQsAzvn0~&4XFa&<`
zB5EOneF0dn#Pq=KXT@i<N;FF?O0~vYNFC}sDf3>G_Z;exf@g>+a4to%-P!OS#hS;@
zrcs~*S9p#BXejEpr56aZrUPv1)-O@IIq;1=OD<W}2EPVUa=*~=v3ctvQtE%WT3;W|
z%5cVd?ov_l^^GV~n&--4Xvl%~i{=PC2R0#<Dup+$43lgu%-!>ZV$t1>_Yf`TI>Z!5
z4=nA9L$6!fTAypzd#nv<m7`HIMdLqFy9#Lz(lD|UEr+3+Lr{jI#wl!`848t(H>U9u
z@MG(=@weUGA7w4&i|2Itv_0P)ZV=MzjzGnGQW$`q7IDdu>^^>uT-iI6O)|^Bs9bGY
z<f{rZOv)0}g@MA!IQ6(rDDz}OFJ3Sx56>)tlS#-(w?_zG5UQT>;EwsFHFTniknZfw
zDmC<QH1+0iu+d!JOxxx0>i+uk?8R*B3h=zW_2=6><cOqLvu-pUf9S*Xo%%4B#R#9&
zGYdXmK{e%03f%$Y)NCy!>AZ^Cx3u9E<BjDTA}|ftV&&axu8OgEMazDBWlEwgyI55<
zgYVOB*0P+=bY1a7F*h1~90HXZHG)q1EhXt>P=(+mg4~!ENl&pww3#q^2c@N@oUcim
z_^~S*@hX9J1UFK<E$bj(tp$=(dd;3-1fd33>VNV0u>)aa;_#^NVJxzG$!X>!At@pn
zPiO*PI9Q*1V>sPDp`F8tP3;o2qc%A8+<;MNP;%!F=J$Q!5;8e&7o?Sy_Dvq*(ZS(-
z`8<0lVoT{%AkzIa>pUU1-&g;9n<%tXF8?a+g?%;JD6p06p!b)BR{DJKG?5A!Sry{9
zp@iV5Nm*{Ks8(WBN^J4j{*VL{c135HBk7?cM#Ob~FiI!N<nu8g7$5!hSXrz<$3WQ>
z&p<u~P1boZNGO>+lOd=a*&2K()}5AhFx2#)F|PJwap2(<NG*c1aQ3q)ra&j}n?T+u
zsE+cxC~Hs??hKcyGM^iX-$m<r#0~oE8Xj9bKr=Iq_ZoF_6k4sM7BiK<LQhBEvP|V@
zQZ!MH(K4KBQqI!vUjw0DB=TS7ytrNj^o<yU9n4J2X4@Jilmw{0dQ(79nV_61QHe)$
z%bkKCJe5VOfw9_0BmDBzy1m9X#jpXr7v^A{x2jz2%5umjuii{94k`Qose>PnwB>2r
zX4FQhVg8G>?vsU(=t`=ffkbyB-6x#sTB$LhHagGD8geF)WKiy+#`~cRBh1`mg^CUm
z4<F)c$A(m@b-wb!IHJa>yGtqLC{^R@=|NJOPx$15FwnEflV|K!Qc4WT_GmP8mL&31
zcY8ky<@2fKN%--3-Cuw0t##j-gmI$CdXGWg;%k4YEI8skTS|CJC^<{Z!1PGd7VSN-
zz43u0lrMmX?_aN8iTrt}qTH)?n{X}??I!_i3orc*wID#AqY6r?4o^HYQr!@9ef%TW
z5gj|PR{)}rKRR8wQKc+C(c6MTlS^DNvsV00L`^i91s^d$FfYNU{qcJEWIDfG-Ot;j
z)!F&iP;<RJk@;19e+m3>xG`YvXGZ@Qy~N{&PeLs4bR3uywCXdvg|HZC9C|$aX7r~6
z9M3n5ZjOmPR|1ROUMe&eg2Z;F&cZ`yaDMy(U~4x)8EcR|f@Su|Qg~<61)2Pph#LFt
zU+S(Y(h_ncy5bAE@{xN)ht$7qESA_n^)O+Md>=$qEJ3`ownne)b!llbIlK3nl&u_E
zwV7NbXkDI12HnjWb9<^nd#6I~_FL6O2~Pomo{Jyw<q*Em@DS~Q)b3qWZ=pWLf>81&
zHqwD3&TQdnU)$})zf;KIRL1PyU*&5M=3NK9wp?iO$0I|ivRTeGx|tI+RZE)jKVi9%
z>jfE3BBqq<t6!j<H_AQ{y-S2wE~P|)OE*MEKZ0g9OIFBJD-@{N*9EWM`g@GF2Z+&5
zw1W(z;edeBxc>)f(E%~qzo$jNz_qa36Z!cf^@b=+8oN<6_qhhIvw?RZw}{pz<xKiu
zIbmLBSk9(+4Tzf90jjo#M9u+P4GLIKKMqM9^Tw>n;%Pu{douFk27P$+l7!BxIc=|#
z{VKbEFZsK!5)N3Y8fwN%S=cDD;#!r-9`E2hoS}S7CN5_&yLR#g3=stjEoyUx5A0ac
z9#v5UJNgo7Q>!S>zByM|ew?rlX^YF(q~z!&=Y$HRP6Ij|F2)TscSDr+A7N37jVy-N
z?cvfOk)O}-j%NBYAg4&|SJ_-x`G-O*fb6tSpxQLqSH-oW995QZTl!9=8%5P7h0NRA
zcEGMNEofnUosGABB9xk-Nw4BRVe)$z^H?sZh5aCLwX@$+(_oZ^P0ZIW3Z=A%E7z>2
z+wtg6ZN{A<Q7zd}6TAn5ii9;Ch*tE|C$yXE1{tWs^_S>kfaPstUFw4kFTb?WYCGY=
zR)8bQ|EOiF<<=gs!0pV<orHSaiB&B;pr(cP6QEpNZOijtYzh-pNr6`a=JHU;UjD?U
zNggfTu)YlnpNk{4MvS0q+^q;#Y;tCrZ%ZxfxKc-NFbsa0yk>#iVGf)M4V)C#n~AIs
zADh7idpCrKwMJ+2GY|C9=Rl!%LWdoFjd)y~%0jVjjuL5YUdb5xyVYP_MmTQhj|?z%
zjhbTDO3gAug>(FpLSP>FS@i~UL^EHS!nmQd)g~JStRgh}^tKEL)49w;@)i~#D6;P?
zK1o`xBK!#OlB}fU4QMlV+f5l4>3QWD4U=YS`erR-Ag_*B2mW>2jWLV_WWz&ZQ+bTe
z&l@)<q4b+vU7nt=&xGv!L2R48f)?#w$x+d(_=DEhMZ$*M`ur+=qF?r9%Vc>f^Brry
zWP6+68mP4So%+96JnWCO!qO=A*lqhO$dP5lInk1lf_%8*p-DE!R?XBWnt&m;Y!Nr)
zwb@cZgcrybh{v1T!NsLwhnL*<giT70d|L#qfaPhH%CE$FDd&NY8N-`G{WUWSh`3bZ
z<J!%%Q}EH?@ynnF2=&Ju%t+GHh1sMX%rVmTnbMnW3j1>pKYMV6j2O8hFzN*+s}z9b
zWah2Lkdce~v_hi**}I4I!S4zMx7veI6Z|TX^XsTZ>6|r(%nq}35t^GhJyogaJmAPT
z@Qer-l##8CJH<48V;cgSCZY;s$a@Ata3Ey`qXjRKr=7MN1y9`6+|bz4yjW>x`Ix^P
z8l!_ur$AST`#2l*&(+q{F1Mzqx2>QD_AW|25ZtE`2ctEU(wf3(To+%weFJxXM}Fo{
zitD)boC0TBp_68<&(7DsN3F#H2WnNG0VY9h&5W*GigT7X59x2KU$<_>AH4&l&|{>`
zwimgvcc|H&X^R0)D9H<C#}s=K*oBUuIA$QlG|J89knB;yQy8!ZTeMihQa%tWk@X{s
z)#YIwXZmJHQVa&xF^a%`0u#-l<n9vVMzwITkrY*V`YK0^REWvRgv3c!MTAj{z;M6r
zbWEUxQiK#^z{*f-GoCCqUFG+q^I7rXjnLQc<K@zfUEWsr<t+<ws_QNJD0bNhwb>@4
zHk$ey7Q#)vJ^gstEywC++SckyVLX(QB<^f{XiY~~B80D~O0`Iqa>dg3cgk}Fy45vO
z!#QlH?}fQ~@tQgg=yB5VH0#V@h#}yNr6<2U{ogeM7$_-%ajuoo_P(7^wV7lHi&46C
zF^ySFG6qOHTP{hFAU7Q2QG=^Vhtd!4%<;yDf#qsZWaUC*(UlA#d*1+u?Z}aoz5-QL
z63{&RNevo01iVYS^H+$mL{kZBBAAQrP;9{god9X3hvcMbhCmJ8IB-tppnrv9hR>!{
zOc;&lQ;Z)bp&28Hp(M~f6BUyuXN;30|MWmj*}KNPv^4vboP2uo@n(P3%Pgnc`T2~!
z2ItcE)%&3n*IDy*?ruZA%5AIjhtC^s^wJjNPW7H=-a%+IRN(bvE6KMxX%U6KHbuVJ
z%XqSM7zb2l$9T|i;`1OKt5%azFVzhOXNEO6B~LhdkhUOnStI9NB{F3ST%|nQRNhOU
zhdkfNg=Z$Uso~|3*33zDh(-eoinXLVYmALg#MBhGU|1*7N130`a2o;fS?_*sC06ux
zupF#CtOQ=QLAh?R%7L#GCfpCzO^D&L(;^Yfu!XVb!7LLGPa>2e`8*Cd5@k?pZKsyQ
znt1rZrHk?)Nj0hfYhib{%o0q~O+{D@ZZvC{3b;EZe{>PiyVsFwlRPhOb&QgLcpjez
z!@5lSo%uJ$0$aZ<mHTKXB52kmH5$v}B5zKUid#lfhjUQP2qk2y5%v_YdWi<{+f)>*
z^T%5b&OsOc7i_Xx{qVWQ`Yk@L_V?9MYWf_4?$l^7^1^H!7>o1Cybzm4Z6MJkP@pbP
zCG;MB|9PR}=3P&RtJN%f1q5TWoZ&9$2opoQa`!Oj85JUekW;q2p|e3zZ&?V*S#4jm
zVkg5?P@?tP`J4lvpVkw*RfOgNHVlHe9_C8r3@C<1VTTHmQ+a*Y-y^FAH$T$p2d27O
z9d6IspRSFZEOnaGJ_C!BBoYIIe%=6^W9Ory1!RD8QpPZ}7EhF}{1TmjOTYDevM{IT
z%k6R2sLihv41(C^{m24ET?G4L&@PTP3+nszHn_c0pn$n6Q@u&0x%T*e*etxP?4u)9
zb~-YS`hZlNH+Dsb#$<*@L_-(zr^Q#1d4Eo>>wan<)bNMT>;^A16FX)Q(6b7Jgwsj-
zhA|Rsf)?v*@O?64EKT&Gi__uKTfq{q!BDPT2opb~3#uC6?Je6n?hoJhmAo=9W)^3_
z@Q)Etl24LT;t9MMn#=b!7U7!PUdk)P@U3#560WPlUQZl=$R)TNpw92vS<kNT$MRzR
z{8Zquut5V5fpBQ71~AO}>c!>aARYqRv+5?-qJ8wJbp_oIvwr2qT5T$(bmLFs^|(Pa
zzv{50Nh}>^jV$&7hfFQ_VMZX>m36H?K7{svC1xag1j@}lO_Z@gh%b2wgg+#U<K`{d
zn0?)~E{GtI^elqD&)94d)@c5!bdl~=oWS!*Hj*@2I^qcdro*hJ(yvc9&<r7Ow0rRg
zvYw9zlpr6<=Y5Z5j*tdYVhq@NUD7Fg@SeN+5QiWjfP)%x4ngu$iKH~fmjaUYnvV0V
zttYz|v8%y@XLJ90ZiwbZGEqldP~1^rbA#o*o4l!3CynkUZR&zqTy%->4Z=@prC|z?
zr6|Mx<y*7Yp;x?@RH+EHPcI5pU|e4z`(a<@NPLEn_}>E09NNn`;CJl|K~rJR4`KMp
z%n<oE-{106<Tt%Z5lA<Qa@M`y_s7d$aU}4@#t~<nJzrfP66E(3Ue%z+_N|y4!x-LF
zs6C1Zeb0JCs6JovKGE`}>>QY#*D*PY;7{J-$f~)lSxWuTj(G=<N#CtWbG)m)*cgnm
z{I%<8;=uPTMdhjILB@87*Cz9FV*ed<uBn8%HrYdY@1cN{jM`2{z@UYWlvRNHr<jbO
zxlpoZ%+3QCj---(PMm8t0(+=!RDPg>2b-rqT0I}-XBbtqMl5_zCWTdSC*x46SA9No
zy6@PRI>;)ix@_zO8?i!}7>1#1sXFPCkwupa85`_f+dIIJC(Xb6Am1k*Tk)3p4k1o#
zr>mNWWV3$Wc+(A@I_}<5cZ2bVc1Yi>sQWFuJDX~#&GX)yIvUa?!*KG-MeB@l#U>{c
zZdLa93?z<&zSq#C+&S)ttF)jz)9Dw*3^+;L`~s(ex^b8}mnOY$R~#z#p4x5IRTxUn
z8mgm!kyxl9qKC^Ue^SMHe<strUu3=Xb0a;P<w^P3_aQ)FV&{XwmCZk{@ArrXbc*Ak
z(w58mvk0MD?Oi^n6v6lQwAhUPb+yy=;=CDGdBe&stK%p5FR`qylzNwDC)c;~67KM6
za<0<%sl2^tgm%O$=J30OLMBi5)7PiSeH>i{(r$1GPuGD9o9_Xz>%L=f8^{8DHtH6S
zLF(vchyqwEo8P?6cp>R6!t#EJ7yfi8zjz+yd`X5b9z$kZT%tM~cZS^l6s9A~wmT+;
zQm;E5JT|-@fQFO{!%V8UB5qd#?w7zgsMUGp{yANb!$FMuCHo8T(-vd!)ruWvDibV0
zw}YCH-btQT2@mdNZ+gld(_CJpL9RYqls263K1zbE0vqikOVOvO=&|!Xxeb5Ul9#*~
zOwm0Y&d(6pdfEw$FZ+}`<N+q~PAD(9pm#$4@_PnomfvO99BJLd=tet>?o)%Y{9#}x
z&QA=S8@@6XQn^P4Go!w~p#HtrbDBi2y3H;i_!$HUs1y_kNbo<+(yn6S^tUDQE=to@
zsDfCXkoSIA_YGkTPX^ce6$P?!yMlvi*IX;!E7nZhTTI*;WZ#emh07DaDg^EJ1_Y3w
z^hU5fPN&LVCju5cThFq<XX&_xrag3Bb$XyOHTUxn(Lty*=m_RP+EyscVxYn!)ESyo
zL=py3EWn_N6H&tYJPXMa_+N$LJP4MI;WRAmHAK0beg}I)hVcyVI=>m#*a9UuU2X20
zyDSPrDoMRnq)DYl7|xBxZ<~B-`uQCvTw-*2VV0e!jb1|V(<V*xN!L>q5d|+!@GPdT
zavczYqN{nq&et+RkjlJ}u=#Y4+t$n^VooKKTFbo8v}gp}U~zP=f?`@!l(QhT1=8?E
zUlU;pm2S_>b}skt6iZp2enz2PZP2H{lh~P*IY~bIEyzr>+i0dSR5@*t(wQlWAP^}%
z^Ndh`ia5@bb(XC!qQ@d<k0-tnQ<B!TltiR$essGweKv~C%#5a|Pk1<*tL`55<C_o@
z=k6KUfAL_#nGze8cIV4dnKQ;~2L?{JpF2OdZtGOo5bYLRM3!4DA&&rLh=Vz#0`ttU
zjyqEi_S9eJGvfM8uH8Cxde#6EUi+O)bTHV6e3*Rn+K}h@*6!ND^PUd7D=SlXLd=Y<
zwVuXKYX5GW#7io8nmD}GQ-8|lVf#dw1Q~s$&BInK)c^cv&hgsrGK5Jr=H9VlEJ|TM
z`%#ciQEEaVjB<n=8|k{O!PJ*FZyS@JFMoRh5D?IB3IbU7w?8JpH%mK1S`&8@BNt~o
zM|vkmBYGPH3tM_i16KojBRd;<TT3Hb`oEpGx3jdP|C7@HZjbFhvS;l4cbiau{Kgp_
zUF{WsEkfY`U|!`Pzwx(C2?IwPJ6j7Q5f%AAUQy%{&28JyfF$At($T+2RU+>zu-;-H
zr$V_4J2NkoN9zb3&VmPaG7H}N)h<qpFB&+hD}b_`d7E+z)O1L)F%CX}<kPv9ra!j|
zV=QL$;^$KV<|&T3p*X~uc+DSTG{&)*nP%8#vAx$@h%Y%tAKX9viu?I$!=_E(2=@&z
z`3r5x8br4&>J-9-&`^~KOnM60pi~uApL}#T1)m;YuUVcm>z`Ui(jv;$s1+*Dx!mJ6
zV;3xIy#uRn;0idZn@eFf1DBeBb*8H(%i))ELs?cf6I}-OyEwT)|8&S-z~e@~`{WG(
zt{<Q=;{Ulr{+yNiCwfV<I?{a#SdiB*y<PoI7lVgtD-mG2?s~C$`cnpTHf9sDkx)zl
zNH<Y1!k|AQ=wL_`$Jvj^-Pt-%sht-o+G>7GE$sMlbRYR`9|xqO&!T*jFlmS^VN?=C
zp+&`xjAr^KnMNU{%tBhu#U!H;n=YbBMwi;BJ`o}WnC4^u%v|i!nwpfQd0@0jl9n<I
zHqIjkfmVSkDD9=F%jC#3`_-sVW;sGc7)6GXxE$r$Alr;xGa8hxZuqM0h(>mBJ&dJL
zTT&E5P$lRK0z%w(4YIi1Fi;McH6TshPj%~R7a_b<+?c4Gzp`pK#n|_G(xAkPh^;JQ
zm4CQAsCR}aclHh9_<A+H=(IaUO&|G5IEb`K#**-IE<@fnG!{59_boW;$3GBb?#0g$
zcwHNQ=}qXZTN|7U1$qrZ?8bAwZV+?#Qh^h&eU77d@tV2Afh1~v7lyFHz9Ckh+`0PR
z@@~A9GU5l-WA}2?eC2w#P_I5I{-qrj=<2n{jO7>fpAH5Ba<S$5ry9)qA350dUn`t`
zl)#(?fHP76&WQe}CPfUK4aBT1jI2x?|EO=lO4CyP3|QTm&j^Is&Y=zX6uU?e(Y*-S
z>ptGn^>o_l^DLCOyOSA@AYQQ3cMd`LKH#X_Ls-W5O1Cd5TYxoeZ36+os-$tSRM6Ut
zmQk|>O0c3h3laGoyC#JVz<Fb(TJgX*=lBAJuzd$I%c^{&6opLYE%Ez;(Ar}kE-`Rc
z<(i`foSRnu@F@M#Vq$e{E#wJu<k7jH?b8>wclVt>TQ>Z@U2F(eH+)*m>NskyQFZ2d
zAt$RgVAzt9t3oQwEY|0<c^R(lqb~6#u^a1!&Drw1C0Az7-T96wC|R!rbdKV(rU7%L
zbC~K5Dl4VhK<FAv+dlotftXuZ>q~aiyRqBDj#K<qvmFjP`uwEsRhUdLbSpte#hc{$
ztu#IL`8?)ThZ;^?jA!BCARPfw_=FSgO%yGf?KibhLFc5x#ZW^m6g1pR1F%!<4v1md
z>5yYO;Gpus@`9;fCm9XY@tqeof8mIC|4EO()PD=_gkS@JFEIeV6#Ad}(#7a6j#Qks
z>|?;|0yvW2b(N<;Z3Q90p8=WYoaO44If^x%OeY=9<h*HZ8TJu_yL}kjeVv-7mV{*B
zm(t_=!Am^K35pYh3c3hg$!F`q5>}}MC0evnRr=`NZ<vL%5J6N$mXZ+WHEv)@Q_v~Q
z2I?z`xrt-BJ5urDq}IeAOT3H~6{g?`hd(R87bW26v9L$Sw*6(aDmel$&byl0Cts%T
zjhf$H-!?fadSA>ZzgTFju#R>3TNY8fAr%zJuELA33il7u;d5Qck+;guqRqCy*e=~k
z;{AFPd*G&Yqx~^TxJ~6WKX8$&&hDVHTDpx^(o+Uvhr<P;>!WV3*WDVNzl7-6#H((p
z+m2zs44Hiv92p?ZwzJauuwqW<bbU?%n?BB|mMJ&UX6z4Ct#338$*fBQW4ma}ap)f#
zXnc&;n~D=`l9KM;dqDPnIz0(`u<7q#O!s_Dvu!=n`9K@}4)o6s%r@mTPzD5vU*P|P
z=?j0fet`P@yE6W602Ry)oGgqa|Ki8RamzIUG>Gla-YW*<1ykZPwl)?t5con(G?>Xv
znf);4FqZtWPYDWbXH`GJZ!vU=W0Xhgs%I3fg`i&jIvFQ8w|>MO9?zB^YE?Fxf5BWS
z9};^OW6yUJo^PkdwAuLK&6bl^<raupc{a7-;{3gX%Tvp_pNr}KJHDOTQC!`k$3ay6
z5ALPttT(?+z;uMYTyC4UJ0qRa%J7a8XJ<=x-HX78{{AN!yzo%H2Sm56kM$4tmXD{0
z2OW*IO2YCVdToO1k<DXOZqnMk)_wjWD1(X}+LjQN9el70qBzATLUi#e^LFvpF!YD@
zdnai9TlJf|n&@>~;eo19wDb!zzfvrX(hE7=d2@d4d0656Xt1nDMtw&@;o~LC46jx`
zB6*E=TiP$3clH$IAA0V!7M3^kYcdSSCtk)WPci*9>w6zqYsDxkua0!}a^Ktu0bT^>
zgRxsPl%m);v_(g+)d(SaPkAK_K~t}KQKCt%401I<laO*h5WF$d_Zh4Zsu0Ws$^`5H
z>HthK=(8ZW5V#<z5UC)#5V|0%5bN4H)}`$P7D0GWEm~b-EnHn>EnZzFBXpW^#n%e`
z3cyOFihv5kijWFZHzzo|qtse3rswk>#F+o0Xr!zpMDgbcY-u8CENSBWE3DV}QLJ&|
zaqNUx$sw2#m?5bVsUfNnsv*mf<-~n^sat^2y1(9@>6tcwU(9jnvvGVaNL@fJN?m*{
zOkH>_4ig(Gid@*b>}d1T`QKv8zeta$x=E+X|1NXY{#)k4Z={FuI3!9im+_!L7q(wY
z=@HreaCzncr+<OLA0!Lv`54CS&%DFOw}__8Dyv%1iWqD1Z!MF_wR2|WScA;!tm`$8
zIjn!Gu;pIk{;_<&t_w*%R+>L7x>g;y`h}%`@{~tmNTc|RjqLRlo3NGc)Jw^N>9I?B
zl$U1(HEUVVLM4LS<WQ-Py@NYPPMC1*n@@M=%gw|4(f#{UH@};&O|x$Wgqwwz1M@mn
z{U&Wx+twp!7zI?IeY46hEl!`q@(7N|z2Gk*wG>+-qiDJlX2Wxo&)wvmolIk9-RO|i
zgj%{~T^Do<MODdry=PAqxKkNzD608vxQsi9d^>Z(eV8{kr(YhoZZ6Y#lGEj;&q6hp
zmh!J8&!^R7YCnNxtR9<mdfM{0cd`9RUDxKUKd5`SS2MIE$lBPhqsw9mAAYX9`2we5
zsxq1T2X&3Vh)rLF{c6t}#6m{<goc_(l!%l_l8EvdIsR`nMu$QNOM*(Wb`oxBCpL1Y
zAQ>_oF&sh}K^amSQTl^Af2HxC6xx_1?#L1zA{jZZ2j%DaFNy+K2AvuI*_bAP#*ii?
zvdidNn#_PEn8rj#hzxt2X#5WvQxj2RQ4<4R*w9BQ`P=B9w?A%%ddHIdgXK&kOhb+%
zj(=tQa-swWsUth-)=~Y(KZ|Y-$||e@fV#H;(fz-EFY3REuAQ5Sqr!j3T#(<ITbnPE
zt#}Y;rTnMnw#O)6|JGca-<sR;H_a_O)unAHIcH*UOM?C>rruevGqcK#TXC`C&O)#-
zzUV5);_6{^6$pDUzq0rJ0z=T|P_{d518fZIEU~;2dUK^n4>0P%XW4kl-8nzR%e$DR
zRo=58jsGP*NqKmC|EDt#O0nUGRkPpYyV-+L_X|LC1NFEoa>_S1R^_apE14qtXSLj@
z{fLmk4Uh<u%jBqwt9@LMLmhbH5-2bZGAOY75^j#YIYd7m3Yyi$p3a+hjSq$Av=^S(
zx{qyFvpWc4R^N+CsTEl*8&Lw^w)fP9U!}b9pE2Iud|OCjf<qGS9{nmVP8+Wz@TOJa
zYMFoY)`Hi|mcO-%4VF=a-VCX^*-}+qx!H!5g2DLMiZGOw@1d-8!<EZ!9t4fEsN(^<
zW<ra#(=-bXx+7ubm9w+Pm%br&@&;W1kX-|rrU;n{S&&hPQ4m@PT98tRQV@k$QXxb^
zOd(o9PQhP6P$5iVl#M;89hWI2lmx&y8dDm7n*Rggs8=@d`qnrB+>GSozV83@Ulav!
zvxibr=&#&7=7#7t{y)?W0O2V!<5~Vn_}{mW^o`h#iA((50?-7~7}12%nEj<Ch?ETr
zQYHzdd}1Sb`<Kq2a`b7KCV<9~|7$c>{O@S2mEM^)f+`-ylRxrlsmOUr=LB}2w#}8W
zc-urTFMl}*>G8weDAlPe|I_4;Le+)JbSuRbQGHt~)Z@k~PqX&iMs_xhm4q8}o-)kJ
zi%j$L-PuhDv$4_yfB;Vd1eo>B(-oV-s6x4_iOk(B!`I*s0j|6HDTMp*Q-j^I5Ja8c
z+1@r;4nH7aZ|_C|FJj~B;_`iX>tcH29w5LEzBb*yWu9&}+_jhNV-pY3)El&K{vv2W
zf-QPwT$Pz!*9)R}LpLIF-!&5Lz8gcy59QD8puKG+Z0cek)Nh67ry<H#s~)YrmbIU3
z{5ZQQxuE|;f0Lydml65iEx!3-Y=v|Me`H-&j~M0c?DP13Yt-qy#SiOm4JURD&{xLg
ztu&jyz+74|r3*QJg4?~<qCK-bWvhe$4}tU90Z6b;b^5AJk$O~mAW3NA10QIzW@*t<
zMFR0ouw3>y^I5Y{1o!`g^nFmi_2GF&{AU&Z&aMul@xMx6<^PVpFr&XC-`^@+7>E1c
ztFRnxW63!cLo+~yJF6gm)3=#TV=dvtn5$I%5Bi>tZG!)mzO(@PviHC3QvE%C=pXCI
zd{8X+J^m^6o4(DKl_2WX0Q!0sBlND^+&Gg&4_+?0K3u;|-w)fq++AHkb~owqs|L2$
zX0;HqjnO<vTW$P$7a)P@BU-0d%~F%odp;#W*mEZ{Q=}PVS7Zt?n;SiG4}ZUsw5yK1
zU9lVd(HDBiUUp~W`(vYn-;+11p<h*5{kx^gR>TkA>l=BaS0Qiw7k~=4bpup*=pR&g
zN;R?;^|uOpbh_Kpe^JjU#L7Q{{kDd?u(YslqXiEWiTyk~Y!EdaXldD;rpImx9ge5;
zM*vZoE?6%&1hy&p@g-Zc8(r(C#>6LMk^sXX!vK^ZlmMk5rGU>u@wsq$k-2zznYkc&
z0l6r7@iw+lZtTWzh@t};aGDbuAewy|Fq&hjK{8Cqg2{}@!pY2P0%{CuLTYvGoI%Y_
zBN|}XKCauL;{Qd_p`y?J%JD&wqOqcpgRwu{;Cx3vM;68wMoNx+Ho`W>HsUnqGy*pU
zHzGB*mQvy%wE!5^{Oj$p-!OU!KT#T?FpX+JXbx#0XijMWYxZhDV`rd17mHjL@2@%E
z{tJ6^eN7Ir06lMiz~?_3dHaWs+wa$~{-xVy5+f@GDu@*P0O}M<R-P&<Zz=#5h@?oY
z3HAL_xUhJ_d3J;KULFhC?Q#HiAERo|A&90kfOm?-Pz`*`OZ7?>-VhwtIDmy++JJ+N
zB7l6{N()7AjzV@;<TSm)Ec|Dt+A9iA<a>YlFwj_5h9gK-TQ152LLDsKWFU+z=aD{~
z$8|hhx0rqJcd<P`<+@%X+2yYne1M+!+0wmDv(Lx-y2#=UBbZ*CiL5(F{qYP=Wkj>a
zRH*kdu>msArgT&V7KW&6<^lNl-P~@$LOlyMq4Nc-!YSRn`3m+O+qR-}qutO=vB}og
zq2uEu#dKBu#wbbVm56(;i6k@`3j65B@&t-4F^{pD8}l*V&e9%9MjyF^6qcudNJ9L3
zTw5zFI{1GT{J-=({t<kVe*hm>P^At&DVvE|(rsy(-#}!&6_q|#yCr%Ux$Y;7>%`x{
z4|Mcr1{u{#ZDk42itnvQho9D@@rWg}P&x~#gdFr7gLMcafc)55FcLVJlI0Xq*RhxM
zf?P{00f2AAiEa+(^^+CXLH0O+RCeg2$hcECT>z1d@NDw*m(^R7X1AYT70KESF@#=i
zFdI)^+Qm$KMMN_Zrq7QpVhd>AjivP5W6VFm-+!`jsQV2*f%Aow$|)U-@eW)Eyfd24
z8vEYkT%DDIva|CTg)CLW>QKRG9qNT_YMEAm$}yg`y0~Ij)Gb!YFXP|f&n!5;W|Glc
z-2O}0(S`iW(F>s4r3gSk{Qr|Nr@swU*v>Nm1}fep?hr7jk4X|<f?-Ng(3LQWK97Y=
zjwCpkt&_P*WGccM4kO%v_`oh6IK;N?quZw{spfu=XGriJaW@?#NRywzwkm#aveBQi
zLM@S2jhVU^G@G`msSmwd@h)1Mx|d^V(pibv*5LAR=Qn?m&7IU_)~!<aXBpx;X<+Sj
zT8pfF^4pXq4XstLWV+n>a^y%3TC9zpnc6$rzP-Dx&xZ=Rd%re$@#~0?UC-98>;2XD
zV)%Yf+|gNkEn@seDt*$|y!g3S{_}StxV|@q4eFEm(rUV0hG@(cl5mkk-l%xWuGH!1
zBHrh<z(HQN*<yawm_@#Z`IzhpvyB!@XWCOSguv8+ut$zcrN=Y#?hh|ko575&+NvdP
z{_d8wv{b`TD7Mv-LfsFWtrp#ksMPP|R^Qqy@tixI)w4hVgA*>Nfbil)k!@9nb{eM@
zSoBg!_Yu&;BhOH*O_G83CiS$K=a=SadPhr~sh$t%nL>c-Y6A7QZ5O+CZYQ&6p<a<t
zrXJXOmn0J9E7>IZm>MR!&~DHpBt{i8Z~B&tm6w_emKT(ZmY4XiVx9|=7mjZWB@YmE
z_J0=ie-=~CQ4Mg-!R$jMzA0iOWaFP3{(1zAM$pF4MwG^s|02<(M(D;B(kRQMl7E$H
z?6;xq7@0qsiGR0>eHM@ADv85{A&9|<A&kMCEFktFdOa;M_WxTH&Q-GMDqj9><!=wS
z{xYEP8dyG${Z~c*AB~Gk+WsDl`%}*W<KhBHLs$MC{j<s!26JE{HBjj2tARwvoigl3
z^%s|N>-?l7n;l{FGtJju2*pQ!sM{MMgqt9Mc3)+r*;yjtY7nCqv}(fk*9s!@XzI?T
zKPHn|#FHs48S^R^q%`cLY#ZDX>hgjqT&^cF+b@78J)RM@@6N85&m>AC48=myk6v4W
zVbWN#ydO!i;S@sS*53PUUFz~ZRA0PboEc$iP8TD2izc(~AWxKuYd6qc8gdfeIm85s
zUb~aC)){_5TX9Inq?wkFNRXSJHTH~kp%5rtQ^+?ln^^lQ{$rsNdo3qX7!)VpNI}ek
zSQcE3exE4)tVTtNA+LvX5q@ftCfq3`N?iHA;uAYM2j!u>#q5Gpy7#|m3ZF76D;@y*
zFu+Ihf21jYVE>Qp>Ev(xzy3S^r+>pg2L;(~a{%*L+r290)BZ7a3nQdxT7M7w*6RWh
zTa6Hzgi}36h*2PkdtFBn>kX~!>}T16s!`7(33`kE>E8Z*`i>UF-1SmQv+Xiws+-|I
z&@cTv`hdj8ztQ)S{ww-6TbJ4V_w*O<zwUhgjy~{T(4YD{`qY0x-{3d;F%kJy*@dG&
zw<?8!r8a_aXt@nGA$Y#2J($XLSK;BzU_}XHOT$`F)vONbz;b?rchR7tOjX#%J4-(@
z#Rxv5n80QukX^Zp)>YjuNaZh*#FV$V1^?%89E1ud@%J;>sQ*0|{Mo8@{tjurz65%O
z606G8rf?(m5{amM3nrqn=r^{Tu&LuedJjUatw#k6<{97<ic6eOw;Z8|r<rbN*u7is
zQ-49S&rj8LoGc+G=%}q=lkQ(MO(e4*QL(9jw3uJ7SmyM^dke)x1TN%WH~`aeF_n5|
zjnrYtyD~8!;}oup5~q(eRS%-mP%3zvPPS%{K*j30^l4w~@V3=+TWhY4ku}CAG`dcz
zoe2`3k3gs#ZR3D-WHatZaF9Mek)sGO)IeJS_#pOZcu-LrPy;&Lta9=boAbzE$+vBC
z1I+;u&CjE;E-}#`$4Rv;sBJ>!*6Xa=4~D|{hf4O_C|Q9`PfGIN?NNg%74{@k@a;}q
zg5|DHlwa5fB>unF&H^f`u6y{1ln6?fw1glbozfs(QUXesbW3+iBO(%#(k&(3ASEGP
zf)WA(Dxe_n-GO&>X7G8w|BJ6{%{uE2&g|dpbIv~Z?7h#vvCHf~AgT<3?re7U)sT&W
z#nlbi)Bg{Q5ZI&IXEiK@fxJ~q-PoE(yV6`b_P`5+0=FU+NHq>Mf8|&iqUAO=Zk~_1
z(18wGV*B6QM%jJ9)rdvOlRP$KigsG!B6aH|D`eRGC|x?l?$dD7F_lz>M`IYVu!gPK
zbg5z4O?CKrf7v8E*OEYWlv;lz{+uU~;Y{OTkIY2zK%esAz^xhjoNt!5`5CO?b1O=R
z)FhCXUy>3Xy3e{%AEez4AKEqJ0uD>~6cXWTug<;^wQ+L&<hK4~!_&eUDCch3xKTOh
zb?ok7ez3#FGhVSe-dYmvTA@RvI#zqJ6y#rRRB@8lblk{eBefI2E)Ooh;o4qKC-Akt
ze3ibsk+!e??NC;uF|7=~riv?LtuaeV-M4zD>fHR8xQcZ*&gPpQtG;9t%eh8No+by6
zw~N~x9>^bsSKQ}#Z9M*-eF7)(x`w(YW8TNoL)}{G;&GgMO_Av$Bb~U*wPv_CZW-m6
z;|FoP<jGk#w$<vvy<sQmvdpTRpfu{2&YOU>BHtnIV8I+Vb*a50ScsTH9<-JU0iG!z
z1QA~$z&qu`>dy)fiWAUd(C74_zyBPF(<+Lo6eik12P|fH0oPR8GjCZ%z#p0gtY;FS
zK!HB6k#Xb-+H$%=hbJrn@=N*M1>9IKft{2H%Y}qgU^gWV3M%LWo1S*mt{l3M_fOg=
z+5x9&sBKplXm8Yp1H=h#(2!%}$WX}80lO|Gz~z*!ae<KI#1)$fY>vcOt`KHxpb`E6
z#RjlKFLfcb1CHKMqbMUBAgn;ACL|#j;(eF0<%ht$n~wV?%>HQgFk>_aFeS?8$$o<L
zu_{_PoNnut6oBj}oJQt#=SSZ%FPOxVlcI^VQGO#wS!$@Wcu*PJ+h0)5CgY1jihzl!
zfYn_%mflS2dSkWIEM|A4_-z6WdX~df4cgD6dM_RtQQ1paaV$KNR2i7mqc{5OI1~$1
z3U8rYO!+8%4TF9yk77#PuaGgv;Z61WWxh|2gwnZaL`76?8UB4A7GFF22fTX{&0b}W
zULt1vNWww^4~ffAB|qT8h^`~Mj$C6(pI5<>AhSaD6|F_fSH?PK1QRT89MI!3FRP;v
z74&~HzcJ_^$je0Xe8-s0m6YT8+eh1Fvs>;sNS1;b2UZ+=V(GDszR4*W3);_;v-P5;
zismm-!9RwtTdu#g)$NS>xnhiOocEBs-?8uG^Y|j<aarUPb5%mbc$}}Z_cxI<YGj+s
z-Rh<78zK=E^x67zDVuKQEPj6zh82(%L|HfgJ~$E&k!!J<`Bovygybx*xKWta&-;5t
zcIxCdy`#9|%X3%o%U375_u3n~?VNtD>)Ta--!b`N<SD?X(MQwMh}<)GyvaQ1OiL0I
zp%nc6D3(xKs#Ri7Gq}HRTOg<z7kX7meXcSz2iP-CjKAD0{Kt}w$$?Vfkhk2(=k!*j
zE?ez-aN(utVxrRf4*JC#l_gkJ&h%RBg{xumqfjm=q1Nxv6MdT(Ug$K7o&Aa0&sjP$
zbZo%n<B~GR#<pJ09Q*ZAB&~1zL;bE94Wb31HpeW~>*}>{Oh+WDhBq=}wQ+HKMhtUy
z!x$fIhxZ7pQc2J|m+kAavsXXKTTso*wAC@%5jzsxjGi~T9~=_(?p=+OOKUiNGKzuL
zQ(PTHx3#sID_SOxH_O|%r-mnj+SeC1bvj)wcp8Ap=>@1xiez>P3_(OnPh2UD318|l
z1uckdNuxP98YfoH*t=aQ@2y=DuO8d5sMH$qQXh4au}k)dEDU$J@o?12na|~R@6fY$
zLS~uK(B<Mu4%Wjd?axP871stoP(H;s%P=v?_bBD8^qH5Z*ez~l%%a6BK#yi33JEOH
zO80SZT)L-8BEd(fP!#`26E|0Ooc^Ovzqe7S)Fr&s>rX<<UN(KvyDKzp*jAYsHtBHp
z?kgHILkbhjE{QIhD8DFCa(s$-AyN@iA9sIuctjLL1XN7aOCxu36z*$dKe!*OUroml
zIuSL2V^3~>V@YI5x!12Z<Jr{&g;KaOZ+!|wiuV1eo!r_9|Eh8+mdmVPCVa?9IopZ5
zh(l|lYH+@if4#9Jx^$Ppn;}&L<(_1zfT2n}cZm#ftUjJ0Uc1Gq{o=;4r?9765?)g3
z4eHI-fV(GDicuD&@6naRWUCinP1DZM1!lP3D8AJhEW>h@HBw)|P@o;Y3qCX;Dgb9q
zRKhU?xwb9iwOA-ZO(!LVZjm&?i<}tmcaQw%b@?fE8H4y2S@D7e4-$oNT<A~(eqJW=
zW0%Pa9>V0lP%&s(_uaj>hdm;%RoffhGLT?}`vKp;L*Y16>?6j(wdBSFch1`ahd++i
z*9P797yEzqt-HIHJtOUFOzIW%sCA)9F&ga49+9R>*X0$^AXU+E=JSHd4Zxm*_g4bu
zjtX!uAaVYiVi(YE#18N<fo}%>DKWs|-P=OIyRQ`iN(|70agQqIa#A212~MIcC2g8Y
z*gKf1*cLz4#HrlveSIrs_EWlj<qlD8<pXQxm$9pv1=pr{l_vH_XWi7_<UZ~co?@yW
znpT~0vR$JCIrm?6xS8Y^aWXG^j658!cs<&2yM9!2=Z(ElVZC{|?I)b1<QEFG3);k<
z8&|K+9j|*4?+P9tc@lI)EXL>A-<%4yth#ILLj1|GmXL`GeqitCqT=AgkKg(f@B4ca
z^e^0_@tqHs?bx#5ts#!*PD<(Bh*J{X)v~Qrto<Qf;mD`*Y|o@PJN9L5;TsX0xJiq)
zxJeIgalyyMi%IP^+N7Hu2GO>97Z1tIC(Fpn+Rc*n!|s!7#7PYFwA&waS7hA_WpS<d
zuD+KmcdvJ*XfU<uS(<eqcfnwO-f%(NvnCn$RTb6OGe3)zWfVU=`Qq8t#Fl_Ou+wry
zD@~jX1BVg^3x@*dB*qGgtx}^<L#7H?*n3ph3K&$=!FPysfdfhUC$ZIEvHH_gf!loo
z?nxdU@Leml7aRHi<-f9yQe&>ibeRCtNteMt%+p}&4$Vo(3lv*D%@vUOPmI;zK2|GJ
z2<S_};#V3`jtE0eVyoad?`e!xBVKZx+HO6@dbnE<+Td^TCv%_y>%J-Q68MWj3*J6A
zgSKyhpzYgRVEY`4BV3Atdvn~6w!X)K?WGwPpKZAoR$C(1HsU^B%Hkpl&pxVEuW)Iv
z-m^`zrQ>X|n)WauJBn`-4~03TOeTV3xEP%HFZ<o<dK?pu*xnvmrSF4h0(j&yL{;yv
zd?U)=q0atR+f0L9<EdCAuMS^f{Fu{((F*0JNe;QCmv(wL6`C&mjN8<Pj=<Ddk;lRQ
zxEtpd4{xpU#R_vplZ%tlxjz{t#TXVYNQs)RGBKmP+;$)$xg!PN-F?q}a!rY#_W;?Q
zFPQ&n&Pd_S?j|0M#g#7WLn)q7ji`7DI?lZxUHMsBx!S%e8mc8t#+OvIhH}a3I=|4N
z?Ymy_vxe5QxRYTR$T-{ujDy(U=-J8?Fb}^?!}N(OuBpziE3dC*@$m;4QHr;UUFrFO
zR><ucvPt7HYteFnL-(Dtn4_vzcs-I@7!FV?*hEo$jw88{lE0G3jBaPW`&jtkn$l~U
z60R)t-efwr&DW`pTucPh-9XNes@xhc^TRRi*HiPdZXRFQS6(|RPUOFC)Vhx}skvNH
zoP;h={n~nc&E-Yd?6+jIu$_To#|&hW?|CfEH8YPqP?#bjm)UF?oEpiT_5_aveoo*1
zxxcsUNjw$#;?t~7t^D+kmgU$%TC+pqw#Z53<Z4{<;H-AoN#IX}DP2SCQ*v1LcYOiA
z<WcUF6uHmg?+o_cY+nsc85tEjjxhvfRDHcSr8BBZ_eRs2b3xX6fXqOrt;(!LpI?5j
zY9Y7jRUW25$7B&vM{aN{WjhX^a7j_YJ+=J!-SSQPTD-g8+!1Zv3b|BkzD<pK!`}_8
zApqQRscW+(Sa;!>w=2dRKUVeRYZePfi@xb(xj0}*SU+-;%gP^9R7^2UQC87cQ6x%C
z5-Sr!8PYBw0J#_c$-Ahg11COUf$RbcVuC&>Qvxz*tYD8qwj5Q8!n*&ti8=Bl%?A`$
zmKA;pBnE*edk^7Fa)bLZO-#Q7)?7$lK*0KsUmE5Z;(wnKD(wPf8luDKx^Q6JcLg#y
z>sS?=F`Hi}yr75doVFk~1z;A+ftS!<4B1~hf~en)1!};tu;-^i;4evON`W%jV`weQ
zG%>^DY|@Gd?O34j6@FaO&N}Dbt8?+;6>OZ)uvctG)Rj5#v9aiVl1w=-0C#<2An|26
zV_AD1_`oBbN81EK2liU`eP3M3ZPD=q0wBA>L6t-@B~J;eX>JB(`jrONn<J1B6TPYv
z>_fvNui?B=TwwBD${6t92d9kJ6?5gs5A3WNAMWmyhFWwYV?2_Uf2DWHsZ8{;g8(O1
zK(A4Q=o^Y#v+bYKdwW><`a_j*XtP~P`%KJOzgO9)`;1nl3Dfo?)B?`7$ys_&x0?=(
z1Yr`{z8^g@YOpJ4!W;|zhvw@En!iYtH$5FxV+q66|M`SwYA=aq4qE+j>Jzjifa>%9
z(lY<YRzx*|ygD5quMSB0&X;_3F(^Y)1L9)TXxt3!x<B{Uctu>+H=%71nr-0~h=>{j
z9GeJ!c)5W;JjmF-${{|ya2F>uJhO%}1U+wl;!Wr>gZbxdspn5#>aPVDv%L=>_6Y)M
zA490to}Q_>FHn2F*l$DSsY9{oU0EuOQe++0Zi+SCm6A=OX2i!x-J3dWK}4C%=x=V?
zk$Scj3`=1TVkTDY81MWn^_(cs5u8(x-uMpZ`=S(AP6J-fIY(k`fpRderq@~W9ztZ5
z?dz3~^$(nql7p>0pL_M(dyZDA5d2YRy%N6AS|mU%>5}zDQt`0|zMMYIH!4syX5SU&
z0F_Q;sGlG$x1l^W@Cm;|uaE5<Mpl)ZGW6jxwBj>aoJJ{uZSZ^Gv6-Uh9rq`X%mn#0
zPd3Bh@qO~xN(6y>a;{gg)!*o^@TB{;Av_77I-+{hz(aE7W56nxBk!<K7@u>;wRtA(
z#gETQzTxp_1^c6Xbr?48cTV9M?oOoLWXI{$BQ8&W{=rE_gH%C(kW)2TAwPrug?i%Q
zgU0OcS9ysA1vD9-xaTg(jn_43yj#?EQmmvs$l!mbDrc&4?<kLcD#UT1K3s2f)E29-
z#-%vp)>W4bsa|KxQUCn*cX4r^%v#+{o=G}M9*2%c8w)=VHeZ;mPJY=}GfiyG>zAJ#
z)?NIV<x*g>Dv{8G{6p6zH^;zq;X%5I=ltQP$vo%PF?+9?hRID!#uOHh8SZJ(%Vs~t
zcT-2i`by-zkt6r(&G_h54aEtK%h&t#S4B0u1(@X%vj#@Lcva6PlhSQy70H?R;kT+Q
zJYyW?w6^}~to2xQV{Z1KG}ma+qV#pG*YeV;-m_c+&g|hw$hthG@kpQj{mY1tj=#$h
zck;@tx$WI<7T(W@Ft}YXbgd@Ro?}lSoMLuC+q-JUv5wc1=yRvb-jAVq`6TBQ>j!ai
zZ}9XV^kG@>p&FG?I<Zd0_cUAS6STiJ?%im=k^a!scKXstE%#@!ilDR<G!NPWkK`r(
zw%f+lofuUeHs%<6{_j(Srtb#2q1p}*d?suwWSiz~v%EEp)K+t0vE~9IFNy;WO2&Ir
zPGYp6j8&Ukq!CN4&EDM4F_5n>m`V_%g=Em#-lB<EYHLpAevWfBcEL=UUp6#bYWo&l
z3Qc=!=A++lZpw$I2DS4utmv^^z3i&d+v-b-_qF5?Z{-9b-e&luCw%p>tH#^bbW*%;
zCFgu=r-bp{mD$kyuSx3gGN`qX%qzq2EC~xHSv4z-O00TJ-#=}B!<dl;{Glog&zi7c
zmQ}OCsKm3!^g?_yDpM=9wuE^#8on)I;R366htaEu9vh1IL20JeEZ`3{X!!Pog-fj3
z{l_BK#;Y=odk|IPKyFoEhujbW!0u@ScTDHb_ya1Ch+11(Is(Ux!1FLbu@<m`I2-u8
zWK6m2?G|MiVtyFGa;U;@1*Ur=)~NU*dkv&8`1rPwzu=E<+xtH`@@2D<^d(3(p0E2{
zf9HC#Ubi>B@P{YTEqGzB*=U0g^CS!Rf#{C5sS&Y?wCqTjc3SJv6_uA%+Oz7OO0p=@
zxx~ChRD^kNF8^r!{5)+Z@Dk0;`vSUANn-r4uuR8l>T)MOxm0v$yLZ8S>w@cEDjLI2
zETah_4mM6SU#8V4`HM=eZ%b>VuDH++l$RGIw*C+=#$RQSL)vcJB3XB$WXWMp%UX6K
zp2T`!M<k+|ZI*tRxqxFDFxt{LePxfGzoUYpPWWyY6YVr!FM2k5amFJzda)v}UX2ph
z-p4OSwM?oRD55eJuI6V2u8kkC96zvSZ)e<LPUKT#y%>GKDUj8T|JzK0j=Btb^9e`*
zePjUik=%LBBy=B%T3B118q9zwP#g#+U=P?xWZm4*A3_Q>#YA-+4j^A?kfj~twzM<h
z6-*NcBKtb2*6&{nM7+%^o^N}i**0&1)bBh{Bl!F=;sB;UJz*ari+0+UJmJfC+NILy
zi#H++bK`6kbL?K?t%vdn@CU#7AUovoUVS3WmhxkDZ0NWKZbRnrT2Zu?b%~f=XZ=#$
zLT@+Lgnz-J+cSq+TZH@L^_I?w%aI#BRtNh(8ZK#OL{>Xrebe-&nCD}-N?K_e=C^y1
zJ48|hAFgbQ@MhMt%k{^2qAuh635UmW6TQ0`xM^C6y^yw##p`O8{a!PRmQF-+nLXmw
z3tVOI8`Tvy<*ydW_?d7h_(#h{A7w1j2bGlQN}4|7EJM9AzImDBS|#CSDekxl>&-&8
z7`vQRDsv7K(}3vL0$wsrO5*0BT5E#F&d)M@o_kz-v9JQOt_3U-J`e;tOdja4bNeSC
zOD~@Kd82+uOy{NC#;Fj+8AODcZ=?9m_ORbutW2D6IQGZeUXpY7X$V-}=N5@<@U4|&
z6u<P@=>0(-*Vn$0X9Fc4qVhur*=alQ`JL6w)bexn!-?9Ih(q$!CVf@jiS><hXcDiB
zXUWj42)`C*(UZ(%&`b-yPq#|H-}pH&!}hs)(mF7!IJ*jRxUWT*R{Kd6<KKDf*LUDr
z?)pQ!(Q4FMhwNr?#Xd%|hYAs%RftNZa%;u5AGraYj27J(F=ON2OxlaxgKjh6C{gnL
z%w->1TXr<Q{Y~;|mNe!@{|r~F4qpc5ijtm;Snj+Tu~1^WkdCH}=`c@n{(#>3xsv*h
zhC3R)T2%$3>Dy+yRkR44E3DGO?hK)GvwZo8aTqH(EA0562i{t$6*XtbCkj4Y|AM$=
zu59fYkpZ(yG(1$lr3`dY9?(VS&QgM^ymZ<}iYMFhdgL!x{b+%p_Q_=09THU<ahsrt
zt+r&1wc<<z1+@j=Hg0JP-dP#cu^DE}Qjy*(+nTN8vVK63ksymn*^el99jm%2hqXYw
z`7R#Ep8LR_%7YTlC|iN|2?UbY-T0y$>2av<RRq(DV3kHou!Ly!=OxJxgeyLc>mcr4
z-+cZ?6E(vQN0dH%Iz~AEquX2Gow0}Y?#K5$3e;aT&dEIHsbjwRwU-F*-Q&y=VUABj
zOuiAOk1PEs!-wW$9fL|p0-KHAUV8uO^_1mG)82kx$nI2+ll+kUT+=-k=1$oJ%8}8<
z^_IQRhcUS*>9S9$rw4j!(GPU*J+c(>^YBpb>~DWyToG{-xJ!D!k@nW6-k^nGtu*v%
zR;0vD>E@W$?>Qq`q|2d4)|}7Mk+@it9j32K$v>y+mcozEq}zIH)Kn>lFzZ;&;_|ir
zmlFjJ4n6TU)Tux6e>8=5M)uZ@b_PcF5Qz++Pn*pVbMYd=!Qr67!7=_HKCN$U?O^X<
zr)R_DVrfyRW~nf&h;t<0;$>=_uEStJl+jPXvTZrIqW>+H<>f2qa^A_T4V*@FpG(y&
zDmddv+$6Vj#<#-b9Sx4f-K=XBjt~{xYFVQQ<QNERZ|_apr+iI{uf15k4IgPDN#REu
zYHWqTJSzD<V~`;x?V<CSch}9b&?m^0k-jtc(fp{a;1Cl8<OkbOI?XB42Jr5#rU@L>
zZbmV>c;l!(p;mNMPel%#Z!g7;$7Sq7aE(NecW@>NCTF3K?xs%ic)SKYmDKTl=F9H<
zcca=J1%>lN!8~!FKHI5~VAIF2D~Yfyw+oMwiHbxGK0$!ju@!%k-cO1j*(sJX4CkL;
z>xF?#6%nucB`fT%nSnhnR}eZ0x!fxWHscHt>Lv^+!RELm5AVqCOU)dsNfl%L*MsSq
zMGGP=LJop$ZC33jL~~c9Zj?5Vpwk=j2rCM`D;-Z8L@MgwA$2)OX&YWJqN9}XJDy@_
z6>B5VA50CTdOmSyTBxA4=f1o!yi7fx?4zqaC`lcq=@^-sMal|OP5l|E!M-E4R#;wK
zn3D#+6<K*nijUe*54{X*ys@WLo7(lih*px>V%<y)z7gUSP~tR+qvX9{Mpkxw<yEMb
zaf68QQyY7vQ14MOXLZ>K3A1FEHa2GtM$&Hwe9w0IWRCs3U#K54iJExd0fzjs#P{YL
zO4^0&f#gP;-KDr|&P)#)o!H#pMzB#OAvqrsdo`Lwbr6bPt=m^OB;=KTLRscFrg^QS
z!btN~;rp_Q?-rH}3oS$`3anL{-L~34Z4OLs2gQ?Z4)tdDZeYFZ%rCE2?8r(g{gFc2
zW?;YMP!pHbJb}*t^x?;sUQ}eU+qn79I_!<=p0a-8$rwZ+$$u>tsnN&3zRyp+rDy4$
zc6+IHU|2wOY(subCn^BGpBau|ZoqYRydYuo;r!J|PqV%PO@-OT5Z2p>wKMnq{Mgss
z?7a9ATD%iA_GyGBRWn^DP?GouvAKt)uvY>Gx($Tgz7g-Wx{UIye)GCU?f<Nt{@t}P
zrWcKqQflU&7Zjrt9G@v-P?6hueC6k^rI@>8iC~JceMwG@UnqHWpkq;;Vk-IR-bdsc
zoI98XZYhTJUQ3x9?Fo(!)#x;&w#p7<d!M7_HzhpqA|qT9?3eFnz>(&%_I(_1C8BzA
z;SOP?#C8=s$!PE12lpGqXgal?i*992KRt;bw!ft<G<^P{@ww<+m--Cp%VE_R(v~<z
zIAhPD?UuV&vq|pT-M|T?Pm^IiASw=jMwVwI_sW>QkgHsGDBOm2`9PTzb@NSzfVrwP
zJ6^s9rwoVmOO6_!@?sG^6r4A+7W}OV>B$=wabbcLdpD<q(2|cM@S<>0uO$-ZxZU+a
z8j>l?Biz4%o}z|X#PC)#jp1z~E|r93%=U&<XrzxWp^nKN&3EWuR#|2>tJI#_?h;z!
z*NPu~)Ssa6Eki!6HAg8hx)5H&d*#?It%-L6PT>iYD^?5drN}<TC2G2nm7G-37JK+4
zA9#N;iL%iziU&u%^SR$hfqa?qA96N!f-7qFsCW+WvFZwF9y2M5kv&UO6l{X#mMYu3
z!T7ia*)>rJo7Jxo&C;hntYXoHX{nNAFLnL2F}KPqFE*7MHqAX^dUVTeF$qaMWRA4M
zbA>%B$CE&uAq-Q{{j*&RhUgp5c|N^seJ<BrR!LlHDlgwM;CK<$Lix_|z|9`VbC=i{
zj-FJjvzwQx@KFsfs#xOi;}0Ll>5vo{MNxtX305rN8m0+L4K6A$XtsveW744%Q5?)-
zSKqnC5V<=U-}%c3pDmSu_a`Il095vX_{@f(B$U~|_K%-ADcA7()_D^6Al~xRLJVM;
z-vwTOwD>2&PCh82XKy48Y+)Qgl|@b#^SJ0nd7xB6hqH_)a%5I3N5~4i2)#H1$z^4e
zPHpV?4*VZibN$C%F5;=pdIun<5BNyIQz{3H^d0>;=y#r5&7)ZhNJs6JAZ#MZo9}M%
z{jzrCes4^xFmueXpJ$E4@bWl9#_e%kG))bp@}UM|dTq-Jx=}T?@u>Qsq%OZZ%fivy
z)n9Ff>6fDCBz_jV>8=Y1ZXEVh23?;<Un*(gk8lz<E_|%(wX|r#N@`Ejp-<z-+#MPt
zOL2{z#9e4DT{$yKXef<uRmo85si$XM_QcT+kK8V^HDz)N^{{ojfB8MKffeh<)XJfn
z*zc~Xagsq3VVWGgwiH*Gm#ef%zI2JX;o7g-V3t2L55Ci%!hHb$TeWL|YEk0)3ljn7
zjU7;9ociDU1f)@x6P0GEo+R8fsDI)saJNgH{9gRyg0irXB>B<hh2YUO+l7U7nl;Dg
zzSXv(b#T_rHT+kUBkSPHXMc{%-4NFZSx-p*u{4!10TgtJlg4JERY|fD*1J$QqCA+(
zAML=jdhz8%EC1rA@XYL7twl-*J2SqNYz>YXXL=<44`KI4tYW(xj!*H;54a>IpUH4c
zYS3s7#Z%{$t1CXKIr78(^aXeNt)_s{@M_FX<zX**htX5o)D@NwO^&!9Fc-8tKW-4<
z@cW5~+F5?}LT$2F!&7{F@UC{%RykC5c#Oa!{z04wc~ib}UEjBAGbLG78i`zeZ0@*E
zx5KkWRIW$mrUnMQ?2K#2*g-m$-VDq@CuKa;Q6+xsw&B&XWFee@q0E*nC0r_5rcyTv
z<R3pob5)>oQd`$_iBZiQy%`|9sQ$q=*jh_-O1w3T)VS)HEb~^l!H-wg)8lj3xw_i-
zzCN~o;g#Z5!+pHJ*2y(;@9@6br&1L|r4$yHvOJy~_`AaHpOgmjs^MS0cjUZ)^+@>b
z=gR8~d)6+|_pCNI<$Ad9<c*Vv3(E$$`*tHo;}~|KKC%ea9U()f^&OZ|O(_h1mtX)l
z#GgxLPC8vt?o;-nr^!Bnx^3i;Zr%y2Y6mkuUSW~Fm^?^=@*?H@E3<h{gCWcnF2o#@
zac!$LZ;RrFCPsrP>RNTO!j@e3DxU;HmX}=xyz*<ifqPkt3Zdb$NHX1)gDTx2Zq!Aw
z^Lw=;5i;503VpfGdP}@3ZOIpl-=({7cE4Jy$~l_n-3tw?i0mB4FnG$r&4JvJEQ1p%
ziD)@)iTCvVryCVDQpOdV!Wq1kV>3igCdNE?5^niS6kYuMyhQAszhhR_22pP>Ps80>
z?Fh*TqHjfhN{l-EUO%S`l?2H-Xf;XvB<KcgC>3%TI5_Mjms=dswsdb*e~e00jfy+W
zKCJIZC`nqcyG==R(FviJQQ6!spKAI}(Ji(W_*tV6KRHJfrR*Ncfy*u2D|_`tW2=Z5
z$eu)Sn`~s4>%y@u7Qffu3chl1C{N@{(PlRE6>j0yx)aZqKQf<fizP902=A&M&U^9@
z-nW~3v7)o9?P+9zX4%7w=){PxReZ<0W$x+4ytg}sBU}*td3Pw!N4Iu6MRGl0g%hi$
zuIozC*ihWG<fDz3^<VLWueYcXcclj28T%x0^(A-2j4BXt9}O+aDskcLQlTFsDlB>G
zGEw=VhTUE-miOl&kZyMYUJwokn8|Q(gt2l^HWwX^>g0VmI3Qc)<R4VQ98@^+lQ%EG
z5x{vwn<0Ik9lro>a}x=Iwz|fFa|+<EKTRqoEGky606w(|yzqa0J?MLG0xzhq7qbRc
z(=ax(FoF~W{$kh`QqX1Krhn#kKg)LnIJj&0z>PnYAY5QkfD&Y5ZOQb=(gIS-clZLt
z-Qn>I(H}l=UIl(u4qxQ)4siWj%Gp&7^OqEmwgi!2q=3o`L5d(X);Q5nZJWLj79gU!
z1y*BcMc_e+u=<mTlL|(Va*zc7dpXyj<fQ+joRbw4QW*G0#3ldVe-s&%u&I9+1}e)0
zDR6xCRBQi@Kq@GK1jv8rs6W(!`ZuXyihmm(j8IZF|Bq6CRiA<sPi>_FHFVC3Kb>rI
zU89J`z-X^L@$!P_GH9}8{kP(!t@XwKQz%Q=#s(;KqX&9w=gHy@N%j?!@PrJu{Wrz1
zLn+1<xUYbko&UeGTn5%w#%3l^g90oaJhi~rzbQ`j!_s}*Bm}sZX$NGA|Dpitr}dl^
z8jmahO^Kc$ol7~Az>`%0`M>^g{K5hmm0}>d;lEOjsh*Xgg^?YUcF5Om?{rR%UjS<d
zf%~-2V70TxEco#l7(KIqh9rMskOLU-z)7cbVF;Vq-31&g4n`&}fSS%I2uuRoLXypB
zNvh6ZxDhG?457ksa0*alCV-aCMRwvDhjQ%w39t#XMz;e{9k}fbfn63*;1GcV?~2XX
z`3BeF;LvE{;e?<7X@JM_oC{D)?~f|8Gq@E7A_BKX0ry}QDipZuz?eemM&URFOe;1q
z=s*diDOeUcCy}^?(V2$?LE3^andLX2aRzR&b+5pI)>O#e#0Jn@E<c>61y*X6%b;rb
zkZ3Z}=SMqR8y}LbIU?vahz;D<7MxWZXezoV`q<k6wsIfXenQWIN%`}$893OP8HnnE
zOvRZwfYEk3JHc%QF5MZe#Q{SM>w8=X0Vy0DFR;&*fYMr-+BwO7h1CDVMM=NK2+|n1
zUDk6rGtlY)u21t8&apsXzq%h*V@!^J!=<8UXJYiL^e1FrvVV}%1d)N;ia^;j8aw;I
zYRGX$8*xsuGmo!^<a%g0G!5bcxA#P;&S>oH6T2X}8j{b;^@rzoL837z)jNRDz%5B(
z-x;*C52}Df)6YIX+P_cD#RY#q5F5B{;6FP7Kp|}Ca<Y(Y8n4dD269;ZY3zgVw_w}f
zmh9}UI_s}F30k<PD*sEQlM^41T_#!wea{DG`8NhmD2AI==V1U96NThpi-YC>U;pMf
zy|;ocV+z?lUgzcjC2m6&HT@G8m<Qa#azR%Jh2*NMKCga$nE`OUP)IOv$AR0kV1KG?
z2?hfVp5)i(0Rze@Kw_*a+Mrns{=Vx2<G|_%x*8@J19aE7bzThE+L(}7U<}w677Mzt
zBP3Q`-8r>$iuIo|kC03%i>E^zwuNPau2l%h<k9dKOrTK?S-J2$Xwb#zAkny*|0igt
zNss42gDy4(iT0)SZ_$329)l#)LsdQ5l)|>K{Rv$^3X-g*<9|VRT1^U)Yzs;Kgbdt*
z31P{gO9MfYJ?j2nkewC^f+UM)JSBr|VacG&zCe<3_WmW=??db70fR1y0tr^$_dftT
zJN{uc1-^#W7<9Q1NU&Q2e*t!SJ_J%z87ik;2;0H}LDzYJ1VS158z6|P59h&xE`b1v
z<v;w_SbrW{<!+}M1Giw!!D<Y;Gyo(T^1J^D+S$<sMuKf&(V)-EL!yO`{x#b9v7k>s
zLt?1`weJ5bhsdAKLPL(P=JeA}gl%Cp1$`1166yZbUm%^;5iAJ!8Wsrpcq1fG!tA+$
zU=BN;M^Vrx*dV#&-=ClBti2lPKJ7Tz7FJKtC%qtfDi{8O2jbipq?TZ5z}K);(1&>-
zsmwl}p9*}m2a;%E>r_wR_MeEL&$mDltt_3N=<N6gbHKK+8iGFd0m-Aca!#IK9;-8M
zG*}q$H7pc#B0MD2hqZG;L8n}wA^VPh8jpi*A<53Be?yW5Z~RZlekX%NjxO*%5w?ZI
z1G!(Ilbs>)c!1dMxh(pb)MrR8SapG~VY#3)d?C4}x6aS?+hui*{`^x8D;Ny4zmNU$
zPhh_@S|L@j>kNkia-@R;IN%5`q$<wly@Dlzw(^7j2Z>Nwu#n<ED4vQ3w;jW<zVox*
zFzCRw+V?;F;FFXrNI9?pa`5%<p9u$dHcJfrGeL?C{YN=x0@qDcwA%xK*AcAKv%*l|
z&SsW@g@JV1`tQQd=9xkM)`#YSGa&Kc_7R%>DCqk4Z$*JSn|%c-o^=18bb9hzf9GOB
kinY2?{~06(+)fyPeXWQ<tO#^qT>uW35)SU?A?WJ=0S)CKJpcdz

literal 0
HcmV?d00001

diff --git a/pqs-prepare/harmonic-prepare/pom.xml b/pqs-prepare/harmonic-prepare/pom.xml
index 0a820908f..4180a4a15 100644
--- a/pqs-prepare/harmonic-prepare/pom.xml
+++ b/pqs-prepare/harmonic-prepare/pom.xml
@@ -14,6 +14,8 @@
     <properties>
         <maven.compiler.source>8</maven.compiler.source>
         <maven.compiler.target>8</maven.compiler.target>
+		 <org.projectlombok.version>1.18.6</org.projectlombok.version>
+        <org.mapstruct.version>1.3.0.Final</org.mapstruct.version>
     </properties>
 
 
@@ -59,6 +61,43 @@
             <groupId>com.njcn</groupId>
             <artifactId>common-redis</artifactId>
             <version>${project.version}</version>
+        </dependency>
+		
+		 <dependency>
+            <groupId>com.njcn</groupId>
+            <artifactId>system-api</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.njcn</groupId>
+            <artifactId>energy-api</artifactId>
+            <version>${project.version}</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.github.jeffreyning</groupId>
+            <artifactId>mybatisplus-plus</artifactId>
+            <version>1.5.1-RELEASE</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.mapstruct</groupId>
+            <artifactId>mapstruct-jdk8</artifactId>
+            <version>${org.mapstruct.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.mapstruct</groupId>
+            <artifactId>mapstruct-processor</artifactId>
+            <version>${org.mapstruct.version}</version>
+        </dependency>
+
+        <!-- 要与mapstruct版本匹配，用同一时间的版本,不然会出现各种问题 -->
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <version>${org.projectlombok.version}</version>
+            <scope>provided</scope>
         </dependency>
     </dependencies>
 
diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/PrepareHarmonicApplication.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/PrepareHarmonicApplication.java
index 92834c31e..5429264ae 100644
--- a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/PrepareHarmonicApplication.java
+++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/PrepareHarmonicApplication.java
@@ -1,5 +1,6 @@
 package com.njcn.prepare.harmonic;
 
+import com.github.jeffreyning.mybatisplus.conf.EnableMPP;
 import lombok.extern.slf4j.Slf4j;
 import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
@@ -12,8 +13,10 @@ import org.springframework.cloud.openfeign.EnableFeignClients;
  * @date 2021年12月14日 20:33
  */
 @Slf4j
+@MapperScan("com.njcn.**.mapper")
 @EnableFeignClients(basePackages = "com.njcn")
 @SpringBootApplication(scanBasePackages = "com.njcn")
+@EnableMPP
 public class PrepareHarmonicApplication {
 
     public static void main(String[] args) {
diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/CoustmReportFeignClient.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/CoustmReportFeignClient.java
new file mode 100644
index 000000000..7417cf3dd
--- /dev/null
+++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/CoustmReportFeignClient.java
@@ -0,0 +1,31 @@
+package com.njcn.prepare.harmonic.api.line;
+
+import com.njcn.common.pojo.constant.ServerInfo;
+import com.njcn.common.pojo.response.HttpResult;
+import com.njcn.prepare.harmonic.api.line.fallback.CoustomReportFeignClientFallbackFactory;
+import com.njcn.prepare.harmonic.pojo.param.LineParam;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+/**
+ * 自定义报表
+ * @author qijian
+ * @date 2022/10/20
+ */
+@FeignClient(
+        value = ServerInfo.HARMONIC_PREPARE,//对应模块名
+        path = "/report",//对应controller请求类
+        fallbackFactory = CoustomReportFeignClientFallbackFactory.class//服务降级处理类
+)
+public interface CoustmReportFeignClient {
+
+    /**
+     * 批量处理报表
+     * @author qijian
+     * @date 2022/10/19
+     */
+    @PostMapping("/batchReport")
+    HttpResult<Boolean> batchReport(@RequestBody LineParam reportParam);
+
+}
diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/DayDataFeignClient.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/DayDataFeignClient.java
new file mode 100644
index 000000000..a2fe11c5e
--- /dev/null
+++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/DayDataFeignClient.java
@@ -0,0 +1,33 @@
+package com.njcn.prepare.harmonic.api.line;
+
+import com.njcn.common.pojo.constant.ServerInfo;
+import com.njcn.common.pojo.response.HttpResult;
+
+import com.njcn.prepare.harmonic.api.line.fallback.DayDataFeignClientFallbackFactory;
+import com.njcn.prepare.harmonic.pojo.param.LimitRateHanlderParam;
+import com.njcn.prepare.harmonic.pojo.param.LineParam;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+/**
+ * 自定义报表
+ * @author qijian
+ * @date 2022/10/20
+ */
+@FeignClient(
+        value = ServerInfo.HARMONIC_PREPARE,//对应模块名
+        path = "/daydata",//对应controller请求类
+        fallbackFactory = DayDataFeignClientFallbackFactory.class//服务降级处理类
+)
+public interface DayDataFeignClient {
+
+    /**
+     * 批量处理报表
+     * @author qijian
+     * @date 2022/10/19
+     */
+    @PostMapping("/dataToDayHanlder")
+    HttpResult<Boolean> dayDataHanlder(@RequestBody LimitRateHanlderParam jobParam);
+
+}
diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/IntegrityFeignClient.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/IntegrityFeignClient.java
new file mode 100644
index 000000000..d0bfd73a4
--- /dev/null
+++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/IntegrityFeignClient.java
@@ -0,0 +1,32 @@
+package com.njcn.prepare.harmonic.api.line;
+
+import com.njcn.common.pojo.constant.ServerInfo;
+import com.njcn.common.pojo.response.HttpResult;
+import com.njcn.prepare.harmonic.api.line.fallback.IntegrityFeignClientFallbackFactory;
+import com.njcn.prepare.harmonic.pojo.param.LineParam;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+/**
+ * 自定义报表
+ * @author qijian
+ * @date 2022/10/20
+ */
+@FeignClient(
+        value = ServerInfo.HARMONIC_PREPARE,//对应模块名
+        path = "/integrity",//对应controller请求类
+        fallbackFactory = IntegrityFeignClientFallbackFactory.class//服务降级处理类
+)
+public interface IntegrityFeignClient {
+
+    /**
+     * 批量处理报表
+     * @author qijian
+     * @date 2022/10/19
+     */
+    @PostMapping("/computeDataIntegrity")
+    HttpResult<String> computeDataIntegrity(@RequestBody @Validated LineParam lineParam);
+
+}
diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/LimitTargetFeignClient.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/LimitTargetFeignClient.java
new file mode 100644
index 000000000..51341caa4
--- /dev/null
+++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/LimitTargetFeignClient.java
@@ -0,0 +1,32 @@
+package com.njcn.prepare.harmonic.api.line;
+
+import com.njcn.common.pojo.constant.ServerInfo;
+import com.njcn.common.pojo.response.HttpResult;
+import com.njcn.prepare.harmonic.api.line.fallback.LimitTargetFeignClientFallbackFactory;
+import com.njcn.prepare.harmonic.pojo.param.LineParam;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+/**
+ * 自定义报表
+ * @author qijian
+ * @date 2022/10/20
+ */
+@FeignClient(
+        value = ServerInfo.HARMONIC_PREPARE,//对应模块名
+        path = "/limitTarget",//对应controller请求类
+        fallbackFactory = LimitTargetFeignClientFallbackFactory.class//服务降级处理类
+)
+public interface LimitTargetFeignClient {
+
+    /**
+     * 批量处理报表
+     * @author qijian
+     * @date 2022/10/19
+     */
+    @PostMapping("/getLimitTargetData")
+    HttpResult<String> getLimitTargetData(@RequestBody @Validated LineParam lineParam);
+
+}
diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/LimitrateFeignClient.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/LimitrateFeignClient.java
new file mode 100644
index 000000000..13c34868d
--- /dev/null
+++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/LimitrateFeignClient.java
@@ -0,0 +1,32 @@
+package com.njcn.prepare.harmonic.api.line;
+
+import com.njcn.common.pojo.constant.ServerInfo;
+import com.njcn.common.pojo.response.HttpResult;
+
+import com.njcn.prepare.harmonic.api.line.fallback.LimitTargetFeignClientFallbackFactory;
+import com.njcn.prepare.harmonic.api.line.fallback.LimitrateFeignClientFallbackFactory;
+import com.njcn.prepare.harmonic.pojo.param.LimitRateHanlderParam;
+import com.njcn.prepare.harmonic.pojo.param.LineParam;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+/**
+ * 自定义报表
+ * @author qijian
+ * @date 2022/10/20
+ */
+@FeignClient(
+        value = ServerInfo.HARMONIC_PREPARE,//对应模块名
+        path = "/limitrate",//对应controller请求类
+        fallbackFactory = LimitrateFeignClientFallbackFactory.class//服务降级处理类
+)
+public interface LimitrateFeignClient {
+
+    /**
+     * 越限
+     */
+    @PostMapping("/LimitRateHanlder")
+    HttpResult<Boolean> limitRateHanlder(@RequestBody LimitRateHanlderParam limitRateHanlderParam );
+
+}
diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/NormalLimitFeignClient.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/NormalLimitFeignClient.java
new file mode 100644
index 000000000..9c6a71700
--- /dev/null
+++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/NormalLimitFeignClient.java
@@ -0,0 +1,31 @@
+package com.njcn.prepare.harmonic.api.line;
+
+import com.njcn.common.pojo.constant.ServerInfo;
+import com.njcn.common.pojo.response.HttpResult;
+import com.njcn.prepare.harmonic.api.line.fallback.NormalFeignClientFallbackFactory;
+import com.njcn.prepare.harmonic.pojo.param.LineParam;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+/**
+ * 自定义报表
+ * @author qijian
+ * @date 2022/10/20
+ */
+@FeignClient(
+        value = ServerInfo.HARMONIC_PREPARE,//对应模块名
+        path = "/normalLimit",//对应controller请求类
+        fallbackFactory = NormalFeignClientFallbackFactory.class//服务降级处理类
+)
+public interface NormalLimitFeignClient {
+
+    /**
+     * 批量处理报表
+     * @author qijian
+     * @date 2022/10/19
+     */
+    @PostMapping("/getNormLimitData")
+    HttpResult<String> getNormLimitData() ;
+
+}
diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/OnlineRateFeignClient.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/OnlineRateFeignClient.java
new file mode 100644
index 000000000..586c7d11e
--- /dev/null
+++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/OnlineRateFeignClient.java
@@ -0,0 +1,30 @@
+package com.njcn.prepare.harmonic.api.line;
+
+import com.njcn.common.pojo.constant.ServerInfo;
+import com.njcn.common.pojo.response.HttpResult;
+import com.njcn.prepare.harmonic.api.line.fallback.OnlineRateFeignClientFallbackFactory;
+import com.njcn.prepare.harmonic.pojo.param.LineParam;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+/**
+ * 自定义报表
+ * @author qijian
+ * @date 2022/10/20
+ */
+@FeignClient(
+        value = ServerInfo.HARMONIC_PREPARE,//对应模块名
+        path = "/onlineRate",//对应controller请求类
+        fallbackFactory = OnlineRateFeignClientFallbackFactory.class//服务降级处理类
+)
+public interface OnlineRateFeignClient {
+
+    /**
+     * 在线率
+     */
+    @PostMapping("/getOnlineRateData")
+    HttpResult<String> getOnlineRateData(@RequestBody @Validated LineParam lineParam);
+
+}
diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/PollutionFeignClient.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/PollutionFeignClient.java
new file mode 100644
index 000000000..3cccf3d4d
--- /dev/null
+++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/PollutionFeignClient.java
@@ -0,0 +1,30 @@
+package com.njcn.prepare.harmonic.api.line;
+
+import com.njcn.common.pojo.constant.ServerInfo;
+import com.njcn.common.pojo.response.HttpResult;
+import com.njcn.prepare.harmonic.api.line.fallback.PollutionFeignClientFallbackFactory;
+import com.njcn.prepare.harmonic.pojo.param.LineParam;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+/**
+ * 自定义报表
+ * @author qijian
+ * @date 2022/10/20
+ */
+@FeignClient(
+        value = ServerInfo.HARMONIC_PREPARE,//对应模块名
+        path = "/pollution",//对应controller请求类
+        fallbackFactory = PollutionFeignClientFallbackFactory.class//服务降级处理类
+)
+public interface PollutionFeignClient {
+
+    /**
+     * 污区
+     */
+    @PostMapping("/processPollutionData")
+    HttpResult<String> processPollutionData(@RequestBody @Validated LineParam lineParam);
+
+}
diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/fallback/CoustomReportFeignClientFallbackFactory.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/fallback/CoustomReportFeignClientFallbackFactory.java
new file mode 100644
index 000000000..f2a94cdf8
--- /dev/null
+++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/fallback/CoustomReportFeignClientFallbackFactory.java
@@ -0,0 +1,44 @@
+package com.njcn.prepare.harmonic.api.line.fallback;
+
+import com.njcn.common.pojo.enums.response.CommonResponseEnum;
+import com.njcn.common.pojo.exception.BusinessException;
+import com.njcn.common.pojo.response.HttpResult;
+import com.njcn.device.pq.utils.DeviceEnumUtil;
+import com.njcn.prepare.harmonic.api.line.CoustmReportFeignClient;
+import com.njcn.prepare.harmonic.api.line.DayDataFeignClient;
+import com.njcn.prepare.harmonic.pojo.param.LimitRateHanlderParam;
+import com.njcn.prepare.harmonic.pojo.param.LineParam;
+import feign.hystrix.FallbackFactory;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+import org.springframework.web.bind.annotation.RequestBody;
+
+/**
+ * ReportFeignClientFallbackFactory
+ *
+ * @author qijian
+ * @version 1.0.0
+ * @createTime 2022/10/24 - 9:52
+ */
+@Slf4j
+@Component
+public class CoustomReportFeignClientFallbackFactory implements FallbackFactory<CoustmReportFeignClient> {
+
+    @Override
+    public CoustmReportFeignClient create(Throwable throwable) {
+        Enum<?> exceptionEnum = CommonResponseEnum.SERVICE_FALLBACK;
+        if (throwable.getCause() instanceof BusinessException) {
+            BusinessException businessException = (BusinessException)throwable.getCause();
+            exceptionEnum = DeviceEnumUtil.getExceptionEnum(businessException.getResult());
+        }
+
+        Enum<?> finalExceptionEnum = exceptionEnum;
+        return new CoustmReportFeignClient() {
+            @Override
+            public HttpResult<Boolean> batchReport(@RequestBody LineParam reportParam){
+                log.error("{}异常，降级处理，异常为：{}", "Date数据转Day数据:  ", throwable.toString());
+                throw new BusinessException(finalExceptionEnum);
+            }
+        };
+    }
+}
diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/fallback/DayDataFeignClientFallbackFactory.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/fallback/DayDataFeignClientFallbackFactory.java
new file mode 100644
index 000000000..a17dbf326
--- /dev/null
+++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/fallback/DayDataFeignClientFallbackFactory.java
@@ -0,0 +1,43 @@
+package com.njcn.prepare.harmonic.api.line.fallback;
+
+import com.njcn.common.pojo.enums.response.CommonResponseEnum;
+import com.njcn.common.pojo.exception.BusinessException;
+import com.njcn.common.pojo.response.HttpResult;
+import com.njcn.device.pq.utils.DeviceEnumUtil;
+import com.njcn.prepare.harmonic.api.line.DayDataFeignClient;
+import com.njcn.prepare.harmonic.pojo.param.LimitRateHanlderParam;
+import com.njcn.prepare.harmonic.pojo.param.LineParam;
+import feign.hystrix.FallbackFactory;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+import org.springframework.web.bind.annotation.RequestBody;
+
+/**
+ * ReportFeignClientFallbackFactory
+ *
+ * @author qijian
+ * @version 1.0.0
+ * @createTime 2022/10/24 - 9:52
+ */
+@Slf4j
+@Component
+public class DayDataFeignClientFallbackFactory implements FallbackFactory<DayDataFeignClient> {
+
+    @Override
+    public DayDataFeignClient create(Throwable throwable) {
+        Enum<?> exceptionEnum = CommonResponseEnum.SERVICE_FALLBACK;
+        if (throwable.getCause() instanceof BusinessException) {
+            BusinessException businessException = (BusinessException)throwable.getCause();
+            exceptionEnum = DeviceEnumUtil.getExceptionEnum(businessException.getResult());
+        }
+
+        Enum<?> finalExceptionEnum = exceptionEnum;
+        return new DayDataFeignClient() {
+            @Override
+            public HttpResult<Boolean> dayDataHanlder(@RequestBody LimitRateHanlderParam jobParam){
+                log.error("{}异常，降级处理，异常为：{}", "Date数据转Day数据:  ", throwable.toString());
+                throw new BusinessException(finalExceptionEnum);
+            }
+        };
+    }
+}
diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/fallback/IntegrityFeignClientFallbackFactory.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/fallback/IntegrityFeignClientFallbackFactory.java
new file mode 100644
index 000000000..bdd909121
--- /dev/null
+++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/fallback/IntegrityFeignClientFallbackFactory.java
@@ -0,0 +1,39 @@
+package com.njcn.prepare.harmonic.api.line.fallback;
+
+import com.njcn.common.pojo.enums.response.CommonResponseEnum;
+import com.njcn.common.pojo.exception.BusinessException;
+import com.njcn.common.pojo.response.HttpResult;
+import com.njcn.device.pq.utils.DeviceEnumUtil;
+import com.njcn.prepare.harmonic.api.line.IntegrityFeignClient;
+import com.njcn.prepare.harmonic.pojo.param.LineParam;
+import feign.hystrix.FallbackFactory;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.RequestBody;
+
+/**
+ * IntegrityFeignClientFallbackFactory
+ */
+@Slf4j
+@Component
+public class IntegrityFeignClientFallbackFactory implements FallbackFactory<IntegrityFeignClient> {
+
+    @Override
+    public IntegrityFeignClient create(Throwable throwable) {
+        Enum<?> exceptionEnum = CommonResponseEnum.SERVICE_FALLBACK;
+        if (throwable.getCause() instanceof BusinessException) {
+            BusinessException businessException = (BusinessException)throwable.getCause();
+            exceptionEnum = DeviceEnumUtil.getExceptionEnum(businessException.getResult());
+        }
+
+        Enum<?> finalExceptionEnum = exceptionEnum;
+        return new IntegrityFeignClient() {
+            @Override
+            public HttpResult<String> computeDataIntegrity(@RequestBody @Validated LineParam lineParam) {
+                log.error("{}异常，降级处理，异常为：{}", "数据完整性处理:  ", throwable.toString());
+                throw new BusinessException(finalExceptionEnum);
+            }
+        };
+    }
+}
diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/fallback/LimitTargetFeignClientFallbackFactory.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/fallback/LimitTargetFeignClientFallbackFactory.java
new file mode 100644
index 000000000..2c6844bd3
--- /dev/null
+++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/fallback/LimitTargetFeignClientFallbackFactory.java
@@ -0,0 +1,43 @@
+package com.njcn.prepare.harmonic.api.line.fallback;
+
+import com.njcn.common.pojo.enums.response.CommonResponseEnum;
+import com.njcn.common.pojo.exception.BusinessException;
+import com.njcn.common.pojo.response.HttpResult;
+import com.njcn.device.pq.utils.DeviceEnumUtil;
+import com.njcn.prepare.harmonic.api.line.LimitTargetFeignClient;
+import com.njcn.prepare.harmonic.pojo.param.LineParam;
+import feign.hystrix.FallbackFactory;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.RequestBody;
+
+/**
+ * ReportFeignClientFallbackFactory
+ *
+ * @author qijian
+ * @version 1.0.0
+ * @createTime 2022/10/24 - 9:52
+ */
+@Slf4j
+@Component
+public class LimitTargetFeignClientFallbackFactory implements FallbackFactory<LimitTargetFeignClient> {
+
+    @Override
+    public LimitTargetFeignClient create(Throwable throwable) {
+        Enum<?> exceptionEnum = CommonResponseEnum.SERVICE_FALLBACK;
+        if (throwable.getCause() instanceof BusinessException) {
+            BusinessException businessException = (BusinessException)throwable.getCause();
+            exceptionEnum = DeviceEnumUtil.getExceptionEnum(businessException.getResult());
+        }
+
+        Enum<?> finalExceptionEnum = exceptionEnum;
+        return new LimitTargetFeignClient() {
+            @Override
+            public HttpResult<String> getLimitTargetData(@RequestBody @Validated LineParam lineParam) {
+                log.error("{}异常，降级处理，异常为：{}", "越限数据:  ", throwable.toString());
+                throw new BusinessException(finalExceptionEnum);
+            }
+        };
+    }
+}
diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/fallback/LimitrateFeignClientFallbackFactory.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/fallback/LimitrateFeignClientFallbackFactory.java
new file mode 100644
index 000000000..43d147931
--- /dev/null
+++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/fallback/LimitrateFeignClientFallbackFactory.java
@@ -0,0 +1,43 @@
+package com.njcn.prepare.harmonic.api.line.fallback;
+
+import com.njcn.common.pojo.enums.response.CommonResponseEnum;
+import com.njcn.common.pojo.exception.BusinessException;
+import com.njcn.common.pojo.response.HttpResult;
+import com.njcn.device.pq.utils.DeviceEnumUtil;
+import com.njcn.prepare.harmonic.api.line.LimitrateFeignClient;
+import com.njcn.prepare.harmonic.pojo.param.LimitRateHanlderParam;
+import com.njcn.prepare.harmonic.pojo.param.LineParam;
+import feign.hystrix.FallbackFactory;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+import org.springframework.web.bind.annotation.RequestBody;
+
+/**
+ * ReportFeignClientFallbackFactory
+ *
+ * @author qijian
+ * @version 1.0.0
+ * @createTime 2022/10/24 - 9:52
+ */
+@Slf4j
+@Component
+public class LimitrateFeignClientFallbackFactory implements FallbackFactory<LimitrateFeignClient> {
+
+    @Override
+    public LimitrateFeignClient create(Throwable throwable) {
+        Enum<?> exceptionEnum = CommonResponseEnum.SERVICE_FALLBACK;
+        if (throwable.getCause() instanceof BusinessException) {
+            BusinessException businessException = (BusinessException)throwable.getCause();
+            exceptionEnum = DeviceEnumUtil.getExceptionEnum(businessException.getResult());
+        }
+
+        Enum<?> finalExceptionEnum = exceptionEnum;
+        return new LimitrateFeignClient() {
+            @Override
+            public HttpResult<Boolean> limitRateHanlder(@RequestBody LimitRateHanlderParam limitRateHanlderParam ){
+                log.error("{}异常，降级处理，异常为：{}", "越限数据处理:  ", throwable.toString());
+                throw new BusinessException(finalExceptionEnum);
+            }
+        };
+    }
+}
diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/fallback/NormalFeignClientFallbackFactory.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/fallback/NormalFeignClientFallbackFactory.java
new file mode 100644
index 000000000..f614566f6
--- /dev/null
+++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/fallback/NormalFeignClientFallbackFactory.java
@@ -0,0 +1,36 @@
+package com.njcn.prepare.harmonic.api.line.fallback;
+
+import com.njcn.common.pojo.enums.response.CommonResponseEnum;
+import com.njcn.common.pojo.exception.BusinessException;
+import com.njcn.common.pojo.response.HttpResult;
+import com.njcn.device.pq.utils.DeviceEnumUtil;
+import com.njcn.prepare.harmonic.api.line.NormalLimitFeignClient;
+import feign.hystrix.FallbackFactory;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+
+/**
+ * NormalFeignClientFallbackFactory
+ */
+@Slf4j
+@Component
+public class NormalFeignClientFallbackFactory implements FallbackFactory<NormalLimitFeignClient> {
+
+    @Override
+    public NormalLimitFeignClient create(Throwable throwable) {
+        Enum<?> exceptionEnum = CommonResponseEnum.SERVICE_FALLBACK;
+        if (throwable.getCause() instanceof BusinessException) {
+            BusinessException businessException = (BusinessException)throwable.getCause();
+            exceptionEnum = DeviceEnumUtil.getExceptionEnum(businessException.getResult());
+        }
+
+        Enum<?> finalExceptionEnum = exceptionEnum;
+        return new NormalLimitFeignClient() {
+            @Override
+            public HttpResult<String> getNormLimitData() {
+                log.error("{}异常，降级处理，异常为：{}", "告警数据:  ", throwable.toString());
+                throw new BusinessException(finalExceptionEnum);
+            }
+        };
+    }
+}
diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/fallback/OnlineRateFeignClientFallbackFactory.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/fallback/OnlineRateFeignClientFallbackFactory.java
new file mode 100644
index 000000000..b3f509d66
--- /dev/null
+++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/fallback/OnlineRateFeignClientFallbackFactory.java
@@ -0,0 +1,39 @@
+package com.njcn.prepare.harmonic.api.line.fallback;
+
+import com.njcn.common.pojo.enums.response.CommonResponseEnum;
+import com.njcn.common.pojo.exception.BusinessException;
+import com.njcn.common.pojo.response.HttpResult;
+import com.njcn.device.pq.utils.DeviceEnumUtil;
+import com.njcn.prepare.harmonic.api.line.OnlineRateFeignClient;
+import com.njcn.prepare.harmonic.pojo.param.LineParam;
+import feign.hystrix.FallbackFactory;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.RequestBody;
+
+/**
+ * OnlineRateFeignClientFallbackFactory
+ */
+@Slf4j
+@Component
+public class OnlineRateFeignClientFallbackFactory implements FallbackFactory<OnlineRateFeignClient> {
+
+    @Override
+    public OnlineRateFeignClient create(Throwable throwable) {
+        Enum<?> exceptionEnum = CommonResponseEnum.SERVICE_FALLBACK;
+        if (throwable.getCause() instanceof BusinessException) {
+            BusinessException businessException = (BusinessException)throwable.getCause();
+            exceptionEnum = DeviceEnumUtil.getExceptionEnum(businessException.getResult());
+        }
+
+        Enum<?> finalExceptionEnum = exceptionEnum;
+        return new OnlineRateFeignClient() {
+            @Override
+            public HttpResult<String> getOnlineRateData(@RequestBody @Validated LineParam lineParam){
+                log.error("{}异常，降级处理，异常为：{}", "在线率:  ", throwable.toString());
+                throw new BusinessException(finalExceptionEnum);
+            }
+        };
+    }
+}
diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/fallback/PollutionFeignClientFallbackFactory.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/fallback/PollutionFeignClientFallbackFactory.java
new file mode 100644
index 000000000..c7063a0f8
--- /dev/null
+++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/fallback/PollutionFeignClientFallbackFactory.java
@@ -0,0 +1,40 @@
+package com.njcn.prepare.harmonic.api.line.fallback;
+
+import com.njcn.common.pojo.enums.response.CommonResponseEnum;
+import com.njcn.common.pojo.exception.BusinessException;
+import com.njcn.common.pojo.response.HttpResult;
+import com.njcn.device.pq.utils.DeviceEnumUtil;
+import com.njcn.prepare.harmonic.api.line.PollutionFeignClient;
+import com.njcn.prepare.harmonic.pojo.param.LineParam;
+import feign.hystrix.FallbackFactory;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.RequestBody;
+
+/**
+ * PollutionFeignClientFallbackFactory
+ *
+ */
+@Slf4j
+@Component
+public class PollutionFeignClientFallbackFactory implements FallbackFactory<PollutionFeignClient> {
+
+    @Override
+    public PollutionFeignClient create(Throwable throwable) {
+        Enum<?> exceptionEnum = CommonResponseEnum.SERVICE_FALLBACK;
+        if (throwable.getCause() instanceof BusinessException) {
+            BusinessException businessException = (BusinessException)throwable.getCause();
+            exceptionEnum = DeviceEnumUtil.getExceptionEnum(businessException.getResult());
+        }
+
+        Enum<?> finalExceptionEnum = exceptionEnum;
+        return new PollutionFeignClient() {
+            @Override
+            public HttpResult<String> processPollutionData(@RequestBody @Validated LineParam lineParam){
+                log.error("{}异常，降级处理，异常为：{}", "污区数据:  ", throwable.toString());
+                throw new BusinessException(finalExceptionEnum);
+            }
+        };
+    }
+}
diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/voltage/VoltageFeignClient.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/voltage/VoltageFeignClient.java
new file mode 100644
index 000000000..943bc253a
--- /dev/null
+++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/voltage/VoltageFeignClient.java
@@ -0,0 +1,10 @@
+package com.njcn.prepare.harmonic.api.voltage;
+
+/**
+ * @author qijian
+ * @version 1.0.0
+ * @date 2022年10月24日 20:13
+ */
+public interface VoltageFeignClient {
+
+}
diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/constant/InfluxdbPOConverter.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/constant/InfluxdbPOConverter.java
new file mode 100644
index 000000000..3d53a630d
--- /dev/null
+++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/constant/InfluxdbPOConverter.java
@@ -0,0 +1,1558 @@
+package com.njcn.prepare.harmonic.constant;
+
+import com.njcn.prepare.harmonic.pojo.po.*;
+import com.njcn.prepare.harmonic.pojo.po.line.*;
+import org.mapstruct.Mapper;
+import org.mapstruct.Mapping;
+import org.mapstruct.factory.Mappers;
+import org.springframework.stereotype.Component;
+
+/**
+ * Description:Influxdb po转mysql po
+ * 接口文档访问地址：http://serverIP:port/swagger-ui.html
+ * Date: 2022/10/25  10:45【需求编号】
+ *
+ * @author clam
+ * @version V1.0.0
+ */
+@Mapper
+@Component
+public interface InfluxdbPOConverter {
+
+    InfluxdbPOConverter INFLUXDB_PO_CONVERTER = Mappers.getMapper (InfluxdbPOConverter.class);
+
+    /*DataHarmRateVPO*/
+    @Mapping(source = "v1", target = "fundamentalVoltageMax")
+    @Mapping(source = "v2", target = "harmonicVoltageContent2Max")
+    @Mapping(source = "v3", target = "harmonicVoltageContent3Max")
+    @Mapping(source = "v4", target = "harmonicVoltageContent4Max")
+    @Mapping(source = "v5", target = "harmonicVoltageContent5Max")
+    @Mapping(source = "v6", target = "harmonicVoltageContent6Max")
+    @Mapping(source = "v7", target = "harmonicVoltageContent7Max")
+    @Mapping(source = "v8", target = "harmonicVoltageContent8Max")
+    @Mapping(source = "v9", target = "harmonicVoltageContent9Max")
+    @Mapping(source = "v10", target = "harmonicVoltageContent10Max")
+    @Mapping(source = "v11", target = "harmonicVoltageContent11Max")
+    @Mapping(source = "v12", target = "harmonicVoltageContent12Max")
+    @Mapping(source = "v13", target = "harmonicVoltageContent13Max")
+    @Mapping(source = "v14", target = "harmonicVoltageContent14Max")
+    @Mapping(source = "v15", target = "harmonicVoltageContent15Max")
+    @Mapping(source = "v16", target = "harmonicVoltageContent16Max")
+    @Mapping(source = "v17", target = "harmonicVoltageContent17Max")
+    @Mapping(source = "v18", target = "harmonicVoltageContent18Max")
+    @Mapping(source = "v19", target = "harmonicVoltageContent19Max")
+    @Mapping(source = "v20", target = "harmonicVoltageContent20Max")
+    @Mapping(source = "v21", target = "harmonicVoltageContent21Max")
+    @Mapping(source = "v22", target = "harmonicVoltageContent22Max")
+    @Mapping(source = "v23", target = "harmonicVoltageContent23Max")
+    @Mapping(source = "v24", target = "harmonicVoltageContent24Max")
+    @Mapping(source = "v25", target = "harmonicVoltageContent25Max")
+    @Mapping(source = "v26", target = "harmonicVoltageContent26Max")
+    @Mapping(source = "v27", target = "harmonicVoltageContent27Max")
+    @Mapping(source = "v28", target = "harmonicVoltageContent28Max")
+    @Mapping(source = "v29", target = "harmonicVoltageContent29Max")
+    @Mapping(source = "v30", target = "harmonicVoltageContent30Max")
+    @Mapping(source = "v31", target = "harmonicVoltageContent31Max")
+    @Mapping(source = "v32", target = "harmonicVoltageContent32Max")
+    @Mapping(source = "v33", target = "harmonicVoltageContent33Max")
+    @Mapping(source = "v34", target = "harmonicVoltageContent34Max")
+    @Mapping(source = "v35", target = "harmonicVoltageContent35Max")
+    @Mapping(source = "v36", target = "harmonicVoltageContent36Max")
+    @Mapping(source = "v37", target = "harmonicVoltageContent37Max")
+    @Mapping(source = "v38", target = "harmonicVoltageContent38Max")
+    @Mapping(source = "v39", target = "harmonicVoltageContent39Max")
+    @Mapping(source = "v40", target = "harmonicVoltageContent40Max")
+    @Mapping(source = "v41", target = "harmonicVoltageContent41Max")
+    @Mapping(source = "v42", target = "harmonicVoltageContent42Max")
+    @Mapping(source = "v43", target = "harmonicVoltageContent43Max")
+    @Mapping(source = "v44", target = "harmonicVoltageContent44Max")
+    @Mapping(source = "v45", target = "harmonicVoltageContent45Max")
+    @Mapping(source = "v46", target = "harmonicVoltageContent46Max")
+    @Mapping(source = "v47", target = "harmonicVoltageContent47Max")
+    @Mapping(source = "v48", target = "harmonicVoltageContent48Max")
+    @Mapping(source = "v49", target = "harmonicVoltageContent49Max")
+    @Mapping(source = "v50", target = "harmonicVoltageContent50Max")
+
+    public RMpHarmonicVRateReportDPO dataVPOTORMpHarmonicPReportDPOMax(DataHarmRateVPO dataVPO);
+
+    @Mapping(source = "v1", target = "fundamentalVoltageMin")
+    @Mapping(source = "v2", target = "harmonicVoltageContent2Min")
+    @Mapping(source = "v3", target = "harmonicVoltageContent3Min")
+    @Mapping(source = "v4", target = "harmonicVoltageContent4Min")
+    @Mapping(source = "v5", target = "harmonicVoltageContent5Min")
+    @Mapping(source = "v6", target = "harmonicVoltageContent6Min")
+    @Mapping(source = "v7", target = "harmonicVoltageContent7Min")
+    @Mapping(source = "v8", target = "harmonicVoltageContent8Min")
+    @Mapping(source = "v9", target = "harmonicVoltageContent9Min")
+    @Mapping(source = "v10", target = "harmonicVoltageContent10Min")
+    @Mapping(source = "v11", target = "harmonicVoltageContent11Min")
+    @Mapping(source = "v12", target = "harmonicVoltageContent12Min")
+    @Mapping(source = "v13", target = "harmonicVoltageContent13Min")
+    @Mapping(source = "v14", target = "harmonicVoltageContent14Min")
+    @Mapping(source = "v15", target = "harmonicVoltageContent15Min")
+    @Mapping(source = "v16", target = "harmonicVoltageContent16Min")
+    @Mapping(source = "v17", target = "harmonicVoltageContent17Min")
+    @Mapping(source = "v18", target = "harmonicVoltageContent18Min")
+    @Mapping(source = "v19", target = "harmonicVoltageContent19Min")
+    @Mapping(source = "v20", target = "harmonicVoltageContent20Min")
+    @Mapping(source = "v21", target = "harmonicVoltageContent21Min")
+    @Mapping(source = "v22", target = "harmonicVoltageContent22Min")
+    @Mapping(source = "v23", target = "harmonicVoltageContent23Min")
+    @Mapping(source = "v24", target = "harmonicVoltageContent24Min")
+    @Mapping(source = "v25", target = "harmonicVoltageContent25Min")
+    @Mapping(source = "v26", target = "harmonicVoltageContent26Min")
+    @Mapping(source = "v27", target = "harmonicVoltageContent27Min")
+    @Mapping(source = "v28", target = "harmonicVoltageContent28Min")
+    @Mapping(source = "v29", target = "harmonicVoltageContent29Min")
+    @Mapping(source = "v30", target = "harmonicVoltageContent30Min")
+    @Mapping(source = "v31", target = "harmonicVoltageContent31Min")
+    @Mapping(source = "v32", target = "harmonicVoltageContent32Min")
+    @Mapping(source = "v33", target = "harmonicVoltageContent33Min")
+    @Mapping(source = "v34", target = "harmonicVoltageContent34Min")
+    @Mapping(source = "v35", target = "harmonicVoltageContent35Min")
+    @Mapping(source = "v36", target = "harmonicVoltageContent36Min")
+    @Mapping(source = "v37", target = "harmonicVoltageContent37Min")
+    @Mapping(source = "v38", target = "harmonicVoltageContent38Min")
+    @Mapping(source = "v39", target = "harmonicVoltageContent39Min")
+    @Mapping(source = "v40", target = "harmonicVoltageContent40Min")
+    @Mapping(source = "v41", target = "harmonicVoltageContent41Min")
+    @Mapping(source = "v42", target = "harmonicVoltageContent42Min")
+    @Mapping(source = "v43", target = "harmonicVoltageContent43Min")
+    @Mapping(source = "v44", target = "harmonicVoltageContent44Min")
+    @Mapping(source = "v45", target = "harmonicVoltageContent45Min")
+    @Mapping(source = "v46", target = "harmonicVoltageContent46Min")
+    @Mapping(source = "v47", target = "harmonicVoltageContent47Min")
+    @Mapping(source = "v48", target = "harmonicVoltageContent48Min")
+    @Mapping(source = "v49", target = "harmonicVoltageContent49Min")
+    @Mapping(source = "v50", target = "harmonicVoltageContent50Min")
+    public RMpHarmonicVRateReportDPO dataVPOTORMpHarmonicPReportDPOMin(DataHarmRateVPO dataVPO);
+
+
+    @Mapping(source = "v1", target = "fundamentalVoltageAvg")
+    @Mapping(source = "v2", target = "harmonicVoltageContent2Avg")
+    @Mapping(source = "v3", target = "harmonicVoltageContent3Avg")
+    @Mapping(source = "v4", target = "harmonicVoltageContent4Avg")
+    @Mapping(source = "v5", target = "harmonicVoltageContent5Avg")
+    @Mapping(source = "v6", target = "harmonicVoltageContent6Avg")
+    @Mapping(source = "v7", target = "harmonicVoltageContent7Avg")
+    @Mapping(source = "v8", target = "harmonicVoltageContent8Avg")
+    @Mapping(source = "v9", target = "harmonicVoltageContent9Avg")
+    @Mapping(source = "v10", target = "harmonicVoltageContent10Avg")
+    @Mapping(source = "v11", target = "harmonicVoltageContent11Avg")
+    @Mapping(source = "v12", target = "harmonicVoltageContent12Avg")
+    @Mapping(source = "v13", target = "harmonicVoltageContent13Avg")
+    @Mapping(source = "v14", target = "harmonicVoltageContent14Avg")
+    @Mapping(source = "v15", target = "harmonicVoltageContent15Avg")
+    @Mapping(source = "v16", target = "harmonicVoltageContent16Avg")
+    @Mapping(source = "v17", target = "harmonicVoltageContent17Avg")
+    @Mapping(source = "v18", target = "harmonicVoltageContent18Avg")
+    @Mapping(source = "v19", target = "harmonicVoltageContent19Avg")
+    @Mapping(source = "v20", target = "harmonicVoltageContent20Avg")
+    @Mapping(source = "v21", target = "harmonicVoltageContent21Avg")
+    @Mapping(source = "v22", target = "harmonicVoltageContent22Avg")
+    @Mapping(source = "v23", target = "harmonicVoltageContent23Avg")
+    @Mapping(source = "v24", target = "harmonicVoltageContent24Avg")
+    @Mapping(source = "v25", target = "harmonicVoltageContent25Avg")
+    @Mapping(source = "v26", target = "harmonicVoltageContent26Avg")
+    @Mapping(source = "v27", target = "harmonicVoltageContent27Avg")
+    @Mapping(source = "v28", target = "harmonicVoltageContent28Avg")
+    @Mapping(source = "v29", target = "harmonicVoltageContent29Avg")
+    @Mapping(source = "v30", target = "harmonicVoltageContent30Avg")
+    @Mapping(source = "v31", target = "harmonicVoltageContent31Avg")
+    @Mapping(source = "v32", target = "harmonicVoltageContent32Avg")
+    @Mapping(source = "v33", target = "harmonicVoltageContent33Avg")
+    @Mapping(source = "v34", target = "harmonicVoltageContent34Avg")
+    @Mapping(source = "v35", target = "harmonicVoltageContent35Avg")
+    @Mapping(source = "v36", target = "harmonicVoltageContent36Avg")
+    @Mapping(source = "v37", target = "harmonicVoltageContent37Avg")
+    @Mapping(source = "v38", target = "harmonicVoltageContent38Avg")
+    @Mapping(source = "v39", target = "harmonicVoltageContent39Avg")
+    @Mapping(source = "v40", target = "harmonicVoltageContent40Avg")
+    @Mapping(source = "v41", target = "harmonicVoltageContent41Avg")
+    @Mapping(source = "v42", target = "harmonicVoltageContent42Avg")
+    @Mapping(source = "v43", target = "harmonicVoltageContent43Avg")
+    @Mapping(source = "v44", target = "harmonicVoltageContent44Avg")
+    @Mapping(source = "v45", target = "harmonicVoltageContent45Avg")
+    @Mapping(source = "v46", target = "harmonicVoltageContent46Avg")
+    @Mapping(source = "v47", target = "harmonicVoltageContent47Avg")
+    @Mapping(source = "v48", target = "harmonicVoltageContent48Avg")
+    @Mapping(source = "v49", target = "harmonicVoltageContent49Avg")
+    @Mapping(source = "v50", target = "harmonicVoltageContent50Avg")
+    public RMpHarmonicVRateReportDPO dataVPOTORMpHarmonicPReportDPOAvg(DataHarmRateVPO dataVPO);
+
+
+    @Mapping(source = "v1", target = "fundamentalVoltage95")
+    @Mapping(source = "v2", target = "harmonicVoltageContent295")
+    @Mapping(source = "v3", target = "harmonicVoltageContent395")
+    @Mapping(source = "v4", target = "harmonicVoltageContent495")
+    @Mapping(source = "v5", target = "harmonicVoltageContent595")
+    @Mapping(source = "v6", target = "harmonicVoltageContent695")
+    @Mapping(source = "v7", target = "harmonicVoltageContent795")
+    @Mapping(source = "v8", target = "harmonicVoltageContent895")
+    @Mapping(source = "v9", target = "harmonicVoltageContent995")
+    @Mapping(source = "v10", target = "harmonicVoltageContent1095")
+    @Mapping(source = "v11", target = "harmonicVoltageContent1195")
+    @Mapping(source = "v12", target = "harmonicVoltageContent1295")
+    @Mapping(source = "v13", target = "harmonicVoltageContent1395")
+    @Mapping(source = "v14", target = "harmonicVoltageContent1495")
+    @Mapping(source = "v15", target = "harmonicVoltageContent1595")
+    @Mapping(source = "v16", target = "harmonicVoltageContent1695")
+    @Mapping(source = "v17", target = "harmonicVoltageContent1795")
+    @Mapping(source = "v18", target = "harmonicVoltageContent1895")
+    @Mapping(source = "v19", target = "harmonicVoltageContent1995")
+    @Mapping(source = "v20", target = "harmonicVoltageContent2095")
+    @Mapping(source = "v21", target = "harmonicVoltageContent2195")
+    @Mapping(source = "v22", target = "harmonicVoltageContent2295")
+    @Mapping(source = "v23", target = "harmonicVoltageContent2395")
+    @Mapping(source = "v24", target = "harmonicVoltageContent2495")
+    @Mapping(source = "v25", target = "harmonicVoltageContent2595")
+    @Mapping(source = "v26", target = "harmonicVoltageContent2695")
+    @Mapping(source = "v27", target = "harmonicVoltageContent2795")
+    @Mapping(source = "v28", target = "harmonicVoltageContent2895")
+    @Mapping(source = "v29", target = "harmonicVoltageContent2995")
+    @Mapping(source = "v30", target = "harmonicVoltageContent3095")
+    @Mapping(source = "v31", target = "harmonicVoltageContent3195")
+    @Mapping(source = "v32", target = "harmonicVoltageContent3295")
+    @Mapping(source = "v33", target = "harmonicVoltageContent3395")
+    @Mapping(source = "v34", target = "harmonicVoltageContent3495")
+    @Mapping(source = "v35", target = "harmonicVoltageContent3595")
+    @Mapping(source = "v36", target = "harmonicVoltageContent3695")
+    @Mapping(source = "v37", target = "harmonicVoltageContent3795")
+    @Mapping(source = "v38", target = "harmonicVoltageContent3895")
+    @Mapping(source = "v39", target = "harmonicVoltageContent3995")
+    @Mapping(source = "v40", target = "harmonicVoltageContent4095")
+    @Mapping(source = "v41", target = "harmonicVoltageContent4195")
+    @Mapping(source = "v42", target = "harmonicVoltageContent4295")
+    @Mapping(source = "v43", target = "harmonicVoltageContent4395")
+    @Mapping(source = "v44", target = "harmonicVoltageContent4495")
+    @Mapping(source = "v45", target = "harmonicVoltageContent4595")
+    @Mapping(source = "v46", target = "harmonicVoltageContent4695")
+    @Mapping(source = "v47", target = "harmonicVoltageContent4795")
+    @Mapping(source = "v48", target = "harmonicVoltageContent4895")
+    @Mapping(source = "v49", target = "harmonicVoltageContent4995")
+    @Mapping(source = "v50", target = "harmonicVoltageContent5095")
+    public RMpHarmonicVRateReportDPO dataVPOTORMpHarmonicPReportDPO95(DataHarmRateVPO dataVPO);
+
+
+    /*DataIPO*/
+    @Mapping(source = "IThd", target = "harmonicCurrentThdMax")
+    @Mapping(source = "i1", target = "fundamentalCurrentMax")
+    @Mapping(source = "i2", target = "harmonicCurrentEffective2Max")
+    @Mapping(source = "i3", target = "harmonicCurrentEffective3Max")
+    @Mapping(source = "i4", target = "harmonicCurrentEffective4Max")
+    @Mapping(source = "i5", target = "harmonicCurrentEffective5Max")
+    @Mapping(source = "i6", target = "harmonicCurrentEffective6Max")
+    @Mapping(source = "i7", target = "harmonicCurrentEffective7Max")
+    @Mapping(source = "i8", target = "harmonicCurrentEffective8Max")
+    @Mapping(source = "i9", target = "harmonicCurrentEffective9Max")
+    @Mapping(source = "i10", target = "harmonicCurrentEffective10Max")
+    @Mapping(source = "i11", target = "harmonicCurrentEffective11Max")
+    @Mapping(source = "i12", target = "harmonicCurrentEffective12Max")
+    @Mapping(source = "i13", target = "harmonicCurrentEffective13Max")
+    @Mapping(source = "i14", target = "harmonicCurrentEffective14Max")
+    @Mapping(source = "i15", target = "harmonicCurrentEffective15Max")
+    @Mapping(source = "i16", target = "harmonicCurrentEffective16Max")
+    @Mapping(source = "i17", target = "harmonicCurrentEffective17Max")
+    @Mapping(source = "i18", target = "harmonicCurrentEffective18Max")
+    @Mapping(source = "i19", target = "harmonicCurrentEffective19Max")
+    @Mapping(source = "i20", target = "harmonicCurrentEffective20Max")
+    @Mapping(source = "i21", target = "harmonicCurrentEffective21Max")
+    @Mapping(source = "i22", target = "harmonicCurrentEffective22Max")
+    @Mapping(source = "i23", target = "harmonicCurrentEffective23Max")
+    @Mapping(source = "i24", target = "harmonicCurrentEffective24Max")
+    @Mapping(source = "i25", target = "harmonicCurrentEffective25Max")
+    @Mapping(source = "i26", target = "harmonicCurrentEffective26Max")
+    @Mapping(source = "i27", target = "harmonicCurrentEffective27Max")
+    @Mapping(source = "i28", target = "harmonicCurrentEffective28Max")
+    @Mapping(source = "i29", target = "harmonicCurrentEffective29Max")
+    @Mapping(source = "i30", target = "harmonicCurrentEffective30Max")
+    @Mapping(source = "i31", target = "harmonicCurrentEffective31Max")
+    @Mapping(source = "i32", target = "harmonicCurrentEffective32Max")
+    @Mapping(source = "i33", target = "harmonicCurrentEffective33Max")
+    @Mapping(source = "i34", target = "harmonicCurrentEffective34Max")
+    @Mapping(source = "i35", target = "harmonicCurrentEffective35Max")
+    @Mapping(source = "i36", target = "harmonicCurrentEffective36Max")
+    @Mapping(source = "i37", target = "harmonicCurrentEffective37Max")
+    @Mapping(source = "i38", target = "harmonicCurrentEffective38Max")
+    @Mapping(source = "i39", target = "harmonicCurrentEffective39Max")
+    @Mapping(source = "i40", target = "harmonicCurrentEffective40Max")
+    @Mapping(source = "i41", target = "harmonicCurrentEffective41Max")
+    @Mapping(source = "i42", target = "harmonicCurrentEffective42Max")
+    @Mapping(source = "i43", target = "harmonicCurrentEffective43Max")
+    @Mapping(source = "i44", target = "harmonicCurrentEffective44Max")
+    @Mapping(source = "i45", target = "harmonicCurrentEffective45Max")
+    @Mapping(source = "i46", target = "harmonicCurrentEffective46Max")
+    @Mapping(source = "i47", target = "harmonicCurrentEffective47Max")
+    @Mapping(source = "i48", target = "harmonicCurrentEffective48Max")
+    @Mapping(source = "i49", target = "harmonicCurrentEffective49Max")
+    @Mapping(source = "i50", target = "harmonicCurrentEffective50Max")
+    public RMpHarmonicIMagReportDPO dataIPOTORMpHarmonicIMagReportDPOMax(DataIPO dataIPO);
+
+    @Mapping(source = "IThd", target = "harmonicCurrentThdMin")
+    @Mapping(source = "i1", target = "fundamentalCurrentMin")
+    @Mapping(source = "i2", target = "harmonicCurrentEffective2Min")
+    @Mapping(source = "i3", target = "harmonicCurrentEffective3Min")
+    @Mapping(source = "i4", target = "harmonicCurrentEffective4Min")
+    @Mapping(source = "i5", target = "harmonicCurrentEffective5Min")
+    @Mapping(source = "i6", target = "harmonicCurrentEffective6Min")
+    @Mapping(source = "i7", target = "harmonicCurrentEffective7Min")
+    @Mapping(source = "i8", target = "harmonicCurrentEffective8Min")
+    @Mapping(source = "i9", target = "harmonicCurrentEffective9Min")
+    @Mapping(source = "i10", target = "harmonicCurrentEffective10Min")
+    @Mapping(source = "i11", target = "harmonicCurrentEffective11Min")
+    @Mapping(source = "i12", target = "harmonicCurrentEffective12Min")
+    @Mapping(source = "i13", target = "harmonicCurrentEffective13Min")
+    @Mapping(source = "i14", target = "harmonicCurrentEffective14Min")
+    @Mapping(source = "i15", target = "harmonicCurrentEffective15Min")
+    @Mapping(source = "i16", target = "harmonicCurrentEffective16Min")
+    @Mapping(source = "i17", target = "harmonicCurrentEffective17Min")
+    @Mapping(source = "i18", target = "harmonicCurrentEffective18Min")
+    @Mapping(source = "i19", target = "harmonicCurrentEffective19Min")
+    @Mapping(source = "i20", target = "harmonicCurrentEffective20Min")
+    @Mapping(source = "i21", target = "harmonicCurrentEffective21Min")
+    @Mapping(source = "i22", target = "harmonicCurrentEffective22Min")
+    @Mapping(source = "i23", target = "harmonicCurrentEffective23Min")
+    @Mapping(source = "i24", target = "harmonicCurrentEffective24Min")
+    @Mapping(source = "i25", target = "harmonicCurrentEffective25Min")
+    @Mapping(source = "i26", target = "harmonicCurrentEffective26Min")
+    @Mapping(source = "i27", target = "harmonicCurrentEffective27Min")
+    @Mapping(source = "i28", target = "harmonicCurrentEffective28Min")
+    @Mapping(source = "i29", target = "harmonicCurrentEffective29Min")
+    @Mapping(source = "i30", target = "harmonicCurrentEffective30Min")
+    @Mapping(source = "i31", target = "harmonicCurrentEffective31Min")
+    @Mapping(source = "i32", target = "harmonicCurrentEffective32Min")
+    @Mapping(source = "i33", target = "harmonicCurrentEffective33Min")
+    @Mapping(source = "i34", target = "harmonicCurrentEffective34Min")
+    @Mapping(source = "i35", target = "harmonicCurrentEffective35Min")
+    @Mapping(source = "i36", target = "harmonicCurrentEffective36Min")
+    @Mapping(source = "i37", target = "harmonicCurrentEffective37Min")
+    @Mapping(source = "i38", target = "harmonicCurrentEffective38Min")
+    @Mapping(source = "i39", target = "harmonicCurrentEffective39Min")
+    @Mapping(source = "i40", target = "harmonicCurrentEffective40Min")
+    @Mapping(source = "i41", target = "harmonicCurrentEffective41Min")
+    @Mapping(source = "i42", target = "harmonicCurrentEffective42Min")
+    @Mapping(source = "i43", target = "harmonicCurrentEffective43Min")
+    @Mapping(source = "i44", target = "harmonicCurrentEffective44Min")
+    @Mapping(source = "i45", target = "harmonicCurrentEffective45Min")
+    @Mapping(source = "i46", target = "harmonicCurrentEffective46Min")
+    @Mapping(source = "i47", target = "harmonicCurrentEffective47Min")
+    @Mapping(source = "i48", target = "harmonicCurrentEffective48Min")
+    @Mapping(source = "i49", target = "harmonicCurrentEffective49Min")
+    @Mapping(source = "i50", target = "harmonicCurrentEffective50Min")
+    public RMpHarmonicIMagReportDPO dataIPOTORMpHarmonicIMagReportDPOMin(DataIPO dataIPO);
+
+
+    @Mapping(source = "IThd", target = "harmonicCurrentThdAvg")
+    @Mapping(source = "i1", target = "fundamentalCurrentAvg")
+    @Mapping(source = "i2", target = "harmonicCurrentEffective2Avg")
+    @Mapping(source = "i3", target = "harmonicCurrentEffective3Avg")
+    @Mapping(source = "i4", target = "harmonicCurrentEffective4Avg")
+    @Mapping(source = "i5", target = "harmonicCurrentEffective5Avg")
+    @Mapping(source = "i6", target = "harmonicCurrentEffective6Avg")
+    @Mapping(source = "i7", target = "harmonicCurrentEffective7Avg")
+    @Mapping(source = "i8", target = "harmonicCurrentEffective8Avg")
+    @Mapping(source = "i9", target = "harmonicCurrentEffective9Avg")
+    @Mapping(source = "i10", target = "harmonicCurrentEffective10Avg")
+    @Mapping(source = "i11", target = "harmonicCurrentEffective11Avg")
+    @Mapping(source = "i12", target = "harmonicCurrentEffective12Avg")
+    @Mapping(source = "i13", target = "harmonicCurrentEffective13Avg")
+    @Mapping(source = "i14", target = "harmonicCurrentEffective14Avg")
+    @Mapping(source = "i15", target = "harmonicCurrentEffective15Avg")
+    @Mapping(source = "i16", target = "harmonicCurrentEffective16Avg")
+    @Mapping(source = "i17", target = "harmonicCurrentEffective17Avg")
+    @Mapping(source = "i18", target = "harmonicCurrentEffective18Avg")
+    @Mapping(source = "i19", target = "harmonicCurrentEffective19Avg")
+    @Mapping(source = "i20", target = "harmonicCurrentEffective20Avg")
+    @Mapping(source = "i21", target = "harmonicCurrentEffective21Avg")
+    @Mapping(source = "i22", target = "harmonicCurrentEffective22Avg")
+    @Mapping(source = "i23", target = "harmonicCurrentEffective23Avg")
+    @Mapping(source = "i24", target = "harmonicCurrentEffective24Avg")
+    @Mapping(source = "i25", target = "harmonicCurrentEffective25Avg")
+    @Mapping(source = "i26", target = "harmonicCurrentEffective26Avg")
+    @Mapping(source = "i27", target = "harmonicCurrentEffective27Avg")
+    @Mapping(source = "i28", target = "harmonicCurrentEffective28Avg")
+    @Mapping(source = "i29", target = "harmonicCurrentEffective29Avg")
+    @Mapping(source = "i30", target = "harmonicCurrentEffective30Avg")
+    @Mapping(source = "i31", target = "harmonicCurrentEffective31Avg")
+    @Mapping(source = "i32", target = "harmonicCurrentEffective32Avg")
+    @Mapping(source = "i33", target = "harmonicCurrentEffective33Avg")
+    @Mapping(source = "i34", target = "harmonicCurrentEffective34Avg")
+    @Mapping(source = "i35", target = "harmonicCurrentEffective35Avg")
+    @Mapping(source = "i36", target = "harmonicCurrentEffective36Avg")
+    @Mapping(source = "i37", target = "harmonicCurrentEffective37Avg")
+    @Mapping(source = "i38", target = "harmonicCurrentEffective38Avg")
+    @Mapping(source = "i39", target = "harmonicCurrentEffective39Avg")
+    @Mapping(source = "i40", target = "harmonicCurrentEffective40Avg")
+    @Mapping(source = "i41", target = "harmonicCurrentEffective41Avg")
+    @Mapping(source = "i42", target = "harmonicCurrentEffective42Avg")
+    @Mapping(source = "i43", target = "harmonicCurrentEffective43Avg")
+    @Mapping(source = "i44", target = "harmonicCurrentEffective44Avg")
+    @Mapping(source = "i45", target = "harmonicCurrentEffective45Avg")
+    @Mapping(source = "i46", target = "harmonicCurrentEffective46Avg")
+    @Mapping(source = "i47", target = "harmonicCurrentEffective47Avg")
+    @Mapping(source = "i48", target = "harmonicCurrentEffective48Avg")
+    @Mapping(source = "i49", target = "harmonicCurrentEffective49Avg")
+    @Mapping(source = "i50", target = "harmonicCurrentEffective50Avg")
+    public RMpHarmonicIMagReportDPO dataIPOTORMpHarmonicIMagReportDPOAvg(DataIPO dataIPO);
+
+
+    @Mapping(source = "IThd", target = "harmonicCurrentThd95")
+    @Mapping(source = "i1", target = "fundamentalCurrent95")
+    @Mapping(source = "i2", target = "harmonicCurrentEffective295")
+    @Mapping(source = "i3", target = "harmonicCurrentEffective395")
+    @Mapping(source = "i4", target = "harmonicCurrentEffective495")
+    @Mapping(source = "i5", target = "harmonicCurrentEffective595")
+    @Mapping(source = "i6", target = "harmonicCurrentEffective695")
+    @Mapping(source = "i7", target = "harmonicCurrentEffective795")
+    @Mapping(source = "i8", target = "harmonicCurrentEffective895")
+    @Mapping(source = "i9", target = "harmonicCurrentEffective995")
+    @Mapping(source = "i10", target = "harmonicCurrentEffective1095")
+    @Mapping(source = "i11", target = "harmonicCurrentEffective1195")
+    @Mapping(source = "i12", target = "harmonicCurrentEffective1295")
+    @Mapping(source = "i13", target = "harmonicCurrentEffective1395")
+    @Mapping(source = "i14", target = "harmonicCurrentEffective1495")
+    @Mapping(source = "i15", target = "harmonicCurrentEffective1595")
+    @Mapping(source = "i16", target = "harmonicCurrentEffective1695")
+    @Mapping(source = "i17", target = "harmonicCurrentEffective1795")
+    @Mapping(source = "i18", target = "harmonicCurrentEffective1895")
+    @Mapping(source = "i19", target = "harmonicCurrentEffective1995")
+    @Mapping(source = "i20", target = "harmonicCurrentEffective2095")
+    @Mapping(source = "i21", target = "harmonicCurrentEffective2195")
+    @Mapping(source = "i22", target = "harmonicCurrentEffective2295")
+    @Mapping(source = "i23", target = "harmonicCurrentEffective2395")
+    @Mapping(source = "i24", target = "harmonicCurrentEffective2495")
+    @Mapping(source = "i25", target = "harmonicCurrentEffective2595")
+    @Mapping(source = "i26", target = "harmonicCurrentEffective2695")
+    @Mapping(source = "i27", target = "harmonicCurrentEffective2795")
+    @Mapping(source = "i28", target = "harmonicCurrentEffective2895")
+    @Mapping(source = "i29", target = "harmonicCurrentEffective2995")
+    @Mapping(source = "i30", target = "harmonicCurrentEffective3095")
+    @Mapping(source = "i31", target = "harmonicCurrentEffective3195")
+    @Mapping(source = "i32", target = "harmonicCurrentEffective3295")
+    @Mapping(source = "i33", target = "harmonicCurrentEffective3395")
+    @Mapping(source = "i34", target = "harmonicCurrentEffective3495")
+    @Mapping(source = "i35", target = "harmonicCurrentEffective3595")
+    @Mapping(source = "i36", target = "harmonicCurrentEffective3695")
+    @Mapping(source = "i37", target = "harmonicCurrentEffective3795")
+    @Mapping(source = "i38", target = "harmonicCurrentEffective3895")
+    @Mapping(source = "i39", target = "harmonicCurrentEffective3995")
+    @Mapping(source = "i40", target = "harmonicCurrentEffective4095")
+    @Mapping(source = "i41", target = "harmonicCurrentEffective4195")
+    @Mapping(source = "i42", target = "harmonicCurrentEffective4295")
+    @Mapping(source = "i43", target = "harmonicCurrentEffective4395")
+    @Mapping(source = "i44", target = "harmonicCurrentEffective4495")
+    @Mapping(source = "i45", target = "harmonicCurrentEffective4595")
+    @Mapping(source = "i46", target = "harmonicCurrentEffective4695")
+    @Mapping(source = "i47", target = "harmonicCurrentEffective4795")
+    @Mapping(source = "i48", target = "harmonicCurrentEffective4895")
+    @Mapping(source = "i49", target = "harmonicCurrentEffective4995")
+    @Mapping(source = "i50", target = "harmonicCurrentEffective5095")
+    public RMpHarmonicIMagReportDPO dataIPOTORMpHarmonicIMagReportDPO95(DataIPO dataIPO);
+
+
+    /*RMpFlickerReportDPO*/
+    @Mapping(source = "fluc", target = "voltageFluctuationMax")
+    @Mapping(source = "plt", target = "shortTermSeverityMax")
+    public RMpFlickerReportDPO rMpFlickerReportDPOConverterMax(DataFlickerPO dataFlickerPO);
+
+    @Mapping(source = "fluc", target = "voltageFluctuationMin")
+    @Mapping(source = "plt", target = "shortTermSeverityMin")
+    public RMpFlickerReportDPO rMpFlickerReportDPOConverterMin(DataFlickerPO dataFlickerPO);
+
+    @Mapping(source = "fluc", target = "voltageFluctuationAvg")
+    @Mapping(source = "plt", target = "shortTermSeverityAvg")
+    public RMpFlickerReportDPO rMpFlickerReportDPOConverterAvg(DataFlickerPO dataFlickerPO);
+
+    @Mapping(source = "fluc", target = "voltageFluctuation95")
+    @Mapping(source = "plt", target = "shortTermSeverity95")
+    public RMpFlickerReportDPO rMpFlickerReportDPOConverter95(DataFlickerPO dataFlickerPO);
+
+    /*RMpHarmonicIRateReportDPO*/
+    @Mapping(source = "i2", target = "i2Min")
+    @Mapping(source = "i3", target = "i3Min")
+    @Mapping(source = "i4", target = "i4Min")
+    @Mapping(source = "i5", target = "i5Min")
+    @Mapping(source = "i6", target = "i6Min")
+    @Mapping(source = "i7", target = "i7Min")
+    @Mapping(source = "i8", target = "i8Min")
+    @Mapping(source = "i9", target = "i9Min")
+    @Mapping(source = "i10", target = "i10Min")
+    @Mapping(source = "i11", target = "i11Min")
+    @Mapping(source = "i12", target = "i12Min")
+    @Mapping(source = "i13", target = "i13Min")
+    @Mapping(source = "i14", target = "i14Min")
+    @Mapping(source = "i15", target = "i15Min")
+    @Mapping(source = "i16", target = "i16Min")
+    @Mapping(source = "i17", target = "i17Min")
+    @Mapping(source = "i18", target = "i18Min")
+    @Mapping(source = "i19", target = "i19Min")
+    @Mapping(source = "i20", target = "i20Min")
+    @Mapping(source = "i21", target = "i21Min")
+    @Mapping(source = "i22", target = "i22Min")
+    @Mapping(source = "i23", target = "i23Min")
+    @Mapping(source = "i24", target = "i24Min")
+    @Mapping(source = "i25", target = "i25Min")
+    @Mapping(source = "i26", target = "i26Min")
+    @Mapping(source = "i27", target = "i27Min")
+    @Mapping(source = "i28", target = "i28Min")
+    @Mapping(source = "i29", target = "i29Min")
+    @Mapping(source = "i30", target = "i30Min")
+    @Mapping(source = "i31", target = "i31Min")
+    @Mapping(source = "i32", target = "i32Min")
+    @Mapping(source = "i33", target = "i33Min")
+    @Mapping(source = "i34", target = "i34Min")
+    @Mapping(source = "i35", target = "i35Min")
+    @Mapping(source = "i36", target = "i36Min")
+    @Mapping(source = "i37", target = "i37Min")
+    @Mapping(source = "i38", target = "i38Min")
+    @Mapping(source = "i39", target = "i39Min")
+    @Mapping(source = "i40", target = "i40Min")
+    @Mapping(source = "i41", target = "i41Min")
+    @Mapping(source = "i42", target = "i42Min")
+    @Mapping(source = "i43", target = "i43Min")
+    @Mapping(source = "i44", target = "i44Min")
+    @Mapping(source = "i45", target = "i45Min")
+    @Mapping(source = "i46", target = "i46Min")
+    @Mapping(source = "i47", target = "i47Min")
+    @Mapping(source = "i48", target = "i48Min")
+    @Mapping(source = "i49", target = "i49Min")
+    @Mapping(source = "i50", target = "i50Min")
+    public RMpHarmonicIRateReportDPO RMpHarmonicIRateReportDPOConverterMin(DataHarmRateIPO dataHarmRateIPO);
+
+    @Mapping(source = "i2", target = "i2Max")
+    @Mapping(source = "i3", target = "i3Max")
+    @Mapping(source = "i4", target = "i4Max")
+    @Mapping(source = "i5", target = "i5Max")
+    @Mapping(source = "i6", target = "i6Max")
+    @Mapping(source = "i7", target = "i7Max")
+    @Mapping(source = "i8", target = "i8Max")
+    @Mapping(source = "i9", target = "i9Max")
+    @Mapping(source = "i10", target = "i10Max")
+    @Mapping(source = "i11", target = "i11Max")
+    @Mapping(source = "i12", target = "i12Max")
+    @Mapping(source = "i13", target = "i13Max")
+    @Mapping(source = "i14", target = "i14Max")
+    @Mapping(source = "i15", target = "i15Max")
+    @Mapping(source = "i16", target = "i16Max")
+    @Mapping(source = "i17", target = "i17Max")
+    @Mapping(source = "i18", target = "i18Max")
+    @Mapping(source = "i19", target = "i19Max")
+    @Mapping(source = "i20", target = "i20Max")
+    @Mapping(source = "i21", target = "i21Max")
+    @Mapping(source = "i22", target = "i22Max")
+    @Mapping(source = "i23", target = "i23Max")
+    @Mapping(source = "i24", target = "i24Max")
+    @Mapping(source = "i25", target = "i25Max")
+    @Mapping(source = "i26", target = "i26Max")
+    @Mapping(source = "i27", target = "i27Max")
+    @Mapping(source = "i28", target = "i28Max")
+    @Mapping(source = "i29", target = "i29Max")
+    @Mapping(source = "i30", target = "i30Max")
+    @Mapping(source = "i31", target = "i31Max")
+    @Mapping(source = "i32", target = "i32Max")
+    @Mapping(source = "i33", target = "i33Max")
+    @Mapping(source = "i34", target = "i34Max")
+    @Mapping(source = "i35", target = "i35Max")
+    @Mapping(source = "i36", target = "i36Max")
+    @Mapping(source = "i37", target = "i37Max")
+    @Mapping(source = "i38", target = "i38Max")
+    @Mapping(source = "i39", target = "i39Max")
+    @Mapping(source = "i40", target = "i40Max")
+    @Mapping(source = "i41", target = "i41Max")
+    @Mapping(source = "i42", target = "i42Max")
+    @Mapping(source = "i43", target = "i43Max")
+    @Mapping(source = "i44", target = "i44Max")
+    @Mapping(source = "i45", target = "i45Max")
+    @Mapping(source = "i46", target = "i46Max")
+    @Mapping(source = "i47", target = "i47Max")
+    @Mapping(source = "i48", target = "i48Max")
+    @Mapping(source = "i49", target = "i49Max")
+    @Mapping(source = "i50", target = "i50Max")
+    public RMpHarmonicIRateReportDPO RMpHarmonicIRateReportDPOConverterMax(DataHarmRateIPO dataHarmRateIPO);
+
+
+    @Mapping(source = "i2", target = "i2Avg")
+    @Mapping(source = "i3", target = "i3Avg")
+    @Mapping(source = "i4", target = "i4Avg")
+    @Mapping(source = "i5", target = "i5Avg")
+    @Mapping(source = "i6", target = "i6Avg")
+    @Mapping(source = "i7", target = "i7Avg")
+    @Mapping(source = "i8", target = "i8Avg")
+    @Mapping(source = "i9", target = "i9Avg")
+    @Mapping(source = "i10", target = "i10Avg")
+    @Mapping(source = "i11", target = "i11Avg")
+    @Mapping(source = "i12", target = "i12Avg")
+    @Mapping(source = "i13", target = "i13Avg")
+    @Mapping(source = "i14", target = "i14Avg")
+    @Mapping(source = "i15", target = "i15Avg")
+    @Mapping(source = "i16", target = "i16Avg")
+    @Mapping(source = "i17", target = "i17Avg")
+    @Mapping(source = "i18", target = "i18Avg")
+    @Mapping(source = "i19", target = "i19Avg")
+    @Mapping(source = "i20", target = "i20Avg")
+    @Mapping(source = "i21", target = "i21Avg")
+    @Mapping(source = "i22", target = "i22Avg")
+    @Mapping(source = "i23", target = "i23Avg")
+    @Mapping(source = "i24", target = "i24Avg")
+    @Mapping(source = "i25", target = "i25Avg")
+    @Mapping(source = "i26", target = "i26Avg")
+    @Mapping(source = "i27", target = "i27Avg")
+    @Mapping(source = "i28", target = "i28Avg")
+    @Mapping(source = "i29", target = "i29Avg")
+    @Mapping(source = "i30", target = "i30Avg")
+    @Mapping(source = "i31", target = "i31Avg")
+    @Mapping(source = "i32", target = "i32Avg")
+    @Mapping(source = "i33", target = "i33Avg")
+    @Mapping(source = "i34", target = "i34Avg")
+    @Mapping(source = "i35", target = "i35Avg")
+    @Mapping(source = "i36", target = "i36Avg")
+    @Mapping(source = "i37", target = "i37Avg")
+    @Mapping(source = "i38", target = "i38Avg")
+    @Mapping(source = "i39", target = "i39Avg")
+    @Mapping(source = "i40", target = "i40Avg")
+    @Mapping(source = "i41", target = "i41Avg")
+    @Mapping(source = "i42", target = "i42Avg")
+    @Mapping(source = "i43", target = "i43Avg")
+    @Mapping(source = "i44", target = "i44Avg")
+    @Mapping(source = "i45", target = "i45Avg")
+    @Mapping(source = "i46", target = "i46Avg")
+    @Mapping(source = "i47", target = "i47Avg")
+    @Mapping(source = "i48", target = "i48Avg")
+    @Mapping(source = "i49", target = "i49Avg")
+    @Mapping(source = "i50", target = "i50Avg")
+    public RMpHarmonicIRateReportDPO RMpHarmonicIRateReportDPOConverterAvg(DataHarmRateIPO dataHarmRateIPO);
+
+    @Mapping(source = "i2", target = "i2Cp95")
+    @Mapping(source = "i3", target = "i3Cp95")
+    @Mapping(source = "i4", target = "i4Cp95")
+    @Mapping(source = "i5", target = "i5Cp95")
+    @Mapping(source = "i6", target = "i6Cp95")
+    @Mapping(source = "i7", target = "i7Cp95")
+    @Mapping(source = "i8", target = "i8Cp95")
+    @Mapping(source = "i9", target = "i9Cp95")
+    @Mapping(source = "i10", target = "i10Cp95")
+    @Mapping(source = "i11", target = "i11Cp95")
+    @Mapping(source = "i12", target = "i12Cp95")
+    @Mapping(source = "i13", target = "i13Cp95")
+    @Mapping(source = "i14", target = "i14Cp95")
+    @Mapping(source = "i15", target = "i15Cp95")
+    @Mapping(source = "i16", target = "i16Cp95")
+    @Mapping(source = "i17", target = "i17Cp95")
+    @Mapping(source = "i18", target = "i18Cp95")
+    @Mapping(source = "i19", target = "i19Cp95")
+    @Mapping(source = "i20", target = "i20Cp95")
+    @Mapping(source = "i21", target = "i21Cp95")
+    @Mapping(source = "i22", target = "i22Cp95")
+    @Mapping(source = "i23", target = "i23Cp95")
+    @Mapping(source = "i24", target = "i24Cp95")
+    @Mapping(source = "i25", target = "i25Cp95")
+    @Mapping(source = "i26", target = "i26Cp95")
+    @Mapping(source = "i27", target = "i27Cp95")
+    @Mapping(source = "i28", target = "i28Cp95")
+    @Mapping(source = "i29", target = "i29Cp95")
+    @Mapping(source = "i30", target = "i30Cp95")
+    @Mapping(source = "i31", target = "i31Cp95")
+    @Mapping(source = "i32", target = "i32Cp95")
+    @Mapping(source = "i33", target = "i33Cp95")
+    @Mapping(source = "i34", target = "i34Cp95")
+    @Mapping(source = "i35", target = "i35Cp95")
+    @Mapping(source = "i36", target = "i36Cp95")
+    @Mapping(source = "i37", target = "i37Cp95")
+    @Mapping(source = "i38", target = "i38Cp95")
+    @Mapping(source = "i39", target = "i39Cp95")
+    @Mapping(source = "i40", target = "i40Cp95")
+    @Mapping(source = "i41", target = "i41Cp95")
+    @Mapping(source = "i42", target = "i42Cp95")
+    @Mapping(source = "i43", target = "i43Cp95")
+    @Mapping(source = "i44", target = "i44Cp95")
+    @Mapping(source = "i45", target = "i45Cp95")
+    @Mapping(source = "i46", target = "i46Cp95")
+    @Mapping(source = "i47", target = "i47Cp95")
+    @Mapping(source = "i48", target = "i48Cp95")
+    @Mapping(source = "i49", target = "i49Cp95")
+    @Mapping(source = "i50", target = "i50Cp95")
+    public RMpHarmonicIRateReportDPO RMpHarmonicIRateReportDPOConverter95(DataHarmRateIPO dataHarmRateIPO);
+    /*RMpInharmonicIRateReportDPO*/
+    @Mapping(source = "i2", target = "inharmI2Min")
+    @Mapping(source = "i3", target = "inharmI3Min")
+    @Mapping(source = "i4", target = "inharmI4Min")
+    @Mapping(source = "i5", target = "inharmI5Min")
+    @Mapping(source = "i6", target = "inharmI6Min")
+    @Mapping(source = "i7", target = "inharmI7Min")
+    @Mapping(source = "i8", target = "inharmI8Min")
+    @Mapping(source = "i9", target = "inharmI9Min")
+    @Mapping(source = "i10", target = "inharmI10Min")
+    @Mapping(source = "i11", target = "inharmI11Min")
+    @Mapping(source = "i12", target = "inharmI12Min")
+    @Mapping(source = "i13", target = "inharmI13Min")
+    @Mapping(source = "i14", target = "inharmI14Min")
+    @Mapping(source = "i15", target = "inharmI15Min")
+    @Mapping(source = "i16", target = "inharmI16Min")
+    @Mapping(source = "i17", target = "inharmI17Min")
+    @Mapping(source = "i18", target = "inharmI18Min")
+    @Mapping(source = "i19", target = "inharmI19Min")
+    @Mapping(source = "i20", target = "inharmI20Min")
+    @Mapping(source = "i21", target = "inharmI21Min")
+    @Mapping(source = "i22", target = "inharmI22Min")
+    @Mapping(source = "i23", target = "inharmI23Min")
+    @Mapping(source = "i24", target = "inharmI24Min")
+    @Mapping(source = "i25", target = "inharmI25Min")
+    @Mapping(source = "i26", target = "inharmI26Min")
+    @Mapping(source = "i27", target = "inharmI27Min")
+    @Mapping(source = "i28", target = "inharmI28Min")
+    @Mapping(source = "i29", target = "inharmI29Min")
+    @Mapping(source = "i30", target = "inharmI30Min")
+    @Mapping(source = "i31", target = "inharmI31Min")
+    @Mapping(source = "i32", target = "inharmI32Min")
+    @Mapping(source = "i33", target = "inharmI33Min")
+    @Mapping(source = "i34", target = "inharmI34Min")
+    @Mapping(source = "i35", target = "inharmI35Min")
+    @Mapping(source = "i36", target = "inharmI36Min")
+    @Mapping(source = "i37", target = "inharmI37Min")
+    @Mapping(source = "i38", target = "inharmI38Min")
+    @Mapping(source = "i39", target = "inharmI39Min")
+    @Mapping(source = "i40", target = "inharmI40Min")
+    @Mapping(source = "i41", target = "inharmI41Min")
+    @Mapping(source = "i42", target = "inharmI42Min")
+    @Mapping(source = "i43", target = "inharmI43Min")
+    @Mapping(source = "i44", target = "inharmI44Min")
+    @Mapping(source = "i45", target = "inharmI45Min")
+    @Mapping(source = "i46", target = "inharmI46Min")
+    @Mapping(source = "i47", target = "inharmI47Min")
+    @Mapping(source = "i48", target = "inharmI48Min")
+    @Mapping(source = "i49", target = "inharmI49Min")
+    @Mapping(source = "i50", target = "inharmI50Min")
+    public RMpInharmonicIRateReportDPO RMpInharmonicIRateReportDPOConverterMin(DataInHarmRateIPO temp);
+
+    @Mapping(source = "i2", target = "inharmI2Max")
+    @Mapping(source = "i3", target = "inharmI3Max")
+    @Mapping(source = "i4", target = "inharmI4Max")
+    @Mapping(source = "i5", target = "inharmI5Max")
+    @Mapping(source = "i6", target = "inharmI6Max")
+    @Mapping(source = "i7", target = "inharmI7Max")
+    @Mapping(source = "i8", target = "inharmI8Max")
+    @Mapping(source = "i9", target = "inharmI9Max")
+    @Mapping(source = "i10", target = "inharmI10Max")
+    @Mapping(source = "i11", target = "inharmI11Max")
+    @Mapping(source = "i12", target = "inharmI12Max")
+    @Mapping(source = "i13", target = "inharmI13Max")
+    @Mapping(source = "i14", target = "inharmI14Max")
+    @Mapping(source = "i15", target = "inharmI15Max")
+    @Mapping(source = "i16", target = "inharmI16Max")
+    @Mapping(source = "i17", target = "inharmI17Max")
+    @Mapping(source = "i18", target = "inharmI18Max")
+    @Mapping(source = "i19", target = "inharmI19Max")
+    @Mapping(source = "i20", target = "inharmI20Max")
+    @Mapping(source = "i21", target = "inharmI21Max")
+    @Mapping(source = "i22", target = "inharmI22Max")
+    @Mapping(source = "i23", target = "inharmI23Max")
+    @Mapping(source = "i24", target = "inharmI24Max")
+    @Mapping(source = "i25", target = "inharmI25Max")
+    @Mapping(source = "i26", target = "inharmI26Max")
+    @Mapping(source = "i27", target = "inharmI27Max")
+    @Mapping(source = "i28", target = "inharmI28Max")
+    @Mapping(source = "i29", target = "inharmI29Max")
+    @Mapping(source = "i30", target = "inharmI30Max")
+    @Mapping(source = "i31", target = "inharmI31Max")
+    @Mapping(source = "i32", target = "inharmI32Max")
+    @Mapping(source = "i33", target = "inharmI33Max")
+    @Mapping(source = "i34", target = "inharmI34Max")
+    @Mapping(source = "i35", target = "inharmI35Max")
+    @Mapping(source = "i36", target = "inharmI36Max")
+    @Mapping(source = "i37", target = "inharmI37Max")
+    @Mapping(source = "i38", target = "inharmI38Max")
+    @Mapping(source = "i39", target = "inharmI39Max")
+    @Mapping(source = "i40", target = "inharmI40Max")
+    @Mapping(source = "i41", target = "inharmI41Max")
+    @Mapping(source = "i42", target = "inharmI42Max")
+    @Mapping(source = "i43", target = "inharmI43Max")
+    @Mapping(source = "i44", target = "inharmI44Max")
+    @Mapping(source = "i45", target = "inharmI45Max")
+    @Mapping(source = "i46", target = "inharmI46Max")
+    @Mapping(source = "i47", target = "inharmI47Max")
+    @Mapping(source = "i48", target = "inharmI48Max")
+    @Mapping(source = "i49", target = "inharmI49Max")
+    @Mapping(source = "i50", target = "inharmI50Max")
+    public RMpInharmonicIRateReportDPO RMpInharmonicIRateReportDPOConverterMax(DataInHarmRateIPO temp);
+
+
+    @Mapping(source = "i2", target = "inharmI2Avg")
+    @Mapping(source = "i3", target = "inharmI3Avg")
+    @Mapping(source = "i4", target = "inharmI4Avg")
+    @Mapping(source = "i5", target = "inharmI5Avg")
+    @Mapping(source = "i6", target = "inharmI6Avg")
+    @Mapping(source = "i7", target = "inharmI7Avg")
+    @Mapping(source = "i8", target = "inharmI8Avg")
+    @Mapping(source = "i9", target = "inharmI9Avg")
+    @Mapping(source = "i10", target = "inharmI10Avg")
+    @Mapping(source = "i11", target = "inharmI11Avg")
+    @Mapping(source = "i12", target = "inharmI12Avg")
+    @Mapping(source = "i13", target = "inharmI13Avg")
+    @Mapping(source = "i14", target = "inharmI14Avg")
+    @Mapping(source = "i15", target = "inharmI15Avg")
+    @Mapping(source = "i16", target = "inharmI16Avg")
+    @Mapping(source = "i17", target = "inharmI17Avg")
+    @Mapping(source = "i18", target = "inharmI18Avg")
+    @Mapping(source = "i19", target = "inharmI19Avg")
+    @Mapping(source = "i20", target = "inharmI20Avg")
+    @Mapping(source = "i21", target = "inharmI21Avg")
+    @Mapping(source = "i22", target = "inharmI22Avg")
+    @Mapping(source = "i23", target = "inharmI23Avg")
+    @Mapping(source = "i24", target = "inharmI24Avg")
+    @Mapping(source = "i25", target = "inharmI25Avg")
+    @Mapping(source = "i26", target = "inharmI26Avg")
+    @Mapping(source = "i27", target = "inharmI27Avg")
+    @Mapping(source = "i28", target = "inharmI28Avg")
+    @Mapping(source = "i29", target = "inharmI29Avg")
+    @Mapping(source = "i30", target = "inharmI30Avg")
+    @Mapping(source = "i31", target = "inharmI31Avg")
+    @Mapping(source = "i32", target = "inharmI32Avg")
+    @Mapping(source = "i33", target = "inharmI33Avg")
+    @Mapping(source = "i34", target = "inharmI34Avg")
+    @Mapping(source = "i35", target = "inharmI35Avg")
+    @Mapping(source = "i36", target = "inharmI36Avg")
+    @Mapping(source = "i37", target = "inharmI37Avg")
+    @Mapping(source = "i38", target = "inharmI38Avg")
+    @Mapping(source = "i39", target = "inharmI39Avg")
+    @Mapping(source = "i40", target = "inharmI40Avg")
+    @Mapping(source = "i41", target = "inharmI41Avg")
+    @Mapping(source = "i42", target = "inharmI42Avg")
+    @Mapping(source = "i43", target = "inharmI43Avg")
+    @Mapping(source = "i44", target = "inharmI44Avg")
+    @Mapping(source = "i45", target = "inharmI45Avg")
+    @Mapping(source = "i46", target = "inharmI46Avg")
+    @Mapping(source = "i47", target = "inharmI47Avg")
+    @Mapping(source = "i48", target = "inharmI48Avg")
+    @Mapping(source = "i49", target = "inharmI49Avg")
+    @Mapping(source = "i50", target = "inharmI50Avg")
+    public RMpInharmonicIRateReportDPO RMpInharmonicIRateReportDPOConverterAvg(DataInHarmRateIPO temp);
+
+    @Mapping(source = "i2", target = "inharmI2Cp95")
+    @Mapping(source = "i3", target = "inharmI3Cp95")
+    @Mapping(source = "i4", target = "inharmI4Cp95")
+    @Mapping(source = "i5", target = "inharmI5Cp95")
+    @Mapping(source = "i6", target = "inharmI6Cp95")
+    @Mapping(source = "i7", target = "inharmI7Cp95")
+    @Mapping(source = "i8", target = "inharmI8Cp95")
+    @Mapping(source = "i9", target = "inharmI9Cp95")
+    @Mapping(source = "i10", target = "inharmI10Cp95")
+    @Mapping(source = "i11", target = "inharmI11Cp95")
+    @Mapping(source = "i12", target = "inharmI12Cp95")
+    @Mapping(source = "i13", target = "inharmI13Cp95")
+    @Mapping(source = "i14", target = "inharmI14Cp95")
+    @Mapping(source = "i15", target = "inharmI15Cp95")
+    @Mapping(source = "i16", target = "inharmI16Cp95")
+    @Mapping(source = "i17", target = "inharmI17Cp95")
+    @Mapping(source = "i18", target = "inharmI18Cp95")
+    @Mapping(source = "i19", target = "inharmI19Cp95")
+    @Mapping(source = "i20", target = "inharmI20Cp95")
+    @Mapping(source = "i21", target = "inharmI21Cp95")
+    @Mapping(source = "i22", target = "inharmI22Cp95")
+    @Mapping(source = "i23", target = "inharmI23Cp95")
+    @Mapping(source = "i24", target = "inharmI24Cp95")
+    @Mapping(source = "i25", target = "inharmI25Cp95")
+    @Mapping(source = "i26", target = "inharmI26Cp95")
+    @Mapping(source = "i27", target = "inharmI27Cp95")
+    @Mapping(source = "i28", target = "inharmI28Cp95")
+    @Mapping(source = "i29", target = "inharmI29Cp95")
+    @Mapping(source = "i30", target = "inharmI30Cp95")
+    @Mapping(source = "i31", target = "inharmI31Cp95")
+    @Mapping(source = "i32", target = "inharmI32Cp95")
+    @Mapping(source = "i33", target = "inharmI33Cp95")
+    @Mapping(source = "i34", target = "inharmI34Cp95")
+    @Mapping(source = "i35", target = "inharmI35Cp95")
+    @Mapping(source = "i36", target = "inharmI36Cp95")
+    @Mapping(source = "i37", target = "inharmI37Cp95")
+    @Mapping(source = "i38", target = "inharmI38Cp95")
+    @Mapping(source = "i39", target = "inharmI39Cp95")
+    @Mapping(source = "i40", target = "inharmI40Cp95")
+    @Mapping(source = "i41", target = "inharmI41Cp95")
+    @Mapping(source = "i42", target = "inharmI42Cp95")
+    @Mapping(source = "i43", target = "inharmI43Cp95")
+    @Mapping(source = "i44", target = "inharmI44Cp95")
+    @Mapping(source = "i45", target = "inharmI45Cp95")
+    @Mapping(source = "i46", target = "inharmI46Cp95")
+    @Mapping(source = "i47", target = "inharmI47Cp95")
+    @Mapping(source = "i48", target = "inharmI48Cp95")
+    @Mapping(source = "i49", target = "inharmI49Cp95")
+    @Mapping(source = "i50", target = "inharmI50Cp95")
+    public RMpInharmonicIRateReportDPO RMpInharmonicIRateReportDPOConverter95(DataInHarmRateIPO temp);
+
+    /*RMpInharmonicIMagReportDPO*/
+    @Mapping(source = "i1", target = "simpleHarmonicCurrentEffective1Min")
+    @Mapping(source = "i2", target = "simpleHarmonicCurrentEffective2Min")
+    @Mapping(source = "i3", target = "simpleHarmonicCurrentEffective3Min")
+    @Mapping(source = "i4", target = "simpleHarmonicCurrentEffective4Min")
+    @Mapping(source = "i5", target = "simpleHarmonicCurrentEffective5Min")
+    @Mapping(source = "i6", target = "simpleHarmonicCurrentEffective6Min")
+    @Mapping(source = "i7", target = "simpleHarmonicCurrentEffective7Min")
+    @Mapping(source = "i8", target = "simpleHarmonicCurrentEffective8Min")
+    @Mapping(source = "i9", target = "simpleHarmonicCurrentEffective9Min")
+    @Mapping(source = "i10", target = "simpleHarmonicCurrentEffective10Min")
+    @Mapping(source = "i11", target = "simpleHarmonicCurrentEffective11Min")
+    @Mapping(source = "i12", target = "simpleHarmonicCurrentEffective12Min")
+    @Mapping(source = "i13", target = "simpleHarmonicCurrentEffective13Min")
+    @Mapping(source = "i14", target = "simpleHarmonicCurrentEffective14Min")
+    @Mapping(source = "i15", target = "simpleHarmonicCurrentEffective15Min")
+    @Mapping(source = "i16", target = "simpleHarmonicCurrentEffective16Min")
+    @Mapping(source = "i17", target = "simpleHarmonicCurrentEffective17Min")
+    @Mapping(source = "i18", target = "simpleHarmonicCurrentEffective18Min")
+    @Mapping(source = "i19", target = "simpleHarmonicCurrentEffective19Min")
+    @Mapping(source = "i20", target = "simpleHarmonicCurrentEffective20Min")
+    @Mapping(source = "i21", target = "simpleHarmonicCurrentEffective21Min")
+    @Mapping(source = "i22", target = "simpleHarmonicCurrentEffective22Min")
+    @Mapping(source = "i23", target = "simpleHarmonicCurrentEffective23Min")
+    @Mapping(source = "i24", target = "simpleHarmonicCurrentEffective24Min")
+    @Mapping(source = "i25", target = "simpleHarmonicCurrentEffective25Min")
+    @Mapping(source = "i26", target = "simpleHarmonicCurrentEffective26Min")
+    @Mapping(source = "i27", target = "simpleHarmonicCurrentEffective27Min")
+    @Mapping(source = "i28", target = "simpleHarmonicCurrentEffective28Min")
+    @Mapping(source = "i29", target = "simpleHarmonicCurrentEffective29Min")
+    @Mapping(source = "i30", target = "simpleHarmonicCurrentEffective30Min")
+    @Mapping(source = "i31", target = "simpleHarmonicCurrentEffective31Min")
+    @Mapping(source = "i32", target = "simpleHarmonicCurrentEffective32Min")
+    @Mapping(source = "i33", target = "simpleHarmonicCurrentEffective33Min")
+    @Mapping(source = "i34", target = "simpleHarmonicCurrentEffective34Min")
+    @Mapping(source = "i35", target = "simpleHarmonicCurrentEffective35Min")
+    @Mapping(source = "i36", target = "simpleHarmonicCurrentEffective36Min")
+    @Mapping(source = "i37", target = "simpleHarmonicCurrentEffective37Min")
+    @Mapping(source = "i38", target = "simpleHarmonicCurrentEffective38Min")
+    @Mapping(source = "i39", target = "simpleHarmonicCurrentEffective39Min")
+    @Mapping(source = "i40", target = "simpleHarmonicCurrentEffective40Min")
+    @Mapping(source = "i41", target = "simpleHarmonicCurrentEffective41Min")
+    @Mapping(source = "i42", target = "simpleHarmonicCurrentEffective42Min")
+    @Mapping(source = "i43", target = "simpleHarmonicCurrentEffective43Min")
+    @Mapping(source = "i44", target = "simpleHarmonicCurrentEffective44Min")
+    @Mapping(source = "i45", target = "simpleHarmonicCurrentEffective45Min")
+    @Mapping(source = "i46", target = "simpleHarmonicCurrentEffective46Min")
+    @Mapping(source = "i47", target = "simpleHarmonicCurrentEffective47Min")
+    @Mapping(source = "i48", target = "simpleHarmonicCurrentEffective48Min")
+    @Mapping(source = "i49", target = "simpleHarmonicCurrentEffective49Min")
+    @Mapping(source = "i50", target = "simpleHarmonicCurrentEffective50Min")
+    public RMpInharmonicIMagReportDPO RMpInharmonicIMagReportDPOConverterMin(DataInHarmIPO temp);
+
+    @Mapping(source = "i1", target = "simpleHarmonicCurrentEffective1Max")
+    @Mapping(source = "i2", target = "simpleHarmonicCurrentEffective2Max")
+    @Mapping(source = "i3", target = "simpleHarmonicCurrentEffective3Max")
+    @Mapping(source = "i4", target = "simpleHarmonicCurrentEffective4Max")
+    @Mapping(source = "i5", target = "simpleHarmonicCurrentEffective5Max")
+    @Mapping(source = "i6", target = "simpleHarmonicCurrentEffective6Max")
+    @Mapping(source = "i7", target = "simpleHarmonicCurrentEffective7Max")
+    @Mapping(source = "i8", target = "simpleHarmonicCurrentEffective8Max")
+    @Mapping(source = "i9", target = "simpleHarmonicCurrentEffective9Max")
+    @Mapping(source = "i10", target = "simpleHarmonicCurrentEffective10Max")
+    @Mapping(source = "i11", target = "simpleHarmonicCurrentEffective11Max")
+    @Mapping(source = "i12", target = "simpleHarmonicCurrentEffective12Max")
+    @Mapping(source = "i13", target = "simpleHarmonicCurrentEffective13Max")
+    @Mapping(source = "i14", target = "simpleHarmonicCurrentEffective14Max")
+    @Mapping(source = "i15", target = "simpleHarmonicCurrentEffective15Max")
+    @Mapping(source = "i16", target = "simpleHarmonicCurrentEffective16Max")
+    @Mapping(source = "i17", target = "simpleHarmonicCurrentEffective17Max")
+    @Mapping(source = "i18", target = "simpleHarmonicCurrentEffective18Max")
+    @Mapping(source = "i19", target = "simpleHarmonicCurrentEffective19Max")
+    @Mapping(source = "i20", target = "simpleHarmonicCurrentEffective20Max")
+    @Mapping(source = "i21", target = "simpleHarmonicCurrentEffective21Max")
+    @Mapping(source = "i22", target = "simpleHarmonicCurrentEffective22Max")
+    @Mapping(source = "i23", target = "simpleHarmonicCurrentEffective23Max")
+    @Mapping(source = "i24", target = "simpleHarmonicCurrentEffective24Max")
+    @Mapping(source = "i25", target = "simpleHarmonicCurrentEffective25Max")
+    @Mapping(source = "i26", target = "simpleHarmonicCurrentEffective26Max")
+    @Mapping(source = "i27", target = "simpleHarmonicCurrentEffective27Max")
+    @Mapping(source = "i28", target = "simpleHarmonicCurrentEffective28Max")
+    @Mapping(source = "i29", target = "simpleHarmonicCurrentEffective29Max")
+    @Mapping(source = "i30", target = "simpleHarmonicCurrentEffective30Max")
+    @Mapping(source = "i31", target = "simpleHarmonicCurrentEffective31Max")
+    @Mapping(source = "i32", target = "simpleHarmonicCurrentEffective32Max")
+    @Mapping(source = "i33", target = "simpleHarmonicCurrentEffective33Max")
+    @Mapping(source = "i34", target = "simpleHarmonicCurrentEffective34Max")
+    @Mapping(source = "i35", target = "simpleHarmonicCurrentEffective35Max")
+    @Mapping(source = "i36", target = "simpleHarmonicCurrentEffective36Max")
+    @Mapping(source = "i37", target = "simpleHarmonicCurrentEffective37Max")
+    @Mapping(source = "i38", target = "simpleHarmonicCurrentEffective38Max")
+    @Mapping(source = "i39", target = "simpleHarmonicCurrentEffective39Max")
+    @Mapping(source = "i40", target = "simpleHarmonicCurrentEffective40Max")
+    @Mapping(source = "i41", target = "simpleHarmonicCurrentEffective41Max")
+    @Mapping(source = "i42", target = "simpleHarmonicCurrentEffective42Max")
+    @Mapping(source = "i43", target = "simpleHarmonicCurrentEffective43Max")
+    @Mapping(source = "i44", target = "simpleHarmonicCurrentEffective44Max")
+    @Mapping(source = "i45", target = "simpleHarmonicCurrentEffective45Max")
+    @Mapping(source = "i46", target = "simpleHarmonicCurrentEffective46Max")
+    @Mapping(source = "i47", target = "simpleHarmonicCurrentEffective47Max")
+    @Mapping(source = "i48", target = "simpleHarmonicCurrentEffective48Max")
+    @Mapping(source = "i49", target = "simpleHarmonicCurrentEffective49Max")
+    @Mapping(source = "i50", target = "simpleHarmonicCurrentEffective50Max")
+    public RMpInharmonicIMagReportDPO RMpInharmonicIMagReportDPOConverterMax(DataInHarmIPO temp);
+
+    @Mapping(source = "i1", target = "simpleHarmonicCurrentEffective1Avg")
+    @Mapping(source = "i2", target = "simpleHarmonicCurrentEffective2Avg")
+    @Mapping(source = "i3", target = "simpleHarmonicCurrentEffective3Avg")
+    @Mapping(source = "i4", target = "simpleHarmonicCurrentEffective4Avg")
+    @Mapping(source = "i5", target = "simpleHarmonicCurrentEffective5Avg")
+    @Mapping(source = "i6", target = "simpleHarmonicCurrentEffective6Avg")
+    @Mapping(source = "i7", target = "simpleHarmonicCurrentEffective7Avg")
+    @Mapping(source = "i8", target = "simpleHarmonicCurrentEffective8Avg")
+    @Mapping(source = "i9", target = "simpleHarmonicCurrentEffective9Avg")
+    @Mapping(source = "i10", target = "simpleHarmonicCurrentEffective10Avg")
+    @Mapping(source = "i11", target = "simpleHarmonicCurrentEffective11Avg")
+    @Mapping(source = "i12", target = "simpleHarmonicCurrentEffective12Avg")
+    @Mapping(source = "i13", target = "simpleHarmonicCurrentEffective13Avg")
+    @Mapping(source = "i14", target = "simpleHarmonicCurrentEffective14Avg")
+    @Mapping(source = "i15", target = "simpleHarmonicCurrentEffective15Avg")
+    @Mapping(source = "i16", target = "simpleHarmonicCurrentEffective16Avg")
+    @Mapping(source = "i17", target = "simpleHarmonicCurrentEffective17Avg")
+    @Mapping(source = "i18", target = "simpleHarmonicCurrentEffective18Avg")
+    @Mapping(source = "i19", target = "simpleHarmonicCurrentEffective19Avg")
+    @Mapping(source = "i20", target = "simpleHarmonicCurrentEffective20Avg")
+    @Mapping(source = "i21", target = "simpleHarmonicCurrentEffective21Avg")
+    @Mapping(source = "i22", target = "simpleHarmonicCurrentEffective22Avg")
+    @Mapping(source = "i23", target = "simpleHarmonicCurrentEffective23Avg")
+    @Mapping(source = "i24", target = "simpleHarmonicCurrentEffective24Avg")
+    @Mapping(source = "i25", target = "simpleHarmonicCurrentEffective25Avg")
+    @Mapping(source = "i26", target = "simpleHarmonicCurrentEffective26Avg")
+    @Mapping(source = "i27", target = "simpleHarmonicCurrentEffective27Avg")
+    @Mapping(source = "i28", target = "simpleHarmonicCurrentEffective28Avg")
+    @Mapping(source = "i29", target = "simpleHarmonicCurrentEffective29Avg")
+    @Mapping(source = "i30", target = "simpleHarmonicCurrentEffective30Avg")
+    @Mapping(source = "i31", target = "simpleHarmonicCurrentEffective31Avg")
+    @Mapping(source = "i32", target = "simpleHarmonicCurrentEffective32Avg")
+    @Mapping(source = "i33", target = "simpleHarmonicCurrentEffective33Avg")
+    @Mapping(source = "i34", target = "simpleHarmonicCurrentEffective34Avg")
+    @Mapping(source = "i35", target = "simpleHarmonicCurrentEffective35Avg")
+    @Mapping(source = "i36", target = "simpleHarmonicCurrentEffective36Avg")
+    @Mapping(source = "i37", target = "simpleHarmonicCurrentEffective37Avg")
+    @Mapping(source = "i38", target = "simpleHarmonicCurrentEffective38Avg")
+    @Mapping(source = "i39", target = "simpleHarmonicCurrentEffective39Avg")
+    @Mapping(source = "i40", target = "simpleHarmonicCurrentEffective40Avg")
+    @Mapping(source = "i41", target = "simpleHarmonicCurrentEffective41Avg")
+    @Mapping(source = "i42", target = "simpleHarmonicCurrentEffective42Avg")
+    @Mapping(source = "i43", target = "simpleHarmonicCurrentEffective43Avg")
+    @Mapping(source = "i44", target = "simpleHarmonicCurrentEffective44Avg")
+    @Mapping(source = "i45", target = "simpleHarmonicCurrentEffective45Avg")
+    @Mapping(source = "i46", target = "simpleHarmonicCurrentEffective46Avg")
+    @Mapping(source = "i47", target = "simpleHarmonicCurrentEffective47Avg")
+    @Mapping(source = "i48", target = "simpleHarmonicCurrentEffective48Avg")
+    @Mapping(source = "i49", target = "simpleHarmonicCurrentEffective49Avg")
+    @Mapping(source = "i50", target = "simpleHarmonicCurrentEffective50Avg")
+    public RMpInharmonicIMagReportDPO RMpInharmonicIMagReportDPOConverterAvg(DataInHarmIPO temp);
+
+    @Mapping(source = "i1", target = "simpleHarmonicCurrentEffective1Cp95")
+    @Mapping(source = "i2", target = "simpleHarmonicCurrentEffective2Cp95")
+    @Mapping(source = "i3", target = "simpleHarmonicCurrentEffective3Cp95")
+    @Mapping(source = "i4", target = "simpleHarmonicCurrentEffective4Cp95")
+    @Mapping(source = "i5", target = "simpleHarmonicCurrentEffective5Cp95")
+    @Mapping(source = "i6", target = "simpleHarmonicCurrentEffective6Cp95")
+    @Mapping(source = "i7", target = "simpleHarmonicCurrentEffective7Cp95")
+    @Mapping(source = "i8", target = "simpleHarmonicCurrentEffective8Cp95")
+    @Mapping(source = "i9", target = "simpleHarmonicCurrentEffective9Cp95")
+    @Mapping(source = "i10", target = "simpleHarmonicCurrentEffective10Cp95")
+    @Mapping(source = "i11", target = "simpleHarmonicCurrentEffective11Cp95")
+    @Mapping(source = "i12", target = "simpleHarmonicCurrentEffective12Cp95")
+    @Mapping(source = "i13", target = "simpleHarmonicCurrentEffective13Cp95")
+    @Mapping(source = "i14", target = "simpleHarmonicCurrentEffective14Cp95")
+    @Mapping(source = "i15", target = "simpleHarmonicCurrentEffective15Cp95")
+    @Mapping(source = "i16", target = "simpleHarmonicCurrentEffective16Cp95")
+    @Mapping(source = "i17", target = "simpleHarmonicCurrentEffective17Cp95")
+    @Mapping(source = "i18", target = "simpleHarmonicCurrentEffective18Cp95")
+    @Mapping(source = "i19", target = "simpleHarmonicCurrentEffective19Cp95")
+    @Mapping(source = "i20", target = "simpleHarmonicCurrentEffective20Cp95")
+    @Mapping(source = "i21", target = "simpleHarmonicCurrentEffective21Cp95")
+    @Mapping(source = "i22", target = "simpleHarmonicCurrentEffective22Cp95")
+    @Mapping(source = "i23", target = "simpleHarmonicCurrentEffective23Cp95")
+    @Mapping(source = "i24", target = "simpleHarmonicCurrentEffective24Cp95")
+    @Mapping(source = "i25", target = "simpleHarmonicCurrentEffective25Cp95")
+    @Mapping(source = "i26", target = "simpleHarmonicCurrentEffective26Cp95")
+    @Mapping(source = "i27", target = "simpleHarmonicCurrentEffective27Cp95")
+    @Mapping(source = "i28", target = "simpleHarmonicCurrentEffective28Cp95")
+    @Mapping(source = "i29", target = "simpleHarmonicCurrentEffective29Cp95")
+    @Mapping(source = "i30", target = "simpleHarmonicCurrentEffective30Cp95")
+    @Mapping(source = "i31", target = "simpleHarmonicCurrentEffective31Cp95")
+    @Mapping(source = "i32", target = "simpleHarmonicCurrentEffective32Cp95")
+    @Mapping(source = "i33", target = "simpleHarmonicCurrentEffective33Cp95")
+    @Mapping(source = "i34", target = "simpleHarmonicCurrentEffective34Cp95")
+    @Mapping(source = "i35", target = "simpleHarmonicCurrentEffective35Cp95")
+    @Mapping(source = "i36", target = "simpleHarmonicCurrentEffective36Cp95")
+    @Mapping(source = "i37", target = "simpleHarmonicCurrentEffective37Cp95")
+    @Mapping(source = "i38", target = "simpleHarmonicCurrentEffective38Cp95")
+    @Mapping(source = "i39", target = "simpleHarmonicCurrentEffective39Cp95")
+    @Mapping(source = "i40", target = "simpleHarmonicCurrentEffective40Cp95")
+    @Mapping(source = "i41", target = "simpleHarmonicCurrentEffective41Cp95")
+    @Mapping(source = "i42", target = "simpleHarmonicCurrentEffective42Cp95")
+    @Mapping(source = "i43", target = "simpleHarmonicCurrentEffective43Cp95")
+    @Mapping(source = "i44", target = "simpleHarmonicCurrentEffective44Cp95")
+    @Mapping(source = "i45", target = "simpleHarmonicCurrentEffective45Cp95")
+    @Mapping(source = "i46", target = "simpleHarmonicCurrentEffective46Cp95")
+    @Mapping(source = "i47", target = "simpleHarmonicCurrentEffective47Cp95")
+    @Mapping(source = "i48", target = "simpleHarmonicCurrentEffective48Cp95")
+    @Mapping(source = "i49", target = "simpleHarmonicCurrentEffective49Cp95")
+    @Mapping(source = "i50", target = "simpleHarmonicCurrentEffective50Cp95")
+    public RMpInharmonicIMagReportDPO RMpInharmonicIMagReportDPOConverter95(DataInHarmIPO temp);
+    /*RMpInharmonicVRateReportDPO*/
+    @Mapping(source = "v1", target = "centreHarmonicVoltageContent1Min")
+    @Mapping(source = "v2", target = "centreHarmonicVoltageContent2Min")
+    @Mapping(source = "v3", target = "centreHarmonicVoltageContent3Min")
+    @Mapping(source = "v4", target = "centreHarmonicVoltageContent4Min")
+    @Mapping(source = "v5", target = "centreHarmonicVoltageContent5Min")
+    @Mapping(source = "v6", target = "centreHarmonicVoltageContent6Min")
+    @Mapping(source = "v7", target = "centreHarmonicVoltageContent7Min")
+    @Mapping(source = "v8", target = "centreHarmonicVoltageContent8Min")
+    @Mapping(source = "v9", target = "centreHarmonicVoltageContent9Min")
+    @Mapping(source = "v10", target = "centreHarmonicVoltageContent10Min")
+    @Mapping(source = "v11", target = "centreHarmonicVoltageContent11Min")
+    @Mapping(source = "v12", target = "centreHarmonicVoltageContent12Min")
+    @Mapping(source = "v13", target = "centreHarmonicVoltageContent13Min")
+    @Mapping(source = "v14", target = "centreHarmonicVoltageContent14Min")
+    @Mapping(source = "v15", target = "centreHarmonicVoltageContent15Min")
+    @Mapping(source = "v16", target = "centreHarmonicVoltageContent16Min")
+    @Mapping(source = "v17", target = "centreHarmonicVoltageContent17Min")
+    @Mapping(source = "v18", target = "centreHarmonicVoltageContent18Min")
+    @Mapping(source = "v19", target = "centreHarmonicVoltageContent19Min")
+    @Mapping(source = "v20", target = "centreHarmonicVoltageContent20Min")
+    @Mapping(source = "v21", target = "centreHarmonicVoltageContent21Min")
+    @Mapping(source = "v22", target = "centreHarmonicVoltageContent22Min")
+    @Mapping(source = "v23", target = "centreHarmonicVoltageContent23Min")
+    @Mapping(source = "v24", target = "centreHarmonicVoltageContent24Min")
+    @Mapping(source = "v25", target = "centreHarmonicVoltageContent25Min")
+    @Mapping(source = "v26", target = "centreHarmonicVoltageContent26Min")
+    @Mapping(source = "v27", target = "centreHarmonicVoltageContent27Min")
+    @Mapping(source = "v28", target = "centreHarmonicVoltageContent28Min")
+    @Mapping(source = "v29", target = "centreHarmonicVoltageContent29Min")
+    @Mapping(source = "v30", target = "centreHarmonicVoltageContent30Min")
+    @Mapping(source = "v31", target = "centreHarmonicVoltageContent31Min")
+    @Mapping(source = "v32", target = "centreHarmonicVoltageContent32Min")
+    @Mapping(source = "v33", target = "centreHarmonicVoltageContent33Min")
+    @Mapping(source = "v34", target = "centreHarmonicVoltageContent34Min")
+    @Mapping(source = "v35", target = "centreHarmonicVoltageContent35Min")
+    @Mapping(source = "v36", target = "centreHarmonicVoltageContent36Min")
+    @Mapping(source = "v37", target = "centreHarmonicVoltageContent37Min")
+    @Mapping(source = "v38", target = "centreHarmonicVoltageContent38Min")
+    @Mapping(source = "v39", target = "centreHarmonicVoltageContent39Min")
+    @Mapping(source = "v40", target = "centreHarmonicVoltageContent40Min")
+    @Mapping(source = "v41", target = "centreHarmonicVoltageContent41Min")
+    @Mapping(source = "v42", target = "centreHarmonicVoltageContent42Min")
+    @Mapping(source = "v43", target = "centreHarmonicVoltageContent43Min")
+    @Mapping(source = "v44", target = "centreHarmonicVoltageContent44Min")
+    @Mapping(source = "v45", target = "centreHarmonicVoltageContent45Min")
+    @Mapping(source = "v46", target = "centreHarmonicVoltageContent46Min")
+    @Mapping(source = "v47", target = "centreHarmonicVoltageContent47Min")
+    @Mapping(source = "v48", target = "centreHarmonicVoltageContent48Min")
+    @Mapping(source = "v49", target = "centreHarmonicVoltageContent49Min")
+    @Mapping(source = "v50", target = "centreHarmonicVoltageContent50Min")
+    public RMpInharmonicVRateReportDPO RMpInharmonicVRateReportDPOConverterMin(DataInHarmRateVPO temp);
+
+    @Mapping(source = "v1", target = "centreHarmonicVoltageContent1Max")
+    @Mapping(source = "v2", target = "centreHarmonicVoltageContent2Max")
+    @Mapping(source = "v3", target = "centreHarmonicVoltageContent3Max")
+    @Mapping(source = "v4", target = "centreHarmonicVoltageContent4Max")
+    @Mapping(source = "v5", target = "centreHarmonicVoltageContent5Max")
+    @Mapping(source = "v6", target = "centreHarmonicVoltageContent6Max")
+    @Mapping(source = "v7", target = "centreHarmonicVoltageContent7Max")
+    @Mapping(source = "v8", target = "centreHarmonicVoltageContent8Max")
+    @Mapping(source = "v9", target = "centreHarmonicVoltageContent9Max")
+    @Mapping(source = "v10", target = "centreHarmonicVoltageContent10Max")
+    @Mapping(source = "v11", target = "centreHarmonicVoltageContent11Max")
+    @Mapping(source = "v12", target = "centreHarmonicVoltageContent12Max")
+    @Mapping(source = "v13", target = "centreHarmonicVoltageContent13Max")
+    @Mapping(source = "v14", target = "centreHarmonicVoltageContent14Max")
+    @Mapping(source = "v15", target = "centreHarmonicVoltageContent15Max")
+    @Mapping(source = "v16", target = "centreHarmonicVoltageContent16Max")
+    @Mapping(source = "v17", target = "centreHarmonicVoltageContent17Max")
+    @Mapping(source = "v18", target = "centreHarmonicVoltageContent18Max")
+    @Mapping(source = "v19", target = "centreHarmonicVoltageContent19Max")
+    @Mapping(source = "v20", target = "centreHarmonicVoltageContent20Max")
+    @Mapping(source = "v21", target = "centreHarmonicVoltageContent21Max")
+    @Mapping(source = "v22", target = "centreHarmonicVoltageContent22Max")
+    @Mapping(source = "v23", target = "centreHarmonicVoltageContent23Max")
+    @Mapping(source = "v24", target = "centreHarmonicVoltageContent24Max")
+    @Mapping(source = "v25", target = "centreHarmonicVoltageContent25Max")
+    @Mapping(source = "v26", target = "centreHarmonicVoltageContent26Max")
+    @Mapping(source = "v27", target = "centreHarmonicVoltageContent27Max")
+    @Mapping(source = "v28", target = "centreHarmonicVoltageContent28Max")
+    @Mapping(source = "v29", target = "centreHarmonicVoltageContent29Max")
+    @Mapping(source = "v30", target = "centreHarmonicVoltageContent30Max")
+    @Mapping(source = "v31", target = "centreHarmonicVoltageContent31Max")
+    @Mapping(source = "v32", target = "centreHarmonicVoltageContent32Max")
+    @Mapping(source = "v33", target = "centreHarmonicVoltageContent33Max")
+    @Mapping(source = "v34", target = "centreHarmonicVoltageContent34Max")
+    @Mapping(source = "v35", target = "centreHarmonicVoltageContent35Max")
+    @Mapping(source = "v36", target = "centreHarmonicVoltageContent36Max")
+    @Mapping(source = "v37", target = "centreHarmonicVoltageContent37Max")
+    @Mapping(source = "v38", target = "centreHarmonicVoltageContent38Max")
+    @Mapping(source = "v39", target = "centreHarmonicVoltageContent39Max")
+    @Mapping(source = "v40", target = "centreHarmonicVoltageContent40Max")
+    @Mapping(source = "v41", target = "centreHarmonicVoltageContent41Max")
+    @Mapping(source = "v42", target = "centreHarmonicVoltageContent42Max")
+    @Mapping(source = "v43", target = "centreHarmonicVoltageContent43Max")
+    @Mapping(source = "v44", target = "centreHarmonicVoltageContent44Max")
+    @Mapping(source = "v45", target = "centreHarmonicVoltageContent45Max")
+    @Mapping(source = "v46", target = "centreHarmonicVoltageContent46Max")
+    @Mapping(source = "v47", target = "centreHarmonicVoltageContent47Max")
+    @Mapping(source = "v48", target = "centreHarmonicVoltageContent48Max")
+    @Mapping(source = "v49", target = "centreHarmonicVoltageContent49Max")
+    @Mapping(source = "v50", target = "centreHarmonicVoltageContent50Max")
+    public RMpInharmonicVRateReportDPO RMpInharmonicVRateReportDPOConverterMax(DataInHarmRateVPO temp);
+
+    @Mapping(source = "v1", target = "centreHarmonicVoltageContent1Avg")
+    @Mapping(source = "v2", target = "centreHarmonicVoltageContent2Avg")
+    @Mapping(source = "v3", target = "centreHarmonicVoltageContent3Avg")
+    @Mapping(source = "v4", target = "centreHarmonicVoltageContent4Avg")
+    @Mapping(source = "v5", target = "centreHarmonicVoltageContent5Avg")
+    @Mapping(source = "v6", target = "centreHarmonicVoltageContent6Avg")
+    @Mapping(source = "v7", target = "centreHarmonicVoltageContent7Avg")
+    @Mapping(source = "v8", target = "centreHarmonicVoltageContent8Avg")
+    @Mapping(source = "v9", target = "centreHarmonicVoltageContent9Avg")
+    @Mapping(source = "v10", target = "centreHarmonicVoltageContent10Avg")
+    @Mapping(source = "v11", target = "centreHarmonicVoltageContent11Avg")
+    @Mapping(source = "v12", target = "centreHarmonicVoltageContent12Avg")
+    @Mapping(source = "v13", target = "centreHarmonicVoltageContent13Avg")
+    @Mapping(source = "v14", target = "centreHarmonicVoltageContent14Avg")
+    @Mapping(source = "v15", target = "centreHarmonicVoltageContent15Avg")
+    @Mapping(source = "v16", target = "centreHarmonicVoltageContent16Avg")
+    @Mapping(source = "v17", target = "centreHarmonicVoltageContent17Avg")
+    @Mapping(source = "v18", target = "centreHarmonicVoltageContent18Avg")
+    @Mapping(source = "v19", target = "centreHarmonicVoltageContent19Avg")
+    @Mapping(source = "v20", target = "centreHarmonicVoltageContent20Avg")
+    @Mapping(source = "v21", target = "centreHarmonicVoltageContent21Avg")
+    @Mapping(source = "v22", target = "centreHarmonicVoltageContent22Avg")
+    @Mapping(source = "v23", target = "centreHarmonicVoltageContent23Avg")
+    @Mapping(source = "v24", target = "centreHarmonicVoltageContent24Avg")
+    @Mapping(source = "v25", target = "centreHarmonicVoltageContent25Avg")
+    @Mapping(source = "v26", target = "centreHarmonicVoltageContent26Avg")
+    @Mapping(source = "v27", target = "centreHarmonicVoltageContent27Avg")
+    @Mapping(source = "v28", target = "centreHarmonicVoltageContent28Avg")
+    @Mapping(source = "v29", target = "centreHarmonicVoltageContent29Avg")
+    @Mapping(source = "v30", target = "centreHarmonicVoltageContent30Avg")
+    @Mapping(source = "v31", target = "centreHarmonicVoltageContent31Avg")
+    @Mapping(source = "v32", target = "centreHarmonicVoltageContent32Avg")
+    @Mapping(source = "v33", target = "centreHarmonicVoltageContent33Avg")
+    @Mapping(source = "v34", target = "centreHarmonicVoltageContent34Avg")
+    @Mapping(source = "v35", target = "centreHarmonicVoltageContent35Avg")
+    @Mapping(source = "v36", target = "centreHarmonicVoltageContent36Avg")
+    @Mapping(source = "v37", target = "centreHarmonicVoltageContent37Avg")
+    @Mapping(source = "v38", target = "centreHarmonicVoltageContent38Avg")
+    @Mapping(source = "v39", target = "centreHarmonicVoltageContent39Avg")
+    @Mapping(source = "v40", target = "centreHarmonicVoltageContent40Avg")
+    @Mapping(source = "v41", target = "centreHarmonicVoltageContent41Avg")
+    @Mapping(source = "v42", target = "centreHarmonicVoltageContent42Avg")
+    @Mapping(source = "v43", target = "centreHarmonicVoltageContent43Avg")
+    @Mapping(source = "v44", target = "centreHarmonicVoltageContent44Avg")
+    @Mapping(source = "v45", target = "centreHarmonicVoltageContent45Avg")
+    @Mapping(source = "v46", target = "centreHarmonicVoltageContent46Avg")
+    @Mapping(source = "v47", target = "centreHarmonicVoltageContent47Avg")
+    @Mapping(source = "v48", target = "centreHarmonicVoltageContent48Avg")
+    @Mapping(source = "v49", target = "centreHarmonicVoltageContent49Avg")
+    @Mapping(source = "v50", target = "centreHarmonicVoltageContent50Avg")
+    public RMpInharmonicVRateReportDPO RMpInharmonicVRateReportDPOConverterAvg(DataInHarmRateVPO temp);
+
+    @Mapping(source = "v1", target = "centreHarmonicVoltageContent1Cp95")
+    @Mapping(source = "v2", target = "centreHarmonicVoltageContent2Cp95")
+    @Mapping(source = "v3", target = "centreHarmonicVoltageContent3Cp95")
+    @Mapping(source = "v4", target = "centreHarmonicVoltageContent4Cp95")
+    @Mapping(source = "v5", target = "centreHarmonicVoltageContent5Cp95")
+    @Mapping(source = "v6", target = "centreHarmonicVoltageContent6Cp95")
+    @Mapping(source = "v7", target = "centreHarmonicVoltageContent7Cp95")
+    @Mapping(source = "v8", target = "centreHarmonicVoltageContent8Cp95")
+    @Mapping(source = "v9", target = "centreHarmonicVoltageContent9Cp95")
+    @Mapping(source = "v10", target = "centreHarmonicVoltageContent10Cp95")
+    @Mapping(source = "v11", target = "centreHarmonicVoltageContent11Cp95")
+    @Mapping(source = "v12", target = "centreHarmonicVoltageContent12Cp95")
+    @Mapping(source = "v13", target = "centreHarmonicVoltageContent13Cp95")
+    @Mapping(source = "v14", target = "centreHarmonicVoltageContent14Cp95")
+    @Mapping(source = "v15", target = "centreHarmonicVoltageContent15Cp95")
+    @Mapping(source = "v16", target = "centreHarmonicVoltageContent16Cp95")
+    @Mapping(source = "v17", target = "centreHarmonicVoltageContent17Cp95")
+    @Mapping(source = "v18", target = "centreHarmonicVoltageContent18Cp95")
+    @Mapping(source = "v19", target = "centreHarmonicVoltageContent19Cp95")
+    @Mapping(source = "v20", target = "centreHarmonicVoltageContent20Cp95")
+    @Mapping(source = "v21", target = "centreHarmonicVoltageContent21Cp95")
+    @Mapping(source = "v22", target = "centreHarmonicVoltageContent22Cp95")
+    @Mapping(source = "v23", target = "centreHarmonicVoltageContent23Cp95")
+    @Mapping(source = "v24", target = "centreHarmonicVoltageContent24Cp95")
+    @Mapping(source = "v25", target = "centreHarmonicVoltageContent25Cp95")
+    @Mapping(source = "v26", target = "centreHarmonicVoltageContent26Cp95")
+    @Mapping(source = "v27", target = "centreHarmonicVoltageContent27Cp95")
+    @Mapping(source = "v28", target = "centreHarmonicVoltageContent28Cp95")
+    @Mapping(source = "v29", target = "centreHarmonicVoltageContent29Cp95")
+    @Mapping(source = "v30", target = "centreHarmonicVoltageContent30Cp95")
+    @Mapping(source = "v31", target = "centreHarmonicVoltageContent31Cp95")
+    @Mapping(source = "v32", target = "centreHarmonicVoltageContent32Cp95")
+    @Mapping(source = "v33", target = "centreHarmonicVoltageContent33Cp95")
+    @Mapping(source = "v34", target = "centreHarmonicVoltageContent34Cp95")
+    @Mapping(source = "v35", target = "centreHarmonicVoltageContent35Cp95")
+    @Mapping(source = "v36", target = "centreHarmonicVoltageContent36Cp95")
+    @Mapping(source = "v37", target = "centreHarmonicVoltageContent37Cp95")
+    @Mapping(source = "v38", target = "centreHarmonicVoltageContent38Cp95")
+    @Mapping(source = "v39", target = "centreHarmonicVoltageContent39Cp95")
+    @Mapping(source = "v40", target = "centreHarmonicVoltageContent40Cp95")
+    @Mapping(source = "v41", target = "centreHarmonicVoltageContent41Cp95")
+    @Mapping(source = "v42", target = "centreHarmonicVoltageContent42Cp95")
+    @Mapping(source = "v43", target = "centreHarmonicVoltageContent43Cp95")
+    @Mapping(source = "v44", target = "centreHarmonicVoltageContent44Cp95")
+    @Mapping(source = "v45", target = "centreHarmonicVoltageContent45Cp95")
+    @Mapping(source = "v46", target = "centreHarmonicVoltageContent46Cp95")
+    @Mapping(source = "v47", target = "centreHarmonicVoltageContent47Cp95")
+    @Mapping(source = "v48", target = "centreHarmonicVoltageContent48Cp95")
+    @Mapping(source = "v49", target = "centreHarmonicVoltageContent49Cp95")
+    @Mapping(source = "v50", target = "centreHarmonicVoltageContent50Cp95")
+    public RMpInharmonicVRateReportDPO RMpInharmonicVRateReportDPOConverter95(DataInHarmRateVPO temp);
+
+    /*RMpInharmonicVRateReportDPO*/
+    @Mapping(source = "p1", target = "centreHarmonicVoltageContent1Min")
+    @Mapping(source = "p2", target = "centreHarmonicVoltageContent2Min")
+    @Mapping(source = "p3", target = "centreHarmonicVoltageContent3Min")
+    @Mapping(source = "p4", target = "centreHarmonicVoltageContent4Min")
+    @Mapping(source = "p5", target = "centreHarmonicVoltageContent5Min")
+    @Mapping(source = "p6", target = "centreHarmonicVoltageContent6Min")
+    @Mapping(source = "p7", target = "centreHarmonicVoltageContent7Min")
+    @Mapping(source = "p8", target = "centreHarmonicVoltageContent8Min")
+    @Mapping(source = "p9", target = "centreHarmonicVoltageContent9Min")
+    @Mapping(source = "p10", target = "centreHarmonicVoltageContent10Min")
+    @Mapping(source = "p11", target = "centreHarmonicVoltageContent11Min")
+    @Mapping(source = "p12", target = "centreHarmonicVoltageContent12Min")
+    @Mapping(source = "p13", target = "centreHarmonicVoltageContent13Min")
+    @Mapping(source = "p14", target = "centreHarmonicVoltageContent14Min")
+    @Mapping(source = "p15", target = "centreHarmonicVoltageContent15Min")
+    @Mapping(source = "p16", target = "centreHarmonicVoltageContent16Min")
+    @Mapping(source = "p17", target = "centreHarmonicVoltageContent17Min")
+    @Mapping(source = "p18", target = "centreHarmonicVoltageContent18Min")
+    @Mapping(source = "p19", target = "centreHarmonicVoltageContent19Min")
+    @Mapping(source = "p20", target = "centreHarmonicVoltageContent20Min")
+    @Mapping(source = "p21", target = "centreHarmonicVoltageContent21Min")
+    @Mapping(source = "p22", target = "centreHarmonicVoltageContent22Min")
+    @Mapping(source = "p23", target = "centreHarmonicVoltageContent23Min")
+    @Mapping(source = "p24", target = "centreHarmonicVoltageContent24Min")
+    @Mapping(source = "p25", target = "centreHarmonicVoltageContent25Min")
+    @Mapping(source = "p26", target = "centreHarmonicVoltageContent26Min")
+    @Mapping(source = "p27", target = "centreHarmonicVoltageContent27Min")
+    @Mapping(source = "p28", target = "centreHarmonicVoltageContent28Min")
+    @Mapping(source = "p29", target = "centreHarmonicVoltageContent29Min")
+    @Mapping(source = "p30", target = "centreHarmonicVoltageContent30Min")
+    @Mapping(source = "p31", target = "centreHarmonicVoltageContent31Min")
+    @Mapping(source = "p32", target = "centreHarmonicVoltageContent32Min")
+    @Mapping(source = "p33", target = "centreHarmonicVoltageContent33Min")
+    @Mapping(source = "p34", target = "centreHarmonicVoltageContent34Min")
+    @Mapping(source = "p35", target = "centreHarmonicVoltageContent35Min")
+    @Mapping(source = "p36", target = "centreHarmonicVoltageContent36Min")
+    @Mapping(source = "p37", target = "centreHarmonicVoltageContent37Min")
+    @Mapping(source = "p38", target = "centreHarmonicVoltageContent38Min")
+    @Mapping(source = "p39", target = "centreHarmonicVoltageContent39Min")
+    @Mapping(source = "p40", target = "centreHarmonicVoltageContent40Min")
+    @Mapping(source = "p41", target = "centreHarmonicVoltageContent41Min")
+    @Mapping(source = "p42", target = "centreHarmonicVoltageContent42Min")
+    @Mapping(source = "p43", target = "centreHarmonicVoltageContent43Min")
+    @Mapping(source = "p44", target = "centreHarmonicVoltageContent44Min")
+    @Mapping(source = "p45", target = "centreHarmonicVoltageContent45Min")
+    @Mapping(source = "p46", target = "centreHarmonicVoltageContent46Min")
+    @Mapping(source = "p47", target = "centreHarmonicVoltageContent47Min")
+    @Mapping(source = "p48", target = "centreHarmonicVoltageContent48Min")
+    @Mapping(source = "p49", target = "centreHarmonicVoltageContent49Min")
+    @Mapping(source = "p50", target = "centreHarmonicVoltageContent50Min")
+    public RMpInharmonicVRateReportDPO RMpHarmonicPReportDPOConverterMin(DataHarmPowerPPO temp);
+
+    @Mapping(source = "p1", target = "centreHarmonicVoltageContent1Max")
+    @Mapping(source = "p2", target = "centreHarmonicVoltageContent2Max")
+    @Mapping(source = "p3", target = "centreHarmonicVoltageContent3Max")
+    @Mapping(source = "p4", target = "centreHarmonicVoltageContent4Max")
+    @Mapping(source = "p5", target = "centreHarmonicVoltageContent5Max")
+    @Mapping(source = "p6", target = "centreHarmonicVoltageContent6Max")
+    @Mapping(source = "p7", target = "centreHarmonicVoltageContent7Max")
+    @Mapping(source = "p8", target = "centreHarmonicVoltageContent8Max")
+    @Mapping(source = "p9", target = "centreHarmonicVoltageContent9Max")
+    @Mapping(source = "p10", target = "centreHarmonicVoltageContent10Max")
+    @Mapping(source = "p11", target = "centreHarmonicVoltageContent11Max")
+    @Mapping(source = "p12", target = "centreHarmonicVoltageContent12Max")
+    @Mapping(source = "p13", target = "centreHarmonicVoltageContent13Max")
+    @Mapping(source = "p14", target = "centreHarmonicVoltageContent14Max")
+    @Mapping(source = "p15", target = "centreHarmonicVoltageContent15Max")
+    @Mapping(source = "p16", target = "centreHarmonicVoltageContent16Max")
+    @Mapping(source = "p17", target = "centreHarmonicVoltageContent17Max")
+    @Mapping(source = "p18", target = "centreHarmonicVoltageContent18Max")
+    @Mapping(source = "p19", target = "centreHarmonicVoltageContent19Max")
+    @Mapping(source = "p20", target = "centreHarmonicVoltageContent20Max")
+    @Mapping(source = "p21", target = "centreHarmonicVoltageContent21Max")
+    @Mapping(source = "p22", target = "centreHarmonicVoltageContent22Max")
+    @Mapping(source = "p23", target = "centreHarmonicVoltageContent23Max")
+    @Mapping(source = "p24", target = "centreHarmonicVoltageContent24Max")
+    @Mapping(source = "p25", target = "centreHarmonicVoltageContent25Max")
+    @Mapping(source = "p26", target = "centreHarmonicVoltageContent26Max")
+    @Mapping(source = "p27", target = "centreHarmonicVoltageContent27Max")
+    @Mapping(source = "p28", target = "centreHarmonicVoltageContent28Max")
+    @Mapping(source = "p29", target = "centreHarmonicVoltageContent29Max")
+    @Mapping(source = "p30", target = "centreHarmonicVoltageContent30Max")
+    @Mapping(source = "p31", target = "centreHarmonicVoltageContent31Max")
+    @Mapping(source = "p32", target = "centreHarmonicVoltageContent32Max")
+    @Mapping(source = "p33", target = "centreHarmonicVoltageContent33Max")
+    @Mapping(source = "p34", target = "centreHarmonicVoltageContent34Max")
+    @Mapping(source = "p35", target = "centreHarmonicVoltageContent35Max")
+    @Mapping(source = "p36", target = "centreHarmonicVoltageContent36Max")
+    @Mapping(source = "p37", target = "centreHarmonicVoltageContent37Max")
+    @Mapping(source = "p38", target = "centreHarmonicVoltageContent38Max")
+    @Mapping(source = "p39", target = "centreHarmonicVoltageContent39Max")
+    @Mapping(source = "p40", target = "centreHarmonicVoltageContent40Max")
+    @Mapping(source = "p41", target = "centreHarmonicVoltageContent41Max")
+    @Mapping(source = "p42", target = "centreHarmonicVoltageContent42Max")
+    @Mapping(source = "p43", target = "centreHarmonicVoltageContent43Max")
+    @Mapping(source = "p44", target = "centreHarmonicVoltageContent44Max")
+    @Mapping(source = "p45", target = "centreHarmonicVoltageContent45Max")
+    @Mapping(source = "p46", target = "centreHarmonicVoltageContent46Max")
+    @Mapping(source = "p47", target = "centreHarmonicVoltageContent47Max")
+    @Mapping(source = "p48", target = "centreHarmonicVoltageContent48Max")
+    @Mapping(source = "p49", target = "centreHarmonicVoltageContent49Max")
+    @Mapping(source = "p50", target = "centreHarmonicVoltageContent50Max")
+    public RMpInharmonicVRateReportDPO RMpHarmonicPReportDPOConverterMax(DataHarmPowerPPO temp);
+
+    @Mapping(source = "p1", target = "centreHarmonicVoltageContent1Avg")
+    @Mapping(source = "p2", target = "centreHarmonicVoltageContent2Avg")
+    @Mapping(source = "p3", target = "centreHarmonicVoltageContent3Avg")
+    @Mapping(source = "p4", target = "centreHarmonicVoltageContent4Avg")
+    @Mapping(source = "p5", target = "centreHarmonicVoltageContent5Avg")
+    @Mapping(source = "p6", target = "centreHarmonicVoltageContent6Avg")
+    @Mapping(source = "p7", target = "centreHarmonicVoltageContent7Avg")
+    @Mapping(source = "p8", target = "centreHarmonicVoltageContent8Avg")
+    @Mapping(source = "p9", target = "centreHarmonicVoltageContent9Avg")
+    @Mapping(source = "p10", target = "centreHarmonicVoltageContent10Avg")
+    @Mapping(source = "p11", target = "centreHarmonicVoltageContent11Avg")
+    @Mapping(source = "p12", target = "centreHarmonicVoltageContent12Avg")
+    @Mapping(source = "p13", target = "centreHarmonicVoltageContent13Avg")
+    @Mapping(source = "p14", target = "centreHarmonicVoltageContent14Avg")
+    @Mapping(source = "p15", target = "centreHarmonicVoltageContent15Avg")
+    @Mapping(source = "p16", target = "centreHarmonicVoltageContent16Avg")
+    @Mapping(source = "p17", target = "centreHarmonicVoltageContent17Avg")
+    @Mapping(source = "p18", target = "centreHarmonicVoltageContent18Avg")
+    @Mapping(source = "p19", target = "centreHarmonicVoltageContent19Avg")
+    @Mapping(source = "p20", target = "centreHarmonicVoltageContent20Avg")
+    @Mapping(source = "p21", target = "centreHarmonicVoltageContent21Avg")
+    @Mapping(source = "p22", target = "centreHarmonicVoltageContent22Avg")
+    @Mapping(source = "p23", target = "centreHarmonicVoltageContent23Avg")
+    @Mapping(source = "p24", target = "centreHarmonicVoltageContent24Avg")
+    @Mapping(source = "p25", target = "centreHarmonicVoltageContent25Avg")
+    @Mapping(source = "p26", target = "centreHarmonicVoltageContent26Avg")
+    @Mapping(source = "p27", target = "centreHarmonicVoltageContent27Avg")
+    @Mapping(source = "p28", target = "centreHarmonicVoltageContent28Avg")
+    @Mapping(source = "p29", target = "centreHarmonicVoltageContent29Avg")
+    @Mapping(source = "p30", target = "centreHarmonicVoltageContent30Avg")
+    @Mapping(source = "p31", target = "centreHarmonicVoltageContent31Avg")
+    @Mapping(source = "p32", target = "centreHarmonicVoltageContent32Avg")
+    @Mapping(source = "p33", target = "centreHarmonicVoltageContent33Avg")
+    @Mapping(source = "p34", target = "centreHarmonicVoltageContent34Avg")
+    @Mapping(source = "p35", target = "centreHarmonicVoltageContent35Avg")
+    @Mapping(source = "p36", target = "centreHarmonicVoltageContent36Avg")
+    @Mapping(source = "p37", target = "centreHarmonicVoltageContent37Avg")
+    @Mapping(source = "p38", target = "centreHarmonicVoltageContent38Avg")
+    @Mapping(source = "p39", target = "centreHarmonicVoltageContent39Avg")
+    @Mapping(source = "p40", target = "centreHarmonicVoltageContent40Avg")
+    @Mapping(source = "p41", target = "centreHarmonicVoltageContent41Avg")
+    @Mapping(source = "p42", target = "centreHarmonicVoltageContent42Avg")
+    @Mapping(source = "p43", target = "centreHarmonicVoltageContent43Avg")
+    @Mapping(source = "p44", target = "centreHarmonicVoltageContent44Avg")
+    @Mapping(source = "p45", target = "centreHarmonicVoltageContent45Avg")
+    @Mapping(source = "p46", target = "centreHarmonicVoltageContent46Avg")
+    @Mapping(source = "p47", target = "centreHarmonicVoltageContent47Avg")
+    @Mapping(source = "p48", target = "centreHarmonicVoltageContent48Avg")
+    @Mapping(source = "p49", target = "centreHarmonicVoltageContent49Avg")
+    @Mapping(source = "p50", target = "centreHarmonicVoltageContent50Avg")
+    public RMpInharmonicVRateReportDPO RMpHarmonicPReportDPOConverterAvg(DataHarmPowerPPO temp);
+
+
+    @Mapping(source = "p1", target = "centreHarmonicVoltageContent1Cp95")
+    @Mapping(source = "p2", target = "centreHarmonicVoltageContent2Cp95")
+    @Mapping(source = "p3", target = "centreHarmonicVoltageContent3Cp95")
+    @Mapping(source = "p4", target = "centreHarmonicVoltageContent4Cp95")
+    @Mapping(source = "p5", target = "centreHarmonicVoltageContent5Cp95")
+    @Mapping(source = "p6", target = "centreHarmonicVoltageContent6Cp95")
+    @Mapping(source = "p7", target = "centreHarmonicVoltageContent7Cp95")
+    @Mapping(source = "p8", target = "centreHarmonicVoltageContent8Cp95")
+    @Mapping(source = "p9", target = "centreHarmonicVoltageContent9Cp95")
+    @Mapping(source = "p10", target = "centreHarmonicVoltageContent10Cp95")
+    @Mapping(source = "p11", target = "centreHarmonicVoltageContent11Cp95")
+    @Mapping(source = "p12", target = "centreHarmonicVoltageContent12Cp95")
+    @Mapping(source = "p13", target = "centreHarmonicVoltageContent13Cp95")
+    @Mapping(source = "p14", target = "centreHarmonicVoltageContent14Cp95")
+    @Mapping(source = "p15", target = "centreHarmonicVoltageContent15Cp95")
+    @Mapping(source = "p16", target = "centreHarmonicVoltageContent16Cp95")
+    @Mapping(source = "p17", target = "centreHarmonicVoltageContent17Cp95")
+    @Mapping(source = "p18", target = "centreHarmonicVoltageContent18Cp95")
+    @Mapping(source = "p19", target = "centreHarmonicVoltageContent19Cp95")
+    @Mapping(source = "p20", target = "centreHarmonicVoltageContent20Cp95")
+    @Mapping(source = "p21", target = "centreHarmonicVoltageContent21Cp95")
+    @Mapping(source = "p22", target = "centreHarmonicVoltageContent22Cp95")
+    @Mapping(source = "p23", target = "centreHarmonicVoltageContent23Cp95")
+    @Mapping(source = "p24", target = "centreHarmonicVoltageContent24Cp95")
+    @Mapping(source = "p25", target = "centreHarmonicVoltageContent25Cp95")
+    @Mapping(source = "p26", target = "centreHarmonicVoltageContent26Cp95")
+    @Mapping(source = "p27", target = "centreHarmonicVoltageContent27Cp95")
+    @Mapping(source = "p28", target = "centreHarmonicVoltageContent28Cp95")
+    @Mapping(source = "p29", target = "centreHarmonicVoltageContent29Cp95")
+    @Mapping(source = "p30", target = "centreHarmonicVoltageContent30Cp95")
+    @Mapping(source = "p31", target = "centreHarmonicVoltageContent31Cp95")
+    @Mapping(source = "p32", target = "centreHarmonicVoltageContent32Cp95")
+    @Mapping(source = "p33", target = "centreHarmonicVoltageContent33Cp95")
+    @Mapping(source = "p34", target = "centreHarmonicVoltageContent34Cp95")
+    @Mapping(source = "p35", target = "centreHarmonicVoltageContent35Cp95")
+    @Mapping(source = "p36", target = "centreHarmonicVoltageContent36Cp95")
+    @Mapping(source = "p37", target = "centreHarmonicVoltageContent37Cp95")
+    @Mapping(source = "p38", target = "centreHarmonicVoltageContent38Cp95")
+    @Mapping(source = "p39", target = "centreHarmonicVoltageContent39Cp95")
+    @Mapping(source = "p40", target = "centreHarmonicVoltageContent40Cp95")
+    @Mapping(source = "p41", target = "centreHarmonicVoltageContent41Cp95")
+    @Mapping(source = "p42", target = "centreHarmonicVoltageContent42Cp95")
+    @Mapping(source = "p43", target = "centreHarmonicVoltageContent43Cp95")
+    @Mapping(source = "p44", target = "centreHarmonicVoltageContent44Cp95")
+    @Mapping(source = "p45", target = "centreHarmonicVoltageContent45Cp95")
+    @Mapping(source = "p46", target = "centreHarmonicVoltageContent46Cp95")
+    @Mapping(source = "p47", target = "centreHarmonicVoltageContent47Cp95")
+    @Mapping(source = "p48", target = "centreHarmonicVoltageContent48Cp95")
+    @Mapping(source = "p49", target = "centreHarmonicVoltageContent49Cp95")
+    @Mapping(source = "p50", target = "centreHarmonicVoltageContent50Cp95")
+    public RMpInharmonicVRateReportDPO RMpHarmonicPReportDPOConverter95(DataHarmPowerPPO temp);
+
+    /*RMpMeasurePhaseReportDPO*/
+    @Mapping(source = "max.rms", target = "phaseVoltageEffectiveMax")
+    @Mapping(source = "max.rmsLvr", target = "lineVoltageEffectiveMax")
+    @Mapping(source = "max.vuDev", target = "VDeUpMax")
+    @Mapping(source = "max.vlDev", target = "VDeLowMax")
+    @Mapping(source = "max1.rms", target = "currentEffectiveMax")
+    @Mapping(source = "max2.p", target = "spActivePowerMax")
+    @Mapping(source = "max4.q", target = "spReactivePowerMax")
+    @Mapping(source = "max3.s", target = "spApparentPowerMax")
+    @Mapping(source = "max2.pf", target = "spPowerFactorMax")
+    @Mapping(source = "max2.df", target = "spFundamentalPowerFactorMax")
+    public RMpMeasurePhaseReportDPO RMpMeasurePhaseReportDPOConverterMax(DataVPO max, DataIPO max1, DataHarmPowerPPO max2, DataHarmPowerSPO max3, DataHarmPowerQPO max4);
+
+    @Mapping(source = "min.rms", target = "phaseVoltageEffectiveMin")
+    @Mapping(source = "min.rmsLvr", target = "lineVoltageEffectiveMin")
+    @Mapping(source = "min.vuDev", target = "VDeUpMin")
+    @Mapping(source = "min.vlDev", target = "VDeLowMin")
+    @Mapping(source = "min1.rms", target = "currentEffectiveMin")
+    @Mapping(source = "min2.p", target = "spActivePowerMin")
+    @Mapping(source = "min4.q", target = "spReactivePowerMin")
+    @Mapping(source = "min3.s", target = "spApparentPowerMin")
+    @Mapping(source = "min2.pf", target = "spPowerFactorMin")
+    @Mapping(source = "min2.df", target = "spFundamentalPowerFactorMin")
+    public RMpMeasurePhaseReportDPO RMpMeasurePhaseReportDPOConverterMin(DataVPO min, DataIPO min1, DataHarmPowerPPO min2, DataHarmPowerSPO min3, DataHarmPowerQPO min4);
+
+
+    @Mapping(source = "avg.rms", target = "phaseVoltageEffectiveAvg")
+    @Mapping(source = "avg.rmsLvr", target = "lineVoltageEffectiveAvg")
+    @Mapping(source = "avg.vuDev", target = "VDeUpAvg")
+    @Mapping(source = "avg.vlDev", target = "VDeLowAvg")
+    @Mapping(source = "avg1.rms", target = "currentEffectiveAvg")
+    @Mapping(source = "avg2.p", target = "spActivePowerAvg")
+    @Mapping(source = "avg4.q", target = "spReactivePowerAvg")
+    @Mapping(source = "avg3.s", target = "spApparentPowerAvg")
+    @Mapping(source = "avg2.pf", target = "spPowerFactorAvg")
+    @Mapping(source = "avg2.df", target = "spFundamentalPowerFactorAvg")
+    public RMpMeasurePhaseReportDPO RMpMeasurePhaseReportDPOConverterAVg(DataVPO avg, DataIPO avg1, DataHarmPowerPPO avg2, DataHarmPowerSPO avg3, DataHarmPowerQPO avg4);
+
+
+    @Mapping(source = "cp95.rms", target = "phaseVoltageEffective95")
+    @Mapping(source = "cp95.rmsLvr", target = "lineVoltageEffective95")
+    @Mapping(source = "cp95.vuDev", target = "VDeUp95")
+    @Mapping(source = "cp95.vlDev", target = "VDeLow95")
+    @Mapping(source = "cp951.rms", target = "currentEffective95")
+    @Mapping(source = "cp952.p", target = "spActivePower95")
+    @Mapping(source = "cp954.q", target = "spReactivePower95")
+    @Mapping(source = "cp953.s", target = "spApparentPower95")
+    @Mapping(source = "cp952.pf", target = "spPowerFactor95")
+    @Mapping(source = "cp952.df", target = "spFundamentalPowerFactor95")
+    public RMpMeasurePhaseReportDPO RMpMeasurePhaseReportDPOConverterCp95(DataVPO cp95, DataIPO cp951, DataHarmPowerPPO cp952, DataHarmPowerSPO cp953, DataHarmPowerQPO cp954);
+}
diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/constant/Param.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/constant/Param.java
new file mode 100644
index 000000000..e88c680eb
--- /dev/null
+++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/constant/Param.java
@@ -0,0 +1,15 @@
+package com.njcn.prepare.harmonic.constant;
+
+
+/**
+ * @author qijian
+ */
+public interface Param {
+
+    /**
+     * 稳态/固态
+     */
+    Integer SOLID_STATE = 0;
+    Integer STEADY_STATE = 1;
+
+}
diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/controller/LimitRateServiceTest.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/controller/LimitRateServiceTest.java
new file mode 100644
index 000000000..6e7308d99
--- /dev/null
+++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/controller/LimitRateServiceTest.java
@@ -0,0 +1,71 @@
+package com.njcn.prepare.harmonic.controller;
+
+import com.njcn.influxdb.utils.InfluxDbUtils;
+import com.njcn.prepare.harmonic.mapper.line.ExcelRptTempMapper;
+import com.njcn.prepare.harmonic.pojo.po.DataVPO;
+import com.njcn.prepare.harmonic.pojo.po.ExcelRptTemp;
+import com.njcn.prepare.harmonic.service.Impl.line.LimitRateService;
+import org.influxdb.dto.QueryResult;
+import org.influxdb.impl.InfluxDBResultMapper;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+import org.springframework.test.context.web.WebAppConfiguration;
+
+import java.text.ParseException;
+import java.util.List;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+/**
+ * Description:
+ * 接口文档访问地址：http://serverIP:port/swagger-ui.html
+ * Date: 2022/10/18  20:15【需求编号】
+ *
+ * @author clam
+ * @version V1.0.0
+ */
+@RunWith(SpringRunner.class)
+@WebAppConfiguration
+@SpringBootTest
+public class LimitRateServiceTest {
+    private  @Autowired
+    LimitRateService limitRateService;
+    private @Autowired
+    InfluxDbUtils influxDbUtils;
+
+    private  @Autowired
+    ExcelRptTempMapper excelRptTempMapper;
+
+    @Test
+    public void test() throws ParseException {
+        System.out.println("spring test start");
+         limitRateService.limitRateJobHandler (Stream.of ("8696be1d170e05b7d848accc059f4558" ).collect(Collectors.toList()), "2022-10-15 00:00:00", "2022-10-15 23:59:59");
+    }
+
+    @Test
+    public void test1(){
+        System.out.println("spring test start");
+        String sql ="SELECT  *   FROM data_v where  time >= '2022-10-15 00:00:00' and time <= '2022-10-15 23:59:59' ";
+        influxDbUtils.setDbName ("pqsbase_test");
+
+        QueryResult sqlResult = influxDbUtils.query (sql);
+        InfluxDBResultMapper resultMapper = new InfluxDBResultMapper ( );
+        List<DataVPO> list = resultMapper.toPOJO (sqlResult, DataVPO.class);
+        System.out.println ("spring test end" );
+    }
+
+
+    @Test
+    public void test3(){
+        System.out.println("spring test start");
+        ExcelRptTemp excelRptTemp = excelRptTempMapper.selectById ("8c7f0cb540904ddeb8fbedef288579d7");
+        System.out.println (excelRptTemp.getId () );
+//        limitRateService.limitRateJobHandler (Stream.of ("8696be1d170e05b7d848accc059f4558" ).collect(Collectors.toList()), "2022-10-15 00:00:00", "2022-10-15 23:59:59");
+    }
+
+
+
+}
diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/controller/area/AreaController.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/controller/area/AreaController.java
new file mode 100644
index 000000000..e70d8cab4
--- /dev/null
+++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/controller/area/AreaController.java
@@ -0,0 +1,9 @@
+package com.njcn.prepare.harmonic.controller.area;
+
+/**
+ * @author denghuajun
+ * @version 1.0.0
+ * @date 2022年10月17日 20:13
+ */
+public class AreaController {
+}
diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/controller/device/DeviceController.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/controller/device/DeviceController.java
new file mode 100644
index 000000000..4cf88d517
--- /dev/null
+++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/controller/device/DeviceController.java
@@ -0,0 +1,9 @@
+package com.njcn.prepare.harmonic.controller.device;
+
+/**
+ * @author denghuajun
+ * @version 1.0.0
+ * @date 2022年10月17日 20:13
+ */
+public class DeviceController {
+}
diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/controller/line/DayDataController.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/controller/line/DayDataController.java
new file mode 100644
index 000000000..826cdbada
--- /dev/null
+++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/controller/line/DayDataController.java
@@ -0,0 +1,68 @@
+package com.njcn.prepare.harmonic.controller.line;
+
+import com.njcn.common.pojo.annotation.OperateInfo;
+import com.njcn.common.pojo.enums.common.LogEnum;
+import com.njcn.common.pojo.enums.response.CommonResponseEnum;
+import com.njcn.common.pojo.response.HttpResult;
+import com.njcn.common.utils.HttpResultUtil;
+import com.njcn.device.pq.api.LineFeignClient;
+import com.njcn.prepare.harmonic.pojo.param.LimitRateHanlderParam;
+import com.njcn.prepare.harmonic.service.line.DayDataService;
+import com.njcn.web.controller.BaseController;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.util.CollectionUtils;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Description:
+ * 接口文档访问地址：http://serverIP:port/swagger-ui.html
+ * Date: 2022/10/24  9:26【需求编号】
+ *
+ * @author clam
+ * @version V1.0.0
+ */
+@Slf4j
+@Api(tags = "日表数据处理")
+@RestController
+@RequestMapping("daydata")
+@RequiredArgsConstructor
+public class DayDataController extends BaseController {
+
+
+    private final LineFeignClient lineFeignClient;
+
+    private final DayDataService dayDataService;
+
+    @ApiOperation("day表定时任务")
+    @ApiImplicitParam(value = "jobParam",name = "jobParam",required = true)
+    @PostMapping("dayDataHanlder")
+    @OperateInfo(info = LogEnum.BUSINESS_MEDIUM)
+    public HttpResult<Boolean> dayDataHanlder(@RequestBody LimitRateHanlderParam jobParam ){
+        String methodDescribe = getMethodDescribe("dayDataHanlder");
+        Boolean result = true;
+        List<String> indexLists = new ArrayList<> ();
+        if(CollectionUtils.isEmpty (jobParam.getLineIds ())){
+            indexLists = lineFeignClient.getLineList ( ).getData ( );
+        }else{
+            indexLists = jobParam.getLineIds ();
+        }
+
+
+        dayDataService.dayDataJobHandler (indexLists,jobParam.getStartTime (),jobParam.getEndTime ());
+        if (result){
+            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, true, methodDescribe);
+        } else {
+            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, false, methodDescribe);
+        }
+    }
+}
diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/controller/line/IntegrityController.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/controller/line/IntegrityController.java
new file mode 100644
index 000000000..7b7b00cbb
--- /dev/null
+++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/controller/line/IntegrityController.java
@@ -0,0 +1,46 @@
+package com.njcn.prepare.harmonic.controller.line;
+
+import com.njcn.common.pojo.annotation.OperateInfo;
+import com.njcn.common.pojo.enums.common.LogEnum;
+import com.njcn.common.pojo.enums.response.CommonResponseEnum;
+import com.njcn.common.pojo.response.HttpResult;
+import com.njcn.common.utils.HttpResultUtil;
+import com.njcn.prepare.harmonic.pojo.param.LineParam;
+import com.njcn.prepare.harmonic.service.line.IntegrityService;
+import com.njcn.web.controller.BaseController;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @author xiaoyao
+ * @version 1.0.0
+ * @createTime 2022/10/24 20:03
+ */
+
+@Slf4j
+@Api(tags = "数据完整性统计")
+@RestController
+@RequestMapping("/integrity")
+@RequiredArgsConstructor
+public class IntegrityController extends BaseController {
+
+    private final IntegrityService integrityService;
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/computeDataIntegrity")
+    @ApiOperation("数据完整性统计")
+    @ApiImplicitParam(name = "lineParam", value = "参数", required = true)
+    public HttpResult<String> computeDataIntegrity(@RequestBody @Validated LineParam lineParam){
+        String methodDescribe = getMethodDescribe("computeDataIntegrity");
+        String out = integrityService.computeDataIntegrity(lineParam);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, out, methodDescribe);
+    }
+}
diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/controller/line/LimitTargetController.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/controller/line/LimitTargetController.java
new file mode 100644
index 000000000..1f45f03f3
--- /dev/null
+++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/controller/line/LimitTargetController.java
@@ -0,0 +1,46 @@
+package com.njcn.prepare.harmonic.controller.line;
+
+import com.njcn.common.pojo.annotation.OperateInfo;
+import com.njcn.common.pojo.enums.common.LogEnum;
+import com.njcn.common.pojo.enums.response.CommonResponseEnum;
+import com.njcn.common.pojo.response.HttpResult;
+import com.njcn.common.utils.HttpResultUtil;
+import com.njcn.prepare.harmonic.pojo.param.LineParam;
+import com.njcn.prepare.harmonic.service.line.LimitTargetService;
+import com.njcn.web.controller.BaseController;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @author xiaoyao
+ * @version 1.0.0
+ * @createTime 2022/10/26 13:32
+ */
+
+@Slf4j
+@Api(tags = "监测点T相数据超限处理")
+@RestController
+@RequestMapping("/limitTarget")
+@RequiredArgsConstructor
+public class LimitTargetController extends BaseController {
+
+    private final LimitTargetService limitTargetService;
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/getLimitTargetData")
+    @ApiOperation("生成limit_target表")
+    @ApiImplicitParam(name = "lineParam", value = "参数", required = true)
+    public HttpResult<String> getLimitTargetData(@RequestBody @Validated LineParam lineParam){
+        String methodDescribe = getMethodDescribe("getLimitTargetData");
+        limitTargetService.getLimitTargetData(lineParam);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
+    }
+}
diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/controller/line/LimitrateController.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/controller/line/LimitrateController.java
new file mode 100644
index 000000000..73003c744
--- /dev/null
+++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/controller/line/LimitrateController.java
@@ -0,0 +1,69 @@
+package com.njcn.prepare.harmonic.controller.line;
+
+import com.njcn.common.pojo.annotation.OperateInfo;
+import com.njcn.common.pojo.enums.common.LogEnum;
+import com.njcn.common.pojo.enums.response.CommonResponseEnum;
+import com.njcn.common.pojo.response.HttpResult;
+import com.njcn.common.utils.HttpResultUtil;
+import com.njcn.device.pq.api.LineFeignClient;
+import com.njcn.prepare.harmonic.pojo.param.LimitRateHanlderParam;
+import com.njcn.prepare.harmonic.service.Impl.line.LimitRateService;
+import com.njcn.web.controller.BaseController;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.util.CollectionUtils;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Description:
+ * 接口文档访问地址：http://serverIP:port/swagger-ui.html
+ * Date: 2022/10/19  9:58【需求编号】
+ *
+ * @author clam
+ * @version V1.0.0
+ */
+@Slf4j
+@Api(tags = "监测点数据超限处理")
+@RestController
+@RequestMapping("limitrate")
+@RequiredArgsConstructor
+public class LimitrateController extends BaseController {
+
+
+    private final LimitRateService limitRateService;
+
+    private final LineFeignClient lineFeignClient;
+
+
+    @ApiOperation("limitrate表定时任务")
+    @ApiImplicitParam(value = "limitRateHanlderParam",name = "limitRateHanlderParam",required = true)
+    @PostMapping("LimitRateHanlder")
+    @OperateInfo(info = LogEnum.BUSINESS_MEDIUM)
+    public HttpResult<Boolean> limitRateHanlder(@RequestBody LimitRateHanlderParam limitRateHanlderParam ){
+        String methodDescribe = getMethodDescribe("limitRateHanlder");
+        Boolean result = true;
+        List<String> indexLists = new ArrayList<> ();
+        if(CollectionUtils.isEmpty (limitRateHanlderParam.getLineIds ())){
+            indexLists = lineFeignClient.getLineList ( ).getData ( );
+        }else{
+            indexLists = limitRateHanlderParam.getLineIds ();
+        }
+
+
+        limitRateService.limitRateJobHandler (indexLists,limitRateHanlderParam.getStartTime (),limitRateHanlderParam.getEndTime ());
+        if (result){
+            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, true, methodDescribe);
+        } else {
+            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, false, methodDescribe);
+        }
+    }
+}
diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/controller/line/NormalLimitController.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/controller/line/NormalLimitController.java
new file mode 100644
index 000000000..b2c459f5f
--- /dev/null
+++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/controller/line/NormalLimitController.java
@@ -0,0 +1,40 @@
+package com.njcn.prepare.harmonic.controller.line;
+
+import com.njcn.common.pojo.annotation.OperateInfo;
+import com.njcn.common.pojo.enums.common.LogEnum;
+import com.njcn.common.pojo.enums.response.CommonResponseEnum;
+import com.njcn.common.pojo.response.HttpResult;
+import com.njcn.common.utils.HttpResultUtil;
+import com.njcn.prepare.harmonic.service.line.NormalLimitService;
+import com.njcn.web.controller.BaseController;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @author denghuajun
+ * @version 1.0.0
+ * @date 2022年10月17日 19:56
+ */
+@Slf4j
+@RestController
+@RequestMapping("/normalLimit")
+@Api(tags = "告警数据预处理")
+@AllArgsConstructor
+public class NormalLimitController extends BaseController {
+
+    private final NormalLimitService normLimitService;
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/getNormLimitData")
+    @ApiOperation("告警数据预处理")
+    public HttpResult<String> getNormLimitData() {
+        String methodDescribe = getMethodDescribe("getNormLimitData");
+        String list = normLimitService.getNormLimitData();
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);
+    }
+}
diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/controller/line/OnlineRateController.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/controller/line/OnlineRateController.java
new file mode 100644
index 000000000..5fe0daa0f
--- /dev/null
+++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/controller/line/OnlineRateController.java
@@ -0,0 +1,49 @@
+package com.njcn.prepare.harmonic.controller.line;
+
+import com.njcn.common.pojo.annotation.OperateInfo;
+import com.njcn.common.pojo.enums.common.LogEnum;
+import com.njcn.common.pojo.enums.response.CommonResponseEnum;
+import com.njcn.common.pojo.response.HttpResult;
+import com.njcn.common.utils.HttpResultUtil;
+import com.njcn.prepare.harmonic.pojo.param.LineParam;
+import com.njcn.prepare.harmonic.service.line.OnlineRateService;
+import com.njcn.web.controller.BaseController;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 生成在线率数据表
+ *
+ * @author xiaoyao
+ * @version 1.0.0
+ * @createTime 2022/10/27 9:17
+ */
+
+@Slf4j
+@Api(tags = "生成在线率数据表")
+@RestController
+@RequestMapping("/onlineRate")
+@RequiredArgsConstructor
+public class OnlineRateController  extends BaseController {
+
+    private final OnlineRateService onlineRateService;
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/getOnlineRateData")
+    @ApiOperation("生成在线率数据")
+    @ApiImplicitParam(name = "lineParam", value = "参数", required = true)
+    public HttpResult<String> getOnlineRateData(@RequestBody @Validated LineParam lineParam){
+        String methodDescribe = getMethodDescribe("getOnlineRateData");
+        onlineRateService.getOnlineRateData(lineParam);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
+    }
+
+}
diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/controller/line/PollutionController.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/controller/line/PollutionController.java
new file mode 100644
index 000000000..a4ea96534
--- /dev/null
+++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/controller/line/PollutionController.java
@@ -0,0 +1,54 @@
+package com.njcn.prepare.harmonic.controller.line;
+
+import com.njcn.common.pojo.annotation.OperateInfo;
+import com.njcn.common.pojo.enums.common.LogEnum;
+import com.njcn.common.pojo.enums.response.CommonResponseEnum;
+import com.njcn.common.pojo.param.StatisticsBizBaseParam;
+import com.njcn.common.pojo.response.HttpResult;
+import com.njcn.common.utils.HttpResultUtil;
+import com.njcn.prepare.harmonic.pojo.param.LineParam;
+import com.njcn.prepare.harmonic.service.line.PollutionService;
+import com.njcn.web.controller.BaseController;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpServletResponse;
+
+
+/**
+ * 监测点污染指标
+ *
+ * @author xiaoyao
+ * @version 1.0.0
+ * @createTime 2022/10/18 8:54
+ */
+
+@Slf4j
+@Api(tags = "监测点污染指标")
+@RestController
+@RequestMapping("/pollution")
+@RequiredArgsConstructor
+public class PollutionController extends BaseController {
+
+    private final PollutionService pollutionService;
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/processPollutionData")
+    @ApiOperation("处理监测点污染指标")
+    @ApiImplicitParam(name = "lineParam", value = "参数", required = true)
+    public HttpResult<String> processPollutionData(@RequestBody @Validated LineParam lineParam){
+        String methodDescribe = getMethodDescribe("processPollutionData");
+        pollutionService.processPollutionData(lineParam);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
+    }
+
+}
diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/controller/line/ReportController.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/controller/line/ReportController.java
new file mode 100644
index 000000000..25daf78b8
--- /dev/null
+++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/controller/line/ReportController.java
@@ -0,0 +1,57 @@
+package com.njcn.prepare.harmonic.controller.line;
+
+import com.njcn.common.pojo.annotation.OperateInfo;
+import com.njcn.common.pojo.enums.common.LogEnum;
+import com.njcn.common.pojo.enums.response.CommonResponseEnum;
+import com.njcn.common.pojo.response.HttpResult;
+import com.njcn.common.utils.HttpResultUtil;
+import com.njcn.prepare.harmonic.pojo.param.LineParam;
+import com.njcn.prepare.harmonic.service.line.ReportService;
+import com.njcn.web.controller.BaseController;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 自定义报表
+ * @author qijian
+ * @date 2022/10/20
+ */
+@Slf4j
+@RestController
+@RequestMapping("/report")
+@Api(tags = "自定义报表")
+@AllArgsConstructor
+public class ReportController extends BaseController {
+
+    private final ReportService reportService;
+
+    /**
+     * 批量处理报表
+     * @author qijian
+     * @date 2022/10/19
+     */
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/batchReport")
+    @ApiOperation("批量处理报表")
+    @ApiImplicitParam(name = "reportParam", value = "查询体", required = true)
+    public HttpResult<Boolean> batchReport(@RequestBody @Validated LineParam reportParam){
+        String methodDescribe = getMethodDescribe("batchReport");
+        boolean res = reportService.batchReport(reportParam);
+        if(res){
+            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
+        }else {
+            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, null, methodDescribe);
+        }
+    }
+
+
+
+}
diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/controller/substion/SubstionController.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/controller/substion/SubstionController.java
new file mode 100644
index 000000000..97d6c60c8
--- /dev/null
+++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/controller/substion/SubstionController.java
@@ -0,0 +1,9 @@
+package com.njcn.prepare.harmonic.controller.substion;
+
+/**
+ * @author denghuajun
+ * @version 1.0.0
+ * @date 2022年10月17日 20:13
+ */
+public class SubstionController {
+}
diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/controller/voltage/VoltageController.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/controller/voltage/VoltageController.java
new file mode 100644
index 000000000..4097fe9bb
--- /dev/null
+++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/controller/voltage/VoltageController.java
@@ -0,0 +1,9 @@
+package com.njcn.prepare.harmonic.controller.voltage;
+
+/**
+ * @author denghuajun
+ * @version 1.0.0
+ * @date 2022年10月17日 20:13
+ */
+public class VoltageController {
+}
diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/area/AreaMapper.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/area/AreaMapper.java
new file mode 100644
index 000000000..7136b547b
--- /dev/null
+++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/area/AreaMapper.java
@@ -0,0 +1,9 @@
+package com.njcn.prepare.harmonic.mapper.area;
+
+/**
+ * @author denghuajun
+ * @version 1.0.0
+ * @date 2022年10月17日 20:15
+ */
+public interface AreaMapper {
+}
diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/device/DeviceMapper.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/device/DeviceMapper.java
new file mode 100644
index 000000000..d7fa0ec0e
--- /dev/null
+++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/device/DeviceMapper.java
@@ -0,0 +1,5 @@
+package com.njcn.prepare.harmonic.mapper.device;
+
+public interface DeviceMapper {
+
+}
diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/AbnormalMapper.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/AbnormalMapper.java
new file mode 100644
index 000000000..a88627736
--- /dev/null
+++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/AbnormalMapper.java
@@ -0,0 +1,12 @@
+package com.njcn.prepare.harmonic.mapper.line;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.njcn.prepare.harmonic.pojo.po.AbnormalPO;
+
+/**
+ * @author denghuajun
+ * @version 1.0.0
+ * @date 2022年10月18日 11:12
+ */
+public interface AbnormalMapper extends BaseMapper<AbnormalPO> {
+}
diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/ExcelRptMapper.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/ExcelRptMapper.java
new file mode 100644
index 000000000..24d9de36c
--- /dev/null
+++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/ExcelRptMapper.java
@@ -0,0 +1,14 @@
+package com.njcn.prepare.harmonic.mapper.line;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.njcn.prepare.harmonic.pojo.po.ExcelRpt;
+
+/**
+ * ExcelRptMapper
+ *
+ * @author qijian
+ * @date 2022/10/14
+ */
+public interface ExcelRptMapper extends BaseMapper<ExcelRpt> {
+
+}
diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/ExcelRptTempMapper.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/ExcelRptTempMapper.java
new file mode 100644
index 000000000..05f5c1359
--- /dev/null
+++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/ExcelRptTempMapper.java
@@ -0,0 +1,16 @@
+package com.njcn.prepare.harmonic.mapper.line;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.njcn.prepare.harmonic.pojo.po.ExcelRptTemp;
+
+import java.util.List;
+
+/**
+ * @author qijian
+ * @date 2022/10/20
+ */
+public interface ExcelRptTempMapper extends BaseMapper<ExcelRptTemp> {
+
+    List<ExcelRptTemp> getActiveTempList();
+
+}
diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/LimitRatePOMapper.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/LimitRatePOMapper.java
new file mode 100644
index 000000000..ed6f350fa
--- /dev/null
+++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/LimitRatePOMapper.java
@@ -0,0 +1,18 @@
+package com.njcn.prepare.harmonic.mapper.line;
+
+import com.github.jeffreyning.mybatisplus.base.MppBaseMapper;
+import com.njcn.harmonic.pojo.po.LimitRatePO;
+
+/**
+ * Description:
+ * 接口文档访问地址：http://serverIP:port/swagger-ui.html
+ * Date: 2022/10/20  18:25【需求编号】
+ *
+ * @author clam
+ * @version V1.0.0
+ */
+public interface LimitRatePOMapper extends MppBaseMapper<LimitRatePO> {
+//    int updateBatch(List<LimitRatePO> list);
+
+//    int batchInsert(@Param("list") List<LimitRatePO> list);
+}
\ No newline at end of file
diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/LimitTargetPOMapper.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/LimitTargetPOMapper.java
new file mode 100644
index 000000000..dd22158b3
--- /dev/null
+++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/LimitTargetPOMapper.java
@@ -0,0 +1,20 @@
+package com.njcn.prepare.harmonic.mapper.line;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.njcn.prepare.harmonic.pojo.po.line.LimitTargetPO;
+
+/**
+ * Description:
+ * 接口文档访问地址：http://serverIP:port/swagger-ui.html
+ * Date: 2022/10/20  18:26【需求编号】
+ *
+ * @author clam
+ * @version V1.0.0
+ */
+public interface LimitTargetPOMapper extends BaseMapper<LimitTargetPO> {
+//    int updateBatch(List<LimitTargetPO> list);
+//
+//    int updateBatchSelective(List<LimitTargetPO> list);
+//
+//    int batchInsert(@Param("list") List<LimitTargetPO> list);
+}
\ No newline at end of file
diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/NormLimitMapper.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/NormLimitMapper.java
new file mode 100644
index 000000000..81de1cd2b
--- /dev/null
+++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/NormLimitMapper.java
@@ -0,0 +1,9 @@
+package com.njcn.prepare.harmonic.mapper.line;
+
+/**
+ * @author denghuajun
+ * @version 1.0.0
+ * @date 2022年10月17日 20:11
+ */
+public interface NormLimitMapper {
+}
diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/RMpFlickerReportDPOMapper.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/RMpFlickerReportDPOMapper.java
new file mode 100644
index 000000000..7b7e9cd3b
--- /dev/null
+++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/RMpFlickerReportDPOMapper.java
@@ -0,0 +1,16 @@
+package com.njcn.prepare.harmonic.mapper.line;
+
+import com.github.jeffreyning.mybatisplus.base.MppBaseMapper;
+import com.njcn.prepare.harmonic.pojo.po.line.RMpFlickerReportDPO;
+
+/**
+ * 
+ * Description:
+ * 接口文档访问地址：http://serverIP:port/swagger-ui.html
+ * Date: 2022/10/26  14:15【需求编号】
+ *
+ * @author clam
+ * @version V1.0.0
+ */
+public interface RMpFlickerReportDPOMapper extends MppBaseMapper<RMpFlickerReportDPO> {
+}
\ No newline at end of file
diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/RMpHarmonicIMagReportDPOMapper.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/RMpHarmonicIMagReportDPOMapper.java
new file mode 100644
index 000000000..a733bda24
--- /dev/null
+++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/RMpHarmonicIMagReportDPOMapper.java
@@ -0,0 +1,16 @@
+package com.njcn.prepare.harmonic.mapper.line;
+
+import com.github.jeffreyning.mybatisplus.base.MppBaseMapper;
+import com.njcn.prepare.harmonic.pojo.po.line.RMpHarmonicIMagReportDPO;
+
+/**
+ * 
+ * Description:
+ * 接口文档访问地址：http://serverIP:port/swagger-ui.html
+ * Date: 2022/10/26  9:50【需求编号】
+ *
+ * @author clam
+ * @version V1.0.0
+ */
+public interface RMpHarmonicIMagReportDPOMapper extends MppBaseMapper<RMpHarmonicIMagReportDPO> {
+}
\ No newline at end of file
diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/RMpHarmonicIRateReportDPOMapper.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/RMpHarmonicIRateReportDPOMapper.java
new file mode 100644
index 000000000..c5c7f03a4
--- /dev/null
+++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/RMpHarmonicIRateReportDPOMapper.java
@@ -0,0 +1,16 @@
+package com.njcn.prepare.harmonic.mapper.line;
+
+import com.github.jeffreyning.mybatisplus.base.MppBaseMapper;
+import com.njcn.prepare.harmonic.pojo.po.line.RMpHarmonicIRateReportDPO;
+
+/**
+ * 
+ * Description:
+ * 接口文档访问地址：http://serverIP:port/swagger-ui.html
+ * Date: 2022/10/26  18:33【需求编号】
+ *
+ * @author clam
+ * @version V1.0.0
+ */
+public interface RMpHarmonicIRateReportDPOMapper extends MppBaseMapper<RMpHarmonicIRateReportDPO> {
+}
\ No newline at end of file
diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/RMpHarmonicPReportDPOMapper.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/RMpHarmonicPReportDPOMapper.java
new file mode 100644
index 000000000..2cc6bea67
--- /dev/null
+++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/RMpHarmonicPReportDPOMapper.java
@@ -0,0 +1,15 @@
+package com.njcn.prepare.harmonic.mapper.line;
+
+import com.github.jeffreyning.mybatisplus.base.MppBaseMapper;
+import com.njcn.prepare.harmonic.pojo.po.line.RMpHarmonicPReportDPO;
+
+/**
+ * Description:
+ * 接口文档访问地址：http://serverIP:port/swagger-ui.html
+ * Date: 2022/10/25  10:33【需求编号】
+ *
+ * @author clam
+ * @version V1.0.0
+ */
+public interface RMpHarmonicPReportDPOMapper extends MppBaseMapper<RMpHarmonicPReportDPO> {
+}
\ No newline at end of file
diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/RMpHarmonicVRateReportDPOMapper.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/RMpHarmonicVRateReportDPOMapper.java
new file mode 100644
index 000000000..aacb85ea1
--- /dev/null
+++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/RMpHarmonicVRateReportDPOMapper.java
@@ -0,0 +1,16 @@
+package com.njcn.prepare.harmonic.mapper.line;
+
+import com.github.jeffreyning.mybatisplus.base.MppBaseMapper;
+import com.njcn.prepare.harmonic.pojo.po.line.RMpHarmonicVRateReportDPO;
+
+/**
+ * 
+ * Description:
+ * 接口文档访问地址：http://serverIP:port/swagger-ui.html
+ * Date: 2022/10/25  11:11【需求编号】
+ *
+ * @author clam
+ * @version V1.0.0
+ */
+public interface RMpHarmonicVRateReportDPOMapper extends MppBaseMapper<RMpHarmonicVRateReportDPO> {
+}
\ No newline at end of file
diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/RMpInharmonicIMagReportDPOMapper.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/RMpInharmonicIMagReportDPOMapper.java
new file mode 100644
index 000000000..8db968bd9
--- /dev/null
+++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/RMpInharmonicIMagReportDPOMapper.java
@@ -0,0 +1,15 @@
+package com.njcn.prepare.harmonic.mapper.line;
+
+import com.github.jeffreyning.mybatisplus.base.MppBaseMapper;
+import com.njcn.prepare.harmonic.pojo.po.line.RMpInharmonicIMagReportDPO;
+
+/**
+ * Description:
+ * 接口文档访问地址：http://serverIP:port/swagger-ui.html
+ * Date: 2022/10/27  13:52【需求编号】
+ *
+ * @author clam
+ * @version V1.0.0
+ */
+public interface RMpInharmonicIMagReportDPOMapper extends MppBaseMapper<RMpInharmonicIMagReportDPO> {
+}
\ No newline at end of file
diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/RMpInharmonicIRateReportDPOMapper.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/RMpInharmonicIRateReportDPOMapper.java
new file mode 100644
index 000000000..7ae1a6506
--- /dev/null
+++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/RMpInharmonicIRateReportDPOMapper.java
@@ -0,0 +1,16 @@
+package com.njcn.prepare.harmonic.mapper.line;
+
+import com.github.jeffreyning.mybatisplus.base.MppBaseMapper;
+import com.njcn.prepare.harmonic.pojo.po.line.RMpInharmonicIRateReportDPO;
+
+/**
+ * 
+ * Description:
+ * 接口文档访问地址：http://serverIP:port/swagger-ui.html
+ * Date: 2022/10/26  19:36【需求编号】
+ *
+ * @author clam
+ * @version V1.0.0
+ */
+public interface RMpInharmonicIRateReportDPOMapper extends MppBaseMapper<RMpInharmonicIRateReportDPO> {
+}
\ No newline at end of file
diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/RMpInharmonicVRateReportDPOMapper.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/RMpInharmonicVRateReportDPOMapper.java
new file mode 100644
index 000000000..08feb01dd
--- /dev/null
+++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/RMpInharmonicVRateReportDPOMapper.java
@@ -0,0 +1,15 @@
+package com.njcn.prepare.harmonic.mapper.line;
+
+import com.github.jeffreyning.mybatisplus.base.MppBaseMapper;
+import com.njcn.prepare.harmonic.pojo.po.line.RMpInharmonicVRateReportDPO;
+
+/**
+ * Description:
+ * 接口文档访问地址：http://serverIP:port/swagger-ui.html
+ * Date: 2022/10/27  13:52【需求编号】
+ *
+ * @author clam
+ * @version V1.0.0
+ */
+public interface RMpInharmonicVRateReportDPOMapper extends MppBaseMapper<RMpInharmonicVRateReportDPO> {
+}
\ No newline at end of file
diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/RMpMeasurePhaseReportDPOMapper.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/RMpMeasurePhaseReportDPOMapper.java
new file mode 100644
index 000000000..45c40786e
--- /dev/null
+++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/RMpMeasurePhaseReportDPOMapper.java
@@ -0,0 +1,16 @@
+package com.njcn.prepare.harmonic.mapper.line;
+
+import com.github.jeffreyning.mybatisplus.base.MppBaseMapper;
+import com.njcn.prepare.harmonic.pojo.po.line.RMpMeasurePhaseReportDPO;
+
+/**
+ * 
+ * Description:
+ * 接口文档访问地址：http://serverIP:port/swagger-ui.html
+ * Date: 2022/10/28  10:53【需求编号】
+ *
+ * @author clam
+ * @version V1.0.0
+ */
+public interface RMpMeasurePhaseReportDPOMapper extends MppBaseMapper<RMpMeasurePhaseReportDPO> {
+}
\ No newline at end of file
diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/RMpMeasureReportDPOMapper.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/RMpMeasureReportDPOMapper.java
new file mode 100644
index 000000000..7fc0ce9cb
--- /dev/null
+++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/RMpMeasureReportDPOMapper.java
@@ -0,0 +1,16 @@
+package com.njcn.prepare.harmonic.mapper.line;
+
+import com.github.jeffreyning.mybatisplus.base.MppBaseMapper;
+import com.njcn.prepare.harmonic.pojo.po.line.RMpMeasureReportDPO;
+
+/**
+ * 
+ * Description:
+ * 接口文档访问地址：http://serverIP:port/swagger-ui.html
+ * Date: 2022/10/28  10:54【需求编号】
+ *
+ * @author clam
+ * @version V1.0.0
+ */
+public interface RMpMeasureReportDPOMapper extends MppBaseMapper<RMpMeasureReportDPO> {
+}
\ No newline at end of file
diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/RMpPltReportDPOMapper.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/RMpPltReportDPOMapper.java
new file mode 100644
index 000000000..af86f5257
--- /dev/null
+++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/RMpPltReportDPOMapper.java
@@ -0,0 +1,16 @@
+package com.njcn.prepare.harmonic.mapper.line;
+
+import com.github.jeffreyning.mybatisplus.base.MppBaseMapper;
+import com.njcn.prepare.harmonic.pojo.po.line.RMpPltReportDPO;
+
+/**
+ * 
+ * Description:
+ * 接口文档访问地址：http://serverIP:port/swagger-ui.html
+ * Date: 2022/10/26  15:26【需求编号】
+ *
+ * @author clam
+ * @version V1.0.0
+ */
+public interface RMpPltReportDPOMapper extends MppBaseMapper<RMpPltReportDPO> {
+}
\ No newline at end of file
diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/RMpPollutionDMapper.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/RMpPollutionDMapper.java
new file mode 100644
index 000000000..07e4d82d9
--- /dev/null
+++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/RMpPollutionDMapper.java
@@ -0,0 +1,21 @@
+package com.njcn.prepare.harmonic.mapper.line;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.njcn.prepare.harmonic.pojo.po.RMpPollutionD;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 监测点污区图统计日表 Mapper 接口
+ * </p>
+ *
+ * @author xiaoyao
+ * @since 2022-10-20
+ */
+public interface RMpPollutionDMapper extends BaseMapper<RMpPollutionD> {
+
+    int insertPollution(@Param("item") RMpPollutionD item);
+
+}
diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/RStatPollutionOrgDMapper.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/RStatPollutionOrgDMapper.java
new file mode 100644
index 000000000..2e205e483
--- /dev/null
+++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/RStatPollutionOrgDMapper.java
@@ -0,0 +1,22 @@
+package com.njcn.prepare.harmonic.mapper.line;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.njcn.prepare.harmonic.pojo.po.RMpPollutionD;
+import com.njcn.prepare.harmonic.pojo.po.RStatPollutionOrgD;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.Map;
+
+/**
+ * <p>
+ * 单位污区图统计日表 Mapper 接口
+ * </p>
+ *
+ * @author xiaoyao
+ * @since 2022-10-20
+ */
+public interface RStatPollutionOrgDMapper extends BaseMapper<RStatPollutionOrgD> {
+
+    int insertPollution(@Param("item") Map<String, Object> item);
+
+}
diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/RStatPollutionOrgMMapper.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/RStatPollutionOrgMMapper.java
new file mode 100644
index 000000000..212afb13b
--- /dev/null
+++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/RStatPollutionOrgMMapper.java
@@ -0,0 +1,20 @@
+package com.njcn.prepare.harmonic.mapper.line;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.njcn.prepare.harmonic.pojo.po.RStatPollutionOrgM;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.Map;
+
+/**
+ * <p>
+ * 单位污区图统计月表 Mapper 接口
+ * </p>
+ *
+ * @author xiaoyao
+ * @since 2022-10-20
+ */
+public interface RStatPollutionOrgMMapper extends BaseMapper<RStatPollutionOrgM> {
+
+    int insertPollution(@Param("item") Map<String, Object> item);
+}
diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/RStatPollutionOrgQMapper.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/RStatPollutionOrgQMapper.java
new file mode 100644
index 000000000..774e7a5aa
--- /dev/null
+++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/RStatPollutionOrgQMapper.java
@@ -0,0 +1,20 @@
+package com.njcn.prepare.harmonic.mapper.line;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.njcn.prepare.harmonic.pojo.po.RStatPollutionOrgQ;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.Map;
+
+/**
+ * <p>
+ * 单位污区图统计季表 Mapper 接口
+ * </p>
+ *
+ * @author xiaoyao
+ * @since 2022-10-20
+ */
+public interface RStatPollutionOrgQMapper extends BaseMapper<RStatPollutionOrgQ> {
+
+    int insertPollution(@Param("item") Map<String, Object> item);
+}
diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/RStatPollutionOrgYMapper.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/RStatPollutionOrgYMapper.java
new file mode 100644
index 000000000..09a258a0c
--- /dev/null
+++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/RStatPollutionOrgYMapper.java
@@ -0,0 +1,20 @@
+package com.njcn.prepare.harmonic.mapper.line;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.njcn.prepare.harmonic.pojo.po.RStatPollutionOrgY;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.Map;
+
+/**
+ * <p>
+ * 单位污区图统计年表 Mapper 接口
+ * </p>
+ *
+ * @author xiaoyao
+ * @since 2022-10-20
+ */
+public interface RStatPollutionOrgYMapper extends BaseMapper<RStatPollutionOrgY> {
+
+    int insertPollution(@Param("item") Map<String, Object> item);
+}
diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/RStatPollutionSubstationDMapper.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/RStatPollutionSubstationDMapper.java
new file mode 100644
index 000000000..19a21dabe
--- /dev/null
+++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/RStatPollutionSubstationDMapper.java
@@ -0,0 +1,22 @@
+package com.njcn.prepare.harmonic.mapper.line;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.njcn.prepare.harmonic.pojo.po.RStatPollutionOrgD;
+import com.njcn.prepare.harmonic.pojo.po.RStatPollutionSubstationD;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.Map;
+
+/**
+ * <p>
+ * 变电站污区图统计日表 Mapper 接口
+ * </p>
+ *
+ * @author xiaoyao
+ * @since 2022-10-20
+ */
+public interface RStatPollutionSubstationDMapper extends BaseMapper<RStatPollutionSubstationD> {
+
+    int insertPollution(@Param("item") Map<String, Object> item);
+
+}
diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/RStatPollutionSubstationMMapper.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/RStatPollutionSubstationMMapper.java
new file mode 100644
index 000000000..da814c86b
--- /dev/null
+++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/RStatPollutionSubstationMMapper.java
@@ -0,0 +1,20 @@
+package com.njcn.prepare.harmonic.mapper.line;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.njcn.prepare.harmonic.pojo.po.RStatPollutionSubstationM;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.Map;
+
+/**
+ * <p>
+ * 变电站污区图统计月表 Mapper 接口
+ * </p>
+ *
+ * @author xiaoyao
+ * @since 2022-10-20
+ */
+public interface RStatPollutionSubstationMMapper extends BaseMapper<RStatPollutionSubstationM> {
+
+    int insertPollution(@Param("item") Map<String, Object> item);
+}
diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/RStatPollutionSubstationQMapper.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/RStatPollutionSubstationQMapper.java
new file mode 100644
index 000000000..d6b893178
--- /dev/null
+++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/RStatPollutionSubstationQMapper.java
@@ -0,0 +1,20 @@
+package com.njcn.prepare.harmonic.mapper.line;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.njcn.prepare.harmonic.pojo.po.RStatPollutionSubstationQ;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.Map;
+
+/**
+ * <p>
+ * 变电站污区图统计季表 Mapper 接口
+ * </p>
+ *
+ * @author xiaoyao
+ * @since 2022-10-20
+ */
+public interface RStatPollutionSubstationQMapper extends BaseMapper<RStatPollutionSubstationQ> {
+
+    int insertPollution(@Param("item") Map<String, Object> item);
+}
diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/RStatPollutionSubstationYMapper.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/RStatPollutionSubstationYMapper.java
new file mode 100644
index 000000000..e16aa126d
--- /dev/null
+++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/RStatPollutionSubstationYMapper.java
@@ -0,0 +1,20 @@
+package com.njcn.prepare.harmonic.mapper.line;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.njcn.prepare.harmonic.pojo.po.RStatPollutionSubstationY;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.Map;
+
+/**
+ * <p>
+ * 变电站污区图统计年表 Mapper 接口
+ * </p>
+ *
+ * @author xiaoyao
+ * @since 2022-10-20
+ */
+public interface RStatPollutionSubstationYMapper extends BaseMapper<RStatPollutionSubstationY> {
+
+    int insertPollution(@Param("item") Map<String, Object> item);
+}
diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/mapping/ExcelRptTempMapper.xml b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/mapping/ExcelRptTempMapper.xml
new file mode 100644
index 000000000..3193e7530
--- /dev/null
+++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/mapping/ExcelRptTempMapper.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.njcn.prepare.harmonic.mapper.line.ExcelRptTempMapper">
+
+    <select id="getActiveTempList" resultType="ExcelRptTemp">
+        SELECT
+            DISTINCT t1.*
+        FROM
+            sys_excel_rpt_temp t1
+            LEFT JOIN sys_dept_temp t2 on t1.Id = t2.temp_id
+            and t2.activation = '1'
+    </select>
+
+</mapper>
diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/mapping/LimitRatePOMapper.xml b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/mapping/LimitRatePOMapper.xml
new file mode 100644
index 000000000..7ed5a7294
--- /dev/null
+++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/mapping/LimitRatePOMapper.xml
@@ -0,0 +1,514 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.njcn.prepare.harmonic.mapper.line.LimitRatePOMapper">
+  <resultMap id="BaseResultMap" type="com.njcn.harmonic.pojo.po.LimitRatePO">
+    <!--@mbg.generated-->
+    <!--@Table limit_rate-->
+    <id column="line_id" property="lineId" />
+    <id column="phasic_type" property="phasicType" />
+    <id column="time" property="time" />
+    <result column="all_time" property="allTime" />
+    <result column="flicker_overtime" property="flickerOverTime" />
+    <result column="flicker_all_time" property="flickerAllTime" />
+    <result column="freq_dev_overtime" property="freqDevOverTime" />
+    <result column="voltage_dev_overtime" property="voltageDevOverTime" />
+    <result column="ubalance_overtime" property="uBalanceOverTime" />
+    <result column="uaberrance_overtime" property="uaberranceOverTime" />
+    <result column="i_neg_overtime" property="iNegOverTime" />
+    <result column="uharm_2_overtime" property="uHarm2OverTime" />
+    <result column="uharm_3_overtime" property="uharm3OverTime" />
+    <result column="uharm_4_overtime" property="uharm4OverTime" />
+    <result column="uharm_5_overtime" property="uharm5OverTime" />
+    <result column="uharm_6_overtime" property="uharm6OverTime" />
+    <result column="uharm_7_overtime" property="uharm7OverTime" />
+    <result column="uharm_8_overtime" property="uharm8OverTime" />
+    <result column="uharm_9_overtime" property="uharm9OverTime" />
+    <result column="uharm_10_overtime" property="uharm10OverTime" />
+    <result column="uharm_11_overtime" property="uharm11OverTime" />
+    <result column="uharm_12_overtime" property="uharm12OverTime" />
+    <result column="uharm_13_overtime" property="uharm13OverTime" />
+    <result column="uharm_14_overtime" property="uharm14OverTime" />
+    <result column="uharm_15_overtime" property="uharm15OverTime" />
+    <result column="uharm_16_overtime" property="uharm16OverTime" />
+    <result column="uharm_17_overtime" property="uharm17OverTime" />
+    <result column="uharm_18_overtime" property="uharm18OverTime" />
+    <result column="uharm_19_overtime" property="uharm19OverTime" />
+    <result column="uharm_20_overtime" property="uharm20OverTime" />
+    <result column="uharm_21_overtime" property="uharm21OverTime" />
+    <result column="uharm_22_overtime" property="uharm22OverTime" />
+    <result column="uharm_23_overtime" property="uharm23OverTime" />
+    <result column="uharm_24_overtime" property="uharm24OverTime" />
+    <result column="uharm_25_overtime" property="uharm25OverTime" />
+    <result column="iharm_2_overtime" property="iharm2OverTime" />
+    <result column="iharm_3_overtime" property="iharm3OverTime" />
+    <result column="iharm_4_overtime" property="iharm4OverTime" />
+    <result column="iharm_5_overtime" property="iharm5OverTime" />
+    <result column="iharm_6_overtime" property="iharm6OverTime" />
+    <result column="iharm_7_overtime" property="iharm7OverTime" />
+    <result column="iharm_8_overtime" property="iharm8OverTime" />
+    <result column="iharm_9_overtime" property="iharm9OverTime" />
+    <result column="iharm_10_overtime" property="iharm10OverTime" />
+    <result column="iharm_11_overtime" property="iharm11OverTime" />
+    <result column="iharm_12_overtime" property="iharm12OverTime" />
+    <result column="iharm_13_overtime" property="iharm13OverTime" />
+    <result column="iharm_14_overtime" property="iharm14OverTime" />
+    <result column="iharm_15_overtime" property="iharm15OverTime" />
+    <result column="iharm_16_overtime" property="iharm16OverTime" />
+    <result column="iharm_17_overtime" property="iharm17OverTime" />
+    <result column="iharm_18_overtime" property="iharm18OverTime" />
+    <result column="iharm_19_overtime" property="iharm19OverTime" />
+    <result column="iharm_20_overtime" property="iharm20OverTime" />
+    <result column="iharm_21_overtime" property="iharm21OverTime" />
+    <result column="iharm_22_overtime" property="iharm22OverTime" />
+    <result column="iharm_23_overtime" property="iharm23OverTime" />
+    <result column="iharm_24_overtime" property="iharm24OverTime" />
+    <result column="iharm_25_overtime" property="iharm25OverTime" />
+    <result column="inuharm_1_overtime" property="inuharm1OverTime" />
+    <result column="inuharm_2_overtime" property="inuharm2OverTime" />
+    <result column="inuharm_3_overtime" property="inuharm3OverTime" />
+    <result column="inuharm_4_overtime" property="inuharm4OverTime" />
+    <result column="inuharm_5_overtime" property="inuharm5OverTime" />
+    <result column="inuharm_6_overtime" property="inuharm6OverTime" />
+    <result column="inuharm_7_overtime" property="inuharm7OverTime" />
+    <result column="inuharm_8_overtime" property="inuharm8OverTime" />
+    <result column="inuharm_9_overtime" property="inuharm9OverTime" />
+    <result column="inuharm_10_overtime" property="inuharm10OverTime" />
+    <result column="inuharm_11_overtime" property="inuharm11OverTime" />
+    <result column="inuharm_12_overtime" property="inuharm12OverTime" />
+    <result column="inuharm_13_overtime" property="inuharm13OverTime" />
+    <result column="inuharm_14_overtime" property="inuharm14OverTime" />
+    <result column="inuharm_15_overtime" property="inuharm15OverTime" />
+    <result column="inuharm_16_overtime" property="inuharm16OverTime" />
+  </resultMap>
+  <sql id="Base_Column_List">
+    <!--@mbg.generated-->
+    line_id, phasic_type, `time`, all_time, flicker_overtime, flicker_all_time, freq_dev_overtime, 
+    voltage_dev_overtime, ubalance_overtime, uaberrance_overtime, i_neg_overtime, uharm_2_overtime, 
+    uharm_3_overtime, uharm_4_overtime, uharm_5_overtime, uharm_6_overtime, uharm_7_overtime, 
+    uharm_8_overtime, uharm_9_overtime, uharm_10_overtime, uharm_11_overtime, uharm_12_overtime, 
+    uharm_13_overtime, uharm_14_overtime, uharm_15_overtime, uharm_16_overtime, uharm_17_overtime, 
+    uharm_18_overtime, uharm_19_overtime, uharm_20_overtime, uharm_21_overtime, uharm_22_overtime, 
+    uharm_23_overtime, uharm_24_overtime, uharm_25_overtime, iharm_2_overtime, iharm_3_overtime, 
+    iharm_4_overtime, iharm_5_overtime, iharm_6_overtime, iharm_7_overtime, iharm_8_overtime, 
+    iharm_9_overtime, iharm_10_overtime, iharm_11_overtime, iharm_12_overtime, iharm_13_overtime, 
+    iharm_14_overtime, iharm_15_overtime, iharm_16_overtime, iharm_17_overtime, iharm_18_overtime, 
+    iharm_19_overtime, iharm_20_overtime, iharm_21_overtime, iharm_22_overtime, iharm_23_overtime, 
+    iharm_24_overtime, iharm_25_overtime, inuharm_1_overtime, inuharm_2_overtime, inuharm_3_overtime, 
+    inuharm_4_overtime, inuharm_5_overtime, inuharm_6_overtime, inuharm_7_overtime, inuharm_8_overtime, 
+    inuharm_9_overtime, inuharm_10_overtime, inuharm_11_overtime, inuharm_12_overtime, 
+    inuharm_13_overtime, inuharm_14_overtime, inuharm_15_overtime, inuharm_16_overtime
+  </sql>
+  <update id="updateBatch" parameterType="java.util.List">
+    <!--@mbg.generated-->
+    update limit_rate
+    <trim prefix="set" suffixOverrides=",">
+      <trim prefix="all_time = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when line_id = #{item.lineId} then #{item.allTime}
+        </foreach>
+      </trim>
+      <trim prefix="flicker_overtime = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when line_id = #{item.lineId} then #{item.flickerOverTime}
+        </foreach>
+      </trim>
+      <trim prefix="flicker_all_time = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when line_id = #{item.lineId} then #{item.flickerAllTime}
+        </foreach>
+      </trim>
+      <trim prefix="freq_dev_overtime = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when line_id = #{item.lineId} then #{item.freqDevOverTime}
+        </foreach>
+      </trim>
+      <trim prefix="voltage_dev_overtime = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when line_id = #{item.lineId} then #{item.voltageDevOverTime}
+        </foreach>
+      </trim>
+      <trim prefix="ubalance_overtime = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when line_id = #{item.lineId} then #{item.ubalanceOverTime}
+        </foreach>
+      </trim>
+      <trim prefix="uaberrance_overtime = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when line_id = #{item.lineId} then #{item.uAberranceOverTime}
+        </foreach>
+      </trim>
+      <trim prefix="i_neg_overtime = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when line_id = #{item.lineId} then #{item.iNegOverTime}
+        </foreach>
+      </trim>
+      <trim prefix="uharm_2_overtime = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when line_id = #{item.lineId} then #{item.uharm2OverTime}
+        </foreach>
+      </trim>
+      <trim prefix="uharm_3_overtime = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when line_id = #{item.lineId} then #{item.uharm3OverTime}
+        </foreach>
+      </trim>
+      <trim prefix="uharm_4_overtime = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when line_id = #{item.lineId} then #{item.uharm4OverTime}
+        </foreach>
+      </trim>
+      <trim prefix="uharm_5_overtime = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when line_id = #{item.lineId} then #{item.uharm5OverTime}
+        </foreach>
+      </trim>
+      <trim prefix="uharm_6_overtime = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when line_id = #{item.lineId} then #{item.uharm6OverTime}
+        </foreach>
+      </trim>
+      <trim prefix="uharm_7_overtime = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when line_id = #{item.lineId} then #{item.uharm7OverTime}
+        </foreach>
+      </trim>
+      <trim prefix="uharm_8_overtime = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when line_id = #{item.lineId} then #{item.uharm8OverTime}
+        </foreach>
+      </trim>
+      <trim prefix="uharm_9_overtime = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when line_id = #{item.lineId} then #{item.uharm9OverTime}
+        </foreach>
+      </trim>
+      <trim prefix="uharm_10_overtime = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when line_id = #{item.lineId} then #{item.uharm10OverTime}
+        </foreach>
+      </trim>
+      <trim prefix="uharm_11_overtime = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when line_id = #{item.lineId} then #{item.uharm11OverTime}
+        </foreach>
+      </trim>
+      <trim prefix="uharm_12_overtime = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when line_id = #{item.lineId} then #{item.uharm12OverTime}
+        </foreach>
+      </trim>
+      <trim prefix="uharm_13_overtime = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when line_id = #{item.lineId} then #{item.uharm13OverTime}
+        </foreach>
+      </trim>
+      <trim prefix="uharm_14_overtime = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when line_id = #{item.lineId} then #{item.uharm14OverTime}
+        </foreach>
+      </trim>
+      <trim prefix="uharm_15_overtime = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when line_id = #{item.lineId} then #{item.uharm15OverTime}
+        </foreach>
+      </trim>
+      <trim prefix="uharm_16_overtime = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when line_id = #{item.lineId} then #{item.uharm16OverTime}
+        </foreach>
+      </trim>
+      <trim prefix="uharm_17_overtime = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when line_id = #{item.lineId} then #{item.uharm17OverTime}
+        </foreach>
+      </trim>
+      <trim prefix="uharm_18_overtime = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when line_id = #{item.lineId} then #{item.uharm18OverTime}
+        </foreach>
+      </trim>
+      <trim prefix="uharm_19_overtime = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when line_id = #{item.lineId} then #{item.uharm19OverTime}
+        </foreach>
+      </trim>
+      <trim prefix="uharm_20_overtime = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when line_id = #{item.lineId} then #{item.uharm20OverTime}
+        </foreach>
+      </trim>
+      <trim prefix="uharm_21_overtime = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when line_id = #{item.lineId} then #{item.uharm21OverTime}
+        </foreach>
+      </trim>
+      <trim prefix="uharm_22_overtime = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when line_id = #{item.lineId} then #{item.uharm22OverTime}
+        </foreach>
+      </trim>
+      <trim prefix="uharm_23_overtime = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when line_id = #{item.lineId} then #{item.uharm23OverTime}
+        </foreach>
+      </trim>
+      <trim prefix="uharm_24_overtime = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when line_id = #{item.lineId} then #{item.uharm24OverTime}
+        </foreach>
+      </trim>
+      <trim prefix="uharm_25_overtime = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when line_id = #{item.lineId} then #{item.uharm25OverTime}
+        </foreach>
+      </trim>
+      <trim prefix="iharm_2_overtime = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when line_id = #{item.lineId} then #{item.iharm2OverTime}
+        </foreach>
+      </trim>
+      <trim prefix="iharm_3_overtime = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when line_id = #{item.lineId} then #{item.iharm3OverTime}
+        </foreach>
+      </trim>
+      <trim prefix="iharm_4_overtime = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when line_id = #{item.lineId} then #{item.iharm4OverTime}
+        </foreach>
+      </trim>
+      <trim prefix="iharm_5_overtime = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when line_id = #{item.lineId} then #{item.iharm5OverTime}
+        </foreach>
+      </trim>
+      <trim prefix="iharm_6_overtime = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when line_id = #{item.lineId} then #{item.iharm6OverTime}
+        </foreach>
+      </trim>
+      <trim prefix="iharm_7_overtime = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when line_id = #{item.lineId} then #{item.iharm7OverTime}
+        </foreach>
+      </trim>
+      <trim prefix="iharm_8_overtime = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when line_id = #{item.lineId} then #{item.iharm8OverTime}
+        </foreach>
+      </trim>
+      <trim prefix="iharm_9_overtime = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when line_id = #{item.lineId} then #{item.iharm9OverTime}
+        </foreach>
+      </trim>
+      <trim prefix="iharm_10_overtime = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when line_id = #{item.lineId} then #{item.iharm10OverTime}
+        </foreach>
+      </trim>
+      <trim prefix="iharm_11_overtime = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when line_id = #{item.lineId} then #{item.iharm11OverTime}
+        </foreach>
+      </trim>
+      <trim prefix="iharm_12_overtime = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when line_id = #{item.lineId} then #{item.iharm12OverTime}
+        </foreach>
+      </trim>
+      <trim prefix="iharm_13_overtime = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when line_id = #{item.lineId} then #{item.iharm13OverTime}
+        </foreach>
+      </trim>
+      <trim prefix="iharm_14_overtime = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when line_id = #{item.lineId} then #{item.iharm14OverTime}
+        </foreach>
+      </trim>
+      <trim prefix="iharm_15_overtime = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when line_id = #{item.lineId} then #{item.iharm15OverTime}
+        </foreach>
+      </trim>
+      <trim prefix="iharm_16_overtime = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when line_id = #{item.lineId} then #{item.iharm16OverTime}
+        </foreach>
+      </trim>
+      <trim prefix="iharm_17_overtime = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when line_id = #{item.lineId} then #{item.iharm17OverTime}
+        </foreach>
+      </trim>
+      <trim prefix="iharm_18_overtime = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when line_id = #{item.lineId} then #{item.iharm18OverTime}
+        </foreach>
+      </trim>
+      <trim prefix="iharm_19_overtime = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when line_id = #{item.lineId} then #{item.iharm19OverTime}
+        </foreach>
+      </trim>
+      <trim prefix="iharm_20_overtime = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when line_id = #{item.lineId} then #{item.iharm20OverTime}
+        </foreach>
+      </trim>
+      <trim prefix="iharm_21_overtime = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when line_id = #{item.lineId} then #{item.iharm21OverTime}
+        </foreach>
+      </trim>
+      <trim prefix="iharm_22_overtime = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when line_id = #{item.lineId} then #{item.iharm22OverTime}
+        </foreach>
+      </trim>
+      <trim prefix="iharm_23_overtime = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when line_id = #{item.lineId} then #{item.iharm23OverTime}
+        </foreach>
+      </trim>
+      <trim prefix="iharm_24_overtime = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when line_id = #{item.lineId} then #{item.iharm24OverTime}
+        </foreach>
+      </trim>
+      <trim prefix="iharm_25_overtime = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when line_id = #{item.lineId} then #{item.iharm25OverTime}
+        </foreach>
+      </trim>
+      <trim prefix="inuharm_1_overtime = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when line_id = #{item.lineId} then #{item.inuharm1OverTime}
+        </foreach>
+      </trim>
+      <trim prefix="inuharm_2_overtime = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when line_id = #{item.lineId} then #{item.inuharm2OverTime}
+        </foreach>
+      </trim>
+      <trim prefix="inuharm_3_overtime = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when line_id = #{item.lineId} then #{item.inuharm3OverTime}
+        </foreach>
+      </trim>
+      <trim prefix="inuharm_4_overtime = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when line_id = #{item.lineId} then #{item.inuharm4OverTime}
+        </foreach>
+      </trim>
+      <trim prefix="inuharm_5_overtime = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when line_id = #{item.lineId} then #{item.inuharm5OverTime}
+        </foreach>
+      </trim>
+      <trim prefix="inuharm_6_overtime = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when line_id = #{item.lineId} then #{item.inuharm6OverTime}
+        </foreach>
+      </trim>
+      <trim prefix="inuharm_7_overtime = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when line_id = #{item.lineId} then #{item.inuharm7OverTime}
+        </foreach>
+      </trim>
+      <trim prefix="inuharm_8_overtime = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when line_id = #{item.lineId} then #{item.inuharm8OverTime}
+        </foreach>
+      </trim>
+      <trim prefix="inuharm_9_overtime = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when line_id = #{item.lineId} then #{item.inuharm9OverTime}
+        </foreach>
+      </trim>
+      <trim prefix="inuharm_10_overtime = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when line_id = #{item.lineId} then #{item.inuharm10OverTime}
+        </foreach>
+      </trim>
+      <trim prefix="inuharm_11_overtime = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when line_id = #{item.lineId} then #{item.inuharm11OverTime}
+        </foreach>
+      </trim>
+      <trim prefix="inuharm_12_overtime = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when line_id = #{item.lineId} then #{item.inuharm12OverTime}
+        </foreach>
+      </trim>
+      <trim prefix="inuharm_13_overtime = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when line_id = #{item.lineId} then #{item.inuharm13OverTime}
+        </foreach>
+      </trim>
+      <trim prefix="inuharm_14_overtime = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when line_id = #{item.lineId} then #{item.inuharm14OverTime}
+        </foreach>
+      </trim>
+      <trim prefix="inuharm_15_overtime = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when line_id = #{item.lineId} then #{item.inuharm15OverTime}
+        </foreach>
+      </trim>
+      <trim prefix="inuharm_16_overtime = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when line_id = #{item.lineId} then #{item.inuharm16OverTime}
+        </foreach>
+      </trim>
+    </trim>
+    where line_id in
+    <foreach close=")" collection="list" item="item" open="(" separator=", ">
+      #{item.lineId}
+    </foreach>
+  </update>
+  <insert id="batchInsert" parameterType="map">
+    <!--@mbg.generated-->
+    insert into limit_rate
+    (line_id, phasic_type, `time`, all_time, flicker_overtime, flicker_all_time, freq_dev_overtime, 
+      voltage_dev_overtime, ubalance_overtime, uaberrance_overtime, i_neg_overtime, uharm_2_overtime, 
+      uharm_3_overtime, uharm_4_overtime, uharm_5_overtime, uharm_6_overtime, uharm_7_overtime, 
+      uharm_8_overtime, uharm_9_overtime, uharm_10_overtime, uharm_11_overtime, uharm_12_overtime, 
+      uharm_13_overtime, uharm_14_overtime, uharm_15_overtime, uharm_16_overtime, uharm_17_overtime, 
+      uharm_18_overtime, uharm_19_overtime, uharm_20_overtime, uharm_21_overtime, uharm_22_overtime, 
+      uharm_23_overtime, uharm_24_overtime, uharm_25_overtime, iharm_2_overtime, iharm_3_overtime, 
+      iharm_4_overtime, iharm_5_overtime, iharm_6_overtime, iharm_7_overtime, iharm_8_overtime, 
+      iharm_9_overtime, iharm_10_overtime, iharm_11_overtime, iharm_12_overtime, iharm_13_overtime, 
+      iharm_14_overtime, iharm_15_overtime, iharm_16_overtime, iharm_17_overtime, iharm_18_overtime, 
+      iharm_19_overtime, iharm_20_overtime, iharm_21_overtime, iharm_22_overtime, iharm_23_overtime, 
+      iharm_24_overtime, iharm_25_overtime, inuharm_1_overtime, inuharm_2_overtime, inuharm_3_overtime, 
+      inuharm_4_overtime, inuharm_5_overtime, inuharm_6_overtime, inuharm_7_overtime, 
+      inuharm_8_overtime, inuharm_9_overtime, inuharm_10_overtime, inuharm_11_overtime, 
+      inuharm_12_overtime, inuharm_13_overtime, inuharm_14_overtime, inuharm_15_overtime, 
+      inuharm_16_overtime)
+    values
+    <foreach collection="list" item="item" separator=",">
+      (#{item.lineId}, #{item.phasicType}, #{item.time}, #{item.allTime}, #{item.flickerOverTime}, 
+        #{item.flickerAllTime}, #{item.freqDevOverTime}, #{item.voltageDevOverTime}, #{item.ubalanceOverTime}, 
+        #{item.uaberranceOverTime}, #{item.iNegOverTime}, #{item.uharm2OverTime}, #{item.uharm3OverTime}, 
+        #{item.uharm4OverTime}, #{item.uharm5OverTime}, #{item.uharm6OverTime}, #{item.uharm7OverTime}, 
+        #{item.uharm8OverTime}, #{item.uharm9OverTime}, #{item.uharm10OverTime}, #{item.uharm11OverTime}, 
+        #{item.uharm12OverTime}, #{item.uharm13OverTime}, #{item.uharm14OverTime}, #{item.uharm15OverTime}, 
+        #{item.uharm16OverTime}, #{item.uharm17OverTime}, #{item.uharm18OverTime}, #{item.uharm19OverTime}, 
+        #{item.uharm20OverTime}, #{item.uharm21OverTime}, #{item.uharm22OverTime}, #{item.uharm23OverTime}, 
+        #{item.uharm24OverTime}, #{item.uharm25OverTime}, #{item.iharm2OverTime}, #{item.iharm3OverTime}, 
+        #{item.iharm4OverTime}, #{item.iharm5OverTime}, #{item.iharm6OverTime}, #{item.iharm7OverTime}, 
+        #{item.iharm8OverTime}, #{item.iharm9OverTime}, #{item.iharm10OverTime}, #{item.iharm11OverTime}, 
+        #{item.iharm12OverTime}, #{item.iharm13OverTime}, #{item.iharm14OverTime}, #{item.iharm15OverTime}, 
+        #{item.iharm16OverTime}, #{item.iharm17OverTime}, #{item.iharm18OverTime}, #{item.iharm19OverTime}, 
+        #{item.iharm20OverTime}, #{item.iharm21OverTime}, #{item.iharm22OverTime}, #{item.iharm23OverTime}, 
+        #{item.iharm24OverTime}, #{item.iharm25OverTime}, #{item.inuharm1OverTime}, #{item.inuharm2OverTime}, 
+        #{item.inuharm3OverTime}, #{item.inuharm4OverTime}, #{item.inuharm5OverTime}, #{item.inuharm6OverTime}, 
+        #{item.inuharm7OverTime}, #{item.inuharm8OverTime}, #{item.inuharm9OverTime}, #{item.inuharm10OverTime}, 
+        #{item.inuharm11OverTime}, #{item.inuharm12OverTime}, #{item.inuharm13OverTime}, 
+        #{item.inuharm14OverTime}, #{item.inuharm15OverTime}, #{item.inuharm16OverTime}
+        )
+    </foreach>
+  </insert>
+</mapper>
\ No newline at end of file
diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/mapping/LimitTargetPOMapper.xml b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/mapping/LimitTargetPOMapper.xml
new file mode 100644
index 000000000..8fb78533e
--- /dev/null
+++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/mapping/LimitTargetPOMapper.xml
@@ -0,0 +1,1028 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.njcn.prepare.harmonic.mapper.line.LimitTargetPOMapper">
+  <resultMap id="BaseResultMap" type="com.njcn.prepare.harmonic.pojo.po.line.LimitTargetPO">
+    <!--@mbg.generated-->
+    <!--@Table limit_target-->
+    <id column="line_id" property="lineId" />
+    <id column="phasic_type" property="phasicType" />
+    <id column="time" property="time" />
+    <result column="all_time" property="allTime" />
+    <result column="flicker_overtime" property="flickerOvertime" />
+    <result column="flicker_all_time" property="flickerAllTime" />
+    <result column="freq_dev_overtime" property="freqDevOvertime" />
+    <result column="voltage_dev_overtime" property="voltageDevOvertime" />
+    <result column="ubalance_overtime" property="ubalanceOvertime" />
+    <result column="uaberrance_overtime" property="uaberranceOvertime" />
+    <result column="i_neg_overtime" property="iNegOvertime" />
+    <result column="uharm_2_overtime" property="uharm2Overtime" />
+    <result column="uharm_3_overtime" property="uharm3Overtime" />
+    <result column="uharm_4_overtime" property="uharm4Overtime" />
+    <result column="uharm_5_overtime" property="uharm5Overtime" />
+    <result column="uharm_6_overtime" property="uharm6Overtime" />
+    <result column="uharm_7_overtime" property="uharm7Overtime" />
+    <result column="uharm_8_overtime" property="uharm8Overtime" />
+    <result column="uharm_9_overtime" property="uharm9Overtime" />
+    <result column="uharm_10_overtime" property="uharm10Overtime" />
+    <result column="uharm_11_overtime" property="uharm11Overtime" />
+    <result column="uharm_12_overtime" property="uharm12Overtime" />
+    <result column="uharm_13_overtime" property="uharm13Overtime" />
+    <result column="uharm_14_overtime" property="uharm14Overtime" />
+    <result column="uharm_15_overtime" property="uharm15Overtime" />
+    <result column="uharm_16_overtime" property="uharm16Overtime" />
+    <result column="uharm_17_overtime" property="uharm17Overtime" />
+    <result column="uharm_18_overtime" property="uharm18Overtime" />
+    <result column="uharm_19_overtime" property="uharm19Overtime" />
+    <result column="uharm_20_overtime" property="uharm20Overtime" />
+    <result column="uharm_21_overtime" property="uharm21Overtime" />
+    <result column="uharm_22_overtime" property="uharm22Overtime" />
+    <result column="uharm_23_overtime" property="uharm23Overtime" />
+    <result column="uharm_24_overtime" property="uharm24Overtime" />
+    <result column="uharm_25_overtime" property="uharm25Overtime" />
+    <result column="iharm_2_overtime" property="iharm2Overtime" />
+    <result column="iharm_3_overtime" property="iharm3Overtime" />
+    <result column="iharm_4_overtime" property="iharm4Overtime" />
+    <result column="iharm_5_overtime" property="iharm5Overtime" />
+    <result column="iharm_6_overtime" property="iharm6Overtime" />
+    <result column="iharm_7_overtime" property="iharm7Overtime" />
+    <result column="iharm_8_overtime" property="iharm8Overtime" />
+    <result column="iharm_9_overtime" property="iharm9Overtime" />
+    <result column="iharm_10_overtime" property="iharm10Overtime" />
+    <result column="iharm_11_overtime" property="iharm11Overtime" />
+    <result column="iharm_12_overtime" property="iharm12Overtime" />
+    <result column="iharm_13_overtime" property="iharm13Overtime" />
+    <result column="iharm_14_overtime" property="iharm14Overtime" />
+    <result column="iharm_15_overtime" property="iharm15Overtime" />
+    <result column="iharm_16_overtime" property="iharm16Overtime" />
+    <result column="iharm_17_overtime" property="iharm17Overtime" />
+    <result column="iharm_18_overtime" property="iharm18Overtime" />
+    <result column="iharm_19_overtime" property="iharm19Overtime" />
+    <result column="iharm_20_overtime" property="iharm20Overtime" />
+    <result column="iharm_21_overtime" property="iharm21Overtime" />
+    <result column="iharm_22_overtime" property="iharm22Overtime" />
+    <result column="iharm_23_overtime" property="iharm23Overtime" />
+    <result column="iharm_24_overtime" property="iharm24Overtime" />
+    <result column="iharm_25_overtime" property="iharm25Overtime" />
+    <result column="inuharm_1_overtime" property="inuharm1Overtime" />
+    <result column="inuharm_2_overtime" property="inuharm2Overtime" />
+    <result column="inuharm_3_overtime" property="inuharm3Overtime" />
+    <result column="inuharm_4_overtime" property="inuharm4Overtime" />
+    <result column="inuharm_5_overtime" property="inuharm5Overtime" />
+    <result column="inuharm_6_overtime" property="inuharm6Overtime" />
+    <result column="inuharm_7_overtime" property="inuharm7Overtime" />
+    <result column="inuharm_8_overtime" property="inuharm8Overtime" />
+    <result column="inuharm_9_overtime" property="inuharm9Overtime" />
+    <result column="inuharm_10_overtime" property="inuharm10Overtime" />
+    <result column="inuharm_11_overtime" property="inuharm11Overtime" />
+    <result column="inuharm_12_overtime" property="inuharm12Overtime" />
+    <result column="inuharm_13_overtime" property="inuharm13Overtime" />
+    <result column="inuharm_14_overtime" property="inuharm14Overtime" />
+    <result column="inuharm_15_overtime" property="inuharm15Overtime" />
+    <result column="inuharm_16_overtime" property="inuharm16Overtime" />
+  </resultMap>
+  <sql id="Base_Column_List">
+    <!--@mbg.generated-->
+    line_id, phasic_type, `time`, all_time, flicker_overtime, flicker_all_time, freq_dev_overtime, 
+    voltage_dev_overtime, ubalance_overtime, uaberrance_overtime, i_neg_overtime, uharm_2_overtime, 
+    uharm_3_overtime, uharm_4_overtime, uharm_5_overtime, uharm_6_overtime, uharm_7_overtime, 
+    uharm_8_overtime, uharm_9_overtime, uharm_10_overtime, uharm_11_overtime, uharm_12_overtime, 
+    uharm_13_overtime, uharm_14_overtime, uharm_15_overtime, uharm_16_overtime, uharm_17_overtime, 
+    uharm_18_overtime, uharm_19_overtime, uharm_20_overtime, uharm_21_overtime, uharm_22_overtime, 
+    uharm_23_overtime, uharm_24_overtime, uharm_25_overtime, iharm_2_overtime, iharm_3_overtime, 
+    iharm_4_overtime, iharm_5_overtime, iharm_6_overtime, iharm_7_overtime, iharm_8_overtime, 
+    iharm_9_overtime, iharm_10_overtime, iharm_11_overtime, iharm_12_overtime, iharm_13_overtime, 
+    iharm_14_overtime, iharm_15_overtime, iharm_16_overtime, iharm_17_overtime, iharm_18_overtime, 
+    iharm_19_overtime, iharm_20_overtime, iharm_21_overtime, iharm_22_overtime, iharm_23_overtime, 
+    iharm_24_overtime, iharm_25_overtime, inuharm_1_overtime, inuharm_2_overtime, inuharm_3_overtime, 
+    inuharm_4_overtime, inuharm_5_overtime, inuharm_6_overtime, inuharm_7_overtime, inuharm_8_overtime, 
+    inuharm_9_overtime, inuharm_10_overtime, inuharm_11_overtime, inuharm_12_overtime, 
+    inuharm_13_overtime, inuharm_14_overtime, inuharm_15_overtime, inuharm_16_overtime
+  </sql>
+  <update id="updateBatch" parameterType="java.util.List">
+    <!--@mbg.generated-->
+    update limit_target
+    <trim prefix="set" suffixOverrides=",">
+      <trim prefix="all_time = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when line_id = #{item.lineId} then #{item.allTime}
+        </foreach>
+      </trim>
+      <trim prefix="flicker_overtime = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when line_id = #{item.lineId} then #{item.flickerOvertime}
+        </foreach>
+      </trim>
+      <trim prefix="flicker_all_time = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when line_id = #{item.lineId} then #{item.flickerAllTime}
+        </foreach>
+      </trim>
+      <trim prefix="freq_dev_overtime = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when line_id = #{item.lineId} then #{item.freqDevOvertime}
+        </foreach>
+      </trim>
+      <trim prefix="voltage_dev_overtime = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when line_id = #{item.lineId} then #{item.voltageDevOvertime}
+        </foreach>
+      </trim>
+      <trim prefix="ubalance_overtime = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when line_id = #{item.lineId} then #{item.ubalanceOvertime}
+        </foreach>
+      </trim>
+      <trim prefix="uaberrance_overtime = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when line_id = #{item.lineId} then #{item.uaberranceOvertime}
+        </foreach>
+      </trim>
+      <trim prefix="i_neg_overtime = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when line_id = #{item.lineId} then #{item.iNegOvertime}
+        </foreach>
+      </trim>
+      <trim prefix="uharm_2_overtime = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when line_id = #{item.lineId} then #{item.uharm2Overtime}
+        </foreach>
+      </trim>
+      <trim prefix="uharm_3_overtime = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when line_id = #{item.lineId} then #{item.uharm3Overtime}
+        </foreach>
+      </trim>
+      <trim prefix="uharm_4_overtime = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when line_id = #{item.lineId} then #{item.uharm4Overtime}
+        </foreach>
+      </trim>
+      <trim prefix="uharm_5_overtime = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when line_id = #{item.lineId} then #{item.uharm5Overtime}
+        </foreach>
+      </trim>
+      <trim prefix="uharm_6_overtime = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when line_id = #{item.lineId} then #{item.uharm6Overtime}
+        </foreach>
+      </trim>
+      <trim prefix="uharm_7_overtime = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when line_id = #{item.lineId} then #{item.uharm7Overtime}
+        </foreach>
+      </trim>
+      <trim prefix="uharm_8_overtime = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when line_id = #{item.lineId} then #{item.uharm8Overtime}
+        </foreach>
+      </trim>
+      <trim prefix="uharm_9_overtime = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when line_id = #{item.lineId} then #{item.uharm9Overtime}
+        </foreach>
+      </trim>
+      <trim prefix="uharm_10_overtime = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when line_id = #{item.lineId} then #{item.uharm10Overtime}
+        </foreach>
+      </trim>
+      <trim prefix="uharm_11_overtime = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when line_id = #{item.lineId} then #{item.uharm11Overtime}
+        </foreach>
+      </trim>
+      <trim prefix="uharm_12_overtime = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when line_id = #{item.lineId} then #{item.uharm12Overtime}
+        </foreach>
+      </trim>
+      <trim prefix="uharm_13_overtime = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when line_id = #{item.lineId} then #{item.uharm13Overtime}
+        </foreach>
+      </trim>
+      <trim prefix="uharm_14_overtime = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when line_id = #{item.lineId} then #{item.uharm14Overtime}
+        </foreach>
+      </trim>
+      <trim prefix="uharm_15_overtime = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when line_id = #{item.lineId} then #{item.uharm15Overtime}
+        </foreach>
+      </trim>
+      <trim prefix="uharm_16_overtime = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when line_id = #{item.lineId} then #{item.uharm16Overtime}
+        </foreach>
+      </trim>
+      <trim prefix="uharm_17_overtime = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when line_id = #{item.lineId} then #{item.uharm17Overtime}
+        </foreach>
+      </trim>
+      <trim prefix="uharm_18_overtime = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when line_id = #{item.lineId} then #{item.uharm18Overtime}
+        </foreach>
+      </trim>
+      <trim prefix="uharm_19_overtime = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when line_id = #{item.lineId} then #{item.uharm19Overtime}
+        </foreach>
+      </trim>
+      <trim prefix="uharm_20_overtime = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when line_id = #{item.lineId} then #{item.uharm20Overtime}
+        </foreach>
+      </trim>
+      <trim prefix="uharm_21_overtime = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when line_id = #{item.lineId} then #{item.uharm21Overtime}
+        </foreach>
+      </trim>
+      <trim prefix="uharm_22_overtime = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when line_id = #{item.lineId} then #{item.uharm22Overtime}
+        </foreach>
+      </trim>
+      <trim prefix="uharm_23_overtime = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when line_id = #{item.lineId} then #{item.uharm23Overtime}
+        </foreach>
+      </trim>
+      <trim prefix="uharm_24_overtime = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when line_id = #{item.lineId} then #{item.uharm24Overtime}
+        </foreach>
+      </trim>
+      <trim prefix="uharm_25_overtime = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when line_id = #{item.lineId} then #{item.uharm25Overtime}
+        </foreach>
+      </trim>
+      <trim prefix="iharm_2_overtime = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when line_id = #{item.lineId} then #{item.iharm2Overtime}
+        </foreach>
+      </trim>
+      <trim prefix="iharm_3_overtime = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when line_id = #{item.lineId} then #{item.iharm3Overtime}
+        </foreach>
+      </trim>
+      <trim prefix="iharm_4_overtime = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when line_id = #{item.lineId} then #{item.iharm4Overtime}
+        </foreach>
+      </trim>
+      <trim prefix="iharm_5_overtime = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when line_id = #{item.lineId} then #{item.iharm5Overtime}
+        </foreach>
+      </trim>
+      <trim prefix="iharm_6_overtime = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when line_id = #{item.lineId} then #{item.iharm6Overtime}
+        </foreach>
+      </trim>
+      <trim prefix="iharm_7_overtime = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when line_id = #{item.lineId} then #{item.iharm7Overtime}
+        </foreach>
+      </trim>
+      <trim prefix="iharm_8_overtime = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when line_id = #{item.lineId} then #{item.iharm8Overtime}
+        </foreach>
+      </trim>
+      <trim prefix="iharm_9_overtime = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when line_id = #{item.lineId} then #{item.iharm9Overtime}
+        </foreach>
+      </trim>
+      <trim prefix="iharm_10_overtime = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when line_id = #{item.lineId} then #{item.iharm10Overtime}
+        </foreach>
+      </trim>
+      <trim prefix="iharm_11_overtime = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when line_id = #{item.lineId} then #{item.iharm11Overtime}
+        </foreach>
+      </trim>
+      <trim prefix="iharm_12_overtime = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when line_id = #{item.lineId} then #{item.iharm12Overtime}
+        </foreach>
+      </trim>
+      <trim prefix="iharm_13_overtime = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when line_id = #{item.lineId} then #{item.iharm13Overtime}
+        </foreach>
+      </trim>
+      <trim prefix="iharm_14_overtime = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when line_id = #{item.lineId} then #{item.iharm14Overtime}
+        </foreach>
+      </trim>
+      <trim prefix="iharm_15_overtime = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when line_id = #{item.lineId} then #{item.iharm15Overtime}
+        </foreach>
+      </trim>
+      <trim prefix="iharm_16_overtime = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when line_id = #{item.lineId} then #{item.iharm16Overtime}
+        </foreach>
+      </trim>
+      <trim prefix="iharm_17_overtime = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when line_id = #{item.lineId} then #{item.iharm17Overtime}
+        </foreach>
+      </trim>
+      <trim prefix="iharm_18_overtime = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when line_id = #{item.lineId} then #{item.iharm18Overtime}
+        </foreach>
+      </trim>
+      <trim prefix="iharm_19_overtime = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when line_id = #{item.lineId} then #{item.iharm19Overtime}
+        </foreach>
+      </trim>
+      <trim prefix="iharm_20_overtime = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when line_id = #{item.lineId} then #{item.iharm20Overtime}
+        </foreach>
+      </trim>
+      <trim prefix="iharm_21_overtime = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when line_id = #{item.lineId} then #{item.iharm21Overtime}
+        </foreach>
+      </trim>
+      <trim prefix="iharm_22_overtime = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when line_id = #{item.lineId} then #{item.iharm22Overtime}
+        </foreach>
+      </trim>
+      <trim prefix="iharm_23_overtime = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when line_id = #{item.lineId} then #{item.iharm23Overtime}
+        </foreach>
+      </trim>
+      <trim prefix="iharm_24_overtime = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when line_id = #{item.lineId} then #{item.iharm24Overtime}
+        </foreach>
+      </trim>
+      <trim prefix="iharm_25_overtime = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when line_id = #{item.lineId} then #{item.iharm25Overtime}
+        </foreach>
+      </trim>
+      <trim prefix="inuharm_1_overtime = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when line_id = #{item.lineId} then #{item.inuharm1Overtime}
+        </foreach>
+      </trim>
+      <trim prefix="inuharm_2_overtime = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when line_id = #{item.lineId} then #{item.inuharm2Overtime}
+        </foreach>
+      </trim>
+      <trim prefix="inuharm_3_overtime = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when line_id = #{item.lineId} then #{item.inuharm3Overtime}
+        </foreach>
+      </trim>
+      <trim prefix="inuharm_4_overtime = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when line_id = #{item.lineId} then #{item.inuharm4Overtime}
+        </foreach>
+      </trim>
+      <trim prefix="inuharm_5_overtime = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when line_id = #{item.lineId} then #{item.inuharm5Overtime}
+        </foreach>
+      </trim>
+      <trim prefix="inuharm_6_overtime = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when line_id = #{item.lineId} then #{item.inuharm6Overtime}
+        </foreach>
+      </trim>
+      <trim prefix="inuharm_7_overtime = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when line_id = #{item.lineId} then #{item.inuharm7Overtime}
+        </foreach>
+      </trim>
+      <trim prefix="inuharm_8_overtime = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when line_id = #{item.lineId} then #{item.inuharm8Overtime}
+        </foreach>
+      </trim>
+      <trim prefix="inuharm_9_overtime = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when line_id = #{item.lineId} then #{item.inuharm9Overtime}
+        </foreach>
+      </trim>
+      <trim prefix="inuharm_10_overtime = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when line_id = #{item.lineId} then #{item.inuharm10Overtime}
+        </foreach>
+      </trim>
+      <trim prefix="inuharm_11_overtime = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when line_id = #{item.lineId} then #{item.inuharm11Overtime}
+        </foreach>
+      </trim>
+      <trim prefix="inuharm_12_overtime = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when line_id = #{item.lineId} then #{item.inuharm12Overtime}
+        </foreach>
+      </trim>
+      <trim prefix="inuharm_13_overtime = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when line_id = #{item.lineId} then #{item.inuharm13Overtime}
+        </foreach>
+      </trim>
+      <trim prefix="inuharm_14_overtime = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when line_id = #{item.lineId} then #{item.inuharm14Overtime}
+        </foreach>
+      </trim>
+      <trim prefix="inuharm_15_overtime = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when line_id = #{item.lineId} then #{item.inuharm15Overtime}
+        </foreach>
+      </trim>
+      <trim prefix="inuharm_16_overtime = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when line_id = #{item.lineId} then #{item.inuharm16Overtime}
+        </foreach>
+      </trim>
+    </trim>
+    where line_id in
+    <foreach close=")" collection="list" item="item" open="(" separator=", ">
+      #{item.lineId}
+    </foreach>
+  </update>
+  <update id="updateBatchSelective" parameterType="java.util.List">
+    <!--@mbg.generated-->
+    update limit_target
+    <trim prefix="set" suffixOverrides=",">
+      <trim prefix="all_time = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          <if test="item.allTime != null">
+            when line_id = #{item.lineId} then #{item.allTime}
+          </if>
+        </foreach>
+      </trim>
+      <trim prefix="flicker_overtime = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          <if test="item.flickerOvertime != null">
+            when line_id = #{item.lineId} then #{item.flickerOvertime}
+          </if>
+        </foreach>
+      </trim>
+      <trim prefix="flicker_all_time = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          <if test="item.flickerAllTime != null">
+            when line_id = #{item.lineId} then #{item.flickerAllTime}
+          </if>
+        </foreach>
+      </trim>
+      <trim prefix="freq_dev_overtime = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          <if test="item.freqDevOvertime != null">
+            when line_id = #{item.lineId} then #{item.freqDevOvertime}
+          </if>
+        </foreach>
+      </trim>
+      <trim prefix="voltage_dev_overtime = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          <if test="item.voltageDevOvertime != null">
+            when line_id = #{item.lineId} then #{item.voltageDevOvertime}
+          </if>
+        </foreach>
+      </trim>
+      <trim prefix="ubalance_overtime = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          <if test="item.ubalanceOvertime != null">
+            when line_id = #{item.lineId} then #{item.ubalanceOvertime}
+          </if>
+        </foreach>
+      </trim>
+      <trim prefix="uaberrance_overtime = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          <if test="item.uaberranceOvertime != null">
+            when line_id = #{item.lineId} then #{item.uaberranceOvertime}
+          </if>
+        </foreach>
+      </trim>
+      <trim prefix="i_neg_overtime = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          <if test="item.iNegOvertime != null">
+            when line_id = #{item.lineId} then #{item.iNegOvertime}
+          </if>
+        </foreach>
+      </trim>
+      <trim prefix="uharm_2_overtime = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          <if test="item.uharm2Overtime != null">
+            when line_id = #{item.lineId} then #{item.uharm2Overtime}
+          </if>
+        </foreach>
+      </trim>
+      <trim prefix="uharm_3_overtime = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          <if test="item.uharm3Overtime != null">
+            when line_id = #{item.lineId} then #{item.uharm3Overtime}
+          </if>
+        </foreach>
+      </trim>
+      <trim prefix="uharm_4_overtime = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          <if test="item.uharm4Overtime != null">
+            when line_id = #{item.lineId} then #{item.uharm4Overtime}
+          </if>
+        </foreach>
+      </trim>
+      <trim prefix="uharm_5_overtime = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          <if test="item.uharm5Overtime != null">
+            when line_id = #{item.lineId} then #{item.uharm5Overtime}
+          </if>
+        </foreach>
+      </trim>
+      <trim prefix="uharm_6_overtime = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          <if test="item.uharm6Overtime != null">
+            when line_id = #{item.lineId} then #{item.uharm6Overtime}
+          </if>
+        </foreach>
+      </trim>
+      <trim prefix="uharm_7_overtime = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          <if test="item.uharm7Overtime != null">
+            when line_id = #{item.lineId} then #{item.uharm7Overtime}
+          </if>
+        </foreach>
+      </trim>
+      <trim prefix="uharm_8_overtime = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          <if test="item.uharm8Overtime != null">
+            when line_id = #{item.lineId} then #{item.uharm8Overtime}
+          </if>
+        </foreach>
+      </trim>
+      <trim prefix="uharm_9_overtime = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          <if test="item.uharm9Overtime != null">
+            when line_id = #{item.lineId} then #{item.uharm9Overtime}
+          </if>
+        </foreach>
+      </trim>
+      <trim prefix="uharm_10_overtime = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          <if test="item.uharm10Overtime != null">
+            when line_id = #{item.lineId} then #{item.uharm10Overtime}
+          </if>
+        </foreach>
+      </trim>
+      <trim prefix="uharm_11_overtime = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          <if test="item.uharm11Overtime != null">
+            when line_id = #{item.lineId} then #{item.uharm11Overtime}
+          </if>
+        </foreach>
+      </trim>
+      <trim prefix="uharm_12_overtime = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          <if test="item.uharm12Overtime != null">
+            when line_id = #{item.lineId} then #{item.uharm12Overtime}
+          </if>
+        </foreach>
+      </trim>
+      <trim prefix="uharm_13_overtime = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          <if test="item.uharm13Overtime != null">
+            when line_id = #{item.lineId} then #{item.uharm13Overtime}
+          </if>
+        </foreach>
+      </trim>
+      <trim prefix="uharm_14_overtime = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          <if test="item.uharm14Overtime != null">
+            when line_id = #{item.lineId} then #{item.uharm14Overtime}
+          </if>
+        </foreach>
+      </trim>
+      <trim prefix="uharm_15_overtime = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          <if test="item.uharm15Overtime != null">
+            when line_id = #{item.lineId} then #{item.uharm15Overtime}
+          </if>
+        </foreach>
+      </trim>
+      <trim prefix="uharm_16_overtime = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          <if test="item.uharm16Overtime != null">
+            when line_id = #{item.lineId} then #{item.uharm16Overtime}
+          </if>
+        </foreach>
+      </trim>
+      <trim prefix="uharm_17_overtime = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          <if test="item.uharm17Overtime != null">
+            when line_id = #{item.lineId} then #{item.uharm17Overtime}
+          </if>
+        </foreach>
+      </trim>
+      <trim prefix="uharm_18_overtime = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          <if test="item.uharm18Overtime != null">
+            when line_id = #{item.lineId} then #{item.uharm18Overtime}
+          </if>
+        </foreach>
+      </trim>
+      <trim prefix="uharm_19_overtime = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          <if test="item.uharm19Overtime != null">
+            when line_id = #{item.lineId} then #{item.uharm19Overtime}
+          </if>
+        </foreach>
+      </trim>
+      <trim prefix="uharm_20_overtime = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          <if test="item.uharm20Overtime != null">
+            when line_id = #{item.lineId} then #{item.uharm20Overtime}
+          </if>
+        </foreach>
+      </trim>
+      <trim prefix="uharm_21_overtime = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          <if test="item.uharm21Overtime != null">
+            when line_id = #{item.lineId} then #{item.uharm21Overtime}
+          </if>
+        </foreach>
+      </trim>
+      <trim prefix="uharm_22_overtime = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          <if test="item.uharm22Overtime != null">
+            when line_id = #{item.lineId} then #{item.uharm22Overtime}
+          </if>
+        </foreach>
+      </trim>
+      <trim prefix="uharm_23_overtime = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          <if test="item.uharm23Overtime != null">
+            when line_id = #{item.lineId} then #{item.uharm23Overtime}
+          </if>
+        </foreach>
+      </trim>
+      <trim prefix="uharm_24_overtime = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          <if test="item.uharm24Overtime != null">
+            when line_id = #{item.lineId} then #{item.uharm24Overtime}
+          </if>
+        </foreach>
+      </trim>
+      <trim prefix="uharm_25_overtime = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          <if test="item.uharm25Overtime != null">
+            when line_id = #{item.lineId} then #{item.uharm25Overtime}
+          </if>
+        </foreach>
+      </trim>
+      <trim prefix="iharm_2_overtime = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          <if test="item.iharm2Overtime != null">
+            when line_id = #{item.lineId} then #{item.iharm2Overtime}
+          </if>
+        </foreach>
+      </trim>
+      <trim prefix="iharm_3_overtime = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          <if test="item.iharm3Overtime != null">
+            when line_id = #{item.lineId} then #{item.iharm3Overtime}
+          </if>
+        </foreach>
+      </trim>
+      <trim prefix="iharm_4_overtime = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          <if test="item.iharm4Overtime != null">
+            when line_id = #{item.lineId} then #{item.iharm4Overtime}
+          </if>
+        </foreach>
+      </trim>
+      <trim prefix="iharm_5_overtime = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          <if test="item.iharm5Overtime != null">
+            when line_id = #{item.lineId} then #{item.iharm5Overtime}
+          </if>
+        </foreach>
+      </trim>
+      <trim prefix="iharm_6_overtime = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          <if test="item.iharm6Overtime != null">
+            when line_id = #{item.lineId} then #{item.iharm6Overtime}
+          </if>
+        </foreach>
+      </trim>
+      <trim prefix="iharm_7_overtime = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          <if test="item.iharm7Overtime != null">
+            when line_id = #{item.lineId} then #{item.iharm7Overtime}
+          </if>
+        </foreach>
+      </trim>
+      <trim prefix="iharm_8_overtime = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          <if test="item.iharm8Overtime != null">
+            when line_id = #{item.lineId} then #{item.iharm8Overtime}
+          </if>
+        </foreach>
+      </trim>
+      <trim prefix="iharm_9_overtime = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          <if test="item.iharm9Overtime != null">
+            when line_id = #{item.lineId} then #{item.iharm9Overtime}
+          </if>
+        </foreach>
+      </trim>
+      <trim prefix="iharm_10_overtime = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          <if test="item.iharm10Overtime != null">
+            when line_id = #{item.lineId} then #{item.iharm10Overtime}
+          </if>
+        </foreach>
+      </trim>
+      <trim prefix="iharm_11_overtime = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          <if test="item.iharm11Overtime != null">
+            when line_id = #{item.lineId} then #{item.iharm11Overtime}
+          </if>
+        </foreach>
+      </trim>
+      <trim prefix="iharm_12_overtime = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          <if test="item.iharm12Overtime != null">
+            when line_id = #{item.lineId} then #{item.iharm12Overtime}
+          </if>
+        </foreach>
+      </trim>
+      <trim prefix="iharm_13_overtime = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          <if test="item.iharm13Overtime != null">
+            when line_id = #{item.lineId} then #{item.iharm13Overtime}
+          </if>
+        </foreach>
+      </trim>
+      <trim prefix="iharm_14_overtime = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          <if test="item.iharm14Overtime != null">
+            when line_id = #{item.lineId} then #{item.iharm14Overtime}
+          </if>
+        </foreach>
+      </trim>
+      <trim prefix="iharm_15_overtime = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          <if test="item.iharm15Overtime != null">
+            when line_id = #{item.lineId} then #{item.iharm15Overtime}
+          </if>
+        </foreach>
+      </trim>
+      <trim prefix="iharm_16_overtime = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          <if test="item.iharm16Overtime != null">
+            when line_id = #{item.lineId} then #{item.iharm16Overtime}
+          </if>
+        </foreach>
+      </trim>
+      <trim prefix="iharm_17_overtime = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          <if test="item.iharm17Overtime != null">
+            when line_id = #{item.lineId} then #{item.iharm17Overtime}
+          </if>
+        </foreach>
+      </trim>
+      <trim prefix="iharm_18_overtime = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          <if test="item.iharm18Overtime != null">
+            when line_id = #{item.lineId} then #{item.iharm18Overtime}
+          </if>
+        </foreach>
+      </trim>
+      <trim prefix="iharm_19_overtime = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          <if test="item.iharm19Overtime != null">
+            when line_id = #{item.lineId} then #{item.iharm19Overtime}
+          </if>
+        </foreach>
+      </trim>
+      <trim prefix="iharm_20_overtime = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          <if test="item.iharm20Overtime != null">
+            when line_id = #{item.lineId} then #{item.iharm20Overtime}
+          </if>
+        </foreach>
+      </trim>
+      <trim prefix="iharm_21_overtime = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          <if test="item.iharm21Overtime != null">
+            when line_id = #{item.lineId} then #{item.iharm21Overtime}
+          </if>
+        </foreach>
+      </trim>
+      <trim prefix="iharm_22_overtime = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          <if test="item.iharm22Overtime != null">
+            when line_id = #{item.lineId} then #{item.iharm22Overtime}
+          </if>
+        </foreach>
+      </trim>
+      <trim prefix="iharm_23_overtime = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          <if test="item.iharm23Overtime != null">
+            when line_id = #{item.lineId} then #{item.iharm23Overtime}
+          </if>
+        </foreach>
+      </trim>
+      <trim prefix="iharm_24_overtime = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          <if test="item.iharm24Overtime != null">
+            when line_id = #{item.lineId} then #{item.iharm24Overtime}
+          </if>
+        </foreach>
+      </trim>
+      <trim prefix="iharm_25_overtime = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          <if test="item.iharm25Overtime != null">
+            when line_id = #{item.lineId} then #{item.iharm25Overtime}
+          </if>
+        </foreach>
+      </trim>
+      <trim prefix="inuharm_1_overtime = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          <if test="item.inuharm1Overtime != null">
+            when line_id = #{item.lineId} then #{item.inuharm1Overtime}
+          </if>
+        </foreach>
+      </trim>
+      <trim prefix="inuharm_2_overtime = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          <if test="item.inuharm2Overtime != null">
+            when line_id = #{item.lineId} then #{item.inuharm2Overtime}
+          </if>
+        </foreach>
+      </trim>
+      <trim prefix="inuharm_3_overtime = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          <if test="item.inuharm3Overtime != null">
+            when line_id = #{item.lineId} then #{item.inuharm3Overtime}
+          </if>
+        </foreach>
+      </trim>
+      <trim prefix="inuharm_4_overtime = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          <if test="item.inuharm4Overtime != null">
+            when line_id = #{item.lineId} then #{item.inuharm4Overtime}
+          </if>
+        </foreach>
+      </trim>
+      <trim prefix="inuharm_5_overtime = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          <if test="item.inuharm5Overtime != null">
+            when line_id = #{item.lineId} then #{item.inuharm5Overtime}
+          </if>
+        </foreach>
+      </trim>
+      <trim prefix="inuharm_6_overtime = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          <if test="item.inuharm6Overtime != null">
+            when line_id = #{item.lineId} then #{item.inuharm6Overtime}
+          </if>
+        </foreach>
+      </trim>
+      <trim prefix="inuharm_7_overtime = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          <if test="item.inuharm7Overtime != null">
+            when line_id = #{item.lineId} then #{item.inuharm7Overtime}
+          </if>
+        </foreach>
+      </trim>
+      <trim prefix="inuharm_8_overtime = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          <if test="item.inuharm8Overtime != null">
+            when line_id = #{item.lineId} then #{item.inuharm8Overtime}
+          </if>
+        </foreach>
+      </trim>
+      <trim prefix="inuharm_9_overtime = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          <if test="item.inuharm9Overtime != null">
+            when line_id = #{item.lineId} then #{item.inuharm9Overtime}
+          </if>
+        </foreach>
+      </trim>
+      <trim prefix="inuharm_10_overtime = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          <if test="item.inuharm10Overtime != null">
+            when line_id = #{item.lineId} then #{item.inuharm10Overtime}
+          </if>
+        </foreach>
+      </trim>
+      <trim prefix="inuharm_11_overtime = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          <if test="item.inuharm11Overtime != null">
+            when line_id = #{item.lineId} then #{item.inuharm11Overtime}
+          </if>
+        </foreach>
+      </trim>
+      <trim prefix="inuharm_12_overtime = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          <if test="item.inuharm12Overtime != null">
+            when line_id = #{item.lineId} then #{item.inuharm12Overtime}
+          </if>
+        </foreach>
+      </trim>
+      <trim prefix="inuharm_13_overtime = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          <if test="item.inuharm13Overtime != null">
+            when line_id = #{item.lineId} then #{item.inuharm13Overtime}
+          </if>
+        </foreach>
+      </trim>
+      <trim prefix="inuharm_14_overtime = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          <if test="item.inuharm14Overtime != null">
+            when line_id = #{item.lineId} then #{item.inuharm14Overtime}
+          </if>
+        </foreach>
+      </trim>
+      <trim prefix="inuharm_15_overtime = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          <if test="item.inuharm15Overtime != null">
+            when line_id = #{item.lineId} then #{item.inuharm15Overtime}
+          </if>
+        </foreach>
+      </trim>
+      <trim prefix="inuharm_16_overtime = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          <if test="item.inuharm16Overtime != null">
+            when line_id = #{item.lineId} then #{item.inuharm16Overtime}
+          </if>
+        </foreach>
+      </trim>
+    </trim>
+    where line_id in
+    <foreach close=")" collection="list" item="item" open="(" separator=", ">
+      #{item.lineId}
+    </foreach>
+  </update>
+  <insert id="batchInsert" parameterType="map">
+    <!--@mbg.generated-->
+    insert into limit_target
+    (line_id, phasic_type, `time`, all_time, flicker_overtime, flicker_all_time, freq_dev_overtime, 
+      voltage_dev_overtime, ubalance_overtime, uaberrance_overtime, i_neg_overtime, uharm_2_overtime, 
+      uharm_3_overtime, uharm_4_overtime, uharm_5_overtime, uharm_6_overtime, uharm_7_overtime, 
+      uharm_8_overtime, uharm_9_overtime, uharm_10_overtime, uharm_11_overtime, uharm_12_overtime, 
+      uharm_13_overtime, uharm_14_overtime, uharm_15_overtime, uharm_16_overtime, uharm_17_overtime, 
+      uharm_18_overtime, uharm_19_overtime, uharm_20_overtime, uharm_21_overtime, uharm_22_overtime, 
+      uharm_23_overtime, uharm_24_overtime, uharm_25_overtime, iharm_2_overtime, iharm_3_overtime, 
+      iharm_4_overtime, iharm_5_overtime, iharm_6_overtime, iharm_7_overtime, iharm_8_overtime, 
+      iharm_9_overtime, iharm_10_overtime, iharm_11_overtime, iharm_12_overtime, iharm_13_overtime, 
+      iharm_14_overtime, iharm_15_overtime, iharm_16_overtime, iharm_17_overtime, iharm_18_overtime, 
+      iharm_19_overtime, iharm_20_overtime, iharm_21_overtime, iharm_22_overtime, iharm_23_overtime, 
+      iharm_24_overtime, iharm_25_overtime, inuharm_1_overtime, inuharm_2_overtime, inuharm_3_overtime, 
+      inuharm_4_overtime, inuharm_5_overtime, inuharm_6_overtime, inuharm_7_overtime, 
+      inuharm_8_overtime, inuharm_9_overtime, inuharm_10_overtime, inuharm_11_overtime, 
+      inuharm_12_overtime, inuharm_13_overtime, inuharm_14_overtime, inuharm_15_overtime, 
+      inuharm_16_overtime)
+    values
+    <foreach collection="list" item="item" separator=",">
+      (#{item.lineId}, #{item.phasicType}, #{item.time}, #{item.allTime}, #{item.flickerOvertime}, 
+        #{item.flickerAllTime}, #{item.freqDevOvertime}, #{item.voltageDevOvertime}, #{item.ubalanceOvertime}, 
+        #{item.uaberranceOvertime}, #{item.iNegOvertime}, #{item.uharm2Overtime}, #{item.uharm3Overtime}, 
+        #{item.uharm4Overtime}, #{item.uharm5Overtime}, #{item.uharm6Overtime}, #{item.uharm7Overtime}, 
+        #{item.uharm8Overtime}, #{item.uharm9Overtime}, #{item.uharm10Overtime}, #{item.uharm11Overtime}, 
+        #{item.uharm12Overtime}, #{item.uharm13Overtime}, #{item.uharm14Overtime}, #{item.uharm15Overtime}, 
+        #{item.uharm16Overtime}, #{item.uharm17Overtime}, #{item.uharm18Overtime}, #{item.uharm19Overtime}, 
+        #{item.uharm20Overtime}, #{item.uharm21Overtime}, #{item.uharm22Overtime}, #{item.uharm23Overtime}, 
+        #{item.uharm24Overtime}, #{item.uharm25Overtime}, #{item.iharm2Overtime}, #{item.iharm3Overtime}, 
+        #{item.iharm4Overtime}, #{item.iharm5Overtime}, #{item.iharm6Overtime}, #{item.iharm7Overtime}, 
+        #{item.iharm8Overtime}, #{item.iharm9Overtime}, #{item.iharm10Overtime}, #{item.iharm11Overtime}, 
+        #{item.iharm12Overtime}, #{item.iharm13Overtime}, #{item.iharm14Overtime}, #{item.iharm15Overtime}, 
+        #{item.iharm16Overtime}, #{item.iharm17Overtime}, #{item.iharm18Overtime}, #{item.iharm19Overtime}, 
+        #{item.iharm20Overtime}, #{item.iharm21Overtime}, #{item.iharm22Overtime}, #{item.iharm23Overtime}, 
+        #{item.iharm24Overtime}, #{item.iharm25Overtime}, #{item.inuharm1Overtime}, #{item.inuharm2Overtime}, 
+        #{item.inuharm3Overtime}, #{item.inuharm4Overtime}, #{item.inuharm5Overtime}, #{item.inuharm6Overtime}, 
+        #{item.inuharm7Overtime}, #{item.inuharm8Overtime}, #{item.inuharm9Overtime}, #{item.inuharm10Overtime}, 
+        #{item.inuharm11Overtime}, #{item.inuharm12Overtime}, #{item.inuharm13Overtime}, 
+        #{item.inuharm14Overtime}, #{item.inuharm15Overtime}, #{item.inuharm16Overtime}
+        )
+    </foreach>
+  </insert>
+</mapper>
\ No newline at end of file
diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/mapping/RMpFlickerReportDPOMapper.xml b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/mapping/RMpFlickerReportDPOMapper.xml
new file mode 100644
index 000000000..fd0a5102e
--- /dev/null
+++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/mapping/RMpFlickerReportDPOMapper.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.njcn.prepare.harmonic.mapper.line.RMpFlickerReportDPOMapper">
+  <resultMap id="BaseResultMap" type="com.njcn.prepare.harmonic.pojo.po.line.RMpFlickerReportDPO">
+    <!--@mbg.generated-->
+    <!--@Table r_mp_flicker_report_d-->
+    <id column="measurement_point_id" jdbcType="VARCHAR" property="measurementPointId" />
+    <id column="data_date" jdbcType="DATE" property="dataDate" />
+    <id column="phase" jdbcType="VARCHAR" property="phase" />
+    <result column="VOLTAGE_FLUCTUATION_MAX" jdbcType="FLOAT" property="voltageFluctuationMax" />
+    <result column="VOLTAGE_FLUCTUATION_MIN" jdbcType="FLOAT" property="voltageFluctuationMin" />
+    <result column="VOLTAGE_FLUCTUATION_AVG" jdbcType="FLOAT" property="voltageFluctuationAvg" />
+    <result column="VOLTAGE_FLUCTUATION_95" jdbcType="FLOAT" property="voltageFluctuation95" />
+    <result column="SHORT_TERM_SEVERITY_MAX" jdbcType="FLOAT" property="shortTermSeverityMax" />
+    <result column="SHORT_TERM_SEVERITY_MIN" jdbcType="FLOAT" property="shortTermSeverityMin" />
+    <result column="SHORT_TERM_SEVERITY_AVG" jdbcType="FLOAT" property="shortTermSeverityAvg" />
+    <result column="SHORT_TERM_SEVERITY_95" jdbcType="FLOAT" property="shortTermSeverity95" />
+  </resultMap>
+  <sql id="Base_Column_List">
+    <!--@mbg.generated-->
+    measurement_point_id, data_date, phase, VOLTAGE_FLUCTUATION_MAX, VOLTAGE_FLUCTUATION_MIN, 
+    VOLTAGE_FLUCTUATION_AVG, VOLTAGE_FLUCTUATION_95, SHORT_TERM_SEVERITY_MAX, SHORT_TERM_SEVERITY_MIN, 
+    SHORT_TERM_SEVERITY_AVG, SHORT_TERM_SEVERITY_95
+  </sql>
+</mapper>
\ No newline at end of file
diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/mapping/RMpHarmonicIMagReportDPOMapper.xml b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/mapping/RMpHarmonicIMagReportDPOMapper.xml
new file mode 100644
index 000000000..dad13d0ce
--- /dev/null
+++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/mapping/RMpHarmonicIMagReportDPOMapper.xml
@@ -0,0 +1,286 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.njcn.prepare.harmonic.mapper.line.RMpHarmonicIMagReportDPOMapper">
+  <resultMap id="BaseResultMap" type="com.njcn.prepare.harmonic.pojo.po.line.RMpHarmonicIMagReportDPO">
+    <!--@mbg.generated-->
+    <!--@Table r_mp_harmonic_i_mag_report_d-->
+    <id column="measurement_point_id" jdbcType="VARCHAR" property="measurementPointId" />
+    <id column="data_date" jdbcType="DATE" property="dataDate" />
+    <id column="phase" jdbcType="VARCHAR" property="phase" />
+    <result column="fundamental_current_max" jdbcType="FLOAT" property="fundamentalCurrentMax" />
+    <result column="fundamental_current_min" jdbcType="FLOAT" property="fundamentalCurrentMin" />
+    <result column="fundamental_current_avg" jdbcType="FLOAT" property="fundamentalCurrentAvg" />
+    <result column="fundamental_current_95" jdbcType="FLOAT" property="fundamentalCurrent95" />
+    <result column="harmonic_current_thd_max" jdbcType="FLOAT" property="harmonicCurrentThdMax" />
+    <result column="harmonic_current_thd_min" jdbcType="FLOAT" property="harmonicCurrentThdMin" />
+    <result column="harmonic_current_thd_avg" jdbcType="FLOAT" property="harmonicCurrentThdAvg" />
+    <result column="harmonic_current_thd_95" jdbcType="FLOAT" property="harmonicCurrentThd95" />
+    <result column="harmonic_current_effective_2_max" jdbcType="FLOAT" property="harmonicCurrentEffective2Max" />
+    <result column="harmonic_current_effective_2_min" jdbcType="FLOAT" property="harmonicCurrentEffective2Min" />
+    <result column="harmonic_current_effective_2_avg" jdbcType="FLOAT" property="harmonicCurrentEffective2Avg" />
+    <result column="harmonic_current_effective_2_95" jdbcType="FLOAT" property="harmonicCurrentEffective295" />
+    <result column="harmonic_current_effective_3_max" jdbcType="FLOAT" property="harmonicCurrentEffective3Max" />
+    <result column="harmonic_current_effective_3_min" jdbcType="FLOAT" property="harmonicCurrentEffective3Min" />
+    <result column="harmonic_current_effective_3_avg" jdbcType="FLOAT" property="harmonicCurrentEffective3Avg" />
+    <result column="harmonic_current_effective_3_95" jdbcType="FLOAT" property="harmonicCurrentEffective395" />
+    <result column="harmonic_current_effective_4_max" jdbcType="FLOAT" property="harmonicCurrentEffective4Max" />
+    <result column="harmonic_current_effective_4_min" jdbcType="FLOAT" property="harmonicCurrentEffective4Min" />
+    <result column="harmonic_current_effective_4_avg" jdbcType="FLOAT" property="harmonicCurrentEffective4Avg" />
+    <result column="harmonic_current_effective_4_95" jdbcType="FLOAT" property="harmonicCurrentEffective495" />
+    <result column="harmonic_current_effective_5_max" jdbcType="FLOAT" property="harmonicCurrentEffective5Max" />
+    <result column="harmonic_current_effective_5_min" jdbcType="FLOAT" property="harmonicCurrentEffective5Min" />
+    <result column="harmonic_current_effective_5_avg" jdbcType="FLOAT" property="harmonicCurrentEffective5Avg" />
+    <result column="harmonic_current_effective_5_95" jdbcType="FLOAT" property="harmonicCurrentEffective595" />
+    <result column="harmonic_current_effective_6_max" jdbcType="FLOAT" property="harmonicCurrentEffective6Max" />
+    <result column="harmonic_current_effective_6_min" jdbcType="FLOAT" property="harmonicCurrentEffective6Min" />
+    <result column="harmonic_current_effective_6_avg" jdbcType="FLOAT" property="harmonicCurrentEffective6Avg" />
+    <result column="harmonic_current_effective_6_95" jdbcType="FLOAT" property="harmonicCurrentEffective695" />
+    <result column="harmonic_current_effective_7_max" jdbcType="FLOAT" property="harmonicCurrentEffective7Max" />
+    <result column="harmonic_current_effective_7_min" jdbcType="FLOAT" property="harmonicCurrentEffective7Min" />
+    <result column="harmonic_current_effective_7_avg" jdbcType="FLOAT" property="harmonicCurrentEffective7Avg" />
+    <result column="harmonic_current_effective_7_95" jdbcType="FLOAT" property="harmonicCurrentEffective795" />
+    <result column="harmonic_current_effective_8_max" jdbcType="FLOAT" property="harmonicCurrentEffective8Max" />
+    <result column="harmonic_current_effective_8_min" jdbcType="FLOAT" property="harmonicCurrentEffective8Min" />
+    <result column="harmonic_current_effective_8_avg" jdbcType="FLOAT" property="harmonicCurrentEffective8Avg" />
+    <result column="harmonic_current_effective_8_95" jdbcType="FLOAT" property="harmonicCurrentEffective895" />
+    <result column="harmonic_current_effective_9_max" jdbcType="FLOAT" property="harmonicCurrentEffective9Max" />
+    <result column="harmonic_current_effective_9_min" jdbcType="FLOAT" property="harmonicCurrentEffective9Min" />
+    <result column="harmonic_current_effective_9_avg" jdbcType="FLOAT" property="harmonicCurrentEffective9Avg" />
+    <result column="harmonic_current_effective_9_95" jdbcType="FLOAT" property="harmonicCurrentEffective995" />
+    <result column="harmonic_current_effective_10_max" jdbcType="FLOAT" property="harmonicCurrentEffective10Max" />
+    <result column="harmonic_current_effective_10_min" jdbcType="FLOAT" property="harmonicCurrentEffective10Min" />
+    <result column="harmonic_current_effective_10_avg" jdbcType="FLOAT" property="harmonicCurrentEffective10Avg" />
+    <result column="harmonic_current_effective_10_95" jdbcType="FLOAT" property="harmonicCurrentEffective1095" />
+    <result column="harmonic_current_effective_11_max" jdbcType="FLOAT" property="harmonicCurrentEffective11Max" />
+    <result column="harmonic_current_effective_11_min" jdbcType="FLOAT" property="harmonicCurrentEffective11Min" />
+    <result column="harmonic_current_effective_11_avg" jdbcType="FLOAT" property="harmonicCurrentEffective11Avg" />
+    <result column="harmonic_current_effective_11_95" jdbcType="FLOAT" property="harmonicCurrentEffective1195" />
+    <result column="harmonic_current_effective_12_max" jdbcType="FLOAT" property="harmonicCurrentEffective12Max" />
+    <result column="harmonic_current_effective_12_min" jdbcType="FLOAT" property="harmonicCurrentEffective12Min" />
+    <result column="harmonic_current_effective_12_avg" jdbcType="FLOAT" property="harmonicCurrentEffective12Avg" />
+    <result column="harmonic_current_effective_12_95" jdbcType="FLOAT" property="harmonicCurrentEffective1295" />
+    <result column="harmonic_current_effective_13_max" jdbcType="FLOAT" property="harmonicCurrentEffective13Max" />
+    <result column="harmonic_current_effective_13_min" jdbcType="FLOAT" property="harmonicCurrentEffective13Min" />
+    <result column="harmonic_current_effective_13_avg" jdbcType="FLOAT" property="harmonicCurrentEffective13Avg" />
+    <result column="harmonic_current_effective_13_95" jdbcType="FLOAT" property="harmonicCurrentEffective1395" />
+    <result column="harmonic_current_effective_14_max" jdbcType="FLOAT" property="harmonicCurrentEffective14Max" />
+    <result column="harmonic_current_effective_14_min" jdbcType="FLOAT" property="harmonicCurrentEffective14Min" />
+    <result column="harmonic_current_effective_14_avg" jdbcType="FLOAT" property="harmonicCurrentEffective14Avg" />
+    <result column="harmonic_current_effective_14_95" jdbcType="FLOAT" property="harmonicCurrentEffective1495" />
+    <result column="harmonic_current_effective_15_max" jdbcType="FLOAT" property="harmonicCurrentEffective15Max" />
+    <result column="harmonic_current_effective_15_min" jdbcType="FLOAT" property="harmonicCurrentEffective15Min" />
+    <result column="harmonic_current_effective_15_avg" jdbcType="FLOAT" property="harmonicCurrentEffective15Avg" />
+    <result column="harmonic_current_effective_15_95" jdbcType="FLOAT" property="harmonicCurrentEffective1595" />
+    <result column="harmonic_current_effective_16_max" jdbcType="FLOAT" property="harmonicCurrentEffective16Max" />
+    <result column="harmonic_current_effective_16_min" jdbcType="FLOAT" property="harmonicCurrentEffective16Min" />
+    <result column="harmonic_current_effective_16_avg" jdbcType="FLOAT" property="harmonicCurrentEffective16Avg" />
+    <result column="harmonic_current_effective_16_95" jdbcType="FLOAT" property="harmonicCurrentEffective1695" />
+    <result column="harmonic_current_effective_17_max" jdbcType="FLOAT" property="harmonicCurrentEffective17Max" />
+    <result column="harmonic_current_effective_17_min" jdbcType="FLOAT" property="harmonicCurrentEffective17Min" />
+    <result column="harmonic_current_effective_17_avg" jdbcType="FLOAT" property="harmonicCurrentEffective17Avg" />
+    <result column="harmonic_current_effective_17_95" jdbcType="FLOAT" property="harmonicCurrentEffective1795" />
+    <result column="harmonic_current_effective_18_max" jdbcType="FLOAT" property="harmonicCurrentEffective18Max" />
+    <result column="harmonic_current_effective_18_min" jdbcType="FLOAT" property="harmonicCurrentEffective18Min" />
+    <result column="harmonic_current_effective_18_avg" jdbcType="FLOAT" property="harmonicCurrentEffective18Avg" />
+    <result column="harmonic_current_effective_18_95" jdbcType="FLOAT" property="harmonicCurrentEffective1895" />
+    <result column="harmonic_current_effective_19_max" jdbcType="FLOAT" property="harmonicCurrentEffective19Max" />
+    <result column="harmonic_current_effective_19_min" jdbcType="FLOAT" property="harmonicCurrentEffective19Min" />
+    <result column="harmonic_current_effective_19_avg" jdbcType="FLOAT" property="harmonicCurrentEffective19Avg" />
+    <result column="harmonic_current_effective_19_95" jdbcType="FLOAT" property="harmonicCurrentEffective1995" />
+    <result column="harmonic_current_effective_20_max" jdbcType="FLOAT" property="harmonicCurrentEffective20Max" />
+    <result column="harmonic_current_effective_20_min" jdbcType="FLOAT" property="harmonicCurrentEffective20Min" />
+    <result column="harmonic_current_effective_20_avg" jdbcType="FLOAT" property="harmonicCurrentEffective20Avg" />
+    <result column="harmonic_current_effective_20_95" jdbcType="FLOAT" property="harmonicCurrentEffective2095" />
+    <result column="harmonic_current_effective_21_max" jdbcType="FLOAT" property="harmonicCurrentEffective21Max" />
+    <result column="harmonic_current_effective_21_min" jdbcType="FLOAT" property="harmonicCurrentEffective21Min" />
+    <result column="harmonic_current_effective_21_avg" jdbcType="FLOAT" property="harmonicCurrentEffective21Avg" />
+    <result column="harmonic_current_effective_21_95" jdbcType="FLOAT" property="harmonicCurrentEffective2195" />
+    <result column="harmonic_current_effective_22_max" jdbcType="FLOAT" property="harmonicCurrentEffective22Max" />
+    <result column="harmonic_current_effective_22_min" jdbcType="FLOAT" property="harmonicCurrentEffective22Min" />
+    <result column="harmonic_current_effective_22_avg" jdbcType="FLOAT" property="harmonicCurrentEffective22Avg" />
+    <result column="harmonic_current_effective_22_95" jdbcType="FLOAT" property="harmonicCurrentEffective2295" />
+    <result column="harmonic_current_effective_23_max" jdbcType="FLOAT" property="harmonicCurrentEffective23Max" />
+    <result column="harmonic_current_effective_23_min" jdbcType="FLOAT" property="harmonicCurrentEffective23Min" />
+    <result column="harmonic_current_effective_23_avg" jdbcType="FLOAT" property="harmonicCurrentEffective23Avg" />
+    <result column="harmonic_current_effective_23_95" jdbcType="FLOAT" property="harmonicCurrentEffective2395" />
+    <result column="harmonic_current_effective_24_max" jdbcType="FLOAT" property="harmonicCurrentEffective24Max" />
+    <result column="harmonic_current_effective_24_min" jdbcType="FLOAT" property="harmonicCurrentEffective24Min" />
+    <result column="harmonic_current_effective_24_avg" jdbcType="FLOAT" property="harmonicCurrentEffective24Avg" />
+    <result column="harmonic_current_effective_24_95" jdbcType="FLOAT" property="harmonicCurrentEffective2495" />
+    <result column="harmonic_current_effective_25_max" jdbcType="FLOAT" property="harmonicCurrentEffective25Max" />
+    <result column="harmonic_current_effective_25_min" jdbcType="FLOAT" property="harmonicCurrentEffective25Min" />
+    <result column="harmonic_current_effective_25_avg" jdbcType="FLOAT" property="harmonicCurrentEffective25Avg" />
+    <result column="harmonic_current_effective_25_95" jdbcType="FLOAT" property="harmonicCurrentEffective2595" />
+    <result column="harmonic_current_effective_26_max" jdbcType="FLOAT" property="harmonicCurrentEffective26Max" />
+    <result column="harmonic_current_effective_26_min" jdbcType="FLOAT" property="harmonicCurrentEffective26Min" />
+    <result column="harmonic_current_effective_26_avg" jdbcType="FLOAT" property="harmonicCurrentEffective26Avg" />
+    <result column="harmonic_current_effective_26_95" jdbcType="FLOAT" property="harmonicCurrentEffective2695" />
+    <result column="harmonic_current_effective_27_max" jdbcType="FLOAT" property="harmonicCurrentEffective27Max" />
+    <result column="harmonic_current_effective_27_min" jdbcType="FLOAT" property="harmonicCurrentEffective27Min" />
+    <result column="harmonic_current_effective_27_avg" jdbcType="FLOAT" property="harmonicCurrentEffective27Avg" />
+    <result column="harmonic_current_effective_27_95" jdbcType="FLOAT" property="harmonicCurrentEffective2795" />
+    <result column="harmonic_current_effective_28_max" jdbcType="FLOAT" property="harmonicCurrentEffective28Max" />
+    <result column="harmonic_current_effective_28_min" jdbcType="FLOAT" property="harmonicCurrentEffective28Min" />
+    <result column="harmonic_current_effective_28_avg" jdbcType="FLOAT" property="harmonicCurrentEffective28Avg" />
+    <result column="harmonic_current_effective_28_95" jdbcType="FLOAT" property="harmonicCurrentEffective2895" />
+    <result column="harmonic_current_effective_29_max" jdbcType="FLOAT" property="harmonicCurrentEffective29Max" />
+    <result column="harmonic_current_effective_29_min" jdbcType="FLOAT" property="harmonicCurrentEffective29Min" />
+    <result column="harmonic_current_effective_29_avg" jdbcType="FLOAT" property="harmonicCurrentEffective29Avg" />
+    <result column="harmonic_current_effective_29_95" jdbcType="FLOAT" property="harmonicCurrentEffective2995" />
+    <result column="harmonic_current_effective_30_max" jdbcType="FLOAT" property="harmonicCurrentEffective30Max" />
+    <result column="harmonic_current_effective_30_min" jdbcType="FLOAT" property="harmonicCurrentEffective30Min" />
+    <result column="harmonic_current_effective_30_avg" jdbcType="FLOAT" property="harmonicCurrentEffective30Avg" />
+    <result column="harmonic_current_effective_30_95" jdbcType="FLOAT" property="harmonicCurrentEffective3095" />
+    <result column="harmonic_current_effective_31_max" jdbcType="FLOAT" property="harmonicCurrentEffective31Max" />
+    <result column="harmonic_current_effective_31_min" jdbcType="FLOAT" property="harmonicCurrentEffective31Min" />
+    <result column="harmonic_current_effective_31_avg" jdbcType="FLOAT" property="harmonicCurrentEffective31Avg" />
+    <result column="harmonic_current_effective_31_95" jdbcType="FLOAT" property="harmonicCurrentEffective3195" />
+    <result column="harmonic_current_effective_32_max" jdbcType="FLOAT" property="harmonicCurrentEffective32Max" />
+    <result column="harmonic_current_effective_32_min" jdbcType="FLOAT" property="harmonicCurrentEffective32Min" />
+    <result column="harmonic_current_effective_32_avg" jdbcType="FLOAT" property="harmonicCurrentEffective32Avg" />
+    <result column="harmonic_current_effective_32_95" jdbcType="FLOAT" property="harmonicCurrentEffective3295" />
+    <result column="harmonic_current_effective_33_max" jdbcType="FLOAT" property="harmonicCurrentEffective33Max" />
+    <result column="harmonic_current_effective_33_min" jdbcType="FLOAT" property="harmonicCurrentEffective33Min" />
+    <result column="harmonic_current_effective_33_avg" jdbcType="FLOAT" property="harmonicCurrentEffective33Avg" />
+    <result column="harmonic_current_effective_33_95" jdbcType="FLOAT" property="harmonicCurrentEffective3395" />
+    <result column="harmonic_current_effective_34_max" jdbcType="FLOAT" property="harmonicCurrentEffective34Max" />
+    <result column="harmonic_current_effective_34_min" jdbcType="FLOAT" property="harmonicCurrentEffective34Min" />
+    <result column="harmonic_current_effective_34_avg" jdbcType="FLOAT" property="harmonicCurrentEffective34Avg" />
+    <result column="harmonic_current_effective_34_95" jdbcType="FLOAT" property="harmonicCurrentEffective3495" />
+    <result column="harmonic_current_effective_35_max" jdbcType="FLOAT" property="harmonicCurrentEffective35Max" />
+    <result column="harmonic_current_effective_35_min" jdbcType="FLOAT" property="harmonicCurrentEffective35Min" />
+    <result column="harmonic_current_effective_35_avg" jdbcType="FLOAT" property="harmonicCurrentEffective35Avg" />
+    <result column="harmonic_current_effective_35_95" jdbcType="FLOAT" property="harmonicCurrentEffective3595" />
+    <result column="harmonic_current_effective_36_max" jdbcType="FLOAT" property="harmonicCurrentEffective36Max" />
+    <result column="harmonic_current_effective_36_min" jdbcType="FLOAT" property="harmonicCurrentEffective36Min" />
+    <result column="harmonic_current_effective_36_avg" jdbcType="FLOAT" property="harmonicCurrentEffective36Avg" />
+    <result column="harmonic_current_effective_36_95" jdbcType="FLOAT" property="harmonicCurrentEffective3695" />
+    <result column="harmonic_current_effective_37_max" jdbcType="FLOAT" property="harmonicCurrentEffective37Max" />
+    <result column="harmonic_current_effective_37_min" jdbcType="FLOAT" property="harmonicCurrentEffective37Min" />
+    <result column="harmonic_current_effective_37_avg" jdbcType="FLOAT" property="harmonicCurrentEffective37Avg" />
+    <result column="harmonic_current_effective_37_95" jdbcType="FLOAT" property="harmonicCurrentEffective3795" />
+    <result column="harmonic_current_effective_38_max" jdbcType="FLOAT" property="harmonicCurrentEffective38Max" />
+    <result column="harmonic_current_effective_38_min" jdbcType="FLOAT" property="harmonicCurrentEffective38Min" />
+    <result column="harmonic_current_effective_38_avg" jdbcType="FLOAT" property="harmonicCurrentEffective38Avg" />
+    <result column="harmonic_current_effective_38_95" jdbcType="FLOAT" property="harmonicCurrentEffective3895" />
+    <result column="harmonic_current_effective_39_max" jdbcType="FLOAT" property="harmonicCurrentEffective39Max" />
+    <result column="harmonic_current_effective_39_min" jdbcType="FLOAT" property="harmonicCurrentEffective39Min" />
+    <result column="harmonic_current_effective_39_avg" jdbcType="FLOAT" property="harmonicCurrentEffective39Avg" />
+    <result column="harmonic_current_effective_39_95" jdbcType="FLOAT" property="harmonicCurrentEffective3995" />
+    <result column="harmonic_current_effective_40_max" jdbcType="FLOAT" property="harmonicCurrentEffective40Max" />
+    <result column="harmonic_current_effective_40_min" jdbcType="FLOAT" property="harmonicCurrentEffective40Min" />
+    <result column="harmonic_current_effective_40_avg" jdbcType="FLOAT" property="harmonicCurrentEffective40Avg" />
+    <result column="harmonic_current_effective_40_95" jdbcType="FLOAT" property="harmonicCurrentEffective4095" />
+    <result column="harmonic_current_effective_41_max" jdbcType="FLOAT" property="harmonicCurrentEffective41Max" />
+    <result column="harmonic_current_effective_41_min" jdbcType="FLOAT" property="harmonicCurrentEffective41Min" />
+    <result column="harmonic_current_effective_41_avg" jdbcType="FLOAT" property="harmonicCurrentEffective41Avg" />
+    <result column="harmonic_current_effective_41_95" jdbcType="FLOAT" property="harmonicCurrentEffective4195" />
+    <result column="harmonic_current_effective_42_max" jdbcType="FLOAT" property="harmonicCurrentEffective42Max" />
+    <result column="harmonic_current_effective_42_min" jdbcType="FLOAT" property="harmonicCurrentEffective42Min" />
+    <result column="harmonic_current_effective_42_avg" jdbcType="FLOAT" property="harmonicCurrentEffective42Avg" />
+    <result column="harmonic_current_effective_42_95" jdbcType="FLOAT" property="harmonicCurrentEffective4295" />
+    <result column="harmonic_current_effective_43_max" jdbcType="FLOAT" property="harmonicCurrentEffective43Max" />
+    <result column="harmonic_current_effective_43_min" jdbcType="FLOAT" property="harmonicCurrentEffective43Min" />
+    <result column="harmonic_current_effective_43_avg" jdbcType="FLOAT" property="harmonicCurrentEffective43Avg" />
+    <result column="harmonic_current_effective_43_95" jdbcType="FLOAT" property="harmonicCurrentEffective4395" />
+    <result column="harmonic_current_effective_44_max" jdbcType="FLOAT" property="harmonicCurrentEffective44Max" />
+    <result column="harmonic_current_effective_44_min" jdbcType="FLOAT" property="harmonicCurrentEffective44Min" />
+    <result column="harmonic_current_effective_44_avg" jdbcType="FLOAT" property="harmonicCurrentEffective44Avg" />
+    <result column="harmonic_current_effective_44_95" jdbcType="FLOAT" property="harmonicCurrentEffective4495" />
+    <result column="harmonic_current_effective_45_max" jdbcType="FLOAT" property="harmonicCurrentEffective45Max" />
+    <result column="harmonic_current_effective_45_min" jdbcType="FLOAT" property="harmonicCurrentEffective45Min" />
+    <result column="harmonic_current_effective_45_avg" jdbcType="FLOAT" property="harmonicCurrentEffective45Avg" />
+    <result column="harmonic_current_effective_45_95" jdbcType="FLOAT" property="harmonicCurrentEffective4595" />
+    <result column="harmonic_current_effective_46_max" jdbcType="FLOAT" property="harmonicCurrentEffective46Max" />
+    <result column="harmonic_current_effective_46_min" jdbcType="FLOAT" property="harmonicCurrentEffective46Min" />
+    <result column="harmonic_current_effective_46_avg" jdbcType="FLOAT" property="harmonicCurrentEffective46Avg" />
+    <result column="harmonic_current_effective_46_95" jdbcType="FLOAT" property="harmonicCurrentEffective4695" />
+    <result column="harmonic_current_effective_47_max" jdbcType="FLOAT" property="harmonicCurrentEffective47Max" />
+    <result column="harmonic_current_effective_47_min" jdbcType="FLOAT" property="harmonicCurrentEffective47Min" />
+    <result column="harmonic_current_effective_47_avg" jdbcType="FLOAT" property="harmonicCurrentEffective47Avg" />
+    <result column="harmonic_current_effective_47_95" jdbcType="FLOAT" property="harmonicCurrentEffective4795" />
+    <result column="harmonic_current_effective_48_max" jdbcType="FLOAT" property="harmonicCurrentEffective48Max" />
+    <result column="harmonic_current_effective_48_min" jdbcType="FLOAT" property="harmonicCurrentEffective48Min" />
+    <result column="harmonic_current_effective_48_avg" jdbcType="FLOAT" property="harmonicCurrentEffective48Avg" />
+    <result column="harmonic_current_effective_48_95" jdbcType="FLOAT" property="harmonicCurrentEffective4895" />
+    <result column="harmonic_current_effective_49_max" jdbcType="FLOAT" property="harmonicCurrentEffective49Max" />
+    <result column="harmonic_current_effective_49_min" jdbcType="FLOAT" property="harmonicCurrentEffective49Min" />
+    <result column="harmonic_current_effective_49_avg" jdbcType="FLOAT" property="harmonicCurrentEffective49Avg" />
+    <result column="harmonic_current_effective_49_95" jdbcType="FLOAT" property="harmonicCurrentEffective4995" />
+    <result column="harmonic_current_effective_50_max" jdbcType="FLOAT" property="harmonicCurrentEffective50Max" />
+    <result column="harmonic_current_effective_50_min" jdbcType="FLOAT" property="harmonicCurrentEffective50Min" />
+    <result column="harmonic_current_effective_50_avg" jdbcType="FLOAT" property="harmonicCurrentEffective50Avg" />
+    <result column="harmonic_current_effective_50_95" jdbcType="FLOAT" property="harmonicCurrentEffective5095" />
+  </resultMap>
+  <sql id="Base_Column_List">
+    <!--@mbg.generated-->
+    measurement_point_id, data_date, phase, fundamental_current_max, fundamental_current_min, 
+    fundamental_current_avg, fundamental_current_95, harmonic_current_thd_max, harmonic_current_thd_min, 
+    harmonic_current_thd_avg, harmonic_current_thd_95, harmonic_current_effective_2_max, 
+    harmonic_current_effective_2_min, harmonic_current_effective_2_avg, harmonic_current_effective_2_95, 
+    harmonic_current_effective_3_max, harmonic_current_effective_3_min, harmonic_current_effective_3_avg, 
+    harmonic_current_effective_3_95, harmonic_current_effective_4_max, harmonic_current_effective_4_min, 
+    harmonic_current_effective_4_avg, harmonic_current_effective_4_95, harmonic_current_effective_5_max, 
+    harmonic_current_effective_5_min, harmonic_current_effective_5_avg, harmonic_current_effective_5_95, 
+    harmonic_current_effective_6_max, harmonic_current_effective_6_min, harmonic_current_effective_6_avg, 
+    harmonic_current_effective_6_95, harmonic_current_effective_7_max, harmonic_current_effective_7_min, 
+    harmonic_current_effective_7_avg, harmonic_current_effective_7_95, harmonic_current_effective_8_max, 
+    harmonic_current_effective_8_min, harmonic_current_effective_8_avg, harmonic_current_effective_8_95, 
+    harmonic_current_effective_9_max, harmonic_current_effective_9_min, harmonic_current_effective_9_avg, 
+    harmonic_current_effective_9_95, harmonic_current_effective_10_max, harmonic_current_effective_10_min, 
+    harmonic_current_effective_10_avg, harmonic_current_effective_10_95, harmonic_current_effective_11_max, 
+    harmonic_current_effective_11_min, harmonic_current_effective_11_avg, harmonic_current_effective_11_95, 
+    harmonic_current_effective_12_max, harmonic_current_effective_12_min, harmonic_current_effective_12_avg, 
+    harmonic_current_effective_12_95, harmonic_current_effective_13_max, harmonic_current_effective_13_min, 
+    harmonic_current_effective_13_avg, harmonic_current_effective_13_95, harmonic_current_effective_14_max, 
+    harmonic_current_effective_14_min, harmonic_current_effective_14_avg, harmonic_current_effective_14_95, 
+    harmonic_current_effective_15_max, harmonic_current_effective_15_min, harmonic_current_effective_15_avg, 
+    harmonic_current_effective_15_95, harmonic_current_effective_16_max, harmonic_current_effective_16_min, 
+    harmonic_current_effective_16_avg, harmonic_current_effective_16_95, harmonic_current_effective_17_max, 
+    harmonic_current_effective_17_min, harmonic_current_effective_17_avg, harmonic_current_effective_17_95, 
+    harmonic_current_effective_18_max, harmonic_current_effective_18_min, harmonic_current_effective_18_avg, 
+    harmonic_current_effective_18_95, harmonic_current_effective_19_max, harmonic_current_effective_19_min, 
+    harmonic_current_effective_19_avg, harmonic_current_effective_19_95, harmonic_current_effective_20_max, 
+    harmonic_current_effective_20_min, harmonic_current_effective_20_avg, harmonic_current_effective_20_95, 
+    harmonic_current_effective_21_max, harmonic_current_effective_21_min, harmonic_current_effective_21_avg, 
+    harmonic_current_effective_21_95, harmonic_current_effective_22_max, harmonic_current_effective_22_min, 
+    harmonic_current_effective_22_avg, harmonic_current_effective_22_95, harmonic_current_effective_23_max, 
+    harmonic_current_effective_23_min, harmonic_current_effective_23_avg, harmonic_current_effective_23_95, 
+    harmonic_current_effective_24_max, harmonic_current_effective_24_min, harmonic_current_effective_24_avg, 
+    harmonic_current_effective_24_95, harmonic_current_effective_25_max, harmonic_current_effective_25_min, 
+    harmonic_current_effective_25_avg, harmonic_current_effective_25_95, harmonic_current_effective_26_max, 
+    harmonic_current_effective_26_min, harmonic_current_effective_26_avg, harmonic_current_effective_26_95, 
+    harmonic_current_effective_27_max, harmonic_current_effective_27_min, harmonic_current_effective_27_avg, 
+    harmonic_current_effective_27_95, harmonic_current_effective_28_max, harmonic_current_effective_28_min, 
+    harmonic_current_effective_28_avg, harmonic_current_effective_28_95, harmonic_current_effective_29_max, 
+    harmonic_current_effective_29_min, harmonic_current_effective_29_avg, harmonic_current_effective_29_95, 
+    harmonic_current_effective_30_max, harmonic_current_effective_30_min, harmonic_current_effective_30_avg, 
+    harmonic_current_effective_30_95, harmonic_current_effective_31_max, harmonic_current_effective_31_min, 
+    harmonic_current_effective_31_avg, harmonic_current_effective_31_95, harmonic_current_effective_32_max, 
+    harmonic_current_effective_32_min, harmonic_current_effective_32_avg, harmonic_current_effective_32_95, 
+    harmonic_current_effective_33_max, harmonic_current_effective_33_min, harmonic_current_effective_33_avg, 
+    harmonic_current_effective_33_95, harmonic_current_effective_34_max, harmonic_current_effective_34_min, 
+    harmonic_current_effective_34_avg, harmonic_current_effective_34_95, harmonic_current_effective_35_max, 
+    harmonic_current_effective_35_min, harmonic_current_effective_35_avg, harmonic_current_effective_35_95, 
+    harmonic_current_effective_36_max, harmonic_current_effective_36_min, harmonic_current_effective_36_avg, 
+    harmonic_current_effective_36_95, harmonic_current_effective_37_max, harmonic_current_effective_37_min, 
+    harmonic_current_effective_37_avg, harmonic_current_effective_37_95, harmonic_current_effective_38_max, 
+    harmonic_current_effective_38_min, harmonic_current_effective_38_avg, harmonic_current_effective_38_95, 
+    harmonic_current_effective_39_max, harmonic_current_effective_39_min, harmonic_current_effective_39_avg, 
+    harmonic_current_effective_39_95, harmonic_current_effective_40_max, harmonic_current_effective_40_min, 
+    harmonic_current_effective_40_avg, harmonic_current_effective_40_95, harmonic_current_effective_41_max, 
+    harmonic_current_effective_41_min, harmonic_current_effective_41_avg, harmonic_current_effective_41_95, 
+    harmonic_current_effective_42_max, harmonic_current_effective_42_min, harmonic_current_effective_42_avg, 
+    harmonic_current_effective_42_95, harmonic_current_effective_43_max, harmonic_current_effective_43_min, 
+    harmonic_current_effective_43_avg, harmonic_current_effective_43_95, harmonic_current_effective_44_max, 
+    harmonic_current_effective_44_min, harmonic_current_effective_44_avg, harmonic_current_effective_44_95, 
+    harmonic_current_effective_45_max, harmonic_current_effective_45_min, harmonic_current_effective_45_avg, 
+    harmonic_current_effective_45_95, harmonic_current_effective_46_max, harmonic_current_effective_46_min, 
+    harmonic_current_effective_46_avg, harmonic_current_effective_46_95, harmonic_current_effective_47_max, 
+    harmonic_current_effective_47_min, harmonic_current_effective_47_avg, harmonic_current_effective_47_95, 
+    harmonic_current_effective_48_max, harmonic_current_effective_48_min, harmonic_current_effective_48_avg, 
+    harmonic_current_effective_48_95, harmonic_current_effective_49_max, harmonic_current_effective_49_min, 
+    harmonic_current_effective_49_avg, harmonic_current_effective_49_95, harmonic_current_effective_50_max, 
+    harmonic_current_effective_50_min, harmonic_current_effective_50_avg, harmonic_current_effective_50_95
+  </sql>
+</mapper>
\ No newline at end of file
diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/mapping/RMpHarmonicIRateReportDPOMapper.xml b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/mapping/RMpHarmonicIRateReportDPOMapper.xml
new file mode 100644
index 000000000..c2a57f9eb
--- /dev/null
+++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/mapping/RMpHarmonicIRateReportDPOMapper.xml
@@ -0,0 +1,235 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.njcn.prepare.harmonic.mapper.line.RMpHarmonicIRateReportDPOMapper">
+  <resultMap id="BaseResultMap" type="com.njcn.prepare.harmonic.pojo.po.line.RMpHarmonicIRateReportDPO">
+    <!--@mbg.generated-->
+    <!--@Table r_mp_harmonic_i_rate_report_d-->
+    <id column="measurement_point_id" jdbcType="VARCHAR" property="measurementPointId" />
+    <id column="data_date" jdbcType="DATE" property="dataDate" />
+    <id column="phase" jdbcType="VARCHAR" property="phase" />
+    <result column="i_2_max" jdbcType="FLOAT" property="i2Max" />
+    <result column="i_2_min" jdbcType="FLOAT" property="i2Min" />
+    <result column="i_2_avg" jdbcType="FLOAT" property="i2Avg" />
+    <result column="i_2_cp95" jdbcType="FLOAT" property="i2Cp95" />
+    <result column="i_3_max" jdbcType="FLOAT" property="i3Max" />
+    <result column="i_3_min" jdbcType="FLOAT" property="i3Min" />
+    <result column="i_3_avg" jdbcType="FLOAT" property="i3Avg" />
+    <result column="i_3_cp95" jdbcType="FLOAT" property="i3Cp95" />
+    <result column="i_4_max" jdbcType="FLOAT" property="i4Max" />
+    <result column="i_4_min" jdbcType="FLOAT" property="i4Min" />
+    <result column="i_4_avg" jdbcType="FLOAT" property="i4Avg" />
+    <result column="i_4_cp95" jdbcType="FLOAT" property="i4Cp95" />
+    <result column="i_5_max" jdbcType="FLOAT" property="i5Max" />
+    <result column="i_5_min" jdbcType="FLOAT" property="i5Min" />
+    <result column="i_5_avg" jdbcType="FLOAT" property="i5Avg" />
+    <result column="i_5_cp95" jdbcType="FLOAT" property="i5Cp95" />
+    <result column="i_6_max" jdbcType="FLOAT" property="i6Max" />
+    <result column="i_6_min" jdbcType="FLOAT" property="i6Min" />
+    <result column="i_6_avg" jdbcType="FLOAT" property="i6Avg" />
+    <result column="i_6_cp95" jdbcType="FLOAT" property="i6Cp95" />
+    <result column="i_7_max" jdbcType="FLOAT" property="i7Max" />
+    <result column="i_7_min" jdbcType="FLOAT" property="i7Min" />
+    <result column="i_7_avg" jdbcType="FLOAT" property="i7Avg" />
+    <result column="i_7_cp95" jdbcType="FLOAT" property="i7Cp95" />
+    <result column="i_8_max" jdbcType="FLOAT" property="i8Max" />
+    <result column="i_8_min" jdbcType="FLOAT" property="i8Min" />
+    <result column="i_8_avg" jdbcType="FLOAT" property="i8Avg" />
+    <result column="i_8_cp95" jdbcType="FLOAT" property="i8Cp95" />
+    <result column="i_9_max" jdbcType="FLOAT" property="i9Max" />
+    <result column="i_9_min" jdbcType="FLOAT" property="i9Min" />
+    <result column="i_9_avg" jdbcType="FLOAT" property="i9Avg" />
+    <result column="i_9_cp95" jdbcType="FLOAT" property="i9Cp95" />
+    <result column="i_10_max" jdbcType="FLOAT" property="i10Max" />
+    <result column="i_10_min" jdbcType="FLOAT" property="i10Min" />
+    <result column="i_10_avg" jdbcType="FLOAT" property="i10Avg" />
+    <result column="i_10_cp95" jdbcType="FLOAT" property="i10Cp95" />
+    <result column="i_11_max" jdbcType="FLOAT" property="i11Max" />
+    <result column="i_11_min" jdbcType="FLOAT" property="i11Min" />
+    <result column="i_11_avg" jdbcType="FLOAT" property="i11Avg" />
+    <result column="i_11_cp95" jdbcType="FLOAT" property="i11Cp95" />
+    <result column="i_12_max" jdbcType="FLOAT" property="i12Max" />
+    <result column="i_12_min" jdbcType="FLOAT" property="i12Min" />
+    <result column="i_12_avg" jdbcType="FLOAT" property="i12Avg" />
+    <result column="i_12_cp95" jdbcType="FLOAT" property="i12Cp95" />
+    <result column="i_13_max" jdbcType="FLOAT" property="i13Max" />
+    <result column="i_13_min" jdbcType="FLOAT" property="i13Min" />
+    <result column="i_13_avg" jdbcType="FLOAT" property="i13Avg" />
+    <result column="i_13_cp95" jdbcType="FLOAT" property="i13Cp95" />
+    <result column="i_14_max" jdbcType="FLOAT" property="i14Max" />
+    <result column="i_14_min" jdbcType="FLOAT" property="i14Min" />
+    <result column="i_14_avg" jdbcType="FLOAT" property="i14Avg" />
+    <result column="i_14_cp95" jdbcType="FLOAT" property="i14Cp95" />
+    <result column="i_15_max" jdbcType="FLOAT" property="i15Max" />
+    <result column="i_15_min" jdbcType="FLOAT" property="i15Min" />
+    <result column="i_15_avg" jdbcType="FLOAT" property="i15Avg" />
+    <result column="i_15_cp95" jdbcType="FLOAT" property="i15Cp95" />
+    <result column="i_16_max" jdbcType="FLOAT" property="i16Max" />
+    <result column="i_16_min" jdbcType="FLOAT" property="i16Min" />
+    <result column="i_16_avg" jdbcType="FLOAT" property="i16Avg" />
+    <result column="i_16_cp95" jdbcType="FLOAT" property="i16Cp95" />
+    <result column="i_17_max" jdbcType="FLOAT" property="i17Max" />
+    <result column="i_17_min" jdbcType="FLOAT" property="i17Min" />
+    <result column="i_17_avg" jdbcType="FLOAT" property="i17Avg" />
+    <result column="i_17_cp95" jdbcType="FLOAT" property="i17Cp95" />
+    <result column="i_18_max" jdbcType="FLOAT" property="i18Max" />
+    <result column="i_18_min" jdbcType="FLOAT" property="i18Min" />
+    <result column="i_18_avg" jdbcType="FLOAT" property="i18Avg" />
+    <result column="i_18_cp95" jdbcType="FLOAT" property="i18Cp95" />
+    <result column="i_19_max" jdbcType="FLOAT" property="i19Max" />
+    <result column="i_19_min" jdbcType="FLOAT" property="i19Min" />
+    <result column="i_19_avg" jdbcType="FLOAT" property="i19Avg" />
+    <result column="i_19_cp95" jdbcType="FLOAT" property="i19Cp95" />
+    <result column="i_20_max" jdbcType="FLOAT" property="i20Max" />
+    <result column="i_20_min" jdbcType="FLOAT" property="i20Min" />
+    <result column="i_20_avg" jdbcType="FLOAT" property="i20Avg" />
+    <result column="i_20_cp95" jdbcType="FLOAT" property="i20Cp95" />
+    <result column="i_21_max" jdbcType="FLOAT" property="i21Max" />
+    <result column="i_21_min" jdbcType="FLOAT" property="i21Min" />
+    <result column="i_21_avg" jdbcType="FLOAT" property="i21Avg" />
+    <result column="i_21_cp95" jdbcType="FLOAT" property="i21Cp95" />
+    <result column="i_22_max" jdbcType="FLOAT" property="i22Max" />
+    <result column="i_22_min" jdbcType="FLOAT" property="i22Min" />
+    <result column="i_22_avg" jdbcType="FLOAT" property="i22Avg" />
+    <result column="i_22_cp95" jdbcType="FLOAT" property="i22Cp95" />
+    <result column="i_23_max" jdbcType="FLOAT" property="i23Max" />
+    <result column="i_23_min" jdbcType="FLOAT" property="i23Min" />
+    <result column="i_23_avg" jdbcType="FLOAT" property="i23Avg" />
+    <result column="i_23_cp95" jdbcType="FLOAT" property="i23Cp95" />
+    <result column="i_24_max" jdbcType="FLOAT" property="i24Max" />
+    <result column="i_24_min" jdbcType="FLOAT" property="i24Min" />
+    <result column="i_24_avg" jdbcType="FLOAT" property="i24Avg" />
+    <result column="i_24_cp95" jdbcType="FLOAT" property="i24Cp95" />
+    <result column="i_25_max" jdbcType="FLOAT" property="i25Max" />
+    <result column="i_25_min" jdbcType="FLOAT" property="i25Min" />
+    <result column="i_25_avg" jdbcType="FLOAT" property="i25Avg" />
+    <result column="i_25_cp95" jdbcType="FLOAT" property="i25Cp95" />
+    <result column="i_26_max" jdbcType="FLOAT" property="i26Max" />
+    <result column="i_26_min" jdbcType="FLOAT" property="i26Min" />
+    <result column="i_26_avg" jdbcType="FLOAT" property="i26Avg" />
+    <result column="i_26_cp95" jdbcType="FLOAT" property="i26Cp95" />
+    <result column="i_27_max" jdbcType="FLOAT" property="i27Max" />
+    <result column="i_27_min" jdbcType="FLOAT" property="i27Min" />
+    <result column="i_27_avg" jdbcType="FLOAT" property="i27Avg" />
+    <result column="i_27_cp95" jdbcType="FLOAT" property="i27Cp95" />
+    <result column="i_28_max" jdbcType="FLOAT" property="i28Max" />
+    <result column="i_28_min" jdbcType="FLOAT" property="i28Min" />
+    <result column="i_28_avg" jdbcType="FLOAT" property="i28Avg" />
+    <result column="i_28_cp95" jdbcType="FLOAT" property="i28Cp95" />
+    <result column="i_29_max" jdbcType="FLOAT" property="i29Max" />
+    <result column="i_29_min" jdbcType="FLOAT" property="i29Min" />
+    <result column="i_29_avg" jdbcType="FLOAT" property="i29Avg" />
+    <result column="i_29_cp95" jdbcType="FLOAT" property="i29Cp95" />
+    <result column="i_30_max" jdbcType="FLOAT" property="i30Max" />
+    <result column="i_30_min" jdbcType="FLOAT" property="i30Min" />
+    <result column="i_30_avg" jdbcType="FLOAT" property="i30Avg" />
+    <result column="i_30_cp95" jdbcType="FLOAT" property="i30Cp95" />
+    <result column="i_31_max" jdbcType="FLOAT" property="i31Max" />
+    <result column="i_31_min" jdbcType="FLOAT" property="i31Min" />
+    <result column="i_31_avg" jdbcType="FLOAT" property="i31Avg" />
+    <result column="i_31_cp95" jdbcType="FLOAT" property="i31Cp95" />
+    <result column="i_32_max" jdbcType="FLOAT" property="i32Max" />
+    <result column="i_32_min" jdbcType="FLOAT" property="i32Min" />
+    <result column="i_32_avg" jdbcType="FLOAT" property="i32Avg" />
+    <result column="i_32_cp95" jdbcType="FLOAT" property="i32Cp95" />
+    <result column="i_33_max" jdbcType="FLOAT" property="i33Max" />
+    <result column="i_33_min" jdbcType="FLOAT" property="i33Min" />
+    <result column="i_33_avg" jdbcType="FLOAT" property="i33Avg" />
+    <result column="i_33_cp95" jdbcType="FLOAT" property="i33Cp95" />
+    <result column="i_34_max" jdbcType="FLOAT" property="i34Max" />
+    <result column="i_34_min" jdbcType="FLOAT" property="i34Min" />
+    <result column="i_34_avg" jdbcType="FLOAT" property="i34Avg" />
+    <result column="i_34_cp95" jdbcType="FLOAT" property="i34Cp95" />
+    <result column="i_35_max" jdbcType="FLOAT" property="i35Max" />
+    <result column="i_35_min" jdbcType="FLOAT" property="i35Min" />
+    <result column="i_35_avg" jdbcType="FLOAT" property="i35Avg" />
+    <result column="i_35_cp95" jdbcType="FLOAT" property="i35Cp95" />
+    <result column="i_36_max" jdbcType="FLOAT" property="i36Max" />
+    <result column="i_36_min" jdbcType="FLOAT" property="i36Min" />
+    <result column="i_36_avg" jdbcType="FLOAT" property="i36Avg" />
+    <result column="i_36_cp95" jdbcType="FLOAT" property="i36Cp95" />
+    <result column="i_37_max" jdbcType="FLOAT" property="i37Max" />
+    <result column="i_37_min" jdbcType="FLOAT" property="i37Min" />
+    <result column="i_37_avg" jdbcType="FLOAT" property="i37Avg" />
+    <result column="i_37_cp95" jdbcType="FLOAT" property="i37Cp95" />
+    <result column="i_38_max" jdbcType="FLOAT" property="i38Max" />
+    <result column="i_38_min" jdbcType="FLOAT" property="i38Min" />
+    <result column="i_38_avg" jdbcType="FLOAT" property="i38Avg" />
+    <result column="i_38_cp95" jdbcType="FLOAT" property="i38Cp95" />
+    <result column="i_39_max" jdbcType="FLOAT" property="i39Max" />
+    <result column="i_39_min" jdbcType="FLOAT" property="i39Min" />
+    <result column="i_39_avg" jdbcType="FLOAT" property="i39Avg" />
+    <result column="i_39_cp95" jdbcType="FLOAT" property="i39Cp95" />
+    <result column="i_40_max" jdbcType="FLOAT" property="i40Max" />
+    <result column="i_40_min" jdbcType="FLOAT" property="i40Min" />
+    <result column="i_40_avg" jdbcType="FLOAT" property="i40Avg" />
+    <result column="i_40_cp95" jdbcType="FLOAT" property="i40Cp95" />
+    <result column="i_41_max" jdbcType="FLOAT" property="i41Max" />
+    <result column="i_41_min" jdbcType="FLOAT" property="i41Min" />
+    <result column="i_41_avg" jdbcType="FLOAT" property="i41Avg" />
+    <result column="i_41_cp95" jdbcType="FLOAT" property="i41Cp95" />
+    <result column="i_42_max" jdbcType="FLOAT" property="i42Max" />
+    <result column="i_42_min" jdbcType="FLOAT" property="i42Min" />
+    <result column="i_42_avg" jdbcType="FLOAT" property="i42Avg" />
+    <result column="i_42_cp95" jdbcType="FLOAT" property="i42Cp95" />
+    <result column="i_43_max" jdbcType="FLOAT" property="i43Max" />
+    <result column="i_43_min" jdbcType="FLOAT" property="i43Min" />
+    <result column="i_43_avg" jdbcType="FLOAT" property="i43Avg" />
+    <result column="i_43_cp95" jdbcType="FLOAT" property="i43Cp95" />
+    <result column="i_44_max" jdbcType="FLOAT" property="i44Max" />
+    <result column="i_44_min" jdbcType="FLOAT" property="i44Min" />
+    <result column="i_44_avg" jdbcType="FLOAT" property="i44Avg" />
+    <result column="i_44_cp95" jdbcType="FLOAT" property="i44Cp95" />
+    <result column="i_45_max" jdbcType="FLOAT" property="i45Max" />
+    <result column="i_45_min" jdbcType="FLOAT" property="i45Min" />
+    <result column="i_45_avg" jdbcType="FLOAT" property="i45Avg" />
+    <result column="i_45_cp95" jdbcType="FLOAT" property="i45Cp95" />
+    <result column="i_46_max" jdbcType="FLOAT" property="i46Max" />
+    <result column="i_46_min" jdbcType="FLOAT" property="i46Min" />
+    <result column="i_46_avg" jdbcType="FLOAT" property="i46Avg" />
+    <result column="i_46_cp95" jdbcType="FLOAT" property="i46Cp95" />
+    <result column="i_47_max" jdbcType="FLOAT" property="i47Max" />
+    <result column="i_47_min" jdbcType="FLOAT" property="i47Min" />
+    <result column="i_47_avg" jdbcType="FLOAT" property="i47Avg" />
+    <result column="i_47_cp95" jdbcType="FLOAT" property="i47Cp95" />
+    <result column="i_48_max" jdbcType="FLOAT" property="i48Max" />
+    <result column="i_48_min" jdbcType="FLOAT" property="i48Min" />
+    <result column="i_48_avg" jdbcType="FLOAT" property="i48Avg" />
+    <result column="i_48_cp95" jdbcType="FLOAT" property="i48Cp95" />
+    <result column="i_49_max" jdbcType="FLOAT" property="i49Max" />
+    <result column="i_49_min" jdbcType="FLOAT" property="i49Min" />
+    <result column="i_49_avg" jdbcType="FLOAT" property="i49Avg" />
+    <result column="i_49_cp95" jdbcType="FLOAT" property="i49Cp95" />
+    <result column="i_50_max" jdbcType="FLOAT" property="i50Max" />
+    <result column="i_50_min" jdbcType="FLOAT" property="i50Min" />
+    <result column="i_50_avg" jdbcType="FLOAT" property="i50Avg" />
+    <result column="i_50_cp95" jdbcType="FLOAT" property="i50Cp95" />
+  </resultMap>
+  <sql id="Base_Column_List">
+    <!--@mbg.generated-->
+    measurement_point_id, data_date, phase, i_2_max, i_2_min, i_2_avg, i_2_cp95, i_3_max, 
+    i_3_min, i_3_avg, i_3_cp95, i_4_max, i_4_min, i_4_avg, i_4_cp95, i_5_max, i_5_min, 
+    i_5_avg, i_5_cp95, i_6_max, i_6_min, i_6_avg, i_6_cp95, i_7_max, i_7_min, i_7_avg, 
+    i_7_cp95, i_8_max, i_8_min, i_8_avg, i_8_cp95, i_9_max, i_9_min, i_9_avg, i_9_cp95, 
+    i_10_max, i_10_min, i_10_avg, i_10_cp95, i_11_max, i_11_min, i_11_avg, i_11_cp95, 
+    i_12_max, i_12_min, i_12_avg, i_12_cp95, i_13_max, i_13_min, i_13_avg, i_13_cp95, 
+    i_14_max, i_14_min, i_14_avg, i_14_cp95, i_15_max, i_15_min, i_15_avg, i_15_cp95, 
+    i_16_max, i_16_min, i_16_avg, i_16_cp95, i_17_max, i_17_min, i_17_avg, i_17_cp95, 
+    i_18_max, i_18_min, i_18_avg, i_18_cp95, i_19_max, i_19_min, i_19_avg, i_19_cp95, 
+    i_20_max, i_20_min, i_20_avg, i_20_cp95, i_21_max, i_21_min, i_21_avg, i_21_cp95, 
+    i_22_max, i_22_min, i_22_avg, i_22_cp95, i_23_max, i_23_min, i_23_avg, i_23_cp95, 
+    i_24_max, i_24_min, i_24_avg, i_24_cp95, i_25_max, i_25_min, i_25_avg, i_25_cp95, 
+    i_26_max, i_26_min, i_26_avg, i_26_cp95, i_27_max, i_27_min, i_27_avg, i_27_cp95, 
+    i_28_max, i_28_min, i_28_avg, i_28_cp95, i_29_max, i_29_min, i_29_avg, i_29_cp95, 
+    i_30_max, i_30_min, i_30_avg, i_30_cp95, i_31_max, i_31_min, i_31_avg, i_31_cp95, 
+    i_32_max, i_32_min, i_32_avg, i_32_cp95, i_33_max, i_33_min, i_33_avg, i_33_cp95, 
+    i_34_max, i_34_min, i_34_avg, i_34_cp95, i_35_max, i_35_min, i_35_avg, i_35_cp95, 
+    i_36_max, i_36_min, i_36_avg, i_36_cp95, i_37_max, i_37_min, i_37_avg, i_37_cp95, 
+    i_38_max, i_38_min, i_38_avg, i_38_cp95, i_39_max, i_39_min, i_39_avg, i_39_cp95, 
+    i_40_max, i_40_min, i_40_avg, i_40_cp95, i_41_max, i_41_min, i_41_avg, i_41_cp95, 
+    i_42_max, i_42_min, i_42_avg, i_42_cp95, i_43_max, i_43_min, i_43_avg, i_43_cp95, 
+    i_44_max, i_44_min, i_44_avg, i_44_cp95, i_45_max, i_45_min, i_45_avg, i_45_cp95, 
+    i_46_max, i_46_min, i_46_avg, i_46_cp95, i_47_max, i_47_min, i_47_avg, i_47_cp95, 
+    i_48_max, i_48_min, i_48_avg, i_48_cp95, i_49_max, i_49_min, i_49_avg, i_49_cp95, 
+    i_50_max, i_50_min, i_50_avg, i_50_cp95
+  </sql>
+</mapper>
\ No newline at end of file
diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/mapping/RMpHarmonicPReportDPOMapper.xml b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/mapping/RMpHarmonicPReportDPOMapper.xml
new file mode 100644
index 000000000..83e258f3b
--- /dev/null
+++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/mapping/RMpHarmonicPReportDPOMapper.xml
@@ -0,0 +1,287 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.njcn.prepare.harmonic.mapper.line.RMpHarmonicPReportDPOMapper">
+  <resultMap id="BaseResultMap" type="com.njcn.prepare.harmonic.pojo.po.line.RMpHarmonicPReportDPO">
+    <!--@mbg.generated-->
+    <!--@Table r_mp_harmonic_p_report_d-->
+    <id column="measurement_point_id" jdbcType="VARCHAR" property="measurementPointId" />
+    <id column="data_date" jdbcType="DATE" property="dataDate" />
+    <id column="phase" jdbcType="VARCHAR" property="phase" />
+    <result column="FUNDAMENTAL_RATEOFWORK_MAX" jdbcType="FLOAT" property="fundamentalRateofworkMax" />
+    <result column="FUNDAMENTAL_RATEOFWORK_Min" jdbcType="FLOAT" property="fundamentalRateofworkMin" />
+    <result column="FUNDAMENTAL_RATEOFWORK_avg" jdbcType="FLOAT" property="fundamentalRateofworkAvg" />
+    <result column="FUNDAMENTAL_RATEOFWORK_95" jdbcType="FLOAT" property="fundamentalRateofwork95" />
+    <result column="FUNDAMENTAL_ACTIVE_POWER_MAX" jdbcType="FLOAT" property="fundamentalActivePowerMax" />
+    <result column="FUNDAMENTAL_ACTIVE_POWER_Min" jdbcType="FLOAT" property="fundamentalActivePowerMin" />
+    <result column="FUNDAMENTAL_ACTIVE_POWER_avg" jdbcType="FLOAT" property="fundamentalActivePowerAvg" />
+    <result column="FUNDAMENTAL_ACTIVE_POWER_95" jdbcType="FLOAT" property="fundamentalActivePower95" />
+    <result column="HARMONIC_ACTIVE_POWER_2_MAX" jdbcType="FLOAT" property="harmonicActivePower2Max" />
+    <result column="HARMONIC_ACTIVE_POWER_2_MIN" jdbcType="FLOAT" property="harmonicActivePower2Min" />
+    <result column="HARMONIC_ACTIVE_POWER_2_AVG" jdbcType="FLOAT" property="harmonicActivePower2Avg" />
+    <result column="HARMONIC_ACTIVE_POWER_2_95" jdbcType="FLOAT" property="harmonicActivePower295" />
+    <result column="HARMONIC_ACTIVE_POWER_3_MAX" jdbcType="FLOAT" property="harmonicActivePower3Max" />
+    <result column="HARMONIC_ACTIVE_POWER_3_MIN" jdbcType="FLOAT" property="harmonicActivePower3Min" />
+    <result column="HARMONIC_ACTIVE_POWER_3_AVG" jdbcType="FLOAT" property="harmonicActivePower3Avg" />
+    <result column="HARMONIC_ACTIVE_POWER_3_95" jdbcType="FLOAT" property="harmonicActivePower395" />
+    <result column="HARMONIC_ACTIVE_POWER_4_MAX" jdbcType="FLOAT" property="harmonicActivePower4Max" />
+    <result column="HARMONIC_ACTIVE_POWER_4_MIN" jdbcType="FLOAT" property="harmonicActivePower4Min" />
+    <result column="HARMONIC_ACTIVE_POWER_4_AVG" jdbcType="FLOAT" property="harmonicActivePower4Avg" />
+    <result column="HARMONIC_ACTIVE_POWER_4_95" jdbcType="FLOAT" property="harmonicActivePower495" />
+    <result column="HARMONIC_ACTIVE_POWER_5_MAX" jdbcType="FLOAT" property="harmonicActivePower5Max" />
+    <result column="HARMONIC_ACTIVE_POWER_5_MIN" jdbcType="FLOAT" property="harmonicActivePower5Min" />
+    <result column="HARMONIC_ACTIVE_POWER_5_AVG" jdbcType="FLOAT" property="harmonicActivePower5Avg" />
+    <result column="HARMONIC_ACTIVE_POWER_5_95" jdbcType="FLOAT" property="harmonicActivePower595" />
+    <result column="HARMONIC_ACTIVE_POWER_6_MAX" jdbcType="FLOAT" property="harmonicActivePower6Max" />
+    <result column="HARMONIC_ACTIVE_POWER_6_MIN" jdbcType="FLOAT" property="harmonicActivePower6Min" />
+    <result column="HARMONIC_ACTIVE_POWER_6_AVG" jdbcType="FLOAT" property="harmonicActivePower6Avg" />
+    <result column="HARMONIC_ACTIVE_POWER_6_95" jdbcType="FLOAT" property="harmonicActivePower695" />
+    <result column="HARMONIC_ACTIVE_POWER_7_MAX" jdbcType="FLOAT" property="harmonicActivePower7Max" />
+    <result column="HARMONIC_ACTIVE_POWER_7_MIN" jdbcType="FLOAT" property="harmonicActivePower7Min" />
+    <result column="HARMONIC_ACTIVE_POWER_7_AVG" jdbcType="FLOAT" property="harmonicActivePower7Avg" />
+    <result column="HARMONIC_ACTIVE_POWER_7_95" jdbcType="FLOAT" property="harmonicActivePower795" />
+    <result column="HARMONIC_ACTIVE_POWER_8_MAX" jdbcType="FLOAT" property="harmonicActivePower8Max" />
+    <result column="HARMONIC_ACTIVE_POWER_8_MIN" jdbcType="FLOAT" property="harmonicActivePower8Min" />
+    <result column="HARMONIC_ACTIVE_POWER_8_AVG" jdbcType="FLOAT" property="harmonicActivePower8Avg" />
+    <result column="HARMONIC_ACTIVE_POWER_8_95" jdbcType="FLOAT" property="harmonicActivePower895" />
+    <result column="HARMONIC_ACTIVE_POWER_9_MAX" jdbcType="FLOAT" property="harmonicActivePower9Max" />
+    <result column="HARMONIC_ACTIVE_POWER_9_MIN" jdbcType="FLOAT" property="harmonicActivePower9Min" />
+    <result column="HARMONIC_ACTIVE_POWER_9_AVG" jdbcType="FLOAT" property="harmonicActivePower9Avg" />
+    <result column="HARMONIC_ACTIVE_POWER_9_95" jdbcType="FLOAT" property="harmonicActivePower995" />
+    <result column="HARMONIC_ACTIVE_POWER_10_MAX" jdbcType="FLOAT" property="harmonicActivePower10Max" />
+    <result column="HARMONIC_ACTIVE_POWER_10_MIN" jdbcType="FLOAT" property="harmonicActivePower10Min" />
+    <result column="HARMONIC_ACTIVE_POWER_10_AVG" jdbcType="FLOAT" property="harmonicActivePower10Avg" />
+    <result column="HARMONIC_ACTIVE_POWER_10_95" jdbcType="FLOAT" property="harmonicActivePower1095" />
+    <result column="HARMONIC_ACTIVE_POWER_11_MAX" jdbcType="FLOAT" property="harmonicActivePower11Max" />
+    <result column="HARMONIC_ACTIVE_POWER_11_MIN" jdbcType="FLOAT" property="harmonicActivePower11Min" />
+    <result column="HARMONIC_ACTIVE_POWER_11_AVG" jdbcType="FLOAT" property="harmonicActivePower11Avg" />
+    <result column="HARMONIC_ACTIVE_POWER_11_95" jdbcType="FLOAT" property="harmonicActivePower1195" />
+    <result column="HARMONIC_ACTIVE_POWER_12_MAX" jdbcType="FLOAT" property="harmonicActivePower12Max" />
+    <result column="HARMONIC_ACTIVE_POWER_12_MIN" jdbcType="FLOAT" property="harmonicActivePower12Min" />
+    <result column="HARMONIC_ACTIVE_POWER_12_AVG" jdbcType="FLOAT" property="harmonicActivePower12Avg" />
+    <result column="HARMONIC_ACTIVE_POWER_12_95" jdbcType="FLOAT" property="harmonicActivePower1295" />
+    <result column="HARMONIC_ACTIVE_POWER_13_MAX" jdbcType="FLOAT" property="harmonicActivePower13Max" />
+    <result column="HARMONIC_ACTIVE_POWER_13_MIN" jdbcType="FLOAT" property="harmonicActivePower13Min" />
+    <result column="HARMONIC_ACTIVE_POWER_13_AVG" jdbcType="FLOAT" property="harmonicActivePower13Avg" />
+    <result column="HARMONIC_ACTIVE_POWER_13_95" jdbcType="FLOAT" property="harmonicActivePower1395" />
+    <result column="HARMONIC_ACTIVE_POWER_14_MAX" jdbcType="FLOAT" property="harmonicActivePower14Max" />
+    <result column="HARMONIC_ACTIVE_POWER_14_MIN" jdbcType="FLOAT" property="harmonicActivePower14Min" />
+    <result column="HARMONIC_ACTIVE_POWER_14_AVG" jdbcType="FLOAT" property="harmonicActivePower14Avg" />
+    <result column="HARMONIC_ACTIVE_POWER_14_95" jdbcType="FLOAT" property="harmonicActivePower1495" />
+    <result column="HARMONIC_ACTIVE_POWER_15_MAX" jdbcType="FLOAT" property="harmonicActivePower15Max" />
+    <result column="HARMONIC_ACTIVE_POWER_15_MIN" jdbcType="FLOAT" property="harmonicActivePower15Min" />
+    <result column="HARMONIC_ACTIVE_POWER_15_AVG" jdbcType="FLOAT" property="harmonicActivePower15Avg" />
+    <result column="HARMONIC_ACTIVE_POWER_15_95" jdbcType="FLOAT" property="harmonicActivePower1595" />
+    <result column="HARMONIC_ACTIVE_POWER_16_MAX" jdbcType="FLOAT" property="harmonicActivePower16Max" />
+    <result column="HARMONIC_ACTIVE_POWER_16_MIN" jdbcType="FLOAT" property="harmonicActivePower16Min" />
+    <result column="HARMONIC_ACTIVE_POWER_16_AVG" jdbcType="FLOAT" property="harmonicActivePower16Avg" />
+    <result column="HARMONIC_ACTIVE_POWER_16_95" jdbcType="FLOAT" property="harmonicActivePower1695" />
+    <result column="HARMONIC_ACTIVE_POWER_17_MAX" jdbcType="FLOAT" property="harmonicActivePower17Max" />
+    <result column="HARMONIC_ACTIVE_POWER_17_MIN" jdbcType="FLOAT" property="harmonicActivePower17Min" />
+    <result column="HARMONIC_ACTIVE_POWER_17_AVG" jdbcType="FLOAT" property="harmonicActivePower17Avg" />
+    <result column="HARMONIC_ACTIVE_POWER_17_95" jdbcType="FLOAT" property="harmonicActivePower1795" />
+    <result column="HARMONIC_ACTIVE_POWER_18_MAX" jdbcType="FLOAT" property="harmonicActivePower18Max" />
+    <result column="HARMONIC_ACTIVE_POWER_18_MIN" jdbcType="FLOAT" property="harmonicActivePower18Min" />
+    <result column="HARMONIC_ACTIVE_POWER_18_AVG" jdbcType="FLOAT" property="harmonicActivePower18Avg" />
+    <result column="HARMONIC_ACTIVE_POWER_18_95" jdbcType="FLOAT" property="harmonicActivePower1895" />
+    <result column="HARMONIC_ACTIVE_POWER_19_MAX" jdbcType="FLOAT" property="harmonicActivePower19Max" />
+    <result column="HARMONIC_ACTIVE_POWER_19_MIN" jdbcType="FLOAT" property="harmonicActivePower19Min" />
+    <result column="HARMONIC_ACTIVE_POWER_19_AVG" jdbcType="FLOAT" property="harmonicActivePower19Avg" />
+    <result column="HARMONIC_ACTIVE_POWER_19_95" jdbcType="FLOAT" property="harmonicActivePower1995" />
+    <result column="HARMONIC_ACTIVE_POWER_20_MAX" jdbcType="FLOAT" property="harmonicActivePower20Max" />
+    <result column="HARMONIC_ACTIVE_POWER_20_MIN" jdbcType="FLOAT" property="harmonicActivePower20Min" />
+    <result column="HARMONIC_ACTIVE_POWER_20_AVG" jdbcType="FLOAT" property="harmonicActivePower20Avg" />
+    <result column="HARMONIC_ACTIVE_POWER_20_95" jdbcType="FLOAT" property="harmonicActivePower2095" />
+    <result column="HARMONIC_ACTIVE_POWER_21_MAX" jdbcType="FLOAT" property="harmonicActivePower21Max" />
+    <result column="HARMONIC_ACTIVE_POWER_21_MIN" jdbcType="FLOAT" property="harmonicActivePower21Min" />
+    <result column="HARMONIC_ACTIVE_POWER_21_AVG" jdbcType="FLOAT" property="harmonicActivePower21Avg" />
+    <result column="HARMONIC_ACTIVE_POWER_21_95" jdbcType="FLOAT" property="harmonicActivePower2195" />
+    <result column="HARMONIC_ACTIVE_POWER_22_MAX" jdbcType="FLOAT" property="harmonicActivePower22Max" />
+    <result column="HARMONIC_ACTIVE_POWER_22_MIN" jdbcType="FLOAT" property="harmonicActivePower22Min" />
+    <result column="HARMONIC_ACTIVE_POWER_22_AVG" jdbcType="FLOAT" property="harmonicActivePower22Avg" />
+    <result column="HARMONIC_ACTIVE_POWER_22_95" jdbcType="FLOAT" property="harmonicActivePower2295" />
+    <result column="HARMONIC_ACTIVE_POWER_23_MAX" jdbcType="FLOAT" property="harmonicActivePower23Max" />
+    <result column="HARMONIC_ACTIVE_POWER_23_MIN" jdbcType="FLOAT" property="harmonicActivePower23Min" />
+    <result column="HARMONIC_ACTIVE_POWER_23_AVG" jdbcType="FLOAT" property="harmonicActivePower23Avg" />
+    <result column="HARMONIC_ACTIVE_POWER_23_95" jdbcType="FLOAT" property="harmonicActivePower2395" />
+    <result column="HARMONIC_ACTIVE_POWER_24_MAX" jdbcType="FLOAT" property="harmonicActivePower24Max" />
+    <result column="HARMONIC_ACTIVE_POWER_24_MIN" jdbcType="FLOAT" property="harmonicActivePower24Min" />
+    <result column="HARMONIC_ACTIVE_POWER_24_AVG" jdbcType="FLOAT" property="harmonicActivePower24Avg" />
+    <result column="HARMONIC_ACTIVE_POWER_24_95" jdbcType="FLOAT" property="harmonicActivePower2495" />
+    <result column="HARMONIC_ACTIVE_POWER_25_MAX" jdbcType="FLOAT" property="harmonicActivePower25Max" />
+    <result column="HARMONIC_ACTIVE_POWER_25_MIN" jdbcType="FLOAT" property="harmonicActivePower25Min" />
+    <result column="HARMONIC_ACTIVE_POWER_25_AVG" jdbcType="FLOAT" property="harmonicActivePower25Avg" />
+    <result column="HARMONIC_ACTIVE_POWER_25_95" jdbcType="FLOAT" property="harmonicActivePower2595" />
+    <result column="HARMONIC_ACTIVE_POWER_26_MAX" jdbcType="FLOAT" property="harmonicActivePower26Max" />
+    <result column="HARMONIC_ACTIVE_POWER_26_MIN" jdbcType="FLOAT" property="harmonicActivePower26Min" />
+    <result column="HARMONIC_ACTIVE_POWER_26_AVG" jdbcType="FLOAT" property="harmonicActivePower26Avg" />
+    <result column="HARMONIC_ACTIVE_POWER_26_95" jdbcType="FLOAT" property="harmonicActivePower2695" />
+    <result column="HARMONIC_ACTIVE_POWER_27_MAX" jdbcType="FLOAT" property="harmonicActivePower27Max" />
+    <result column="HARMONIC_ACTIVE_POWER_27_MIN" jdbcType="FLOAT" property="harmonicActivePower27Min" />
+    <result column="HARMONIC_ACTIVE_POWER_27_AVG" jdbcType="FLOAT" property="harmonicActivePower27Avg" />
+    <result column="HARMONIC_ACTIVE_POWER_27_95" jdbcType="FLOAT" property="harmonicActivePower2795" />
+    <result column="HARMONIC_ACTIVE_POWER_28_MAX" jdbcType="FLOAT" property="harmonicActivePower28Max" />
+    <result column="HARMONIC_ACTIVE_POWER_28_MIN" jdbcType="FLOAT" property="harmonicActivePower28Min" />
+    <result column="HARMONIC_ACTIVE_POWER_28_AVG" jdbcType="FLOAT" property="harmonicActivePower28Avg" />
+    <result column="HARMONIC_ACTIVE_POWER_28_95" jdbcType="FLOAT" property="harmonicActivePower2895" />
+    <result column="HARMONIC_ACTIVE_POWER_29_MAX" jdbcType="FLOAT" property="harmonicActivePower29Max" />
+    <result column="HARMONIC_ACTIVE_POWER_29_MIN" jdbcType="FLOAT" property="harmonicActivePower29Min" />
+    <result column="HARMONIC_ACTIVE_POWER_29_AVG" jdbcType="FLOAT" property="harmonicActivePower29Avg" />
+    <result column="HARMONIC_ACTIVE_POWER_29_95" jdbcType="FLOAT" property="harmonicActivePower2995" />
+    <result column="HARMONIC_ACTIVE_POWER_30_MAX" jdbcType="FLOAT" property="harmonicActivePower30Max" />
+    <result column="HARMONIC_ACTIVE_POWER_30_MIN" jdbcType="FLOAT" property="harmonicActivePower30Min" />
+    <result column="HARMONIC_ACTIVE_POWER_30_AVG" jdbcType="FLOAT" property="harmonicActivePower30Avg" />
+    <result column="HARMONIC_ACTIVE_POWER_30_95" jdbcType="FLOAT" property="harmonicActivePower3095" />
+    <result column="HARMONIC_ACTIVE_POWER_31_MAX" jdbcType="FLOAT" property="harmonicActivePower31Max" />
+    <result column="HARMONIC_ACTIVE_POWER_31_MIN" jdbcType="FLOAT" property="harmonicActivePower31Min" />
+    <result column="HARMONIC_ACTIVE_POWER_31_AVG" jdbcType="FLOAT" property="harmonicActivePower31Avg" />
+    <result column="HARMONIC_ACTIVE_POWER_31_95" jdbcType="FLOAT" property="harmonicActivePower3195" />
+    <result column="HARMONIC_ACTIVE_POWER_32_MAX" jdbcType="FLOAT" property="harmonicActivePower32Max" />
+    <result column="HARMONIC_ACTIVE_POWER_32_MIN" jdbcType="FLOAT" property="harmonicActivePower32Min" />
+    <result column="HARMONIC_ACTIVE_POWER_32_AVG" jdbcType="FLOAT" property="harmonicActivePower32Avg" />
+    <result column="HARMONIC_ACTIVE_POWER_32_95" jdbcType="FLOAT" property="harmonicActivePower3295" />
+    <result column="HARMONIC_ACTIVE_POWER_33_MAX" jdbcType="FLOAT" property="harmonicActivePower33Max" />
+    <result column="HARMONIC_ACTIVE_POWER_33_MIN" jdbcType="FLOAT" property="harmonicActivePower33Min" />
+    <result column="HARMONIC_ACTIVE_POWER_33_AVG" jdbcType="FLOAT" property="harmonicActivePower33Avg" />
+    <result column="HARMONIC_ACTIVE_POWER_33_95" jdbcType="FLOAT" property="harmonicActivePower3395" />
+    <result column="HARMONIC_ACTIVE_POWER_34_MAX" jdbcType="FLOAT" property="harmonicActivePower34Max" />
+    <result column="HARMONIC_ACTIVE_POWER_34_MIN" jdbcType="FLOAT" property="harmonicActivePower34Min" />
+    <result column="HARMONIC_ACTIVE_POWER_34_AVG" jdbcType="FLOAT" property="harmonicActivePower34Avg" />
+    <result column="HARMONIC_ACTIVE_POWER_34_95" jdbcType="FLOAT" property="harmonicActivePower3495" />
+    <result column="HARMONIC_ACTIVE_POWER_35_MAX" jdbcType="FLOAT" property="harmonicActivePower35Max" />
+    <result column="HARMONIC_ACTIVE_POWER_35_MIN" jdbcType="FLOAT" property="harmonicActivePower35Min" />
+    <result column="HARMONIC_ACTIVE_POWER_35_AVG" jdbcType="FLOAT" property="harmonicActivePower35Avg" />
+    <result column="HARMONIC_ACTIVE_POWER_35_95" jdbcType="FLOAT" property="harmonicActivePower3595" />
+    <result column="HARMONIC_ACTIVE_POWER_36_MAX" jdbcType="FLOAT" property="harmonicActivePower36Max" />
+    <result column="HARMONIC_ACTIVE_POWER_36_MIN" jdbcType="FLOAT" property="harmonicActivePower36Min" />
+    <result column="HARMONIC_ACTIVE_POWER_36_AVG" jdbcType="FLOAT" property="harmonicActivePower36Avg" />
+    <result column="HARMONIC_ACTIVE_POWER_36_95" jdbcType="FLOAT" property="harmonicActivePower3695" />
+    <result column="HARMONIC_ACTIVE_POWER_37_MAX" jdbcType="FLOAT" property="harmonicActivePower37Max" />
+    <result column="HARMONIC_ACTIVE_POWER_37_MIN" jdbcType="FLOAT" property="harmonicActivePower37Min" />
+    <result column="HARMONIC_ACTIVE_POWER_37_AVG" jdbcType="FLOAT" property="harmonicActivePower37Avg" />
+    <result column="HARMONIC_ACTIVE_POWER_37_95" jdbcType="FLOAT" property="harmonicActivePower3795" />
+    <result column="HARMONIC_ACTIVE_POWER_38_MAX" jdbcType="FLOAT" property="harmonicActivePower38Max" />
+    <result column="HARMONIC_ACTIVE_POWER_38_MIN" jdbcType="FLOAT" property="harmonicActivePower38Min" />
+    <result column="HARMONIC_ACTIVE_POWER_38_AVG" jdbcType="FLOAT" property="harmonicActivePower38Avg" />
+    <result column="HARMONIC_ACTIVE_POWER_38_95" jdbcType="FLOAT" property="harmonicActivePower3895" />
+    <result column="HARMONIC_ACTIVE_POWER_39_MAX" jdbcType="FLOAT" property="harmonicActivePower39Max" />
+    <result column="HARMONIC_ACTIVE_POWER_39_MIN" jdbcType="FLOAT" property="harmonicActivePower39Min" />
+    <result column="HARMONIC_ACTIVE_POWER_39_AVG" jdbcType="FLOAT" property="harmonicActivePower39Avg" />
+    <result column="HARMONIC_ACTIVE_POWER_39_95" jdbcType="FLOAT" property="harmonicActivePower3995" />
+    <result column="HARMONIC_ACTIVE_POWER_40_MAX" jdbcType="FLOAT" property="harmonicActivePower40Max" />
+    <result column="HARMONIC_ACTIVE_POWER_40_MIN" jdbcType="FLOAT" property="harmonicActivePower40Min" />
+    <result column="HARMONIC_ACTIVE_POWER_40_AVG" jdbcType="FLOAT" property="harmonicActivePower40Avg" />
+    <result column="HARMONIC_ACTIVE_POWER_40_95" jdbcType="FLOAT" property="harmonicActivePower4095" />
+    <result column="HARMONIC_ACTIVE_POWER_41_MAX" jdbcType="FLOAT" property="harmonicActivePower41Max" />
+    <result column="HARMONIC_ACTIVE_POWER_41_MIN" jdbcType="FLOAT" property="harmonicActivePower41Min" />
+    <result column="HARMONIC_ACTIVE_POWER_41_AVG" jdbcType="FLOAT" property="harmonicActivePower41Avg" />
+    <result column="HARMONIC_ACTIVE_POWER_41_95" jdbcType="FLOAT" property="harmonicActivePower4195" />
+    <result column="HARMONIC_ACTIVE_POWER_42_MAX" jdbcType="FLOAT" property="harmonicActivePower42Max" />
+    <result column="HARMONIC_ACTIVE_POWER_42_MIN" jdbcType="FLOAT" property="harmonicActivePower42Min" />
+    <result column="HARMONIC_ACTIVE_POWER_42_AVG" jdbcType="FLOAT" property="harmonicActivePower42Avg" />
+    <result column="HARMONIC_ACTIVE_POWER_42_95" jdbcType="FLOAT" property="harmonicActivePower4295" />
+    <result column="HARMONIC_ACTIVE_POWER_43_MAX" jdbcType="FLOAT" property="harmonicActivePower43Max" />
+    <result column="HARMONIC_ACTIVE_POWER_43_MIN" jdbcType="FLOAT" property="harmonicActivePower43Min" />
+    <result column="HARMONIC_ACTIVE_POWER_43_AVG" jdbcType="FLOAT" property="harmonicActivePower43Avg" />
+    <result column="HARMONIC_ACTIVE_POWER_43_95" jdbcType="FLOAT" property="harmonicActivePower4395" />
+    <result column="HARMONIC_ACTIVE_POWER_44_MAX" jdbcType="FLOAT" property="harmonicActivePower44Max" />
+    <result column="HARMONIC_ACTIVE_POWER_44_MIN" jdbcType="FLOAT" property="harmonicActivePower44Min" />
+    <result column="HARMONIC_ACTIVE_POWER_44_AVG" jdbcType="FLOAT" property="harmonicActivePower44Avg" />
+    <result column="HARMONIC_ACTIVE_POWER_44_95" jdbcType="FLOAT" property="harmonicActivePower4495" />
+    <result column="HARMONIC_ACTIVE_POWER_45_MAX" jdbcType="FLOAT" property="harmonicActivePower45Max" />
+    <result column="HARMONIC_ACTIVE_POWER_45_MIN" jdbcType="FLOAT" property="harmonicActivePower45Min" />
+    <result column="HARMONIC_ACTIVE_POWER_45_AVG" jdbcType="FLOAT" property="harmonicActivePower45Avg" />
+    <result column="HARMONIC_ACTIVE_POWER_45_95" jdbcType="FLOAT" property="harmonicActivePower4595" />
+    <result column="HARMONIC_ACTIVE_POWER_46_MAX" jdbcType="FLOAT" property="harmonicActivePower46Max" />
+    <result column="HARMONIC_ACTIVE_POWER_46_MIN" jdbcType="FLOAT" property="harmonicActivePower46Min" />
+    <result column="HARMONIC_ACTIVE_POWER_46_AVG" jdbcType="FLOAT" property="harmonicActivePower46Avg" />
+    <result column="HARMONIC_ACTIVE_POWER_46_95" jdbcType="FLOAT" property="harmonicActivePower4695" />
+    <result column="HARMONIC_ACTIVE_POWER_47_MAX" jdbcType="FLOAT" property="harmonicActivePower47Max" />
+    <result column="HARMONIC_ACTIVE_POWER_47_MIN" jdbcType="FLOAT" property="harmonicActivePower47Min" />
+    <result column="HARMONIC_ACTIVE_POWER_47_AVG" jdbcType="FLOAT" property="harmonicActivePower47Avg" />
+    <result column="HARMONIC_ACTIVE_POWER_47_95" jdbcType="FLOAT" property="harmonicActivePower4795" />
+    <result column="HARMONIC_ACTIVE_POWER_48_MAX" jdbcType="FLOAT" property="harmonicActivePower48Max" />
+    <result column="HARMONIC_ACTIVE_POWER_48_MIN" jdbcType="FLOAT" property="harmonicActivePower48Min" />
+    <result column="HARMONIC_ACTIVE_POWER_48_AVG" jdbcType="FLOAT" property="harmonicActivePower48Avg" />
+    <result column="HARMONIC_ACTIVE_POWER_48_95" jdbcType="FLOAT" property="harmonicActivePower4895" />
+    <result column="HARMONIC_ACTIVE_POWER_49_MAX" jdbcType="FLOAT" property="harmonicActivePower49Max" />
+    <result column="HARMONIC_ACTIVE_POWER_49_MIN" jdbcType="FLOAT" property="harmonicActivePower49Min" />
+    <result column="HARMONIC_ACTIVE_POWER_49_AVG" jdbcType="FLOAT" property="harmonicActivePower49Avg" />
+    <result column="HARMONIC_ACTIVE_POWER_49_95" jdbcType="FLOAT" property="harmonicActivePower4995" />
+    <result column="HARMONIC_ACTIVE_POWER_50_MAX" jdbcType="FLOAT" property="harmonicActivePower50Max" />
+    <result column="HARMONIC_ACTIVE_POWER_50_MIN" jdbcType="FLOAT" property="harmonicActivePower50Min" />
+    <result column="HARMONIC_ACTIVE_POWER_50_AVG" jdbcType="FLOAT" property="harmonicActivePower50Avg" />
+    <result column="HARMONIC_ACTIVE_POWER_50_95" jdbcType="FLOAT" property="harmonicActivePower5095" />
+  </resultMap>
+  <sql id="Base_Column_List">
+    <!--@mbg.generated-->
+    measurement_point_id, data_date, phase, FUNDAMENTAL_RATEOFWORK_MAX, FUNDAMENTAL_RATEOFWORK_Min, 
+    FUNDAMENTAL_RATEOFWORK_avg, FUNDAMENTAL_RATEOFWORK_95, FUNDAMENTAL_ACTIVE_POWER_MAX, 
+    FUNDAMENTAL_ACTIVE_POWER_Min, FUNDAMENTAL_ACTIVE_POWER_avg, FUNDAMENTAL_ACTIVE_POWER_95, 
+    HARMONIC_ACTIVE_POWER_2_MAX, HARMONIC_ACTIVE_POWER_2_MIN, HARMONIC_ACTIVE_POWER_2_AVG, 
+    HARMONIC_ACTIVE_POWER_2_95, HARMONIC_ACTIVE_POWER_3_MAX, HARMONIC_ACTIVE_POWER_3_MIN, 
+    HARMONIC_ACTIVE_POWER_3_AVG, HARMONIC_ACTIVE_POWER_3_95, HARMONIC_ACTIVE_POWER_4_MAX, 
+    HARMONIC_ACTIVE_POWER_4_MIN, HARMONIC_ACTIVE_POWER_4_AVG, HARMONIC_ACTIVE_POWER_4_95, 
+    HARMONIC_ACTIVE_POWER_5_MAX, HARMONIC_ACTIVE_POWER_5_MIN, HARMONIC_ACTIVE_POWER_5_AVG, 
+    HARMONIC_ACTIVE_POWER_5_95, HARMONIC_ACTIVE_POWER_6_MAX, HARMONIC_ACTIVE_POWER_6_MIN, 
+    HARMONIC_ACTIVE_POWER_6_AVG, HARMONIC_ACTIVE_POWER_6_95, HARMONIC_ACTIVE_POWER_7_MAX, 
+    HARMONIC_ACTIVE_POWER_7_MIN, HARMONIC_ACTIVE_POWER_7_AVG, HARMONIC_ACTIVE_POWER_7_95, 
+    HARMONIC_ACTIVE_POWER_8_MAX, HARMONIC_ACTIVE_POWER_8_MIN, HARMONIC_ACTIVE_POWER_8_AVG, 
+    HARMONIC_ACTIVE_POWER_8_95, HARMONIC_ACTIVE_POWER_9_MAX, HARMONIC_ACTIVE_POWER_9_MIN, 
+    HARMONIC_ACTIVE_POWER_9_AVG, HARMONIC_ACTIVE_POWER_9_95, HARMONIC_ACTIVE_POWER_10_MAX, 
+    HARMONIC_ACTIVE_POWER_10_MIN, HARMONIC_ACTIVE_POWER_10_AVG, HARMONIC_ACTIVE_POWER_10_95, 
+    HARMONIC_ACTIVE_POWER_11_MAX, HARMONIC_ACTIVE_POWER_11_MIN, HARMONIC_ACTIVE_POWER_11_AVG, 
+    HARMONIC_ACTIVE_POWER_11_95, HARMONIC_ACTIVE_POWER_12_MAX, HARMONIC_ACTIVE_POWER_12_MIN, 
+    HARMONIC_ACTIVE_POWER_12_AVG, HARMONIC_ACTIVE_POWER_12_95, HARMONIC_ACTIVE_POWER_13_MAX, 
+    HARMONIC_ACTIVE_POWER_13_MIN, HARMONIC_ACTIVE_POWER_13_AVG, HARMONIC_ACTIVE_POWER_13_95, 
+    HARMONIC_ACTIVE_POWER_14_MAX, HARMONIC_ACTIVE_POWER_14_MIN, HARMONIC_ACTIVE_POWER_14_AVG, 
+    HARMONIC_ACTIVE_POWER_14_95, HARMONIC_ACTIVE_POWER_15_MAX, HARMONIC_ACTIVE_POWER_15_MIN, 
+    HARMONIC_ACTIVE_POWER_15_AVG, HARMONIC_ACTIVE_POWER_15_95, HARMONIC_ACTIVE_POWER_16_MAX, 
+    HARMONIC_ACTIVE_POWER_16_MIN, HARMONIC_ACTIVE_POWER_16_AVG, HARMONIC_ACTIVE_POWER_16_95, 
+    HARMONIC_ACTIVE_POWER_17_MAX, HARMONIC_ACTIVE_POWER_17_MIN, HARMONIC_ACTIVE_POWER_17_AVG, 
+    HARMONIC_ACTIVE_POWER_17_95, HARMONIC_ACTIVE_POWER_18_MAX, HARMONIC_ACTIVE_POWER_18_MIN, 
+    HARMONIC_ACTIVE_POWER_18_AVG, HARMONIC_ACTIVE_POWER_18_95, HARMONIC_ACTIVE_POWER_19_MAX, 
+    HARMONIC_ACTIVE_POWER_19_MIN, HARMONIC_ACTIVE_POWER_19_AVG, HARMONIC_ACTIVE_POWER_19_95, 
+    HARMONIC_ACTIVE_POWER_20_MAX, HARMONIC_ACTIVE_POWER_20_MIN, HARMONIC_ACTIVE_POWER_20_AVG, 
+    HARMONIC_ACTIVE_POWER_20_95, HARMONIC_ACTIVE_POWER_21_MAX, HARMONIC_ACTIVE_POWER_21_MIN, 
+    HARMONIC_ACTIVE_POWER_21_AVG, HARMONIC_ACTIVE_POWER_21_95, HARMONIC_ACTIVE_POWER_22_MAX, 
+    HARMONIC_ACTIVE_POWER_22_MIN, HARMONIC_ACTIVE_POWER_22_AVG, HARMONIC_ACTIVE_POWER_22_95, 
+    HARMONIC_ACTIVE_POWER_23_MAX, HARMONIC_ACTIVE_POWER_23_MIN, HARMONIC_ACTIVE_POWER_23_AVG, 
+    HARMONIC_ACTIVE_POWER_23_95, HARMONIC_ACTIVE_POWER_24_MAX, HARMONIC_ACTIVE_POWER_24_MIN, 
+    HARMONIC_ACTIVE_POWER_24_AVG, HARMONIC_ACTIVE_POWER_24_95, HARMONIC_ACTIVE_POWER_25_MAX, 
+    HARMONIC_ACTIVE_POWER_25_MIN, HARMONIC_ACTIVE_POWER_25_AVG, HARMONIC_ACTIVE_POWER_25_95, 
+    HARMONIC_ACTIVE_POWER_26_MAX, HARMONIC_ACTIVE_POWER_26_MIN, HARMONIC_ACTIVE_POWER_26_AVG, 
+    HARMONIC_ACTIVE_POWER_26_95, HARMONIC_ACTIVE_POWER_27_MAX, HARMONIC_ACTIVE_POWER_27_MIN, 
+    HARMONIC_ACTIVE_POWER_27_AVG, HARMONIC_ACTIVE_POWER_27_95, HARMONIC_ACTIVE_POWER_28_MAX, 
+    HARMONIC_ACTIVE_POWER_28_MIN, HARMONIC_ACTIVE_POWER_28_AVG, HARMONIC_ACTIVE_POWER_28_95, 
+    HARMONIC_ACTIVE_POWER_29_MAX, HARMONIC_ACTIVE_POWER_29_MIN, HARMONIC_ACTIVE_POWER_29_AVG, 
+    HARMONIC_ACTIVE_POWER_29_95, HARMONIC_ACTIVE_POWER_30_MAX, HARMONIC_ACTIVE_POWER_30_MIN, 
+    HARMONIC_ACTIVE_POWER_30_AVG, HARMONIC_ACTIVE_POWER_30_95, HARMONIC_ACTIVE_POWER_31_MAX, 
+    HARMONIC_ACTIVE_POWER_31_MIN, HARMONIC_ACTIVE_POWER_31_AVG, HARMONIC_ACTIVE_POWER_31_95, 
+    HARMONIC_ACTIVE_POWER_32_MAX, HARMONIC_ACTIVE_POWER_32_MIN, HARMONIC_ACTIVE_POWER_32_AVG, 
+    HARMONIC_ACTIVE_POWER_32_95, HARMONIC_ACTIVE_POWER_33_MAX, HARMONIC_ACTIVE_POWER_33_MIN, 
+    HARMONIC_ACTIVE_POWER_33_AVG, HARMONIC_ACTIVE_POWER_33_95, HARMONIC_ACTIVE_POWER_34_MAX, 
+    HARMONIC_ACTIVE_POWER_34_MIN, HARMONIC_ACTIVE_POWER_34_AVG, HARMONIC_ACTIVE_POWER_34_95, 
+    HARMONIC_ACTIVE_POWER_35_MAX, HARMONIC_ACTIVE_POWER_35_MIN, HARMONIC_ACTIVE_POWER_35_AVG, 
+    HARMONIC_ACTIVE_POWER_35_95, HARMONIC_ACTIVE_POWER_36_MAX, HARMONIC_ACTIVE_POWER_36_MIN, 
+    HARMONIC_ACTIVE_POWER_36_AVG, HARMONIC_ACTIVE_POWER_36_95, HARMONIC_ACTIVE_POWER_37_MAX, 
+    HARMONIC_ACTIVE_POWER_37_MIN, HARMONIC_ACTIVE_POWER_37_AVG, HARMONIC_ACTIVE_POWER_37_95, 
+    HARMONIC_ACTIVE_POWER_38_MAX, HARMONIC_ACTIVE_POWER_38_MIN, HARMONIC_ACTIVE_POWER_38_AVG, 
+    HARMONIC_ACTIVE_POWER_38_95, HARMONIC_ACTIVE_POWER_39_MAX, HARMONIC_ACTIVE_POWER_39_MIN, 
+    HARMONIC_ACTIVE_POWER_39_AVG, HARMONIC_ACTIVE_POWER_39_95, HARMONIC_ACTIVE_POWER_40_MAX, 
+    HARMONIC_ACTIVE_POWER_40_MIN, HARMONIC_ACTIVE_POWER_40_AVG, HARMONIC_ACTIVE_POWER_40_95, 
+    HARMONIC_ACTIVE_POWER_41_MAX, HARMONIC_ACTIVE_POWER_41_MIN, HARMONIC_ACTIVE_POWER_41_AVG, 
+    HARMONIC_ACTIVE_POWER_41_95, HARMONIC_ACTIVE_POWER_42_MAX, HARMONIC_ACTIVE_POWER_42_MIN, 
+    HARMONIC_ACTIVE_POWER_42_AVG, HARMONIC_ACTIVE_POWER_42_95, HARMONIC_ACTIVE_POWER_43_MAX, 
+    HARMONIC_ACTIVE_POWER_43_MIN, HARMONIC_ACTIVE_POWER_43_AVG, HARMONIC_ACTIVE_POWER_43_95, 
+    HARMONIC_ACTIVE_POWER_44_MAX, HARMONIC_ACTIVE_POWER_44_MIN, HARMONIC_ACTIVE_POWER_44_AVG, 
+    HARMONIC_ACTIVE_POWER_44_95, HARMONIC_ACTIVE_POWER_45_MAX, HARMONIC_ACTIVE_POWER_45_MIN, 
+    HARMONIC_ACTIVE_POWER_45_AVG, HARMONIC_ACTIVE_POWER_45_95, HARMONIC_ACTIVE_POWER_46_MAX, 
+    HARMONIC_ACTIVE_POWER_46_MIN, HARMONIC_ACTIVE_POWER_46_AVG, HARMONIC_ACTIVE_POWER_46_95, 
+    HARMONIC_ACTIVE_POWER_47_MAX, HARMONIC_ACTIVE_POWER_47_MIN, HARMONIC_ACTIVE_POWER_47_AVG, 
+    HARMONIC_ACTIVE_POWER_47_95, HARMONIC_ACTIVE_POWER_48_MAX, HARMONIC_ACTIVE_POWER_48_MIN, 
+    HARMONIC_ACTIVE_POWER_48_AVG, HARMONIC_ACTIVE_POWER_48_95, HARMONIC_ACTIVE_POWER_49_MAX, 
+    HARMONIC_ACTIVE_POWER_49_MIN, HARMONIC_ACTIVE_POWER_49_AVG, HARMONIC_ACTIVE_POWER_49_95, 
+    HARMONIC_ACTIVE_POWER_50_MAX, HARMONIC_ACTIVE_POWER_50_MIN, HARMONIC_ACTIVE_POWER_50_AVG, 
+    HARMONIC_ACTIVE_POWER_50_95
+  </sql>
+</mapper>
\ No newline at end of file
diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/mapping/RMpHarmonicVRateReportDPOMapper.xml b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/mapping/RMpHarmonicVRateReportDPOMapper.xml
new file mode 100644
index 000000000..0b6274b18
--- /dev/null
+++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/mapping/RMpHarmonicVRateReportDPOMapper.xml
@@ -0,0 +1,286 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.njcn.prepare.harmonic.mapper.line.RMpHarmonicVRateReportDPOMapper">
+  <resultMap id="BaseResultMap" type="com.njcn.prepare.harmonic.pojo.po.line.RMpHarmonicVRateReportDPO">
+    <!--@mbg.generated-->
+    <!--@Table r_mp_harmonic_v_rate_report_d-->
+    <id column="measurement_point_id" jdbcType="VARCHAR" property="measurementPointId" />
+    <id column="data_date" jdbcType="DATE" property="dataDate" />
+    <id column="phase" jdbcType="VARCHAR" property="phase" />
+    <result column="voltage_harmonic_thd_max" jdbcType="FLOAT" property="voltageHarmonicThdMax" />
+    <result column="voltage_harmonic_thd_min" jdbcType="FLOAT" property="voltageHarmonicThdMin" />
+    <result column="voltage_harmonic_thd_avg" jdbcType="FLOAT" property="voltageHarmonicThdAvg" />
+    <result column="voltage_harmonic_thd_95" jdbcType="FLOAT" property="voltageHarmonicThd95" />
+    <result column="fundamental_voltage_max" jdbcType="FLOAT" property="fundamentalVoltageMax" />
+    <result column="fundamental_voltage_min" jdbcType="FLOAT" property="fundamentalVoltageMin" />
+    <result column="fundamental_voltage_avg" jdbcType="FLOAT" property="fundamentalVoltageAvg" />
+    <result column="fundamental_voltage_95" jdbcType="FLOAT" property="fundamentalVoltage95" />
+    <result column="harmonic_voltage_content_2_max" jdbcType="FLOAT" property="harmonicVoltageContent2Max" />
+    <result column="harmonic_voltage_content_2_min" jdbcType="FLOAT" property="harmonicVoltageContent2Min" />
+    <result column="harmonic_voltage_content_2_avg" jdbcType="FLOAT" property="harmonicVoltageContent2Avg" />
+    <result column="harmonic_voltage_content_2_95" jdbcType="FLOAT" property="harmonicVoltageContent295" />
+    <result column="harmonic_voltage_content_3_max" jdbcType="FLOAT" property="harmonicVoltageContent3Max" />
+    <result column="harmonic_voltage_content_3_min" jdbcType="FLOAT" property="harmonicVoltageContent3Min" />
+    <result column="harmonic_voltage_content_3_avg" jdbcType="FLOAT" property="harmonicVoltageContent3Avg" />
+    <result column="harmonic_voltage_content_3_95" jdbcType="FLOAT" property="harmonicVoltageContent395" />
+    <result column="harmonic_voltage_content_4_max" jdbcType="FLOAT" property="harmonicVoltageContent4Max" />
+    <result column="harmonic_voltage_content_4_min" jdbcType="FLOAT" property="harmonicVoltageContent4Min" />
+    <result column="harmonic_voltage_content_4_avg" jdbcType="FLOAT" property="harmonicVoltageContent4Avg" />
+    <result column="harmonic_voltage_content_4_95" jdbcType="FLOAT" property="harmonicVoltageContent495" />
+    <result column="harmonic_voltage_content_5_max" jdbcType="FLOAT" property="harmonicVoltageContent5Max" />
+    <result column="harmonic_voltage_content_5_min" jdbcType="FLOAT" property="harmonicVoltageContent5Min" />
+    <result column="harmonic_voltage_content_5_avg" jdbcType="FLOAT" property="harmonicVoltageContent5Avg" />
+    <result column="harmonic_voltage_content_5_95" jdbcType="FLOAT" property="harmonicVoltageContent595" />
+    <result column="harmonic_voltage_content_6_max" jdbcType="FLOAT" property="harmonicVoltageContent6Max" />
+    <result column="harmonic_voltage_content_6_min" jdbcType="FLOAT" property="harmonicVoltageContent6Min" />
+    <result column="harmonic_voltage_content_6_avg" jdbcType="FLOAT" property="harmonicVoltageContent6Avg" />
+    <result column="harmonic_voltage_content_6_95" jdbcType="FLOAT" property="harmonicVoltageContent695" />
+    <result column="harmonic_voltage_content_7_max" jdbcType="FLOAT" property="harmonicVoltageContent7Max" />
+    <result column="harmonic_voltage_content_7_min" jdbcType="FLOAT" property="harmonicVoltageContent7Min" />
+    <result column="harmonic_voltage_content_7_avg" jdbcType="FLOAT" property="harmonicVoltageContent7Avg" />
+    <result column="harmonic_voltage_content_7_95" jdbcType="FLOAT" property="harmonicVoltageContent795" />
+    <result column="harmonic_voltage_content_8_max" jdbcType="FLOAT" property="harmonicVoltageContent8Max" />
+    <result column="harmonic_voltage_content_8_min" jdbcType="FLOAT" property="harmonicVoltageContent8Min" />
+    <result column="harmonic_voltage_content_8_avg" jdbcType="FLOAT" property="harmonicVoltageContent8Avg" />
+    <result column="harmonic_voltage_content_8_95" jdbcType="FLOAT" property="harmonicVoltageContent895" />
+    <result column="harmonic_voltage_content_9_max" jdbcType="FLOAT" property="harmonicVoltageContent9Max" />
+    <result column="harmonic_voltage_content_9_min" jdbcType="FLOAT" property="harmonicVoltageContent9Min" />
+    <result column="harmonic_voltage_content_9_avg" jdbcType="FLOAT" property="harmonicVoltageContent9Avg" />
+    <result column="harmonic_voltage_content_9_95" jdbcType="FLOAT" property="harmonicVoltageContent995" />
+    <result column="harmonic_voltage_content_10_max" jdbcType="FLOAT" property="harmonicVoltageContent10Max" />
+    <result column="harmonic_voltage_content_10_min" jdbcType="FLOAT" property="harmonicVoltageContent10Min" />
+    <result column="harmonic_voltage_content_10_avg" jdbcType="FLOAT" property="harmonicVoltageContent10Avg" />
+    <result column="harmonic_voltage_content_10_95" jdbcType="FLOAT" property="harmonicVoltageContent1095" />
+    <result column="harmonic_voltage_content_11_max" jdbcType="FLOAT" property="harmonicVoltageContent11Max" />
+    <result column="harmonic_voltage_content_11_min" jdbcType="FLOAT" property="harmonicVoltageContent11Min" />
+    <result column="harmonic_voltage_content_11_avg" jdbcType="FLOAT" property="harmonicVoltageContent11Avg" />
+    <result column="harmonic_voltage_content_11_95" jdbcType="FLOAT" property="harmonicVoltageContent1195" />
+    <result column="harmonic_voltage_content_12_max" jdbcType="FLOAT" property="harmonicVoltageContent12Max" />
+    <result column="harmonic_voltage_content_12_min" jdbcType="FLOAT" property="harmonicVoltageContent12Min" />
+    <result column="harmonic_voltage_content_12_avg" jdbcType="FLOAT" property="harmonicVoltageContent12Avg" />
+    <result column="harmonic_voltage_content_12_95" jdbcType="FLOAT" property="harmonicVoltageContent1295" />
+    <result column="harmonic_voltage_content_13_max" jdbcType="FLOAT" property="harmonicVoltageContent13Max" />
+    <result column="harmonic_voltage_content_13_min" jdbcType="FLOAT" property="harmonicVoltageContent13Min" />
+    <result column="harmonic_voltage_content_13_avg" jdbcType="FLOAT" property="harmonicVoltageContent13Avg" />
+    <result column="harmonic_voltage_content_13_95" jdbcType="FLOAT" property="harmonicVoltageContent1395" />
+    <result column="harmonic_voltage_content_14_max" jdbcType="FLOAT" property="harmonicVoltageContent14Max" />
+    <result column="harmonic_voltage_content_14_min" jdbcType="FLOAT" property="harmonicVoltageContent14Min" />
+    <result column="harmonic_voltage_content_14_avg" jdbcType="FLOAT" property="harmonicVoltageContent14Avg" />
+    <result column="harmonic_voltage_content_14_95" jdbcType="FLOAT" property="harmonicVoltageContent1495" />
+    <result column="harmonic_voltage_content_15_max" jdbcType="FLOAT" property="harmonicVoltageContent15Max" />
+    <result column="harmonic_voltage_content_15_min" jdbcType="FLOAT" property="harmonicVoltageContent15Min" />
+    <result column="harmonic_voltage_content_15_avg" jdbcType="FLOAT" property="harmonicVoltageContent15Avg" />
+    <result column="harmonic_voltage_content_15_95" jdbcType="FLOAT" property="harmonicVoltageContent1595" />
+    <result column="harmonic_voltage_content_16_max" jdbcType="FLOAT" property="harmonicVoltageContent16Max" />
+    <result column="harmonic_voltage_content_16_min" jdbcType="FLOAT" property="harmonicVoltageContent16Min" />
+    <result column="harmonic_voltage_content_16_avg" jdbcType="FLOAT" property="harmonicVoltageContent16Avg" />
+    <result column="harmonic_voltage_content_16_95" jdbcType="FLOAT" property="harmonicVoltageContent1695" />
+    <result column="harmonic_voltage_content_17_max" jdbcType="FLOAT" property="harmonicVoltageContent17Max" />
+    <result column="harmonic_voltage_content_17_min" jdbcType="FLOAT" property="harmonicVoltageContent17Min" />
+    <result column="harmonic_voltage_content_17_avg" jdbcType="FLOAT" property="harmonicVoltageContent17Avg" />
+    <result column="harmonic_voltage_content_17_95" jdbcType="FLOAT" property="harmonicVoltageContent1795" />
+    <result column="harmonic_voltage_content_18_max" jdbcType="FLOAT" property="harmonicVoltageContent18Max" />
+    <result column="harmonic_voltage_content_18_min" jdbcType="FLOAT" property="harmonicVoltageContent18Min" />
+    <result column="harmonic_voltage_content_18_avg" jdbcType="FLOAT" property="harmonicVoltageContent18Avg" />
+    <result column="harmonic_voltage_content_18_95" jdbcType="FLOAT" property="harmonicVoltageContent1895" />
+    <result column="harmonic_voltage_content_19_max" jdbcType="FLOAT" property="harmonicVoltageContent19Max" />
+    <result column="harmonic_voltage_content_19_min" jdbcType="FLOAT" property="harmonicVoltageContent19Min" />
+    <result column="harmonic_voltage_content_19_avg" jdbcType="FLOAT" property="harmonicVoltageContent19Avg" />
+    <result column="harmonic_voltage_content_19_95" jdbcType="FLOAT" property="harmonicVoltageContent1995" />
+    <result column="harmonic_voltage_content_20_max" jdbcType="FLOAT" property="harmonicVoltageContent20Max" />
+    <result column="harmonic_voltage_content_20_min" jdbcType="FLOAT" property="harmonicVoltageContent20Min" />
+    <result column="harmonic_voltage_content_20_avg" jdbcType="FLOAT" property="harmonicVoltageContent20Avg" />
+    <result column="harmonic_voltage_content_20_95" jdbcType="FLOAT" property="harmonicVoltageContent2095" />
+    <result column="harmonic_voltage_content_21_max" jdbcType="FLOAT" property="harmonicVoltageContent21Max" />
+    <result column="harmonic_voltage_content_21_min" jdbcType="FLOAT" property="harmonicVoltageContent21Min" />
+    <result column="harmonic_voltage_content_21_avg" jdbcType="FLOAT" property="harmonicVoltageContent21Avg" />
+    <result column="harmonic_voltage_content_21_95" jdbcType="FLOAT" property="harmonicVoltageContent2195" />
+    <result column="harmonic_voltage_content_22_max" jdbcType="FLOAT" property="harmonicVoltageContent22Max" />
+    <result column="harmonic_voltage_content_22_min" jdbcType="FLOAT" property="harmonicVoltageContent22Min" />
+    <result column="harmonic_voltage_content_22_avg" jdbcType="FLOAT" property="harmonicVoltageContent22Avg" />
+    <result column="harmonic_voltage_content_22_95" jdbcType="FLOAT" property="harmonicVoltageContent2295" />
+    <result column="harmonic_voltage_content_23_max" jdbcType="FLOAT" property="harmonicVoltageContent23Max" />
+    <result column="harmonic_voltage_content_23_min" jdbcType="FLOAT" property="harmonicVoltageContent23Min" />
+    <result column="harmonic_voltage_content_23_avg" jdbcType="FLOAT" property="harmonicVoltageContent23Avg" />
+    <result column="harmonic_voltage_content_23_95" jdbcType="FLOAT" property="harmonicVoltageContent2395" />
+    <result column="harmonic_voltage_content_24_max" jdbcType="FLOAT" property="harmonicVoltageContent24Max" />
+    <result column="harmonic_voltage_content_24_min" jdbcType="FLOAT" property="harmonicVoltageContent24Min" />
+    <result column="harmonic_voltage_content_24_avg" jdbcType="FLOAT" property="harmonicVoltageContent24Avg" />
+    <result column="harmonic_voltage_content_24_95" jdbcType="FLOAT" property="harmonicVoltageContent2495" />
+    <result column="harmonic_voltage_content_25_max" jdbcType="FLOAT" property="harmonicVoltageContent25Max" />
+    <result column="harmonic_voltage_content_25_min" jdbcType="FLOAT" property="harmonicVoltageContent25Min" />
+    <result column="harmonic_voltage_content_25_avg" jdbcType="FLOAT" property="harmonicVoltageContent25Avg" />
+    <result column="harmonic_voltage_content_25_95" jdbcType="FLOAT" property="harmonicVoltageContent2595" />
+    <result column="harmonic_voltage_content_26_max" jdbcType="FLOAT" property="harmonicVoltageContent26Max" />
+    <result column="harmonic_voltage_content_26_min" jdbcType="FLOAT" property="harmonicVoltageContent26Min" />
+    <result column="harmonic_voltage_content_26_avg" jdbcType="FLOAT" property="harmonicVoltageContent26Avg" />
+    <result column="harmonic_voltage_content_26_95" jdbcType="FLOAT" property="harmonicVoltageContent2695" />
+    <result column="harmonic_voltage_content_27_max" jdbcType="FLOAT" property="harmonicVoltageContent27Max" />
+    <result column="harmonic_voltage_content_27_min" jdbcType="FLOAT" property="harmonicVoltageContent27Min" />
+    <result column="harmonic_voltage_content_27_avg" jdbcType="FLOAT" property="harmonicVoltageContent27Avg" />
+    <result column="harmonic_voltage_content_27_95" jdbcType="FLOAT" property="harmonicVoltageContent2795" />
+    <result column="harmonic_voltage_content_28_max" jdbcType="FLOAT" property="harmonicVoltageContent28Max" />
+    <result column="harmonic_voltage_content_28_min" jdbcType="FLOAT" property="harmonicVoltageContent28Min" />
+    <result column="harmonic_voltage_content_28_avg" jdbcType="FLOAT" property="harmonicVoltageContent28Avg" />
+    <result column="harmonic_voltage_content_28_95" jdbcType="FLOAT" property="harmonicVoltageContent2895" />
+    <result column="harmonic_voltage_content_29_max" jdbcType="FLOAT" property="harmonicVoltageContent29Max" />
+    <result column="harmonic_voltage_content_29_min" jdbcType="FLOAT" property="harmonicVoltageContent29Min" />
+    <result column="harmonic_voltage_content_29_avg" jdbcType="FLOAT" property="harmonicVoltageContent29Avg" />
+    <result column="harmonic_voltage_content_29_95" jdbcType="FLOAT" property="harmonicVoltageContent2995" />
+    <result column="harmonic_voltage_content_30_max" jdbcType="FLOAT" property="harmonicVoltageContent30Max" />
+    <result column="harmonic_voltage_content_30_min" jdbcType="FLOAT" property="harmonicVoltageContent30Min" />
+    <result column="harmonic_voltage_content_30_avg" jdbcType="FLOAT" property="harmonicVoltageContent30Avg" />
+    <result column="harmonic_voltage_content_30_95" jdbcType="FLOAT" property="harmonicVoltageContent3095" />
+    <result column="harmonic_voltage_content_31_max" jdbcType="FLOAT" property="harmonicVoltageContent31Max" />
+    <result column="harmonic_voltage_content_31_min" jdbcType="FLOAT" property="harmonicVoltageContent31Min" />
+    <result column="harmonic_voltage_content_31_avg" jdbcType="FLOAT" property="harmonicVoltageContent31Avg" />
+    <result column="harmonic_voltage_content_31_95" jdbcType="FLOAT" property="harmonicVoltageContent3195" />
+    <result column="harmonic_voltage_content_32_max" jdbcType="FLOAT" property="harmonicVoltageContent32Max" />
+    <result column="harmonic_voltage_content_32_min" jdbcType="FLOAT" property="harmonicVoltageContent32Min" />
+    <result column="harmonic_voltage_content_32_avg" jdbcType="FLOAT" property="harmonicVoltageContent32Avg" />
+    <result column="harmonic_voltage_content_32_95" jdbcType="FLOAT" property="harmonicVoltageContent3295" />
+    <result column="harmonic_voltage_content_33_max" jdbcType="FLOAT" property="harmonicVoltageContent33Max" />
+    <result column="harmonic_voltage_content_33_min" jdbcType="FLOAT" property="harmonicVoltageContent33Min" />
+    <result column="harmonic_voltage_content_33_avg" jdbcType="FLOAT" property="harmonicVoltageContent33Avg" />
+    <result column="harmonic_voltage_content_33_95" jdbcType="FLOAT" property="harmonicVoltageContent3395" />
+    <result column="harmonic_voltage_content_34_max" jdbcType="FLOAT" property="harmonicVoltageContent34Max" />
+    <result column="harmonic_voltage_content_34_min" jdbcType="FLOAT" property="harmonicVoltageContent34Min" />
+    <result column="harmonic_voltage_content_34_avg" jdbcType="FLOAT" property="harmonicVoltageContent34Avg" />
+    <result column="harmonic_voltage_content_34_95" jdbcType="FLOAT" property="harmonicVoltageContent3495" />
+    <result column="harmonic_voltage_content_35_max" jdbcType="FLOAT" property="harmonicVoltageContent35Max" />
+    <result column="harmonic_voltage_content_35_min" jdbcType="FLOAT" property="harmonicVoltageContent35Min" />
+    <result column="harmonic_voltage_content_35_avg" jdbcType="FLOAT" property="harmonicVoltageContent35Avg" />
+    <result column="harmonic_voltage_content_35_95" jdbcType="FLOAT" property="harmonicVoltageContent3595" />
+    <result column="harmonic_voltage_content_36_max" jdbcType="FLOAT" property="harmonicVoltageContent36Max" />
+    <result column="harmonic_voltage_content_36_min" jdbcType="FLOAT" property="harmonicVoltageContent36Min" />
+    <result column="harmonic_voltage_content_36_avg" jdbcType="FLOAT" property="harmonicVoltageContent36Avg" />
+    <result column="harmonic_voltage_content_36_95" jdbcType="FLOAT" property="harmonicVoltageContent3695" />
+    <result column="harmonic_voltage_content_37_max" jdbcType="FLOAT" property="harmonicVoltageContent37Max" />
+    <result column="harmonic_voltage_content_37_min" jdbcType="FLOAT" property="harmonicVoltageContent37Min" />
+    <result column="harmonic_voltage_content_37_avg" jdbcType="FLOAT" property="harmonicVoltageContent37Avg" />
+    <result column="harmonic_voltage_content_37_95" jdbcType="FLOAT" property="harmonicVoltageContent3795" />
+    <result column="harmonic_voltage_content_38_max" jdbcType="FLOAT" property="harmonicVoltageContent38Max" />
+    <result column="harmonic_voltage_content_38_min" jdbcType="FLOAT" property="harmonicVoltageContent38Min" />
+    <result column="harmonic_voltage_content_38_avg" jdbcType="FLOAT" property="harmonicVoltageContent38Avg" />
+    <result column="harmonic_voltage_content_38_95" jdbcType="FLOAT" property="harmonicVoltageContent3895" />
+    <result column="harmonic_voltage_content_39_max" jdbcType="FLOAT" property="harmonicVoltageContent39Max" />
+    <result column="harmonic_voltage_content_39_min" jdbcType="FLOAT" property="harmonicVoltageContent39Min" />
+    <result column="harmonic_voltage_content_39_avg" jdbcType="FLOAT" property="harmonicVoltageContent39Avg" />
+    <result column="harmonic_voltage_content_39_95" jdbcType="FLOAT" property="harmonicVoltageContent3995" />
+    <result column="harmonic_voltage_content_40_max" jdbcType="FLOAT" property="harmonicVoltageContent40Max" />
+    <result column="harmonic_voltage_content_40_min" jdbcType="FLOAT" property="harmonicVoltageContent40Min" />
+    <result column="harmonic_voltage_content_40_avg" jdbcType="FLOAT" property="harmonicVoltageContent40Avg" />
+    <result column="harmonic_voltage_content_40_95" jdbcType="FLOAT" property="harmonicVoltageContent4095" />
+    <result column="harmonic_voltage_content_41_max" jdbcType="FLOAT" property="harmonicVoltageContent41Max" />
+    <result column="harmonic_voltage_content_41_min" jdbcType="FLOAT" property="harmonicVoltageContent41Min" />
+    <result column="harmonic_voltage_content_41_avg" jdbcType="FLOAT" property="harmonicVoltageContent41Avg" />
+    <result column="harmonic_voltage_content_41_95" jdbcType="FLOAT" property="harmonicVoltageContent4195" />
+    <result column="harmonic_voltage_content_42_max" jdbcType="FLOAT" property="harmonicVoltageContent42Max" />
+    <result column="harmonic_voltage_content_42_min" jdbcType="FLOAT" property="harmonicVoltageContent42Min" />
+    <result column="harmonic_voltage_content_42_avg" jdbcType="FLOAT" property="harmonicVoltageContent42Avg" />
+    <result column="harmonic_voltage_content_42_95" jdbcType="FLOAT" property="harmonicVoltageContent4295" />
+    <result column="harmonic_voltage_content_43_max" jdbcType="FLOAT" property="harmonicVoltageContent43Max" />
+    <result column="harmonic_voltage_content_43_min" jdbcType="FLOAT" property="harmonicVoltageContent43Min" />
+    <result column="harmonic_voltage_content_43_avg" jdbcType="FLOAT" property="harmonicVoltageContent43Avg" />
+    <result column="harmonic_voltage_content_43_95" jdbcType="FLOAT" property="harmonicVoltageContent4395" />
+    <result column="harmonic_voltage_content_44_max" jdbcType="FLOAT" property="harmonicVoltageContent44Max" />
+    <result column="harmonic_voltage_content_44_min" jdbcType="FLOAT" property="harmonicVoltageContent44Min" />
+    <result column="harmonic_voltage_content_44_avg" jdbcType="FLOAT" property="harmonicVoltageContent44Avg" />
+    <result column="harmonic_voltage_content_44_95" jdbcType="FLOAT" property="harmonicVoltageContent4495" />
+    <result column="harmonic_voltage_content_45_max" jdbcType="FLOAT" property="harmonicVoltageContent45Max" />
+    <result column="harmonic_voltage_content_45_min" jdbcType="FLOAT" property="harmonicVoltageContent45Min" />
+    <result column="harmonic_voltage_content_45_avg" jdbcType="FLOAT" property="harmonicVoltageContent45Avg" />
+    <result column="harmonic_voltage_content_45_95" jdbcType="FLOAT" property="harmonicVoltageContent4595" />
+    <result column="harmonic_voltage_content_46_max" jdbcType="FLOAT" property="harmonicVoltageContent46Max" />
+    <result column="harmonic_voltage_content_46_min" jdbcType="FLOAT" property="harmonicVoltageContent46Min" />
+    <result column="harmonic_voltage_content_46_avg" jdbcType="FLOAT" property="harmonicVoltageContent46Avg" />
+    <result column="harmonic_voltage_content_46_95" jdbcType="FLOAT" property="harmonicVoltageContent4695" />
+    <result column="harmonic_voltage_content_47_max" jdbcType="FLOAT" property="harmonicVoltageContent47Max" />
+    <result column="harmonic_voltage_content_47_min" jdbcType="FLOAT" property="harmonicVoltageContent47Min" />
+    <result column="harmonic_voltage_content_47_avg" jdbcType="FLOAT" property="harmonicVoltageContent47Avg" />
+    <result column="harmonic_voltage_content_47_95" jdbcType="FLOAT" property="harmonicVoltageContent4795" />
+    <result column="harmonic_voltage_content_48_max" jdbcType="FLOAT" property="harmonicVoltageContent48Max" />
+    <result column="harmonic_voltage_content_48_min" jdbcType="FLOAT" property="harmonicVoltageContent48Min" />
+    <result column="harmonic_voltage_content_48_avg" jdbcType="FLOAT" property="harmonicVoltageContent48Avg" />
+    <result column="harmonic_voltage_content_48_95" jdbcType="FLOAT" property="harmonicVoltageContent4895" />
+    <result column="harmonic_voltage_content_49_max" jdbcType="FLOAT" property="harmonicVoltageContent49Max" />
+    <result column="harmonic_voltage_content_49_min" jdbcType="FLOAT" property="harmonicVoltageContent49Min" />
+    <result column="harmonic_voltage_content_49_avg" jdbcType="FLOAT" property="harmonicVoltageContent49Avg" />
+    <result column="harmonic_voltage_content_49_95" jdbcType="FLOAT" property="harmonicVoltageContent4995" />
+    <result column="harmonic_voltage_content_50_max" jdbcType="FLOAT" property="harmonicVoltageContent50Max" />
+    <result column="harmonic_voltage_content_50_min" jdbcType="FLOAT" property="harmonicVoltageContent50Min" />
+    <result column="harmonic_voltage_content_50_avg" jdbcType="FLOAT" property="harmonicVoltageContent50Avg" />
+    <result column="harmonic_voltage_content_50_95" jdbcType="FLOAT" property="harmonicVoltageContent5095" />
+  </resultMap>
+  <sql id="Base_Column_List">
+    <!--@mbg.generated-->
+    measurement_point_id, data_date, phase, voltage_harmonic_thd_max, voltage_harmonic_thd_min, 
+    voltage_harmonic_thd_avg, voltage_harmonic_thd_95, fundamental_voltage_max, fundamental_voltage_min, 
+    fundamental_voltage_avg, fundamental_voltage_95, harmonic_voltage_content_2_max, 
+    harmonic_voltage_content_2_min, harmonic_voltage_content_2_avg, harmonic_voltage_content_2_95, 
+    harmonic_voltage_content_3_max, harmonic_voltage_content_3_min, harmonic_voltage_content_3_avg, 
+    harmonic_voltage_content_3_95, harmonic_voltage_content_4_max, harmonic_voltage_content_4_min, 
+    harmonic_voltage_content_4_avg, harmonic_voltage_content_4_95, harmonic_voltage_content_5_max, 
+    harmonic_voltage_content_5_min, harmonic_voltage_content_5_avg, harmonic_voltage_content_5_95, 
+    harmonic_voltage_content_6_max, harmonic_voltage_content_6_min, harmonic_voltage_content_6_avg, 
+    harmonic_voltage_content_6_95, harmonic_voltage_content_7_max, harmonic_voltage_content_7_min, 
+    harmonic_voltage_content_7_avg, harmonic_voltage_content_7_95, harmonic_voltage_content_8_max, 
+    harmonic_voltage_content_8_min, harmonic_voltage_content_8_avg, harmonic_voltage_content_8_95, 
+    harmonic_voltage_content_9_max, harmonic_voltage_content_9_min, harmonic_voltage_content_9_avg, 
+    harmonic_voltage_content_9_95, harmonic_voltage_content_10_max, harmonic_voltage_content_10_min, 
+    harmonic_voltage_content_10_avg, harmonic_voltage_content_10_95, harmonic_voltage_content_11_max, 
+    harmonic_voltage_content_11_min, harmonic_voltage_content_11_avg, harmonic_voltage_content_11_95, 
+    harmonic_voltage_content_12_max, harmonic_voltage_content_12_min, harmonic_voltage_content_12_avg, 
+    harmonic_voltage_content_12_95, harmonic_voltage_content_13_max, harmonic_voltage_content_13_min, 
+    harmonic_voltage_content_13_avg, harmonic_voltage_content_13_95, harmonic_voltage_content_14_max, 
+    harmonic_voltage_content_14_min, harmonic_voltage_content_14_avg, harmonic_voltage_content_14_95, 
+    harmonic_voltage_content_15_max, harmonic_voltage_content_15_min, harmonic_voltage_content_15_avg, 
+    harmonic_voltage_content_15_95, harmonic_voltage_content_16_max, harmonic_voltage_content_16_min, 
+    harmonic_voltage_content_16_avg, harmonic_voltage_content_16_95, harmonic_voltage_content_17_max, 
+    harmonic_voltage_content_17_min, harmonic_voltage_content_17_avg, harmonic_voltage_content_17_95, 
+    harmonic_voltage_content_18_max, harmonic_voltage_content_18_min, harmonic_voltage_content_18_avg, 
+    harmonic_voltage_content_18_95, harmonic_voltage_content_19_max, harmonic_voltage_content_19_min, 
+    harmonic_voltage_content_19_avg, harmonic_voltage_content_19_95, harmonic_voltage_content_20_max, 
+    harmonic_voltage_content_20_min, harmonic_voltage_content_20_avg, harmonic_voltage_content_20_95, 
+    harmonic_voltage_content_21_max, harmonic_voltage_content_21_min, harmonic_voltage_content_21_avg, 
+    harmonic_voltage_content_21_95, harmonic_voltage_content_22_max, harmonic_voltage_content_22_min, 
+    harmonic_voltage_content_22_avg, harmonic_voltage_content_22_95, harmonic_voltage_content_23_max, 
+    harmonic_voltage_content_23_min, harmonic_voltage_content_23_avg, harmonic_voltage_content_23_95, 
+    harmonic_voltage_content_24_max, harmonic_voltage_content_24_min, harmonic_voltage_content_24_avg, 
+    harmonic_voltage_content_24_95, harmonic_voltage_content_25_max, harmonic_voltage_content_25_min, 
+    harmonic_voltage_content_25_avg, harmonic_voltage_content_25_95, harmonic_voltage_content_26_max, 
+    harmonic_voltage_content_26_min, harmonic_voltage_content_26_avg, harmonic_voltage_content_26_95, 
+    harmonic_voltage_content_27_max, harmonic_voltage_content_27_min, harmonic_voltage_content_27_avg, 
+    harmonic_voltage_content_27_95, harmonic_voltage_content_28_max, harmonic_voltage_content_28_min, 
+    harmonic_voltage_content_28_avg, harmonic_voltage_content_28_95, harmonic_voltage_content_29_max, 
+    harmonic_voltage_content_29_min, harmonic_voltage_content_29_avg, harmonic_voltage_content_29_95, 
+    harmonic_voltage_content_30_max, harmonic_voltage_content_30_min, harmonic_voltage_content_30_avg, 
+    harmonic_voltage_content_30_95, harmonic_voltage_content_31_max, harmonic_voltage_content_31_min, 
+    harmonic_voltage_content_31_avg, harmonic_voltage_content_31_95, harmonic_voltage_content_32_max, 
+    harmonic_voltage_content_32_min, harmonic_voltage_content_32_avg, harmonic_voltage_content_32_95, 
+    harmonic_voltage_content_33_max, harmonic_voltage_content_33_min, harmonic_voltage_content_33_avg, 
+    harmonic_voltage_content_33_95, harmonic_voltage_content_34_max, harmonic_voltage_content_34_min, 
+    harmonic_voltage_content_34_avg, harmonic_voltage_content_34_95, harmonic_voltage_content_35_max, 
+    harmonic_voltage_content_35_min, harmonic_voltage_content_35_avg, harmonic_voltage_content_35_95, 
+    harmonic_voltage_content_36_max, harmonic_voltage_content_36_min, harmonic_voltage_content_36_avg, 
+    harmonic_voltage_content_36_95, harmonic_voltage_content_37_max, harmonic_voltage_content_37_min, 
+    harmonic_voltage_content_37_avg, harmonic_voltage_content_37_95, harmonic_voltage_content_38_max, 
+    harmonic_voltage_content_38_min, harmonic_voltage_content_38_avg, harmonic_voltage_content_38_95, 
+    harmonic_voltage_content_39_max, harmonic_voltage_content_39_min, harmonic_voltage_content_39_avg, 
+    harmonic_voltage_content_39_95, harmonic_voltage_content_40_max, harmonic_voltage_content_40_min, 
+    harmonic_voltage_content_40_avg, harmonic_voltage_content_40_95, harmonic_voltage_content_41_max, 
+    harmonic_voltage_content_41_min, harmonic_voltage_content_41_avg, harmonic_voltage_content_41_95, 
+    harmonic_voltage_content_42_max, harmonic_voltage_content_42_min, harmonic_voltage_content_42_avg, 
+    harmonic_voltage_content_42_95, harmonic_voltage_content_43_max, harmonic_voltage_content_43_min, 
+    harmonic_voltage_content_43_avg, harmonic_voltage_content_43_95, harmonic_voltage_content_44_max, 
+    harmonic_voltage_content_44_min, harmonic_voltage_content_44_avg, harmonic_voltage_content_44_95, 
+    harmonic_voltage_content_45_max, harmonic_voltage_content_45_min, harmonic_voltage_content_45_avg, 
+    harmonic_voltage_content_45_95, harmonic_voltage_content_46_max, harmonic_voltage_content_46_min, 
+    harmonic_voltage_content_46_avg, harmonic_voltage_content_46_95, harmonic_voltage_content_47_max, 
+    harmonic_voltage_content_47_min, harmonic_voltage_content_47_avg, harmonic_voltage_content_47_95, 
+    harmonic_voltage_content_48_max, harmonic_voltage_content_48_min, harmonic_voltage_content_48_avg, 
+    harmonic_voltage_content_48_95, harmonic_voltage_content_49_max, harmonic_voltage_content_49_min, 
+    harmonic_voltage_content_49_avg, harmonic_voltage_content_49_95, harmonic_voltage_content_50_max, 
+    harmonic_voltage_content_50_min, harmonic_voltage_content_50_avg, harmonic_voltage_content_50_95
+  </sql>
+</mapper>
\ No newline at end of file
diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/mapping/RMpInharmonicIMagReportDPOMapper.xml b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/mapping/RMpInharmonicIMagReportDPOMapper.xml
new file mode 100644
index 000000000..4aa71ff37
--- /dev/null
+++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/mapping/RMpInharmonicIMagReportDPOMapper.xml
@@ -0,0 +1,315 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.njcn.prepare.harmonic.mapper.line.RMpInharmonicIMagReportDPOMapper">
+  <resultMap id="BaseResultMap" type="com.njcn.prepare.harmonic.pojo.po.line.RMpInharmonicIMagReportDPO">
+    <!--@mbg.generated-->
+    <!--@Table r_mp_inharmonic_i_mag_report_d-->
+    <id column="measurement_point_id" jdbcType="VARCHAR" property="measurementPointId" />
+    <id column="data_date" jdbcType="DATE" property="dataDate" />
+    <id column="phase" jdbcType="VARCHAR" property="phase" />
+    <result column="simple_harmonic_current_effective_1_max" jdbcType="FLOAT" property="simpleHarmonicCurrentEffective1Max" />
+    <result column="simple_harmonic_current_effective_1_min" jdbcType="FLOAT" property="simpleHarmonicCurrentEffective1Min" />
+    <result column="simple_harmonic_current_effective_1_avg" jdbcType="FLOAT" property="simpleHarmonicCurrentEffective1Avg" />
+    <result column="simple_harmonic_current_effective_1_cp95" jdbcType="FLOAT" property="simpleHarmonicCurrentEffective1Cp95" />
+    <result column="simple_harmonic_current_effective_2_max" jdbcType="FLOAT" property="simpleHarmonicCurrentEffective2Max" />
+    <result column="simple_harmonic_current_effective_2_min" jdbcType="FLOAT" property="simpleHarmonicCurrentEffective2Min" />
+    <result column="simple_harmonic_current_effective_2_avg" jdbcType="FLOAT" property="simpleHarmonicCurrentEffective2Avg" />
+    <result column="simple_harmonic_current_effective_2_cp95" jdbcType="FLOAT" property="simpleHarmonicCurrentEffective2Cp95" />
+    <result column="simple_harmonic_current_effective_3_max" jdbcType="FLOAT" property="simpleHarmonicCurrentEffective3Max" />
+    <result column="simple_harmonic_current_effective_3_min" jdbcType="FLOAT" property="simpleHarmonicCurrentEffective3Min" />
+    <result column="simple_harmonic_current_effective_3_avg" jdbcType="FLOAT" property="simpleHarmonicCurrentEffective3Avg" />
+    <result column="simple_harmonic_current_effective_3_cp95" jdbcType="FLOAT" property="simpleHarmonicCurrentEffective3Cp95" />
+    <result column="simple_harmonic_current_effective_4_max" jdbcType="FLOAT" property="simpleHarmonicCurrentEffective4Max" />
+    <result column="simple_harmonic_current_effective_4_min" jdbcType="FLOAT" property="simpleHarmonicCurrentEffective4Min" />
+    <result column="simple_harmonic_current_effective_4_avg" jdbcType="FLOAT" property="simpleHarmonicCurrentEffective4Avg" />
+    <result column="simple_harmonic_current_effective_4_cp95" jdbcType="FLOAT" property="simpleHarmonicCurrentEffective4Cp95" />
+    <result column="simple_harmonic_current_effective_5_max" jdbcType="FLOAT" property="simpleHarmonicCurrentEffective5Max" />
+    <result column="simple_harmonic_current_effective_5_min" jdbcType="FLOAT" property="simpleHarmonicCurrentEffective5Min" />
+    <result column="simple_harmonic_current_effective_5_avg" jdbcType="FLOAT" property="simpleHarmonicCurrentEffective5Avg" />
+    <result column="simple_harmonic_current_effective_5_cp95" jdbcType="FLOAT" property="simpleHarmonicCurrentEffective5Cp95" />
+    <result column="simple_harmonic_current_effective_6_max" jdbcType="FLOAT" property="simpleHarmonicCurrentEffective6Max" />
+    <result column="simple_harmonic_current_effective_6_min" jdbcType="FLOAT" property="simpleHarmonicCurrentEffective6Min" />
+    <result column="simple_harmonic_current_effective_6_avg" jdbcType="FLOAT" property="simpleHarmonicCurrentEffective6Avg" />
+    <result column="simple_harmonic_current_effective_6_cp95" jdbcType="FLOAT" property="simpleHarmonicCurrentEffective6Cp95" />
+    <result column="simple_harmonic_current_effective_7_max" jdbcType="FLOAT" property="simpleHarmonicCurrentEffective7Max" />
+    <result column="simple_harmonic_current_effective_7_min" jdbcType="FLOAT" property="simpleHarmonicCurrentEffective7Min" />
+    <result column="simple_harmonic_current_effective_7_avg" jdbcType="FLOAT" property="simpleHarmonicCurrentEffective7Avg" />
+    <result column="simple_harmonic_current_effective_7_cp95" jdbcType="FLOAT" property="simpleHarmonicCurrentEffective7Cp95" />
+    <result column="simple_harmonic_current_effective_8_max" jdbcType="FLOAT" property="simpleHarmonicCurrentEffective8Max" />
+    <result column="simple_harmonic_current_effective_8_min" jdbcType="FLOAT" property="simpleHarmonicCurrentEffective8Min" />
+    <result column="simple_harmonic_current_effective_8_avg" jdbcType="FLOAT" property="simpleHarmonicCurrentEffective8Avg" />
+    <result column="simple_harmonic_current_effective_8_cp95" jdbcType="FLOAT" property="simpleHarmonicCurrentEffective8Cp95" />
+    <result column="simple_harmonic_current_effective_9_max" jdbcType="FLOAT" property="simpleHarmonicCurrentEffective9Max" />
+    <result column="simple_harmonic_current_effective_9_min" jdbcType="FLOAT" property="simpleHarmonicCurrentEffective9Min" />
+    <result column="simple_harmonic_current_effective_9_avg" jdbcType="FLOAT" property="simpleHarmonicCurrentEffective9Avg" />
+    <result column="simple_harmonic_current_effective_9_cp95" jdbcType="FLOAT" property="simpleHarmonicCurrentEffective9Cp95" />
+    <result column="simple_harmonic_current_effective_10_max" jdbcType="FLOAT" property="simpleHarmonicCurrentEffective10Max" />
+    <result column="simple_harmonic_current_effective_10_min" jdbcType="FLOAT" property="simpleHarmonicCurrentEffective10Min" />
+    <result column="simple_harmonic_current_effective_10_avg" jdbcType="FLOAT" property="simpleHarmonicCurrentEffective10Avg" />
+    <result column="simple_harmonic_current_effective_10_cp95" jdbcType="FLOAT" property="simpleHarmonicCurrentEffective10Cp95" />
+    <result column="simple_harmonic_current_effective_11_max" jdbcType="FLOAT" property="simpleHarmonicCurrentEffective11Max" />
+    <result column="simple_harmonic_current_effective_11_min" jdbcType="FLOAT" property="simpleHarmonicCurrentEffective11Min" />
+    <result column="simple_harmonic_current_effective_11_avg" jdbcType="FLOAT" property="simpleHarmonicCurrentEffective11Avg" />
+    <result column="simple_harmonic_current_effective_11_cp95" jdbcType="FLOAT" property="simpleHarmonicCurrentEffective11Cp95" />
+    <result column="simple_harmonic_current_effective_12_max" jdbcType="FLOAT" property="simpleHarmonicCurrentEffective12Max" />
+    <result column="simple_harmonic_current_effective_12_min" jdbcType="FLOAT" property="simpleHarmonicCurrentEffective12Min" />
+    <result column="simple_harmonic_current_effective_12_avg" jdbcType="FLOAT" property="simpleHarmonicCurrentEffective12Avg" />
+    <result column="simple_harmonic_current_effective_12_cp95" jdbcType="FLOAT" property="simpleHarmonicCurrentEffective12Cp95" />
+    <result column="simple_harmonic_current_effective_13_max" jdbcType="FLOAT" property="simpleHarmonicCurrentEffective13Max" />
+    <result column="simple_harmonic_current_effective_13_min" jdbcType="FLOAT" property="simpleHarmonicCurrentEffective13Min" />
+    <result column="simple_harmonic_current_effective_13_avg" jdbcType="FLOAT" property="simpleHarmonicCurrentEffective13Avg" />
+    <result column="simple_harmonic_current_effective_13_cp95" jdbcType="FLOAT" property="simpleHarmonicCurrentEffective13Cp95" />
+    <result column="simple_harmonic_current_effective_14_max" jdbcType="FLOAT" property="simpleHarmonicCurrentEffective14Max" />
+    <result column="simple_harmonic_current_effective_14_min" jdbcType="FLOAT" property="simpleHarmonicCurrentEffective14Min" />
+    <result column="simple_harmonic_current_effective_14_avg" jdbcType="FLOAT" property="simpleHarmonicCurrentEffective14Avg" />
+    <result column="simple_harmonic_current_effective_14_cp95" jdbcType="FLOAT" property="simpleHarmonicCurrentEffective14Cp95" />
+    <result column="simple_harmonic_current_effective_15_max" jdbcType="FLOAT" property="simpleHarmonicCurrentEffective15Max" />
+    <result column="simple_harmonic_current_effective_15_min" jdbcType="FLOAT" property="simpleHarmonicCurrentEffective15Min" />
+    <result column="simple_harmonic_current_effective_15_avg" jdbcType="FLOAT" property="simpleHarmonicCurrentEffective15Avg" />
+    <result column="simple_harmonic_current_effective_15_cp95" jdbcType="FLOAT" property="simpleHarmonicCurrentEffective15Cp95" />
+    <result column="simple_harmonic_current_effective_16_max" jdbcType="FLOAT" property="simpleHarmonicCurrentEffective16Max" />
+    <result column="simple_harmonic_current_effective_16_min" jdbcType="FLOAT" property="simpleHarmonicCurrentEffective16Min" />
+    <result column="simple_harmonic_current_effective_16_avg" jdbcType="FLOAT" property="simpleHarmonicCurrentEffective16Avg" />
+    <result column="simple_harmonic_current_effective_16_cp95" jdbcType="FLOAT" property="simpleHarmonicCurrentEffective16Cp95" />
+    <result column="simple_harmonic_current_effective_17_max" jdbcType="FLOAT" property="simpleHarmonicCurrentEffective17Max" />
+    <result column="simple_harmonic_current_effective_17_min" jdbcType="FLOAT" property="simpleHarmonicCurrentEffective17Min" />
+    <result column="simple_harmonic_current_effective_17_avg" jdbcType="FLOAT" property="simpleHarmonicCurrentEffective17Avg" />
+    <result column="simple_harmonic_current_effective_17_cp95" jdbcType="FLOAT" property="simpleHarmonicCurrentEffective17Cp95" />
+    <result column="simple_harmonic_current_effective_18_max" jdbcType="FLOAT" property="simpleHarmonicCurrentEffective18Max" />
+    <result column="simple_harmonic_current_effective_18_min" jdbcType="FLOAT" property="simpleHarmonicCurrentEffective18Min" />
+    <result column="simple_harmonic_current_effective_18_avg" jdbcType="FLOAT" property="simpleHarmonicCurrentEffective18Avg" />
+    <result column="simple_harmonic_current_effective_18_cp95" jdbcType="FLOAT" property="simpleHarmonicCurrentEffective18Cp95" />
+    <result column="simple_harmonic_current_effective_19_max" jdbcType="FLOAT" property="simpleHarmonicCurrentEffective19Max" />
+    <result column="simple_harmonic_current_effective_19_min" jdbcType="FLOAT" property="simpleHarmonicCurrentEffective19Min" />
+    <result column="simple_harmonic_current_effective_19_avg" jdbcType="FLOAT" property="simpleHarmonicCurrentEffective19Avg" />
+    <result column="simple_harmonic_current_effective_19_cp95" jdbcType="FLOAT" property="simpleHarmonicCurrentEffective19Cp95" />
+    <result column="simple_harmonic_current_effective_20_max" jdbcType="FLOAT" property="simpleHarmonicCurrentEffective20Max" />
+    <result column="simple_harmonic_current_effective_20_min" jdbcType="FLOAT" property="simpleHarmonicCurrentEffective20Min" />
+    <result column="simple_harmonic_current_effective_20_avg" jdbcType="FLOAT" property="simpleHarmonicCurrentEffective20Avg" />
+    <result column="simple_harmonic_current_effective_20_cp95" jdbcType="FLOAT" property="simpleHarmonicCurrentEffective20Cp95" />
+    <result column="simple_harmonic_current_effective_21_max" jdbcType="FLOAT" property="simpleHarmonicCurrentEffective21Max" />
+    <result column="simple_harmonic_current_effective_21_min" jdbcType="FLOAT" property="simpleHarmonicCurrentEffective21Min" />
+    <result column="simple_harmonic_current_effective_21_avg" jdbcType="FLOAT" property="simpleHarmonicCurrentEffective21Avg" />
+    <result column="simple_harmonic_current_effective_21_cp95" jdbcType="FLOAT" property="simpleHarmonicCurrentEffective21Cp95" />
+    <result column="simple_harmonic_current_effective_22_max" jdbcType="FLOAT" property="simpleHarmonicCurrentEffective22Max" />
+    <result column="simple_harmonic_current_effective_22_min" jdbcType="FLOAT" property="simpleHarmonicCurrentEffective22Min" />
+    <result column="simple_harmonic_current_effective_22_avg" jdbcType="FLOAT" property="simpleHarmonicCurrentEffective22Avg" />
+    <result column="simple_harmonic_current_effective_22_cp95" jdbcType="FLOAT" property="simpleHarmonicCurrentEffective22Cp95" />
+    <result column="simple_harmonic_current_effective_23_max" jdbcType="FLOAT" property="simpleHarmonicCurrentEffective23Max" />
+    <result column="simple_harmonic_current_effective_23_min" jdbcType="FLOAT" property="simpleHarmonicCurrentEffective23Min" />
+    <result column="simple_harmonic_current_effective_23_avg" jdbcType="FLOAT" property="simpleHarmonicCurrentEffective23Avg" />
+    <result column="simple_harmonic_current_effective_23_cp95" jdbcType="FLOAT" property="simpleHarmonicCurrentEffective23Cp95" />
+    <result column="simple_harmonic_current_effective_24_max" jdbcType="FLOAT" property="simpleHarmonicCurrentEffective24Max" />
+    <result column="simple_harmonic_current_effective_24_min" jdbcType="FLOAT" property="simpleHarmonicCurrentEffective24Min" />
+    <result column="simple_harmonic_current_effective_24_avg" jdbcType="FLOAT" property="simpleHarmonicCurrentEffective24Avg" />
+    <result column="simple_harmonic_current_effective_24_cp95" jdbcType="FLOAT" property="simpleHarmonicCurrentEffective24Cp95" />
+    <result column="simple_harmonic_current_effective_25_max" jdbcType="FLOAT" property="simpleHarmonicCurrentEffective25Max" />
+    <result column="simple_harmonic_current_effective_25_min" jdbcType="FLOAT" property="simpleHarmonicCurrentEffective25Min" />
+    <result column="simple_harmonic_current_effective_25_avg" jdbcType="FLOAT" property="simpleHarmonicCurrentEffective25Avg" />
+    <result column="simple_harmonic_current_effective_25_cp95" jdbcType="FLOAT" property="simpleHarmonicCurrentEffective25Cp95" />
+    <result column="simple_harmonic_current_effective_26_max" jdbcType="FLOAT" property="simpleHarmonicCurrentEffective26Max" />
+    <result column="simple_harmonic_current_effective_26_min" jdbcType="FLOAT" property="simpleHarmonicCurrentEffective26Min" />
+    <result column="simple_harmonic_current_effective_26_avg" jdbcType="FLOAT" property="simpleHarmonicCurrentEffective26Avg" />
+    <result column="simple_harmonic_current_effective_26_cp95" jdbcType="FLOAT" property="simpleHarmonicCurrentEffective26Cp95" />
+    <result column="simple_harmonic_current_effective_27_max" jdbcType="FLOAT" property="simpleHarmonicCurrentEffective27Max" />
+    <result column="simple_harmonic_current_effective_27_min" jdbcType="FLOAT" property="simpleHarmonicCurrentEffective27Min" />
+    <result column="simple_harmonic_current_effective_27_avg" jdbcType="FLOAT" property="simpleHarmonicCurrentEffective27Avg" />
+    <result column="simple_harmonic_current_effective_27_cp95" jdbcType="FLOAT" property="simpleHarmonicCurrentEffective27Cp95" />
+    <result column="simple_harmonic_current_effective_28_max" jdbcType="FLOAT" property="simpleHarmonicCurrentEffective28Max" />
+    <result column="simple_harmonic_current_effective_28_min" jdbcType="FLOAT" property="simpleHarmonicCurrentEffective28Min" />
+    <result column="simple_harmonic_current_effective_28_avg" jdbcType="FLOAT" property="simpleHarmonicCurrentEffective28Avg" />
+    <result column="simple_harmonic_current_effective_28_cp95" jdbcType="FLOAT" property="simpleHarmonicCurrentEffective28Cp95" />
+    <result column="simple_harmonic_current_effective_29_max" jdbcType="FLOAT" property="simpleHarmonicCurrentEffective29Max" />
+    <result column="simple_harmonic_current_effective_29_min" jdbcType="FLOAT" property="simpleHarmonicCurrentEffective29Min" />
+    <result column="simple_harmonic_current_effective_29_avg" jdbcType="FLOAT" property="simpleHarmonicCurrentEffective29Avg" />
+    <result column="simple_harmonic_current_effective_29_cp95" jdbcType="FLOAT" property="simpleHarmonicCurrentEffective29Cp95" />
+    <result column="simple_harmonic_current_effective_30_max" jdbcType="FLOAT" property="simpleHarmonicCurrentEffective30Max" />
+    <result column="simple_harmonic_current_effective_30_min" jdbcType="FLOAT" property="simpleHarmonicCurrentEffective30Min" />
+    <result column="simple_harmonic_current_effective_30_avg" jdbcType="FLOAT" property="simpleHarmonicCurrentEffective30Avg" />
+    <result column="simple_harmonic_current_effective_30_cp95" jdbcType="FLOAT" property="simpleHarmonicCurrentEffective30Cp95" />
+    <result column="simple_harmonic_current_effective_31_max" jdbcType="FLOAT" property="simpleHarmonicCurrentEffective31Max" />
+    <result column="simple_harmonic_current_effective_31_min" jdbcType="FLOAT" property="simpleHarmonicCurrentEffective31Min" />
+    <result column="simple_harmonic_current_effective_31_avg" jdbcType="FLOAT" property="simpleHarmonicCurrentEffective31Avg" />
+    <result column="simple_harmonic_current_effective_31_cp95" jdbcType="FLOAT" property="simpleHarmonicCurrentEffective31Cp95" />
+    <result column="simple_harmonic_current_effective_32_max" jdbcType="FLOAT" property="simpleHarmonicCurrentEffective32Max" />
+    <result column="simple_harmonic_current_effective_32_min" jdbcType="FLOAT" property="simpleHarmonicCurrentEffective32Min" />
+    <result column="simple_harmonic_current_effective_32_avg" jdbcType="FLOAT" property="simpleHarmonicCurrentEffective32Avg" />
+    <result column="simple_harmonic_current_effective_32_cp95" jdbcType="FLOAT" property="simpleHarmonicCurrentEffective32Cp95" />
+    <result column="simple_harmonic_current_effective_33_max" jdbcType="FLOAT" property="simpleHarmonicCurrentEffective33Max" />
+    <result column="simple_harmonic_current_effective_33_min" jdbcType="FLOAT" property="simpleHarmonicCurrentEffective33Min" />
+    <result column="simple_harmonic_current_effective_33_avg" jdbcType="FLOAT" property="simpleHarmonicCurrentEffective33Avg" />
+    <result column="simple_harmonic_current_effective_33_cp95" jdbcType="FLOAT" property="simpleHarmonicCurrentEffective33Cp95" />
+    <result column="simple_harmonic_current_effective_34_max" jdbcType="FLOAT" property="simpleHarmonicCurrentEffective34Max" />
+    <result column="simple_harmonic_current_effective_34_min" jdbcType="FLOAT" property="simpleHarmonicCurrentEffective34Min" />
+    <result column="simple_harmonic_current_effective_34_avg" jdbcType="FLOAT" property="simpleHarmonicCurrentEffective34Avg" />
+    <result column="simple_harmonic_current_effective_34_cp95" jdbcType="FLOAT" property="simpleHarmonicCurrentEffective34Cp95" />
+    <result column="simple_harmonic_current_effective_35_max" jdbcType="FLOAT" property="simpleHarmonicCurrentEffective35Max" />
+    <result column="simple_harmonic_current_effective_35_min" jdbcType="FLOAT" property="simpleHarmonicCurrentEffective35Min" />
+    <result column="simple_harmonic_current_effective_35_avg" jdbcType="FLOAT" property="simpleHarmonicCurrentEffective35Avg" />
+    <result column="simple_harmonic_current_effective_35_cp95" jdbcType="FLOAT" property="simpleHarmonicCurrentEffective35Cp95" />
+    <result column="simple_harmonic_current_effective_36_max" jdbcType="FLOAT" property="simpleHarmonicCurrentEffective36Max" />
+    <result column="simple_harmonic_current_effective_36_min" jdbcType="FLOAT" property="simpleHarmonicCurrentEffective36Min" />
+    <result column="simple_harmonic_current_effective_36_avg" jdbcType="FLOAT" property="simpleHarmonicCurrentEffective36Avg" />
+    <result column="simple_harmonic_current_effective_36_cp95" jdbcType="FLOAT" property="simpleHarmonicCurrentEffective36Cp95" />
+    <result column="simple_harmonic_current_effective_37_max" jdbcType="FLOAT" property="simpleHarmonicCurrentEffective37Max" />
+    <result column="simple_harmonic_current_effective_37_min" jdbcType="FLOAT" property="simpleHarmonicCurrentEffective37Min" />
+    <result column="simple_harmonic_current_effective_37_avg" jdbcType="FLOAT" property="simpleHarmonicCurrentEffective37Avg" />
+    <result column="simple_harmonic_current_effective_37_cp95" jdbcType="FLOAT" property="simpleHarmonicCurrentEffective37Cp95" />
+    <result column="simple_harmonic_current_effective_38_max" jdbcType="FLOAT" property="simpleHarmonicCurrentEffective38Max" />
+    <result column="simple_harmonic_current_effective_38_min" jdbcType="FLOAT" property="simpleHarmonicCurrentEffective38Min" />
+    <result column="simple_harmonic_current_effective_38_avg" jdbcType="FLOAT" property="simpleHarmonicCurrentEffective38Avg" />
+    <result column="simple_harmonic_current_effective_38_cp95" jdbcType="FLOAT" property="simpleHarmonicCurrentEffective38Cp95" />
+    <result column="simple_harmonic_current_effective_39_max" jdbcType="FLOAT" property="simpleHarmonicCurrentEffective39Max" />
+    <result column="simple_harmonic_current_effective_39_min" jdbcType="FLOAT" property="simpleHarmonicCurrentEffective39Min" />
+    <result column="simple_harmonic_current_effective_39_avg" jdbcType="FLOAT" property="simpleHarmonicCurrentEffective39Avg" />
+    <result column="simple_harmonic_current_effective_39_cp95" jdbcType="FLOAT" property="simpleHarmonicCurrentEffective39Cp95" />
+    <result column="simple_harmonic_current_effective_40_max" jdbcType="FLOAT" property="simpleHarmonicCurrentEffective40Max" />
+    <result column="simple_harmonic_current_effective_40_min" jdbcType="FLOAT" property="simpleHarmonicCurrentEffective40Min" />
+    <result column="simple_harmonic_current_effective_40_avg" jdbcType="FLOAT" property="simpleHarmonicCurrentEffective40Avg" />
+    <result column="simple_harmonic_current_effective_40_cp95" jdbcType="FLOAT" property="simpleHarmonicCurrentEffective40Cp95" />
+    <result column="simple_harmonic_current_effective_41_max" jdbcType="FLOAT" property="simpleHarmonicCurrentEffective41Max" />
+    <result column="simple_harmonic_current_effective_41_min" jdbcType="FLOAT" property="simpleHarmonicCurrentEffective41Min" />
+    <result column="simple_harmonic_current_effective_41_avg" jdbcType="FLOAT" property="simpleHarmonicCurrentEffective41Avg" />
+    <result column="simple_harmonic_current_effective_41_cp95" jdbcType="FLOAT" property="simpleHarmonicCurrentEffective41Cp95" />
+    <result column="simple_harmonic_current_effective_42_max" jdbcType="FLOAT" property="simpleHarmonicCurrentEffective42Max" />
+    <result column="simple_harmonic_current_effective_42_min" jdbcType="FLOAT" property="simpleHarmonicCurrentEffective42Min" />
+    <result column="simple_harmonic_current_effective_42_avg" jdbcType="FLOAT" property="simpleHarmonicCurrentEffective42Avg" />
+    <result column="simple_harmonic_current_effective_42_cp95" jdbcType="FLOAT" property="simpleHarmonicCurrentEffective42Cp95" />
+    <result column="simple_harmonic_current_effective_43_max" jdbcType="FLOAT" property="simpleHarmonicCurrentEffective43Max" />
+    <result column="simple_harmonic_current_effective_43_min" jdbcType="FLOAT" property="simpleHarmonicCurrentEffective43Min" />
+    <result column="simple_harmonic_current_effective_43_avg" jdbcType="FLOAT" property="simpleHarmonicCurrentEffective43Avg" />
+    <result column="simple_harmonic_current_effective_43_cp95" jdbcType="FLOAT" property="simpleHarmonicCurrentEffective43Cp95" />
+    <result column="simple_harmonic_current_effective_44_max" jdbcType="FLOAT" property="simpleHarmonicCurrentEffective44Max" />
+    <result column="simple_harmonic_current_effective_44_min" jdbcType="FLOAT" property="simpleHarmonicCurrentEffective44Min" />
+    <result column="simple_harmonic_current_effective_44_avg" jdbcType="FLOAT" property="simpleHarmonicCurrentEffective44Avg" />
+    <result column="simple_harmonic_current_effective_44_cp95" jdbcType="FLOAT" property="simpleHarmonicCurrentEffective44Cp95" />
+    <result column="simple_harmonic_current_effective_45_max" jdbcType="FLOAT" property="simpleHarmonicCurrentEffective45Max" />
+    <result column="simple_harmonic_current_effective_45_min" jdbcType="FLOAT" property="simpleHarmonicCurrentEffective45Min" />
+    <result column="simple_harmonic_current_effective_45_avg" jdbcType="FLOAT" property="simpleHarmonicCurrentEffective45Avg" />
+    <result column="simple_harmonic_current_effective_45_cp95" jdbcType="FLOAT" property="simpleHarmonicCurrentEffective45Cp95" />
+    <result column="simple_harmonic_current_effective_46_max" jdbcType="FLOAT" property="simpleHarmonicCurrentEffective46Max" />
+    <result column="simple_harmonic_current_effective_46_min" jdbcType="FLOAT" property="simpleHarmonicCurrentEffective46Min" />
+    <result column="simple_harmonic_current_effective_46_avg" jdbcType="FLOAT" property="simpleHarmonicCurrentEffective46Avg" />
+    <result column="simple_harmonic_current_effective_46_cp95" jdbcType="FLOAT" property="simpleHarmonicCurrentEffective46Cp95" />
+    <result column="simple_harmonic_current_effective_47_max" jdbcType="FLOAT" property="simpleHarmonicCurrentEffective47Max" />
+    <result column="simple_harmonic_current_effective_47_min" jdbcType="FLOAT" property="simpleHarmonicCurrentEffective47Min" />
+    <result column="simple_harmonic_current_effective_47_avg" jdbcType="FLOAT" property="simpleHarmonicCurrentEffective47Avg" />
+    <result column="simple_harmonic_current_effective_47_cp95" jdbcType="FLOAT" property="simpleHarmonicCurrentEffective47Cp95" />
+    <result column="simple_harmonic_current_effective_48_max" jdbcType="FLOAT" property="simpleHarmonicCurrentEffective48Max" />
+    <result column="simple_harmonic_current_effective_48_min" jdbcType="FLOAT" property="simpleHarmonicCurrentEffective48Min" />
+    <result column="simple_harmonic_current_effective_48_avg" jdbcType="FLOAT" property="simpleHarmonicCurrentEffective48Avg" />
+    <result column="simple_harmonic_current_effective_48_cp95" jdbcType="FLOAT" property="simpleHarmonicCurrentEffective48Cp95" />
+    <result column="simple_harmonic_current_effective_49_max" jdbcType="FLOAT" property="simpleHarmonicCurrentEffective49Max" />
+    <result column="simple_harmonic_current_effective_49_min" jdbcType="FLOAT" property="simpleHarmonicCurrentEffective49Min" />
+    <result column="simple_harmonic_current_effective_49_avg" jdbcType="FLOAT" property="simpleHarmonicCurrentEffective49Avg" />
+    <result column="simple_harmonic_current_effective_49_cp95" jdbcType="FLOAT" property="simpleHarmonicCurrentEffective49Cp95" />
+    <result column="simple_harmonic_current_effective_50_max" jdbcType="FLOAT" property="simpleHarmonicCurrentEffective50Max" />
+    <result column="simple_harmonic_current_effective_50_min" jdbcType="FLOAT" property="simpleHarmonicCurrentEffective50Min" />
+    <result column="simple_harmonic_current_effective_50_avg" jdbcType="FLOAT" property="simpleHarmonicCurrentEffective50Avg" />
+    <result column="simple_harmonic_current_effective_50_cp95" jdbcType="FLOAT" property="simpleHarmonicCurrentEffective50Cp95" />
+  </resultMap>
+  <sql id="Base_Column_List">
+    <!--@mbg.generated-->
+    measurement_point_id, data_date, phase, simple_harmonic_current_effective_1_max, 
+    simple_harmonic_current_effective_1_min, simple_harmonic_current_effective_1_avg, 
+    simple_harmonic_current_effective_1_cp95, simple_harmonic_current_effective_2_max, 
+    simple_harmonic_current_effective_2_min, simple_harmonic_current_effective_2_avg, 
+    simple_harmonic_current_effective_2_cp95, simple_harmonic_current_effective_3_max, 
+    simple_harmonic_current_effective_3_min, simple_harmonic_current_effective_3_avg, 
+    simple_harmonic_current_effective_3_cp95, simple_harmonic_current_effective_4_max, 
+    simple_harmonic_current_effective_4_min, simple_harmonic_current_effective_4_avg, 
+    simple_harmonic_current_effective_4_cp95, simple_harmonic_current_effective_5_max, 
+    simple_harmonic_current_effective_5_min, simple_harmonic_current_effective_5_avg, 
+    simple_harmonic_current_effective_5_cp95, simple_harmonic_current_effective_6_max, 
+    simple_harmonic_current_effective_6_min, simple_harmonic_current_effective_6_avg, 
+    simple_harmonic_current_effective_6_cp95, simple_harmonic_current_effective_7_max, 
+    simple_harmonic_current_effective_7_min, simple_harmonic_current_effective_7_avg, 
+    simple_harmonic_current_effective_7_cp95, simple_harmonic_current_effective_8_max, 
+    simple_harmonic_current_effective_8_min, simple_harmonic_current_effective_8_avg, 
+    simple_harmonic_current_effective_8_cp95, simple_harmonic_current_effective_9_max, 
+    simple_harmonic_current_effective_9_min, simple_harmonic_current_effective_9_avg, 
+    simple_harmonic_current_effective_9_cp95, simple_harmonic_current_effective_10_max, 
+    simple_harmonic_current_effective_10_min, simple_harmonic_current_effective_10_avg, 
+    simple_harmonic_current_effective_10_cp95, simple_harmonic_current_effective_11_max, 
+    simple_harmonic_current_effective_11_min, simple_harmonic_current_effective_11_avg, 
+    simple_harmonic_current_effective_11_cp95, simple_harmonic_current_effective_12_max, 
+    simple_harmonic_current_effective_12_min, simple_harmonic_current_effective_12_avg, 
+    simple_harmonic_current_effective_12_cp95, simple_harmonic_current_effective_13_max, 
+    simple_harmonic_current_effective_13_min, simple_harmonic_current_effective_13_avg, 
+    simple_harmonic_current_effective_13_cp95, simple_harmonic_current_effective_14_max, 
+    simple_harmonic_current_effective_14_min, simple_harmonic_current_effective_14_avg, 
+    simple_harmonic_current_effective_14_cp95, simple_harmonic_current_effective_15_max, 
+    simple_harmonic_current_effective_15_min, simple_harmonic_current_effective_15_avg, 
+    simple_harmonic_current_effective_15_cp95, simple_harmonic_current_effective_16_max, 
+    simple_harmonic_current_effective_16_min, simple_harmonic_current_effective_16_avg, 
+    simple_harmonic_current_effective_16_cp95, simple_harmonic_current_effective_17_max, 
+    simple_harmonic_current_effective_17_min, simple_harmonic_current_effective_17_avg, 
+    simple_harmonic_current_effective_17_cp95, simple_harmonic_current_effective_18_max, 
+    simple_harmonic_current_effective_18_min, simple_harmonic_current_effective_18_avg, 
+    simple_harmonic_current_effective_18_cp95, simple_harmonic_current_effective_19_max, 
+    simple_harmonic_current_effective_19_min, simple_harmonic_current_effective_19_avg, 
+    simple_harmonic_current_effective_19_cp95, simple_harmonic_current_effective_20_max, 
+    simple_harmonic_current_effective_20_min, simple_harmonic_current_effective_20_avg, 
+    simple_harmonic_current_effective_20_cp95, simple_harmonic_current_effective_21_max, 
+    simple_harmonic_current_effective_21_min, simple_harmonic_current_effective_21_avg, 
+    simple_harmonic_current_effective_21_cp95, simple_harmonic_current_effective_22_max, 
+    simple_harmonic_current_effective_22_min, simple_harmonic_current_effective_22_avg, 
+    simple_harmonic_current_effective_22_cp95, simple_harmonic_current_effective_23_max, 
+    simple_harmonic_current_effective_23_min, simple_harmonic_current_effective_23_avg, 
+    simple_harmonic_current_effective_23_cp95, simple_harmonic_current_effective_24_max, 
+    simple_harmonic_current_effective_24_min, simple_harmonic_current_effective_24_avg, 
+    simple_harmonic_current_effective_24_cp95, simple_harmonic_current_effective_25_max, 
+    simple_harmonic_current_effective_25_min, simple_harmonic_current_effective_25_avg, 
+    simple_harmonic_current_effective_25_cp95, simple_harmonic_current_effective_26_max, 
+    simple_harmonic_current_effective_26_min, simple_harmonic_current_effective_26_avg, 
+    simple_harmonic_current_effective_26_cp95, simple_harmonic_current_effective_27_max, 
+    simple_harmonic_current_effective_27_min, simple_harmonic_current_effective_27_avg, 
+    simple_harmonic_current_effective_27_cp95, simple_harmonic_current_effective_28_max, 
+    simple_harmonic_current_effective_28_min, simple_harmonic_current_effective_28_avg, 
+    simple_harmonic_current_effective_28_cp95, simple_harmonic_current_effective_29_max, 
+    simple_harmonic_current_effective_29_min, simple_harmonic_current_effective_29_avg, 
+    simple_harmonic_current_effective_29_cp95, simple_harmonic_current_effective_30_max, 
+    simple_harmonic_current_effective_30_min, simple_harmonic_current_effective_30_avg, 
+    simple_harmonic_current_effective_30_cp95, simple_harmonic_current_effective_31_max, 
+    simple_harmonic_current_effective_31_min, simple_harmonic_current_effective_31_avg, 
+    simple_harmonic_current_effective_31_cp95, simple_harmonic_current_effective_32_max, 
+    simple_harmonic_current_effective_32_min, simple_harmonic_current_effective_32_avg, 
+    simple_harmonic_current_effective_32_cp95, simple_harmonic_current_effective_33_max, 
+    simple_harmonic_current_effective_33_min, simple_harmonic_current_effective_33_avg, 
+    simple_harmonic_current_effective_33_cp95, simple_harmonic_current_effective_34_max, 
+    simple_harmonic_current_effective_34_min, simple_harmonic_current_effective_34_avg, 
+    simple_harmonic_current_effective_34_cp95, simple_harmonic_current_effective_35_max, 
+    simple_harmonic_current_effective_35_min, simple_harmonic_current_effective_35_avg, 
+    simple_harmonic_current_effective_35_cp95, simple_harmonic_current_effective_36_max, 
+    simple_harmonic_current_effective_36_min, simple_harmonic_current_effective_36_avg, 
+    simple_harmonic_current_effective_36_cp95, simple_harmonic_current_effective_37_max, 
+    simple_harmonic_current_effective_37_min, simple_harmonic_current_effective_37_avg, 
+    simple_harmonic_current_effective_37_cp95, simple_harmonic_current_effective_38_max, 
+    simple_harmonic_current_effective_38_min, simple_harmonic_current_effective_38_avg, 
+    simple_harmonic_current_effective_38_cp95, simple_harmonic_current_effective_39_max, 
+    simple_harmonic_current_effective_39_min, simple_harmonic_current_effective_39_avg, 
+    simple_harmonic_current_effective_39_cp95, simple_harmonic_current_effective_40_max, 
+    simple_harmonic_current_effective_40_min, simple_harmonic_current_effective_40_avg, 
+    simple_harmonic_current_effective_40_cp95, simple_harmonic_current_effective_41_max, 
+    simple_harmonic_current_effective_41_min, simple_harmonic_current_effective_41_avg, 
+    simple_harmonic_current_effective_41_cp95, simple_harmonic_current_effective_42_max, 
+    simple_harmonic_current_effective_42_min, simple_harmonic_current_effective_42_avg, 
+    simple_harmonic_current_effective_42_cp95, simple_harmonic_current_effective_43_max, 
+    simple_harmonic_current_effective_43_min, simple_harmonic_current_effective_43_avg, 
+    simple_harmonic_current_effective_43_cp95, simple_harmonic_current_effective_44_max, 
+    simple_harmonic_current_effective_44_min, simple_harmonic_current_effective_44_avg, 
+    simple_harmonic_current_effective_44_cp95, simple_harmonic_current_effective_45_max, 
+    simple_harmonic_current_effective_45_min, simple_harmonic_current_effective_45_avg, 
+    simple_harmonic_current_effective_45_cp95, simple_harmonic_current_effective_46_max, 
+    simple_harmonic_current_effective_46_min, simple_harmonic_current_effective_46_avg, 
+    simple_harmonic_current_effective_46_cp95, simple_harmonic_current_effective_47_max, 
+    simple_harmonic_current_effective_47_min, simple_harmonic_current_effective_47_avg, 
+    simple_harmonic_current_effective_47_cp95, simple_harmonic_current_effective_48_max, 
+    simple_harmonic_current_effective_48_min, simple_harmonic_current_effective_48_avg, 
+    simple_harmonic_current_effective_48_cp95, simple_harmonic_current_effective_49_max, 
+    simple_harmonic_current_effective_49_min, simple_harmonic_current_effective_49_avg, 
+    simple_harmonic_current_effective_49_cp95, simple_harmonic_current_effective_50_max, 
+    simple_harmonic_current_effective_50_min, simple_harmonic_current_effective_50_avg, 
+    simple_harmonic_current_effective_50_cp95
+  </sql>
+</mapper>
\ No newline at end of file
diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/mapping/RMpInharmonicIRateReportDPOMapper.xml b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/mapping/RMpInharmonicIRateReportDPOMapper.xml
new file mode 100644
index 000000000..cb4b2ee83
--- /dev/null
+++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/mapping/RMpInharmonicIRateReportDPOMapper.xml
@@ -0,0 +1,250 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.njcn.prepare.harmonic.mapper.line.RMpInharmonicIRateReportDPOMapper">
+  <resultMap id="BaseResultMap" type="com.njcn.prepare.harmonic.pojo.po.line.RMpInharmonicIRateReportDPO">
+    <!--@mbg.generated-->
+    <!--@Table r_mp_inharmonic_i_rate_report_d-->
+    <id column="measurement_point_id" jdbcType="VARCHAR" property="measurementPointId" />
+    <id column="data_date" jdbcType="DATE" property="dataDate" />
+    <id column="phase" jdbcType="VARCHAR" property="phase" />
+    <result column="inharm_i_2_max" jdbcType="FLOAT" property="inharmI2Max" />
+    <result column="inharm_i_2_min" jdbcType="FLOAT" property="inharmI2Min" />
+    <result column="inharm_i_2_avg" jdbcType="FLOAT" property="inharmI2Avg" />
+    <result column="inharm_i_2_cp95" jdbcType="FLOAT" property="inharmI2Cp95" />
+    <result column="inharm_i_3_max" jdbcType="FLOAT" property="inharmI3Max" />
+    <result column="inharm_i_3_min" jdbcType="FLOAT" property="inharmI3Min" />
+    <result column="inharm_i_3_avg" jdbcType="FLOAT" property="inharmI3Avg" />
+    <result column="inharm_i_3_cp95" jdbcType="FLOAT" property="inharmI3Cp95" />
+    <result column="inharm_i_4_max" jdbcType="FLOAT" property="inharmI4Max" />
+    <result column="inharm_i_4_min" jdbcType="FLOAT" property="inharmI4Min" />
+    <result column="inharm_i_4_avg" jdbcType="FLOAT" property="inharmI4Avg" />
+    <result column="inharm_i_4_cp95" jdbcType="FLOAT" property="inharmI4Cp95" />
+    <result column="inharm_i_5_max" jdbcType="FLOAT" property="inharmI5Max" />
+    <result column="inharm_i_5_min" jdbcType="FLOAT" property="inharmI5Min" />
+    <result column="inharm_i_5_avg" jdbcType="FLOAT" property="inharmI5Avg" />
+    <result column="inharm_i_5_cp95" jdbcType="FLOAT" property="inharmI5Cp95" />
+    <result column="inharm_i_6_max" jdbcType="FLOAT" property="inharmI6Max" />
+    <result column="inharm_i_6_min" jdbcType="FLOAT" property="inharmI6Min" />
+    <result column="inharm_i_6_avg" jdbcType="FLOAT" property="inharmI6Avg" />
+    <result column="inharm_i_6_cp95" jdbcType="FLOAT" property="inharmI6Cp95" />
+    <result column="inharm_i_7_max" jdbcType="FLOAT" property="inharmI7Max" />
+    <result column="inharm_i_7_min" jdbcType="FLOAT" property="inharmI7Min" />
+    <result column="inharm_i_7_avg" jdbcType="FLOAT" property="inharmI7Avg" />
+    <result column="inharm_i_7_cp95" jdbcType="FLOAT" property="inharmI7Cp95" />
+    <result column="inharm_i_8_max" jdbcType="FLOAT" property="inharmI8Max" />
+    <result column="inharm_i_8_min" jdbcType="FLOAT" property="inharmI8Min" />
+    <result column="inharm_i_8_avg" jdbcType="FLOAT" property="inharmI8Avg" />
+    <result column="inharm_i_8_cp95" jdbcType="FLOAT" property="inharmI8Cp95" />
+    <result column="inharm_i_9_max" jdbcType="FLOAT" property="inharmI9Max" />
+    <result column="inharm_i_9_min" jdbcType="FLOAT" property="inharmI9Min" />
+    <result column="inharm_i_9_avg" jdbcType="FLOAT" property="inharmI9Avg" />
+    <result column="inharm_i_9_cp95" jdbcType="FLOAT" property="inharmI9Cp95" />
+    <result column="inharm_i_10_max" jdbcType="FLOAT" property="inharmI10Max" />
+    <result column="inharm_i_10_min" jdbcType="FLOAT" property="inharmI10Min" />
+    <result column="inharm_i_10_avg" jdbcType="FLOAT" property="inharmI10Avg" />
+    <result column="inharm_i_10_cp95" jdbcType="FLOAT" property="inharmI10Cp95" />
+    <result column="inharm_i_11_max" jdbcType="FLOAT" property="inharmI11Max" />
+    <result column="inharm_i_11_min" jdbcType="FLOAT" property="inharmI11Min" />
+    <result column="inharm_i_11_avg" jdbcType="FLOAT" property="inharmI11Avg" />
+    <result column="inharm_i_11_cp95" jdbcType="FLOAT" property="inharmI11Cp95" />
+    <result column="inharm_i_12_max" jdbcType="FLOAT" property="inharmI12Max" />
+    <result column="inharm_i_12_min" jdbcType="FLOAT" property="inharmI12Min" />
+    <result column="inharm_i_12_avg" jdbcType="FLOAT" property="inharmI12Avg" />
+    <result column="inharm_i_12_cp95" jdbcType="FLOAT" property="inharmI12Cp95" />
+    <result column="inharm_i_13_max" jdbcType="FLOAT" property="inharmI13Max" />
+    <result column="inharm_i_13_min" jdbcType="FLOAT" property="inharmI13Min" />
+    <result column="inharm_i_13_avg" jdbcType="FLOAT" property="inharmI13Avg" />
+    <result column="inharm_i_13_cp95" jdbcType="FLOAT" property="inharmI13Cp95" />
+    <result column="inharm_i_14_max" jdbcType="FLOAT" property="inharmI14Max" />
+    <result column="inharm_i_14_min" jdbcType="FLOAT" property="inharmI14Min" />
+    <result column="inharm_i_14_avg" jdbcType="FLOAT" property="inharmI14Avg" />
+    <result column="inharm_i_14_cp95" jdbcType="FLOAT" property="inharmI14Cp95" />
+    <result column="inharm_i_15_max" jdbcType="FLOAT" property="inharmI15Max" />
+    <result column="inharm_i_15_min" jdbcType="FLOAT" property="inharmI15Min" />
+    <result column="inharm_i_15_avg" jdbcType="FLOAT" property="inharmI15Avg" />
+    <result column="inharm_i_15_cp95" jdbcType="FLOAT" property="inharmI15Cp95" />
+    <result column="inharm_i_16_max" jdbcType="FLOAT" property="inharmI16Max" />
+    <result column="inharm_i_16_min" jdbcType="FLOAT" property="inharmI16Min" />
+    <result column="inharm_i_16_avg" jdbcType="FLOAT" property="inharmI16Avg" />
+    <result column="inharm_i_16_cp95" jdbcType="FLOAT" property="inharmI16Cp95" />
+    <result column="inharm_i_17_max" jdbcType="FLOAT" property="inharmI17Max" />
+    <result column="inharm_i_17_min" jdbcType="FLOAT" property="inharmI17Min" />
+    <result column="inharm_i_17_avg" jdbcType="FLOAT" property="inharmI17Avg" />
+    <result column="inharm_i_17_cp95" jdbcType="FLOAT" property="inharmI17Cp95" />
+    <result column="inharm_i_18_max" jdbcType="FLOAT" property="inharmI18Max" />
+    <result column="inharm_i_18_min" jdbcType="FLOAT" property="inharmI18Min" />
+    <result column="inharm_i_18_avg" jdbcType="FLOAT" property="inharmI18Avg" />
+    <result column="inharm_i_18_cp95" jdbcType="FLOAT" property="inharmI18Cp95" />
+    <result column="inharm_i_19_max" jdbcType="FLOAT" property="inharmI19Max" />
+    <result column="inharm_i_19_min" jdbcType="FLOAT" property="inharmI19Min" />
+    <result column="inharm_i_19_avg" jdbcType="FLOAT" property="inharmI19Avg" />
+    <result column="inharm_i_19_cp95" jdbcType="FLOAT" property="inharmI19Cp95" />
+    <result column="inharm_i_20_max" jdbcType="FLOAT" property="inharmI20Max" />
+    <result column="inharm_i_20_min" jdbcType="FLOAT" property="inharmI20Min" />
+    <result column="inharm_i_20_avg" jdbcType="FLOAT" property="inharmI20Avg" />
+    <result column="inharm_i_20_cp95" jdbcType="FLOAT" property="inharmI20Cp95" />
+    <result column="inharm_i_21_max" jdbcType="FLOAT" property="inharmI21Max" />
+    <result column="inharm_i_21_min" jdbcType="FLOAT" property="inharmI21Min" />
+    <result column="inharm_i_21_avg" jdbcType="FLOAT" property="inharmI21Avg" />
+    <result column="inharm_i_21_cp95" jdbcType="FLOAT" property="inharmI21Cp95" />
+    <result column="inharm_i_22_max" jdbcType="FLOAT" property="inharmI22Max" />
+    <result column="inharm_i_22_min" jdbcType="FLOAT" property="inharmI22Min" />
+    <result column="inharm_i_22_avg" jdbcType="FLOAT" property="inharmI22Avg" />
+    <result column="inharm_i_22_cp95" jdbcType="FLOAT" property="inharmI22Cp95" />
+    <result column="inharm_i_23_max" jdbcType="FLOAT" property="inharmI23Max" />
+    <result column="inharm_i_23_min" jdbcType="FLOAT" property="inharmI23Min" />
+    <result column="inharm_i_23_avg" jdbcType="FLOAT" property="inharmI23Avg" />
+    <result column="inharm_i_23_cp95" jdbcType="FLOAT" property="inharmI23Cp95" />
+    <result column="inharm_i_24_max" jdbcType="FLOAT" property="inharmI24Max" />
+    <result column="inharm_i_24_min" jdbcType="FLOAT" property="inharmI24Min" />
+    <result column="inharm_i_24_avg" jdbcType="FLOAT" property="inharmI24Avg" />
+    <result column="inharm_i_24_cp95" jdbcType="FLOAT" property="inharmI24Cp95" />
+    <result column="inharm_i_25_max" jdbcType="FLOAT" property="inharmI25Max" />
+    <result column="inharm_i_25_min" jdbcType="FLOAT" property="inharmI25Min" />
+    <result column="inharm_i_25_avg" jdbcType="FLOAT" property="inharmI25Avg" />
+    <result column="inharm_i_25_cp95" jdbcType="FLOAT" property="inharmI25Cp95" />
+    <result column="inharm_i_26_max" jdbcType="FLOAT" property="inharmI26Max" />
+    <result column="inharm_i_26_min" jdbcType="FLOAT" property="inharmI26Min" />
+    <result column="inharm_i_26_avg" jdbcType="FLOAT" property="inharmI26Avg" />
+    <result column="inharm_i_26_cp95" jdbcType="FLOAT" property="inharmI26Cp95" />
+    <result column="inharm_i_27_max" jdbcType="FLOAT" property="inharmI27Max" />
+    <result column="inharm_i_27_min" jdbcType="FLOAT" property="inharmI27Min" />
+    <result column="inharm_i_27_avg" jdbcType="FLOAT" property="inharmI27Avg" />
+    <result column="inharm_i_27_cp95" jdbcType="FLOAT" property="inharmI27Cp95" />
+    <result column="inharm_i_28_max" jdbcType="FLOAT" property="inharmI28Max" />
+    <result column="inharm_i_28_min" jdbcType="FLOAT" property="inharmI28Min" />
+    <result column="inharm_i_28_avg" jdbcType="FLOAT" property="inharmI28Avg" />
+    <result column="inharm_i_28_cp95" jdbcType="FLOAT" property="inharmI28Cp95" />
+    <result column="inharm_i_29_max" jdbcType="FLOAT" property="inharmI29Max" />
+    <result column="inharm_i_29_min" jdbcType="FLOAT" property="inharmI29Min" />
+    <result column="inharm_i_29_avg" jdbcType="FLOAT" property="inharmI29Avg" />
+    <result column="inharm_i_29_cp95" jdbcType="FLOAT" property="inharmI29Cp95" />
+    <result column="inharm_i_30_max" jdbcType="FLOAT" property="inharmI30Max" />
+    <result column="inharm_i_30_min" jdbcType="FLOAT" property="inharmI30Min" />
+    <result column="inharm_i_30_avg" jdbcType="FLOAT" property="inharmI30Avg" />
+    <result column="inharm_i_30_cp95" jdbcType="FLOAT" property="inharmI30Cp95" />
+    <result column="inharm_i_31_max" jdbcType="FLOAT" property="inharmI31Max" />
+    <result column="inharm_i_31_min" jdbcType="FLOAT" property="inharmI31Min" />
+    <result column="inharm_i_31_avg" jdbcType="FLOAT" property="inharmI31Avg" />
+    <result column="inharm_i_31_cp95" jdbcType="FLOAT" property="inharmI31Cp95" />
+    <result column="inharm_i_32_max" jdbcType="FLOAT" property="inharmI32Max" />
+    <result column="inharm_i_32_min" jdbcType="FLOAT" property="inharmI32Min" />
+    <result column="inharm_i_32_avg" jdbcType="FLOAT" property="inharmI32Avg" />
+    <result column="inharm_i_32_cp95" jdbcType="FLOAT" property="inharmI32Cp95" />
+    <result column="inharm_i_33_max" jdbcType="FLOAT" property="inharmI33Max" />
+    <result column="inharm_i_33_min" jdbcType="FLOAT" property="inharmI33Min" />
+    <result column="inharm_i_33_avg" jdbcType="FLOAT" property="inharmI33Avg" />
+    <result column="inharm_i_33_cp95" jdbcType="FLOAT" property="inharmI33Cp95" />
+    <result column="inharm_i_34_max" jdbcType="FLOAT" property="inharmI34Max" />
+    <result column="inharm_i_34_min" jdbcType="FLOAT" property="inharmI34Min" />
+    <result column="inharm_i_34_avg" jdbcType="FLOAT" property="inharmI34Avg" />
+    <result column="inharm_i_34_cp95" jdbcType="FLOAT" property="inharmI34Cp95" />
+    <result column="inharm_i_35_max" jdbcType="FLOAT" property="inharmI35Max" />
+    <result column="inharm_i_35_min" jdbcType="FLOAT" property="inharmI35Min" />
+    <result column="inharm_i_35_avg" jdbcType="FLOAT" property="inharmI35Avg" />
+    <result column="inharm_i_35_cp95" jdbcType="FLOAT" property="inharmI35Cp95" />
+    <result column="inharm_i_36_max" jdbcType="FLOAT" property="inharmI36Max" />
+    <result column="inharm_i_36_min" jdbcType="FLOAT" property="inharmI36Min" />
+    <result column="inharm_i_36_avg" jdbcType="FLOAT" property="inharmI36Avg" />
+    <result column="inharm_i_36_cp95" jdbcType="FLOAT" property="inharmI36Cp95" />
+    <result column="inharm_i_37_max" jdbcType="FLOAT" property="inharmI37Max" />
+    <result column="inharm_i_37_min" jdbcType="FLOAT" property="inharmI37Min" />
+    <result column="inharm_i_37_avg" jdbcType="FLOAT" property="inharmI37Avg" />
+    <result column="inharm_i_37_cp95" jdbcType="FLOAT" property="inharmI37Cp95" />
+    <result column="inharm_i_38_max" jdbcType="FLOAT" property="inharmI38Max" />
+    <result column="inharm_i_38_min" jdbcType="FLOAT" property="inharmI38Min" />
+    <result column="inharm_i_38_avg" jdbcType="FLOAT" property="inharmI38Avg" />
+    <result column="inharm_i_38_cp95" jdbcType="FLOAT" property="inharmI38Cp95" />
+    <result column="inharm_i_39_max" jdbcType="FLOAT" property="inharmI39Max" />
+    <result column="inharm_i_39_min" jdbcType="FLOAT" property="inharmI39Min" />
+    <result column="inharm_i_39_avg" jdbcType="FLOAT" property="inharmI39Avg" />
+    <result column="inharm_i_39_cp95" jdbcType="FLOAT" property="inharmI39Cp95" />
+    <result column="inharm_i_40_max" jdbcType="FLOAT" property="inharmI40Max" />
+    <result column="inharm_i_40_min" jdbcType="FLOAT" property="inharmI40Min" />
+    <result column="inharm_i_40_avg" jdbcType="FLOAT" property="inharmI40Avg" />
+    <result column="inharm_i_40_cp95" jdbcType="FLOAT" property="inharmI40Cp95" />
+    <result column="inharm_i_41_max" jdbcType="FLOAT" property="inharmI41Max" />
+    <result column="inharm_i_41_min" jdbcType="FLOAT" property="inharmI41Min" />
+    <result column="inharm_i_41_avg" jdbcType="FLOAT" property="inharmI41Avg" />
+    <result column="inharm_i_41_cp95" jdbcType="FLOAT" property="inharmI41Cp95" />
+    <result column="inharm_i_42_max" jdbcType="FLOAT" property="inharmI42Max" />
+    <result column="inharm_i_42_min" jdbcType="FLOAT" property="inharmI42Min" />
+    <result column="inharm_i_42_avg" jdbcType="FLOAT" property="inharmI42Avg" />
+    <result column="inharm_i_42_cp95" jdbcType="FLOAT" property="inharmI42Cp95" />
+    <result column="inharm_i_43_max" jdbcType="FLOAT" property="inharmI43Max" />
+    <result column="inharm_i_43_min" jdbcType="FLOAT" property="inharmI43Min" />
+    <result column="inharm_i_43_avg" jdbcType="FLOAT" property="inharmI43Avg" />
+    <result column="inharm_i_43_cp95" jdbcType="FLOAT" property="inharmI43Cp95" />
+    <result column="inharm_i_44_max" jdbcType="FLOAT" property="inharmI44Max" />
+    <result column="inharm_i_44_min" jdbcType="FLOAT" property="inharmI44Min" />
+    <result column="inharm_i_44_avg" jdbcType="FLOAT" property="inharmI44Avg" />
+    <result column="inharm_i_44_cp95" jdbcType="FLOAT" property="inharmI44Cp95" />
+    <result column="inharm_i_45_max" jdbcType="FLOAT" property="inharmI45Max" />
+    <result column="inharm_i_45_min" jdbcType="FLOAT" property="inharmI45Min" />
+    <result column="inharm_i_45_avg" jdbcType="FLOAT" property="inharmI45Avg" />
+    <result column="inharm_i_45_cp95" jdbcType="FLOAT" property="inharmI45Cp95" />
+    <result column="inharm_i_46_max" jdbcType="FLOAT" property="inharmI46Max" />
+    <result column="inharm_i_46_min" jdbcType="FLOAT" property="inharmI46Min" />
+    <result column="inharm_i_46_avg" jdbcType="FLOAT" property="inharmI46Avg" />
+    <result column="inharm_i_46_cp95" jdbcType="FLOAT" property="inharmI46Cp95" />
+    <result column="inharm_i_47_max" jdbcType="FLOAT" property="inharmI47Max" />
+    <result column="inharm_i_47_min" jdbcType="FLOAT" property="inharmI47Min" />
+    <result column="inharm_i_47_avg" jdbcType="FLOAT" property="inharmI47Avg" />
+    <result column="inharm_i_47_cp95" jdbcType="FLOAT" property="inharmI47Cp95" />
+    <result column="inharm_i_48_max" jdbcType="FLOAT" property="inharmI48Max" />
+    <result column="inharm_i_48_min" jdbcType="FLOAT" property="inharmI48Min" />
+    <result column="inharm_i_48_avg" jdbcType="FLOAT" property="inharmI48Avg" />
+    <result column="inharm_i_48_cp95" jdbcType="FLOAT" property="inharmI48Cp95" />
+    <result column="inharm_i_49_max" jdbcType="FLOAT" property="inharmI49Max" />
+    <result column="inharm_i_49_min" jdbcType="FLOAT" property="inharmI49Min" />
+    <result column="inharm_i_49_avg" jdbcType="FLOAT" property="inharmI49Avg" />
+    <result column="inharm_i_49_cp95" jdbcType="FLOAT" property="inharmI49Cp95" />
+    <result column="inharm_i_50_max" jdbcType="FLOAT" property="inharmI50Max" />
+    <result column="inharm_i_50_min" jdbcType="FLOAT" property="inharmI50Min" />
+    <result column="inharm_i_50_avg" jdbcType="FLOAT" property="inharmI50Avg" />
+    <result column="inharm_i_50_cp95" jdbcType="FLOAT" property="inharmI50Cp95" />
+  </resultMap>
+  <sql id="Base_Column_List">
+    <!--@mbg.generated-->
+    measurement_point_id, data_date, phase, inharm_i_2_max, inharm_i_2_min, inharm_i_2_avg, 
+    inharm_i_2_cp95, inharm_i_3_max, inharm_i_3_min, inharm_i_3_avg, inharm_i_3_cp95, 
+    inharm_i_4_max, inharm_i_4_min, inharm_i_4_avg, inharm_i_4_cp95, inharm_i_5_max, 
+    inharm_i_5_min, inharm_i_5_avg, inharm_i_5_cp95, inharm_i_6_max, inharm_i_6_min, 
+    inharm_i_6_avg, inharm_i_6_cp95, inharm_i_7_max, inharm_i_7_min, inharm_i_7_avg, 
+    inharm_i_7_cp95, inharm_i_8_max, inharm_i_8_min, inharm_i_8_avg, inharm_i_8_cp95, 
+    inharm_i_9_max, inharm_i_9_min, inharm_i_9_avg, inharm_i_9_cp95, inharm_i_10_max, 
+    inharm_i_10_min, inharm_i_10_avg, inharm_i_10_cp95, inharm_i_11_max, inharm_i_11_min, 
+    inharm_i_11_avg, inharm_i_11_cp95, inharm_i_12_max, inharm_i_12_min, inharm_i_12_avg, 
+    inharm_i_12_cp95, inharm_i_13_max, inharm_i_13_min, inharm_i_13_avg, inharm_i_13_cp95, 
+    inharm_i_14_max, inharm_i_14_min, inharm_i_14_avg, inharm_i_14_cp95, inharm_i_15_max, 
+    inharm_i_15_min, inharm_i_15_avg, inharm_i_15_cp95, inharm_i_16_max, inharm_i_16_min, 
+    inharm_i_16_avg, inharm_i_16_cp95, inharm_i_17_max, inharm_i_17_min, inharm_i_17_avg, 
+    inharm_i_17_cp95, inharm_i_18_max, inharm_i_18_min, inharm_i_18_avg, inharm_i_18_cp95, 
+    inharm_i_19_max, inharm_i_19_min, inharm_i_19_avg, inharm_i_19_cp95, inharm_i_20_max, 
+    inharm_i_20_min, inharm_i_20_avg, inharm_i_20_cp95, inharm_i_21_max, inharm_i_21_min, 
+    inharm_i_21_avg, inharm_i_21_cp95, inharm_i_22_max, inharm_i_22_min, inharm_i_22_avg, 
+    inharm_i_22_cp95, inharm_i_23_max, inharm_i_23_min, inharm_i_23_avg, inharm_i_23_cp95, 
+    inharm_i_24_max, inharm_i_24_min, inharm_i_24_avg, inharm_i_24_cp95, inharm_i_25_max, 
+    inharm_i_25_min, inharm_i_25_avg, inharm_i_25_cp95, inharm_i_26_max, inharm_i_26_min, 
+    inharm_i_26_avg, inharm_i_26_cp95, inharm_i_27_max, inharm_i_27_min, inharm_i_27_avg, 
+    inharm_i_27_cp95, inharm_i_28_max, inharm_i_28_min, inharm_i_28_avg, inharm_i_28_cp95, 
+    inharm_i_29_max, inharm_i_29_min, inharm_i_29_avg, inharm_i_29_cp95, inharm_i_30_max, 
+    inharm_i_30_min, inharm_i_30_avg, inharm_i_30_cp95, inharm_i_31_max, inharm_i_31_min, 
+    inharm_i_31_avg, inharm_i_31_cp95, inharm_i_32_max, inharm_i_32_min, inharm_i_32_avg, 
+    inharm_i_32_cp95, inharm_i_33_max, inharm_i_33_min, inharm_i_33_avg, inharm_i_33_cp95, 
+    inharm_i_34_max, inharm_i_34_min, inharm_i_34_avg, inharm_i_34_cp95, inharm_i_35_max, 
+    inharm_i_35_min, inharm_i_35_avg, inharm_i_35_cp95, inharm_i_36_max, inharm_i_36_min, 
+    inharm_i_36_avg, inharm_i_36_cp95, inharm_i_37_max, inharm_i_37_min, inharm_i_37_avg, 
+    inharm_i_37_cp95, inharm_i_38_max, inharm_i_38_min, inharm_i_38_avg, inharm_i_38_cp95, 
+    inharm_i_39_max, inharm_i_39_min, inharm_i_39_avg, inharm_i_39_cp95, inharm_i_40_max, 
+    inharm_i_40_min, inharm_i_40_avg, inharm_i_40_cp95, inharm_i_41_max, inharm_i_41_min, 
+    inharm_i_41_avg, inharm_i_41_cp95, inharm_i_42_max, inharm_i_42_min, inharm_i_42_avg, 
+    inharm_i_42_cp95, inharm_i_43_max, inharm_i_43_min, inharm_i_43_avg, inharm_i_43_cp95, 
+    inharm_i_44_max, inharm_i_44_min, inharm_i_44_avg, inharm_i_44_cp95, inharm_i_45_max, 
+    inharm_i_45_min, inharm_i_45_avg, inharm_i_45_cp95, inharm_i_46_max, inharm_i_46_min, 
+    inharm_i_46_avg, inharm_i_46_cp95, inharm_i_47_max, inharm_i_47_min, inharm_i_47_avg, 
+    inharm_i_47_cp95, inharm_i_48_max, inharm_i_48_min, inharm_i_48_avg, inharm_i_48_cp95, 
+    inharm_i_49_max, inharm_i_49_min, inharm_i_49_avg, inharm_i_49_cp95, inharm_i_50_max, 
+    inharm_i_50_min, inharm_i_50_avg, inharm_i_50_cp95
+  </sql>
+</mapper>
\ No newline at end of file
diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/mapping/RMpInharmonicVRateReportDPOMapper.xml b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/mapping/RMpInharmonicVRateReportDPOMapper.xml
new file mode 100644
index 000000000..578d48981
--- /dev/null
+++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/mapping/RMpInharmonicVRateReportDPOMapper.xml
@@ -0,0 +1,281 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.njcn.prepare.harmonic.mapper.line.RMpInharmonicVRateReportDPOMapper">
+  <resultMap id="BaseResultMap" type="com.njcn.prepare.harmonic.pojo.po.line.RMpInharmonicVRateReportDPO">
+    <!--@mbg.generated-->
+    <!--@Table r_mp_inharmonic_v_rate_report_d-->
+    <id column="measurement_point_id" jdbcType="VARCHAR" property="measurementPointId" />
+    <id column="data_date" jdbcType="DATE" property="dataDate" />
+    <id column="phase" jdbcType="VARCHAR" property="phase" />
+    <result column="centre_harmonic_voltage_content1_max" jdbcType="FLOAT" property="centreHarmonicVoltageContent1Max" />
+    <result column="centre_harmonic_voltage_content1_min" jdbcType="FLOAT" property="centreHarmonicVoltageContent1Min" />
+    <result column="centre_harmonic_voltage_content1_avg" jdbcType="FLOAT" property="centreHarmonicVoltageContent1Avg" />
+    <result column="centre_harmonic_voltage_content1_cp95" jdbcType="FLOAT" property="centreHarmonicVoltageContent1Cp95" />
+    <result column="centre_harmonic_voltage_content2_max" jdbcType="FLOAT" property="centreHarmonicVoltageContent2Max" />
+    <result column="centre_harmonic_voltage_content2_min" jdbcType="FLOAT" property="centreHarmonicVoltageContent2Min" />
+    <result column="centre_harmonic_voltage_content2_avg" jdbcType="FLOAT" property="centreHarmonicVoltageContent2Avg" />
+    <result column="centre_harmonic_voltage_content2_cp95" jdbcType="FLOAT" property="centreHarmonicVoltageContent2Cp95" />
+    <result column="centre_harmonic_voltage_content3_max" jdbcType="FLOAT" property="centreHarmonicVoltageContent3Max" />
+    <result column="centre_harmonic_voltage_content3_min" jdbcType="FLOAT" property="centreHarmonicVoltageContent3Min" />
+    <result column="centre_harmonic_voltage_content3_avg" jdbcType="FLOAT" property="centreHarmonicVoltageContent3Avg" />
+    <result column="centre_harmonic_voltage_content3_cp95" jdbcType="FLOAT" property="centreHarmonicVoltageContent3Cp95" />
+    <result column="centre_harmonic_voltage_content4_max" jdbcType="FLOAT" property="centreHarmonicVoltageContent4Max" />
+    <result column="centre_harmonic_voltage_content4_min" jdbcType="FLOAT" property="centreHarmonicVoltageContent4Min" />
+    <result column="centre_harmonic_voltage_content4_avg" jdbcType="FLOAT" property="centreHarmonicVoltageContent4Avg" />
+    <result column="centre_harmonic_voltage_content4_cp95" jdbcType="FLOAT" property="centreHarmonicVoltageContent4Cp95" />
+    <result column="centre_harmonic_voltage_content5_max" jdbcType="FLOAT" property="centreHarmonicVoltageContent5Max" />
+    <result column="centre_harmonic_voltage_content5_min" jdbcType="FLOAT" property="centreHarmonicVoltageContent5Min" />
+    <result column="centre_harmonic_voltage_content5_avg" jdbcType="FLOAT" property="centreHarmonicVoltageContent5Avg" />
+    <result column="centre_harmonic_voltage_content5_cp95" jdbcType="FLOAT" property="centreHarmonicVoltageContent5Cp95" />
+    <result column="centre_harmonic_voltage_content6_max" jdbcType="FLOAT" property="centreHarmonicVoltageContent6Max" />
+    <result column="centre_harmonic_voltage_content6_min" jdbcType="FLOAT" property="centreHarmonicVoltageContent6Min" />
+    <result column="centre_harmonic_voltage_content6_avg" jdbcType="FLOAT" property="centreHarmonicVoltageContent6Avg" />
+    <result column="centre_harmonic_voltage_content6_cp95" jdbcType="FLOAT" property="centreHarmonicVoltageContent6Cp95" />
+    <result column="centre_harmonic_voltage_content7_max" jdbcType="FLOAT" property="centreHarmonicVoltageContent7Max" />
+    <result column="centre_harmonic_voltage_content7_min" jdbcType="FLOAT" property="centreHarmonicVoltageContent7Min" />
+    <result column="centre_harmonic_voltage_content7_avg" jdbcType="FLOAT" property="centreHarmonicVoltageContent7Avg" />
+    <result column="centre_harmonic_voltage_content7_cp95" jdbcType="FLOAT" property="centreHarmonicVoltageContent7Cp95" />
+    <result column="centre_harmonic_voltage_content8_max" jdbcType="FLOAT" property="centreHarmonicVoltageContent8Max" />
+    <result column="centre_harmonic_voltage_content8_min" jdbcType="FLOAT" property="centreHarmonicVoltageContent8Min" />
+    <result column="centre_harmonic_voltage_content8_avg" jdbcType="FLOAT" property="centreHarmonicVoltageContent8Avg" />
+    <result column="centre_harmonic_voltage_content8_cp95" jdbcType="FLOAT" property="centreHarmonicVoltageContent8Cp95" />
+    <result column="centre_harmonic_voltage_content9_max" jdbcType="FLOAT" property="centreHarmonicVoltageContent9Max" />
+    <result column="centre_harmonic_voltage_content9_min" jdbcType="FLOAT" property="centreHarmonicVoltageContent9Min" />
+    <result column="centre_harmonic_voltage_content9_avg" jdbcType="FLOAT" property="centreHarmonicVoltageContent9Avg" />
+    <result column="centre_harmonic_voltage_content9_cp95" jdbcType="FLOAT" property="centreHarmonicVoltageContent9Cp95" />
+    <result column="centre_harmonic_voltage_content10_max" jdbcType="FLOAT" property="centreHarmonicVoltageContent10Max" />
+    <result column="centre_harmonic_voltage_content10_min" jdbcType="FLOAT" property="centreHarmonicVoltageContent10Min" />
+    <result column="centre_harmonic_voltage_content10_avg" jdbcType="FLOAT" property="centreHarmonicVoltageContent10Avg" />
+    <result column="centre_harmonic_voltage_content10_cp95" jdbcType="FLOAT" property="centreHarmonicVoltageContent10Cp95" />
+    <result column="centre_harmonic_voltage_content11_max" jdbcType="FLOAT" property="centreHarmonicVoltageContent11Max" />
+    <result column="centre_harmonic_voltage_content11_min" jdbcType="FLOAT" property="centreHarmonicVoltageContent11Min" />
+    <result column="centre_harmonic_voltage_content11_avg" jdbcType="FLOAT" property="centreHarmonicVoltageContent11Avg" />
+    <result column="centre_harmonic_voltage_content11_cp95" jdbcType="FLOAT" property="centreHarmonicVoltageContent11Cp95" />
+    <result column="centre_harmonic_voltage_content12_max" jdbcType="FLOAT" property="centreHarmonicVoltageContent12Max" />
+    <result column="centre_harmonic_voltage_content12_min" jdbcType="FLOAT" property="centreHarmonicVoltageContent12Min" />
+    <result column="centre_harmonic_voltage_content12_avg" jdbcType="FLOAT" property="centreHarmonicVoltageContent12Avg" />
+    <result column="centre_harmonic_voltage_content12_cp95" jdbcType="FLOAT" property="centreHarmonicVoltageContent12Cp95" />
+    <result column="centre_harmonic_voltage_content13_max" jdbcType="FLOAT" property="centreHarmonicVoltageContent13Max" />
+    <result column="centre_harmonic_voltage_content13_min" jdbcType="FLOAT" property="centreHarmonicVoltageContent13Min" />
+    <result column="centre_harmonic_voltage_content13_avg" jdbcType="FLOAT" property="centreHarmonicVoltageContent13Avg" />
+    <result column="centre_harmonic_voltage_content13_cp95" jdbcType="FLOAT" property="centreHarmonicVoltageContent13Cp95" />
+    <result column="centre_harmonic_voltage_content14_max" jdbcType="FLOAT" property="centreHarmonicVoltageContent14Max" />
+    <result column="centre_harmonic_voltage_content14_min" jdbcType="FLOAT" property="centreHarmonicVoltageContent14Min" />
+    <result column="centre_harmonic_voltage_content14_avg" jdbcType="FLOAT" property="centreHarmonicVoltageContent14Avg" />
+    <result column="centre_harmonic_voltage_content14_cp95" jdbcType="FLOAT" property="centreHarmonicVoltageContent14Cp95" />
+    <result column="centre_harmonic_voltage_content15_max" jdbcType="FLOAT" property="centreHarmonicVoltageContent15Max" />
+    <result column="centre_harmonic_voltage_content15_min" jdbcType="FLOAT" property="centreHarmonicVoltageContent15Min" />
+    <result column="centre_harmonic_voltage_content15_avg" jdbcType="FLOAT" property="centreHarmonicVoltageContent15Avg" />
+    <result column="centre_harmonic_voltage_content15_cp95" jdbcType="FLOAT" property="centreHarmonicVoltageContent15Cp95" />
+    <result column="centre_harmonic_voltage_content16_max" jdbcType="FLOAT" property="centreHarmonicVoltageContent16Max" />
+    <result column="centre_harmonic_voltage_content16_min" jdbcType="FLOAT" property="centreHarmonicVoltageContent16Min" />
+    <result column="centre_harmonic_voltage_content16_avg" jdbcType="FLOAT" property="centreHarmonicVoltageContent16Avg" />
+    <result column="centre_harmonic_voltage_content16_cp95" jdbcType="FLOAT" property="centreHarmonicVoltageContent16Cp95" />
+    <result column="centre_harmonic_voltage_content17_max" jdbcType="FLOAT" property="centreHarmonicVoltageContent17Max" />
+    <result column="centre_harmonic_voltage_content17_min" jdbcType="FLOAT" property="centreHarmonicVoltageContent17Min" />
+    <result column="centre_harmonic_voltage_content17_avg" jdbcType="FLOAT" property="centreHarmonicVoltageContent17Avg" />
+    <result column="centre_harmonic_voltage_content17_cp95" jdbcType="FLOAT" property="centreHarmonicVoltageContent17Cp95" />
+    <result column="centre_harmonic_voltage_content18_max" jdbcType="FLOAT" property="centreHarmonicVoltageContent18Max" />
+    <result column="centre_harmonic_voltage_content18_min" jdbcType="FLOAT" property="centreHarmonicVoltageContent18Min" />
+    <result column="centre_harmonic_voltage_content18_avg" jdbcType="FLOAT" property="centreHarmonicVoltageContent18Avg" />
+    <result column="centre_harmonic_voltage_content18_cp95" jdbcType="FLOAT" property="centreHarmonicVoltageContent18Cp95" />
+    <result column="centre_harmonic_voltage_content19_max" jdbcType="FLOAT" property="centreHarmonicVoltageContent19Max" />
+    <result column="centre_harmonic_voltage_content19_min" jdbcType="FLOAT" property="centreHarmonicVoltageContent19Min" />
+    <result column="centre_harmonic_voltage_content19_avg" jdbcType="FLOAT" property="centreHarmonicVoltageContent19Avg" />
+    <result column="centre_harmonic_voltage_content19_cp95" jdbcType="FLOAT" property="centreHarmonicVoltageContent19Cp95" />
+    <result column="centre_harmonic_voltage_content20_max" jdbcType="FLOAT" property="centreHarmonicVoltageContent20Max" />
+    <result column="centre_harmonic_voltage_content20_min" jdbcType="FLOAT" property="centreHarmonicVoltageContent20Min" />
+    <result column="centre_harmonic_voltage_content20_avg" jdbcType="FLOAT" property="centreHarmonicVoltageContent20Avg" />
+    <result column="centre_harmonic_voltage_content20_cp95" jdbcType="FLOAT" property="centreHarmonicVoltageContent20Cp95" />
+    <result column="centre_harmonic_voltage_content21_max" jdbcType="FLOAT" property="centreHarmonicVoltageContent21Max" />
+    <result column="centre_harmonic_voltage_content21_min" jdbcType="FLOAT" property="centreHarmonicVoltageContent21Min" />
+    <result column="centre_harmonic_voltage_content21_avg" jdbcType="FLOAT" property="centreHarmonicVoltageContent21Avg" />
+    <result column="centre_harmonic_voltage_content21_cp95" jdbcType="FLOAT" property="centreHarmonicVoltageContent21Cp95" />
+    <result column="centre_harmonic_voltage_content22_max" jdbcType="FLOAT" property="centreHarmonicVoltageContent22Max" />
+    <result column="centre_harmonic_voltage_content22_min" jdbcType="FLOAT" property="centreHarmonicVoltageContent22Min" />
+    <result column="centre_harmonic_voltage_content22_avg" jdbcType="FLOAT" property="centreHarmonicVoltageContent22Avg" />
+    <result column="centre_harmonic_voltage_content22_cp95" jdbcType="FLOAT" property="centreHarmonicVoltageContent22Cp95" />
+    <result column="centre_harmonic_voltage_content23_max" jdbcType="FLOAT" property="centreHarmonicVoltageContent23Max" />
+    <result column="centre_harmonic_voltage_content23_min" jdbcType="FLOAT" property="centreHarmonicVoltageContent23Min" />
+    <result column="centre_harmonic_voltage_content23_avg" jdbcType="FLOAT" property="centreHarmonicVoltageContent23Avg" />
+    <result column="centre_harmonic_voltage_content23_cp95" jdbcType="FLOAT" property="centreHarmonicVoltageContent23Cp95" />
+    <result column="centre_harmonic_voltage_content24_max" jdbcType="FLOAT" property="centreHarmonicVoltageContent24Max" />
+    <result column="centre_harmonic_voltage_content24_min" jdbcType="FLOAT" property="centreHarmonicVoltageContent24Min" />
+    <result column="centre_harmonic_voltage_content24_avg" jdbcType="FLOAT" property="centreHarmonicVoltageContent24Avg" />
+    <result column="centre_harmonic_voltage_content24_cp95" jdbcType="FLOAT" property="centreHarmonicVoltageContent24Cp95" />
+    <result column="centre_harmonic_voltage_content25_max" jdbcType="FLOAT" property="centreHarmonicVoltageContent25Max" />
+    <result column="centre_harmonic_voltage_content25_min" jdbcType="FLOAT" property="centreHarmonicVoltageContent25Min" />
+    <result column="centre_harmonic_voltage_content25_avg" jdbcType="FLOAT" property="centreHarmonicVoltageContent25Avg" />
+    <result column="centre_harmonic_voltage_content25_cp95" jdbcType="FLOAT" property="centreHarmonicVoltageContent25Cp95" />
+    <result column="centre_harmonic_voltage_content26_max" jdbcType="FLOAT" property="centreHarmonicVoltageContent26Max" />
+    <result column="centre_harmonic_voltage_content26_min" jdbcType="FLOAT" property="centreHarmonicVoltageContent26Min" />
+    <result column="centre_harmonic_voltage_content26_avg" jdbcType="FLOAT" property="centreHarmonicVoltageContent26Avg" />
+    <result column="centre_harmonic_voltage_content26_cp95" jdbcType="FLOAT" property="centreHarmonicVoltageContent26Cp95" />
+    <result column="centre_harmonic_voltage_content27_max" jdbcType="FLOAT" property="centreHarmonicVoltageContent27Max" />
+    <result column="centre_harmonic_voltage_content27_min" jdbcType="FLOAT" property="centreHarmonicVoltageContent27Min" />
+    <result column="centre_harmonic_voltage_content27_avg" jdbcType="FLOAT" property="centreHarmonicVoltageContent27Avg" />
+    <result column="centre_harmonic_voltage_content27_cp95" jdbcType="FLOAT" property="centreHarmonicVoltageContent27Cp95" />
+    <result column="centre_harmonic_voltage_content28_max" jdbcType="FLOAT" property="centreHarmonicVoltageContent28Max" />
+    <result column="centre_harmonic_voltage_content28_min" jdbcType="FLOAT" property="centreHarmonicVoltageContent28Min" />
+    <result column="centre_harmonic_voltage_content28_avg" jdbcType="FLOAT" property="centreHarmonicVoltageContent28Avg" />
+    <result column="centre_harmonic_voltage_content28_cp95" jdbcType="FLOAT" property="centreHarmonicVoltageContent28Cp95" />
+    <result column="centre_harmonic_voltage_content29_max" jdbcType="FLOAT" property="centreHarmonicVoltageContent29Max" />
+    <result column="centre_harmonic_voltage_content29_min" jdbcType="FLOAT" property="centreHarmonicVoltageContent29Min" />
+    <result column="centre_harmonic_voltage_content29_avg" jdbcType="FLOAT" property="centreHarmonicVoltageContent29Avg" />
+    <result column="centre_harmonic_voltage_content29_cp95" jdbcType="FLOAT" property="centreHarmonicVoltageContent29Cp95" />
+    <result column="centre_harmonic_voltage_content30_max" jdbcType="FLOAT" property="centreHarmonicVoltageContent30Max" />
+    <result column="centre_harmonic_voltage_content30_min" jdbcType="FLOAT" property="centreHarmonicVoltageContent30Min" />
+    <result column="centre_harmonic_voltage_content30_avg" jdbcType="FLOAT" property="centreHarmonicVoltageContent30Avg" />
+    <result column="centre_harmonic_voltage_content30_cp95" jdbcType="FLOAT" property="centreHarmonicVoltageContent30Cp95" />
+    <result column="centre_harmonic_voltage_content31_max" jdbcType="FLOAT" property="centreHarmonicVoltageContent31Max" />
+    <result column="centre_harmonic_voltage_content31_min" jdbcType="FLOAT" property="centreHarmonicVoltageContent31Min" />
+    <result column="centre_harmonic_voltage_content31_avg" jdbcType="FLOAT" property="centreHarmonicVoltageContent31Avg" />
+    <result column="centre_harmonic_voltage_content31_cp95" jdbcType="FLOAT" property="centreHarmonicVoltageContent31Cp95" />
+    <result column="centre_harmonic_voltage_content32_max" jdbcType="FLOAT" property="centreHarmonicVoltageContent32Max" />
+    <result column="centre_harmonic_voltage_content32_min" jdbcType="FLOAT" property="centreHarmonicVoltageContent32Min" />
+    <result column="centre_harmonic_voltage_content32_avg" jdbcType="FLOAT" property="centreHarmonicVoltageContent32Avg" />
+    <result column="centre_harmonic_voltage_content32_cp95" jdbcType="FLOAT" property="centreHarmonicVoltageContent32Cp95" />
+    <result column="centre_harmonic_voltage_content33_max" jdbcType="FLOAT" property="centreHarmonicVoltageContent33Max" />
+    <result column="centre_harmonic_voltage_content33_min" jdbcType="FLOAT" property="centreHarmonicVoltageContent33Min" />
+    <result column="centre_harmonic_voltage_content33_avg" jdbcType="FLOAT" property="centreHarmonicVoltageContent33Avg" />
+    <result column="centre_harmonic_voltage_content33_cp95" jdbcType="FLOAT" property="centreHarmonicVoltageContent33Cp95" />
+    <result column="centre_harmonic_voltage_content34_max" jdbcType="FLOAT" property="centreHarmonicVoltageContent34Max" />
+    <result column="centre_harmonic_voltage_content34_min" jdbcType="FLOAT" property="centreHarmonicVoltageContent34Min" />
+    <result column="centre_harmonic_voltage_content34_avg" jdbcType="FLOAT" property="centreHarmonicVoltageContent34Avg" />
+    <result column="centre_harmonic_voltage_content34_cp95" jdbcType="FLOAT" property="centreHarmonicVoltageContent34Cp95" />
+    <result column="centre_harmonic_voltage_content35_max" jdbcType="FLOAT" property="centreHarmonicVoltageContent35Max" />
+    <result column="centre_harmonic_voltage_content35_min" jdbcType="FLOAT" property="centreHarmonicVoltageContent35Min" />
+    <result column="centre_harmonic_voltage_content35_avg" jdbcType="FLOAT" property="centreHarmonicVoltageContent35Avg" />
+    <result column="centre_harmonic_voltage_content35_cp95" jdbcType="FLOAT" property="centreHarmonicVoltageContent35Cp95" />
+    <result column="centre_harmonic_voltage_content36_max" jdbcType="FLOAT" property="centreHarmonicVoltageContent36Max" />
+    <result column="centre_harmonic_voltage_content36_min" jdbcType="FLOAT" property="centreHarmonicVoltageContent36Min" />
+    <result column="centre_harmonic_voltage_content36_avg" jdbcType="FLOAT" property="centreHarmonicVoltageContent36Avg" />
+    <result column="centre_harmonic_voltage_content36_cp95" jdbcType="FLOAT" property="centreHarmonicVoltageContent36Cp95" />
+    <result column="centre_harmonic_voltage_content37_max" jdbcType="FLOAT" property="centreHarmonicVoltageContent37Max" />
+    <result column="centre_harmonic_voltage_content37_min" jdbcType="FLOAT" property="centreHarmonicVoltageContent37Min" />
+    <result column="centre_harmonic_voltage_content37_avg" jdbcType="FLOAT" property="centreHarmonicVoltageContent37Avg" />
+    <result column="centre_harmonic_voltage_content37_cp95" jdbcType="FLOAT" property="centreHarmonicVoltageContent37Cp95" />
+    <result column="centre_harmonic_voltage_content38_max" jdbcType="FLOAT" property="centreHarmonicVoltageContent38Max" />
+    <result column="centre_harmonic_voltage_content38_min" jdbcType="FLOAT" property="centreHarmonicVoltageContent38Min" />
+    <result column="centre_harmonic_voltage_content38_avg" jdbcType="FLOAT" property="centreHarmonicVoltageContent38Avg" />
+    <result column="centre_harmonic_voltage_content38_cp95" jdbcType="FLOAT" property="centreHarmonicVoltageContent38Cp95" />
+    <result column="centre_harmonic_voltage_content39_max" jdbcType="FLOAT" property="centreHarmonicVoltageContent39Max" />
+    <result column="centre_harmonic_voltage_content39_min" jdbcType="FLOAT" property="centreHarmonicVoltageContent39Min" />
+    <result column="centre_harmonic_voltage_content39_avg" jdbcType="FLOAT" property="centreHarmonicVoltageContent39Avg" />
+    <result column="centre_harmonic_voltage_content39_cp95" jdbcType="FLOAT" property="centreHarmonicVoltageContent39Cp95" />
+    <result column="centre_harmonic_voltage_content40_max" jdbcType="FLOAT" property="centreHarmonicVoltageContent40Max" />
+    <result column="centre_harmonic_voltage_content40_min" jdbcType="FLOAT" property="centreHarmonicVoltageContent40Min" />
+    <result column="centre_harmonic_voltage_content40_avg" jdbcType="FLOAT" property="centreHarmonicVoltageContent40Avg" />
+    <result column="centre_harmonic_voltage_content40_cp95" jdbcType="FLOAT" property="centreHarmonicVoltageContent40Cp95" />
+    <result column="centre_harmonic_voltage_content41_max" jdbcType="FLOAT" property="centreHarmonicVoltageContent41Max" />
+    <result column="centre_harmonic_voltage_content41_min" jdbcType="FLOAT" property="centreHarmonicVoltageContent41Min" />
+    <result column="centre_harmonic_voltage_content41_avg" jdbcType="FLOAT" property="centreHarmonicVoltageContent41Avg" />
+    <result column="centre_harmonic_voltage_content41_cp95" jdbcType="FLOAT" property="centreHarmonicVoltageContent41Cp95" />
+    <result column="centre_harmonic_voltage_content42_max" jdbcType="FLOAT" property="centreHarmonicVoltageContent42Max" />
+    <result column="centre_harmonic_voltage_content42_min" jdbcType="FLOAT" property="centreHarmonicVoltageContent42Min" />
+    <result column="centre_harmonic_voltage_content42_avg" jdbcType="FLOAT" property="centreHarmonicVoltageContent42Avg" />
+    <result column="centre_harmonic_voltage_content42_cp95" jdbcType="FLOAT" property="centreHarmonicVoltageContent42Cp95" />
+    <result column="centre_harmonic_voltage_content43_max" jdbcType="FLOAT" property="centreHarmonicVoltageContent43Max" />
+    <result column="centre_harmonic_voltage_content43_min" jdbcType="FLOAT" property="centreHarmonicVoltageContent43Min" />
+    <result column="centre_harmonic_voltage_content43_avg" jdbcType="FLOAT" property="centreHarmonicVoltageContent43Avg" />
+    <result column="centre_harmonic_voltage_content43_cp95" jdbcType="FLOAT" property="centreHarmonicVoltageContent43Cp95" />
+    <result column="centre_harmonic_voltage_content44_max" jdbcType="FLOAT" property="centreHarmonicVoltageContent44Max" />
+    <result column="centre_harmonic_voltage_content44_min" jdbcType="FLOAT" property="centreHarmonicVoltageContent44Min" />
+    <result column="centre_harmonic_voltage_content44_avg" jdbcType="FLOAT" property="centreHarmonicVoltageContent44Avg" />
+    <result column="centre_harmonic_voltage_content44_cp95" jdbcType="FLOAT" property="centreHarmonicVoltageContent44Cp95" />
+    <result column="centre_harmonic_voltage_content45_max" jdbcType="FLOAT" property="centreHarmonicVoltageContent45Max" />
+    <result column="centre_harmonic_voltage_content45_min" jdbcType="FLOAT" property="centreHarmonicVoltageContent45Min" />
+    <result column="centre_harmonic_voltage_content45_avg" jdbcType="FLOAT" property="centreHarmonicVoltageContent45Avg" />
+    <result column="centre_harmonic_voltage_content45_cp95" jdbcType="FLOAT" property="centreHarmonicVoltageContent45Cp95" />
+    <result column="centre_harmonic_voltage_content46_max" jdbcType="FLOAT" property="centreHarmonicVoltageContent46Max" />
+    <result column="centre_harmonic_voltage_content46_min" jdbcType="FLOAT" property="centreHarmonicVoltageContent46Min" />
+    <result column="centre_harmonic_voltage_content46_avg" jdbcType="FLOAT" property="centreHarmonicVoltageContent46Avg" />
+    <result column="centre_harmonic_voltage_content46_cp95" jdbcType="FLOAT" property="centreHarmonicVoltageContent46Cp95" />
+    <result column="centre_harmonic_voltage_content47_max" jdbcType="FLOAT" property="centreHarmonicVoltageContent47Max" />
+    <result column="centre_harmonic_voltage_content47_min" jdbcType="FLOAT" property="centreHarmonicVoltageContent47Min" />
+    <result column="centre_harmonic_voltage_content47_avg" jdbcType="FLOAT" property="centreHarmonicVoltageContent47Avg" />
+    <result column="centre_harmonic_voltage_content47_cp95" jdbcType="FLOAT" property="centreHarmonicVoltageContent47Cp95" />
+    <result column="centre_harmonic_voltage_content48_max" jdbcType="FLOAT" property="centreHarmonicVoltageContent48Max" />
+    <result column="centre_harmonic_voltage_content48_min" jdbcType="FLOAT" property="centreHarmonicVoltageContent48Min" />
+    <result column="centre_harmonic_voltage_content48_avg" jdbcType="FLOAT" property="centreHarmonicVoltageContent48Avg" />
+    <result column="centre_harmonic_voltage_content48_cp95" jdbcType="FLOAT" property="centreHarmonicVoltageContent48Cp95" />
+    <result column="centre_harmonic_voltage_content49_max" jdbcType="FLOAT" property="centreHarmonicVoltageContent49Max" />
+    <result column="centre_harmonic_voltage_content49_min" jdbcType="FLOAT" property="centreHarmonicVoltageContent49Min" />
+    <result column="centre_harmonic_voltage_content49_avg" jdbcType="FLOAT" property="centreHarmonicVoltageContent49Avg" />
+    <result column="centre_harmonic_voltage_content49_cp95" jdbcType="FLOAT" property="centreHarmonicVoltageContent49Cp95" />
+    <result column="centre_harmonic_voltage_content50_max" jdbcType="FLOAT" property="centreHarmonicVoltageContent50Max" />
+    <result column="centre_harmonic_voltage_content50_min" jdbcType="FLOAT" property="centreHarmonicVoltageContent50Min" />
+    <result column="centre_harmonic_voltage_content50_avg" jdbcType="FLOAT" property="centreHarmonicVoltageContent50Avg" />
+    <result column="centre_harmonic_voltage_content50_cp95" jdbcType="FLOAT" property="centreHarmonicVoltageContent50Cp95" />
+  </resultMap>
+  <sql id="Base_Column_List">
+    <!--@mbg.generated-->
+    measurement_point_id, data_date, phase, centre_harmonic_voltage_content1_max, centre_harmonic_voltage_content1_min, 
+    centre_harmonic_voltage_content1_avg, centre_harmonic_voltage_content1_cp95, centre_harmonic_voltage_content2_max, 
+    centre_harmonic_voltage_content2_min, centre_harmonic_voltage_content2_avg, centre_harmonic_voltage_content2_cp95, 
+    centre_harmonic_voltage_content3_max, centre_harmonic_voltage_content3_min, centre_harmonic_voltage_content3_avg, 
+    centre_harmonic_voltage_content3_cp95, centre_harmonic_voltage_content4_max, centre_harmonic_voltage_content4_min, 
+    centre_harmonic_voltage_content4_avg, centre_harmonic_voltage_content4_cp95, centre_harmonic_voltage_content5_max, 
+    centre_harmonic_voltage_content5_min, centre_harmonic_voltage_content5_avg, centre_harmonic_voltage_content5_cp95, 
+    centre_harmonic_voltage_content6_max, centre_harmonic_voltage_content6_min, centre_harmonic_voltage_content6_avg, 
+    centre_harmonic_voltage_content6_cp95, centre_harmonic_voltage_content7_max, centre_harmonic_voltage_content7_min, 
+    centre_harmonic_voltage_content7_avg, centre_harmonic_voltage_content7_cp95, centre_harmonic_voltage_content8_max, 
+    centre_harmonic_voltage_content8_min, centre_harmonic_voltage_content8_avg, centre_harmonic_voltage_content8_cp95, 
+    centre_harmonic_voltage_content9_max, centre_harmonic_voltage_content9_min, centre_harmonic_voltage_content9_avg, 
+    centre_harmonic_voltage_content9_cp95, centre_harmonic_voltage_content10_max, centre_harmonic_voltage_content10_min, 
+    centre_harmonic_voltage_content10_avg, centre_harmonic_voltage_content10_cp95, centre_harmonic_voltage_content11_max, 
+    centre_harmonic_voltage_content11_min, centre_harmonic_voltage_content11_avg, centre_harmonic_voltage_content11_cp95, 
+    centre_harmonic_voltage_content12_max, centre_harmonic_voltage_content12_min, centre_harmonic_voltage_content12_avg, 
+    centre_harmonic_voltage_content12_cp95, centre_harmonic_voltage_content13_max, centre_harmonic_voltage_content13_min, 
+    centre_harmonic_voltage_content13_avg, centre_harmonic_voltage_content13_cp95, centre_harmonic_voltage_content14_max, 
+    centre_harmonic_voltage_content14_min, centre_harmonic_voltage_content14_avg, centre_harmonic_voltage_content14_cp95, 
+    centre_harmonic_voltage_content15_max, centre_harmonic_voltage_content15_min, centre_harmonic_voltage_content15_avg, 
+    centre_harmonic_voltage_content15_cp95, centre_harmonic_voltage_content16_max, centre_harmonic_voltage_content16_min, 
+    centre_harmonic_voltage_content16_avg, centre_harmonic_voltage_content16_cp95, centre_harmonic_voltage_content17_max, 
+    centre_harmonic_voltage_content17_min, centre_harmonic_voltage_content17_avg, centre_harmonic_voltage_content17_cp95, 
+    centre_harmonic_voltage_content18_max, centre_harmonic_voltage_content18_min, centre_harmonic_voltage_content18_avg, 
+    centre_harmonic_voltage_content18_cp95, centre_harmonic_voltage_content19_max, centre_harmonic_voltage_content19_min, 
+    centre_harmonic_voltage_content19_avg, centre_harmonic_voltage_content19_cp95, centre_harmonic_voltage_content20_max, 
+    centre_harmonic_voltage_content20_min, centre_harmonic_voltage_content20_avg, centre_harmonic_voltage_content20_cp95, 
+    centre_harmonic_voltage_content21_max, centre_harmonic_voltage_content21_min, centre_harmonic_voltage_content21_avg, 
+    centre_harmonic_voltage_content21_cp95, centre_harmonic_voltage_content22_max, centre_harmonic_voltage_content22_min, 
+    centre_harmonic_voltage_content22_avg, centre_harmonic_voltage_content22_cp95, centre_harmonic_voltage_content23_max, 
+    centre_harmonic_voltage_content23_min, centre_harmonic_voltage_content23_avg, centre_harmonic_voltage_content23_cp95, 
+    centre_harmonic_voltage_content24_max, centre_harmonic_voltage_content24_min, centre_harmonic_voltage_content24_avg, 
+    centre_harmonic_voltage_content24_cp95, centre_harmonic_voltage_content25_max, centre_harmonic_voltage_content25_min, 
+    centre_harmonic_voltage_content25_avg, centre_harmonic_voltage_content25_cp95, centre_harmonic_voltage_content26_max, 
+    centre_harmonic_voltage_content26_min, centre_harmonic_voltage_content26_avg, centre_harmonic_voltage_content26_cp95, 
+    centre_harmonic_voltage_content27_max, centre_harmonic_voltage_content27_min, centre_harmonic_voltage_content27_avg, 
+    centre_harmonic_voltage_content27_cp95, centre_harmonic_voltage_content28_max, centre_harmonic_voltage_content28_min, 
+    centre_harmonic_voltage_content28_avg, centre_harmonic_voltage_content28_cp95, centre_harmonic_voltage_content29_max, 
+    centre_harmonic_voltage_content29_min, centre_harmonic_voltage_content29_avg, centre_harmonic_voltage_content29_cp95, 
+    centre_harmonic_voltage_content30_max, centre_harmonic_voltage_content30_min, centre_harmonic_voltage_content30_avg, 
+    centre_harmonic_voltage_content30_cp95, centre_harmonic_voltage_content31_max, centre_harmonic_voltage_content31_min, 
+    centre_harmonic_voltage_content31_avg, centre_harmonic_voltage_content31_cp95, centre_harmonic_voltage_content32_max, 
+    centre_harmonic_voltage_content32_min, centre_harmonic_voltage_content32_avg, centre_harmonic_voltage_content32_cp95, 
+    centre_harmonic_voltage_content33_max, centre_harmonic_voltage_content33_min, centre_harmonic_voltage_content33_avg, 
+    centre_harmonic_voltage_content33_cp95, centre_harmonic_voltage_content34_max, centre_harmonic_voltage_content34_min, 
+    centre_harmonic_voltage_content34_avg, centre_harmonic_voltage_content34_cp95, centre_harmonic_voltage_content35_max, 
+    centre_harmonic_voltage_content35_min, centre_harmonic_voltage_content35_avg, centre_harmonic_voltage_content35_cp95, 
+    centre_harmonic_voltage_content36_max, centre_harmonic_voltage_content36_min, centre_harmonic_voltage_content36_avg, 
+    centre_harmonic_voltage_content36_cp95, centre_harmonic_voltage_content37_max, centre_harmonic_voltage_content37_min, 
+    centre_harmonic_voltage_content37_avg, centre_harmonic_voltage_content37_cp95, centre_harmonic_voltage_content38_max, 
+    centre_harmonic_voltage_content38_min, centre_harmonic_voltage_content38_avg, centre_harmonic_voltage_content38_cp95, 
+    centre_harmonic_voltage_content39_max, centre_harmonic_voltage_content39_min, centre_harmonic_voltage_content39_avg, 
+    centre_harmonic_voltage_content39_cp95, centre_harmonic_voltage_content40_max, centre_harmonic_voltage_content40_min, 
+    centre_harmonic_voltage_content40_avg, centre_harmonic_voltage_content40_cp95, centre_harmonic_voltage_content41_max, 
+    centre_harmonic_voltage_content41_min, centre_harmonic_voltage_content41_avg, centre_harmonic_voltage_content41_cp95, 
+    centre_harmonic_voltage_content42_max, centre_harmonic_voltage_content42_min, centre_harmonic_voltage_content42_avg, 
+    centre_harmonic_voltage_content42_cp95, centre_harmonic_voltage_content43_max, centre_harmonic_voltage_content43_min, 
+    centre_harmonic_voltage_content43_avg, centre_harmonic_voltage_content43_cp95, centre_harmonic_voltage_content44_max, 
+    centre_harmonic_voltage_content44_min, centre_harmonic_voltage_content44_avg, centre_harmonic_voltage_content44_cp95, 
+    centre_harmonic_voltage_content45_max, centre_harmonic_voltage_content45_min, centre_harmonic_voltage_content45_avg, 
+    centre_harmonic_voltage_content45_cp95, centre_harmonic_voltage_content46_max, centre_harmonic_voltage_content46_min, 
+    centre_harmonic_voltage_content46_avg, centre_harmonic_voltage_content46_cp95, centre_harmonic_voltage_content47_max, 
+    centre_harmonic_voltage_content47_min, centre_harmonic_voltage_content47_avg, centre_harmonic_voltage_content47_cp95, 
+    centre_harmonic_voltage_content48_max, centre_harmonic_voltage_content48_min, centre_harmonic_voltage_content48_avg, 
+    centre_harmonic_voltage_content48_cp95, centre_harmonic_voltage_content49_max, centre_harmonic_voltage_content49_min, 
+    centre_harmonic_voltage_content49_avg, centre_harmonic_voltage_content49_cp95, centre_harmonic_voltage_content50_max, 
+    centre_harmonic_voltage_content50_min, centre_harmonic_voltage_content50_avg, centre_harmonic_voltage_content50_cp95
+  </sql>
+</mapper>
\ No newline at end of file
diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/mapping/RMpMeasurePhaseReportDPOMapper.xml b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/mapping/RMpMeasurePhaseReportDPOMapper.xml
new file mode 100644
index 000000000..726505989
--- /dev/null
+++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/mapping/RMpMeasurePhaseReportDPOMapper.xml
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.njcn.prepare.harmonic.mapper.line.RMpMeasurePhaseReportDPOMapper">
+  <resultMap id="BaseResultMap" type="com.njcn.prepare.harmonic.pojo.po.line.RMpMeasurePhaseReportDPO">
+    <!--@mbg.generated-->
+    <!--@Table r_mp_measure_phase_report_d-->
+    <id column="measurement_point_id" jdbcType="VARCHAR" property="measurementPointId" />
+    <id column="data_date" jdbcType="DATE" property="dataDate" />
+    <id column="phase" jdbcType="VARCHAR" property="phase" />
+    <result column="phase_voltage_effective_max" jdbcType="FLOAT" property="phaseVoltageEffectiveMax" />
+    <result column="phase_voltage_effective_min" jdbcType="FLOAT" property="phaseVoltageEffectiveMin" />
+    <result column="phase_voltage_effective_avg" jdbcType="FLOAT" property="phaseVoltageEffectiveAvg" />
+    <result column="phase_voltage_effective_95" jdbcType="FLOAT" property="phaseVoltageEffective95" />
+    <result column="line_voltage_effective_max" jdbcType="FLOAT" property="lineVoltageEffectiveMax" />
+    <result column="line_voltage_effective_min" jdbcType="FLOAT" property="lineVoltageEffectiveMin" />
+    <result column="line_voltage_effective_avg" jdbcType="FLOAT" property="lineVoltageEffectiveAvg" />
+    <result column="line_voltage_effective_95" jdbcType="FLOAT" property="lineVoltageEffective95" />
+    <result column="v_de_up_max" jdbcType="FLOAT" property="vDeUpMax" />
+    <result column="v_de_up_min" jdbcType="FLOAT" property="vDeUpMin" />
+    <result column="v_de_up_avg" jdbcType="FLOAT" property="vDeUpAvg" />
+    <result column="v_de_up_95" jdbcType="FLOAT" property="vDeUp95" />
+    <result column="v_de_low_max" jdbcType="FLOAT" property="vDeLowMax" />
+    <result column="v_de_low_min" jdbcType="FLOAT" property="vDeLowMin" />
+    <result column="v_de_low_avg" jdbcType="FLOAT" property="vDeLowAvg" />
+    <result column="v_de_low_95" jdbcType="FLOAT" property="vDeLow95" />
+    <result column="current_effective_max" jdbcType="FLOAT" property="currentEffectiveMax" />
+    <result column="current_effective_min" jdbcType="FLOAT" property="currentEffectiveMin" />
+    <result column="current_effective_avg" jdbcType="FLOAT" property="currentEffectiveAvg" />
+    <result column="current_effective_95" jdbcType="FLOAT" property="currentEffective95" />
+    <result column="sp_active_power_max" jdbcType="FLOAT" property="spActivePowerMax" />
+    <result column="sp_active_power_min" jdbcType="FLOAT" property="spActivePowerMin" />
+    <result column="sp_active_power_avg" jdbcType="FLOAT" property="spActivePowerAvg" />
+    <result column="sp_active_power_95" jdbcType="FLOAT" property="spActivePower95" />
+    <result column="sp_reactive_power_max" jdbcType="FLOAT" property="spReactivePowerMax" />
+    <result column="sp_reactive_power_min" jdbcType="FLOAT" property="spReactivePowerMin" />
+    <result column="sp_reactive_power_avg" jdbcType="FLOAT" property="spReactivePowerAvg" />
+    <result column="sp_reactive_power_95" jdbcType="FLOAT" property="spReactivePower95" />
+    <result column="sp_apparent_power_max" jdbcType="FLOAT" property="spApparentPowerMax" />
+    <result column="sp_apparent_power_min" jdbcType="FLOAT" property="spApparentPowerMin" />
+    <result column="sp_apparent_power_avg" jdbcType="FLOAT" property="spApparentPowerAvg" />
+    <result column="sp_apparent_power_95" jdbcType="FLOAT" property="spApparentPower95" />
+    <result column="sp_power_factor_max" jdbcType="FLOAT" property="spPowerFactorMax" />
+    <result column="sp_power_factor_min" jdbcType="FLOAT" property="spPowerFactorMin" />
+    <result column="sp_power_factor_avg" jdbcType="FLOAT" property="spPowerFactorAvg" />
+    <result column="sp_power_factor_95" jdbcType="FLOAT" property="spPowerFactor95" />
+    <result column="sp_fundamental_power_factor_max" jdbcType="FLOAT" property="spFundamentalPowerFactorMax" />
+    <result column="sp_fundamental_power_factor_min" jdbcType="FLOAT" property="spFundamentalPowerFactorMin" />
+    <result column="sp_fundamental_power_factor_avg" jdbcType="FLOAT" property="spFundamentalPowerFactorAvg" />
+    <result column="sp_fundamental_power_factor_95" jdbcType="FLOAT" property="spFundamentalPowerFactor95" />
+  </resultMap>
+  <sql id="Base_Column_List">
+    <!--@mbg.generated-->
+    measurement_point_id, data_date, phase, phase_voltage_effective_max, phase_voltage_effective_min, 
+    phase_voltage_effective_avg, phase_voltage_effective_95, line_voltage_effective_max, 
+    line_voltage_effective_min, line_voltage_effective_avg, line_voltage_effective_95, 
+    v_de_up_max, v_de_up_min, v_de_up_avg, v_de_up_95, v_de_low_max, v_de_low_min, v_de_low_avg, 
+    v_de_low_95, current_effective_max, current_effective_min, current_effective_avg, 
+    current_effective_95, sp_active_power_max, sp_active_power_min, sp_active_power_avg, 
+    sp_active_power_95, sp_reactive_power_max, sp_reactive_power_min, sp_reactive_power_avg, 
+    sp_reactive_power_95, sp_apparent_power_max, sp_apparent_power_min, sp_apparent_power_avg, 
+    sp_apparent_power_95, sp_power_factor_max, sp_power_factor_min, sp_power_factor_avg, 
+    sp_power_factor_95, sp_fundamental_power_factor_max, sp_fundamental_power_factor_min, 
+    sp_fundamental_power_factor_avg, sp_fundamental_power_factor_95
+  </sql>
+</mapper>
\ No newline at end of file
diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/mapping/RMpMeasureReportDPOMapper.xml b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/mapping/RMpMeasureReportDPOMapper.xml
new file mode 100644
index 000000000..4bf7c24b3
--- /dev/null
+++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/mapping/RMpMeasureReportDPOMapper.xml
@@ -0,0 +1,135 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.njcn.prepare.harmonic.mapper.line.RMpMeasureReportDPOMapper">
+  <resultMap id="BaseResultMap" type="com.njcn.prepare.harmonic.pojo.po.line.RMpMeasureReportDPO">
+    <!--@mbg.generated-->
+    <!--@Table r_mp_measure_report_d-->
+    <id column="measurement_point_id" jdbcType="VARCHAR" property="measurementPointId" />
+    <id column="data_date" jdbcType="DATE" property="dataDate" />
+    <result column="frequency_max" jdbcType="FLOAT" property="frequencyMax" />
+    <result column="frequency_min" jdbcType="FLOAT" property="frequencyMin" />
+    <result column="frequency_avg" jdbcType="FLOAT" property="frequencyAvg" />
+    <result column="frequency_95" jdbcType="FLOAT" property="frequency95" />
+    <result column="frequency_deviation_max" jdbcType="FLOAT" property="frequencyDeviationMax" />
+    <result column="frequency_deviation_min" jdbcType="FLOAT" property="frequencyDeviationMin" />
+    <result column="frequency_deviation_avg" jdbcType="FLOAT" property="frequencyDeviationAvg" />
+    <result column="frequency_deviation_95" jdbcType="FLOAT" property="frequencyDeviation95" />
+    <result column="total_active_power_max" jdbcType="FLOAT" property="totalActivePowerMax" />
+    <result column="total_active_power_min" jdbcType="FLOAT" property="totalActivePowerMin" />
+    <result column="total_active_power_avg" jdbcType="FLOAT" property="totalActivePowerAvg" />
+    <result column="total_active_power_95" jdbcType="FLOAT" property="totalActivePower95" />
+    <result column="total_reactive_power_max" jdbcType="FLOAT" property="totalReactivePowerMax" />
+    <result column="total_reactive_power_min" jdbcType="FLOAT" property="totalReactivePowerMin" />
+    <result column="total_reactive_power_avg" jdbcType="FLOAT" property="totalReactivePowerAvg" />
+    <result column="total_reactive_power_95" jdbcType="FLOAT" property="totalReactivePower95" />
+    <result column="total_apparent_power_max" jdbcType="FLOAT" property="totalApparentPowerMax" />
+    <result column="total_apparent_power_min" jdbcType="FLOAT" property="totalApparentPowerMin" />
+    <result column="total_apparent_power_avg" jdbcType="FLOAT" property="totalApparentPowerAvg" />
+    <result column="total_apparent_power_95" jdbcType="FLOAT" property="totalApparentPower95" />
+    <result column="tp_power_factor_max" jdbcType="FLOAT" property="tpPowerFactorMax" />
+    <result column="tp_power_factor_min" jdbcType="FLOAT" property="tpPowerFactorMin" />
+    <result column="tp_power_factor_avg" jdbcType="FLOAT" property="tpPowerFactorAvg" />
+    <result column="tp_power_factor_95" jdbcType="FLOAT" property="tpPowerFactor95" />
+    <result column="fundamental_power_factor_max" jdbcType="FLOAT" property="fundamentalPowerFactorMax" />
+    <result column="fundamental_power_factor_min" jdbcType="FLOAT" property="fundamentalPowerFactorMin" />
+    <result column="fundamental_power_factor_avg" jdbcType="FLOAT" property="fundamentalPowerFactorAvg" />
+    <result column="fundamental_power_factor_95" jdbcType="FLOAT" property="fundamentalPowerFactor95" />
+    <result column="positive_sequence_voltage_max" jdbcType="FLOAT" property="positiveSequenceVoltageMax" />
+    <result column="positive_sequence_voltage_min" jdbcType="FLOAT" property="positiveSequenceVoltageMin" />
+    <result column="positive_sequence_voltage_avg" jdbcType="FLOAT" property="positiveSequenceVoltageAvg" />
+    <result column="positive_sequence_voltage_95" jdbcType="FLOAT" property="positiveSequenceVoltage95" />
+    <result column="negative_sequence_voltage_max" jdbcType="FLOAT" property="negativeSequenceVoltageMax" />
+    <result column="negative_sequence_voltage_min" jdbcType="FLOAT" property="negativeSequenceVoltageMin" />
+    <result column="negative_sequence_voltage_avg" jdbcType="FLOAT" property="negativeSequenceVoltageAvg" />
+    <result column="negative_sequence_voltage_95" jdbcType="FLOAT" property="negativeSequenceVoltage95" />
+    <result column="zero_sequence_voltage_max" jdbcType="FLOAT" property="zeroSequenceVoltageMax" />
+    <result column="zero_sequence_voltage_min" jdbcType="FLOAT" property="zeroSequenceVoltageMin" />
+    <result column="zero_sequence_voltage_avg" jdbcType="FLOAT" property="zeroSequenceVoltageAvg" />
+    <result column="zero_sequence_voltage_95" jdbcType="FLOAT" property="zeroSequenceVoltage95" />
+    <result column="negative_sequence_voltage_unbalance_max" jdbcType="FLOAT" property="negativeSequenceVoltageUnbalanceMax" />
+    <result column="negative_sequence_voltage_unbalance_min" jdbcType="FLOAT" property="negativeSequenceVoltageUnbalanceMin" />
+    <result column="negative_sequence_voltage_unbalance_avg" jdbcType="FLOAT" property="negativeSequenceVoltageUnbalanceAvg" />
+    <result column="negative_sequence_voltage_unbalance_95" jdbcType="FLOAT" property="negativeSequenceVoltageUnbalance95" />
+    <result column="zero_sequence_voltage_unbalance_max" jdbcType="FLOAT" property="zeroSequenceVoltageUnbalanceMax" />
+    <result column="zero_sequence_voltage_unbalance_min" jdbcType="FLOAT" property="zeroSequenceVoltageUnbalanceMin" />
+    <result column="zero_sequence_voltage_unbalance_avg" jdbcType="FLOAT" property="zeroSequenceVoltageUnbalanceAvg" />
+    <result column="zero_sequence_voltage_unbalance_95" jdbcType="FLOAT" property="zeroSequenceVoltageUnbalance95" />
+    <result column="positive_sequence_current_max" jdbcType="FLOAT" property="positiveSequenceCurrentMax" />
+    <result column="positive_sequence_current_min" jdbcType="FLOAT" property="positiveSequenceCurrentMin" />
+    <result column="positive_sequence_current_avg" jdbcType="FLOAT" property="positiveSequenceCurrentAvg" />
+    <result column="positive_sequence_current_95" jdbcType="FLOAT" property="positiveSequenceCurrent95" />
+    <result column="negative_sequence_current_max" jdbcType="FLOAT" property="negativeSequenceCurrentMax" />
+    <result column="negative_sequence_current_min" jdbcType="FLOAT" property="negativeSequenceCurrentMin" />
+    <result column="negative_sequence_current_avg" jdbcType="FLOAT" property="negativeSequenceCurrentAvg" />
+    <result column="negative_sequence_current_95" jdbcType="FLOAT" property="negativeSequenceCurrent95" />
+    <result column="zero_sequence_current_max" jdbcType="FLOAT" property="zeroSequenceCurrentMax" />
+    <result column="zero_sequence_current_min" jdbcType="FLOAT" property="zeroSequenceCurrentMin" />
+    <result column="zero_sequence_current_avg" jdbcType="FLOAT" property="zeroSequenceCurrentAvg" />
+    <result column="zero_sequence_current_95" jdbcType="FLOAT" property="zeroSequenceCurrent95" />
+    <result column="negative_sequence_current_unbalance_max" jdbcType="FLOAT" property="negativeSequenceCurrentUnbalanceMax" />
+    <result column="negative_sequence_current_unbalance_min" jdbcType="FLOAT" property="negativeSequenceCurrentUnbalanceMin" />
+    <result column="negative_sequence_current_unbalance_avg" jdbcType="FLOAT" property="negativeSequenceCurrentUnbalanceAvg" />
+    <result column="negative_sequence_current_unbalance_95" jdbcType="FLOAT" property="negativeSequenceCurrentUnbalance95" />
+    <result column="zero_sequence_current_imbalance_max" jdbcType="FLOAT" property="zeroSequenceCurrentImbalanceMax" />
+    <result column="zero_sequence_current_imbalance_min" jdbcType="FLOAT" property="zeroSequenceCurrentImbalanceMin" />
+    <result column="zero_sequence_current_imbalance_avg" jdbcType="FLOAT" property="zeroSequenceCurrentImbalanceAvg" />
+    <result column="zero_sequence_current_imbalance_95" jdbcType="FLOAT" property="zeroSequenceCurrentImbalance95" />
+    <result column="equivalent_apparent_power_max" jdbcType="FLOAT" property="equivalentApparentPowerMax" />
+    <result column="equivalent_apparent_power_min" jdbcType="FLOAT" property="equivalentApparentPowerMin" />
+    <result column="equivalent_apparent_power_avg" jdbcType="FLOAT" property="equivalentApparentPowerAvg" />
+    <result column="equivalent_apparent_power_95" jdbcType="FLOAT" property="equivalentApparentPower95" />
+    <result column="equivalent_power_factor_max" jdbcType="FLOAT" property="equivalentPowerFactorMax" />
+    <result column="equivalent_power_factor_min" jdbcType="FLOAT" property="equivalentPowerFactorMin" />
+    <result column="equivalent_power_factor_avg" jdbcType="FLOAT" property="equivalentPowerFactorAvg" />
+    <result column="equivalent_power_factor_95" jdbcType="FLOAT" property="equivalentPowerFactor95" />
+    <result column="fundamental_wave_rateo_max" jdbcType="FLOAT" property="fundamentalWaveRateoMax" />
+    <result column="fundamental_wave_rateo_min" jdbcType="FLOAT" property="fundamentalWaveRateoMin" />
+    <result column="fundamental_wave_rateo_avg" jdbcType="FLOAT" property="fundamentalWaveRateoAvg" />
+    <result column="fundamental_wave_rateo_95" jdbcType="FLOAT" property="fundamentalWaveRateo95" />
+    <result column="fundamental_wave_apparent_max" jdbcType="FLOAT" property="fundamentalWaveApparentMax" />
+    <result column="fundamental_wave_apparent_min" jdbcType="FLOAT" property="fundamentalWaveApparentMin" />
+    <result column="fundamental_wave_apparent_avg" jdbcType="FLOAT" property="fundamentalWaveApparentAvg" />
+    <result column="fundamental_wave_apparent_95" jdbcType="FLOAT" property="fundamentalWaveApparent95" />
+    <result column="nonfundamental_wave_rateo_max" jdbcType="FLOAT" property="nonfundamentalWaveRateoMax" />
+    <result column="nonfundamental_wave_rateo_min" jdbcType="FLOAT" property="nonfundamentalWaveRateoMin" />
+    <result column="nonfundamental_wave_rateo_avg" jdbcType="FLOAT" property="nonfundamentalWaveRateoAvg" />
+    <result column="nonfundamental_wave_rateo_95" jdbcType="FLOAT" property="nonfundamentalWaveRateo95" />
+    <result column="unbalanced_apparent_power_max" jdbcType="FLOAT" property="unbalancedApparentPowerMax" />
+    <result column="unbalanced_apparent_power_min" jdbcType="FLOAT" property="unbalancedApparentPowerMin" />
+    <result column="unbalanced_apparent_power_avg" jdbcType="FLOAT" property="unbalancedApparentPowerAvg" />
+    <result column="unbalanced_apparent_power_95" jdbcType="FLOAT" property="unbalancedApparentPower95" />
+  </resultMap>
+  <sql id="Base_Column_List">
+    <!--@mbg.generated-->
+    measurement_point_id, data_date, frequency_max, frequency_min, frequency_avg, frequency_95, 
+    frequency_deviation_max, frequency_deviation_min, frequency_deviation_avg, frequency_deviation_95, 
+    total_active_power_max, total_active_power_min, total_active_power_avg, total_active_power_95, 
+    total_reactive_power_max, total_reactive_power_min, total_reactive_power_avg, total_reactive_power_95, 
+    total_apparent_power_max, total_apparent_power_min, total_apparent_power_avg, total_apparent_power_95, 
+    tp_power_factor_max, tp_power_factor_min, tp_power_factor_avg, tp_power_factor_95, 
+    fundamental_power_factor_max, fundamental_power_factor_min, fundamental_power_factor_avg, 
+    fundamental_power_factor_95, positive_sequence_voltage_max, positive_sequence_voltage_min, 
+    positive_sequence_voltage_avg, positive_sequence_voltage_95, negative_sequence_voltage_max, 
+    negative_sequence_voltage_min, negative_sequence_voltage_avg, negative_sequence_voltage_95, 
+    zero_sequence_voltage_max, zero_sequence_voltage_min, zero_sequence_voltage_avg, 
+    zero_sequence_voltage_95, negative_sequence_voltage_unbalance_max, negative_sequence_voltage_unbalance_min, 
+    negative_sequence_voltage_unbalance_avg, negative_sequence_voltage_unbalance_95, 
+    zero_sequence_voltage_unbalance_max, zero_sequence_voltage_unbalance_min, zero_sequence_voltage_unbalance_avg, 
+    zero_sequence_voltage_unbalance_95, positive_sequence_current_max, positive_sequence_current_min, 
+    positive_sequence_current_avg, positive_sequence_current_95, negative_sequence_current_max, 
+    negative_sequence_current_min, negative_sequence_current_avg, negative_sequence_current_95, 
+    zero_sequence_current_max, zero_sequence_current_min, zero_sequence_current_avg, 
+    zero_sequence_current_95, negative_sequence_current_unbalance_max, negative_sequence_current_unbalance_min, 
+    negative_sequence_current_unbalance_avg, negative_sequence_current_unbalance_95, 
+    zero_sequence_current_imbalance_max, zero_sequence_current_imbalance_min, zero_sequence_current_imbalance_avg, 
+    zero_sequence_current_imbalance_95, equivalent_apparent_power_max, equivalent_apparent_power_min, 
+    equivalent_apparent_power_avg, equivalent_apparent_power_95, equivalent_power_factor_max, 
+    equivalent_power_factor_min, equivalent_power_factor_avg, equivalent_power_factor_95, 
+    fundamental_wave_rateo_max, fundamental_wave_rateo_min, fundamental_wave_rateo_avg, 
+    fundamental_wave_rateo_95, fundamental_wave_apparent_max, fundamental_wave_apparent_min, 
+    fundamental_wave_apparent_avg, fundamental_wave_apparent_95, nonfundamental_wave_rateo_max, 
+    nonfundamental_wave_rateo_min, nonfundamental_wave_rateo_avg, nonfundamental_wave_rateo_95, 
+    unbalanced_apparent_power_max, unbalanced_apparent_power_min, unbalanced_apparent_power_avg, 
+    unbalanced_apparent_power_95
+  </sql>
+</mapper>
\ No newline at end of file
diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/mapping/RMpPltReportDPOMapper.xml b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/mapping/RMpPltReportDPOMapper.xml
new file mode 100644
index 000000000..a2d5efafd
--- /dev/null
+++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/mapping/RMpPltReportDPOMapper.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.njcn.prepare.harmonic.mapper.line.RMpPltReportDPOMapper">
+  <resultMap id="BaseResultMap" type="com.njcn.prepare.harmonic.pojo.po.line.RMpPltReportDPO">
+    <!--@mbg.generated-->
+    <!--@Table r_mp_plt_report_d-->
+    <id column="measurement_point_id" jdbcType="VARCHAR" property="measurementPointId" />
+    <id column="data_date" jdbcType="DATE" property="dataDate" />
+    <id column="phase" jdbcType="VARCHAR" property="phase" />
+    <result column="long_time_flashing_max" jdbcType="FLOAT" property="longTimeFlashingMax" />
+    <result column="long_time_flashing_min" jdbcType="FLOAT" property="longTimeFlashingMin" />
+    <result column="long_time_flashing_avg" jdbcType="FLOAT" property="longTimeFlashingAvg" />
+    <result column="long_time_flashing_95" jdbcType="FLOAT" property="longTimeFlashing95" />
+  </resultMap>
+  <sql id="Base_Column_List">
+    <!--@mbg.generated-->
+    measurement_point_id, data_date, phase, long_time_flashing_max, long_time_flashing_min, 
+    long_time_flashing_avg, long_time_flashing_95
+  </sql>
+</mapper>
\ No newline at end of file
diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/mapping/RMpPollutionDMapper.xml b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/mapping/RMpPollutionDMapper.xml
new file mode 100644
index 000000000..c4b3450d2
--- /dev/null
+++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/mapping/RMpPollutionDMapper.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.njcn.prepare.harmonic.mapper.line.RMpPollutionDMapper">
+
+    <insert id="insertPollution">
+        INSERT INTO r_mp_pollution_d ( line_Id, data_date, freq_dev, v_dev, v_unbalance,
+         v_all, plt, i_all, i_neg, v_inharm) VALUES
+            ( #{item.lineId}, #{item.dataDate}, #{item.freqDev}, #{item.vDev}, #{item.vUnbalance},
+            #{item.vAll}, #{item.plt}, #{item.iAll}, #{item.iNeg}, #{item.vInharm}   )
+            ON DUPLICATE KEY UPDATE freq_dev = #{item.freqDev}, v_dev = #{item.vDev}, v_unbalance = #{item.vUnbalance},
+            v_all = #{item.vAll}, plt = #{item.plt}, i_all = #{item.iAll}, i_neg = #{item.iNeg}, v_inharm = #{item.vInharm}
+    </insert>
+</mapper>
diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/mapping/RStatPollutionOrgDMapper.xml b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/mapping/RStatPollutionOrgDMapper.xml
new file mode 100644
index 000000000..76abd4006
--- /dev/null
+++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/mapping/RStatPollutionOrgDMapper.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.njcn.prepare.harmonic.mapper.line.RStatPollutionOrgDMapper">
+
+    <insert id="insertPollution">
+        INSERT INTO r_stat_pollution_org_d ( org_id, data_date, pollution_type, `value`) VALUES
+            ( #{item.orgId}, #{item.dataDate}, #{item.pollutionType}, #{item.value}   )
+            ON DUPLICATE KEY UPDATE `value` = #{item.value}
+    </insert>
+
+</mapper>
diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/mapping/RStatPollutionOrgMMapper.xml b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/mapping/RStatPollutionOrgMMapper.xml
new file mode 100644
index 000000000..f845bdc32
--- /dev/null
+++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/mapping/RStatPollutionOrgMMapper.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.njcn.prepare.harmonic.mapper.line.RStatPollutionOrgMMapper">
+
+    <insert id="insertPollution">
+        INSERT INTO r_stat_pollution_org_m ( org_id, data_date, pollution_type, `value`) VALUES
+            ( #{item.orgId}, #{item.dataDate}, #{item.pollutionType}, #{item.value}   )
+            ON DUPLICATE KEY UPDATE `value` = #{item.value}
+    </insert>
+
+</mapper>
diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/mapping/RStatPollutionOrgQMapper.xml b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/mapping/RStatPollutionOrgQMapper.xml
new file mode 100644
index 000000000..ef7b43354
--- /dev/null
+++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/mapping/RStatPollutionOrgQMapper.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.njcn.prepare.harmonic.mapper.line.RStatPollutionOrgQMapper">
+
+    <insert id="insertPollution">
+        INSERT INTO r_stat_pollution_org_q ( org_id, data_date, pollution_type, `value`) VALUES
+            ( #{item.orgId}, #{item.dataDate}, #{item.pollutionType}, #{item.value}   )
+            ON DUPLICATE KEY UPDATE `value` = #{item.value}
+    </insert>
+</mapper>
diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/mapping/RStatPollutionOrgYMapper.xml b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/mapping/RStatPollutionOrgYMapper.xml
new file mode 100644
index 000000000..c7a9be19d
--- /dev/null
+++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/mapping/RStatPollutionOrgYMapper.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.njcn.prepare.harmonic.mapper.line.RStatPollutionOrgYMapper">
+
+    <insert id="insertPollution">
+        INSERT INTO r_stat_pollution_org_y ( org_id, data_date, pollution_type, `value`) VALUES
+            ( #{item.orgId}, #{item.dataDate}, #{item.pollutionType}, #{item.value}   )
+            ON DUPLICATE KEY UPDATE `value` = #{item.value}
+    </insert>
+</mapper>
diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/mapping/RStatPollutionSubstationDMapper.xml b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/mapping/RStatPollutionSubstationDMapper.xml
new file mode 100644
index 000000000..79c505a72
--- /dev/null
+++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/mapping/RStatPollutionSubstationDMapper.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.njcn.prepare.harmonic.mapper.line.RStatPollutionSubstationDMapper">
+
+    <insert id="insertPollution">
+        INSERT INTO r_stat_pollution_substation_d ( substation_id, data_date, pollution_type, `value`) VALUES
+            ( #{item.substationId}, #{item.dataDate}, #{item.pollutionType}, #{item.value}   )
+            ON DUPLICATE KEY UPDATE `value` = #{item.value}
+    </insert>
+
+</mapper>
diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/mapping/RStatPollutionSubstationMMapper.xml b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/mapping/RStatPollutionSubstationMMapper.xml
new file mode 100644
index 000000000..6f59495b2
--- /dev/null
+++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/mapping/RStatPollutionSubstationMMapper.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.njcn.prepare.harmonic.mapper.line.RStatPollutionSubstationMMapper">
+
+    <insert id="insertPollution">
+        INSERT INTO r_stat_pollution_substation_m ( substation_id, data_date, pollution_type, `value`) VALUES
+            ( #{item.substationId}, #{item.dataDate}, #{item.pollutionType}, #{item.value}   )
+            ON DUPLICATE KEY UPDATE `value` = #{item.value}
+    </insert>
+</mapper>
diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/mapping/RStatPollutionSubstationQMapper.xml b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/mapping/RStatPollutionSubstationQMapper.xml
new file mode 100644
index 000000000..c92a336d5
--- /dev/null
+++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/mapping/RStatPollutionSubstationQMapper.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.njcn.prepare.harmonic.mapper.line.RStatPollutionSubstationQMapper">
+
+    <insert id="insertPollution">
+        INSERT INTO r_stat_pollution_substation_q ( substation_id, data_date, pollution_type, `value`) VALUES
+            ( #{item.substationId}, #{item.dataDate}, #{item.pollutionType}, #{item.value}   )
+            ON DUPLICATE KEY UPDATE `value` = #{item.value}
+    </insert>
+</mapper>
diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/mapping/RStatPollutionSubstationYMapper.xml b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/mapping/RStatPollutionSubstationYMapper.xml
new file mode 100644
index 000000000..f2d6cc24d
--- /dev/null
+++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/mapping/RStatPollutionSubstationYMapper.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.njcn.prepare.harmonic.mapper.line.RStatPollutionSubstationYMapper">
+
+    <insert id="insertPollution">
+        INSERT INTO r_stat_pollution_substation_y ( substation_id, data_date, pollution_type, `value`) VALUES
+            ( #{item.substationId}, #{item.dataDate}, #{item.pollutionType}, #{item.value}   )
+            ON DUPLICATE KEY UPDATE `value` = #{item.value}
+    </insert>
+</mapper>
diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/substion/subMapper.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/substion/subMapper.java
new file mode 100644
index 000000000..dc4f0ce80
--- /dev/null
+++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/substion/subMapper.java
@@ -0,0 +1,9 @@
+package com.njcn.prepare.harmonic.mapper.substion;
+
+/**
+ * @author denghuajun
+ * @version 1.0.0
+ * @date 2022年10月17日 20:16
+ */
+public interface subMapper {
+}
diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/voltage/VoltageMapper.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/voltage/VoltageMapper.java
new file mode 100644
index 000000000..cd668396f
--- /dev/null
+++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/voltage/VoltageMapper.java
@@ -0,0 +1,9 @@
+package com.njcn.prepare.harmonic.mapper.voltage;
+
+/**
+ * @author denghuajun
+ * @version 1.0.0
+ * @date 2022年10月17日 20:16
+ */
+public interface VoltageMapper {
+}
diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/pojo/dto/LineDTO.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/pojo/dto/LineDTO.java
new file mode 100644
index 000000000..00e85f2ed
--- /dev/null
+++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/pojo/dto/LineDTO.java
@@ -0,0 +1,9 @@
+package com.njcn.prepare.harmonic.pojo.dto;
+
+/**
+ * @author denghuajun
+ * @version 1.0.0
+ * @date 2022年10月17日 20:17
+ */
+public class LineDTO {
+}
diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/pojo/dto/OnLineRateDTO.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/pojo/dto/OnLineRateDTO.java
new file mode 100644
index 000000000..d835a2d8b
--- /dev/null
+++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/pojo/dto/OnLineRateDTO.java
@@ -0,0 +1,18 @@
+package com.njcn.prepare.harmonic.pojo.dto;
+
+import lombok.Data;
+
+/**
+ * @author xiaoyao
+ * @version 1.0.0
+ * @createTime 2022/10/27 10:56
+ */
+@Data
+public class OnLineRateDTO {
+
+    private Integer onLineMinute;
+
+    private Integer offLineMinute;
+
+    private Double rate = 0.0;
+}
diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/pojo/dto/PollutionDTO.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/pojo/dto/PollutionDTO.java
new file mode 100644
index 000000000..a3346355b
--- /dev/null
+++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/pojo/dto/PollutionDTO.java
@@ -0,0 +1,54 @@
+package com.njcn.prepare.harmonic.pojo.dto;
+
+import lombok.Data;
+
+@Data
+public class PollutionDTO {
+
+    /**
+     * 监测点id
+     */
+    private String lineId;
+
+    /**
+     * 频率偏差污染值
+     */
+    private Double freqDev = 0.0;
+
+    /**
+     * 电压偏差污染值
+     */
+    private Double vDev = 0.0;
+
+    /**
+     * 三相电压不平衡度污染值
+     */
+    private Double vUnbalance = 0.0;
+
+    /**
+     * 谐波电压污染值
+     */
+    private Double vAll = 0.0;
+
+    /**
+     * 长时电压闪变污染值
+     */
+    private Double plt = 0.0;
+
+    /**
+     * 谐波电流污染值
+     */
+    private Double iAll = 0.0;
+
+    /**
+     * 负序电流污染值
+     */
+    private Double iNeg = 0.0;
+
+    /**
+     * 间谐波电压含有率污染值
+     */
+    private Double vInharm = 0.0;
+
+
+}
diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/pojo/param/LimitRateHanlderParam.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/pojo/param/LimitRateHanlderParam.java
new file mode 100644
index 000000000..51816b666
--- /dev/null
+++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/pojo/param/LimitRateHanlderParam.java
@@ -0,0 +1,30 @@
+package com.njcn.prepare.harmonic.pojo.param;
+
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.annotations.ApiOperation;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * Description:
+ * 接口文档访问地址：http://serverIP:port/swagger-ui.html
+ * Date: 2022/10/19  11:41【需求编号】
+ *
+ * @author clam
+ * @version V1.0.0
+ */
+@Data
+@ApiOperation ("LimitRateHanlderParam")
+public class LimitRateHanlderParam {
+
+    @ApiModelProperty(name = "lineIds",value = "监测点索引集合")
+    private List<String> lineIds;
+
+
+    @ApiModelProperty(name = "startTime",value = "处理数据开始时间")
+    private String startTime;
+
+    @ApiModelProperty(name = "endTime",value = "处理数据结束时间")
+    private String endTime;
+}
diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/pojo/param/LineParam.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/pojo/param/LineParam.java
new file mode 100644
index 000000000..dcc50f840
--- /dev/null
+++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/pojo/param/LineParam.java
@@ -0,0 +1,29 @@
+package com.njcn.prepare.harmonic.pojo.param;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.util.List;
+
+/**
+ * @author qijian
+ * Date: 2022/10/20  11:41
+ * @version V1.0.0
+ */
+@Data
+public class LineParam {
+
+    @ApiModelProperty(name = "lineIds",value = "监测点索引集合")
+    private List<String> lineIds;
+
+    @ApiModelProperty(name = "type",value = "报表类型")
+    @NotNull(message = "报表类型不可为空")
+    private Integer type;
+
+    @ApiModelProperty(name = "dataDate",value = "报表时间")
+    @NotBlank(message = "报表时间不可为空")
+    private String dataDate;
+
+}
diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/pojo/po/AbnormalPO.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/pojo/po/AbnormalPO.java
new file mode 100644
index 000000000..15e8e7833
--- /dev/null
+++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/pojo/po/AbnormalPO.java
@@ -0,0 +1,245 @@
+package com.njcn.prepare.harmonic.pojo.po;
+
+import cn.hutool.core.date.DateTime;
+import lombok.Data;
+import org.influxdb.annotation.Column;
+import org.influxdb.annotation.Measurement;
+
+import java.time.Instant;
+
+/**
+ * 告警数据表
+ *
+ * @author denghuajun
+ * @version 1.0.0
+ * @date  2022/10/18 10:20
+ */
+@Data
+@Measurement(name = "r_mp_surplus_abnormal_d")
+public class AbnormalPO {
+
+    @Column(name = "Time_Id")
+    private DateTime timeId;
+
+    @Column(name = "Id")
+    private String id;
+
+    @Column(name = "Phasic_Type")
+    private String phasicType;
+
+    @Column(name="Value_Type")
+    private String valueType;
+
+    @Column(name = "Voltage_Dev")
+    private Float voltageDev;
+
+    @Column(name = "Uvoltage_Dev")
+    private Float uvoltageDev;
+
+    @Column(name = "Flicker")
+    private Float flickerAllTime;
+
+    @Column(name = "Freq")
+    private Float freqDev;
+
+    @Column(name = "Ubalance")
+    private Float uBalance;
+
+    @Column(name = "Uaberrance")
+    private Float uAberrance;
+
+    @Column(name = "I_Neg")
+    private Float iNeg;
+
+    @Column(name = "Uharm_2")
+    private Float uHarm2;
+
+    @Column(name = "Uharm_3")
+    private Float uHarm3;
+
+    @Column(name = "Uharm_4")
+    private Float uHarm4;
+
+    @Column(name = "Uharm_5")
+    private Float uHarm5;
+
+    @Column(name = "Uharm_6")
+    private Float uHarm6;
+
+    @Column(name = "Uharm_7")
+    private Float uHarm7;
+
+    @Column(name = "Uharm_8")
+    private Float uHarm8;
+
+    @Column(name = "Uharm_9")
+    private Float uHarm9;
+
+    @Column(name = "Uharm_10")
+    private Float uHarm10;
+
+    @Column(name = "Uharm_11")
+    private Float uHarm11;
+
+    @Column(name = "Uharm_12")
+    private Float uHarm12;
+
+    @Column(name = "Uharm_13")
+    private Float uHarm13;
+
+    @Column(name = "Uharm_14")
+    private Float uHarm14;
+
+    @Column(name = "Uharm_15")
+    private Float uHarm15;
+
+    @Column(name = "Uharm_16")
+    private Float uHarm16;
+
+    @Column(name = "Uharm_17")
+    private Float uHarm17;
+
+    @Column(name = "Uharm_18")
+    private Float uHarm18;
+
+    @Column(name = "Uharm_19")
+    private Float uHarm19;
+
+    @Column(name = "Uharm_20")
+    private Float uHarm20;
+
+    @Column(name = "Uharm_21")
+    private Float uHarm21;
+
+    @Column(name = "Uharm_22")
+    private Float uHarm22;
+
+    @Column(name = "Uharm_23")
+    private Float uHarm23;
+
+    @Column(name = "Uharm_24")
+    private Float uHarm24;
+
+    @Column(name = "Uharm_25")
+    private Float uHarm25;
+
+    @Column(name = "Iharm_2")
+    private Float iHarm2;
+
+    @Column(name = "Iharm_3")
+    private Float iHarm3;
+
+    @Column(name = "Iharm_4")
+    private Float iHarm4;
+
+    @Column(name = "Iharm_5")
+    private Float iHarm5;
+
+    @Column(name = "Iharm_6")
+    private Float iHarm6;
+
+    @Column(name = "Iharm_7")
+    private Float iHarm7;
+
+    @Column(name = "Iharm_8")
+    private Float iHarm8;
+
+    @Column(name = "Iharm_9")
+    private Float iHarm9;
+
+    @Column(name = "Iharm_10")
+    private Float iHarm10;
+
+    @Column(name = "Iharm_11")
+    private Float iHarm11;
+
+    @Column(name = "Iharm_12")
+    private Float iHarm12;
+
+    @Column(name = "Iharm_13")
+    private Float iHarm13;
+
+    @Column(name = "Iharm_14")
+    private Float iHarm14;
+
+    @Column(name = "Iharm_15")
+    private Float iHarm15;
+
+    @Column(name = "Iharm_16")
+    private Float iHarm16;
+
+    @Column(name = "Iharm_17")
+    private Float iHarm17;
+
+    @Column(name = "Iharm_18")
+    private Float iHarm18;
+
+    @Column(name = "Iharm_19")
+    private Float iHarm19;
+
+    @Column(name = "Iharm_20")
+    private Float iHarm20;
+
+    @Column(name = "Iharm_21")
+    private Float iHarm21;
+
+    @Column(name = "Iharm_22")
+    private Float iHarm22;
+
+    @Column(name = "Iharm_23")
+    private Float iHarm23;
+
+    @Column(name = "Iharm_24")
+    private Float iHarm24;
+
+    @Column(name = "Iharm_25")
+    private Float iHarm25;
+
+    @Column(name = "Inuharm_1")
+    private Float inuHarm1;
+
+    @Column(name = "Inuharm_2")
+    private Float inuHarm2;
+
+    @Column(name = "Inuharm_3")
+    private Float inuHarm3;
+
+    @Column(name = "Inuharm_4")
+    private Float inuHarm4;
+
+    @Column(name = "Inuharm_5")
+    private Float inuHarm5;
+
+    @Column(name = "Inuharm_6")
+    private Float inuHarm6;
+
+    @Column(name = "Inuharm_7")
+    private Float inuHarm7;
+
+    @Column(name = "Inuharm_8")
+    private Float inuHarm8;
+
+    @Column(name = "Inuharm_9")
+    private Float inuHarm9;
+
+    @Column(name = "Inuharm_10")
+    private Float inuHarm10;
+
+    @Column(name = "Inuharm_11")
+    private Float inuHarm11;
+
+    @Column(name = "Inuharm_12")
+    private Float inuHarm12;
+
+    @Column(name = "Inuharm_13")
+    private Float inuHarm13;
+
+    @Column(name = "Inuharm_14")
+    private Float inuHarm14;
+
+    @Column(name = "Inuharm_15")
+    private Float inuHarm15;
+
+    @Column(name = "Inuharm_16")
+    private Float inuHarm16;
+}
diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/pojo/po/DataFlickerPO.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/pojo/po/DataFlickerPO.java
new file mode 100644
index 000000000..6516168e4
--- /dev/null
+++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/pojo/po/DataFlickerPO.java
@@ -0,0 +1,43 @@
+package com.njcn.prepare.harmonic.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/11 16:08
+ */
+@Data
+@Measurement(name = "data_flicker")
+public class DataFlickerPO {
+
+    @Column(name = "time")
+    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;
+
+    @Column(name = "fluc")
+    private Double fluc;
+
+    @Column(name = "plt")
+    private Double plt;
+
+    @Column(name = "pst")
+    private Double pst;
+}
diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/pojo/po/DataFlucPO.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/pojo/po/DataFlucPO.java
new file mode 100644
index 000000000..9f0986c61
--- /dev/null
+++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/pojo/po/DataFlucPO.java
@@ -0,0 +1,41 @@
+package com.njcn.prepare.harmonic.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/11 16:33
+ */
+@Data
+@Measurement(name = "data_fluc")
+public class DataFlucPO {
+
+    @Column(name = "time")
+    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;
+
+    @Column(name = "fluc")
+    private Double fluc;
+
+    @Column(name = "fluccf")
+    private Double fluccf;
+
+}
diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/pojo/po/DataHarmPhasicIPO.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/pojo/po/DataHarmPhasicIPO.java
new file mode 100644
index 000000000..fc0eb1bc1
--- /dev/null
+++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/pojo/po/DataHarmPhasicIPO.java
@@ -0,0 +1,185 @@
+package com.njcn.prepare.harmonic.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_harmphasic_i")
+public class DataHarmPhasicIPO {
+
+    @Column(name = "time")
+    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;
+
+    @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-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/pojo/po/DataHarmPhasicVPO.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/pojo/po/DataHarmPhasicVPO.java
new file mode 100644
index 000000000..8691d58c9
--- /dev/null
+++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/pojo/po/DataHarmPhasicVPO.java
@@ -0,0 +1,185 @@
+package com.njcn.prepare.harmonic.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_harmphasic_v")
+public class DataHarmPhasicVPO {
+
+    @Column(name = "time")
+    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;
+
+    @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-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/pojo/po/DataHarmPowerPPO.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/pojo/po/DataHarmPowerPPO.java
new file mode 100644
index 000000000..046ebb146
--- /dev/null
+++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/pojo/po/DataHarmPowerPPO.java
@@ -0,0 +1,193 @@
+package com.njcn.prepare.harmonic.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_harmpower_p")
+public class DataHarmPowerPPO {
+
+    @Column(name = "time")
+    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;
+
+    @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-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/pojo/po/DataHarmPowerQPO.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/pojo/po/DataHarmPowerQPO.java
new file mode 100644
index 000000000..53830af9c
--- /dev/null
+++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/pojo/po/DataHarmPowerQPO.java
@@ -0,0 +1,188 @@
+package com.njcn.prepare.harmonic.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_harmpower_q")
+public class DataHarmPowerQPO {
+
+    @Column(name = "time")
+    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;
+
+    @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-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/pojo/po/DataHarmPowerSPO.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/pojo/po/DataHarmPowerSPO.java
new file mode 100644
index 000000000..ac707be35
--- /dev/null
+++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/pojo/po/DataHarmPowerSPO.java
@@ -0,0 +1,188 @@
+package com.njcn.prepare.harmonic.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_harmpower_s")
+public class DataHarmPowerSPO {
+
+    @Column(name = "time")
+    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;
+
+    @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-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/pojo/po/DataHarmRateIPO.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/pojo/po/DataHarmRateIPO.java
new file mode 100644
index 000000000..aec68d1cf
--- /dev/null
+++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/pojo/po/DataHarmRateIPO.java
@@ -0,0 +1,185 @@
+package com.njcn.prepare.harmonic.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_harmrate_i")
+public class DataHarmRateIPO {
+
+    @Column(name = "time")
+    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;
+
+    @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-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/pojo/po/DataHarmRateVPO.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/pojo/po/DataHarmRateVPO.java
new file mode 100644
index 000000000..6d0f893e5
--- /dev/null
+++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/pojo/po/DataHarmRateVPO.java
@@ -0,0 +1,186 @@
+package com.njcn.prepare.harmonic.pojo.po;
+
+import lombok.Data;
+import org.influxdb.annotation.Column;
+import org.influxdb.annotation.Measurement;
+
+import java.time.Instant;
+
+/**
+ * Description:
+ * 接口文档访问地址：http://serverIP:port/swagger-ui.html
+ * Date: 2022/10/18  11:24【需求编号】
+ *
+ * @author clam
+ * @version V1.0.0
+ */
+@Data
+@Measurement(name = "data_harmrate_v")
+public class DataHarmRateVPO {
+
+
+    @Column(name = "time")
+    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;
+
+    @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-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/pojo/po/DataIPO.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/pojo/po/DataIPO.java
new file mode 100644
index 000000000..301390995
--- /dev/null
+++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/pojo/po/DataIPO.java
@@ -0,0 +1,196 @@
+package com.njcn.prepare.harmonic.pojo.po;
+
+import lombok.Data;
+import org.influxdb.annotation.Column;
+import org.influxdb.annotation.Measurement;
+
+import java.time.Instant;
+
+@Data
+@Measurement(name = "data_i")
+public class DataIPO {
+
+    @Column(name = "time")
+    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;
+
+    @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-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/pojo/po/DataInHarmIPO.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/pojo/po/DataInHarmIPO.java
new file mode 100644
index 000000000..34a71c714
--- /dev/null
+++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/pojo/po/DataInHarmIPO.java
@@ -0,0 +1,185 @@
+package com.njcn.prepare.harmonic.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_harmphasic_i")
+public class DataInHarmIPO {
+
+    @Column(name = "time")
+    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;
+
+    @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-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/pojo/po/DataInHarmRateIPO.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/pojo/po/DataInHarmRateIPO.java
new file mode 100644
index 000000000..ce43b3e26
--- /dev/null
+++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/pojo/po/DataInHarmRateIPO.java
@@ -0,0 +1,185 @@
+package com.njcn.prepare.harmonic.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 DataInHarmRateIPO {
+
+    @Column(name = "time")
+    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;
+
+    @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-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/pojo/po/DataInHarmRateVPO.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/pojo/po/DataInHarmRateVPO.java
new file mode 100644
index 000000000..9233982c0
--- /dev/null
+++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/pojo/po/DataInHarmRateVPO.java
@@ -0,0 +1,185 @@
+package com.njcn.prepare.harmonic.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_v")
+public class DataInHarmRateVPO {
+
+    @Column(name = "time")
+    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;
+
+    @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-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/pojo/po/DataInHarmVPO.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/pojo/po/DataInHarmVPO.java
new file mode 100644
index 000000000..a22083b33
--- /dev/null
+++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/pojo/po/DataInHarmVPO.java
@@ -0,0 +1,186 @@
+package com.njcn.prepare.harmonic.pojo.po;
+
+import lombok.Data;
+import org.influxdb.annotation.Column;
+import org.influxdb.annotation.Measurement;
+
+import java.time.Instant;
+
+/**
+ * Description:
+ * 接口文档访问地址：http://serverIP:port/swagger-ui.html
+ * Date: 2022/10/18  11:24【需求编号】
+ *
+ * @author clam
+ * @version V1.0.0
+ */
+@Data
+@Measurement(name = "data_inharm_v")
+public class DataInHarmVPO {
+
+    @Column(name = "time")
+    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;
+
+    @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-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/pojo/po/DataPltPO.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/pojo/po/DataPltPO.java
new file mode 100644
index 000000000..5a7d9d82c
--- /dev/null
+++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/pojo/po/DataPltPO.java
@@ -0,0 +1,35 @@
+package com.njcn.prepare.harmonic.pojo.po;
+
+import lombok.Data;
+import org.influxdb.annotation.Column;
+import org.influxdb.annotation.Measurement;
+
+import java.time.Instant;
+
+@Data
+@Measurement(name = "data_plt")
+public class DataPltPO {
+
+    @Column(name = "time")
+    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 = "quality_flag")
+    private String qualityFlag;
+
+    @Column(name = "plt")
+    private Double plt;
+
+    //自定义字段-闪变总计算次数
+    @Column(name = "flicker_all_time")
+    private Integer flickerAllTime;
+
+}
diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/pojo/po/DataPolluctionPO.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/pojo/po/DataPolluctionPO.java
new file mode 100644
index 000000000..e75c41516
--- /dev/null
+++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/pojo/po/DataPolluctionPO.java
@@ -0,0 +1,48 @@
+package com.njcn.prepare.harmonic.pojo.po;
+
+import lombok.Data;
+import org.influxdb.annotation.Column;
+import org.influxdb.annotation.Measurement;
+
+import java.time.Instant;
+
+/**
+ * @author xiaoyao
+ * @version 1.0.0
+ * @createTime 2022/10/21 13:45
+ */
+@Data
+@Measurement(name = "data_polluction")
+public class DataPolluctionPO {
+
+    @Column(name = "line_id")
+    private String lineId;
+
+    @Column(name = "time")
+    private Instant time;
+
+    @Column(name = "freq_dev")
+    private Double freqDev;
+
+    @Column(name = "v_dev")
+    private Double vDev;
+
+    @Column(name = "v_unbalance")
+    private Double vUnbalance;
+
+    @Column(name = "v_all")
+    private Double vAll;
+
+    @Column(name = "plt")
+    private Double plt;
+
+    @Column(name = "i_all")
+    private Double iAll;
+
+    @Column(name = "i_neg")
+    private Double iNeg;
+
+    @Column(name = "v_inharm")
+    private Double vInharm;
+
+}
diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/pojo/po/DataVPO.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/pojo/po/DataVPO.java
new file mode 100644
index 000000000..06b9e0007
--- /dev/null
+++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/pojo/po/DataVPO.java
@@ -0,0 +1,214 @@
+package com.njcn.prepare.harmonic.pojo.po;
+
+import lombok.Data;
+import org.influxdb.annotation.Column;
+import org.influxdb.annotation.Measurement;
+
+import java.time.Instant;
+
+@Data
+@Measurement(name = "data_v")
+public class DataVPO {
+
+    @Column(name = "time")
+    private Instant time;
+
+    @Column(name = "freq")
+    private Double freq;
+
+    @Column(name = "freq_dev")
+    private Double freqDev;
+
+    @Column(name = "quality_flag")
+    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")
+    private String lineId;
+
+    @Column(name = "phasic_type")
+    private String phaseType;
+
+    @Column(name = "value_type")
+    private String valueType;
+
+    //自定义字段-总计算次数
+    @Column(name = "all_time")
+    private Integer allTime;
+}
diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/pojo/po/DayHarmrateVPO.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/pojo/po/DayHarmrateVPO.java
new file mode 100644
index 000000000..f543a1c2b
--- /dev/null
+++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/pojo/po/DayHarmrateVPO.java
@@ -0,0 +1,177 @@
+package com.njcn.prepare.harmonic.pojo.po;
+
+import lombok.Data;
+import org.influxdb.annotation.Column;
+import org.influxdb.annotation.Measurement;
+
+import java.time.Instant;
+
+@Data
+@Measurement(name = "day_harmrate_v")
+public class DayHarmrateVPO {
+
+    @Column(name = "time")
+    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 = "quality_flag")
+    private String qualityFlag;
+
+    @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-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/pojo/po/DayIPO.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/pojo/po/DayIPO.java
new file mode 100644
index 000000000..4c5324e1f
--- /dev/null
+++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/pojo/po/DayIPO.java
@@ -0,0 +1,13 @@
+package com.njcn.prepare.harmonic.pojo.po;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.influxdb.annotation.Measurement;
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Measurement(name = "day_i")
+public class DayIPO extends DataIPO {
+
+
+}
diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/pojo/po/DayInharmVPO.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/pojo/po/DayInharmVPO.java
new file mode 100644
index 000000000..41d28f719
--- /dev/null
+++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/pojo/po/DayInharmVPO.java
@@ -0,0 +1,178 @@
+package com.njcn.prepare.harmonic.pojo.po;
+
+import lombok.Data;
+import org.influxdb.annotation.Column;
+import org.influxdb.annotation.Measurement;
+
+import java.time.Instant;
+
+@Data
+@Measurement(name = "day_inharm_v")
+public class DayInharmVPO {
+
+    @Column(name = "time")
+    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 = "quality_flag")
+    private String qualityFlag;
+
+    @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-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/pojo/po/DayPltPO.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/pojo/po/DayPltPO.java
new file mode 100644
index 000000000..56ba76873
--- /dev/null
+++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/pojo/po/DayPltPO.java
@@ -0,0 +1,13 @@
+package com.njcn.prepare.harmonic.pojo.po;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.influxdb.annotation.Measurement;
+
+@EqualsAndHashCode(callSuper = true)
+@Data
+@Measurement(name = "day_plt")
+public class DayPltPO extends DataPltPO {
+
+
+}
diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/pojo/po/DayVPO.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/pojo/po/DayVPO.java
new file mode 100644
index 000000000..6fd1394c5
--- /dev/null
+++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/pojo/po/DayVPO.java
@@ -0,0 +1,12 @@
+package com.njcn.prepare.harmonic.pojo.po;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.influxdb.annotation.Measurement;
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Measurement(name = "day_v")
+public class DayVPO extends DataVPO {
+
+}
diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/pojo/po/ExcelRpt.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/pojo/po/ExcelRpt.java
new file mode 100644
index 000000000..17890bee8
--- /dev/null
+++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/pojo/po/ExcelRpt.java
@@ -0,0 +1,55 @@
+package com.njcn.prepare.harmonic.pojo.po;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.njcn.db.bo.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+/**
+ * (SysExcelRpt)实体类
+ *
+ * @author qijian
+ * @since 2022-10-14 10:44:54
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName(value = "sys_excel_rpt")
+public class ExcelRpt extends BaseEntity {
+    /**
+     * 主键
+     */
+    private String id;
+    /**
+     * 名称
+     */
+    private String name;
+    /**
+     * 监测点Id
+     */
+    private String lineId;
+    /**
+     * 报表日期
+     */
+    private Date dataDate;
+    /**
+     * 报表模板Id
+     */
+    private String tempId;
+    /**
+     * 报表内容
+     */
+    private String content;
+    /**
+     * 报表类型（1年 2季度 3月份 4周 5日）
+     */
+    private Integer type;
+    /**
+     * 状态（0：删除；1：正常）
+     */
+    private Integer state;
+
+}
+
+
diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/pojo/po/ExcelRptTemp.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/pojo/po/ExcelRptTemp.java
new file mode 100644
index 000000000..20616b463
--- /dev/null
+++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/pojo/po/ExcelRptTemp.java
@@ -0,0 +1,29 @@
+package com.njcn.prepare.harmonic.pojo.po;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.njcn.db.bo.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 自定义报表
+ * @author qijian
+ * @since 2022-10-14 10:44:54
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName(value = "sys_excel_rpt_temp")
+public class ExcelRptTemp extends BaseEntity {
+    private String id;
+
+    private String name;
+
+    private String content;
+
+    private Integer state;
+
+    private String valueTitle;
+
+    private String reportType;
+
+}
diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/pojo/po/LinePO.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/pojo/po/LinePO.java
new file mode 100644
index 000000000..cbab103d4
--- /dev/null
+++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/pojo/po/LinePO.java
@@ -0,0 +1,9 @@
+package com.njcn.prepare.harmonic.pojo.po;
+
+/**
+ * @author denghuajun
+ * @version 1.0.0
+ * @date 2022年10月17日 20:17
+ */
+public class LinePO {
+}
diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/pojo/po/PqsCommunicatePO.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/pojo/po/PqsCommunicatePO.java
new file mode 100644
index 000000000..3611ad983
--- /dev/null
+++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/pojo/po/PqsCommunicatePO.java
@@ -0,0 +1,30 @@
+package com.njcn.prepare.harmonic.pojo.po;
+
+import lombok.Data;
+import org.influxdb.annotation.Column;
+import org.influxdb.annotation.Measurement;
+
+import java.time.Instant;
+
+/**
+ * @author xiaoyao
+ * @version 1.0.0
+ * @createTime 2022/10/27 10:08
+ */
+
+@Data
+@Measurement(name = "pqs_communicate")
+public class PqsCommunicatePO {
+
+    @Column(name = "time")
+    private Instant time;
+
+    @Column(name = "line_id")
+    private String lineId;
+
+    @Column(name = "type")
+    private Integer type;
+
+    @Column(name = "description")
+    private String description;
+}
diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/pojo/po/RMpPollutionD.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/pojo/po/RMpPollutionD.java
new file mode 100644
index 000000000..8d7775306
--- /dev/null
+++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/pojo/po/RMpPollutionD.java
@@ -0,0 +1,159 @@
+package com.njcn.prepare.harmonic.pojo.po;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import java.time.LocalDateTime;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 监测点污区图统计日表
+ * </p>
+ *
+ * @author xiaoyao
+ * @since 2022-10-20
+ */
+@TableName("r_mp_pollution_d")
+public class RMpPollutionD implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 监测点id
+     */
+    @TableId(value = "line_id", type = IdType.AUTO)
+    private String lineId;
+
+    /**
+     * 时间
+     */
+    private LocalDateTime dataDate;
+
+    /**
+     * 频率偏差
+     */
+    private Float freqDev;
+
+    /**
+     * 电压偏差
+     */
+    private Float vDev;
+
+    /**
+     * 三相电压不平衡度
+     */
+    private Float vUnbalance;
+
+    /**
+     * 谐波电压(电压总谐波畸变率、各次谐波电压含有率)
+     */
+    private Float vAll;
+
+    /**
+     * 长时闪变
+     */
+    private Float plt;
+
+    /**
+     * 谐波电流
+     */
+    private Float iAll;
+
+    /**
+     * 负序电流
+     */
+    private Float iNeg;
+
+    /**
+     * 间谐波电压含有率
+     */
+    private Float vInharm;
+
+    public String getLineId() {
+        return lineId;
+    }
+
+    public void setLineId(String lineId) {
+        this.lineId = lineId;
+    }
+    public LocalDateTime getDataDate() {
+        return dataDate;
+    }
+
+    public void setDataDate(LocalDateTime dataDate) {
+        this.dataDate = dataDate;
+    }
+    public Float getFreqDev() {
+        return freqDev;
+    }
+
+    public void setFreqDev(Float freqDev) {
+        this.freqDev = freqDev;
+    }
+    public Float getvDev() {
+        return vDev;
+    }
+
+    public void setvDev(Float vDev) {
+        this.vDev = vDev;
+    }
+    public Float getvUnbalance() {
+        return vUnbalance;
+    }
+
+    public void setvUnbalance(Float vUnbalance) {
+        this.vUnbalance = vUnbalance;
+    }
+    public Float getvAll() {
+        return vAll;
+    }
+
+    public void setvAll(Float vAll) {
+        this.vAll = vAll;
+    }
+    public Float getPlt() {
+        return plt;
+    }
+
+    public void setPlt(Float plt) {
+        this.plt = plt;
+    }
+    public Float getiAll() {
+        return iAll;
+    }
+
+    public void setiAll(Float iAll) {
+        this.iAll = iAll;
+    }
+    public Float getiNeg() {
+        return iNeg;
+    }
+
+    public void setiNeg(Float iNeg) {
+        this.iNeg = iNeg;
+    }
+    public Float getvInharm() {
+        return vInharm;
+    }
+
+    public void setvInharm(Float vInharm) {
+        this.vInharm = vInharm;
+    }
+
+    @Override
+    public String toString() {
+        return "RMpPollutionD{" +
+            "lineId=" + lineId +
+            ", dataDate=" + dataDate +
+            ", freqDev=" + freqDev +
+            ", vDev=" + vDev +
+            ", vUnbalance=" + vUnbalance +
+            ", vAll=" + vAll +
+            ", plt=" + plt +
+            ", iAll=" + iAll +
+            ", iNeg=" + iNeg +
+            ", vInharm=" + vInharm +
+        "}";
+    }
+}
diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/pojo/po/RStatPollutionOrgD.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/pojo/po/RStatPollutionOrgD.java
new file mode 100644
index 000000000..99fb3f75c
--- /dev/null
+++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/pojo/po/RStatPollutionOrgD.java
@@ -0,0 +1,81 @@
+package com.njcn.prepare.harmonic.pojo.po;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import java.time.LocalDateTime;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 单位污区图统计日表
+ * </p>
+ *
+ * @author xiaoyao
+ * @since 2022-10-20
+ */
+@TableName("r_stat_pollution_org_d")
+public class RStatPollutionOrgD implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 单位id
+     */
+    @TableId(value = "org_id", type = IdType.AUTO)
+    private String orgId;
+
+    /**
+     * 时间
+     */
+    private LocalDateTime dataDate;
+
+    /**
+     * 污区图统计类型
+     */
+    private String pollutionType;
+
+    /**
+     * 统计值
+     */
+    private Float value;
+
+    public String getOrgId() {
+        return orgId;
+    }
+
+    public void setOrgId(String orgId) {
+        this.orgId = orgId;
+    }
+    public LocalDateTime getDataDate() {
+        return dataDate;
+    }
+
+    public void setDataDate(LocalDateTime dataDate) {
+        this.dataDate = dataDate;
+    }
+    public String getPollutionType() {
+        return pollutionType;
+    }
+
+    public void setPollutionType(String pollutionType) {
+        this.pollutionType = pollutionType;
+    }
+    public Float getValue() {
+        return value;
+    }
+
+    public void setValue(Float value) {
+        this.value = value;
+    }
+
+    @Override
+    public String toString() {
+        return "RStatPollutionOrgD{" +
+            "orgId=" + orgId +
+            ", dataDate=" + dataDate +
+            ", pollutionType=" + pollutionType +
+            ", value=" + value +
+        "}";
+    }
+}
diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/pojo/po/RStatPollutionOrgM.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/pojo/po/RStatPollutionOrgM.java
new file mode 100644
index 000000000..fd4245ae9
--- /dev/null
+++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/pojo/po/RStatPollutionOrgM.java
@@ -0,0 +1,81 @@
+package com.njcn.prepare.harmonic.pojo.po;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import java.time.LocalDateTime;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 单位污区图统计月表
+ * </p>
+ *
+ * @author xiaoyao
+ * @since 2022-10-20
+ */
+@TableName("r_stat_pollution_org_m")
+public class RStatPollutionOrgM implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 单位id
+     */
+    @TableId(value = "org_id", type = IdType.AUTO)
+    private String orgId;
+
+    /**
+     * 时间
+     */
+    private LocalDateTime dataDate;
+
+    /**
+     * 污区图统计类型
+     */
+    private String pollutionType;
+
+    /**
+     * 统计值
+     */
+    private Float value;
+
+    public String getOrgId() {
+        return orgId;
+    }
+
+    public void setOrgId(String orgId) {
+        this.orgId = orgId;
+    }
+    public LocalDateTime getDataDate() {
+        return dataDate;
+    }
+
+    public void setDataDate(LocalDateTime dataDate) {
+        this.dataDate = dataDate;
+    }
+    public String getPollutionType() {
+        return pollutionType;
+    }
+
+    public void setPollutionType(String pollutionType) {
+        this.pollutionType = pollutionType;
+    }
+    public Float getValue() {
+        return value;
+    }
+
+    public void setValue(Float value) {
+        this.value = value;
+    }
+
+    @Override
+    public String toString() {
+        return "RStatPollutionOrgM{" +
+            "orgId=" + orgId +
+            ", dataDate=" + dataDate +
+            ", pollutionType=" + pollutionType +
+            ", value=" + value +
+        "}";
+    }
+}
diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/pojo/po/RStatPollutionOrgQ.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/pojo/po/RStatPollutionOrgQ.java
new file mode 100644
index 000000000..d6bb01c3b
--- /dev/null
+++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/pojo/po/RStatPollutionOrgQ.java
@@ -0,0 +1,81 @@
+package com.njcn.prepare.harmonic.pojo.po;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import java.time.LocalDateTime;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 单位污区图统计季表
+ * </p>
+ *
+ * @author xiaoyao
+ * @since 2022-10-20
+ */
+@TableName("r_stat_pollution_org_q")
+public class RStatPollutionOrgQ implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 单位id
+     */
+    @TableId(value = "org_id", type = IdType.AUTO)
+    private String orgId;
+
+    /**
+     * 时间
+     */
+    private LocalDateTime dataDate;
+
+    /**
+     * 污区图统计类型
+     */
+    private String pollutionType;
+
+    /**
+     * 统计值
+     */
+    private Float value;
+
+    public String getOrgId() {
+        return orgId;
+    }
+
+    public void setOrgId(String orgId) {
+        this.orgId = orgId;
+    }
+    public LocalDateTime getDataDate() {
+        return dataDate;
+    }
+
+    public void setDataDate(LocalDateTime dataDate) {
+        this.dataDate = dataDate;
+    }
+    public String getPollutionType() {
+        return pollutionType;
+    }
+
+    public void setPollutionType(String pollutionType) {
+        this.pollutionType = pollutionType;
+    }
+    public Float getValue() {
+        return value;
+    }
+
+    public void setValue(Float value) {
+        this.value = value;
+    }
+
+    @Override
+    public String toString() {
+        return "RStatPollutionOrgQ{" +
+            "orgId=" + orgId +
+            ", dataDate=" + dataDate +
+            ", pollutionType=" + pollutionType +
+            ", value=" + value +
+        "}";
+    }
+}
diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/pojo/po/RStatPollutionOrgY.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/pojo/po/RStatPollutionOrgY.java
new file mode 100644
index 000000000..78bed8e19
--- /dev/null
+++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/pojo/po/RStatPollutionOrgY.java
@@ -0,0 +1,81 @@
+package com.njcn.prepare.harmonic.pojo.po;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import java.time.LocalDateTime;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 单位污区图统计年表
+ * </p>
+ *
+ * @author xiaoyao
+ * @since 2022-10-20
+ */
+@TableName("r_stat_pollution_org_y")
+public class RStatPollutionOrgY implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 单位id
+     */
+    @TableId(value = "org_id", type = IdType.AUTO)
+    private String orgId;
+
+    /**
+     * 时间
+     */
+    private LocalDateTime dataDate;
+
+    /**
+     * 污区图统计类型
+     */
+    private String pollutionType;
+
+    /**
+     * 统计值
+     */
+    private Float value;
+
+    public String getOrgId() {
+        return orgId;
+    }
+
+    public void setOrgId(String orgId) {
+        this.orgId = orgId;
+    }
+    public LocalDateTime getDataDate() {
+        return dataDate;
+    }
+
+    public void setDataDate(LocalDateTime dataDate) {
+        this.dataDate = dataDate;
+    }
+    public String getPollutionType() {
+        return pollutionType;
+    }
+
+    public void setPollutionType(String pollutionType) {
+        this.pollutionType = pollutionType;
+    }
+    public Float getValue() {
+        return value;
+    }
+
+    public void setValue(Float value) {
+        this.value = value;
+    }
+
+    @Override
+    public String toString() {
+        return "RStatPollutionOrgY{" +
+            "orgId=" + orgId +
+            ", dataDate=" + dataDate +
+            ", pollutionType=" + pollutionType +
+            ", value=" + value +
+        "}";
+    }
+}
diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/pojo/po/RStatPollutionSubstationD.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/pojo/po/RStatPollutionSubstationD.java
new file mode 100644
index 000000000..67899bee0
--- /dev/null
+++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/pojo/po/RStatPollutionSubstationD.java
@@ -0,0 +1,81 @@
+package com.njcn.prepare.harmonic.pojo.po;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import java.time.LocalDateTime;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 变电站污区图统计日表
+ * </p>
+ *
+ * @author xiaoyao
+ * @since 2022-10-20
+ */
+@TableName("r_stat_pollution_substation_d")
+public class RStatPollutionSubstationD implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 变电站id
+     */
+    @TableId(value = "substation_id", type = IdType.AUTO)
+    private String substationId;
+
+    /**
+     * 时间
+     */
+    private LocalDateTime dataDate;
+
+    /**
+     * 污区图统计类型
+     */
+    private String pollutionType;
+
+    /**
+     * 统计值
+     */
+    private Float value;
+
+    public String getSubstationId() {
+        return substationId;
+    }
+
+    public void setSubstationId(String substationId) {
+        this.substationId = substationId;
+    }
+    public LocalDateTime getDataDate() {
+        return dataDate;
+    }
+
+    public void setDataDate(LocalDateTime dataDate) {
+        this.dataDate = dataDate;
+    }
+    public String getPollutionType() {
+        return pollutionType;
+    }
+
+    public void setPollutionType(String pollutionType) {
+        this.pollutionType = pollutionType;
+    }
+    public Float getValue() {
+        return value;
+    }
+
+    public void setValue(Float value) {
+        this.value = value;
+    }
+
+    @Override
+    public String toString() {
+        return "RStatPollutionSubstationD{" +
+            "substationId=" + substationId +
+            ", dataDate=" + dataDate +
+            ", pollutionType=" + pollutionType +
+            ", value=" + value +
+        "}";
+    }
+}
diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/pojo/po/RStatPollutionSubstationM.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/pojo/po/RStatPollutionSubstationM.java
new file mode 100644
index 000000000..74f8d542c
--- /dev/null
+++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/pojo/po/RStatPollutionSubstationM.java
@@ -0,0 +1,81 @@
+package com.njcn.prepare.harmonic.pojo.po;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import java.time.LocalDateTime;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 变电站污区图统计月表
+ * </p>
+ *
+ * @author xiaoyao
+ * @since 2022-10-20
+ */
+@TableName("r_stat_pollution_substation_m")
+public class RStatPollutionSubstationM implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 变电站id
+     */
+    @TableId(value = "substation_id", type = IdType.AUTO)
+    private String substationId;
+
+    /**
+     * 时间
+     */
+    private LocalDateTime dataDate;
+
+    /**
+     * 污区图统计类型
+     */
+    private String pollutionType;
+
+    /**
+     * 统计值
+     */
+    private Float value;
+
+    public String getSubstationId() {
+        return substationId;
+    }
+
+    public void setSubstationId(String substationId) {
+        this.substationId = substationId;
+    }
+    public LocalDateTime getDataDate() {
+        return dataDate;
+    }
+
+    public void setDataDate(LocalDateTime dataDate) {
+        this.dataDate = dataDate;
+    }
+    public String getPollutionType() {
+        return pollutionType;
+    }
+
+    public void setPollutionType(String pollutionType) {
+        this.pollutionType = pollutionType;
+    }
+    public Float getValue() {
+        return value;
+    }
+
+    public void setValue(Float value) {
+        this.value = value;
+    }
+
+    @Override
+    public String toString() {
+        return "RStatPollutionSubstationM{" +
+            "substationId=" + substationId +
+            ", dataDate=" + dataDate +
+            ", pollutionType=" + pollutionType +
+            ", value=" + value +
+        "}";
+    }
+}
diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/pojo/po/RStatPollutionSubstationQ.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/pojo/po/RStatPollutionSubstationQ.java
new file mode 100644
index 000000000..167c4b594
--- /dev/null
+++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/pojo/po/RStatPollutionSubstationQ.java
@@ -0,0 +1,81 @@
+package com.njcn.prepare.harmonic.pojo.po;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import java.time.LocalDateTime;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 变电站污区图统计季表
+ * </p>
+ *
+ * @author xiaoyao
+ * @since 2022-10-20
+ */
+@TableName("r_stat_pollution_substation_q")
+public class RStatPollutionSubstationQ implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 变电站id
+     */
+    @TableId(value = "substation_id", type = IdType.AUTO)
+    private String substationId;
+
+    /**
+     * 时间
+     */
+    private LocalDateTime dataDate;
+
+    /**
+     * 污区图统计类型
+     */
+    private String pollutionType;
+
+    /**
+     * 统计值
+     */
+    private Float value;
+
+    public String getSubstationId() {
+        return substationId;
+    }
+
+    public void setSubstationId(String substationId) {
+        this.substationId = substationId;
+    }
+    public LocalDateTime getDataDate() {
+        return dataDate;
+    }
+
+    public void setDataDate(LocalDateTime dataDate) {
+        this.dataDate = dataDate;
+    }
+    public String getPollutionType() {
+        return pollutionType;
+    }
+
+    public void setPollutionType(String pollutionType) {
+        this.pollutionType = pollutionType;
+    }
+    public Float getValue() {
+        return value;
+    }
+
+    public void setValue(Float value) {
+        this.value = value;
+    }
+
+    @Override
+    public String toString() {
+        return "RStatPollutionSubstationQ{" +
+            "substationId=" + substationId +
+            ", dataDate=" + dataDate +
+            ", pollutionType=" + pollutionType +
+            ", value=" + value +
+        "}";
+    }
+}
diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/pojo/po/RStatPollutionSubstationY.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/pojo/po/RStatPollutionSubstationY.java
new file mode 100644
index 000000000..2ebf4b789
--- /dev/null
+++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/pojo/po/RStatPollutionSubstationY.java
@@ -0,0 +1,81 @@
+package com.njcn.prepare.harmonic.pojo.po;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import java.time.LocalDateTime;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 变电站污区图统计年表
+ * </p>
+ *
+ * @author xiaoyao
+ * @since 2022-10-20
+ */
+@TableName("r_stat_pollution_substation_y")
+public class RStatPollutionSubstationY implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 变电站id
+     */
+    @TableId(value = "substation_id", type = IdType.AUTO)
+    private String substationId;
+
+    /**
+     * 时间
+     */
+    private LocalDateTime dataDate;
+
+    /**
+     * 污区图统计类型
+     */
+    private String pollutionType;
+
+    /**
+     * 统计值
+     */
+    private Float value;
+
+    public String getSubstationId() {
+        return substationId;
+    }
+
+    public void setSubstationId(String substationId) {
+        this.substationId = substationId;
+    }
+    public LocalDateTime getDataDate() {
+        return dataDate;
+    }
+
+    public void setDataDate(LocalDateTime dataDate) {
+        this.dataDate = dataDate;
+    }
+    public String getPollutionType() {
+        return pollutionType;
+    }
+
+    public void setPollutionType(String pollutionType) {
+        this.pollutionType = pollutionType;
+    }
+    public Float getValue() {
+        return value;
+    }
+
+    public void setValue(Float value) {
+        this.value = value;
+    }
+
+    @Override
+    public String toString() {
+        return "RStatPollutionSubstationY{" +
+            "substationId=" + substationId +
+            ", dataDate=" + dataDate +
+            ", pollutionType=" + pollutionType +
+            ", value=" + value +
+        "}";
+    }
+}
diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/pojo/po/line/LimitTargetPO.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/pojo/po/line/LimitTargetPO.java
new file mode 100644
index 000000000..c797891e5
--- /dev/null
+++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/pojo/po/line/LimitTargetPO.java
@@ -0,0 +1,478 @@
+package com.njcn.prepare.harmonic.pojo.po.line;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.Date;
+
+/**
+ * 
+ * Description:
+ * 接口文档访问地址：http://serverIP:port/swagger-ui.html
+ * Date: 2022/10/20  18:26【需求编号】
+ *
+ * @author clam
+ * @version V1.0.0
+ */
+
+/**
+ * 合格率统计表
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@TableName(value = "limit_target")
+public class LimitTargetPO {
+    /**
+     * 监测点ID合格率的变电站/装置/母线/线路序号
+     */
+    @TableField(value = "line_id")
+    private String lineId;
+
+    /**
+     * 数据类型,’A’表示A相，’B’表示B相,’C’表示C相,’’M’表示ABC三项总和，T’表示总
+     */
+    @TableField(value = "phasic_type")
+    private String phasicType;
+
+    /**
+     * 合格率时间
+     */
+    @TableField(value = "time")
+    private Date time;
+
+    /**
+     * 总计算次数
+     */
+    @TableField(value = "all_time")
+    private Integer allTime;
+
+    /**
+     * 闪变总计算次数
+     */
+    @TableField(value = "flicker_overtime")
+    private Integer flickerOvertime;
+
+    /**
+     * 频率偏差越限次数
+     */
+    @TableField(value = "flicker_all_time")
+    private Integer flickerAllTime;
+
+    /**
+     * 电压偏差越限次数
+     */
+    @TableField(value = "freq_dev_overtime")
+    private Integer freqDevOvertime;
+
+    /**
+     * 电压不平衡度越限次数
+     */
+    @TableField(value = "voltage_dev_overtime")
+    private Integer voltageDevOvertime;
+
+    /**
+     * 闪变越限次数
+     */
+    @TableField(value = "ubalance_overtime")
+    private Integer ubalanceOvertime;
+
+    /**
+     * 电压谐波畸变率越限次数
+     */
+    @TableField(value = "uaberrance_overtime")
+    private Integer uaberranceOvertime;
+
+    /**
+     * 负序电流限值次数
+     */
+    @TableField(value = "i_neg_overtime")
+    private Integer iNegOvertime;
+
+    /**
+     * 2次电压谐波含有率越限次数
+     */
+    @TableField(value = "uharm_2_overtime")
+    private Integer uharm2Overtime;
+
+    /**
+     * 3次电压谐波含有率越限次数
+     */
+    @TableField(value = "uharm_3_overtime")
+    private Integer uharm3Overtime;
+
+    /**
+     * 4次电压谐波含有率越限次数
+     */
+    @TableField(value = "uharm_4_overtime")
+    private Integer uharm4Overtime;
+
+    /**
+     * 5次电压谐波含有率越限次数
+     */
+    @TableField(value = "uharm_5_overtime")
+    private Integer uharm5Overtime;
+
+    /**
+     * 6次电压谐波含有率越限次数
+     */
+    @TableField(value = "uharm_6_overtime")
+    private Integer uharm6Overtime;
+
+    /**
+     * 7次电压谐波含有率越限次数
+     */
+    @TableField(value = "uharm_7_overtime")
+    private Integer uharm7Overtime;
+
+    /**
+     * 8次电压谐波含有率越限次数
+     */
+    @TableField(value = "uharm_8_overtime")
+    private Integer uharm8Overtime;
+
+    /**
+     * 9次电压谐波含有率越限次数
+     */
+    @TableField(value = "uharm_9_overtime")
+    private Integer uharm9Overtime;
+
+    /**
+     * 10次电压谐波含有率越限次数
+     */
+    @TableField(value = "uharm_10_overtime")
+    private Integer uharm10Overtime;
+
+    /**
+     * 11次电压谐波含有率越限次数
+     */
+    @TableField(value = "uharm_11_overtime")
+    private Integer uharm11Overtime;
+
+    /**
+     * 12次电压谐波含有率越限次数
+     */
+    @TableField(value = "uharm_12_overtime")
+    private Integer uharm12Overtime;
+
+    /**
+     * 13次电压谐波含有率越限次数
+     */
+    @TableField(value = "uharm_13_overtime")
+    private Integer uharm13Overtime;
+
+    /**
+     * 14次电压谐波含有率越限次数
+     */
+    @TableField(value = "uharm_14_overtime")
+    private Integer uharm14Overtime;
+
+    /**
+     * 15次电压谐波含有率越限次数
+     */
+    @TableField(value = "uharm_15_overtime")
+    private Integer uharm15Overtime;
+
+    /**
+     * 16次电压谐波含有率越限次数
+     */
+    @TableField(value = "uharm_16_overtime")
+    private Integer uharm16Overtime;
+
+    /**
+     * 17次电压谐波含有率越限次数
+     */
+    @TableField(value = "uharm_17_overtime")
+    private Integer uharm17Overtime;
+
+    /**
+     * 18次电压谐波含有率越限次数
+     */
+    @TableField(value = "uharm_18_overtime")
+    private Integer uharm18Overtime;
+
+    /**
+     * 19次电压谐波含有率越限次数
+     */
+    @TableField(value = "uharm_19_overtime")
+    private Integer uharm19Overtime;
+
+    /**
+     * 20次电压谐波含有率越限次数
+     */
+    @TableField(value = "uharm_20_overtime")
+    private Integer uharm20Overtime;
+
+    /**
+     * 21次电压谐波含有率越限次数
+     */
+    @TableField(value = "uharm_21_overtime")
+    private Integer uharm21Overtime;
+
+    /**
+     * 22次电压谐波含有率越限次数
+     */
+    @TableField(value = "uharm_22_overtime")
+    private Integer uharm22Overtime;
+
+    /**
+     * 23次电压谐波含有率越限次数
+     */
+    @TableField(value = "uharm_23_overtime")
+    private Integer uharm23Overtime;
+
+    /**
+     * 24次电压谐波含有率越限次数
+     */
+    @TableField(value = "uharm_24_overtime")
+    private Integer uharm24Overtime;
+
+    /**
+     * 25次电压谐波含有率越限次数
+     */
+    @TableField(value = "uharm_25_overtime")
+    private Integer uharm25Overtime;
+
+    /**
+     * 2次电流谐波幅值越限次数
+     */
+    @TableField(value = "iharm_2_overtime")
+    private Integer iharm2Overtime;
+
+    /**
+     * 3次电流谐波幅值越限次数
+     */
+    @TableField(value = "iharm_3_overtime")
+    private Integer iharm3Overtime;
+
+    /**
+     * 4次电流谐波幅值越限次数
+     */
+    @TableField(value = "iharm_4_overtime")
+    private Integer iharm4Overtime;
+
+    /**
+     * 5次电流谐波幅值越限次数
+     */
+    @TableField(value = "iharm_5_overtime")
+    private Integer iharm5Overtime;
+
+    /**
+     * 6次电流谐波幅值越限次数
+     */
+    @TableField(value = "iharm_6_overtime")
+    private Integer iharm6Overtime;
+
+    /**
+     * 7次电流谐波幅值越限次数
+     */
+    @TableField(value = "iharm_7_overtime")
+    private Integer iharm7Overtime;
+
+    /**
+     * 8次电流谐波幅值越限次数
+     */
+    @TableField(value = "iharm_8_overtime")
+    private Integer iharm8Overtime;
+
+    /**
+     * 9次电流谐波幅值越限次数
+     */
+    @TableField(value = "iharm_9_overtime")
+    private Integer iharm9Overtime;
+
+    /**
+     * 10次电流谐波幅值越限次数
+     */
+    @TableField(value = "iharm_10_overtime")
+    private Integer iharm10Overtime;
+
+    /**
+     * 11次电流谐波幅值越限次数
+     */
+    @TableField(value = "iharm_11_overtime")
+    private Integer iharm11Overtime;
+
+    /**
+     * 12次电流谐波幅值越限次数
+     */
+    @TableField(value = "iharm_12_overtime")
+    private Integer iharm12Overtime;
+
+    /**
+     * 13次电流谐波幅值越限次数
+     */
+    @TableField(value = "iharm_13_overtime")
+    private Integer iharm13Overtime;
+
+    /**
+     * 14次电流谐波幅值越限次数
+     */
+    @TableField(value = "iharm_14_overtime")
+    private Integer iharm14Overtime;
+
+    /**
+     * 15次电流谐波幅值越限次数
+     */
+    @TableField(value = "iharm_15_overtime")
+    private Integer iharm15Overtime;
+
+    /**
+     * 16次电流谐波幅值越限次数
+     */
+    @TableField(value = "iharm_16_overtime")
+    private Integer iharm16Overtime;
+
+    /**
+     * 17次电流谐波幅值越限次数
+     */
+    @TableField(value = "iharm_17_overtime")
+    private Integer iharm17Overtime;
+
+    /**
+     * 18次电流谐波幅值越限次数
+     */
+    @TableField(value = "iharm_18_overtime")
+    private Integer iharm18Overtime;
+
+    /**
+     * 19次电流谐波幅值越限次数
+     */
+    @TableField(value = "iharm_19_overtime")
+    private Integer iharm19Overtime;
+
+    /**
+     * 20次电流谐波幅值越限次数
+     */
+    @TableField(value = "iharm_20_overtime")
+    private Integer iharm20Overtime;
+
+    /**
+     * 21次电流谐波幅值越限次数
+     */
+    @TableField(value = "iharm_21_overtime")
+    private Integer iharm21Overtime;
+
+    /**
+     * 22次电流谐波幅值越限次数
+     */
+    @TableField(value = "iharm_22_overtime")
+    private Integer iharm22Overtime;
+
+    /**
+     * 23次电流谐波幅值越限次数
+     */
+    @TableField(value = "iharm_23_overtime")
+    private Integer iharm23Overtime;
+
+    /**
+     * 24次电流谐波幅值越限次数
+     */
+    @TableField(value = "iharm_24_overtime")
+    private Integer iharm24Overtime;
+
+    /**
+     * 25次电流谐波幅值越限次数
+     */
+    @TableField(value = "iharm_25_overtime")
+    private Integer iharm25Overtime;
+
+    /**
+     * 0.5次间谐波电压限值次数
+     */
+    @TableField(value = "inuharm_1_overtime")
+    private Integer inuharm1Overtime;
+
+    /**
+     * 1.5次间谐波电压限值次数
+     */
+    @TableField(value = "inuharm_2_overtime")
+    private Integer inuharm2Overtime;
+
+    /**
+     * 2.5次间谐波电压限值次数
+     */
+    @TableField(value = "inuharm_3_overtime")
+    private Integer inuharm3Overtime;
+
+    /**
+     * 3.5次间谐波电压限值次数
+     */
+    @TableField(value = "inuharm_4_overtime")
+    private Integer inuharm4Overtime;
+
+    /**
+     * 4.5次间谐波电压限值次数
+     */
+    @TableField(value = "inuharm_5_overtime")
+    private Integer inuharm5Overtime;
+
+    /**
+     * 5.5次间谐波电压限值次数
+     */
+    @TableField(value = "inuharm_6_overtime")
+    private Integer inuharm6Overtime;
+
+    /**
+     * 6.5次间谐波电压限值次数
+     */
+    @TableField(value = "inuharm_7_overtime")
+    private Integer inuharm7Overtime;
+
+    /**
+     * 7.5次间谐波电压限值次数
+     */
+    @TableField(value = "inuharm_8_overtime")
+    private Integer inuharm8Overtime;
+
+    /**
+     * 8.5次间谐波电压限值次数
+     */
+    @TableField(value = "inuharm_9_overtime")
+    private Integer inuharm9Overtime;
+
+    /**
+     * 9.5次间谐波电压限值次数
+     */
+    @TableField(value = "inuharm_10_overtime")
+    private Integer inuharm10Overtime;
+
+    /**
+     * 10.5次间谐波电压限值次数
+     */
+    @TableField(value = "inuharm_11_overtime")
+    private Integer inuharm11Overtime;
+
+    /**
+     * 11.5次间谐波电压限值次数
+     */
+    @TableField(value = "inuharm_12_overtime")
+    private Integer inuharm12Overtime;
+
+    /**
+     * 12.5次间谐波电压限值次数
+     */
+    @TableField(value = "inuharm_13_overtime")
+    private Integer inuharm13Overtime;
+
+    /**
+     * 13.5次间谐波电压限值次数
+     */
+    @TableField(value = "inuharm_14_overtime")
+    private Integer inuharm14Overtime;
+
+    /**
+     * 14.5次间谐波电压限值次数
+     */
+    @TableField(value = "inuharm_15_overtime")
+    private Integer inuharm15Overtime;
+
+    /**
+     * 15.5次间谐波电压限值次数
+     */
+    @TableField(value = "inuharm_16_overtime")
+    private Integer inuharm16Overtime;
+}
\ No newline at end of file
diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/pojo/po/line/RMpFlickerReportDPO.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/pojo/po/line/RMpFlickerReportDPO.java
new file mode 100644
index 000000000..846244ffd
--- /dev/null
+++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/pojo/po/line/RMpFlickerReportDPO.java
@@ -0,0 +1,101 @@
+package com.njcn.prepare.harmonic.pojo.po.line;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.github.jeffreyning.mybatisplus.anno.MppMultiId;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 
+ * Description:
+ * 接口文档访问地址：http://serverIP:port/swagger-ui.html
+ * Date: 2022/10/26  14:15【需求编号】
+ *
+ * @author clam
+ * @version V1.0.0
+ */
+@ApiModel(value="com-njcn-prepare-harmonic-pojo-po-line-RMpFlickerReportDPO")
+@Data
+@TableName(value = "r_mp_flicker_report_d")
+public class RMpFlickerReportDPO {
+    /**
+     * 监测点ID
+     */
+    @MppMultiId(value = "measurement_point_id")
+    @ApiModelProperty(value="监测点ID")
+    private String measurementPointId;
+
+    /**
+     * 生成数据的时间,每日统计一次
+     */
+    @MppMultiId(value = "data_date")
+    @ApiModelProperty(value="生成数据的时间,每日统计一次")
+    private Date dataDate;
+
+    /**
+     * 相别："A" "B" "C" "ABC" "T"  配网部分相别的数据采用T标志存储
+     */
+    @MppMultiId(value = "phase")
+    @ApiModelProperty(value="相别：'A' 'B' 'C' 'ABC' 'T'  配网部分相别的数据采用T标志存储")
+    private String phase;
+
+    /**
+     * 电压波动-最大值
+     */
+    @TableField(value = "VOLTAGE_FLUCTUATION_MAX")
+    @ApiModelProperty(value="电压波动-最大值")
+    private Double voltageFluctuationMax;
+
+    /**
+     * 电压波动-最小值
+     */
+    @TableField(value = "VOLTAGE_FLUCTUATION_MIN")
+    @ApiModelProperty(value="电压波动-最小值")
+    private Double voltageFluctuationMin;
+
+    /**
+     * 电压波动-平均值
+     */
+    @TableField(value = "VOLTAGE_FLUCTUATION_AVG")
+    @ApiModelProperty(value="电压波动-平均值")
+    private Double voltageFluctuationAvg;
+
+    /**
+     * 电压波动-95值
+     */
+    @TableField(value = "VOLTAGE_FLUCTUATION_95")
+    @ApiModelProperty(value="电压波动-95值")
+    private Double voltageFluctuation95;
+
+    /**
+     * 短时间闪变值-最大值
+     */
+    @TableField(value = "SHORT_TERM_SEVERITY_MAX")
+    @ApiModelProperty(value="短时间闪变值-最大值")
+    private Double shortTermSeverityMax;
+
+    /**
+     * 短时间闪变值-最小值
+     */
+    @TableField(value = "SHORT_TERM_SEVERITY_MIN")
+    @ApiModelProperty(value="短时间闪变值-最小值")
+    private Double shortTermSeverityMin;
+
+    /**
+     * 短时间闪变值-平均值
+     */
+    @TableField(value = "SHORT_TERM_SEVERITY_AVG")
+    @ApiModelProperty(value="短时间闪变值-平均值")
+    private Double shortTermSeverityAvg;
+
+    /**
+     * 短时间闪变值-95值
+     */
+    @TableField(value = "SHORT_TERM_SEVERITY_95")
+    @ApiModelProperty(value="短时间闪变值-95值")
+    private Double shortTermSeverity95;
+}
\ No newline at end of file
diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/pojo/po/line/RMpHarmonicIMagReportDPO.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/pojo/po/line/RMpHarmonicIMagReportDPO.java
new file mode 100644
index 000000000..6f5c83344
--- /dev/null
+++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/pojo/po/line/RMpHarmonicIMagReportDPO.java
@@ -0,0 +1,1476 @@
+package com.njcn.prepare.harmonic.pojo.po.line;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.github.jeffreyning.mybatisplus.anno.MppMultiId;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 
+ * Description:
+ * 接口文档访问地址：http://serverIP:port/swagger-ui.html
+ * Date: 2022/10/26  9:50【需求编号】
+ *
+ * @author clam
+ * @version V1.0.0
+ */
+/**
+    * 稳态监测点指标日报-日表(主配网表)  /各次谐波电流有效值
+    */
+@ApiModel(value="com-njcn-prepare-harmonic-pojo-po-line-RMpHarmonicIMagReportDPO")
+@Data
+@TableName(value = "r_mp_harmonic_i_mag_report_d")
+public class RMpHarmonicIMagReportDPO {
+    /**
+     * 监测点ID
+     */
+    @MppMultiId(value = "measurement_point_id")
+    @ApiModelProperty(value="监测点ID")
+    private String measurementPointId;
+
+    /**
+     * 生成数据的时间,每日统计一次
+     */
+    @MppMultiId(value = "data_date")
+    @ApiModelProperty(value="生成数据的时间,每日统计一次")
+    private Date dataDate;
+
+    /**
+     * 相别：‘A’ 'B' 'C' 'ABC' 'T'  配网部分相别的数据采用T标志存储
+     */
+    @MppMultiId(value = "phase")
+    @ApiModelProperty(value="相别：‘A’ 'B' 'C' 'ABC' 'T'  配网部分相别的数据采用T标志存储")
+    private String phase;
+
+    /**
+     * 基波电流-最大值
+     */
+    @TableField(value = "fundamental_current_max")
+    @ApiModelProperty(value="基波电流-最大值")
+    private Double fundamentalCurrentMax;
+
+    /**
+     * 基波电流-最小值
+     */
+    @TableField(value = "fundamental_current_min")
+    @ApiModelProperty(value="基波电流-最小值")
+    private Double fundamentalCurrentMin;
+
+    /**
+     * 基波电流-平均值
+     */
+    @TableField(value = "fundamental_current_avg")
+    @ApiModelProperty(value="基波电流-平均值")
+    private Double fundamentalCurrentAvg;
+
+    /**
+     * 基波电流-95值
+     */
+    @TableField(value = "fundamental_current_95")
+    @ApiModelProperty(value="基波电流-95值")
+    private Double fundamentalCurrent95;
+
+    /**
+     * 电流总谐波畸变率-最大值
+     */
+    @TableField(value = "harmonic_current_thd_max")
+    @ApiModelProperty(value="电流总谐波畸变率-最大值")
+    private Double harmonicCurrentThdMax;
+
+    /**
+     * 电流总谐波畸变率-最小值
+     */
+    @TableField(value = "harmonic_current_thd_min")
+    @ApiModelProperty(value="电流总谐波畸变率-最小值")
+    private Double harmonicCurrentThdMin;
+
+    /**
+     * 电流总谐波畸变率-平均值
+     */
+    @TableField(value = "harmonic_current_thd_avg")
+    @ApiModelProperty(value="电流总谐波畸变率-平均值")
+    private Double harmonicCurrentThdAvg;
+
+    /**
+     * 电流总谐波畸变率-95值
+     */
+    @TableField(value = "harmonic_current_thd_95")
+    @ApiModelProperty(value="电流总谐波畸变率-95值")
+    private Double harmonicCurrentThd95;
+
+    /**
+     * 2次谐波电流有效值-最大值
+     */
+    @TableField(value = "harmonic_current_effective_2_max")
+    @ApiModelProperty(value="2次谐波电流有效值-最大值")
+    private Double harmonicCurrentEffective2Max;
+
+    /**
+     * 2次谐波电流有效值-最小值
+     */
+    @TableField(value = "harmonic_current_effective_2_min")
+    @ApiModelProperty(value="2次谐波电流有效值-最小值")
+    private Double harmonicCurrentEffective2Min;
+
+    /**
+     * 2次谐波电流有效值-平均值
+     */
+    @TableField(value = "harmonic_current_effective_2_avg")
+    @ApiModelProperty(value="2次谐波电流有效值-平均值")
+    private Double harmonicCurrentEffective2Avg;
+
+    /**
+     * 2次谐波电流有效值-95值
+     */
+    @TableField(value = "harmonic_current_effective_2_95")
+    @ApiModelProperty(value="2次谐波电流有效值-95值")
+    private Double harmonicCurrentEffective295;
+
+    /**
+     * 3次谐波电流有效值-最大值
+     */
+    @TableField(value = "harmonic_current_effective_3_max")
+    @ApiModelProperty(value="3次谐波电流有效值-最大值")
+    private Double harmonicCurrentEffective3Max;
+
+    /**
+     * 3次谐波电流有效值-最小值
+     */
+    @TableField(value = "harmonic_current_effective_3_min")
+    @ApiModelProperty(value="3次谐波电流有效值-最小值")
+    private Double harmonicCurrentEffective3Min;
+
+    /**
+     * 3次谐波电流有效值-平均值
+     */
+    @TableField(value = "harmonic_current_effective_3_avg")
+    @ApiModelProperty(value="3次谐波电流有效值-平均值")
+    private Double harmonicCurrentEffective3Avg;
+
+    /**
+     * 3次谐波电流有效值-95值
+     */
+    @TableField(value = "harmonic_current_effective_3_95")
+    @ApiModelProperty(value="3次谐波电流有效值-95值")
+    private Double harmonicCurrentEffective395;
+
+    /**
+     * 4次谐波电流有效值-最大值
+     */
+    @TableField(value = "harmonic_current_effective_4_max")
+    @ApiModelProperty(value="4次谐波电流有效值-最大值")
+    private Double harmonicCurrentEffective4Max;
+
+    /**
+     * 4次谐波电流有效值-最小值
+     */
+    @TableField(value = "harmonic_current_effective_4_min")
+    @ApiModelProperty(value="4次谐波电流有效值-最小值")
+    private Double harmonicCurrentEffective4Min;
+
+    /**
+     * 4次谐波电流有效值-平均值
+     */
+    @TableField(value = "harmonic_current_effective_4_avg")
+    @ApiModelProperty(value="4次谐波电流有效值-平均值")
+    private Double harmonicCurrentEffective4Avg;
+
+    /**
+     * 4次谐波电流有效值-95值
+     */
+    @TableField(value = "harmonic_current_effective_4_95")
+    @ApiModelProperty(value="4次谐波电流有效值-95值")
+    private Double harmonicCurrentEffective495;
+
+    /**
+     * 5次谐波电流有效值-最大值
+     */
+    @TableField(value = "harmonic_current_effective_5_max")
+    @ApiModelProperty(value="5次谐波电流有效值-最大值")
+    private Double harmonicCurrentEffective5Max;
+
+    /**
+     * 5次谐波电流有效值-最小值
+     */
+    @TableField(value = "harmonic_current_effective_5_min")
+    @ApiModelProperty(value="5次谐波电流有效值-最小值")
+    private Double harmonicCurrentEffective5Min;
+
+    /**
+     * 5次谐波电流有效值-平均值
+     */
+    @TableField(value = "harmonic_current_effective_5_avg")
+    @ApiModelProperty(value="5次谐波电流有效值-平均值")
+    private Double harmonicCurrentEffective5Avg;
+
+    /**
+     * 5次谐波电流有效值-95值
+     */
+    @TableField(value = "harmonic_current_effective_5_95")
+    @ApiModelProperty(value="5次谐波电流有效值-95值")
+    private Double harmonicCurrentEffective595;
+
+    /**
+     * 6次谐波电流有效值-最大值
+     */
+    @TableField(value = "harmonic_current_effective_6_max")
+    @ApiModelProperty(value="6次谐波电流有效值-最大值")
+    private Double harmonicCurrentEffective6Max;
+
+    /**
+     * 6次谐波电流有效值-最小值
+     */
+    @TableField(value = "harmonic_current_effective_6_min")
+    @ApiModelProperty(value="6次谐波电流有效值-最小值")
+    private Double harmonicCurrentEffective6Min;
+
+    /**
+     * 6次谐波电流有效值-平均值
+     */
+    @TableField(value = "harmonic_current_effective_6_avg")
+    @ApiModelProperty(value="6次谐波电流有效值-平均值")
+    private Double harmonicCurrentEffective6Avg;
+
+    /**
+     * 6次谐波电流有效值-95值
+     */
+    @TableField(value = "harmonic_current_effective_6_95")
+    @ApiModelProperty(value="6次谐波电流有效值-95值")
+    private Double harmonicCurrentEffective695;
+
+    /**
+     * 7次谐波电流有效值-最大值
+     */
+    @TableField(value = "harmonic_current_effective_7_max")
+    @ApiModelProperty(value="7次谐波电流有效值-最大值")
+    private Double harmonicCurrentEffective7Max;
+
+    /**
+     * 7次谐波电流有效值-最小值
+     */
+    @TableField(value = "harmonic_current_effective_7_min")
+    @ApiModelProperty(value="7次谐波电流有效值-最小值")
+    private Double harmonicCurrentEffective7Min;
+
+    /**
+     * 7次谐波电流有效值-平均值
+     */
+    @TableField(value = "harmonic_current_effective_7_avg")
+    @ApiModelProperty(value="7次谐波电流有效值-平均值")
+    private Double harmonicCurrentEffective7Avg;
+
+    /**
+     * 7次谐波电流有效值-95值
+     */
+    @TableField(value = "harmonic_current_effective_7_95")
+    @ApiModelProperty(value="7次谐波电流有效值-95值")
+    private Double harmonicCurrentEffective795;
+
+    /**
+     * 8次谐波电流有效值-最大值
+     */
+    @TableField(value = "harmonic_current_effective_8_max")
+    @ApiModelProperty(value="8次谐波电流有效值-最大值")
+    private Double harmonicCurrentEffective8Max;
+
+    /**
+     * 8次谐波电流有效值-最小值
+     */
+    @TableField(value = "harmonic_current_effective_8_min")
+    @ApiModelProperty(value="8次谐波电流有效值-最小值")
+    private Double harmonicCurrentEffective8Min;
+
+    /**
+     * 8次谐波电流有效值-平均值
+     */
+    @TableField(value = "harmonic_current_effective_8_avg")
+    @ApiModelProperty(value="8次谐波电流有效值-平均值")
+    private Double harmonicCurrentEffective8Avg;
+
+    /**
+     * 8次谐波电流有效值-95值
+     */
+    @TableField(value = "harmonic_current_effective_8_95")
+    @ApiModelProperty(value="8次谐波电流有效值-95值")
+    private Double harmonicCurrentEffective895;
+
+    /**
+     * 9次谐波电流有效值-最大值
+     */
+    @TableField(value = "harmonic_current_effective_9_max")
+    @ApiModelProperty(value="9次谐波电流有效值-最大值")
+    private Double harmonicCurrentEffective9Max;
+
+    /**
+     * 9次谐波电流有效值-最小值
+     */
+    @TableField(value = "harmonic_current_effective_9_min")
+    @ApiModelProperty(value="9次谐波电流有效值-最小值")
+    private Double harmonicCurrentEffective9Min;
+
+    /**
+     * 9次谐波电流有效值-平均值
+     */
+    @TableField(value = "harmonic_current_effective_9_avg")
+    @ApiModelProperty(value="9次谐波电流有效值-平均值")
+    private Double harmonicCurrentEffective9Avg;
+
+    /**
+     * 9次谐波电流有效值-95值
+     */
+    @TableField(value = "harmonic_current_effective_9_95")
+    @ApiModelProperty(value="9次谐波电流有效值-95值")
+    private Double harmonicCurrentEffective995;
+
+    /**
+     * 10次谐波电流有效值-最大值
+     */
+    @TableField(value = "harmonic_current_effective_10_max")
+    @ApiModelProperty(value="10次谐波电流有效值-最大值")
+    private Double harmonicCurrentEffective10Max;
+
+    /**
+     * 10次谐波电流有效值-最小值
+     */
+    @TableField(value = "harmonic_current_effective_10_min")
+    @ApiModelProperty(value="10次谐波电流有效值-最小值")
+    private Double harmonicCurrentEffective10Min;
+
+    /**
+     * 10次谐波电流有效值-平均值
+     */
+    @TableField(value = "harmonic_current_effective_10_avg")
+    @ApiModelProperty(value="10次谐波电流有效值-平均值")
+    private Double harmonicCurrentEffective10Avg;
+
+    /**
+     * 10次谐波电流有效值-95值
+     */
+    @TableField(value = "harmonic_current_effective_10_95")
+    @ApiModelProperty(value="10次谐波电流有效值-95值")
+    private Double harmonicCurrentEffective1095;
+
+    /**
+     * 11次谐波电流有效值-最大值
+     */
+    @TableField(value = "harmonic_current_effective_11_max")
+    @ApiModelProperty(value="11次谐波电流有效值-最大值")
+    private Double harmonicCurrentEffective11Max;
+
+    /**
+     * 11次谐波电流有效值-最小值
+     */
+    @TableField(value = "harmonic_current_effective_11_min")
+    @ApiModelProperty(value="11次谐波电流有效值-最小值")
+    private Double harmonicCurrentEffective11Min;
+
+    /**
+     * 11次谐波电流有效值-平均值
+     */
+    @TableField(value = "harmonic_current_effective_11_avg")
+    @ApiModelProperty(value="11次谐波电流有效值-平均值")
+    private Double harmonicCurrentEffective11Avg;
+
+    /**
+     * 11次谐波电流有效值-95值
+     */
+    @TableField(value = "harmonic_current_effective_11_95")
+    @ApiModelProperty(value="11次谐波电流有效值-95值")
+    private Double harmonicCurrentEffective1195;
+
+    /**
+     * 12次谐波电流有效值-最大值
+     */
+    @TableField(value = "harmonic_current_effective_12_max")
+    @ApiModelProperty(value="12次谐波电流有效值-最大值")
+    private Double harmonicCurrentEffective12Max;
+
+    /**
+     * 12次谐波电流有效值-最小值
+     */
+    @TableField(value = "harmonic_current_effective_12_min")
+    @ApiModelProperty(value="12次谐波电流有效值-最小值")
+    private Double harmonicCurrentEffective12Min;
+
+    /**
+     * 12次谐波电流有效值-平均值
+     */
+    @TableField(value = "harmonic_current_effective_12_avg")
+    @ApiModelProperty(value="12次谐波电流有效值-平均值")
+    private Double harmonicCurrentEffective12Avg;
+
+    /**
+     * 12次谐波电流有效值-95值
+     */
+    @TableField(value = "harmonic_current_effective_12_95")
+    @ApiModelProperty(value="12次谐波电流有效值-95值")
+    private Double harmonicCurrentEffective1295;
+
+    /**
+     * 13次谐波电流有效值-最大值
+     */
+    @TableField(value = "harmonic_current_effective_13_max")
+    @ApiModelProperty(value="13次谐波电流有效值-最大值")
+    private Double harmonicCurrentEffective13Max;
+
+    /**
+     * 13次谐波电流有效值-最小值
+     */
+    @TableField(value = "harmonic_current_effective_13_min")
+    @ApiModelProperty(value="13次谐波电流有效值-最小值")
+    private Double harmonicCurrentEffective13Min;
+
+    /**
+     * 13次谐波电流有效值-平均值
+     */
+    @TableField(value = "harmonic_current_effective_13_avg")
+    @ApiModelProperty(value="13次谐波电流有效值-平均值")
+    private Double harmonicCurrentEffective13Avg;
+
+    /**
+     * 13次谐波电流有效值-95值
+     */
+    @TableField(value = "harmonic_current_effective_13_95")
+    @ApiModelProperty(value="13次谐波电流有效值-95值")
+    private Double harmonicCurrentEffective1395;
+
+    /**
+     * 14次谐波电流有效值-最大值
+     */
+    @TableField(value = "harmonic_current_effective_14_max")
+    @ApiModelProperty(value="14次谐波电流有效值-最大值")
+    private Double harmonicCurrentEffective14Max;
+
+    /**
+     * 14次谐波电流有效值-最小值
+     */
+    @TableField(value = "harmonic_current_effective_14_min")
+    @ApiModelProperty(value="14次谐波电流有效值-最小值")
+    private Double harmonicCurrentEffective14Min;
+
+    /**
+     * 14次谐波电流有效值-平均值
+     */
+    @TableField(value = "harmonic_current_effective_14_avg")
+    @ApiModelProperty(value="14次谐波电流有效值-平均值")
+    private Double harmonicCurrentEffective14Avg;
+
+    /**
+     * 14次谐波电流有效值-95值
+     */
+    @TableField(value = "harmonic_current_effective_14_95")
+    @ApiModelProperty(value="14次谐波电流有效值-95值")
+    private Double harmonicCurrentEffective1495;
+
+    /**
+     * 15次谐波电流有效值-最大值
+     */
+    @TableField(value = "harmonic_current_effective_15_max")
+    @ApiModelProperty(value="15次谐波电流有效值-最大值")
+    private Double harmonicCurrentEffective15Max;
+
+    /**
+     * 15次谐波电流有效值-最小值
+     */
+    @TableField(value = "harmonic_current_effective_15_min")
+    @ApiModelProperty(value="15次谐波电流有效值-最小值")
+    private Double harmonicCurrentEffective15Min;
+
+    /**
+     * 15次谐波电流有效值-平均值
+     */
+    @TableField(value = "harmonic_current_effective_15_avg")
+    @ApiModelProperty(value="15次谐波电流有效值-平均值")
+    private Double harmonicCurrentEffective15Avg;
+
+    /**
+     * 15次谐波电流有效值-95值
+     */
+    @TableField(value = "harmonic_current_effective_15_95")
+    @ApiModelProperty(value="15次谐波电流有效值-95值")
+    private Double harmonicCurrentEffective1595;
+
+    /**
+     * 16次谐波电流有效值-最大值
+     */
+    @TableField(value = "harmonic_current_effective_16_max")
+    @ApiModelProperty(value="16次谐波电流有效值-最大值")
+    private Double harmonicCurrentEffective16Max;
+
+    /**
+     * 16次谐波电流有效值-最小值
+     */
+    @TableField(value = "harmonic_current_effective_16_min")
+    @ApiModelProperty(value="16次谐波电流有效值-最小值")
+    private Double harmonicCurrentEffective16Min;
+
+    /**
+     * 16次谐波电流有效值-平均值
+     */
+    @TableField(value = "harmonic_current_effective_16_avg")
+    @ApiModelProperty(value="16次谐波电流有效值-平均值")
+    private Double harmonicCurrentEffective16Avg;
+
+    /**
+     * 16次谐波电流有效值-95值
+     */
+    @TableField(value = "harmonic_current_effective_16_95")
+    @ApiModelProperty(value="16次谐波电流有效值-95值")
+    private Double harmonicCurrentEffective1695;
+
+    /**
+     * 17次谐波电流有效值-最大值
+     */
+    @TableField(value = "harmonic_current_effective_17_max")
+    @ApiModelProperty(value="17次谐波电流有效值-最大值")
+    private Double harmonicCurrentEffective17Max;
+
+    /**
+     * 17次谐波电流有效值-最小值
+     */
+    @TableField(value = "harmonic_current_effective_17_min")
+    @ApiModelProperty(value="17次谐波电流有效值-最小值")
+    private Double harmonicCurrentEffective17Min;
+
+    /**
+     * 17次谐波电流有效值-平均值
+     */
+    @TableField(value = "harmonic_current_effective_17_avg")
+    @ApiModelProperty(value="17次谐波电流有效值-平均值")
+    private Double harmonicCurrentEffective17Avg;
+
+    /**
+     * 17次谐波电流有效值-95值
+     */
+    @TableField(value = "harmonic_current_effective_17_95")
+    @ApiModelProperty(value="17次谐波电流有效值-95值")
+    private Double harmonicCurrentEffective1795;
+
+    /**
+     * 18次谐波电流有效值-最大值
+     */
+    @TableField(value = "harmonic_current_effective_18_max")
+    @ApiModelProperty(value="18次谐波电流有效值-最大值")
+    private Double harmonicCurrentEffective18Max;
+
+    /**
+     * 18次谐波电流有效值-最小值
+     */
+    @TableField(value = "harmonic_current_effective_18_min")
+    @ApiModelProperty(value="18次谐波电流有效值-最小值")
+    private Double harmonicCurrentEffective18Min;
+
+    /**
+     * 18次谐波电流有效值-平均值
+     */
+    @TableField(value = "harmonic_current_effective_18_avg")
+    @ApiModelProperty(value="18次谐波电流有效值-平均值")
+    private Double harmonicCurrentEffective18Avg;
+
+    /**
+     * 18次谐波电流有效值-95值
+     */
+    @TableField(value = "harmonic_current_effective_18_95")
+    @ApiModelProperty(value="18次谐波电流有效值-95值")
+    private Double harmonicCurrentEffective1895;
+
+    /**
+     * 19次谐波电流有效值-最大值
+     */
+    @TableField(value = "harmonic_current_effective_19_max")
+    @ApiModelProperty(value="19次谐波电流有效值-最大值")
+    private Double harmonicCurrentEffective19Max;
+
+    /**
+     * 19次谐波电流有效值-最小值
+     */
+    @TableField(value = "harmonic_current_effective_19_min")
+    @ApiModelProperty(value="19次谐波电流有效值-最小值")
+    private Double harmonicCurrentEffective19Min;
+
+    /**
+     * 19次谐波电流有效值-平均值
+     */
+    @TableField(value = "harmonic_current_effective_19_avg")
+    @ApiModelProperty(value="19次谐波电流有效值-平均值")
+    private Double harmonicCurrentEffective19Avg;
+
+    /**
+     * 19次谐波电流有效值-95值
+     */
+    @TableField(value = "harmonic_current_effective_19_95")
+    @ApiModelProperty(value="19次谐波电流有效值-95值")
+    private Double harmonicCurrentEffective1995;
+
+    /**
+     * 20次谐波电流有效值-最大值
+     */
+    @TableField(value = "harmonic_current_effective_20_max")
+    @ApiModelProperty(value="20次谐波电流有效值-最大值")
+    private Double harmonicCurrentEffective20Max;
+
+    /**
+     * 20次谐波电流有效值-最小值
+     */
+    @TableField(value = "harmonic_current_effective_20_min")
+    @ApiModelProperty(value="20次谐波电流有效值-最小值")
+    private Double harmonicCurrentEffective20Min;
+
+    /**
+     * 20次谐波电流有效值-平均值
+     */
+    @TableField(value = "harmonic_current_effective_20_avg")
+    @ApiModelProperty(value="20次谐波电流有效值-平均值")
+    private Double harmonicCurrentEffective20Avg;
+
+    /**
+     * 20次谐波电流有效值-95值
+     */
+    @TableField(value = "harmonic_current_effective_20_95")
+    @ApiModelProperty(value="20次谐波电流有效值-95值")
+    private Double harmonicCurrentEffective2095;
+
+    /**
+     * 21次谐波电流有效值-最大值
+     */
+    @TableField(value = "harmonic_current_effective_21_max")
+    @ApiModelProperty(value="21次谐波电流有效值-最大值")
+    private Double harmonicCurrentEffective21Max;
+
+    /**
+     * 21次谐波电流有效值-最小值
+     */
+    @TableField(value = "harmonic_current_effective_21_min")
+    @ApiModelProperty(value="21次谐波电流有效值-最小值")
+    private Double harmonicCurrentEffective21Min;
+
+    /**
+     * 21次谐波电流有效值-平均值
+     */
+    @TableField(value = "harmonic_current_effective_21_avg")
+    @ApiModelProperty(value="21次谐波电流有效值-平均值")
+    private Double harmonicCurrentEffective21Avg;
+
+    /**
+     * 21次谐波电流有效值-95值
+     */
+    @TableField(value = "harmonic_current_effective_21_95")
+    @ApiModelProperty(value="21次谐波电流有效值-95值")
+    private Double harmonicCurrentEffective2195;
+
+    /**
+     * 22次谐波电流有效值-最大值
+     */
+    @TableField(value = "harmonic_current_effective_22_max")
+    @ApiModelProperty(value="22次谐波电流有效值-最大值")
+    private Double harmonicCurrentEffective22Max;
+
+    /**
+     * 22次谐波电流有效值-最小值
+     */
+    @TableField(value = "harmonic_current_effective_22_min")
+    @ApiModelProperty(value="22次谐波电流有效值-最小值")
+    private Double harmonicCurrentEffective22Min;
+
+    /**
+     * 22次谐波电流有效值-平均值
+     */
+    @TableField(value = "harmonic_current_effective_22_avg")
+    @ApiModelProperty(value="22次谐波电流有效值-平均值")
+    private Double harmonicCurrentEffective22Avg;
+
+    /**
+     * 22次谐波电流有效值-95值
+     */
+    @TableField(value = "harmonic_current_effective_22_95")
+    @ApiModelProperty(value="22次谐波电流有效值-95值")
+    private Double harmonicCurrentEffective2295;
+
+    /**
+     * 23次谐波电流有效值-最大值
+     */
+    @TableField(value = "harmonic_current_effective_23_max")
+    @ApiModelProperty(value="23次谐波电流有效值-最大值")
+    private Double harmonicCurrentEffective23Max;
+
+    /**
+     * 23次谐波电流有效值-最小值
+     */
+    @TableField(value = "harmonic_current_effective_23_min")
+    @ApiModelProperty(value="23次谐波电流有效值-最小值")
+    private Double harmonicCurrentEffective23Min;
+
+    /**
+     * 23次谐波电流有效值-平均值
+     */
+    @TableField(value = "harmonic_current_effective_23_avg")
+    @ApiModelProperty(value="23次谐波电流有效值-平均值")
+    private Double harmonicCurrentEffective23Avg;
+
+    /**
+     * 23次谐波电流有效值-95值
+     */
+    @TableField(value = "harmonic_current_effective_23_95")
+    @ApiModelProperty(value="23次谐波电流有效值-95值")
+    private Double harmonicCurrentEffective2395;
+
+    /**
+     * 24次谐波电流有效值-最大值
+     */
+    @TableField(value = "harmonic_current_effective_24_max")
+    @ApiModelProperty(value="24次谐波电流有效值-最大值")
+    private Double harmonicCurrentEffective24Max;
+
+    /**
+     * 24次谐波电流有效值-最小值
+     */
+    @TableField(value = "harmonic_current_effective_24_min")
+    @ApiModelProperty(value="24次谐波电流有效值-最小值")
+    private Double harmonicCurrentEffective24Min;
+
+    /**
+     * 24次谐波电流有效值-平均值
+     */
+    @TableField(value = "harmonic_current_effective_24_avg")
+    @ApiModelProperty(value="24次谐波电流有效值-平均值")
+    private Double harmonicCurrentEffective24Avg;
+
+    /**
+     * 24次谐波电流有效值-95值
+     */
+    @TableField(value = "harmonic_current_effective_24_95")
+    @ApiModelProperty(value="24次谐波电流有效值-95值")
+    private Double harmonicCurrentEffective2495;
+
+    /**
+     * 25次谐波电流有效值-最大值
+     */
+    @TableField(value = "harmonic_current_effective_25_max")
+    @ApiModelProperty(value="25次谐波电流有效值-最大值")
+    private Double harmonicCurrentEffective25Max;
+
+    /**
+     * 25次谐波电流有效值-最小值
+     */
+    @TableField(value = "harmonic_current_effective_25_min")
+    @ApiModelProperty(value="25次谐波电流有效值-最小值")
+    private Double harmonicCurrentEffective25Min;
+
+    /**
+     * 25次谐波电流有效值-平均值
+     */
+    @TableField(value = "harmonic_current_effective_25_avg")
+    @ApiModelProperty(value="25次谐波电流有效值-平均值")
+    private Double harmonicCurrentEffective25Avg;
+
+    /**
+     * 25次谐波电流有效值-95值
+     */
+    @TableField(value = "harmonic_current_effective_25_95")
+    @ApiModelProperty(value="25次谐波电流有效值-95值")
+    private Double harmonicCurrentEffective2595;
+
+    /**
+     * 26次谐波电流有效值-最大值
+     */
+    @TableField(value = "harmonic_current_effective_26_max")
+    @ApiModelProperty(value="26次谐波电流有效值-最大值")
+    private Double harmonicCurrentEffective26Max;
+
+    /**
+     * 26次谐波电流有效值-最小值
+     */
+    @TableField(value = "harmonic_current_effective_26_min")
+    @ApiModelProperty(value="26次谐波电流有效值-最小值")
+    private Double harmonicCurrentEffective26Min;
+
+    /**
+     * 26次谐波电流有效值-平均值
+     */
+    @TableField(value = "harmonic_current_effective_26_avg")
+    @ApiModelProperty(value="26次谐波电流有效值-平均值")
+    private Double harmonicCurrentEffective26Avg;
+
+    /**
+     * 26次谐波电流有效值-95值
+     */
+    @TableField(value = "harmonic_current_effective_26_95")
+    @ApiModelProperty(value="26次谐波电流有效值-95值")
+    private Double harmonicCurrentEffective2695;
+
+    /**
+     * 27次谐波电流有效值-最大值
+     */
+    @TableField(value = "harmonic_current_effective_27_max")
+    @ApiModelProperty(value="27次谐波电流有效值-最大值")
+    private Double harmonicCurrentEffective27Max;
+
+    /**
+     * 27次谐波电流有效值-最小值
+     */
+    @TableField(value = "harmonic_current_effective_27_min")
+    @ApiModelProperty(value="27次谐波电流有效值-最小值")
+    private Double harmonicCurrentEffective27Min;
+
+    /**
+     * 27次谐波电流有效值-平均值
+     */
+    @TableField(value = "harmonic_current_effective_27_avg")
+    @ApiModelProperty(value="27次谐波电流有效值-平均值")
+    private Double harmonicCurrentEffective27Avg;
+
+    /**
+     * 27次谐波电流有效值-95值
+     */
+    @TableField(value = "harmonic_current_effective_27_95")
+    @ApiModelProperty(value="27次谐波电流有效值-95值")
+    private Double harmonicCurrentEffective2795;
+
+    /**
+     * 28次谐波电流有效值-最大值
+     */
+    @TableField(value = "harmonic_current_effective_28_max")
+    @ApiModelProperty(value="28次谐波电流有效值-最大值")
+    private Double harmonicCurrentEffective28Max;
+
+    /**
+     * 28次谐波电流有效值-最小值
+     */
+    @TableField(value = "harmonic_current_effective_28_min")
+    @ApiModelProperty(value="28次谐波电流有效值-最小值")
+    private Double harmonicCurrentEffective28Min;
+
+    /**
+     * 28次谐波电流有效值-平均值
+     */
+    @TableField(value = "harmonic_current_effective_28_avg")
+    @ApiModelProperty(value="28次谐波电流有效值-平均值")
+    private Double harmonicCurrentEffective28Avg;
+
+    /**
+     * 28次谐波电流有效值-95值
+     */
+    @TableField(value = "harmonic_current_effective_28_95")
+    @ApiModelProperty(value="28次谐波电流有效值-95值")
+    private Double harmonicCurrentEffective2895;
+
+    /**
+     * 29次谐波电流有效值-最大值
+     */
+    @TableField(value = "harmonic_current_effective_29_max")
+    @ApiModelProperty(value="29次谐波电流有效值-最大值")
+    private Double harmonicCurrentEffective29Max;
+
+    /**
+     * 29次谐波电流有效值-最小值
+     */
+    @TableField(value = "harmonic_current_effective_29_min")
+    @ApiModelProperty(value="29次谐波电流有效值-最小值")
+    private Double harmonicCurrentEffective29Min;
+
+    /**
+     * 29次谐波电流有效值-平均值
+     */
+    @TableField(value = "harmonic_current_effective_29_avg")
+    @ApiModelProperty(value="29次谐波电流有效值-平均值")
+    private Double harmonicCurrentEffective29Avg;
+
+    /**
+     * 29次谐波电流有效值-95值
+     */
+    @TableField(value = "harmonic_current_effective_29_95")
+    @ApiModelProperty(value="29次谐波电流有效值-95值")
+    private Double harmonicCurrentEffective2995;
+
+    /**
+     * 30次谐波电流有效值-最大值
+     */
+    @TableField(value = "harmonic_current_effective_30_max")
+    @ApiModelProperty(value="30次谐波电流有效值-最大值")
+    private Double harmonicCurrentEffective30Max;
+
+    /**
+     * 30次谐波电流有效值-最小值
+     */
+    @TableField(value = "harmonic_current_effective_30_min")
+    @ApiModelProperty(value="30次谐波电流有效值-最小值")
+    private Double harmonicCurrentEffective30Min;
+
+    /**
+     * 30次谐波电流有效值-平均值
+     */
+    @TableField(value = "harmonic_current_effective_30_avg")
+    @ApiModelProperty(value="30次谐波电流有效值-平均值")
+    private Double harmonicCurrentEffective30Avg;
+
+    /**
+     * 30次谐波电流有效值-95值
+     */
+    @TableField(value = "harmonic_current_effective_30_95")
+    @ApiModelProperty(value="30次谐波电流有效值-95值")
+    private Double harmonicCurrentEffective3095;
+
+    /**
+     * 31次谐波电流有效值-最大值
+     */
+    @TableField(value = "harmonic_current_effective_31_max")
+    @ApiModelProperty(value="31次谐波电流有效值-最大值")
+    private Double harmonicCurrentEffective31Max;
+
+    /**
+     * 31次谐波电流有效值-最小值
+     */
+    @TableField(value = "harmonic_current_effective_31_min")
+    @ApiModelProperty(value="31次谐波电流有效值-最小值")
+    private Double harmonicCurrentEffective31Min;
+
+    /**
+     * 31次谐波电流有效值-平均值
+     */
+    @TableField(value = "harmonic_current_effective_31_avg")
+    @ApiModelProperty(value="31次谐波电流有效值-平均值")
+    private Double harmonicCurrentEffective31Avg;
+
+    /**
+     * 31次谐波电流有效值-95值
+     */
+    @TableField(value = "harmonic_current_effective_31_95")
+    @ApiModelProperty(value="31次谐波电流有效值-95值")
+    private Double harmonicCurrentEffective3195;
+
+    /**
+     * 32次谐波电流有效值-最大值
+     */
+    @TableField(value = "harmonic_current_effective_32_max")
+    @ApiModelProperty(value="32次谐波电流有效值-最大值")
+    private Double harmonicCurrentEffective32Max;
+
+    /**
+     * 32次谐波电流有效值-最小值
+     */
+    @TableField(value = "harmonic_current_effective_32_min")
+    @ApiModelProperty(value="32次谐波电流有效值-最小值")
+    private Double harmonicCurrentEffective32Min;
+
+    /**
+     * 32次谐波电流有效值-平均值
+     */
+    @TableField(value = "harmonic_current_effective_32_avg")
+    @ApiModelProperty(value="32次谐波电流有效值-平均值")
+    private Double harmonicCurrentEffective32Avg;
+
+    /**
+     * 32次谐波电流有效值-95值
+     */
+    @TableField(value = "harmonic_current_effective_32_95")
+    @ApiModelProperty(value="32次谐波电流有效值-95值")
+    private Double harmonicCurrentEffective3295;
+
+    /**
+     * 33次谐波电流有效值-最大值
+     */
+    @TableField(value = "harmonic_current_effective_33_max")
+    @ApiModelProperty(value="33次谐波电流有效值-最大值")
+    private Double harmonicCurrentEffective33Max;
+
+    /**
+     * 33次谐波电流有效值-最小值
+     */
+    @TableField(value = "harmonic_current_effective_33_min")
+    @ApiModelProperty(value="33次谐波电流有效值-最小值")
+    private Double harmonicCurrentEffective33Min;
+
+    /**
+     * 33次谐波电流有效值-平均值
+     */
+    @TableField(value = "harmonic_current_effective_33_avg")
+    @ApiModelProperty(value="33次谐波电流有效值-平均值")
+    private Double harmonicCurrentEffective33Avg;
+
+    /**
+     * 33次谐波电流有效值-95值
+     */
+    @TableField(value = "harmonic_current_effective_33_95")
+    @ApiModelProperty(value="33次谐波电流有效值-95值")
+    private Double harmonicCurrentEffective3395;
+
+    /**
+     * 34次谐波电流有效值-最大值
+     */
+    @TableField(value = "harmonic_current_effective_34_max")
+    @ApiModelProperty(value="34次谐波电流有效值-最大值")
+    private Double harmonicCurrentEffective34Max;
+
+    /**
+     * 34次谐波电流有效值-最小值
+     */
+    @TableField(value = "harmonic_current_effective_34_min")
+    @ApiModelProperty(value="34次谐波电流有效值-最小值")
+    private Double harmonicCurrentEffective34Min;
+
+    /**
+     * 34次谐波电流有效值-平均值
+     */
+    @TableField(value = "harmonic_current_effective_34_avg")
+    @ApiModelProperty(value="34次谐波电流有效值-平均值")
+    private Double harmonicCurrentEffective34Avg;
+
+    /**
+     * 34次谐波电流有效值-95值
+     */
+    @TableField(value = "harmonic_current_effective_34_95")
+    @ApiModelProperty(value="34次谐波电流有效值-95值")
+    private Double harmonicCurrentEffective3495;
+
+    /**
+     * 35次谐波电流有效值-最大值
+     */
+    @TableField(value = "harmonic_current_effective_35_max")
+    @ApiModelProperty(value="35次谐波电流有效值-最大值")
+    private Double harmonicCurrentEffective35Max;
+
+    /**
+     * 35次谐波电流有效值-最小值
+     */
+    @TableField(value = "harmonic_current_effective_35_min")
+    @ApiModelProperty(value="35次谐波电流有效值-最小值")
+    private Double harmonicCurrentEffective35Min;
+
+    /**
+     * 35次谐波电流有效值-平均值
+     */
+    @TableField(value = "harmonic_current_effective_35_avg")
+    @ApiModelProperty(value="35次谐波电流有效值-平均值")
+    private Double harmonicCurrentEffective35Avg;
+
+    /**
+     * 35次谐波电流有效值-95值
+     */
+    @TableField(value = "harmonic_current_effective_35_95")
+    @ApiModelProperty(value="35次谐波电流有效值-95值")
+    private Double harmonicCurrentEffective3595;
+
+    /**
+     * 36次谐波电流有效值-最大值
+     */
+    @TableField(value = "harmonic_current_effective_36_max")
+    @ApiModelProperty(value="36次谐波电流有效值-最大值")
+    private Double harmonicCurrentEffective36Max;
+
+    /**
+     * 36次谐波电流有效值-最小值
+     */
+    @TableField(value = "harmonic_current_effective_36_min")
+    @ApiModelProperty(value="36次谐波电流有效值-最小值")
+    private Double harmonicCurrentEffective36Min;
+
+    /**
+     * 36次谐波电流有效值-平均值
+     */
+    @TableField(value = "harmonic_current_effective_36_avg")
+    @ApiModelProperty(value="36次谐波电流有效值-平均值")
+    private Double harmonicCurrentEffective36Avg;
+
+    /**
+     * 36次谐波电流有效值-95值
+     */
+    @TableField(value = "harmonic_current_effective_36_95")
+    @ApiModelProperty(value="36次谐波电流有效值-95值")
+    private Double harmonicCurrentEffective3695;
+
+    /**
+     * 37次谐波电流有效值-最大值
+     */
+    @TableField(value = "harmonic_current_effective_37_max")
+    @ApiModelProperty(value="37次谐波电流有效值-最大值")
+    private Double harmonicCurrentEffective37Max;
+
+    /**
+     * 37次谐波电流有效值-最小值
+     */
+    @TableField(value = "harmonic_current_effective_37_min")
+    @ApiModelProperty(value="37次谐波电流有效值-最小值")
+    private Double harmonicCurrentEffective37Min;
+
+    /**
+     * 37次谐波电流有效值-平均值
+     */
+    @TableField(value = "harmonic_current_effective_37_avg")
+    @ApiModelProperty(value="37次谐波电流有效值-平均值")
+    private Double harmonicCurrentEffective37Avg;
+
+    /**
+     * 37次谐波电流有效值-95值
+     */
+    @TableField(value = "harmonic_current_effective_37_95")
+    @ApiModelProperty(value="37次谐波电流有效值-95值")
+    private Double harmonicCurrentEffective3795;
+
+    /**
+     * 38次谐波电流有效值-最大值
+     */
+    @TableField(value = "harmonic_current_effective_38_max")
+    @ApiModelProperty(value="38次谐波电流有效值-最大值")
+    private Double harmonicCurrentEffective38Max;
+
+    /**
+     * 38次谐波电流有效值-最小值
+     */
+    @TableField(value = "harmonic_current_effective_38_min")
+    @ApiModelProperty(value="38次谐波电流有效值-最小值")
+    private Double harmonicCurrentEffective38Min;
+
+    /**
+     * 38次谐波电流有效值-平均值
+     */
+    @TableField(value = "harmonic_current_effective_38_avg")
+    @ApiModelProperty(value="38次谐波电流有效值-平均值")
+    private Double harmonicCurrentEffective38Avg;
+
+    /**
+     * 38次谐波电流有效值-95值
+     */
+    @TableField(value = "harmonic_current_effective_38_95")
+    @ApiModelProperty(value="38次谐波电流有效值-95值")
+    private Double harmonicCurrentEffective3895;
+
+    /**
+     * 39次谐波电流有效值-最大值
+     */
+    @TableField(value = "harmonic_current_effective_39_max")
+    @ApiModelProperty(value="39次谐波电流有效值-最大值")
+    private Double harmonicCurrentEffective39Max;
+
+    /**
+     * 39次谐波电流有效值-最小值
+     */
+    @TableField(value = "harmonic_current_effective_39_min")
+    @ApiModelProperty(value="39次谐波电流有效值-最小值")
+    private Double harmonicCurrentEffective39Min;
+
+    /**
+     * 39次谐波电流有效值-平均值
+     */
+    @TableField(value = "harmonic_current_effective_39_avg")
+    @ApiModelProperty(value="39次谐波电流有效值-平均值")
+    private Double harmonicCurrentEffective39Avg;
+
+    /**
+     * 39次谐波电流有效值-95值
+     */
+    @TableField(value = "harmonic_current_effective_39_95")
+    @ApiModelProperty(value="39次谐波电流有效值-95值")
+    private Double harmonicCurrentEffective3995;
+
+    /**
+     * 40次谐波电流有效值-最大值
+     */
+    @TableField(value = "harmonic_current_effective_40_max")
+    @ApiModelProperty(value="40次谐波电流有效值-最大值")
+    private Double harmonicCurrentEffective40Max;
+
+    /**
+     * 40次谐波电流有效值-最小值
+     */
+    @TableField(value = "harmonic_current_effective_40_min")
+    @ApiModelProperty(value="40次谐波电流有效值-最小值")
+    private Double harmonicCurrentEffective40Min;
+
+    /**
+     * 40次谐波电流有效值-平均值
+     */
+    @TableField(value = "harmonic_current_effective_40_avg")
+    @ApiModelProperty(value="40次谐波电流有效值-平均值")
+    private Double harmonicCurrentEffective40Avg;
+
+    /**
+     * 40次谐波电流有效值-95值
+     */
+    @TableField(value = "harmonic_current_effective_40_95")
+    @ApiModelProperty(value="40次谐波电流有效值-95值")
+    private Double harmonicCurrentEffective4095;
+
+    /**
+     * 41次谐波电流有效值-最大值
+     */
+    @TableField(value = "harmonic_current_effective_41_max")
+    @ApiModelProperty(value="41次谐波电流有效值-最大值")
+    private Double harmonicCurrentEffective41Max;
+
+    /**
+     * 41次谐波电流有效值-最小值
+     */
+    @TableField(value = "harmonic_current_effective_41_min")
+    @ApiModelProperty(value="41次谐波电流有效值-最小值")
+    private Double harmonicCurrentEffective41Min;
+
+    /**
+     * 41次谐波电流有效值-平均值
+     */
+    @TableField(value = "harmonic_current_effective_41_avg")
+    @ApiModelProperty(value="41次谐波电流有效值-平均值")
+    private Double harmonicCurrentEffective41Avg;
+
+    /**
+     * 41次谐波电流有效值-95值
+     */
+    @TableField(value = "harmonic_current_effective_41_95")
+    @ApiModelProperty(value="41次谐波电流有效值-95值")
+    private Double harmonicCurrentEffective4195;
+
+    /**
+     * 42次谐波电流有效值-最大值
+     */
+    @TableField(value = "harmonic_current_effective_42_max")
+    @ApiModelProperty(value="42次谐波电流有效值-最大值")
+    private Double harmonicCurrentEffective42Max;
+
+    /**
+     * 42次谐波电流有效值-最小值
+     */
+    @TableField(value = "harmonic_current_effective_42_min")
+    @ApiModelProperty(value="42次谐波电流有效值-最小值")
+    private Double harmonicCurrentEffective42Min;
+
+    /**
+     * 42次谐波电流有效值-平均值
+     */
+    @TableField(value = "harmonic_current_effective_42_avg")
+    @ApiModelProperty(value="42次谐波电流有效值-平均值")
+    private Double harmonicCurrentEffective42Avg;
+
+    /**
+     * 42次谐波电流有效值-95值
+     */
+    @TableField(value = "harmonic_current_effective_42_95")
+    @ApiModelProperty(value="42次谐波电流有效值-95值")
+    private Double harmonicCurrentEffective4295;
+
+    /**
+     * 43次谐波电流有效值-最大值
+     */
+    @TableField(value = "harmonic_current_effective_43_max")
+    @ApiModelProperty(value="43次谐波电流有效值-最大值")
+    private Double harmonicCurrentEffective43Max;
+
+    /**
+     * 43次谐波电流有效值-最小值
+     */
+    @TableField(value = "harmonic_current_effective_43_min")
+    @ApiModelProperty(value="43次谐波电流有效值-最小值")
+    private Double harmonicCurrentEffective43Min;
+
+    /**
+     * 43次谐波电流有效值-平均值
+     */
+    @TableField(value = "harmonic_current_effective_43_avg")
+    @ApiModelProperty(value="43次谐波电流有效值-平均值")
+    private Double harmonicCurrentEffective43Avg;
+
+    /**
+     * 43次谐波电流有效值-95值
+     */
+    @TableField(value = "harmonic_current_effective_43_95")
+    @ApiModelProperty(value="43次谐波电流有效值-95值")
+    private Double harmonicCurrentEffective4395;
+
+    /**
+     * 44次谐波电流有效值-最大值
+     */
+    @TableField(value = "harmonic_current_effective_44_max")
+    @ApiModelProperty(value="44次谐波电流有效值-最大值")
+    private Double harmonicCurrentEffective44Max;
+
+    /**
+     * 44次谐波电流有效值-最小值
+     */
+    @TableField(value = "harmonic_current_effective_44_min")
+    @ApiModelProperty(value="44次谐波电流有效值-最小值")
+    private Double harmonicCurrentEffective44Min;
+
+    /**
+     * 44次谐波电流有效值-平均值
+     */
+    @TableField(value = "harmonic_current_effective_44_avg")
+    @ApiModelProperty(value="44次谐波电流有效值-平均值")
+    private Double harmonicCurrentEffective44Avg;
+
+    /**
+     * 44次谐波电流有效值-95值
+     */
+    @TableField(value = "harmonic_current_effective_44_95")
+    @ApiModelProperty(value="44次谐波电流有效值-95值")
+    private Double harmonicCurrentEffective4495;
+
+    /**
+     * 45次谐波电流有效值-最大值
+     */
+    @TableField(value = "harmonic_current_effective_45_max")
+    @ApiModelProperty(value="45次谐波电流有效值-最大值")
+    private Double harmonicCurrentEffective45Max;
+
+    /**
+     * 45次谐波电流有效值-最小值
+     */
+    @TableField(value = "harmonic_current_effective_45_min")
+    @ApiModelProperty(value="45次谐波电流有效值-最小值")
+    private Double harmonicCurrentEffective45Min;
+
+    /**
+     * 45次谐波电流有效值-平均值
+     */
+    @TableField(value = "harmonic_current_effective_45_avg")
+    @ApiModelProperty(value="45次谐波电流有效值-平均值")
+    private Double harmonicCurrentEffective45Avg;
+
+    /**
+     * 45次谐波电流有效值-95值
+     */
+    @TableField(value = "harmonic_current_effective_45_95")
+    @ApiModelProperty(value="45次谐波电流有效值-95值")
+    private Double harmonicCurrentEffective4595;
+
+    /**
+     * 46次谐波电流有效值-最大值
+     */
+    @TableField(value = "harmonic_current_effective_46_max")
+    @ApiModelProperty(value="46次谐波电流有效值-最大值")
+    private Double harmonicCurrentEffective46Max;
+
+    /**
+     * 46次谐波电流有效值-最小值
+     */
+    @TableField(value = "harmonic_current_effective_46_min")
+    @ApiModelProperty(value="46次谐波电流有效值-最小值")
+    private Double harmonicCurrentEffective46Min;
+
+    /**
+     * 46次谐波电流有效值-平均值
+     */
+    @TableField(value = "harmonic_current_effective_46_avg")
+    @ApiModelProperty(value="46次谐波电流有效值-平均值")
+    private Double harmonicCurrentEffective46Avg;
+
+    /**
+     * 46次谐波电流有效值-95值
+     */
+    @TableField(value = "harmonic_current_effective_46_95")
+    @ApiModelProperty(value="46次谐波电流有效值-95值")
+    private Double harmonicCurrentEffective4695;
+
+    /**
+     * 47次谐波电流有效值-最大值
+     */
+    @TableField(value = "harmonic_current_effective_47_max")
+    @ApiModelProperty(value="47次谐波电流有效值-最大值")
+    private Double harmonicCurrentEffective47Max;
+
+    /**
+     * 47次谐波电流有效值-最小值
+     */
+    @TableField(value = "harmonic_current_effective_47_min")
+    @ApiModelProperty(value="47次谐波电流有效值-最小值")
+    private Double harmonicCurrentEffective47Min;
+
+    /**
+     * 47次谐波电流有效值-平均值
+     */
+    @TableField(value = "harmonic_current_effective_47_avg")
+    @ApiModelProperty(value="47次谐波电流有效值-平均值")
+    private Double harmonicCurrentEffective47Avg;
+
+    /**
+     * 47次谐波电流有效值-95值
+     */
+    @TableField(value = "harmonic_current_effective_47_95")
+    @ApiModelProperty(value="47次谐波电流有效值-95值")
+    private Double harmonicCurrentEffective4795;
+
+    /**
+     * 48次谐波电流有效值-最大值
+     */
+    @TableField(value = "harmonic_current_effective_48_max")
+    @ApiModelProperty(value="48次谐波电流有效值-最大值")
+    private Double harmonicCurrentEffective48Max;
+
+    /**
+     * 48次谐波电流有效值-最小值
+     */
+    @TableField(value = "harmonic_current_effective_48_min")
+    @ApiModelProperty(value="48次谐波电流有效值-最小值")
+    private Double harmonicCurrentEffective48Min;
+
+    /**
+     * 48次谐波电流有效值-平均值
+     */
+    @TableField(value = "harmonic_current_effective_48_avg")
+    @ApiModelProperty(value="48次谐波电流有效值-平均值")
+    private Double harmonicCurrentEffective48Avg;
+
+    /**
+     * 48次谐波电流有效值-95值
+     */
+    @TableField(value = "harmonic_current_effective_48_95")
+    @ApiModelProperty(value="48次谐波电流有效值-95值")
+    private Double harmonicCurrentEffective4895;
+
+    /**
+     * 49次谐波电流有效值-最大值
+     */
+    @TableField(value = "harmonic_current_effective_49_max")
+    @ApiModelProperty(value="49次谐波电流有效值-最大值")
+    private Double harmonicCurrentEffective49Max;
+
+    /**
+     * 49次谐波电流有效值-最小值
+     */
+    @TableField(value = "harmonic_current_effective_49_min")
+    @ApiModelProperty(value="49次谐波电流有效值-最小值")
+    private Double harmonicCurrentEffective49Min;
+
+    /**
+     * 49次谐波电流有效值-平均值
+     */
+    @TableField(value = "harmonic_current_effective_49_avg")
+    @ApiModelProperty(value="49次谐波电流有效值-平均值")
+    private Double harmonicCurrentEffective49Avg;
+
+    /**
+     * 49次谐波电流有效值-95值
+     */
+    @TableField(value = "harmonic_current_effective_49_95")
+    @ApiModelProperty(value="49次谐波电流有效值-95值")
+    private Double harmonicCurrentEffective4995;
+
+    /**
+     * 50次谐波电流有效值-最大值
+     */
+    @TableField(value = "harmonic_current_effective_50_max")
+    @ApiModelProperty(value="50次谐波电流有效值-最大值")
+    private Double harmonicCurrentEffective50Max;
+
+    /**
+     * 50次谐波电流有效值-最小值
+     */
+    @TableField(value = "harmonic_current_effective_50_min")
+    @ApiModelProperty(value="50次谐波电流有效值-最小值")
+    private Double harmonicCurrentEffective50Min;
+
+    /**
+     * 50次谐波电流有效值-平均值
+     */
+    @TableField(value = "harmonic_current_effective_50_avg")
+    @ApiModelProperty(value="50次谐波电流有效值-平均值")
+    private Double harmonicCurrentEffective50Avg;
+
+    /**
+     * 50次谐波电流有效值-95值
+     */
+    @TableField(value = "harmonic_current_effective_50_95")
+    @ApiModelProperty(value="50次谐波电流有效值-95值")
+    private Double harmonicCurrentEffective5095;
+}
\ No newline at end of file
diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/pojo/po/line/RMpHarmonicIRateReportDPO.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/pojo/po/line/RMpHarmonicIRateReportDPO.java
new file mode 100644
index 000000000..8f17c9a21
--- /dev/null
+++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/pojo/po/line/RMpHarmonicIRateReportDPO.java
@@ -0,0 +1,1420 @@
+package com.njcn.prepare.harmonic.pojo.po.line;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.github.jeffreyning.mybatisplus.anno.MppMultiId;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 
+ * Description:
+ * 接口文档访问地址：http://serverIP:port/swagger-ui.html
+ * Date: 2022/10/26  18:33【需求编号】
+ *
+ * @author clam
+ * @version V1.0.0
+ */
+/**
+    * 稳态监测点指标日报-日表(主网表)  /各次谐波电流含有率
+    */
+@ApiModel(value="com-njcn-prepare-harmonic-pojo-po-line-RMpHarmonicIRateReportDPO")
+@Data
+@TableName(value = "r_mp_harmonic_i_rate_report_d")
+public class RMpHarmonicIRateReportDPO {
+    /**
+     * 监测点ID
+     */
+    @MppMultiId(value = "measurement_point_id")
+    @ApiModelProperty(value="监测点ID")
+    private String measurementPointId;
+
+    /**
+     * 生成数据的时间,每日统计一次
+     */
+    @MppMultiId(value = "data_date")
+    @ApiModelProperty(value="生成数据的时间,每日统计一次")
+    private Date dataDate;
+
+    /**
+     * 相别：‘A’ 'B' 'C' 'ABC' 'T' 配网部分相别的数据采用T标志存储
+     */
+    @MppMultiId(value = "phase")
+    @ApiModelProperty(value="相别：‘A’ 'B' 'C' 'ABC' 'T' 配网部分相别的数据采用T标志存储")
+    private String phase;
+
+    /**
+     * 2次谐波电流含有率-最大值
+     */
+    @TableField(value = "i_2_max")
+    @ApiModelProperty(value="2次谐波电流含有率-最大值")
+    private Double i2Max;
+
+    /**
+     * 2次谐波电流含有率-最小值
+     */
+    @TableField(value = "i_2_min")
+    @ApiModelProperty(value="2次谐波电流含有率-最小值")
+    private Double i2Min;
+
+    /**
+     * 2次谐波电流含有率-平均值
+     */
+    @TableField(value = "i_2_avg")
+    @ApiModelProperty(value="2次谐波电流含有率-平均值")
+    private Double i2Avg;
+
+    /**
+     * 2次谐波电流含有率-cp95值
+     */
+    @TableField(value = "i_2_cp95")
+    @ApiModelProperty(value="2次谐波电流含有率-cp95值")
+    private Double i2Cp95;
+
+    /**
+     * 3次谐波电流含有率-最大值
+     */
+    @TableField(value = "i_3_max")
+    @ApiModelProperty(value="3次谐波电流含有率-最大值")
+    private Double i3Max;
+
+    /**
+     * 3次谐波电流含有率-最小值
+     */
+    @TableField(value = "i_3_min")
+    @ApiModelProperty(value="3次谐波电流含有率-最小值")
+    private Double i3Min;
+
+    /**
+     * 3次谐波电流含有率-平均值
+     */
+    @TableField(value = "i_3_avg")
+    @ApiModelProperty(value="3次谐波电流含有率-平均值")
+    private Double i3Avg;
+
+    /**
+     * 3次谐波电流含有率-cp95值
+     */
+    @TableField(value = "i_3_cp95")
+    @ApiModelProperty(value="3次谐波电流含有率-cp95值")
+    private Double i3Cp95;
+
+    /**
+     * 4次谐波电流含有率-最大值
+     */
+    @TableField(value = "i_4_max")
+    @ApiModelProperty(value="4次谐波电流含有率-最大值")
+    private Double i4Max;
+
+    /**
+     * 4次谐波电流含有率-最小值
+     */
+    @TableField(value = "i_4_min")
+    @ApiModelProperty(value="4次谐波电流含有率-最小值")
+    private Double i4Min;
+
+    /**
+     * 4次谐波电流含有率-平均值
+     */
+    @TableField(value = "i_4_avg")
+    @ApiModelProperty(value="4次谐波电流含有率-平均值")
+    private Double i4Avg;
+
+    /**
+     * 4次谐波电流含有率-cp95值
+     */
+    @TableField(value = "i_4_cp95")
+    @ApiModelProperty(value="4次谐波电流含有率-cp95值")
+    private Double i4Cp95;
+
+    /**
+     * 5次谐波电流含有率-最大值
+     */
+    @TableField(value = "i_5_max")
+    @ApiModelProperty(value="5次谐波电流含有率-最大值")
+    private Double i5Max;
+
+    /**
+     * 5次谐波电流含有率-最小值
+     */
+    @TableField(value = "i_5_min")
+    @ApiModelProperty(value="5次谐波电流含有率-最小值")
+    private Double i5Min;
+
+    /**
+     * 5次谐波电流含有率-平均值
+     */
+    @TableField(value = "i_5_avg")
+    @ApiModelProperty(value="5次谐波电流含有率-平均值")
+    private Double i5Avg;
+
+    /**
+     * 5次谐波电流含有率-cp95值
+     */
+    @TableField(value = "i_5_cp95")
+    @ApiModelProperty(value="5次谐波电流含有率-cp95值")
+    private Double i5Cp95;
+
+    /**
+     * 6次谐波电流含有率-最大值
+     */
+    @TableField(value = "i_6_max")
+    @ApiModelProperty(value="6次谐波电流含有率-最大值")
+    private Double i6Max;
+
+    /**
+     * 6次谐波电流含有率-最小值
+     */
+    @TableField(value = "i_6_min")
+    @ApiModelProperty(value="6次谐波电流含有率-最小值")
+    private Double i6Min;
+
+    /**
+     * 6次谐波电流含有率-平均值
+     */
+    @TableField(value = "i_6_avg")
+    @ApiModelProperty(value="6次谐波电流含有率-平均值")
+    private Double i6Avg;
+
+    /**
+     * 6次谐波电流含有率-cp95值
+     */
+    @TableField(value = "i_6_cp95")
+    @ApiModelProperty(value="6次谐波电流含有率-cp95值")
+    private Double i6Cp95;
+
+    /**
+     * 7次谐波电流含有率-最大值
+     */
+    @TableField(value = "i_7_max")
+    @ApiModelProperty(value="7次谐波电流含有率-最大值")
+    private Double i7Max;
+
+    /**
+     * 7次谐波电流含有率-最小值
+     */
+    @TableField(value = "i_7_min")
+    @ApiModelProperty(value="7次谐波电流含有率-最小值")
+    private Double i7Min;
+
+    /**
+     * 7次谐波电流含有率-平均值
+     */
+    @TableField(value = "i_7_avg")
+    @ApiModelProperty(value="7次谐波电流含有率-平均值")
+    private Double i7Avg;
+
+    /**
+     * 7次谐波电流含有率-cp95值
+     */
+    @TableField(value = "i_7_cp95")
+    @ApiModelProperty(value="7次谐波电流含有率-cp95值")
+    private Double i7Cp95;
+
+    /**
+     * 8次谐波电流含有率-最大值
+     */
+    @TableField(value = "i_8_max")
+    @ApiModelProperty(value="8次谐波电流含有率-最大值")
+    private Double i8Max;
+
+    /**
+     * 8次谐波电流含有率-最小值
+     */
+    @TableField(value = "i_8_min")
+    @ApiModelProperty(value="8次谐波电流含有率-最小值")
+    private Double i8Min;
+
+    /**
+     * 8次谐波电流含有率-平均值
+     */
+    @TableField(value = "i_8_avg")
+    @ApiModelProperty(value="8次谐波电流含有率-平均值")
+    private Double i8Avg;
+
+    /**
+     * 8次谐波电流含有率-cp95值
+     */
+    @TableField(value = "i_8_cp95")
+    @ApiModelProperty(value="8次谐波电流含有率-cp95值")
+    private Double i8Cp95;
+
+    /**
+     * 9次谐波电流含有率-最大值
+     */
+    @TableField(value = "i_9_max")
+    @ApiModelProperty(value="9次谐波电流含有率-最大值")
+    private Double i9Max;
+
+    /**
+     * 9次谐波电流含有率-最小值
+     */
+    @TableField(value = "i_9_min")
+    @ApiModelProperty(value="9次谐波电流含有率-最小值")
+    private Double i9Min;
+
+    /**
+     * 9次谐波电流含有率-平均值
+     */
+    @TableField(value = "i_9_avg")
+    @ApiModelProperty(value="9次谐波电流含有率-平均值")
+    private Double i9Avg;
+
+    /**
+     * 9次谐波电流含有率-cp95值
+     */
+    @TableField(value = "i_9_cp95")
+    @ApiModelProperty(value="9次谐波电流含有率-cp95值")
+    private Double i9Cp95;
+
+    /**
+     * 10次谐波电流含有率-最大值
+     */
+    @TableField(value = "i_10_max")
+    @ApiModelProperty(value="10次谐波电流含有率-最大值")
+    private Double i10Max;
+
+    /**
+     * 10次谐波电流含有率-最小值
+     */
+    @TableField(value = "i_10_min")
+    @ApiModelProperty(value="10次谐波电流含有率-最小值")
+    private Double i10Min;
+
+    /**
+     * 10次谐波电流含有率-平均值
+     */
+    @TableField(value = "i_10_avg")
+    @ApiModelProperty(value="10次谐波电流含有率-平均值")
+    private Double i10Avg;
+
+    /**
+     * 10次谐波电流含有率-cp95值
+     */
+    @TableField(value = "i_10_cp95")
+    @ApiModelProperty(value="10次谐波电流含有率-cp95值")
+    private Double i10Cp95;
+
+    /**
+     * 11次谐波电流含有率-最大值
+     */
+    @TableField(value = "i_11_max")
+    @ApiModelProperty(value="11次谐波电流含有率-最大值")
+    private Double i11Max;
+
+    /**
+     * 11次谐波电流含有率-最小值
+     */
+    @TableField(value = "i_11_min")
+    @ApiModelProperty(value="11次谐波电流含有率-最小值")
+    private Double i11Min;
+
+    /**
+     * 11次谐波电流含有率-平均值
+     */
+    @TableField(value = "i_11_avg")
+    @ApiModelProperty(value="11次谐波电流含有率-平均值")
+    private Double i11Avg;
+
+    /**
+     * 11次谐波电流含有率-cp95值
+     */
+    @TableField(value = "i_11_cp95")
+    @ApiModelProperty(value="11次谐波电流含有率-cp95值")
+    private Double i11Cp95;
+
+    /**
+     * 12次谐波电流含有率-最大值
+     */
+    @TableField(value = "i_12_max")
+    @ApiModelProperty(value="12次谐波电流含有率-最大值")
+    private Double i12Max;
+
+    /**
+     * 12次谐波电流含有率-最小值
+     */
+    @TableField(value = "i_12_min")
+    @ApiModelProperty(value="12次谐波电流含有率-最小值")
+    private Double i12Min;
+
+    /**
+     * 12次谐波电流含有率-平均值
+     */
+    @TableField(value = "i_12_avg")
+    @ApiModelProperty(value="12次谐波电流含有率-平均值")
+    private Double i12Avg;
+
+    /**
+     * 12次谐波电流含有率-cp95值
+     */
+    @TableField(value = "i_12_cp95")
+    @ApiModelProperty(value="12次谐波电流含有率-cp95值")
+    private Double i12Cp95;
+
+    /**
+     * 13次谐波电流含有率-最大值
+     */
+    @TableField(value = "i_13_max")
+    @ApiModelProperty(value="13次谐波电流含有率-最大值")
+    private Double i13Max;
+
+    /**
+     * 13次谐波电流含有率-最小值
+     */
+    @TableField(value = "i_13_min")
+    @ApiModelProperty(value="13次谐波电流含有率-最小值")
+    private Double i13Min;
+
+    /**
+     * 13次谐波电流含有率-平均值
+     */
+    @TableField(value = "i_13_avg")
+    @ApiModelProperty(value="13次谐波电流含有率-平均值")
+    private Double i13Avg;
+
+    /**
+     * 13次谐波电流含有率-cp95值
+     */
+    @TableField(value = "i_13_cp95")
+    @ApiModelProperty(value="13次谐波电流含有率-cp95值")
+    private Double i13Cp95;
+
+    /**
+     * 14次谐波电流含有率-最大值
+     */
+    @TableField(value = "i_14_max")
+    @ApiModelProperty(value="14次谐波电流含有率-最大值")
+    private Double i14Max;
+
+    /**
+     * 14次谐波电流含有率-最小值
+     */
+    @TableField(value = "i_14_min")
+    @ApiModelProperty(value="14次谐波电流含有率-最小值")
+    private Double i14Min;
+
+    /**
+     * 14次谐波电流含有率-平均值
+     */
+    @TableField(value = "i_14_avg")
+    @ApiModelProperty(value="14次谐波电流含有率-平均值")
+    private Double i14Avg;
+
+    /**
+     * 14次谐波电流含有率-cp95值
+     */
+    @TableField(value = "i_14_cp95")
+    @ApiModelProperty(value="14次谐波电流含有率-cp95值")
+    private Double i14Cp95;
+
+    /**
+     * 15次谐波电流含有率-最大值
+     */
+    @TableField(value = "i_15_max")
+    @ApiModelProperty(value="15次谐波电流含有率-最大值")
+    private Double i15Max;
+
+    /**
+     * 15次谐波电流含有率-最小值
+     */
+    @TableField(value = "i_15_min")
+    @ApiModelProperty(value="15次谐波电流含有率-最小值")
+    private Double i15Min;
+
+    /**
+     * 15次谐波电流含有率-平均值
+     */
+    @TableField(value = "i_15_avg")
+    @ApiModelProperty(value="15次谐波电流含有率-平均值")
+    private Double i15Avg;
+
+    /**
+     * 15次谐波电流含有率-cp95值
+     */
+    @TableField(value = "i_15_cp95")
+    @ApiModelProperty(value="15次谐波电流含有率-cp95值")
+    private Double i15Cp95;
+
+    /**
+     * 16次谐波电流含有率-最大值
+     */
+    @TableField(value = "i_16_max")
+    @ApiModelProperty(value="16次谐波电流含有率-最大值")
+    private Double i16Max;
+
+    /**
+     * 16次谐波电流含有率-最小值
+     */
+    @TableField(value = "i_16_min")
+    @ApiModelProperty(value="16次谐波电流含有率-最小值")
+    private Double i16Min;
+
+    /**
+     * 16次谐波电流含有率-平均值
+     */
+    @TableField(value = "i_16_avg")
+    @ApiModelProperty(value="16次谐波电流含有率-平均值")
+    private Double i16Avg;
+
+    /**
+     * 16次谐波电流含有率-cp95值
+     */
+    @TableField(value = "i_16_cp95")
+    @ApiModelProperty(value="16次谐波电流含有率-cp95值")
+    private Double i16Cp95;
+
+    /**
+     * 17次谐波电流含有率-最大值
+     */
+    @TableField(value = "i_17_max")
+    @ApiModelProperty(value="17次谐波电流含有率-最大值")
+    private Double i17Max;
+
+    /**
+     * 17次谐波电流含有率-最小值
+     */
+    @TableField(value = "i_17_min")
+    @ApiModelProperty(value="17次谐波电流含有率-最小值")
+    private Double i17Min;
+
+    /**
+     * 17次谐波电流含有率-平均值
+     */
+    @TableField(value = "i_17_avg")
+    @ApiModelProperty(value="17次谐波电流含有率-平均值")
+    private Double i17Avg;
+
+    /**
+     * 17次谐波电流含有率-cp95值
+     */
+    @TableField(value = "i_17_cp95")
+    @ApiModelProperty(value="17次谐波电流含有率-cp95值")
+    private Double i17Cp95;
+
+    /**
+     * 18次谐波电流含有率-最大值
+     */
+    @TableField(value = "i_18_max")
+    @ApiModelProperty(value="18次谐波电流含有率-最大值")
+    private Double i18Max;
+
+    /**
+     * 18次谐波电流含有率-最小值
+     */
+    @TableField(value = "i_18_min")
+    @ApiModelProperty(value="18次谐波电流含有率-最小值")
+    private Double i18Min;
+
+    /**
+     * 18次谐波电流含有率-平均值
+     */
+    @TableField(value = "i_18_avg")
+    @ApiModelProperty(value="18次谐波电流含有率-平均值")
+    private Double i18Avg;
+
+    /**
+     * 18次谐波电流含有率-cp95值
+     */
+    @TableField(value = "i_18_cp95")
+    @ApiModelProperty(value="18次谐波电流含有率-cp95值")
+    private Double i18Cp95;
+
+    /**
+     * 19次谐波电流含有率-最大值
+     */
+    @TableField(value = "i_19_max")
+    @ApiModelProperty(value="19次谐波电流含有率-最大值")
+    private Double i19Max;
+
+    /**
+     * 19次谐波电流含有率-最小值
+     */
+    @TableField(value = "i_19_min")
+    @ApiModelProperty(value="19次谐波电流含有率-最小值")
+    private Double i19Min;
+
+    /**
+     * 19次谐波电流含有率-平均值
+     */
+    @TableField(value = "i_19_avg")
+    @ApiModelProperty(value="19次谐波电流含有率-平均值")
+    private Double i19Avg;
+
+    /**
+     * 19次谐波电流含有率-cp95值
+     */
+    @TableField(value = "i_19_cp95")
+    @ApiModelProperty(value="19次谐波电流含有率-cp95值")
+    private Double i19Cp95;
+
+    /**
+     * 20次谐波电流含有率-最大值
+     */
+    @TableField(value = "i_20_max")
+    @ApiModelProperty(value="20次谐波电流含有率-最大值")
+    private Double i20Max;
+
+    /**
+     * 20次谐波电流含有率-最小值
+     */
+    @TableField(value = "i_20_min")
+    @ApiModelProperty(value="20次谐波电流含有率-最小值")
+    private Double i20Min;
+
+    /**
+     * 20次谐波电流含有率-平均值
+     */
+    @TableField(value = "i_20_avg")
+    @ApiModelProperty(value="20次谐波电流含有率-平均值")
+    private Double i20Avg;
+
+    /**
+     * 20次谐波电流含有率-cp95值
+     */
+    @TableField(value = "i_20_cp95")
+    @ApiModelProperty(value="20次谐波电流含有率-cp95值")
+    private Double i20Cp95;
+
+    /**
+     * 21次谐波电流含有率-最大值
+     */
+    @TableField(value = "i_21_max")
+    @ApiModelProperty(value="21次谐波电流含有率-最大值")
+    private Double i21Max;
+
+    /**
+     * 21次谐波电流含有率-最小值
+     */
+    @TableField(value = "i_21_min")
+    @ApiModelProperty(value="21次谐波电流含有率-最小值")
+    private Double i21Min;
+
+    /**
+     * 21次谐波电流含有率-平均值
+     */
+    @TableField(value = "i_21_avg")
+    @ApiModelProperty(value="21次谐波电流含有率-平均值")
+    private Double i21Avg;
+
+    /**
+     * 21次谐波电流含有率-cp95值
+     */
+    @TableField(value = "i_21_cp95")
+    @ApiModelProperty(value="21次谐波电流含有率-cp95值")
+    private Double i21Cp95;
+
+    /**
+     * 22次谐波电流含有率-最大值
+     */
+    @TableField(value = "i_22_max")
+    @ApiModelProperty(value="22次谐波电流含有率-最大值")
+    private Double i22Max;
+
+    /**
+     * 22次谐波电流含有率-最小值
+     */
+    @TableField(value = "i_22_min")
+    @ApiModelProperty(value="22次谐波电流含有率-最小值")
+    private Double i22Min;
+
+    /**
+     * 22次谐波电流含有率-平均值
+     */
+    @TableField(value = "i_22_avg")
+    @ApiModelProperty(value="22次谐波电流含有率-平均值")
+    private Double i22Avg;
+
+    /**
+     * 22次谐波电流含有率-cp95值
+     */
+    @TableField(value = "i_22_cp95")
+    @ApiModelProperty(value="22次谐波电流含有率-cp95值")
+    private Double i22Cp95;
+
+    /**
+     * 23次谐波电流含有率-最大值
+     */
+    @TableField(value = "i_23_max")
+    @ApiModelProperty(value="23次谐波电流含有率-最大值")
+    private Double i23Max;
+
+    /**
+     * 23次谐波电流含有率-最小值
+     */
+    @TableField(value = "i_23_min")
+    @ApiModelProperty(value="23次谐波电流含有率-最小值")
+    private Double i23Min;
+
+    /**
+     * 23次谐波电流含有率-平均值
+     */
+    @TableField(value = "i_23_avg")
+    @ApiModelProperty(value="23次谐波电流含有率-平均值")
+    private Double i23Avg;
+
+    /**
+     * 23次谐波电流含有率-cp95值
+     */
+    @TableField(value = "i_23_cp95")
+    @ApiModelProperty(value="23次谐波电流含有率-cp95值")
+    private Double i23Cp95;
+
+    /**
+     * 24次谐波电流含有率-最大值
+     */
+    @TableField(value = "i_24_max")
+    @ApiModelProperty(value="24次谐波电流含有率-最大值")
+    private Double i24Max;
+
+    /**
+     * 24次谐波电流含有率-最小值
+     */
+    @TableField(value = "i_24_min")
+    @ApiModelProperty(value="24次谐波电流含有率-最小值")
+    private Double i24Min;
+
+    /**
+     * 24次谐波电流含有率-平均值
+     */
+    @TableField(value = "i_24_avg")
+    @ApiModelProperty(value="24次谐波电流含有率-平均值")
+    private Double i24Avg;
+
+    /**
+     * 24次谐波电流含有率-cp95值
+     */
+    @TableField(value = "i_24_cp95")
+    @ApiModelProperty(value="24次谐波电流含有率-cp95值")
+    private Double i24Cp95;
+
+    /**
+     * 25次谐波电流含有率-最大值
+     */
+    @TableField(value = "i_25_max")
+    @ApiModelProperty(value="25次谐波电流含有率-最大值")
+    private Double i25Max;
+
+    /**
+     * 25次谐波电流含有率-最小值
+     */
+    @TableField(value = "i_25_min")
+    @ApiModelProperty(value="25次谐波电流含有率-最小值")
+    private Double i25Min;
+
+    /**
+     * 25次谐波电流含有率-平均值
+     */
+    @TableField(value = "i_25_avg")
+    @ApiModelProperty(value="25次谐波电流含有率-平均值")
+    private Double i25Avg;
+
+    /**
+     * 25次谐波电流含有率-cp95值
+     */
+    @TableField(value = "i_25_cp95")
+    @ApiModelProperty(value="25次谐波电流含有率-cp95值")
+    private Double i25Cp95;
+
+    /**
+     * 26次谐波电流含有率-最大值
+     */
+    @TableField(value = "i_26_max")
+    @ApiModelProperty(value="26次谐波电流含有率-最大值")
+    private Double i26Max;
+
+    /**
+     * 26次谐波电流含有率-最小值
+     */
+    @TableField(value = "i_26_min")
+    @ApiModelProperty(value="26次谐波电流含有率-最小值")
+    private Double i26Min;
+
+    /**
+     * 26次谐波电流含有率-平均值
+     */
+    @TableField(value = "i_26_avg")
+    @ApiModelProperty(value="26次谐波电流含有率-平均值")
+    private Double i26Avg;
+
+    /**
+     * 26次谐波电流含有率-cp95值
+     */
+    @TableField(value = "i_26_cp95")
+    @ApiModelProperty(value="26次谐波电流含有率-cp95值")
+    private Double i26Cp95;
+
+    /**
+     * 27次谐波电流含有率-最大值
+     */
+    @TableField(value = "i_27_max")
+    @ApiModelProperty(value="27次谐波电流含有率-最大值")
+    private Double i27Max;
+
+    /**
+     * 27次谐波电流含有率-最小值
+     */
+    @TableField(value = "i_27_min")
+    @ApiModelProperty(value="27次谐波电流含有率-最小值")
+    private Double i27Min;
+
+    /**
+     * 27次谐波电流含有率-平均值
+     */
+    @TableField(value = "i_27_avg")
+    @ApiModelProperty(value="27次谐波电流含有率-平均值")
+    private Double i27Avg;
+
+    /**
+     * 27次谐波电流含有率-cp95值
+     */
+    @TableField(value = "i_27_cp95")
+    @ApiModelProperty(value="27次谐波电流含有率-cp95值")
+    private Double i27Cp95;
+
+    /**
+     * 28次谐波电流含有率-最大值
+     */
+    @TableField(value = "i_28_max")
+    @ApiModelProperty(value="28次谐波电流含有率-最大值")
+    private Double i28Max;
+
+    /**
+     * 28次谐波电流含有率-最小值
+     */
+    @TableField(value = "i_28_min")
+    @ApiModelProperty(value="28次谐波电流含有率-最小值")
+    private Double i28Min;
+
+    /**
+     * 28次谐波电流含有率-平均值
+     */
+    @TableField(value = "i_28_avg")
+    @ApiModelProperty(value="28次谐波电流含有率-平均值")
+    private Double i28Avg;
+
+    /**
+     * 28次谐波电流含有率-cp95值
+     */
+    @TableField(value = "i_28_cp95")
+    @ApiModelProperty(value="28次谐波电流含有率-cp95值")
+    private Double i28Cp95;
+
+    /**
+     * 29次谐波电流含有率-最大值
+     */
+    @TableField(value = "i_29_max")
+    @ApiModelProperty(value="29次谐波电流含有率-最大值")
+    private Double i29Max;
+
+    /**
+     * 29次谐波电流含有率-最小值
+     */
+    @TableField(value = "i_29_min")
+    @ApiModelProperty(value="29次谐波电流含有率-最小值")
+    private Double i29Min;
+
+    /**
+     * 29次谐波电流含有率-平均值
+     */
+    @TableField(value = "i_29_avg")
+    @ApiModelProperty(value="29次谐波电流含有率-平均值")
+    private Double i29Avg;
+
+    /**
+     * 29次谐波电流含有率-cp95值
+     */
+    @TableField(value = "i_29_cp95")
+    @ApiModelProperty(value="29次谐波电流含有率-cp95值")
+    private Double i29Cp95;
+
+    /**
+     * 30次谐波电流含有率-最大值
+     */
+    @TableField(value = "i_30_max")
+    @ApiModelProperty(value="30次谐波电流含有率-最大值")
+    private Double i30Max;
+
+    /**
+     * 30次谐波电流含有率-最小值
+     */
+    @TableField(value = "i_30_min")
+    @ApiModelProperty(value="30次谐波电流含有率-最小值")
+    private Double i30Min;
+
+    /**
+     * 30次谐波电流含有率-平均值
+     */
+    @TableField(value = "i_30_avg")
+    @ApiModelProperty(value="30次谐波电流含有率-平均值")
+    private Double i30Avg;
+
+    /**
+     * 30次谐波电流含有率-cp95值
+     */
+    @TableField(value = "i_30_cp95")
+    @ApiModelProperty(value="30次谐波电流含有率-cp95值")
+    private Double i30Cp95;
+
+    /**
+     * 31次谐波电流含有率-最大值
+     */
+    @TableField(value = "i_31_max")
+    @ApiModelProperty(value="31次谐波电流含有率-最大值")
+    private Double i31Max;
+
+    /**
+     * 31次谐波电流含有率-最小值
+     */
+    @TableField(value = "i_31_min")
+    @ApiModelProperty(value="31次谐波电流含有率-最小值")
+    private Double i31Min;
+
+    /**
+     * 31次谐波电流含有率-平均值
+     */
+    @TableField(value = "i_31_avg")
+    @ApiModelProperty(value="31次谐波电流含有率-平均值")
+    private Double i31Avg;
+
+    /**
+     * 31次谐波电流含有率-cp95值
+     */
+    @TableField(value = "i_31_cp95")
+    @ApiModelProperty(value="31次谐波电流含有率-cp95值")
+    private Double i31Cp95;
+
+    /**
+     * 32次谐波电流含有率-最大值
+     */
+    @TableField(value = "i_32_max")
+    @ApiModelProperty(value="32次谐波电流含有率-最大值")
+    private Double i32Max;
+
+    /**
+     * 32次谐波电流含有率-最小值
+     */
+    @TableField(value = "i_32_min")
+    @ApiModelProperty(value="32次谐波电流含有率-最小值")
+    private Double i32Min;
+
+    /**
+     * 32次谐波电流含有率-平均值
+     */
+    @TableField(value = "i_32_avg")
+    @ApiModelProperty(value="32次谐波电流含有率-平均值")
+    private Double i32Avg;
+
+    /**
+     * 32次谐波电流含有率-cp95值
+     */
+    @TableField(value = "i_32_cp95")
+    @ApiModelProperty(value="32次谐波电流含有率-cp95值")
+    private Double i32Cp95;
+
+    /**
+     * 33次谐波电流含有率-最大值
+     */
+    @TableField(value = "i_33_max")
+    @ApiModelProperty(value="33次谐波电流含有率-最大值")
+    private Double i33Max;
+
+    /**
+     * 33次谐波电流含有率-最小值
+     */
+    @TableField(value = "i_33_min")
+    @ApiModelProperty(value="33次谐波电流含有率-最小值")
+    private Double i33Min;
+
+    /**
+     * 33次谐波电流含有率-平均值
+     */
+    @TableField(value = "i_33_avg")
+    @ApiModelProperty(value="33次谐波电流含有率-平均值")
+    private Double i33Avg;
+
+    /**
+     * 33次谐波电流含有率-cp95值
+     */
+    @TableField(value = "i_33_cp95")
+    @ApiModelProperty(value="33次谐波电流含有率-cp95值")
+    private Double i33Cp95;
+
+    /**
+     * 34次谐波电流含有率-最大值
+     */
+    @TableField(value = "i_34_max")
+    @ApiModelProperty(value="34次谐波电流含有率-最大值")
+    private Double i34Max;
+
+    /**
+     * 34次谐波电流含有率-最小值
+     */
+    @TableField(value = "i_34_min")
+    @ApiModelProperty(value="34次谐波电流含有率-最小值")
+    private Double i34Min;
+
+    /**
+     * 34次谐波电流含有率-平均值
+     */
+    @TableField(value = "i_34_avg")
+    @ApiModelProperty(value="34次谐波电流含有率-平均值")
+    private Double i34Avg;
+
+    /**
+     * 34次谐波电流含有率-cp95值
+     */
+    @TableField(value = "i_34_cp95")
+    @ApiModelProperty(value="34次谐波电流含有率-cp95值")
+    private Double i34Cp95;
+
+    /**
+     * 35次谐波电流含有率-最大值
+     */
+    @TableField(value = "i_35_max")
+    @ApiModelProperty(value="35次谐波电流含有率-最大值")
+    private Double i35Max;
+
+    /**
+     * 35次谐波电流含有率-最小值
+     */
+    @TableField(value = "i_35_min")
+    @ApiModelProperty(value="35次谐波电流含有率-最小值")
+    private Double i35Min;
+
+    /**
+     * 35次谐波电流含有率-平均值
+     */
+    @TableField(value = "i_35_avg")
+    @ApiModelProperty(value="35次谐波电流含有率-平均值")
+    private Double i35Avg;
+
+    /**
+     * 35次谐波电流含有率-cp95值
+     */
+    @TableField(value = "i_35_cp95")
+    @ApiModelProperty(value="35次谐波电流含有率-cp95值")
+    private Double i35Cp95;
+
+    /**
+     * 36次谐波电流含有率-最大值
+     */
+    @TableField(value = "i_36_max")
+    @ApiModelProperty(value="36次谐波电流含有率-最大值")
+    private Double i36Max;
+
+    /**
+     * 36次谐波电流含有率-最小值
+     */
+    @TableField(value = "i_36_min")
+    @ApiModelProperty(value="36次谐波电流含有率-最小值")
+    private Double i36Min;
+
+    /**
+     * 36次谐波电流含有率-平均值
+     */
+    @TableField(value = "i_36_avg")
+    @ApiModelProperty(value="36次谐波电流含有率-平均值")
+    private Double i36Avg;
+
+    /**
+     * 36次谐波电流含有率-cp95值
+     */
+    @TableField(value = "i_36_cp95")
+    @ApiModelProperty(value="36次谐波电流含有率-cp95值")
+    private Double i36Cp95;
+
+    /**
+     * 37次谐波电流含有率-最大值
+     */
+    @TableField(value = "i_37_max")
+    @ApiModelProperty(value="37次谐波电流含有率-最大值")
+    private Double i37Max;
+
+    /**
+     * 37次谐波电流含有率-最小值
+     */
+    @TableField(value = "i_37_min")
+    @ApiModelProperty(value="37次谐波电流含有率-最小值")
+    private Double i37Min;
+
+    /**
+     * 37次谐波电流含有率-平均值
+     */
+    @TableField(value = "i_37_avg")
+    @ApiModelProperty(value="37次谐波电流含有率-平均值")
+    private Double i37Avg;
+
+    /**
+     * 37次谐波电流含有率-cp95值
+     */
+    @TableField(value = "i_37_cp95")
+    @ApiModelProperty(value="37次谐波电流含有率-cp95值")
+    private Double i37Cp95;
+
+    /**
+     * 38次谐波电流含有率-最大值
+     */
+    @TableField(value = "i_38_max")
+    @ApiModelProperty(value="38次谐波电流含有率-最大值")
+    private Double i38Max;
+
+    /**
+     * 38次谐波电流含有率-最小值
+     */
+    @TableField(value = "i_38_min")
+    @ApiModelProperty(value="38次谐波电流含有率-最小值")
+    private Double i38Min;
+
+    /**
+     * 38次谐波电流含有率-平均值
+     */
+    @TableField(value = "i_38_avg")
+    @ApiModelProperty(value="38次谐波电流含有率-平均值")
+    private Double i38Avg;
+
+    /**
+     * 38次谐波电流含有率-cp95值
+     */
+    @TableField(value = "i_38_cp95")
+    @ApiModelProperty(value="38次谐波电流含有率-cp95值")
+    private Double i38Cp95;
+
+    /**
+     * 39次谐波电流含有率-最大值
+     */
+    @TableField(value = "i_39_max")
+    @ApiModelProperty(value="39次谐波电流含有率-最大值")
+    private Double i39Max;
+
+    /**
+     * 39次谐波电流含有率-最小值
+     */
+    @TableField(value = "i_39_min")
+    @ApiModelProperty(value="39次谐波电流含有率-最小值")
+    private Double i39Min;
+
+    /**
+     * 39次谐波电流含有率-平均值
+     */
+    @TableField(value = "i_39_avg")
+    @ApiModelProperty(value="39次谐波电流含有率-平均值")
+    private Double i39Avg;
+
+    /**
+     * 39次谐波电流含有率-cp95值
+     */
+    @TableField(value = "i_39_cp95")
+    @ApiModelProperty(value="39次谐波电流含有率-cp95值")
+    private Double i39Cp95;
+
+    /**
+     * 40次谐波电流含有率-最大值
+     */
+    @TableField(value = "i_40_max")
+    @ApiModelProperty(value="40次谐波电流含有率-最大值")
+    private Double i40Max;
+
+    /**
+     * 40次谐波电流含有率-最小值
+     */
+    @TableField(value = "i_40_min")
+    @ApiModelProperty(value="40次谐波电流含有率-最小值")
+    private Double i40Min;
+
+    /**
+     * 40次谐波电流含有率-平均值
+     */
+    @TableField(value = "i_40_avg")
+    @ApiModelProperty(value="40次谐波电流含有率-平均值")
+    private Double i40Avg;
+
+    /**
+     * 40次谐波电流含有率-cp95值
+     */
+    @TableField(value = "i_40_cp95")
+    @ApiModelProperty(value="40次谐波电流含有率-cp95值")
+    private Double i40Cp95;
+
+    /**
+     * 41次谐波电流含有率-最大值
+     */
+    @TableField(value = "i_41_max")
+    @ApiModelProperty(value="41次谐波电流含有率-最大值")
+    private Double i41Max;
+
+    /**
+     * 41次谐波电流含有率-最小值
+     */
+    @TableField(value = "i_41_min")
+    @ApiModelProperty(value="41次谐波电流含有率-最小值")
+    private Double i41Min;
+
+    /**
+     * 41次谐波电流含有率-平均值
+     */
+    @TableField(value = "i_41_avg")
+    @ApiModelProperty(value="41次谐波电流含有率-平均值")
+    private Double i41Avg;
+
+    /**
+     * 41次谐波电流含有率-cp95值
+     */
+    @TableField(value = "i_41_cp95")
+    @ApiModelProperty(value="41次谐波电流含有率-cp95值")
+    private Double i41Cp95;
+
+    /**
+     * 42次谐波电流含有率-最大值
+     */
+    @TableField(value = "i_42_max")
+    @ApiModelProperty(value="42次谐波电流含有率-最大值")
+    private Double i42Max;
+
+    /**
+     * 42次谐波电流含有率-最小值
+     */
+    @TableField(value = "i_42_min")
+    @ApiModelProperty(value="42次谐波电流含有率-最小值")
+    private Double i42Min;
+
+    /**
+     * 42次谐波电流含有率-平均值
+     */
+    @TableField(value = "i_42_avg")
+    @ApiModelProperty(value="42次谐波电流含有率-平均值")
+    private Double i42Avg;
+
+    /**
+     * 42次谐波电流含有率-cp95值
+     */
+    @TableField(value = "i_42_cp95")
+    @ApiModelProperty(value="42次谐波电流含有率-cp95值")
+    private Double i42Cp95;
+
+    /**
+     * 43次谐波电流含有率-最大值
+     */
+    @TableField(value = "i_43_max")
+    @ApiModelProperty(value="43次谐波电流含有率-最大值")
+    private Double i43Max;
+
+    /**
+     * 43次谐波电流含有率-最小值
+     */
+    @TableField(value = "i_43_min")
+    @ApiModelProperty(value="43次谐波电流含有率-最小值")
+    private Double i43Min;
+
+    /**
+     * 43次谐波电流含有率-平均值
+     */
+    @TableField(value = "i_43_avg")
+    @ApiModelProperty(value="43次谐波电流含有率-平均值")
+    private Double i43Avg;
+
+    /**
+     * 43次谐波电流含有率-cp95值
+     */
+    @TableField(value = "i_43_cp95")
+    @ApiModelProperty(value="43次谐波电流含有率-cp95值")
+    private Double i43Cp95;
+
+    /**
+     * 44次谐波电流含有率-最大值
+     */
+    @TableField(value = "i_44_max")
+    @ApiModelProperty(value="44次谐波电流含有率-最大值")
+    private Double i44Max;
+
+    /**
+     * 44次谐波电流含有率-最小值
+     */
+    @TableField(value = "i_44_min")
+    @ApiModelProperty(value="44次谐波电流含有率-最小值")
+    private Double i44Min;
+
+    /**
+     * 44次谐波电流含有率-平均值
+     */
+    @TableField(value = "i_44_avg")
+    @ApiModelProperty(value="44次谐波电流含有率-平均值")
+    private Double i44Avg;
+
+    /**
+     * 44次谐波电流含有率-cp95值
+     */
+    @TableField(value = "i_44_cp95")
+    @ApiModelProperty(value="44次谐波电流含有率-cp95值")
+    private Double i44Cp95;
+
+    /**
+     * 45次谐波电流含有率-最大值
+     */
+    @TableField(value = "i_45_max")
+    @ApiModelProperty(value="45次谐波电流含有率-最大值")
+    private Double i45Max;
+
+    /**
+     * 45次谐波电流含有率-最小值
+     */
+    @TableField(value = "i_45_min")
+    @ApiModelProperty(value="45次谐波电流含有率-最小值")
+    private Double i45Min;
+
+    /**
+     * 45次谐波电流含有率-平均值
+     */
+    @TableField(value = "i_45_avg")
+    @ApiModelProperty(value="45次谐波电流含有率-平均值")
+    private Double i45Avg;
+
+    /**
+     * 45次谐波电流含有率-cp95值
+     */
+    @TableField(value = "i_45_cp95")
+    @ApiModelProperty(value="45次谐波电流含有率-cp95值")
+    private Double i45Cp95;
+
+    /**
+     * 46次谐波电流含有率-最大值
+     */
+    @TableField(value = "i_46_max")
+    @ApiModelProperty(value="46次谐波电流含有率-最大值")
+    private Double i46Max;
+
+    /**
+     * 46次谐波电流含有率-最小值
+     */
+    @TableField(value = "i_46_min")
+    @ApiModelProperty(value="46次谐波电流含有率-最小值")
+    private Double i46Min;
+
+    /**
+     * 46次谐波电流含有率-平均值
+     */
+    @TableField(value = "i_46_avg")
+    @ApiModelProperty(value="46次谐波电流含有率-平均值")
+    private Double i46Avg;
+
+    /**
+     * 46次谐波电流含有率-cp95值
+     */
+    @TableField(value = "i_46_cp95")
+    @ApiModelProperty(value="46次谐波电流含有率-cp95值")
+    private Double i46Cp95;
+
+    /**
+     * 47次谐波电流含有率-最大值
+     */
+    @TableField(value = "i_47_max")
+    @ApiModelProperty(value="47次谐波电流含有率-最大值")
+    private Double i47Max;
+
+    /**
+     * 47次谐波电流含有率-最小值
+     */
+    @TableField(value = "i_47_min")
+    @ApiModelProperty(value="47次谐波电流含有率-最小值")
+    private Double i47Min;
+
+    /**
+     * 47次谐波电流含有率-平均值
+     */
+    @TableField(value = "i_47_avg")
+    @ApiModelProperty(value="47次谐波电流含有率-平均值")
+    private Double i47Avg;
+
+    /**
+     * 47次谐波电流含有率-cp95值
+     */
+    @TableField(value = "i_47_cp95")
+    @ApiModelProperty(value="47次谐波电流含有率-cp95值")
+    private Double i47Cp95;
+
+    /**
+     * 48次谐波电流含有率-最大值
+     */
+    @TableField(value = "i_48_max")
+    @ApiModelProperty(value="48次谐波电流含有率-最大值")
+    private Double i48Max;
+
+    /**
+     * 48次谐波电流含有率-最小值
+     */
+    @TableField(value = "i_48_min")
+    @ApiModelProperty(value="48次谐波电流含有率-最小值")
+    private Double i48Min;
+
+    /**
+     * 48次谐波电流含有率-平均值
+     */
+    @TableField(value = "i_48_avg")
+    @ApiModelProperty(value="48次谐波电流含有率-平均值")
+    private Double i48Avg;
+
+    /**
+     * 48次谐波电流含有率-cp95值
+     */
+    @TableField(value = "i_48_cp95")
+    @ApiModelProperty(value="48次谐波电流含有率-cp95值")
+    private Double i48Cp95;
+
+    /**
+     * 49次谐波电流含有率-最大值
+     */
+    @TableField(value = "i_49_max")
+    @ApiModelProperty(value="49次谐波电流含有率-最大值")
+    private Double i49Max;
+
+    /**
+     * 49次谐波电流含有率-最小值
+     */
+    @TableField(value = "i_49_min")
+    @ApiModelProperty(value="49次谐波电流含有率-最小值")
+    private Double i49Min;
+
+    /**
+     * 49次谐波电流含有率-平均值
+     */
+    @TableField(value = "i_49_avg")
+    @ApiModelProperty(value="49次谐波电流含有率-平均值")
+    private Double i49Avg;
+
+    /**
+     * 49次谐波电流含有率-cp95值
+     */
+    @TableField(value = "i_49_cp95")
+    @ApiModelProperty(value="49次谐波电流含有率-cp95值")
+    private Double i49Cp95;
+
+    /**
+     * 50次谐波电流含有率-最大值
+     */
+    @TableField(value = "i_50_max")
+    @ApiModelProperty(value="50次谐波电流含有率-最大值")
+    private Double i50Max;
+
+    /**
+     * 50次谐波电流含有率-最小值
+     */
+    @TableField(value = "i_50_min")
+    @ApiModelProperty(value="50次谐波电流含有率-最小值")
+    private Double i50Min;
+
+    /**
+     * 50次谐波电流含有率-平均值
+     */
+    @TableField(value = "i_50_avg")
+    @ApiModelProperty(value="50次谐波电流含有率-平均值")
+    private Double i50Avg;
+
+    /**
+     * 50次谐波电流含有率-cp95值
+     */
+    @TableField(value = "i_50_cp95")
+    @ApiModelProperty(value="50次谐波电流含有率-cp95值")
+    private Double i50Cp95;
+}
\ No newline at end of file
diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/pojo/po/line/RMpHarmonicPReportDPO.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/pojo/po/line/RMpHarmonicPReportDPO.java
new file mode 100644
index 000000000..38094ef11
--- /dev/null
+++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/pojo/po/line/RMpHarmonicPReportDPO.java
@@ -0,0 +1,5198 @@
+package com.njcn.prepare.harmonic.pojo.po.line;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.github.jeffreyning.mybatisplus.anno.MppMultiId;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.util.Date;
+
+/**
+ * Description:
+ * 接口文档访问地址：http://serverIP:port/swagger-ui.html
+ * Date: 2022/10/25  10:33【需求编号】
+ *
+ * @author clam
+ * @version V1.0.0
+ */
+@ApiModel(value = "com-njcn-prepare-harmonic-pojo-po-line-RMpHarmonicPReportDPO")
+@TableName(value = "r_mp_harmonic_p_report_d")
+public class RMpHarmonicPReportDPO {
+
+
+    /**
+     * 监测点ID
+     */
+    @MppMultiId(value = "measurement_point_id")
+    @ApiModelProperty(value = "监测点ID")
+    private String measurementPointId;
+
+    /**
+     * 生成数据的时间,每日统计一次
+     */
+    @MppMultiId(value = "data_date")
+    @ApiModelProperty(value = "生成数据的时间,每日统计一次")
+    private Date dataDate;
+
+    /**
+     * 相别："A" "B" "C" "ABC" "T"  配网部分相别的数据采用T标志存储
+     */
+    @MppMultiId(value = "phase")
+    @ApiModelProperty(value = "相别：'A' 'B' 'C' 'ABC' 'T'  配网部分相别的数据采用T标志存储")
+    private String phase;
+
+    /**
+     * 基波无功功率-最大值
+     */
+    @TableField(value = "FUNDAMENTAL_RATEOFWORK_MAX")
+    @ApiModelProperty(value = "基波无功功率-最大值")
+    private Double fundamentalRateofworkMax;
+
+    /**
+     * 基波无功功率-最小值
+     */
+    @TableField(value = "FUNDAMENTAL_RATEOFWORK_Min")
+    @ApiModelProperty(value = "基波无功功率-最小值")
+    private Double fundamentalRateofworkMin;
+
+    /**
+     * 基波无功功率-平均值
+     */
+    @TableField(value = "FUNDAMENTAL_RATEOFWORK_avg")
+    @ApiModelProperty(value = "基波无功功率-平均值")
+    private Double fundamentalRateofworkAvg;
+
+    /**
+     * 基波无功功率-95值
+     */
+    @TableField(value = "FUNDAMENTAL_RATEOFWORK_95")
+    @ApiModelProperty(value = "基波无功功率-95值")
+    private Double fundamentalRateofwork95;
+
+    /**
+     * 基波有功功率-最大值
+     */
+    @TableField(value = "FUNDAMENTAL_ACTIVE_POWER_MAX")
+    @ApiModelProperty(value = "基波有功功率-最大值")
+    private Double fundamentalActivePowerMax;
+
+    /**
+     * 基波有功功率-最小值
+     */
+    @TableField(value = "FUNDAMENTAL_ACTIVE_POWER_Min")
+    @ApiModelProperty(value = "基波有功功率-最小值")
+    private Double fundamentalActivePowerMin;
+
+    /**
+     * 基波有功功率-平均值
+     */
+    @TableField(value = "FUNDAMENTAL_ACTIVE_POWER_avg")
+    @ApiModelProperty(value = "基波有功功率-平均值")
+    private Double fundamentalActivePowerAvg;
+
+    /**
+     * 基波有功功率-95值
+     */
+    @TableField(value = "FUNDAMENTAL_ACTIVE_POWER_95")
+    @ApiModelProperty(value = "基波有功功率-95值")
+    private Double fundamentalActivePower95;
+
+    /**
+     * 2次谐波有功功率-最大值
+     */
+    @TableField(value = "HARMONIC_ACTIVE_POWER_2_MAX")
+    @ApiModelProperty(value = "2次谐波有功功率-最大值")
+    private Double harmonicActivePower2Max;
+
+    /**
+     * 2次谐波有功功率-最小值
+     */
+    @TableField(value = "HARMONIC_ACTIVE_POWER_2_MIN")
+    @ApiModelProperty(value = "2次谐波有功功率-最小值")
+    private Double harmonicActivePower2Min;
+
+    /**
+     * 2次谐波有功功率-平均值
+     */
+    @TableField(value = "HARMONIC_ACTIVE_POWER_2_AVG")
+    @ApiModelProperty(value = "2次谐波有功功率-平均值")
+    private Double harmonicActivePower2Avg;
+
+    /**
+     * 2次谐波有功功率-95值
+     */
+    @TableField(value = "HARMONIC_ACTIVE_POWER_2_95")
+    @ApiModelProperty(value = "2次谐波有功功率-95值")
+    private Double harmonicActivePower295;
+
+    /**
+     * 3次谐波有功功率-最大值
+     */
+    @TableField(value = "HARMONIC_ACTIVE_POWER_3_MAX")
+    @ApiModelProperty(value = "3次谐波有功功率-最大值")
+    private Double harmonicActivePower3Max;
+
+    /**
+     * 3次谐波有功功率-最小值
+     */
+    @TableField(value = "HARMONIC_ACTIVE_POWER_3_MIN")
+    @ApiModelProperty(value = "3次谐波有功功率-最小值")
+    private Double harmonicActivePower3Min;
+
+    /**
+     * 3次谐波有功功率-平均值
+     */
+    @TableField(value = "HARMONIC_ACTIVE_POWER_3_AVG")
+    @ApiModelProperty(value = "3次谐波有功功率-平均值")
+    private Double harmonicActivePower3Avg;
+
+    /**
+     * 3次谐波有功功率-95值
+     */
+    @TableField(value = "HARMONIC_ACTIVE_POWER_3_95")
+    @ApiModelProperty(value = "3次谐波有功功率-95值")
+    private Double harmonicActivePower395;
+
+    /**
+     * 4次谐波有功功率-最大值
+     */
+    @TableField(value = "HARMONIC_ACTIVE_POWER_4_MAX")
+    @ApiModelProperty(value = "4次谐波有功功率-最大值")
+    private Double harmonicActivePower4Max;
+
+    /**
+     * 4次谐波有功功率-最小值
+     */
+    @TableField(value = "HARMONIC_ACTIVE_POWER_4_MIN")
+    @ApiModelProperty(value = "4次谐波有功功率-最小值")
+    private Double harmonicActivePower4Min;
+
+    /**
+     * 4次谐波有功功率-平均值
+     */
+    @TableField(value = "HARMONIC_ACTIVE_POWER_4_AVG")
+    @ApiModelProperty(value = "4次谐波有功功率-平均值")
+    private Double harmonicActivePower4Avg;
+
+    /**
+     * 4次谐波有功功率-95值
+     */
+    @TableField(value = "HARMONIC_ACTIVE_POWER_4_95")
+    @ApiModelProperty(value = "4次谐波有功功率-95值")
+    private Double harmonicActivePower495;
+
+    /**
+     * 5次谐波有功功率-最大值
+     */
+    @TableField(value = "HARMONIC_ACTIVE_POWER_5_MAX")
+    @ApiModelProperty(value = "5次谐波有功功率-最大值")
+    private Double harmonicActivePower5Max;
+
+    /**
+     * 5次谐波有功功率-最小值
+     */
+    @TableField(value = "HARMONIC_ACTIVE_POWER_5_MIN")
+    @ApiModelProperty(value = "5次谐波有功功率-最小值")
+    private Double harmonicActivePower5Min;
+
+    /**
+     * 5次谐波有功功率-平均值
+     */
+    @TableField(value = "HARMONIC_ACTIVE_POWER_5_AVG")
+    @ApiModelProperty(value = "5次谐波有功功率-平均值")
+    private Double harmonicActivePower5Avg;
+
+    /**
+     * 5次谐波有功功率-95值
+     */
+    @TableField(value = "HARMONIC_ACTIVE_POWER_5_95")
+    @ApiModelProperty(value = "5次谐波有功功率-95值")
+    private Double harmonicActivePower595;
+
+    /**
+     * 6次谐波有功功率-最大值
+     */
+    @TableField(value = "HARMONIC_ACTIVE_POWER_6_MAX")
+    @ApiModelProperty(value = "6次谐波有功功率-最大值")
+    private Double harmonicActivePower6Max;
+
+    /**
+     * 6次谐波有功功率-最小值
+     */
+    @TableField(value = "HARMONIC_ACTIVE_POWER_6_MIN")
+    @ApiModelProperty(value = "6次谐波有功功率-最小值")
+    private Double harmonicActivePower6Min;
+
+    /**
+     * 6次谐波有功功率-平均值
+     */
+    @TableField(value = "HARMONIC_ACTIVE_POWER_6_AVG")
+    @ApiModelProperty(value = "6次谐波有功功率-平均值")
+    private Double harmonicActivePower6Avg;
+
+    /**
+     * 6次谐波有功功率-95值
+     */
+    @TableField(value = "HARMONIC_ACTIVE_POWER_6_95")
+    @ApiModelProperty(value = "6次谐波有功功率-95值")
+    private Double harmonicActivePower695;
+
+    /**
+     * 7次谐波有功功率-最大值
+     */
+    @TableField(value = "HARMONIC_ACTIVE_POWER_7_MAX")
+    @ApiModelProperty(value = "7次谐波有功功率-最大值")
+    private Double harmonicActivePower7Max;
+
+    /**
+     * 7次谐波有功功率-最小值
+     */
+    @TableField(value = "HARMONIC_ACTIVE_POWER_7_MIN")
+    @ApiModelProperty(value = "7次谐波有功功率-最小值")
+    private Double harmonicActivePower7Min;
+
+    /**
+     * 7次谐波有功功率-平均值
+     */
+    @TableField(value = "HARMONIC_ACTIVE_POWER_7_AVG")
+    @ApiModelProperty(value = "7次谐波有功功率-平均值")
+    private Double harmonicActivePower7Avg;
+
+    /**
+     * 7次谐波有功功率-95值
+     */
+    @TableField(value = "HARMONIC_ACTIVE_POWER_7_95")
+    @ApiModelProperty(value = "7次谐波有功功率-95值")
+    private Double harmonicActivePower795;
+
+    /**
+     * 8次谐波有功功率-最大值
+     */
+    @TableField(value = "HARMONIC_ACTIVE_POWER_8_MAX")
+    @ApiModelProperty(value = "8次谐波有功功率-最大值")
+    private Double harmonicActivePower8Max;
+
+    /**
+     * 8次谐波有功功率-最小值
+     */
+    @TableField(value = "HARMONIC_ACTIVE_POWER_8_MIN")
+    @ApiModelProperty(value = "8次谐波有功功率-最小值")
+    private Double harmonicActivePower8Min;
+
+    /**
+     * 8次谐波有功功率-平均值
+     */
+    @TableField(value = "HARMONIC_ACTIVE_POWER_8_AVG")
+    @ApiModelProperty(value = "8次谐波有功功率-平均值")
+    private Double harmonicActivePower8Avg;
+
+    /**
+     * 8次谐波有功功率-95值
+     */
+    @TableField(value = "HARMONIC_ACTIVE_POWER_8_95")
+    @ApiModelProperty(value = "8次谐波有功功率-95值")
+    private Double harmonicActivePower895;
+
+    /**
+     * 9次谐波有功功率-最大值
+     */
+    @TableField(value = "HARMONIC_ACTIVE_POWER_9_MAX")
+    @ApiModelProperty(value = "9次谐波有功功率-最大值")
+    private Double harmonicActivePower9Max;
+
+    /**
+     * 9次谐波有功功率-最小值
+     */
+    @TableField(value = "HARMONIC_ACTIVE_POWER_9_MIN")
+    @ApiModelProperty(value = "9次谐波有功功率-最小值")
+    private Double harmonicActivePower9Min;
+
+    /**
+     * 9次谐波有功功率-平均值
+     */
+    @TableField(value = "HARMONIC_ACTIVE_POWER_9_AVG")
+    @ApiModelProperty(value = "9次谐波有功功率-平均值")
+    private Double harmonicActivePower9Avg;
+
+    /**
+     * 9次谐波有功功率-95值
+     */
+    @TableField(value = "HARMONIC_ACTIVE_POWER_9_95")
+    @ApiModelProperty(value = "9次谐波有功功率-95值")
+    private Double harmonicActivePower995;
+
+    /**
+     * 10次谐波有功功率-最大值
+     */
+    @TableField(value = "HARMONIC_ACTIVE_POWER_10_MAX")
+    @ApiModelProperty(value = "10次谐波有功功率-最大值")
+    private Double harmonicActivePower10Max;
+
+    /**
+     * 10次谐波有功功率-最小值
+     */
+    @TableField(value = "HARMONIC_ACTIVE_POWER_10_MIN")
+    @ApiModelProperty(value = "10次谐波有功功率-最小值")
+    private Double harmonicActivePower10Min;
+
+    /**
+     * 10次谐波有功功率-平均值
+     */
+    @TableField(value = "HARMONIC_ACTIVE_POWER_10_AVG")
+    @ApiModelProperty(value = "10次谐波有功功率-平均值")
+    private Double harmonicActivePower10Avg;
+
+    /**
+     * 10次谐波有功功率-95值
+     */
+    @TableField(value = "HARMONIC_ACTIVE_POWER_10_95")
+    @ApiModelProperty(value = "10次谐波有功功率-95值")
+    private Double harmonicActivePower1095;
+
+    /**
+     * 11次谐波有功功率-最大值
+     */
+    @TableField(value = "HARMONIC_ACTIVE_POWER_11_MAX")
+    @ApiModelProperty(value = "11次谐波有功功率-最大值")
+    private Double harmonicActivePower11Max;
+
+    /**
+     * 11次谐波有功功率-最小值
+     */
+    @TableField(value = "HARMONIC_ACTIVE_POWER_11_MIN")
+    @ApiModelProperty(value = "11次谐波有功功率-最小值")
+    private Double harmonicActivePower11Min;
+
+    /**
+     * 11次谐波有功功率-平均值
+     */
+    @TableField(value = "HARMONIC_ACTIVE_POWER_11_AVG")
+    @ApiModelProperty(value = "11次谐波有功功率-平均值")
+    private Double harmonicActivePower11Avg;
+
+    /**
+     * 11次谐波有功功率-95值
+     */
+    @TableField(value = "HARMONIC_ACTIVE_POWER_11_95")
+    @ApiModelProperty(value = "11次谐波有功功率-95值")
+    private Double harmonicActivePower1195;
+
+    /**
+     * 12次谐波有功功率-最大值
+     */
+    @TableField(value = "HARMONIC_ACTIVE_POWER_12_MAX")
+    @ApiModelProperty(value = "12次谐波有功功率-最大值")
+    private Double harmonicActivePower12Max;
+
+    /**
+     * 12次谐波有功功率-最小值
+     */
+    @TableField(value = "HARMONIC_ACTIVE_POWER_12_MIN")
+    @ApiModelProperty(value = "12次谐波有功功率-最小值")
+    private Double harmonicActivePower12Min;
+
+    /**
+     * 12次谐波有功功率-平均值
+     */
+    @TableField(value = "HARMONIC_ACTIVE_POWER_12_AVG")
+    @ApiModelProperty(value = "12次谐波有功功率-平均值")
+    private Double harmonicActivePower12Avg;
+
+    /**
+     * 12次谐波有功功率-95值
+     */
+    @TableField(value = "HARMONIC_ACTIVE_POWER_12_95")
+    @ApiModelProperty(value = "12次谐波有功功率-95值")
+    private Double harmonicActivePower1295;
+
+    /**
+     * 13次谐波有功功率-最大值
+     */
+    @TableField(value = "HARMONIC_ACTIVE_POWER_13_MAX")
+    @ApiModelProperty(value = "13次谐波有功功率-最大值")
+    private Double harmonicActivePower13Max;
+
+    /**
+     * 13次谐波有功功率-最小值
+     */
+    @TableField(value = "HARMONIC_ACTIVE_POWER_13_MIN")
+    @ApiModelProperty(value = "13次谐波有功功率-最小值")
+    private Double harmonicActivePower13Min;
+
+    /**
+     * 13次谐波有功功率-平均值
+     */
+    @TableField(value = "HARMONIC_ACTIVE_POWER_13_AVG")
+    @ApiModelProperty(value = "13次谐波有功功率-平均值")
+    private Double harmonicActivePower13Avg;
+
+    /**
+     * 13次谐波有功功率-95值
+     */
+    @TableField(value = "HARMONIC_ACTIVE_POWER_13_95")
+    @ApiModelProperty(value = "13次谐波有功功率-95值")
+    private Double harmonicActivePower1395;
+
+    /**
+     * 14次谐波有功功率-最大值
+     */
+    @TableField(value = "HARMONIC_ACTIVE_POWER_14_MAX")
+    @ApiModelProperty(value = "14次谐波有功功率-最大值")
+    private Double harmonicActivePower14Max;
+
+    /**
+     * 14次谐波有功功率-最小值
+     */
+    @TableField(value = "HARMONIC_ACTIVE_POWER_14_MIN")
+    @ApiModelProperty(value = "14次谐波有功功率-最小值")
+    private Double harmonicActivePower14Min;
+
+    /**
+     * 14次谐波有功功率-平均值
+     */
+    @TableField(value = "HARMONIC_ACTIVE_POWER_14_AVG")
+    @ApiModelProperty(value = "14次谐波有功功率-平均值")
+    private Double harmonicActivePower14Avg;
+
+    /**
+     * 14次谐波有功功率-95值
+     */
+    @TableField(value = "HARMONIC_ACTIVE_POWER_14_95")
+    @ApiModelProperty(value = "14次谐波有功功率-95值")
+    private Double harmonicActivePower1495;
+
+    /**
+     * 15次谐波有功功率-最大值
+     */
+    @TableField(value = "HARMONIC_ACTIVE_POWER_15_MAX")
+    @ApiModelProperty(value = "15次谐波有功功率-最大值")
+    private Double harmonicActivePower15Max;
+
+    /**
+     * 15次谐波有功功率-最小值
+     */
+    @TableField(value = "HARMONIC_ACTIVE_POWER_15_MIN")
+    @ApiModelProperty(value = "15次谐波有功功率-最小值")
+    private Double harmonicActivePower15Min;
+
+    /**
+     * 15次谐波有功功率-平均值
+     */
+    @TableField(value = "HARMONIC_ACTIVE_POWER_15_AVG")
+    @ApiModelProperty(value = "15次谐波有功功率-平均值")
+    private Double harmonicActivePower15Avg;
+
+    /**
+     * 15次谐波有功功率-95值
+     */
+    @TableField(value = "HARMONIC_ACTIVE_POWER_15_95")
+    @ApiModelProperty(value = "15次谐波有功功率-95值")
+    private Double harmonicActivePower1595;
+
+    /**
+     * 16次谐波有功功率-最大值
+     */
+    @TableField(value = "HARMONIC_ACTIVE_POWER_16_MAX")
+    @ApiModelProperty(value = "16次谐波有功功率-最大值")
+    private Double harmonicActivePower16Max;
+
+    /**
+     * 16次谐波有功功率-最小值
+     */
+    @TableField(value = "HARMONIC_ACTIVE_POWER_16_MIN")
+    @ApiModelProperty(value = "16次谐波有功功率-最小值")
+    private Double harmonicActivePower16Min;
+
+    /**
+     * 16次谐波有功功率-平均值
+     */
+    @TableField(value = "HARMONIC_ACTIVE_POWER_16_AVG")
+    @ApiModelProperty(value = "16次谐波有功功率-平均值")
+    private Double harmonicActivePower16Avg;
+
+    /**
+     * 16次谐波有功功率-95值
+     */
+    @TableField(value = "HARMONIC_ACTIVE_POWER_16_95")
+    @ApiModelProperty(value = "16次谐波有功功率-95值")
+    private Double harmonicActivePower1695;
+
+    /**
+     * 17次谐波有功功率-最大值
+     */
+    @TableField(value = "HARMONIC_ACTIVE_POWER_17_MAX")
+    @ApiModelProperty(value = "17次谐波有功功率-最大值")
+    private Double harmonicActivePower17Max;
+
+    /**
+     * 17次谐波有功功率-最小值
+     */
+    @TableField(value = "HARMONIC_ACTIVE_POWER_17_MIN")
+    @ApiModelProperty(value = "17次谐波有功功率-最小值")
+    private Double harmonicActivePower17Min;
+
+    /**
+     * 17次谐波有功功率-平均值
+     */
+    @TableField(value = "HARMONIC_ACTIVE_POWER_17_AVG")
+    @ApiModelProperty(value = "17次谐波有功功率-平均值")
+    private Double harmonicActivePower17Avg;
+
+    /**
+     * 17次谐波有功功率-95值
+     */
+    @TableField(value = "HARMONIC_ACTIVE_POWER_17_95")
+    @ApiModelProperty(value = "17次谐波有功功率-95值")
+    private Double harmonicActivePower1795;
+
+    /**
+     * 18次谐波有功功率-最大值
+     */
+    @TableField(value = "HARMONIC_ACTIVE_POWER_18_MAX")
+    @ApiModelProperty(value = "18次谐波有功功率-最大值")
+    private Double harmonicActivePower18Max;
+
+    /**
+     * 18次谐波有功功率-最小值
+     */
+    @TableField(value = "HARMONIC_ACTIVE_POWER_18_MIN")
+    @ApiModelProperty(value = "18次谐波有功功率-最小值")
+    private Double harmonicActivePower18Min;
+
+    /**
+     * 18次谐波有功功率-平均值
+     */
+    @TableField(value = "HARMONIC_ACTIVE_POWER_18_AVG")
+    @ApiModelProperty(value = "18次谐波有功功率-平均值")
+    private Double harmonicActivePower18Avg;
+
+    /**
+     * 18次谐波有功功率-95值
+     */
+    @TableField(value = "HARMONIC_ACTIVE_POWER_18_95")
+    @ApiModelProperty(value = "18次谐波有功功率-95值")
+    private Double harmonicActivePower1895;
+
+    /**
+     * 19次谐波有功功率-最大值
+     */
+    @TableField(value = "HARMONIC_ACTIVE_POWER_19_MAX")
+    @ApiModelProperty(value = "19次谐波有功功率-最大值")
+    private Double harmonicActivePower19Max;
+
+    /**
+     * 19次谐波有功功率-最小值
+     */
+    @TableField(value = "HARMONIC_ACTIVE_POWER_19_MIN")
+    @ApiModelProperty(value = "19次谐波有功功率-最小值")
+    private Double harmonicActivePower19Min;
+
+    /**
+     * 19次谐波有功功率-平均值
+     */
+    @TableField(value = "HARMONIC_ACTIVE_POWER_19_AVG")
+    @ApiModelProperty(value = "19次谐波有功功率-平均值")
+    private Double harmonicActivePower19Avg;
+
+    /**
+     * 19次谐波有功功率-95值
+     */
+    @TableField(value = "HARMONIC_ACTIVE_POWER_19_95")
+    @ApiModelProperty(value = "19次谐波有功功率-95值")
+    private Double harmonicActivePower1995;
+
+    /**
+     * 20次谐波有功功率-最大值
+     */
+    @TableField(value = "HARMONIC_ACTIVE_POWER_20_MAX")
+    @ApiModelProperty(value = "20次谐波有功功率-最大值")
+    private Double harmonicActivePower20Max;
+
+    /**
+     * 20次谐波有功功率-最小值
+     */
+    @TableField(value = "HARMONIC_ACTIVE_POWER_20_MIN")
+    @ApiModelProperty(value = "20次谐波有功功率-最小值")
+    private Double harmonicActivePower20Min;
+
+    /**
+     * 20次谐波有功功率-平均值
+     */
+    @TableField(value = "HARMONIC_ACTIVE_POWER_20_AVG")
+    @ApiModelProperty(value = "20次谐波有功功率-平均值")
+    private Double harmonicActivePower20Avg;
+
+    /**
+     * 20次谐波有功功率-95值
+     */
+    @TableField(value = "HARMONIC_ACTIVE_POWER_20_95")
+    @ApiModelProperty(value = "20次谐波有功功率-95值")
+    private Double harmonicActivePower2095;
+
+    /**
+     * 21次谐波有功功率-最大值
+     */
+    @TableField(value = "HARMONIC_ACTIVE_POWER_21_MAX")
+    @ApiModelProperty(value = "21次谐波有功功率-最大值")
+    private Double harmonicActivePower21Max;
+
+    /**
+     * 21次谐波有功功率-最小值
+     */
+    @TableField(value = "HARMONIC_ACTIVE_POWER_21_MIN")
+    @ApiModelProperty(value = "21次谐波有功功率-最小值")
+    private Double harmonicActivePower21Min;
+
+    /**
+     * 21次谐波有功功率-平均值
+     */
+    @TableField(value = "HARMONIC_ACTIVE_POWER_21_AVG")
+    @ApiModelProperty(value = "21次谐波有功功率-平均值")
+    private Double harmonicActivePower21Avg;
+
+    /**
+     * 21次谐波有功功率-95值
+     */
+    @TableField(value = "HARMONIC_ACTIVE_POWER_21_95")
+    @ApiModelProperty(value = "21次谐波有功功率-95值")
+    private Double harmonicActivePower2195;
+
+    /**
+     * 22次谐波有功功率-最大值
+     */
+    @TableField(value = "HARMONIC_ACTIVE_POWER_22_MAX")
+    @ApiModelProperty(value = "22次谐波有功功率-最大值")
+    private Double harmonicActivePower22Max;
+
+    /**
+     * 22次谐波有功功率-最小值
+     */
+    @TableField(value = "HARMONIC_ACTIVE_POWER_22_MIN")
+    @ApiModelProperty(value = "22次谐波有功功率-最小值")
+    private Double harmonicActivePower22Min;
+
+    /**
+     * 22次谐波有功功率-平均值
+     */
+    @TableField(value = "HARMONIC_ACTIVE_POWER_22_AVG")
+    @ApiModelProperty(value = "22次谐波有功功率-平均值")
+    private Double harmonicActivePower22Avg;
+
+    /**
+     * 22次谐波有功功率-95值
+     */
+    @TableField(value = "HARMONIC_ACTIVE_POWER_22_95")
+    @ApiModelProperty(value = "22次谐波有功功率-95值")
+    private Double harmonicActivePower2295;
+
+    /**
+     * 23次谐波有功功率-最大值
+     */
+    @TableField(value = "HARMONIC_ACTIVE_POWER_23_MAX")
+    @ApiModelProperty(value = "23次谐波有功功率-最大值")
+    private Double harmonicActivePower23Max;
+
+    /**
+     * 23次谐波有功功率-最小值
+     */
+    @TableField(value = "HARMONIC_ACTIVE_POWER_23_MIN")
+    @ApiModelProperty(value = "23次谐波有功功率-最小值")
+    private Double harmonicActivePower23Min;
+
+    /**
+     * 23次谐波有功功率-平均值
+     */
+    @TableField(value = "HARMONIC_ACTIVE_POWER_23_AVG")
+    @ApiModelProperty(value = "23次谐波有功功率-平均值")
+    private Double harmonicActivePower23Avg;
+
+    /**
+     * 23次谐波有功功率-95值
+     */
+    @TableField(value = "HARMONIC_ACTIVE_POWER_23_95")
+    @ApiModelProperty(value = "23次谐波有功功率-95值")
+    private Double harmonicActivePower2395;
+
+    /**
+     * 24次谐波有功功率-最大值
+     */
+    @TableField(value = "HARMONIC_ACTIVE_POWER_24_MAX")
+    @ApiModelProperty(value = "24次谐波有功功率-最大值")
+    private Double harmonicActivePower24Max;
+
+    /**
+     * 24次谐波有功功率-最小值
+     */
+    @TableField(value = "HARMONIC_ACTIVE_POWER_24_MIN")
+    @ApiModelProperty(value = "24次谐波有功功率-最小值")
+    private Double harmonicActivePower24Min;
+
+    /**
+     * 24次谐波有功功率-平均值
+     */
+    @TableField(value = "HARMONIC_ACTIVE_POWER_24_AVG")
+    @ApiModelProperty(value = "24次谐波有功功率-平均值")
+    private Double harmonicActivePower24Avg;
+
+    /**
+     * 24次谐波有功功率-95值
+     */
+    @TableField(value = "HARMONIC_ACTIVE_POWER_24_95")
+    @ApiModelProperty(value = "24次谐波有功功率-95值")
+    private Double harmonicActivePower2495;
+
+    /**
+     * 25次谐波有功功率-最大值
+     */
+    @TableField(value = "HARMONIC_ACTIVE_POWER_25_MAX")
+    @ApiModelProperty(value = "25次谐波有功功率-最大值")
+    private Double harmonicActivePower25Max;
+
+    /**
+     * 25次谐波有功功率-最小值
+     */
+    @TableField(value = "HARMONIC_ACTIVE_POWER_25_MIN")
+    @ApiModelProperty(value = "25次谐波有功功率-最小值")
+    private Double harmonicActivePower25Min;
+
+    /**
+     * 25次谐波有功功率-平均值
+     */
+    @TableField(value = "HARMONIC_ACTIVE_POWER_25_AVG")
+    @ApiModelProperty(value = "25次谐波有功功率-平均值")
+    private Double harmonicActivePower25Avg;
+
+    /**
+     * 25次谐波有功功率-95值
+     */
+    @TableField(value = "HARMONIC_ACTIVE_POWER_25_95")
+    @ApiModelProperty(value = "25次谐波有功功率-95值")
+    private Double harmonicActivePower2595;
+
+    /**
+     * 26次谐波有功功率-最大值
+     */
+    @TableField(value = "HARMONIC_ACTIVE_POWER_26_MAX")
+    @ApiModelProperty(value = "26次谐波有功功率-最大值")
+    private Double harmonicActivePower26Max;
+
+    /**
+     * 26次谐波有功功率-最小值
+     */
+    @TableField(value = "HARMONIC_ACTIVE_POWER_26_MIN")
+    @ApiModelProperty(value = "26次谐波有功功率-最小值")
+    private Double harmonicActivePower26Min;
+
+    /**
+     * 26次谐波有功功率-平均值
+     */
+    @TableField(value = "HARMONIC_ACTIVE_POWER_26_AVG")
+    @ApiModelProperty(value = "26次谐波有功功率-平均值")
+    private Double harmonicActivePower26Avg;
+
+    /**
+     * 26次谐波有功功率-95值
+     */
+    @TableField(value = "HARMONIC_ACTIVE_POWER_26_95")
+    @ApiModelProperty(value = "26次谐波有功功率-95值")
+    private Double harmonicActivePower2695;
+
+    /**
+     * 27次谐波有功功率-最大值
+     */
+    @TableField(value = "HARMONIC_ACTIVE_POWER_27_MAX")
+    @ApiModelProperty(value = "27次谐波有功功率-最大值")
+    private Double harmonicActivePower27Max;
+
+    /**
+     * 27次谐波有功功率-最小值
+     */
+    @TableField(value = "HARMONIC_ACTIVE_POWER_27_MIN")
+    @ApiModelProperty(value = "27次谐波有功功率-最小值")
+    private Double harmonicActivePower27Min;
+
+    /**
+     * 27次谐波有功功率-平均值
+     */
+    @TableField(value = "HARMONIC_ACTIVE_POWER_27_AVG")
+    @ApiModelProperty(value = "27次谐波有功功率-平均值")
+    private Double harmonicActivePower27Avg;
+
+    /**
+     * 27次谐波有功功率-95值
+     */
+    @TableField(value = "HARMONIC_ACTIVE_POWER_27_95")
+    @ApiModelProperty(value = "27次谐波有功功率-95值")
+    private Double harmonicActivePower2795;
+
+    /**
+     * 28次谐波有功功率-最大值
+     */
+    @TableField(value = "HARMONIC_ACTIVE_POWER_28_MAX")
+    @ApiModelProperty(value = "28次谐波有功功率-最大值")
+    private Double harmonicActivePower28Max;
+
+    /**
+     * 28次谐波有功功率-最小值
+     */
+    @TableField(value = "HARMONIC_ACTIVE_POWER_28_MIN")
+    @ApiModelProperty(value = "28次谐波有功功率-最小值")
+    private Double harmonicActivePower28Min;
+
+    /**
+     * 28次谐波有功功率-平均值
+     */
+    @TableField(value = "HARMONIC_ACTIVE_POWER_28_AVG")
+    @ApiModelProperty(value = "28次谐波有功功率-平均值")
+    private Double harmonicActivePower28Avg;
+
+    /**
+     * 28次谐波有功功率-95值
+     */
+    @TableField(value = "HARMONIC_ACTIVE_POWER_28_95")
+    @ApiModelProperty(value = "28次谐波有功功率-95值")
+    private Double harmonicActivePower2895;
+
+    /**
+     * 29次谐波有功功率-最大值
+     */
+    @TableField(value = "HARMONIC_ACTIVE_POWER_29_MAX")
+    @ApiModelProperty(value = "29次谐波有功功率-最大值")
+    private Double harmonicActivePower29Max;
+
+    /**
+     * 29次谐波有功功率-最小值
+     */
+    @TableField(value = "HARMONIC_ACTIVE_POWER_29_MIN")
+    @ApiModelProperty(value = "29次谐波有功功率-最小值")
+    private Double harmonicActivePower29Min;
+
+    /**
+     * 29次谐波有功功率-平均值
+     */
+    @TableField(value = "HARMONIC_ACTIVE_POWER_29_AVG")
+    @ApiModelProperty(value = "29次谐波有功功率-平均值")
+    private Double harmonicActivePower29Avg;
+
+    /**
+     * 29次谐波有功功率-95值
+     */
+    @TableField(value = "HARMONIC_ACTIVE_POWER_29_95")
+    @ApiModelProperty(value = "29次谐波有功功率-95值")
+    private Double harmonicActivePower2995;
+
+    /**
+     * 30次谐波有功功率-最大值
+     */
+    @TableField(value = "HARMONIC_ACTIVE_POWER_30_MAX")
+    @ApiModelProperty(value = "30次谐波有功功率-最大值")
+    private Double harmonicActivePower30Max;
+
+    /**
+     * 30次谐波有功功率-最小值
+     */
+    @TableField(value = "HARMONIC_ACTIVE_POWER_30_MIN")
+    @ApiModelProperty(value = "30次谐波有功功率-最小值")
+    private Double harmonicActivePower30Min;
+
+    /**
+     * 30次谐波有功功率-平均值
+     */
+    @TableField(value = "HARMONIC_ACTIVE_POWER_30_AVG")
+    @ApiModelProperty(value = "30次谐波有功功率-平均值")
+    private Double harmonicActivePower30Avg;
+
+    /**
+     * 30次谐波有功功率-95值
+     */
+    @TableField(value = "HARMONIC_ACTIVE_POWER_30_95")
+    @ApiModelProperty(value = "30次谐波有功功率-95值")
+    private Double harmonicActivePower3095;
+
+    /**
+     * 31次谐波有功功率-最大值
+     */
+    @TableField(value = "HARMONIC_ACTIVE_POWER_31_MAX")
+    @ApiModelProperty(value = "31次谐波有功功率-最大值")
+    private Double harmonicActivePower31Max;
+
+    /**
+     * 31次谐波有功功率-最小值
+     */
+    @TableField(value = "HARMONIC_ACTIVE_POWER_31_MIN")
+    @ApiModelProperty(value = "31次谐波有功功率-最小值")
+    private Double harmonicActivePower31Min;
+
+    /**
+     * 31次谐波有功功率-平均值
+     */
+    @TableField(value = "HARMONIC_ACTIVE_POWER_31_AVG")
+    @ApiModelProperty(value = "31次谐波有功功率-平均值")
+    private Double harmonicActivePower31Avg;
+
+    /**
+     * 31次谐波有功功率-95值
+     */
+    @TableField(value = "HARMONIC_ACTIVE_POWER_31_95")
+    @ApiModelProperty(value = "31次谐波有功功率-95值")
+    private Double harmonicActivePower3195;
+
+    /**
+     * 32次谐波有功功率-最大值
+     */
+    @TableField(value = "HARMONIC_ACTIVE_POWER_32_MAX")
+    @ApiModelProperty(value = "32次谐波有功功率-最大值")
+    private Double harmonicActivePower32Max;
+
+    /**
+     * 32次谐波有功功率-最小值
+     */
+    @TableField(value = "HARMONIC_ACTIVE_POWER_32_MIN")
+    @ApiModelProperty(value = "32次谐波有功功率-最小值")
+    private Double harmonicActivePower32Min;
+
+    /**
+     * 32次谐波有功功率-平均值
+     */
+    @TableField(value = "HARMONIC_ACTIVE_POWER_32_AVG")
+    @ApiModelProperty(value = "32次谐波有功功率-平均值")
+    private Double harmonicActivePower32Avg;
+
+    /**
+     * 32次谐波有功功率-95值
+     */
+    @TableField(value = "HARMONIC_ACTIVE_POWER_32_95")
+    @ApiModelProperty(value = "32次谐波有功功率-95值")
+    private Double harmonicActivePower3295;
+
+    /**
+     * 33次谐波有功功率-最大值
+     */
+    @TableField(value = "HARMONIC_ACTIVE_POWER_33_MAX")
+    @ApiModelProperty(value = "33次谐波有功功率-最大值")
+    private Double harmonicActivePower33Max;
+
+    /**
+     * 33次谐波有功功率-最小值
+     */
+    @TableField(value = "HARMONIC_ACTIVE_POWER_33_MIN")
+    @ApiModelProperty(value = "33次谐波有功功率-最小值")
+    private Double harmonicActivePower33Min;
+
+    /**
+     * 33次谐波有功功率-平均值
+     */
+    @TableField(value = "HARMONIC_ACTIVE_POWER_33_AVG")
+    @ApiModelProperty(value = "33次谐波有功功率-平均值")
+    private Double harmonicActivePower33Avg;
+
+    /**
+     * 33次谐波有功功率-95值
+     */
+    @TableField(value = "HARMONIC_ACTIVE_POWER_33_95")
+    @ApiModelProperty(value = "33次谐波有功功率-95值")
+    private Double harmonicActivePower3395;
+
+    /**
+     * 34次谐波有功功率-最大值
+     */
+    @TableField(value = "HARMONIC_ACTIVE_POWER_34_MAX")
+    @ApiModelProperty(value = "34次谐波有功功率-最大值")
+    private Double harmonicActivePower34Max;
+
+    /**
+     * 34次谐波有功功率-最小值
+     */
+    @TableField(value = "HARMONIC_ACTIVE_POWER_34_MIN")
+    @ApiModelProperty(value = "34次谐波有功功率-最小值")
+    private Double harmonicActivePower34Min;
+
+    /**
+     * 34次谐波有功功率-平均值
+     */
+    @TableField(value = "HARMONIC_ACTIVE_POWER_34_AVG")
+    @ApiModelProperty(value = "34次谐波有功功率-平均值")
+    private Double harmonicActivePower34Avg;
+
+    /**
+     * 34次谐波有功功率-95值
+     */
+    @TableField(value = "HARMONIC_ACTIVE_POWER_34_95")
+    @ApiModelProperty(value = "34次谐波有功功率-95值")
+    private Double harmonicActivePower3495;
+
+    /**
+     * 35次谐波有功功率-最大值
+     */
+    @TableField(value = "HARMONIC_ACTIVE_POWER_35_MAX")
+    @ApiModelProperty(value = "35次谐波有功功率-最大值")
+    private Double harmonicActivePower35Max;
+
+    /**
+     * 35次谐波有功功率-最小值
+     */
+    @TableField(value = "HARMONIC_ACTIVE_POWER_35_MIN")
+    @ApiModelProperty(value = "35次谐波有功功率-最小值")
+    private Double harmonicActivePower35Min;
+
+    /**
+     * 35次谐波有功功率-平均值
+     */
+    @TableField(value = "HARMONIC_ACTIVE_POWER_35_AVG")
+    @ApiModelProperty(value = "35次谐波有功功率-平均值")
+    private Double harmonicActivePower35Avg;
+
+    /**
+     * 35次谐波有功功率-95值
+     */
+    @TableField(value = "HARMONIC_ACTIVE_POWER_35_95")
+    @ApiModelProperty(value = "35次谐波有功功率-95值")
+    private Double harmonicActivePower3595;
+
+    /**
+     * 36次谐波有功功率-最大值
+     */
+    @TableField(value = "HARMONIC_ACTIVE_POWER_36_MAX")
+    @ApiModelProperty(value = "36次谐波有功功率-最大值")
+    private Double harmonicActivePower36Max;
+
+    /**
+     * 36次谐波有功功率-最小值
+     */
+    @TableField(value = "HARMONIC_ACTIVE_POWER_36_MIN")
+    @ApiModelProperty(value = "36次谐波有功功率-最小值")
+    private Double harmonicActivePower36Min;
+
+    /**
+     * 36次谐波有功功率-平均值
+     */
+    @TableField(value = "HARMONIC_ACTIVE_POWER_36_AVG")
+    @ApiModelProperty(value = "36次谐波有功功率-平均值")
+    private Double harmonicActivePower36Avg;
+
+    /**
+     * 36次谐波有功功率-95值
+     */
+    @TableField(value = "HARMONIC_ACTIVE_POWER_36_95")
+    @ApiModelProperty(value = "36次谐波有功功率-95值")
+    private Double harmonicActivePower3695;
+
+    /**
+     * 37次谐波有功功率-最大值
+     */
+    @TableField(value = "HARMONIC_ACTIVE_POWER_37_MAX")
+    @ApiModelProperty(value = "37次谐波有功功率-最大值")
+    private Double harmonicActivePower37Max;
+
+    /**
+     * 37次谐波有功功率-最小值
+     */
+    @TableField(value = "HARMONIC_ACTIVE_POWER_37_MIN")
+    @ApiModelProperty(value = "37次谐波有功功率-最小值")
+    private Double harmonicActivePower37Min;
+
+    /**
+     * 37次谐波有功功率-平均值
+     */
+    @TableField(value = "HARMONIC_ACTIVE_POWER_37_AVG")
+    @ApiModelProperty(value = "37次谐波有功功率-平均值")
+    private Double harmonicActivePower37Avg;
+
+    /**
+     * 37次谐波有功功率-95值
+     */
+    @TableField(value = "HARMONIC_ACTIVE_POWER_37_95")
+    @ApiModelProperty(value = "37次谐波有功功率-95值")
+    private Double harmonicActivePower3795;
+
+    /**
+     * 38次谐波有功功率-最大值
+     */
+    @TableField(value = "HARMONIC_ACTIVE_POWER_38_MAX")
+    @ApiModelProperty(value = "38次谐波有功功率-最大值")
+    private Double harmonicActivePower38Max;
+
+    /**
+     * 38次谐波有功功率-最小值
+     */
+    @TableField(value = "HARMONIC_ACTIVE_POWER_38_MIN")
+    @ApiModelProperty(value = "38次谐波有功功率-最小值")
+    private Double harmonicActivePower38Min;
+
+    /**
+     * 38次谐波有功功率-平均值
+     */
+    @TableField(value = "HARMONIC_ACTIVE_POWER_38_AVG")
+    @ApiModelProperty(value = "38次谐波有功功率-平均值")
+    private Double harmonicActivePower38Avg;
+
+    /**
+     * 38次谐波有功功率-95值
+     */
+    @TableField(value = "HARMONIC_ACTIVE_POWER_38_95")
+    @ApiModelProperty(value = "38次谐波有功功率-95值")
+    private Double harmonicActivePower3895;
+
+    /**
+     * 39次谐波有功功率-最大值
+     */
+    @TableField(value = "HARMONIC_ACTIVE_POWER_39_MAX")
+    @ApiModelProperty(value = "39次谐波有功功率-最大值")
+    private Double harmonicActivePower39Max;
+
+    /**
+     * 39次谐波有功功率-最小值
+     */
+    @TableField(value = "HARMONIC_ACTIVE_POWER_39_MIN")
+    @ApiModelProperty(value = "39次谐波有功功率-最小值")
+    private Double harmonicActivePower39Min;
+
+    /**
+     * 39次谐波有功功率-平均值
+     */
+    @TableField(value = "HARMONIC_ACTIVE_POWER_39_AVG")
+    @ApiModelProperty(value = "39次谐波有功功率-平均值")
+    private Double harmonicActivePower39Avg;
+
+    /**
+     * 39次谐波有功功率-95值
+     */
+    @TableField(value = "HARMONIC_ACTIVE_POWER_39_95")
+    @ApiModelProperty(value = "39次谐波有功功率-95值")
+    private Double harmonicActivePower3995;
+
+    /**
+     * 40次谐波有功功率-最大值
+     */
+    @TableField(value = "HARMONIC_ACTIVE_POWER_40_MAX")
+    @ApiModelProperty(value = "40次谐波有功功率-最大值")
+    private Double harmonicActivePower40Max;
+
+    /**
+     * 40次谐波有功功率-最小值
+     */
+    @TableField(value = "HARMONIC_ACTIVE_POWER_40_MIN")
+    @ApiModelProperty(value = "40次谐波有功功率-最小值")
+    private Double harmonicActivePower40Min;
+
+    /**
+     * 40次谐波有功功率-平均值
+     */
+    @TableField(value = "HARMONIC_ACTIVE_POWER_40_AVG")
+    @ApiModelProperty(value = "40次谐波有功功率-平均值")
+    private Double harmonicActivePower40Avg;
+
+    /**
+     * 40次谐波有功功率-95值
+     */
+    @TableField(value = "HARMONIC_ACTIVE_POWER_40_95")
+    @ApiModelProperty(value = "40次谐波有功功率-95值")
+    private Double harmonicActivePower4095;
+
+    /**
+     * 41次谐波有功功率-最大值
+     */
+    @TableField(value = "HARMONIC_ACTIVE_POWER_41_MAX")
+    @ApiModelProperty(value = "41次谐波有功功率-最大值")
+    private Double harmonicActivePower41Max;
+
+    /**
+     * 41次谐波有功功率-最小值
+     */
+    @TableField(value = "HARMONIC_ACTIVE_POWER_41_MIN")
+    @ApiModelProperty(value = "41次谐波有功功率-最小值")
+    private Double harmonicActivePower41Min;
+
+    /**
+     * 41次谐波有功功率-平均值
+     */
+    @TableField(value = "HARMONIC_ACTIVE_POWER_41_AVG")
+    @ApiModelProperty(value = "41次谐波有功功率-平均值")
+    private Double harmonicActivePower41Avg;
+
+    /**
+     * 41次谐波有功功率-95值
+     */
+    @TableField(value = "HARMONIC_ACTIVE_POWER_41_95")
+    @ApiModelProperty(value = "41次谐波有功功率-95值")
+    private Double harmonicActivePower4195;
+
+    /**
+     * 42次谐波有功功率-最大值
+     */
+    @TableField(value = "HARMONIC_ACTIVE_POWER_42_MAX")
+    @ApiModelProperty(value = "42次谐波有功功率-最大值")
+    private Double harmonicActivePower42Max;
+
+    /**
+     * 42次谐波有功功率-最小值
+     */
+    @TableField(value = "HARMONIC_ACTIVE_POWER_42_MIN")
+    @ApiModelProperty(value = "42次谐波有功功率-最小值")
+    private Double harmonicActivePower42Min;
+
+    /**
+     * 42次谐波有功功率-平均值
+     */
+    @TableField(value = "HARMONIC_ACTIVE_POWER_42_AVG")
+    @ApiModelProperty(value = "42次谐波有功功率-平均值")
+    private Double harmonicActivePower42Avg;
+
+    /**
+     * 42次谐波有功功率-95值
+     */
+    @TableField(value = "HARMONIC_ACTIVE_POWER_42_95")
+    @ApiModelProperty(value = "42次谐波有功功率-95值")
+    private Double harmonicActivePower4295;
+
+    /**
+     * 43次谐波有功功率-最大值
+     */
+    @TableField(value = "HARMONIC_ACTIVE_POWER_43_MAX")
+    @ApiModelProperty(value = "43次谐波有功功率-最大值")
+    private Double harmonicActivePower43Max;
+
+    /**
+     * 43次谐波有功功率-最小值
+     */
+    @TableField(value = "HARMONIC_ACTIVE_POWER_43_MIN")
+    @ApiModelProperty(value = "43次谐波有功功率-最小值")
+    private Double harmonicActivePower43Min;
+
+    /**
+     * 43次谐波有功功率-平均值
+     */
+    @TableField(value = "HARMONIC_ACTIVE_POWER_43_AVG")
+    @ApiModelProperty(value = "43次谐波有功功率-平均值")
+    private Double harmonicActivePower43Avg;
+
+    /**
+     * 43次谐波有功功率-95值
+     */
+    @TableField(value = "HARMONIC_ACTIVE_POWER_43_95")
+    @ApiModelProperty(value = "43次谐波有功功率-95值")
+    private Double harmonicActivePower4395;
+
+    /**
+     * 44次谐波有功功率-最大值
+     */
+    @TableField(value = "HARMONIC_ACTIVE_POWER_44_MAX")
+    @ApiModelProperty(value = "44次谐波有功功率-最大值")
+    private Double harmonicActivePower44Max;
+
+    /**
+     * 44次谐波有功功率-最小值
+     */
+    @TableField(value = "HARMONIC_ACTIVE_POWER_44_MIN")
+    @ApiModelProperty(value = "44次谐波有功功率-最小值")
+    private Double harmonicActivePower44Min;
+
+    /**
+     * 44次谐波有功功率-平均值
+     */
+    @TableField(value = "HARMONIC_ACTIVE_POWER_44_AVG")
+    @ApiModelProperty(value = "44次谐波有功功率-平均值")
+    private Double harmonicActivePower44Avg;
+
+    /**
+     * 44次谐波有功功率-95值
+     */
+    @TableField(value = "HARMONIC_ACTIVE_POWER_44_95")
+    @ApiModelProperty(value = "44次谐波有功功率-95值")
+    private Double harmonicActivePower4495;
+
+    /**
+     * 45次谐波有功功率-最大值
+     */
+    @TableField(value = "HARMONIC_ACTIVE_POWER_45_MAX")
+    @ApiModelProperty(value = "45次谐波有功功率-最大值")
+    private Double harmonicActivePower45Max;
+
+    /**
+     * 45次谐波有功功率-最小值
+     */
+    @TableField(value = "HARMONIC_ACTIVE_POWER_45_MIN")
+    @ApiModelProperty(value = "45次谐波有功功率-最小值")
+    private Double harmonicActivePower45Min;
+
+    /**
+     * 45次谐波有功功率-平均值
+     */
+    @TableField(value = "HARMONIC_ACTIVE_POWER_45_AVG")
+    @ApiModelProperty(value = "45次谐波有功功率-平均值")
+    private Double harmonicActivePower45Avg;
+
+    /**
+     * 45次谐波有功功率-95值
+     */
+    @TableField(value = "HARMONIC_ACTIVE_POWER_45_95")
+    @ApiModelProperty(value = "45次谐波有功功率-95值")
+    private Double harmonicActivePower4595;
+
+    /**
+     * 46次谐波有功功率-最大值
+     */
+    @TableField(value = "HARMONIC_ACTIVE_POWER_46_MAX")
+    @ApiModelProperty(value = "46次谐波有功功率-最大值")
+    private Double harmonicActivePower46Max;
+
+    /**
+     * 46次谐波有功功率-最小值
+     */
+    @TableField(value = "HARMONIC_ACTIVE_POWER_46_MIN")
+    @ApiModelProperty(value = "46次谐波有功功率-最小值")
+    private Double harmonicActivePower46Min;
+
+    /**
+     * 46次谐波有功功率-平均值
+     */
+    @TableField(value = "HARMONIC_ACTIVE_POWER_46_AVG")
+    @ApiModelProperty(value = "46次谐波有功功率-平均值")
+    private Double harmonicActivePower46Avg;
+
+    /**
+     * 46次谐波有功功率-95值
+     */
+    @TableField(value = "HARMONIC_ACTIVE_POWER_46_95")
+    @ApiModelProperty(value = "46次谐波有功功率-95值")
+    private Double harmonicActivePower4695;
+
+    /**
+     * 47次谐波有功功率-最大值
+     */
+    @TableField(value = "HARMONIC_ACTIVE_POWER_47_MAX")
+    @ApiModelProperty(value = "47次谐波有功功率-最大值")
+    private Double harmonicActivePower47Max;
+
+    /**
+     * 47次谐波有功功率-最小值
+     */
+    @TableField(value = "HARMONIC_ACTIVE_POWER_47_MIN")
+    @ApiModelProperty(value = "47次谐波有功功率-最小值")
+    private Double harmonicActivePower47Min;
+
+    /**
+     * 47次谐波有功功率-平均值
+     */
+    @TableField(value = "HARMONIC_ACTIVE_POWER_47_AVG")
+    @ApiModelProperty(value = "47次谐波有功功率-平均值")
+    private Double harmonicActivePower47Avg;
+
+    /**
+     * 47次谐波有功功率-95值
+     */
+    @TableField(value = "HARMONIC_ACTIVE_POWER_47_95")
+    @ApiModelProperty(value = "47次谐波有功功率-95值")
+    private Double harmonicActivePower4795;
+
+    /**
+     * 48次谐波有功功率-最大值
+     */
+    @TableField(value = "HARMONIC_ACTIVE_POWER_48_MAX")
+    @ApiModelProperty(value = "48次谐波有功功率-最大值")
+    private Double harmonicActivePower48Max;
+
+    /**
+     * 48次谐波有功功率-最小值
+     */
+    @TableField(value = "HARMONIC_ACTIVE_POWER_48_MIN")
+    @ApiModelProperty(value = "48次谐波有功功率-最小值")
+    private Double harmonicActivePower48Min;
+
+    /**
+     * 48次谐波有功功率-平均值
+     */
+    @TableField(value = "HARMONIC_ACTIVE_POWER_48_AVG")
+    @ApiModelProperty(value = "48次谐波有功功率-平均值")
+    private Double harmonicActivePower48Avg;
+
+    /**
+     * 48次谐波有功功率-95值
+     */
+    @TableField(value = "HARMONIC_ACTIVE_POWER_48_95")
+    @ApiModelProperty(value = "48次谐波有功功率-95值")
+    private Double harmonicActivePower4895;
+
+    /**
+     * 49次谐波有功功率-最大值
+     */
+    @TableField(value = "HARMONIC_ACTIVE_POWER_49_MAX")
+    @ApiModelProperty(value = "49次谐波有功功率-最大值")
+    private Double harmonicActivePower49Max;
+
+    /**
+     * 49次谐波有功功率-最小值
+     */
+    @TableField(value = "HARMONIC_ACTIVE_POWER_49_MIN")
+    @ApiModelProperty(value = "49次谐波有功功率-最小值")
+    private Double harmonicActivePower49Min;
+
+    /**
+     * 49次谐波有功功率-平均值
+     */
+    @TableField(value = "HARMONIC_ACTIVE_POWER_49_AVG")
+    @ApiModelProperty(value = "49次谐波有功功率-平均值")
+    private Double harmonicActivePower49Avg;
+
+    /**
+     * 49次谐波有功功率-95值
+     */
+    @TableField(value = "HARMONIC_ACTIVE_POWER_49_95")
+    @ApiModelProperty(value = "49次谐波有功功率-95值")
+    private Double harmonicActivePower4995;
+
+    /**
+     * 50次谐波有功功率-最大值
+     */
+    @TableField(value = "HARMONIC_ACTIVE_POWER_50_MAX")
+    @ApiModelProperty(value = "50次谐波有功功率-最大值")
+    private Double harmonicActivePower50Max;
+
+    /**
+     * 50次谐波有功功率-最小值
+     */
+    @TableField(value = "HARMONIC_ACTIVE_POWER_50_MIN")
+    @ApiModelProperty(value = "50次谐波有功功率-最小值")
+    private Double harmonicActivePower50Min;
+
+    /**
+     * 50次谐波有功功率-平均值
+     */
+    @TableField(value = "HARMONIC_ACTIVE_POWER_50_AVG")
+    @ApiModelProperty(value = "50次谐波有功功率-平均值")
+    private Double harmonicActivePower50Avg;
+
+    /**
+     * 50次谐波有功功率-95值
+     */
+    @TableField(value = "HARMONIC_ACTIVE_POWER_50_95")
+    @ApiModelProperty(value = "50次谐波有功功率-95值")
+    private Double harmonicActivePower5095;
+
+    /**
+     * 获取监测点ID
+     *
+     * @return measurement_point_id - 监测点ID
+     */
+    public String getMeasurementPointId() {
+        return measurementPointId;
+    }
+
+    /**
+     * 设置监测点ID
+     *
+     * @param measurementPointId 监测点ID
+     */
+    public void setMeasurementPointId(String measurementPointId) {
+        this.measurementPointId = measurementPointId;
+    }
+
+    /**
+     * 获取生成数据的时间,每日统计一次
+     *
+     * @return data_date - 生成数据的时间,每日统计一次
+     */
+    public Date getDataDate() {
+        return dataDate;
+    }
+
+    /**
+     * 设置生成数据的时间,每日统计一次
+     *
+     * @param dataDate 生成数据的时间,每日统计一次
+     */
+    public void setDataDate(Date dataDate) {
+        this.dataDate = dataDate;
+    }
+
+    /**
+     * 获取相别："A" "B" "C" "ABC" "T"  配网部分相别的数据采用T标志存储
+     *
+     * @return phase - 相别："A" "B" "C" "ABC" "T"  配网部分相别的数据采用T标志存储
+     */
+    public String getPhase() {
+        return phase;
+    }
+
+    /**
+     * 设置相别："A" "B" "C" "ABC" "T"  配网部分相别的数据采用T标志存储
+     *
+     * @param phase 相别："A" "B" "C" "ABC" "T"  配网部分相别的数据采用T标志存储
+     */
+    public void setPhase(String phase) {
+        this.phase = phase;
+    }
+
+    /**
+     * 获取基波无功功率-最大值
+     *
+     * @return FUNDAMENTAL_RATEOFWORK_MAX - 基波无功功率-最大值
+     */
+    public Double getFundamentalRateofworkMax() {
+        return fundamentalRateofworkMax;
+    }
+
+    /**
+     * 设置基波无功功率-最大值
+     *
+     * @param fundamentalRateofworkMax 基波无功功率-最大值
+     */
+    public void setFundamentalRateofworkMax(Double fundamentalRateofworkMax) {
+        this.fundamentalRateofworkMax = fundamentalRateofworkMax;
+    }
+
+    /**
+     * 获取基波无功功率-最小值
+     *
+     * @return FUNDAMENTAL_RATEOFWORK_Min - 基波无功功率-最小值
+     */
+    public Double getFundamentalRateofworkMin() {
+        return fundamentalRateofworkMin;
+    }
+
+    /**
+     * 设置基波无功功率-最小值
+     *
+     * @param fundamentalRateofworkMin 基波无功功率-最小值
+     */
+    public void setFundamentalRateofworkMin(Double fundamentalRateofworkMin) {
+        this.fundamentalRateofworkMin = fundamentalRateofworkMin;
+    }
+
+    /**
+     * 获取基波无功功率-平均值
+     *
+     * @return FUNDAMENTAL_RATEOFWORK_avg - 基波无功功率-平均值
+     */
+    public Double getFundamentalRateofworkAvg() {
+        return fundamentalRateofworkAvg;
+    }
+
+    /**
+     * 设置基波无功功率-平均值
+     *
+     * @param fundamentalRateofworkAvg 基波无功功率-平均值
+     */
+    public void setFundamentalRateofworkAvg(Double fundamentalRateofworkAvg) {
+        this.fundamentalRateofworkAvg = fundamentalRateofworkAvg;
+    }
+
+    /**
+     * 获取基波无功功率-95值
+     *
+     * @return FUNDAMENTAL_RATEOFWORK_95 - 基波无功功率-95值
+     */
+    public Double getFundamentalRateofwork95() {
+        return fundamentalRateofwork95;
+    }
+
+    /**
+     * 设置基波无功功率-95值
+     *
+     * @param fundamentalRateofwork95 基波无功功率-95值
+     */
+    public void setFundamentalRateofwork95(Double fundamentalRateofwork95) {
+        this.fundamentalRateofwork95 = fundamentalRateofwork95;
+    }
+
+    /**
+     * 获取基波有功功率-最大值
+     *
+     * @return FUNDAMENTAL_ACTIVE_POWER_MAX - 基波有功功率-最大值
+     */
+    public Double getFundamentalActivePowerMax() {
+        return fundamentalActivePowerMax;
+    }
+
+    /**
+     * 设置基波有功功率-最大值
+     *
+     * @param fundamentalActivePowerMax 基波有功功率-最大值
+     */
+    public void setFundamentalActivePowerMax(Double fundamentalActivePowerMax) {
+        this.fundamentalActivePowerMax = fundamentalActivePowerMax;
+    }
+
+    /**
+     * 获取基波有功功率-最小值
+     *
+     * @return FUNDAMENTAL_ACTIVE_POWER_Min - 基波有功功率-最小值
+     */
+    public Double getFundamentalActivePowerMin() {
+        return fundamentalActivePowerMin;
+    }
+
+    /**
+     * 设置基波有功功率-最小值
+     *
+     * @param fundamentalActivePowerMin 基波有功功率-最小值
+     */
+    public void setFundamentalActivePowerMin(Double fundamentalActivePowerMin) {
+        this.fundamentalActivePowerMin = fundamentalActivePowerMin;
+    }
+
+    /**
+     * 获取基波有功功率-平均值
+     *
+     * @return FUNDAMENTAL_ACTIVE_POWER_avg - 基波有功功率-平均值
+     */
+    public Double getFundamentalActivePowerAvg() {
+        return fundamentalActivePowerAvg;
+    }
+
+    /**
+     * 设置基波有功功率-平均值
+     *
+     * @param fundamentalActivePowerAvg 基波有功功率-平均值
+     */
+    public void setFundamentalActivePowerAvg(Double fundamentalActivePowerAvg) {
+        this.fundamentalActivePowerAvg = fundamentalActivePowerAvg;
+    }
+
+    /**
+     * 获取基波有功功率-95值
+     *
+     * @return FUNDAMENTAL_ACTIVE_POWER_95 - 基波有功功率-95值
+     */
+    public Double getFundamentalActivePower95() {
+        return fundamentalActivePower95;
+    }
+
+    /**
+     * 设置基波有功功率-95值
+     *
+     * @param fundamentalActivePower95 基波有功功率-95值
+     */
+    public void setFundamentalActivePower95(Double fundamentalActivePower95) {
+        this.fundamentalActivePower95 = fundamentalActivePower95;
+    }
+
+    /**
+     * 获取2次谐波有功功率-最大值
+     *
+     * @return HARMONIC_ACTIVE_POWER_2_MAX - 2次谐波有功功率-最大值
+     */
+    public Double getHarmonicActivePower2Max() {
+        return harmonicActivePower2Max;
+    }
+
+    /**
+     * 设置2次谐波有功功率-最大值
+     *
+     * @param harmonicActivePower2Max 2次谐波有功功率-最大值
+     */
+    public void setHarmonicActivePower2Max(Double harmonicActivePower2Max) {
+        this.harmonicActivePower2Max = harmonicActivePower2Max;
+    }
+
+    /**
+     * 获取2次谐波有功功率-最小值
+     *
+     * @return HARMONIC_ACTIVE_POWER_2_MIN - 2次谐波有功功率-最小值
+     */
+    public Double getHarmonicActivePower2Min() {
+        return harmonicActivePower2Min;
+    }
+
+    /**
+     * 设置2次谐波有功功率-最小值
+     *
+     * @param harmonicActivePower2Min 2次谐波有功功率-最小值
+     */
+    public void setHarmonicActivePower2Min(Double harmonicActivePower2Min) {
+        this.harmonicActivePower2Min = harmonicActivePower2Min;
+    }
+
+    /**
+     * 获取2次谐波有功功率-平均值
+     *
+     * @return HARMONIC_ACTIVE_POWER_2_AVG - 2次谐波有功功率-平均值
+     */
+    public Double getHarmonicActivePower2Avg() {
+        return harmonicActivePower2Avg;
+    }
+
+    /**
+     * 设置2次谐波有功功率-平均值
+     *
+     * @param harmonicActivePower2Avg 2次谐波有功功率-平均值
+     */
+    public void setHarmonicActivePower2Avg(Double harmonicActivePower2Avg) {
+        this.harmonicActivePower2Avg = harmonicActivePower2Avg;
+    }
+
+    /**
+     * 获取2次谐波有功功率-95值
+     *
+     * @return HARMONIC_ACTIVE_POWER_2_95 - 2次谐波有功功率-95值
+     */
+    public Double getHarmonicActivePower295() {
+        return harmonicActivePower295;
+    }
+
+    /**
+     * 设置2次谐波有功功率-95值
+     *
+     * @param harmonicActivePower295 2次谐波有功功率-95值
+     */
+    public void setHarmonicActivePower295(Double harmonicActivePower295) {
+        this.harmonicActivePower295 = harmonicActivePower295;
+    }
+
+    /**
+     * 获取3次谐波有功功率-最大值
+     *
+     * @return HARMONIC_ACTIVE_POWER_3_MAX - 3次谐波有功功率-最大值
+     */
+    public Double getHarmonicActivePower3Max() {
+        return harmonicActivePower3Max;
+    }
+
+    /**
+     * 设置3次谐波有功功率-最大值
+     *
+     * @param harmonicActivePower3Max 3次谐波有功功率-最大值
+     */
+    public void setHarmonicActivePower3Max(Double harmonicActivePower3Max) {
+        this.harmonicActivePower3Max = harmonicActivePower3Max;
+    }
+
+    /**
+     * 获取3次谐波有功功率-最小值
+     *
+     * @return HARMONIC_ACTIVE_POWER_3_MIN - 3次谐波有功功率-最小值
+     */
+    public Double getHarmonicActivePower3Min() {
+        return harmonicActivePower3Min;
+    }
+
+    /**
+     * 设置3次谐波有功功率-最小值
+     *
+     * @param harmonicActivePower3Min 3次谐波有功功率-最小值
+     */
+    public void setHarmonicActivePower3Min(Double harmonicActivePower3Min) {
+        this.harmonicActivePower3Min = harmonicActivePower3Min;
+    }
+
+    /**
+     * 获取3次谐波有功功率-平均值
+     *
+     * @return HARMONIC_ACTIVE_POWER_3_AVG - 3次谐波有功功率-平均值
+     */
+    public Double getHarmonicActivePower3Avg() {
+        return harmonicActivePower3Avg;
+    }
+
+    /**
+     * 设置3次谐波有功功率-平均值
+     *
+     * @param harmonicActivePower3Avg 3次谐波有功功率-平均值
+     */
+    public void setHarmonicActivePower3Avg(Double harmonicActivePower3Avg) {
+        this.harmonicActivePower3Avg = harmonicActivePower3Avg;
+    }
+
+    /**
+     * 获取3次谐波有功功率-95值
+     *
+     * @return HARMONIC_ACTIVE_POWER_3_95 - 3次谐波有功功率-95值
+     */
+    public Double getHarmonicActivePower395() {
+        return harmonicActivePower395;
+    }
+
+    /**
+     * 设置3次谐波有功功率-95值
+     *
+     * @param harmonicActivePower395 3次谐波有功功率-95值
+     */
+    public void setHarmonicActivePower395(Double harmonicActivePower395) {
+        this.harmonicActivePower395 = harmonicActivePower395;
+    }
+
+    /**
+     * 获取4次谐波有功功率-最大值
+     *
+     * @return HARMONIC_ACTIVE_POWER_4_MAX - 4次谐波有功功率-最大值
+     */
+    public Double getHarmonicActivePower4Max() {
+        return harmonicActivePower4Max;
+    }
+
+    /**
+     * 设置4次谐波有功功率-最大值
+     *
+     * @param harmonicActivePower4Max 4次谐波有功功率-最大值
+     */
+    public void setHarmonicActivePower4Max(Double harmonicActivePower4Max) {
+        this.harmonicActivePower4Max = harmonicActivePower4Max;
+    }
+
+    /**
+     * 获取4次谐波有功功率-最小值
+     *
+     * @return HARMONIC_ACTIVE_POWER_4_MIN - 4次谐波有功功率-最小值
+     */
+    public Double getHarmonicActivePower4Min() {
+        return harmonicActivePower4Min;
+    }
+
+    /**
+     * 设置4次谐波有功功率-最小值
+     *
+     * @param harmonicActivePower4Min 4次谐波有功功率-最小值
+     */
+    public void setHarmonicActivePower4Min(Double harmonicActivePower4Min) {
+        this.harmonicActivePower4Min = harmonicActivePower4Min;
+    }
+
+    /**
+     * 获取4次谐波有功功率-平均值
+     *
+     * @return HARMONIC_ACTIVE_POWER_4_AVG - 4次谐波有功功率-平均值
+     */
+    public Double getHarmonicActivePower4Avg() {
+        return harmonicActivePower4Avg;
+    }
+
+    /**
+     * 设置4次谐波有功功率-平均值
+     *
+     * @param harmonicActivePower4Avg 4次谐波有功功率-平均值
+     */
+    public void setHarmonicActivePower4Avg(Double harmonicActivePower4Avg) {
+        this.harmonicActivePower4Avg = harmonicActivePower4Avg;
+    }
+
+    /**
+     * 获取4次谐波有功功率-95值
+     *
+     * @return HARMONIC_ACTIVE_POWER_4_95 - 4次谐波有功功率-95值
+     */
+    public Double getHarmonicActivePower495() {
+        return harmonicActivePower495;
+    }
+
+    /**
+     * 设置4次谐波有功功率-95值
+     *
+     * @param harmonicActivePower495 4次谐波有功功率-95值
+     */
+    public void setHarmonicActivePower495(Double harmonicActivePower495) {
+        this.harmonicActivePower495 = harmonicActivePower495;
+    }
+
+    /**
+     * 获取5次谐波有功功率-最大值
+     *
+     * @return HARMONIC_ACTIVE_POWER_5_MAX - 5次谐波有功功率-最大值
+     */
+    public Double getHarmonicActivePower5Max() {
+        return harmonicActivePower5Max;
+    }
+
+    /**
+     * 设置5次谐波有功功率-最大值
+     *
+     * @param harmonicActivePower5Max 5次谐波有功功率-最大值
+     */
+    public void setHarmonicActivePower5Max(Double harmonicActivePower5Max) {
+        this.harmonicActivePower5Max = harmonicActivePower5Max;
+    }
+
+    /**
+     * 获取5次谐波有功功率-最小值
+     *
+     * @return HARMONIC_ACTIVE_POWER_5_MIN - 5次谐波有功功率-最小值
+     */
+    public Double getHarmonicActivePower5Min() {
+        return harmonicActivePower5Min;
+    }
+
+    /**
+     * 设置5次谐波有功功率-最小值
+     *
+     * @param harmonicActivePower5Min 5次谐波有功功率-最小值
+     */
+    public void setHarmonicActivePower5Min(Double harmonicActivePower5Min) {
+        this.harmonicActivePower5Min = harmonicActivePower5Min;
+    }
+
+    /**
+     * 获取5次谐波有功功率-平均值
+     *
+     * @return HARMONIC_ACTIVE_POWER_5_AVG - 5次谐波有功功率-平均值
+     */
+    public Double getHarmonicActivePower5Avg() {
+        return harmonicActivePower5Avg;
+    }
+
+    /**
+     * 设置5次谐波有功功率-平均值
+     *
+     * @param harmonicActivePower5Avg 5次谐波有功功率-平均值
+     */
+    public void setHarmonicActivePower5Avg(Double harmonicActivePower5Avg) {
+        this.harmonicActivePower5Avg = harmonicActivePower5Avg;
+    }
+
+    /**
+     * 获取5次谐波有功功率-95值
+     *
+     * @return HARMONIC_ACTIVE_POWER_5_95 - 5次谐波有功功率-95值
+     */
+    public Double getHarmonicActivePower595() {
+        return harmonicActivePower595;
+    }
+
+    /**
+     * 设置5次谐波有功功率-95值
+     *
+     * @param harmonicActivePower595 5次谐波有功功率-95值
+     */
+    public void setHarmonicActivePower595(Double harmonicActivePower595) {
+        this.harmonicActivePower595 = harmonicActivePower595;
+    }
+
+    /**
+     * 获取6次谐波有功功率-最大值
+     *
+     * @return HARMONIC_ACTIVE_POWER_6_MAX - 6次谐波有功功率-最大值
+     */
+    public Double getHarmonicActivePower6Max() {
+        return harmonicActivePower6Max;
+    }
+
+    /**
+     * 设置6次谐波有功功率-最大值
+     *
+     * @param harmonicActivePower6Max 6次谐波有功功率-最大值
+     */
+    public void setHarmonicActivePower6Max(Double harmonicActivePower6Max) {
+        this.harmonicActivePower6Max = harmonicActivePower6Max;
+    }
+
+    /**
+     * 获取6次谐波有功功率-最小值
+     *
+     * @return HARMONIC_ACTIVE_POWER_6_MIN - 6次谐波有功功率-最小值
+     */
+    public Double getHarmonicActivePower6Min() {
+        return harmonicActivePower6Min;
+    }
+
+    /**
+     * 设置6次谐波有功功率-最小值
+     *
+     * @param harmonicActivePower6Min 6次谐波有功功率-最小值
+     */
+    public void setHarmonicActivePower6Min(Double harmonicActivePower6Min) {
+        this.harmonicActivePower6Min = harmonicActivePower6Min;
+    }
+
+    /**
+     * 获取6次谐波有功功率-平均值
+     *
+     * @return HARMONIC_ACTIVE_POWER_6_AVG - 6次谐波有功功率-平均值
+     */
+    public Double getHarmonicActivePower6Avg() {
+        return harmonicActivePower6Avg;
+    }
+
+    /**
+     * 设置6次谐波有功功率-平均值
+     *
+     * @param harmonicActivePower6Avg 6次谐波有功功率-平均值
+     */
+    public void setHarmonicActivePower6Avg(Double harmonicActivePower6Avg) {
+        this.harmonicActivePower6Avg = harmonicActivePower6Avg;
+    }
+
+    /**
+     * 获取6次谐波有功功率-95值
+     *
+     * @return HARMONIC_ACTIVE_POWER_6_95 - 6次谐波有功功率-95值
+     */
+    public Double getHarmonicActivePower695() {
+        return harmonicActivePower695;
+    }
+
+    /**
+     * 设置6次谐波有功功率-95值
+     *
+     * @param harmonicActivePower695 6次谐波有功功率-95值
+     */
+    public void setHarmonicActivePower695(Double harmonicActivePower695) {
+        this.harmonicActivePower695 = harmonicActivePower695;
+    }
+
+    /**
+     * 获取7次谐波有功功率-最大值
+     *
+     * @return HARMONIC_ACTIVE_POWER_7_MAX - 7次谐波有功功率-最大值
+     */
+    public Double getHarmonicActivePower7Max() {
+        return harmonicActivePower7Max;
+    }
+
+    /**
+     * 设置7次谐波有功功率-最大值
+     *
+     * @param harmonicActivePower7Max 7次谐波有功功率-最大值
+     */
+    public void setHarmonicActivePower7Max(Double harmonicActivePower7Max) {
+        this.harmonicActivePower7Max = harmonicActivePower7Max;
+    }
+
+    /**
+     * 获取7次谐波有功功率-最小值
+     *
+     * @return HARMONIC_ACTIVE_POWER_7_MIN - 7次谐波有功功率-最小值
+     */
+    public Double getHarmonicActivePower7Min() {
+        return harmonicActivePower7Min;
+    }
+
+    /**
+     * 设置7次谐波有功功率-最小值
+     *
+     * @param harmonicActivePower7Min 7次谐波有功功率-最小值
+     */
+    public void setHarmonicActivePower7Min(Double harmonicActivePower7Min) {
+        this.harmonicActivePower7Min = harmonicActivePower7Min;
+    }
+
+    /**
+     * 获取7次谐波有功功率-平均值
+     *
+     * @return HARMONIC_ACTIVE_POWER_7_AVG - 7次谐波有功功率-平均值
+     */
+    public Double getHarmonicActivePower7Avg() {
+        return harmonicActivePower7Avg;
+    }
+
+    /**
+     * 设置7次谐波有功功率-平均值
+     *
+     * @param harmonicActivePower7Avg 7次谐波有功功率-平均值
+     */
+    public void setHarmonicActivePower7Avg(Double harmonicActivePower7Avg) {
+        this.harmonicActivePower7Avg = harmonicActivePower7Avg;
+    }
+
+    /**
+     * 获取7次谐波有功功率-95值
+     *
+     * @return HARMONIC_ACTIVE_POWER_7_95 - 7次谐波有功功率-95值
+     */
+    public Double getHarmonicActivePower795() {
+        return harmonicActivePower795;
+    }
+
+    /**
+     * 设置7次谐波有功功率-95值
+     *
+     * @param harmonicActivePower795 7次谐波有功功率-95值
+     */
+    public void setHarmonicActivePower795(Double harmonicActivePower795) {
+        this.harmonicActivePower795 = harmonicActivePower795;
+    }
+
+    /**
+     * 获取8次谐波有功功率-最大值
+     *
+     * @return HARMONIC_ACTIVE_POWER_8_MAX - 8次谐波有功功率-最大值
+     */
+    public Double getHarmonicActivePower8Max() {
+        return harmonicActivePower8Max;
+    }
+
+    /**
+     * 设置8次谐波有功功率-最大值
+     *
+     * @param harmonicActivePower8Max 8次谐波有功功率-最大值
+     */
+    public void setHarmonicActivePower8Max(Double harmonicActivePower8Max) {
+        this.harmonicActivePower8Max = harmonicActivePower8Max;
+    }
+
+    /**
+     * 获取8次谐波有功功率-最小值
+     *
+     * @return HARMONIC_ACTIVE_POWER_8_MIN - 8次谐波有功功率-最小值
+     */
+    public Double getHarmonicActivePower8Min() {
+        return harmonicActivePower8Min;
+    }
+
+    /**
+     * 设置8次谐波有功功率-最小值
+     *
+     * @param harmonicActivePower8Min 8次谐波有功功率-最小值
+     */
+    public void setHarmonicActivePower8Min(Double harmonicActivePower8Min) {
+        this.harmonicActivePower8Min = harmonicActivePower8Min;
+    }
+
+    /**
+     * 获取8次谐波有功功率-平均值
+     *
+     * @return HARMONIC_ACTIVE_POWER_8_AVG - 8次谐波有功功率-平均值
+     */
+    public Double getHarmonicActivePower8Avg() {
+        return harmonicActivePower8Avg;
+    }
+
+    /**
+     * 设置8次谐波有功功率-平均值
+     *
+     * @param harmonicActivePower8Avg 8次谐波有功功率-平均值
+     */
+    public void setHarmonicActivePower8Avg(Double harmonicActivePower8Avg) {
+        this.harmonicActivePower8Avg = harmonicActivePower8Avg;
+    }
+
+    /**
+     * 获取8次谐波有功功率-95值
+     *
+     * @return HARMONIC_ACTIVE_POWER_8_95 - 8次谐波有功功率-95值
+     */
+    public Double getHarmonicActivePower895() {
+        return harmonicActivePower895;
+    }
+
+    /**
+     * 设置8次谐波有功功率-95值
+     *
+     * @param harmonicActivePower895 8次谐波有功功率-95值
+     */
+    public void setHarmonicActivePower895(Double harmonicActivePower895) {
+        this.harmonicActivePower895 = harmonicActivePower895;
+    }
+
+    /**
+     * 获取9次谐波有功功率-最大值
+     *
+     * @return HARMONIC_ACTIVE_POWER_9_MAX - 9次谐波有功功率-最大值
+     */
+    public Double getHarmonicActivePower9Max() {
+        return harmonicActivePower9Max;
+    }
+
+    /**
+     * 设置9次谐波有功功率-最大值
+     *
+     * @param harmonicActivePower9Max 9次谐波有功功率-最大值
+     */
+    public void setHarmonicActivePower9Max(Double harmonicActivePower9Max) {
+        this.harmonicActivePower9Max = harmonicActivePower9Max;
+    }
+
+    /**
+     * 获取9次谐波有功功率-最小值
+     *
+     * @return HARMONIC_ACTIVE_POWER_9_MIN - 9次谐波有功功率-最小值
+     */
+    public Double getHarmonicActivePower9Min() {
+        return harmonicActivePower9Min;
+    }
+
+    /**
+     * 设置9次谐波有功功率-最小值
+     *
+     * @param harmonicActivePower9Min 9次谐波有功功率-最小值
+     */
+    public void setHarmonicActivePower9Min(Double harmonicActivePower9Min) {
+        this.harmonicActivePower9Min = harmonicActivePower9Min;
+    }
+
+    /**
+     * 获取9次谐波有功功率-平均值
+     *
+     * @return HARMONIC_ACTIVE_POWER_9_AVG - 9次谐波有功功率-平均值
+     */
+    public Double getHarmonicActivePower9Avg() {
+        return harmonicActivePower9Avg;
+    }
+
+    /**
+     * 设置9次谐波有功功率-平均值
+     *
+     * @param harmonicActivePower9Avg 9次谐波有功功率-平均值
+     */
+    public void setHarmonicActivePower9Avg(Double harmonicActivePower9Avg) {
+        this.harmonicActivePower9Avg = harmonicActivePower9Avg;
+    }
+
+    /**
+     * 获取9次谐波有功功率-95值
+     *
+     * @return HARMONIC_ACTIVE_POWER_9_95 - 9次谐波有功功率-95值
+     */
+    public Double getHarmonicActivePower995() {
+        return harmonicActivePower995;
+    }
+
+    /**
+     * 设置9次谐波有功功率-95值
+     *
+     * @param harmonicActivePower995 9次谐波有功功率-95值
+     */
+    public void setHarmonicActivePower995(Double harmonicActivePower995) {
+        this.harmonicActivePower995 = harmonicActivePower995;
+    }
+
+    /**
+     * 获取10次谐波有功功率-最大值
+     *
+     * @return HARMONIC_ACTIVE_POWER_10_MAX - 10次谐波有功功率-最大值
+     */
+    public Double getHarmonicActivePower10Max() {
+        return harmonicActivePower10Max;
+    }
+
+    /**
+     * 设置10次谐波有功功率-最大值
+     *
+     * @param harmonicActivePower10Max 10次谐波有功功率-最大值
+     */
+    public void setHarmonicActivePower10Max(Double harmonicActivePower10Max) {
+        this.harmonicActivePower10Max = harmonicActivePower10Max;
+    }
+
+    /**
+     * 获取10次谐波有功功率-最小值
+     *
+     * @return HARMONIC_ACTIVE_POWER_10_MIN - 10次谐波有功功率-最小值
+     */
+    public Double getHarmonicActivePower10Min() {
+        return harmonicActivePower10Min;
+    }
+
+    /**
+     * 设置10次谐波有功功率-最小值
+     *
+     * @param harmonicActivePower10Min 10次谐波有功功率-最小值
+     */
+    public void setHarmonicActivePower10Min(Double harmonicActivePower10Min) {
+        this.harmonicActivePower10Min = harmonicActivePower10Min;
+    }
+
+    /**
+     * 获取10次谐波有功功率-平均值
+     *
+     * @return HARMONIC_ACTIVE_POWER_10_AVG - 10次谐波有功功率-平均值
+     */
+    public Double getHarmonicActivePower10Avg() {
+        return harmonicActivePower10Avg;
+    }
+
+    /**
+     * 设置10次谐波有功功率-平均值
+     *
+     * @param harmonicActivePower10Avg 10次谐波有功功率-平均值
+     */
+    public void setHarmonicActivePower10Avg(Double harmonicActivePower10Avg) {
+        this.harmonicActivePower10Avg = harmonicActivePower10Avg;
+    }
+
+    /**
+     * 获取10次谐波有功功率-95值
+     *
+     * @return HARMONIC_ACTIVE_POWER_10_95 - 10次谐波有功功率-95值
+     */
+    public Double getHarmonicActivePower1095() {
+        return harmonicActivePower1095;
+    }
+
+    /**
+     * 设置10次谐波有功功率-95值
+     *
+     * @param harmonicActivePower1095 10次谐波有功功率-95值
+     */
+    public void setHarmonicActivePower1095(Double harmonicActivePower1095) {
+        this.harmonicActivePower1095 = harmonicActivePower1095;
+    }
+
+    /**
+     * 获取11次谐波有功功率-最大值
+     *
+     * @return HARMONIC_ACTIVE_POWER_11_MAX - 11次谐波有功功率-最大值
+     */
+    public Double getHarmonicActivePower11Max() {
+        return harmonicActivePower11Max;
+    }
+
+    /**
+     * 设置11次谐波有功功率-最大值
+     *
+     * @param harmonicActivePower11Max 11次谐波有功功率-最大值
+     */
+    public void setHarmonicActivePower11Max(Double harmonicActivePower11Max) {
+        this.harmonicActivePower11Max = harmonicActivePower11Max;
+    }
+
+    /**
+     * 获取11次谐波有功功率-最小值
+     *
+     * @return HARMONIC_ACTIVE_POWER_11_MIN - 11次谐波有功功率-最小值
+     */
+    public Double getHarmonicActivePower11Min() {
+        return harmonicActivePower11Min;
+    }
+
+    /**
+     * 设置11次谐波有功功率-最小值
+     *
+     * @param harmonicActivePower11Min 11次谐波有功功率-最小值
+     */
+    public void setHarmonicActivePower11Min(Double harmonicActivePower11Min) {
+        this.harmonicActivePower11Min = harmonicActivePower11Min;
+    }
+
+    /**
+     * 获取11次谐波有功功率-平均值
+     *
+     * @return HARMONIC_ACTIVE_POWER_11_AVG - 11次谐波有功功率-平均值
+     */
+    public Double getHarmonicActivePower11Avg() {
+        return harmonicActivePower11Avg;
+    }
+
+    /**
+     * 设置11次谐波有功功率-平均值
+     *
+     * @param harmonicActivePower11Avg 11次谐波有功功率-平均值
+     */
+    public void setHarmonicActivePower11Avg(Double harmonicActivePower11Avg) {
+        this.harmonicActivePower11Avg = harmonicActivePower11Avg;
+    }
+
+    /**
+     * 获取11次谐波有功功率-95值
+     *
+     * @return HARMONIC_ACTIVE_POWER_11_95 - 11次谐波有功功率-95值
+     */
+    public Double getHarmonicActivePower1195() {
+        return harmonicActivePower1195;
+    }
+
+    /**
+     * 设置11次谐波有功功率-95值
+     *
+     * @param harmonicActivePower1195 11次谐波有功功率-95值
+     */
+    public void setHarmonicActivePower1195(Double harmonicActivePower1195) {
+        this.harmonicActivePower1195 = harmonicActivePower1195;
+    }
+
+    /**
+     * 获取12次谐波有功功率-最大值
+     *
+     * @return HARMONIC_ACTIVE_POWER_12_MAX - 12次谐波有功功率-最大值
+     */
+    public Double getHarmonicActivePower12Max() {
+        return harmonicActivePower12Max;
+    }
+
+    /**
+     * 设置12次谐波有功功率-最大值
+     *
+     * @param harmonicActivePower12Max 12次谐波有功功率-最大值
+     */
+    public void setHarmonicActivePower12Max(Double harmonicActivePower12Max) {
+        this.harmonicActivePower12Max = harmonicActivePower12Max;
+    }
+
+    /**
+     * 获取12次谐波有功功率-最小值
+     *
+     * @return HARMONIC_ACTIVE_POWER_12_MIN - 12次谐波有功功率-最小值
+     */
+    public Double getHarmonicActivePower12Min() {
+        return harmonicActivePower12Min;
+    }
+
+    /**
+     * 设置12次谐波有功功率-最小值
+     *
+     * @param harmonicActivePower12Min 12次谐波有功功率-最小值
+     */
+    public void setHarmonicActivePower12Min(Double harmonicActivePower12Min) {
+        this.harmonicActivePower12Min = harmonicActivePower12Min;
+    }
+
+    /**
+     * 获取12次谐波有功功率-平均值
+     *
+     * @return HARMONIC_ACTIVE_POWER_12_AVG - 12次谐波有功功率-平均值
+     */
+    public Double getHarmonicActivePower12Avg() {
+        return harmonicActivePower12Avg;
+    }
+
+    /**
+     * 设置12次谐波有功功率-平均值
+     *
+     * @param harmonicActivePower12Avg 12次谐波有功功率-平均值
+     */
+    public void setHarmonicActivePower12Avg(Double harmonicActivePower12Avg) {
+        this.harmonicActivePower12Avg = harmonicActivePower12Avg;
+    }
+
+    /**
+     * 获取12次谐波有功功率-95值
+     *
+     * @return HARMONIC_ACTIVE_POWER_12_95 - 12次谐波有功功率-95值
+     */
+    public Double getHarmonicActivePower1295() {
+        return harmonicActivePower1295;
+    }
+
+    /**
+     * 设置12次谐波有功功率-95值
+     *
+     * @param harmonicActivePower1295 12次谐波有功功率-95值
+     */
+    public void setHarmonicActivePower1295(Double harmonicActivePower1295) {
+        this.harmonicActivePower1295 = harmonicActivePower1295;
+    }
+
+    /**
+     * 获取13次谐波有功功率-最大值
+     *
+     * @return HARMONIC_ACTIVE_POWER_13_MAX - 13次谐波有功功率-最大值
+     */
+    public Double getHarmonicActivePower13Max() {
+        return harmonicActivePower13Max;
+    }
+
+    /**
+     * 设置13次谐波有功功率-最大值
+     *
+     * @param harmonicActivePower13Max 13次谐波有功功率-最大值
+     */
+    public void setHarmonicActivePower13Max(Double harmonicActivePower13Max) {
+        this.harmonicActivePower13Max = harmonicActivePower13Max;
+    }
+
+    /**
+     * 获取13次谐波有功功率-最小值
+     *
+     * @return HARMONIC_ACTIVE_POWER_13_MIN - 13次谐波有功功率-最小值
+     */
+    public Double getHarmonicActivePower13Min() {
+        return harmonicActivePower13Min;
+    }
+
+    /**
+     * 设置13次谐波有功功率-最小值
+     *
+     * @param harmonicActivePower13Min 13次谐波有功功率-最小值
+     */
+    public void setHarmonicActivePower13Min(Double harmonicActivePower13Min) {
+        this.harmonicActivePower13Min = harmonicActivePower13Min;
+    }
+
+    /**
+     * 获取13次谐波有功功率-平均值
+     *
+     * @return HARMONIC_ACTIVE_POWER_13_AVG - 13次谐波有功功率-平均值
+     */
+    public Double getHarmonicActivePower13Avg() {
+        return harmonicActivePower13Avg;
+    }
+
+    /**
+     * 设置13次谐波有功功率-平均值
+     *
+     * @param harmonicActivePower13Avg 13次谐波有功功率-平均值
+     */
+    public void setHarmonicActivePower13Avg(Double harmonicActivePower13Avg) {
+        this.harmonicActivePower13Avg = harmonicActivePower13Avg;
+    }
+
+    /**
+     * 获取13次谐波有功功率-95值
+     *
+     * @return HARMONIC_ACTIVE_POWER_13_95 - 13次谐波有功功率-95值
+     */
+    public Double getHarmonicActivePower1395() {
+        return harmonicActivePower1395;
+    }
+
+    /**
+     * 设置13次谐波有功功率-95值
+     *
+     * @param harmonicActivePower1395 13次谐波有功功率-95值
+     */
+    public void setHarmonicActivePower1395(Double harmonicActivePower1395) {
+        this.harmonicActivePower1395 = harmonicActivePower1395;
+    }
+
+    /**
+     * 获取14次谐波有功功率-最大值
+     *
+     * @return HARMONIC_ACTIVE_POWER_14_MAX - 14次谐波有功功率-最大值
+     */
+    public Double getHarmonicActivePower14Max() {
+        return harmonicActivePower14Max;
+    }
+
+    /**
+     * 设置14次谐波有功功率-最大值
+     *
+     * @param harmonicActivePower14Max 14次谐波有功功率-最大值
+     */
+    public void setHarmonicActivePower14Max(Double harmonicActivePower14Max) {
+        this.harmonicActivePower14Max = harmonicActivePower14Max;
+    }
+
+    /**
+     * 获取14次谐波有功功率-最小值
+     *
+     * @return HARMONIC_ACTIVE_POWER_14_MIN - 14次谐波有功功率-最小值
+     */
+    public Double getHarmonicActivePower14Min() {
+        return harmonicActivePower14Min;
+    }
+
+    /**
+     * 设置14次谐波有功功率-最小值
+     *
+     * @param harmonicActivePower14Min 14次谐波有功功率-最小值
+     */
+    public void setHarmonicActivePower14Min(Double harmonicActivePower14Min) {
+        this.harmonicActivePower14Min = harmonicActivePower14Min;
+    }
+
+    /**
+     * 获取14次谐波有功功率-平均值
+     *
+     * @return HARMONIC_ACTIVE_POWER_14_AVG - 14次谐波有功功率-平均值
+     */
+    public Double getHarmonicActivePower14Avg() {
+        return harmonicActivePower14Avg;
+    }
+
+    /**
+     * 设置14次谐波有功功率-平均值
+     *
+     * @param harmonicActivePower14Avg 14次谐波有功功率-平均值
+     */
+    public void setHarmonicActivePower14Avg(Double harmonicActivePower14Avg) {
+        this.harmonicActivePower14Avg = harmonicActivePower14Avg;
+    }
+
+    /**
+     * 获取14次谐波有功功率-95值
+     *
+     * @return HARMONIC_ACTIVE_POWER_14_95 - 14次谐波有功功率-95值
+     */
+    public Double getHarmonicActivePower1495() {
+        return harmonicActivePower1495;
+    }
+
+    /**
+     * 设置14次谐波有功功率-95值
+     *
+     * @param harmonicActivePower1495 14次谐波有功功率-95值
+     */
+    public void setHarmonicActivePower1495(Double harmonicActivePower1495) {
+        this.harmonicActivePower1495 = harmonicActivePower1495;
+    }
+
+    /**
+     * 获取15次谐波有功功率-最大值
+     *
+     * @return HARMONIC_ACTIVE_POWER_15_MAX - 15次谐波有功功率-最大值
+     */
+    public Double getHarmonicActivePower15Max() {
+        return harmonicActivePower15Max;
+    }
+
+    /**
+     * 设置15次谐波有功功率-最大值
+     *
+     * @param harmonicActivePower15Max 15次谐波有功功率-最大值
+     */
+    public void setHarmonicActivePower15Max(Double harmonicActivePower15Max) {
+        this.harmonicActivePower15Max = harmonicActivePower15Max;
+    }
+
+    /**
+     * 获取15次谐波有功功率-最小值
+     *
+     * @return HARMONIC_ACTIVE_POWER_15_MIN - 15次谐波有功功率-最小值
+     */
+    public Double getHarmonicActivePower15Min() {
+        return harmonicActivePower15Min;
+    }
+
+    /**
+     * 设置15次谐波有功功率-最小值
+     *
+     * @param harmonicActivePower15Min 15次谐波有功功率-最小值
+     */
+    public void setHarmonicActivePower15Min(Double harmonicActivePower15Min) {
+        this.harmonicActivePower15Min = harmonicActivePower15Min;
+    }
+
+    /**
+     * 获取15次谐波有功功率-平均值
+     *
+     * @return HARMONIC_ACTIVE_POWER_15_AVG - 15次谐波有功功率-平均值
+     */
+    public Double getHarmonicActivePower15Avg() {
+        return harmonicActivePower15Avg;
+    }
+
+    /**
+     * 设置15次谐波有功功率-平均值
+     *
+     * @param harmonicActivePower15Avg 15次谐波有功功率-平均值
+     */
+    public void setHarmonicActivePower15Avg(Double harmonicActivePower15Avg) {
+        this.harmonicActivePower15Avg = harmonicActivePower15Avg;
+    }
+
+    /**
+     * 获取15次谐波有功功率-95值
+     *
+     * @return HARMONIC_ACTIVE_POWER_15_95 - 15次谐波有功功率-95值
+     */
+    public Double getHarmonicActivePower1595() {
+        return harmonicActivePower1595;
+    }
+
+    /**
+     * 设置15次谐波有功功率-95值
+     *
+     * @param harmonicActivePower1595 15次谐波有功功率-95值
+     */
+    public void setHarmonicActivePower1595(Double harmonicActivePower1595) {
+        this.harmonicActivePower1595 = harmonicActivePower1595;
+    }
+
+    /**
+     * 获取16次谐波有功功率-最大值
+     *
+     * @return HARMONIC_ACTIVE_POWER_16_MAX - 16次谐波有功功率-最大值
+     */
+    public Double getHarmonicActivePower16Max() {
+        return harmonicActivePower16Max;
+    }
+
+    /**
+     * 设置16次谐波有功功率-最大值
+     *
+     * @param harmonicActivePower16Max 16次谐波有功功率-最大值
+     */
+    public void setHarmonicActivePower16Max(Double harmonicActivePower16Max) {
+        this.harmonicActivePower16Max = harmonicActivePower16Max;
+    }
+
+    /**
+     * 获取16次谐波有功功率-最小值
+     *
+     * @return HARMONIC_ACTIVE_POWER_16_MIN - 16次谐波有功功率-最小值
+     */
+    public Double getHarmonicActivePower16Min() {
+        return harmonicActivePower16Min;
+    }
+
+    /**
+     * 设置16次谐波有功功率-最小值
+     *
+     * @param harmonicActivePower16Min 16次谐波有功功率-最小值
+     */
+    public void setHarmonicActivePower16Min(Double harmonicActivePower16Min) {
+        this.harmonicActivePower16Min = harmonicActivePower16Min;
+    }
+
+    /**
+     * 获取16次谐波有功功率-平均值
+     *
+     * @return HARMONIC_ACTIVE_POWER_16_AVG - 16次谐波有功功率-平均值
+     */
+    public Double getHarmonicActivePower16Avg() {
+        return harmonicActivePower16Avg;
+    }
+
+    /**
+     * 设置16次谐波有功功率-平均值
+     *
+     * @param harmonicActivePower16Avg 16次谐波有功功率-平均值
+     */
+    public void setHarmonicActivePower16Avg(Double harmonicActivePower16Avg) {
+        this.harmonicActivePower16Avg = harmonicActivePower16Avg;
+    }
+
+    /**
+     * 获取16次谐波有功功率-95值
+     *
+     * @return HARMONIC_ACTIVE_POWER_16_95 - 16次谐波有功功率-95值
+     */
+    public Double getHarmonicActivePower1695() {
+        return harmonicActivePower1695;
+    }
+
+    /**
+     * 设置16次谐波有功功率-95值
+     *
+     * @param harmonicActivePower1695 16次谐波有功功率-95值
+     */
+    public void setHarmonicActivePower1695(Double harmonicActivePower1695) {
+        this.harmonicActivePower1695 = harmonicActivePower1695;
+    }
+
+    /**
+     * 获取17次谐波有功功率-最大值
+     *
+     * @return HARMONIC_ACTIVE_POWER_17_MAX - 17次谐波有功功率-最大值
+     */
+    public Double getHarmonicActivePower17Max() {
+        return harmonicActivePower17Max;
+    }
+
+    /**
+     * 设置17次谐波有功功率-最大值
+     *
+     * @param harmonicActivePower17Max 17次谐波有功功率-最大值
+     */
+    public void setHarmonicActivePower17Max(Double harmonicActivePower17Max) {
+        this.harmonicActivePower17Max = harmonicActivePower17Max;
+    }
+
+    /**
+     * 获取17次谐波有功功率-最小值
+     *
+     * @return HARMONIC_ACTIVE_POWER_17_MIN - 17次谐波有功功率-最小值
+     */
+    public Double getHarmonicActivePower17Min() {
+        return harmonicActivePower17Min;
+    }
+
+    /**
+     * 设置17次谐波有功功率-最小值
+     *
+     * @param harmonicActivePower17Min 17次谐波有功功率-最小值
+     */
+    public void setHarmonicActivePower17Min(Double harmonicActivePower17Min) {
+        this.harmonicActivePower17Min = harmonicActivePower17Min;
+    }
+
+    /**
+     * 获取17次谐波有功功率-平均值
+     *
+     * @return HARMONIC_ACTIVE_POWER_17_AVG - 17次谐波有功功率-平均值
+     */
+    public Double getHarmonicActivePower17Avg() {
+        return harmonicActivePower17Avg;
+    }
+
+    /**
+     * 设置17次谐波有功功率-平均值
+     *
+     * @param harmonicActivePower17Avg 17次谐波有功功率-平均值
+     */
+    public void setHarmonicActivePower17Avg(Double harmonicActivePower17Avg) {
+        this.harmonicActivePower17Avg = harmonicActivePower17Avg;
+    }
+
+    /**
+     * 获取17次谐波有功功率-95值
+     *
+     * @return HARMONIC_ACTIVE_POWER_17_95 - 17次谐波有功功率-95值
+     */
+    public Double getHarmonicActivePower1795() {
+        return harmonicActivePower1795;
+    }
+
+    /**
+     * 设置17次谐波有功功率-95值
+     *
+     * @param harmonicActivePower1795 17次谐波有功功率-95值
+     */
+    public void setHarmonicActivePower1795(Double harmonicActivePower1795) {
+        this.harmonicActivePower1795 = harmonicActivePower1795;
+    }
+
+    /**
+     * 获取18次谐波有功功率-最大值
+     *
+     * @return HARMONIC_ACTIVE_POWER_18_MAX - 18次谐波有功功率-最大值
+     */
+    public Double getHarmonicActivePower18Max() {
+        return harmonicActivePower18Max;
+    }
+
+    /**
+     * 设置18次谐波有功功率-最大值
+     *
+     * @param harmonicActivePower18Max 18次谐波有功功率-最大值
+     */
+    public void setHarmonicActivePower18Max(Double harmonicActivePower18Max) {
+        this.harmonicActivePower18Max = harmonicActivePower18Max;
+    }
+
+    /**
+     * 获取18次谐波有功功率-最小值
+     *
+     * @return HARMONIC_ACTIVE_POWER_18_MIN - 18次谐波有功功率-最小值
+     */
+    public Double getHarmonicActivePower18Min() {
+        return harmonicActivePower18Min;
+    }
+
+    /**
+     * 设置18次谐波有功功率-最小值
+     *
+     * @param harmonicActivePower18Min 18次谐波有功功率-最小值
+     */
+    public void setHarmonicActivePower18Min(Double harmonicActivePower18Min) {
+        this.harmonicActivePower18Min = harmonicActivePower18Min;
+    }
+
+    /**
+     * 获取18次谐波有功功率-平均值
+     *
+     * @return HARMONIC_ACTIVE_POWER_18_AVG - 18次谐波有功功率-平均值
+     */
+    public Double getHarmonicActivePower18Avg() {
+        return harmonicActivePower18Avg;
+    }
+
+    /**
+     * 设置18次谐波有功功率-平均值
+     *
+     * @param harmonicActivePower18Avg 18次谐波有功功率-平均值
+     */
+    public void setHarmonicActivePower18Avg(Double harmonicActivePower18Avg) {
+        this.harmonicActivePower18Avg = harmonicActivePower18Avg;
+    }
+
+    /**
+     * 获取18次谐波有功功率-95值
+     *
+     * @return HARMONIC_ACTIVE_POWER_18_95 - 18次谐波有功功率-95值
+     */
+    public Double getHarmonicActivePower1895() {
+        return harmonicActivePower1895;
+    }
+
+    /**
+     * 设置18次谐波有功功率-95值
+     *
+     * @param harmonicActivePower1895 18次谐波有功功率-95值
+     */
+    public void setHarmonicActivePower1895(Double harmonicActivePower1895) {
+        this.harmonicActivePower1895 = harmonicActivePower1895;
+    }
+
+    /**
+     * 获取19次谐波有功功率-最大值
+     *
+     * @return HARMONIC_ACTIVE_POWER_19_MAX - 19次谐波有功功率-最大值
+     */
+    public Double getHarmonicActivePower19Max() {
+        return harmonicActivePower19Max;
+    }
+
+    /**
+     * 设置19次谐波有功功率-最大值
+     *
+     * @param harmonicActivePower19Max 19次谐波有功功率-最大值
+     */
+    public void setHarmonicActivePower19Max(Double harmonicActivePower19Max) {
+        this.harmonicActivePower19Max = harmonicActivePower19Max;
+    }
+
+    /**
+     * 获取19次谐波有功功率-最小值
+     *
+     * @return HARMONIC_ACTIVE_POWER_19_MIN - 19次谐波有功功率-最小值
+     */
+    public Double getHarmonicActivePower19Min() {
+        return harmonicActivePower19Min;
+    }
+
+    /**
+     * 设置19次谐波有功功率-最小值
+     *
+     * @param harmonicActivePower19Min 19次谐波有功功率-最小值
+     */
+    public void setHarmonicActivePower19Min(Double harmonicActivePower19Min) {
+        this.harmonicActivePower19Min = harmonicActivePower19Min;
+    }
+
+    /**
+     * 获取19次谐波有功功率-平均值
+     *
+     * @return HARMONIC_ACTIVE_POWER_19_AVG - 19次谐波有功功率-平均值
+     */
+    public Double getHarmonicActivePower19Avg() {
+        return harmonicActivePower19Avg;
+    }
+
+    /**
+     * 设置19次谐波有功功率-平均值
+     *
+     * @param harmonicActivePower19Avg 19次谐波有功功率-平均值
+     */
+    public void setHarmonicActivePower19Avg(Double harmonicActivePower19Avg) {
+        this.harmonicActivePower19Avg = harmonicActivePower19Avg;
+    }
+
+    /**
+     * 获取19次谐波有功功率-95值
+     *
+     * @return HARMONIC_ACTIVE_POWER_19_95 - 19次谐波有功功率-95值
+     */
+    public Double getHarmonicActivePower1995() {
+        return harmonicActivePower1995;
+    }
+
+    /**
+     * 设置19次谐波有功功率-95值
+     *
+     * @param harmonicActivePower1995 19次谐波有功功率-95值
+     */
+    public void setHarmonicActivePower1995(Double harmonicActivePower1995) {
+        this.harmonicActivePower1995 = harmonicActivePower1995;
+    }
+
+    /**
+     * 获取20次谐波有功功率-最大值
+     *
+     * @return HARMONIC_ACTIVE_POWER_20_MAX - 20次谐波有功功率-最大值
+     */
+    public Double getHarmonicActivePower20Max() {
+        return harmonicActivePower20Max;
+    }
+
+    /**
+     * 设置20次谐波有功功率-最大值
+     *
+     * @param harmonicActivePower20Max 20次谐波有功功率-最大值
+     */
+    public void setHarmonicActivePower20Max(Double harmonicActivePower20Max) {
+        this.harmonicActivePower20Max = harmonicActivePower20Max;
+    }
+
+    /**
+     * 获取20次谐波有功功率-最小值
+     *
+     * @return HARMONIC_ACTIVE_POWER_20_MIN - 20次谐波有功功率-最小值
+     */
+    public Double getHarmonicActivePower20Min() {
+        return harmonicActivePower20Min;
+    }
+
+    /**
+     * 设置20次谐波有功功率-最小值
+     *
+     * @param harmonicActivePower20Min 20次谐波有功功率-最小值
+     */
+    public void setHarmonicActivePower20Min(Double harmonicActivePower20Min) {
+        this.harmonicActivePower20Min = harmonicActivePower20Min;
+    }
+
+    /**
+     * 获取20次谐波有功功率-平均值
+     *
+     * @return HARMONIC_ACTIVE_POWER_20_AVG - 20次谐波有功功率-平均值
+     */
+    public Double getHarmonicActivePower20Avg() {
+        return harmonicActivePower20Avg;
+    }
+
+    /**
+     * 设置20次谐波有功功率-平均值
+     *
+     * @param harmonicActivePower20Avg 20次谐波有功功率-平均值
+     */
+    public void setHarmonicActivePower20Avg(Double harmonicActivePower20Avg) {
+        this.harmonicActivePower20Avg = harmonicActivePower20Avg;
+    }
+
+    /**
+     * 获取20次谐波有功功率-95值
+     *
+     * @return HARMONIC_ACTIVE_POWER_20_95 - 20次谐波有功功率-95值
+     */
+    public Double getHarmonicActivePower2095() {
+        return harmonicActivePower2095;
+    }
+
+    /**
+     * 设置20次谐波有功功率-95值
+     *
+     * @param harmonicActivePower2095 20次谐波有功功率-95值
+     */
+    public void setHarmonicActivePower2095(Double harmonicActivePower2095) {
+        this.harmonicActivePower2095 = harmonicActivePower2095;
+    }
+
+    /**
+     * 获取21次谐波有功功率-最大值
+     *
+     * @return HARMONIC_ACTIVE_POWER_21_MAX - 21次谐波有功功率-最大值
+     */
+    public Double getHarmonicActivePower21Max() {
+        return harmonicActivePower21Max;
+    }
+
+    /**
+     * 设置21次谐波有功功率-最大值
+     *
+     * @param harmonicActivePower21Max 21次谐波有功功率-最大值
+     */
+    public void setHarmonicActivePower21Max(Double harmonicActivePower21Max) {
+        this.harmonicActivePower21Max = harmonicActivePower21Max;
+    }
+
+    /**
+     * 获取21次谐波有功功率-最小值
+     *
+     * @return HARMONIC_ACTIVE_POWER_21_MIN - 21次谐波有功功率-最小值
+     */
+    public Double getHarmonicActivePower21Min() {
+        return harmonicActivePower21Min;
+    }
+
+    /**
+     * 设置21次谐波有功功率-最小值
+     *
+     * @param harmonicActivePower21Min 21次谐波有功功率-最小值
+     */
+    public void setHarmonicActivePower21Min(Double harmonicActivePower21Min) {
+        this.harmonicActivePower21Min = harmonicActivePower21Min;
+    }
+
+    /**
+     * 获取21次谐波有功功率-平均值
+     *
+     * @return HARMONIC_ACTIVE_POWER_21_AVG - 21次谐波有功功率-平均值
+     */
+    public Double getHarmonicActivePower21Avg() {
+        return harmonicActivePower21Avg;
+    }
+
+    /**
+     * 设置21次谐波有功功率-平均值
+     *
+     * @param harmonicActivePower21Avg 21次谐波有功功率-平均值
+     */
+    public void setHarmonicActivePower21Avg(Double harmonicActivePower21Avg) {
+        this.harmonicActivePower21Avg = harmonicActivePower21Avg;
+    }
+
+    /**
+     * 获取21次谐波有功功率-95值
+     *
+     * @return HARMONIC_ACTIVE_POWER_21_95 - 21次谐波有功功率-95值
+     */
+    public Double getHarmonicActivePower2195() {
+        return harmonicActivePower2195;
+    }
+
+    /**
+     * 设置21次谐波有功功率-95值
+     *
+     * @param harmonicActivePower2195 21次谐波有功功率-95值
+     */
+    public void setHarmonicActivePower2195(Double harmonicActivePower2195) {
+        this.harmonicActivePower2195 = harmonicActivePower2195;
+    }
+
+    /**
+     * 获取22次谐波有功功率-最大值
+     *
+     * @return HARMONIC_ACTIVE_POWER_22_MAX - 22次谐波有功功率-最大值
+     */
+    public Double getHarmonicActivePower22Max() {
+        return harmonicActivePower22Max;
+    }
+
+    /**
+     * 设置22次谐波有功功率-最大值
+     *
+     * @param harmonicActivePower22Max 22次谐波有功功率-最大值
+     */
+    public void setHarmonicActivePower22Max(Double harmonicActivePower22Max) {
+        this.harmonicActivePower22Max = harmonicActivePower22Max;
+    }
+
+    /**
+     * 获取22次谐波有功功率-最小值
+     *
+     * @return HARMONIC_ACTIVE_POWER_22_MIN - 22次谐波有功功率-最小值
+     */
+    public Double getHarmonicActivePower22Min() {
+        return harmonicActivePower22Min;
+    }
+
+    /**
+     * 设置22次谐波有功功率-最小值
+     *
+     * @param harmonicActivePower22Min 22次谐波有功功率-最小值
+     */
+    public void setHarmonicActivePower22Min(Double harmonicActivePower22Min) {
+        this.harmonicActivePower22Min = harmonicActivePower22Min;
+    }
+
+    /**
+     * 获取22次谐波有功功率-平均值
+     *
+     * @return HARMONIC_ACTIVE_POWER_22_AVG - 22次谐波有功功率-平均值
+     */
+    public Double getHarmonicActivePower22Avg() {
+        return harmonicActivePower22Avg;
+    }
+
+    /**
+     * 设置22次谐波有功功率-平均值
+     *
+     * @param harmonicActivePower22Avg 22次谐波有功功率-平均值
+     */
+    public void setHarmonicActivePower22Avg(Double harmonicActivePower22Avg) {
+        this.harmonicActivePower22Avg = harmonicActivePower22Avg;
+    }
+
+    /**
+     * 获取22次谐波有功功率-95值
+     *
+     * @return HARMONIC_ACTIVE_POWER_22_95 - 22次谐波有功功率-95值
+     */
+    public Double getHarmonicActivePower2295() {
+        return harmonicActivePower2295;
+    }
+
+    /**
+     * 设置22次谐波有功功率-95值
+     *
+     * @param harmonicActivePower2295 22次谐波有功功率-95值
+     */
+    public void setHarmonicActivePower2295(Double harmonicActivePower2295) {
+        this.harmonicActivePower2295 = harmonicActivePower2295;
+    }
+
+    /**
+     * 获取23次谐波有功功率-最大值
+     *
+     * @return HARMONIC_ACTIVE_POWER_23_MAX - 23次谐波有功功率-最大值
+     */
+    public Double getHarmonicActivePower23Max() {
+        return harmonicActivePower23Max;
+    }
+
+    /**
+     * 设置23次谐波有功功率-最大值
+     *
+     * @param harmonicActivePower23Max 23次谐波有功功率-最大值
+     */
+    public void setHarmonicActivePower23Max(Double harmonicActivePower23Max) {
+        this.harmonicActivePower23Max = harmonicActivePower23Max;
+    }
+
+    /**
+     * 获取23次谐波有功功率-最小值
+     *
+     * @return HARMONIC_ACTIVE_POWER_23_MIN - 23次谐波有功功率-最小值
+     */
+    public Double getHarmonicActivePower23Min() {
+        return harmonicActivePower23Min;
+    }
+
+    /**
+     * 设置23次谐波有功功率-最小值
+     *
+     * @param harmonicActivePower23Min 23次谐波有功功率-最小值
+     */
+    public void setHarmonicActivePower23Min(Double harmonicActivePower23Min) {
+        this.harmonicActivePower23Min = harmonicActivePower23Min;
+    }
+
+    /**
+     * 获取23次谐波有功功率-平均值
+     *
+     * @return HARMONIC_ACTIVE_POWER_23_AVG - 23次谐波有功功率-平均值
+     */
+    public Double getHarmonicActivePower23Avg() {
+        return harmonicActivePower23Avg;
+    }
+
+    /**
+     * 设置23次谐波有功功率-平均值
+     *
+     * @param harmonicActivePower23Avg 23次谐波有功功率-平均值
+     */
+    public void setHarmonicActivePower23Avg(Double harmonicActivePower23Avg) {
+        this.harmonicActivePower23Avg = harmonicActivePower23Avg;
+    }
+
+    /**
+     * 获取23次谐波有功功率-95值
+     *
+     * @return HARMONIC_ACTIVE_POWER_23_95 - 23次谐波有功功率-95值
+     */
+    public Double getHarmonicActivePower2395() {
+        return harmonicActivePower2395;
+    }
+
+    /**
+     * 设置23次谐波有功功率-95值
+     *
+     * @param harmonicActivePower2395 23次谐波有功功率-95值
+     */
+    public void setHarmonicActivePower2395(Double harmonicActivePower2395) {
+        this.harmonicActivePower2395 = harmonicActivePower2395;
+    }
+
+    /**
+     * 获取24次谐波有功功率-最大值
+     *
+     * @return HARMONIC_ACTIVE_POWER_24_MAX - 24次谐波有功功率-最大值
+     */
+    public Double getHarmonicActivePower24Max() {
+        return harmonicActivePower24Max;
+    }
+
+    /**
+     * 设置24次谐波有功功率-最大值
+     *
+     * @param harmonicActivePower24Max 24次谐波有功功率-最大值
+     */
+    public void setHarmonicActivePower24Max(Double harmonicActivePower24Max) {
+        this.harmonicActivePower24Max = harmonicActivePower24Max;
+    }
+
+    /**
+     * 获取24次谐波有功功率-最小值
+     *
+     * @return HARMONIC_ACTIVE_POWER_24_MIN - 24次谐波有功功率-最小值
+     */
+    public Double getHarmonicActivePower24Min() {
+        return harmonicActivePower24Min;
+    }
+
+    /**
+     * 设置24次谐波有功功率-最小值
+     *
+     * @param harmonicActivePower24Min 24次谐波有功功率-最小值
+     */
+    public void setHarmonicActivePower24Min(Double harmonicActivePower24Min) {
+        this.harmonicActivePower24Min = harmonicActivePower24Min;
+    }
+
+    /**
+     * 获取24次谐波有功功率-平均值
+     *
+     * @return HARMONIC_ACTIVE_POWER_24_AVG - 24次谐波有功功率-平均值
+     */
+    public Double getHarmonicActivePower24Avg() {
+        return harmonicActivePower24Avg;
+    }
+
+    /**
+     * 设置24次谐波有功功率-平均值
+     *
+     * @param harmonicActivePower24Avg 24次谐波有功功率-平均值
+     */
+    public void setHarmonicActivePower24Avg(Double harmonicActivePower24Avg) {
+        this.harmonicActivePower24Avg = harmonicActivePower24Avg;
+    }
+
+    /**
+     * 获取24次谐波有功功率-95值
+     *
+     * @return HARMONIC_ACTIVE_POWER_24_95 - 24次谐波有功功率-95值
+     */
+    public Double getHarmonicActivePower2495() {
+        return harmonicActivePower2495;
+    }
+
+    /**
+     * 设置24次谐波有功功率-95值
+     *
+     * @param harmonicActivePower2495 24次谐波有功功率-95值
+     */
+    public void setHarmonicActivePower2495(Double harmonicActivePower2495) {
+        this.harmonicActivePower2495 = harmonicActivePower2495;
+    }
+
+    /**
+     * 获取25次谐波有功功率-最大值
+     *
+     * @return HARMONIC_ACTIVE_POWER_25_MAX - 25次谐波有功功率-最大值
+     */
+    public Double getHarmonicActivePower25Max() {
+        return harmonicActivePower25Max;
+    }
+
+    /**
+     * 设置25次谐波有功功率-最大值
+     *
+     * @param harmonicActivePower25Max 25次谐波有功功率-最大值
+     */
+    public void setHarmonicActivePower25Max(Double harmonicActivePower25Max) {
+        this.harmonicActivePower25Max = harmonicActivePower25Max;
+    }
+
+    /**
+     * 获取25次谐波有功功率-最小值
+     *
+     * @return HARMONIC_ACTIVE_POWER_25_MIN - 25次谐波有功功率-最小值
+     */
+    public Double getHarmonicActivePower25Min() {
+        return harmonicActivePower25Min;
+    }
+
+    /**
+     * 设置25次谐波有功功率-最小值
+     *
+     * @param harmonicActivePower25Min 25次谐波有功功率-最小值
+     */
+    public void setHarmonicActivePower25Min(Double harmonicActivePower25Min) {
+        this.harmonicActivePower25Min = harmonicActivePower25Min;
+    }
+
+    /**
+     * 获取25次谐波有功功率-平均值
+     *
+     * @return HARMONIC_ACTIVE_POWER_25_AVG - 25次谐波有功功率-平均值
+     */
+    public Double getHarmonicActivePower25Avg() {
+        return harmonicActivePower25Avg;
+    }
+
+    /**
+     * 设置25次谐波有功功率-平均值
+     *
+     * @param harmonicActivePower25Avg 25次谐波有功功率-平均值
+     */
+    public void setHarmonicActivePower25Avg(Double harmonicActivePower25Avg) {
+        this.harmonicActivePower25Avg = harmonicActivePower25Avg;
+    }
+
+    /**
+     * 获取25次谐波有功功率-95值
+     *
+     * @return HARMONIC_ACTIVE_POWER_25_95 - 25次谐波有功功率-95值
+     */
+    public Double getHarmonicActivePower2595() {
+        return harmonicActivePower2595;
+    }
+
+    /**
+     * 设置25次谐波有功功率-95值
+     *
+     * @param harmonicActivePower2595 25次谐波有功功率-95值
+     */
+    public void setHarmonicActivePower2595(Double harmonicActivePower2595) {
+        this.harmonicActivePower2595 = harmonicActivePower2595;
+    }
+
+    /**
+     * 获取26次谐波有功功率-最大值
+     *
+     * @return HARMONIC_ACTIVE_POWER_26_MAX - 26次谐波有功功率-最大值
+     */
+    public Double getHarmonicActivePower26Max() {
+        return harmonicActivePower26Max;
+    }
+
+    /**
+     * 设置26次谐波有功功率-最大值
+     *
+     * @param harmonicActivePower26Max 26次谐波有功功率-最大值
+     */
+    public void setHarmonicActivePower26Max(Double harmonicActivePower26Max) {
+        this.harmonicActivePower26Max = harmonicActivePower26Max;
+    }
+
+    /**
+     * 获取26次谐波有功功率-最小值
+     *
+     * @return HARMONIC_ACTIVE_POWER_26_MIN - 26次谐波有功功率-最小值
+     */
+    public Double getHarmonicActivePower26Min() {
+        return harmonicActivePower26Min;
+    }
+
+    /**
+     * 设置26次谐波有功功率-最小值
+     *
+     * @param harmonicActivePower26Min 26次谐波有功功率-最小值
+     */
+    public void setHarmonicActivePower26Min(Double harmonicActivePower26Min) {
+        this.harmonicActivePower26Min = harmonicActivePower26Min;
+    }
+
+    /**
+     * 获取26次谐波有功功率-平均值
+     *
+     * @return HARMONIC_ACTIVE_POWER_26_AVG - 26次谐波有功功率-平均值
+     */
+    public Double getHarmonicActivePower26Avg() {
+        return harmonicActivePower26Avg;
+    }
+
+    /**
+     * 设置26次谐波有功功率-平均值
+     *
+     * @param harmonicActivePower26Avg 26次谐波有功功率-平均值
+     */
+    public void setHarmonicActivePower26Avg(Double harmonicActivePower26Avg) {
+        this.harmonicActivePower26Avg = harmonicActivePower26Avg;
+    }
+
+    /**
+     * 获取26次谐波有功功率-95值
+     *
+     * @return HARMONIC_ACTIVE_POWER_26_95 - 26次谐波有功功率-95值
+     */
+    public Double getHarmonicActivePower2695() {
+        return harmonicActivePower2695;
+    }
+
+    /**
+     * 设置26次谐波有功功率-95值
+     *
+     * @param harmonicActivePower2695 26次谐波有功功率-95值
+     */
+    public void setHarmonicActivePower2695(Double harmonicActivePower2695) {
+        this.harmonicActivePower2695 = harmonicActivePower2695;
+    }
+
+    /**
+     * 获取27次谐波有功功率-最大值
+     *
+     * @return HARMONIC_ACTIVE_POWER_27_MAX - 27次谐波有功功率-最大值
+     */
+    public Double getHarmonicActivePower27Max() {
+        return harmonicActivePower27Max;
+    }
+
+    /**
+     * 设置27次谐波有功功率-最大值
+     *
+     * @param harmonicActivePower27Max 27次谐波有功功率-最大值
+     */
+    public void setHarmonicActivePower27Max(Double harmonicActivePower27Max) {
+        this.harmonicActivePower27Max = harmonicActivePower27Max;
+    }
+
+    /**
+     * 获取27次谐波有功功率-最小值
+     *
+     * @return HARMONIC_ACTIVE_POWER_27_MIN - 27次谐波有功功率-最小值
+     */
+    public Double getHarmonicActivePower27Min() {
+        return harmonicActivePower27Min;
+    }
+
+    /**
+     * 设置27次谐波有功功率-最小值
+     *
+     * @param harmonicActivePower27Min 27次谐波有功功率-最小值
+     */
+    public void setHarmonicActivePower27Min(Double harmonicActivePower27Min) {
+        this.harmonicActivePower27Min = harmonicActivePower27Min;
+    }
+
+    /**
+     * 获取27次谐波有功功率-平均值
+     *
+     * @return HARMONIC_ACTIVE_POWER_27_AVG - 27次谐波有功功率-平均值
+     */
+    public Double getHarmonicActivePower27Avg() {
+        return harmonicActivePower27Avg;
+    }
+
+    /**
+     * 设置27次谐波有功功率-平均值
+     *
+     * @param harmonicActivePower27Avg 27次谐波有功功率-平均值
+     */
+    public void setHarmonicActivePower27Avg(Double harmonicActivePower27Avg) {
+        this.harmonicActivePower27Avg = harmonicActivePower27Avg;
+    }
+
+    /**
+     * 获取27次谐波有功功率-95值
+     *
+     * @return HARMONIC_ACTIVE_POWER_27_95 - 27次谐波有功功率-95值
+     */
+    public Double getHarmonicActivePower2795() {
+        return harmonicActivePower2795;
+    }
+
+    /**
+     * 设置27次谐波有功功率-95值
+     *
+     * @param harmonicActivePower2795 27次谐波有功功率-95值
+     */
+    public void setHarmonicActivePower2795(Double harmonicActivePower2795) {
+        this.harmonicActivePower2795 = harmonicActivePower2795;
+    }
+
+    /**
+     * 获取28次谐波有功功率-最大值
+     *
+     * @return HARMONIC_ACTIVE_POWER_28_MAX - 28次谐波有功功率-最大值
+     */
+    public Double getHarmonicActivePower28Max() {
+        return harmonicActivePower28Max;
+    }
+
+    /**
+     * 设置28次谐波有功功率-最大值
+     *
+     * @param harmonicActivePower28Max 28次谐波有功功率-最大值
+     */
+    public void setHarmonicActivePower28Max(Double harmonicActivePower28Max) {
+        this.harmonicActivePower28Max = harmonicActivePower28Max;
+    }
+
+    /**
+     * 获取28次谐波有功功率-最小值
+     *
+     * @return HARMONIC_ACTIVE_POWER_28_MIN - 28次谐波有功功率-最小值
+     */
+    public Double getHarmonicActivePower28Min() {
+        return harmonicActivePower28Min;
+    }
+
+    /**
+     * 设置28次谐波有功功率-最小值
+     *
+     * @param harmonicActivePower28Min 28次谐波有功功率-最小值
+     */
+    public void setHarmonicActivePower28Min(Double harmonicActivePower28Min) {
+        this.harmonicActivePower28Min = harmonicActivePower28Min;
+    }
+
+    /**
+     * 获取28次谐波有功功率-平均值
+     *
+     * @return HARMONIC_ACTIVE_POWER_28_AVG - 28次谐波有功功率-平均值
+     */
+    public Double getHarmonicActivePower28Avg() {
+        return harmonicActivePower28Avg;
+    }
+
+    /**
+     * 设置28次谐波有功功率-平均值
+     *
+     * @param harmonicActivePower28Avg 28次谐波有功功率-平均值
+     */
+    public void setHarmonicActivePower28Avg(Double harmonicActivePower28Avg) {
+        this.harmonicActivePower28Avg = harmonicActivePower28Avg;
+    }
+
+    /**
+     * 获取28次谐波有功功率-95值
+     *
+     * @return HARMONIC_ACTIVE_POWER_28_95 - 28次谐波有功功率-95值
+     */
+    public Double getHarmonicActivePower2895() {
+        return harmonicActivePower2895;
+    }
+
+    /**
+     * 设置28次谐波有功功率-95值
+     *
+     * @param harmonicActivePower2895 28次谐波有功功率-95值
+     */
+    public void setHarmonicActivePower2895(Double harmonicActivePower2895) {
+        this.harmonicActivePower2895 = harmonicActivePower2895;
+    }
+
+    /**
+     * 获取29次谐波有功功率-最大值
+     *
+     * @return HARMONIC_ACTIVE_POWER_29_MAX - 29次谐波有功功率-最大值
+     */
+    public Double getHarmonicActivePower29Max() {
+        return harmonicActivePower29Max;
+    }
+
+    /**
+     * 设置29次谐波有功功率-最大值
+     *
+     * @param harmonicActivePower29Max 29次谐波有功功率-最大值
+     */
+    public void setHarmonicActivePower29Max(Double harmonicActivePower29Max) {
+        this.harmonicActivePower29Max = harmonicActivePower29Max;
+    }
+
+    /**
+     * 获取29次谐波有功功率-最小值
+     *
+     * @return HARMONIC_ACTIVE_POWER_29_MIN - 29次谐波有功功率-最小值
+     */
+    public Double getHarmonicActivePower29Min() {
+        return harmonicActivePower29Min;
+    }
+
+    /**
+     * 设置29次谐波有功功率-最小值
+     *
+     * @param harmonicActivePower29Min 29次谐波有功功率-最小值
+     */
+    public void setHarmonicActivePower29Min(Double harmonicActivePower29Min) {
+        this.harmonicActivePower29Min = harmonicActivePower29Min;
+    }
+
+    /**
+     * 获取29次谐波有功功率-平均值
+     *
+     * @return HARMONIC_ACTIVE_POWER_29_AVG - 29次谐波有功功率-平均值
+     */
+    public Double getHarmonicActivePower29Avg() {
+        return harmonicActivePower29Avg;
+    }
+
+    /**
+     * 设置29次谐波有功功率-平均值
+     *
+     * @param harmonicActivePower29Avg 29次谐波有功功率-平均值
+     */
+    public void setHarmonicActivePower29Avg(Double harmonicActivePower29Avg) {
+        this.harmonicActivePower29Avg = harmonicActivePower29Avg;
+    }
+
+    /**
+     * 获取29次谐波有功功率-95值
+     *
+     * @return HARMONIC_ACTIVE_POWER_29_95 - 29次谐波有功功率-95值
+     */
+    public Double getHarmonicActivePower2995() {
+        return harmonicActivePower2995;
+    }
+
+    /**
+     * 设置29次谐波有功功率-95值
+     *
+     * @param harmonicActivePower2995 29次谐波有功功率-95值
+     */
+    public void setHarmonicActivePower2995(Double harmonicActivePower2995) {
+        this.harmonicActivePower2995 = harmonicActivePower2995;
+    }
+
+    /**
+     * 获取30次谐波有功功率-最大值
+     *
+     * @return HARMONIC_ACTIVE_POWER_30_MAX - 30次谐波有功功率-最大值
+     */
+    public Double getHarmonicActivePower30Max() {
+        return harmonicActivePower30Max;
+    }
+
+    /**
+     * 设置30次谐波有功功率-最大值
+     *
+     * @param harmonicActivePower30Max 30次谐波有功功率-最大值
+     */
+    public void setHarmonicActivePower30Max(Double harmonicActivePower30Max) {
+        this.harmonicActivePower30Max = harmonicActivePower30Max;
+    }
+
+    /**
+     * 获取30次谐波有功功率-最小值
+     *
+     * @return HARMONIC_ACTIVE_POWER_30_MIN - 30次谐波有功功率-最小值
+     */
+    public Double getHarmonicActivePower30Min() {
+        return harmonicActivePower30Min;
+    }
+
+    /**
+     * 设置30次谐波有功功率-最小值
+     *
+     * @param harmonicActivePower30Min 30次谐波有功功率-最小值
+     */
+    public void setHarmonicActivePower30Min(Double harmonicActivePower30Min) {
+        this.harmonicActivePower30Min = harmonicActivePower30Min;
+    }
+
+    /**
+     * 获取30次谐波有功功率-平均值
+     *
+     * @return HARMONIC_ACTIVE_POWER_30_AVG - 30次谐波有功功率-平均值
+     */
+    public Double getHarmonicActivePower30Avg() {
+        return harmonicActivePower30Avg;
+    }
+
+    /**
+     * 设置30次谐波有功功率-平均值
+     *
+     * @param harmonicActivePower30Avg 30次谐波有功功率-平均值
+     */
+    public void setHarmonicActivePower30Avg(Double harmonicActivePower30Avg) {
+        this.harmonicActivePower30Avg = harmonicActivePower30Avg;
+    }
+
+    /**
+     * 获取30次谐波有功功率-95值
+     *
+     * @return HARMONIC_ACTIVE_POWER_30_95 - 30次谐波有功功率-95值
+     */
+    public Double getHarmonicActivePower3095() {
+        return harmonicActivePower3095;
+    }
+
+    /**
+     * 设置30次谐波有功功率-95值
+     *
+     * @param harmonicActivePower3095 30次谐波有功功率-95值
+     */
+    public void setHarmonicActivePower3095(Double harmonicActivePower3095) {
+        this.harmonicActivePower3095 = harmonicActivePower3095;
+    }
+
+    /**
+     * 获取31次谐波有功功率-最大值
+     *
+     * @return HARMONIC_ACTIVE_POWER_31_MAX - 31次谐波有功功率-最大值
+     */
+    public Double getHarmonicActivePower31Max() {
+        return harmonicActivePower31Max;
+    }
+
+    /**
+     * 设置31次谐波有功功率-最大值
+     *
+     * @param harmonicActivePower31Max 31次谐波有功功率-最大值
+     */
+    public void setHarmonicActivePower31Max(Double harmonicActivePower31Max) {
+        this.harmonicActivePower31Max = harmonicActivePower31Max;
+    }
+
+    /**
+     * 获取31次谐波有功功率-最小值
+     *
+     * @return HARMONIC_ACTIVE_POWER_31_MIN - 31次谐波有功功率-最小值
+     */
+    public Double getHarmonicActivePower31Min() {
+        return harmonicActivePower31Min;
+    }
+
+    /**
+     * 设置31次谐波有功功率-最小值
+     *
+     * @param harmonicActivePower31Min 31次谐波有功功率-最小值
+     */
+    public void setHarmonicActivePower31Min(Double harmonicActivePower31Min) {
+        this.harmonicActivePower31Min = harmonicActivePower31Min;
+    }
+
+    /**
+     * 获取31次谐波有功功率-平均值
+     *
+     * @return HARMONIC_ACTIVE_POWER_31_AVG - 31次谐波有功功率-平均值
+     */
+    public Double getHarmonicActivePower31Avg() {
+        return harmonicActivePower31Avg;
+    }
+
+    /**
+     * 设置31次谐波有功功率-平均值
+     *
+     * @param harmonicActivePower31Avg 31次谐波有功功率-平均值
+     */
+    public void setHarmonicActivePower31Avg(Double harmonicActivePower31Avg) {
+        this.harmonicActivePower31Avg = harmonicActivePower31Avg;
+    }
+
+    /**
+     * 获取31次谐波有功功率-95值
+     *
+     * @return HARMONIC_ACTIVE_POWER_31_95 - 31次谐波有功功率-95值
+     */
+    public Double getHarmonicActivePower3195() {
+        return harmonicActivePower3195;
+    }
+
+    /**
+     * 设置31次谐波有功功率-95值
+     *
+     * @param harmonicActivePower3195 31次谐波有功功率-95值
+     */
+    public void setHarmonicActivePower3195(Double harmonicActivePower3195) {
+        this.harmonicActivePower3195 = harmonicActivePower3195;
+    }
+
+    /**
+     * 获取32次谐波有功功率-最大值
+     *
+     * @return HARMONIC_ACTIVE_POWER_32_MAX - 32次谐波有功功率-最大值
+     */
+    public Double getHarmonicActivePower32Max() {
+        return harmonicActivePower32Max;
+    }
+
+    /**
+     * 设置32次谐波有功功率-最大值
+     *
+     * @param harmonicActivePower32Max 32次谐波有功功率-最大值
+     */
+    public void setHarmonicActivePower32Max(Double harmonicActivePower32Max) {
+        this.harmonicActivePower32Max = harmonicActivePower32Max;
+    }
+
+    /**
+     * 获取32次谐波有功功率-最小值
+     *
+     * @return HARMONIC_ACTIVE_POWER_32_MIN - 32次谐波有功功率-最小值
+     */
+    public Double getHarmonicActivePower32Min() {
+        return harmonicActivePower32Min;
+    }
+
+    /**
+     * 设置32次谐波有功功率-最小值
+     *
+     * @param harmonicActivePower32Min 32次谐波有功功率-最小值
+     */
+    public void setHarmonicActivePower32Min(Double harmonicActivePower32Min) {
+        this.harmonicActivePower32Min = harmonicActivePower32Min;
+    }
+
+    /**
+     * 获取32次谐波有功功率-平均值
+     *
+     * @return HARMONIC_ACTIVE_POWER_32_AVG - 32次谐波有功功率-平均值
+     */
+    public Double getHarmonicActivePower32Avg() {
+        return harmonicActivePower32Avg;
+    }
+
+    /**
+     * 设置32次谐波有功功率-平均值
+     *
+     * @param harmonicActivePower32Avg 32次谐波有功功率-平均值
+     */
+    public void setHarmonicActivePower32Avg(Double harmonicActivePower32Avg) {
+        this.harmonicActivePower32Avg = harmonicActivePower32Avg;
+    }
+
+    /**
+     * 获取32次谐波有功功率-95值
+     *
+     * @return HARMONIC_ACTIVE_POWER_32_95 - 32次谐波有功功率-95值
+     */
+    public Double getHarmonicActivePower3295() {
+        return harmonicActivePower3295;
+    }
+
+    /**
+     * 设置32次谐波有功功率-95值
+     *
+     * @param harmonicActivePower3295 32次谐波有功功率-95值
+     */
+    public void setHarmonicActivePower3295(Double harmonicActivePower3295) {
+        this.harmonicActivePower3295 = harmonicActivePower3295;
+    }
+
+    /**
+     * 获取33次谐波有功功率-最大值
+     *
+     * @return HARMONIC_ACTIVE_POWER_33_MAX - 33次谐波有功功率-最大值
+     */
+    public Double getHarmonicActivePower33Max() {
+        return harmonicActivePower33Max;
+    }
+
+    /**
+     * 设置33次谐波有功功率-最大值
+     *
+     * @param harmonicActivePower33Max 33次谐波有功功率-最大值
+     */
+    public void setHarmonicActivePower33Max(Double harmonicActivePower33Max) {
+        this.harmonicActivePower33Max = harmonicActivePower33Max;
+    }
+
+    /**
+     * 获取33次谐波有功功率-最小值
+     *
+     * @return HARMONIC_ACTIVE_POWER_33_MIN - 33次谐波有功功率-最小值
+     */
+    public Double getHarmonicActivePower33Min() {
+        return harmonicActivePower33Min;
+    }
+
+    /**
+     * 设置33次谐波有功功率-最小值
+     *
+     * @param harmonicActivePower33Min 33次谐波有功功率-最小值
+     */
+    public void setHarmonicActivePower33Min(Double harmonicActivePower33Min) {
+        this.harmonicActivePower33Min = harmonicActivePower33Min;
+    }
+
+    /**
+     * 获取33次谐波有功功率-平均值
+     *
+     * @return HARMONIC_ACTIVE_POWER_33_AVG - 33次谐波有功功率-平均值
+     */
+    public Double getHarmonicActivePower33Avg() {
+        return harmonicActivePower33Avg;
+    }
+
+    /**
+     * 设置33次谐波有功功率-平均值
+     *
+     * @param harmonicActivePower33Avg 33次谐波有功功率-平均值
+     */
+    public void setHarmonicActivePower33Avg(Double harmonicActivePower33Avg) {
+        this.harmonicActivePower33Avg = harmonicActivePower33Avg;
+    }
+
+    /**
+     * 获取33次谐波有功功率-95值
+     *
+     * @return HARMONIC_ACTIVE_POWER_33_95 - 33次谐波有功功率-95值
+     */
+    public Double getHarmonicActivePower3395() {
+        return harmonicActivePower3395;
+    }
+
+    /**
+     * 设置33次谐波有功功率-95值
+     *
+     * @param harmonicActivePower3395 33次谐波有功功率-95值
+     */
+    public void setHarmonicActivePower3395(Double harmonicActivePower3395) {
+        this.harmonicActivePower3395 = harmonicActivePower3395;
+    }
+
+    /**
+     * 获取34次谐波有功功率-最大值
+     *
+     * @return HARMONIC_ACTIVE_POWER_34_MAX - 34次谐波有功功率-最大值
+     */
+    public Double getHarmonicActivePower34Max() {
+        return harmonicActivePower34Max;
+    }
+
+    /**
+     * 设置34次谐波有功功率-最大值
+     *
+     * @param harmonicActivePower34Max 34次谐波有功功率-最大值
+     */
+    public void setHarmonicActivePower34Max(Double harmonicActivePower34Max) {
+        this.harmonicActivePower34Max = harmonicActivePower34Max;
+    }
+
+    /**
+     * 获取34次谐波有功功率-最小值
+     *
+     * @return HARMONIC_ACTIVE_POWER_34_MIN - 34次谐波有功功率-最小值
+     */
+    public Double getHarmonicActivePower34Min() {
+        return harmonicActivePower34Min;
+    }
+
+    /**
+     * 设置34次谐波有功功率-最小值
+     *
+     * @param harmonicActivePower34Min 34次谐波有功功率-最小值
+     */
+    public void setHarmonicActivePower34Min(Double harmonicActivePower34Min) {
+        this.harmonicActivePower34Min = harmonicActivePower34Min;
+    }
+
+    /**
+     * 获取34次谐波有功功率-平均值
+     *
+     * @return HARMONIC_ACTIVE_POWER_34_AVG - 34次谐波有功功率-平均值
+     */
+    public Double getHarmonicActivePower34Avg() {
+        return harmonicActivePower34Avg;
+    }
+
+    /**
+     * 设置34次谐波有功功率-平均值
+     *
+     * @param harmonicActivePower34Avg 34次谐波有功功率-平均值
+     */
+    public void setHarmonicActivePower34Avg(Double harmonicActivePower34Avg) {
+        this.harmonicActivePower34Avg = harmonicActivePower34Avg;
+    }
+
+    /**
+     * 获取34次谐波有功功率-95值
+     *
+     * @return HARMONIC_ACTIVE_POWER_34_95 - 34次谐波有功功率-95值
+     */
+    public Double getHarmonicActivePower3495() {
+        return harmonicActivePower3495;
+    }
+
+    /**
+     * 设置34次谐波有功功率-95值
+     *
+     * @param harmonicActivePower3495 34次谐波有功功率-95值
+     */
+    public void setHarmonicActivePower3495(Double harmonicActivePower3495) {
+        this.harmonicActivePower3495 = harmonicActivePower3495;
+    }
+
+    /**
+     * 获取35次谐波有功功率-最大值
+     *
+     * @return HARMONIC_ACTIVE_POWER_35_MAX - 35次谐波有功功率-最大值
+     */
+    public Double getHarmonicActivePower35Max() {
+        return harmonicActivePower35Max;
+    }
+
+    /**
+     * 设置35次谐波有功功率-最大值
+     *
+     * @param harmonicActivePower35Max 35次谐波有功功率-最大值
+     */
+    public void setHarmonicActivePower35Max(Double harmonicActivePower35Max) {
+        this.harmonicActivePower35Max = harmonicActivePower35Max;
+    }
+
+    /**
+     * 获取35次谐波有功功率-最小值
+     *
+     * @return HARMONIC_ACTIVE_POWER_35_MIN - 35次谐波有功功率-最小值
+     */
+    public Double getHarmonicActivePower35Min() {
+        return harmonicActivePower35Min;
+    }
+
+    /**
+     * 设置35次谐波有功功率-最小值
+     *
+     * @param harmonicActivePower35Min 35次谐波有功功率-最小值
+     */
+    public void setHarmonicActivePower35Min(Double harmonicActivePower35Min) {
+        this.harmonicActivePower35Min = harmonicActivePower35Min;
+    }
+
+    /**
+     * 获取35次谐波有功功率-平均值
+     *
+     * @return HARMONIC_ACTIVE_POWER_35_AVG - 35次谐波有功功率-平均值
+     */
+    public Double getHarmonicActivePower35Avg() {
+        return harmonicActivePower35Avg;
+    }
+
+    /**
+     * 设置35次谐波有功功率-平均值
+     *
+     * @param harmonicActivePower35Avg 35次谐波有功功率-平均值
+     */
+    public void setHarmonicActivePower35Avg(Double harmonicActivePower35Avg) {
+        this.harmonicActivePower35Avg = harmonicActivePower35Avg;
+    }
+
+    /**
+     * 获取35次谐波有功功率-95值
+     *
+     * @return HARMONIC_ACTIVE_POWER_35_95 - 35次谐波有功功率-95值
+     */
+    public Double getHarmonicActivePower3595() {
+        return harmonicActivePower3595;
+    }
+
+    /**
+     * 设置35次谐波有功功率-95值
+     *
+     * @param harmonicActivePower3595 35次谐波有功功率-95值
+     */
+    public void setHarmonicActivePower3595(Double harmonicActivePower3595) {
+        this.harmonicActivePower3595 = harmonicActivePower3595;
+    }
+
+    /**
+     * 获取36次谐波有功功率-最大值
+     *
+     * @return HARMONIC_ACTIVE_POWER_36_MAX - 36次谐波有功功率-最大值
+     */
+    public Double getHarmonicActivePower36Max() {
+        return harmonicActivePower36Max;
+    }
+
+    /**
+     * 设置36次谐波有功功率-最大值
+     *
+     * @param harmonicActivePower36Max 36次谐波有功功率-最大值
+     */
+    public void setHarmonicActivePower36Max(Double harmonicActivePower36Max) {
+        this.harmonicActivePower36Max = harmonicActivePower36Max;
+    }
+
+    /**
+     * 获取36次谐波有功功率-最小值
+     *
+     * @return HARMONIC_ACTIVE_POWER_36_MIN - 36次谐波有功功率-最小值
+     */
+    public Double getHarmonicActivePower36Min() {
+        return harmonicActivePower36Min;
+    }
+
+    /**
+     * 设置36次谐波有功功率-最小值
+     *
+     * @param harmonicActivePower36Min 36次谐波有功功率-最小值
+     */
+    public void setHarmonicActivePower36Min(Double harmonicActivePower36Min) {
+        this.harmonicActivePower36Min = harmonicActivePower36Min;
+    }
+
+    /**
+     * 获取36次谐波有功功率-平均值
+     *
+     * @return HARMONIC_ACTIVE_POWER_36_AVG - 36次谐波有功功率-平均值
+     */
+    public Double getHarmonicActivePower36Avg() {
+        return harmonicActivePower36Avg;
+    }
+
+    /**
+     * 设置36次谐波有功功率-平均值
+     *
+     * @param harmonicActivePower36Avg 36次谐波有功功率-平均值
+     */
+    public void setHarmonicActivePower36Avg(Double harmonicActivePower36Avg) {
+        this.harmonicActivePower36Avg = harmonicActivePower36Avg;
+    }
+
+    /**
+     * 获取36次谐波有功功率-95值
+     *
+     * @return HARMONIC_ACTIVE_POWER_36_95 - 36次谐波有功功率-95值
+     */
+    public Double getHarmonicActivePower3695() {
+        return harmonicActivePower3695;
+    }
+
+    /**
+     * 设置36次谐波有功功率-95值
+     *
+     * @param harmonicActivePower3695 36次谐波有功功率-95值
+     */
+    public void setHarmonicActivePower3695(Double harmonicActivePower3695) {
+        this.harmonicActivePower3695 = harmonicActivePower3695;
+    }
+
+    /**
+     * 获取37次谐波有功功率-最大值
+     *
+     * @return HARMONIC_ACTIVE_POWER_37_MAX - 37次谐波有功功率-最大值
+     */
+    public Double getHarmonicActivePower37Max() {
+        return harmonicActivePower37Max;
+    }
+
+    /**
+     * 设置37次谐波有功功率-最大值
+     *
+     * @param harmonicActivePower37Max 37次谐波有功功率-最大值
+     */
+    public void setHarmonicActivePower37Max(Double harmonicActivePower37Max) {
+        this.harmonicActivePower37Max = harmonicActivePower37Max;
+    }
+
+    /**
+     * 获取37次谐波有功功率-最小值
+     *
+     * @return HARMONIC_ACTIVE_POWER_37_MIN - 37次谐波有功功率-最小值
+     */
+    public Double getHarmonicActivePower37Min() {
+        return harmonicActivePower37Min;
+    }
+
+    /**
+     * 设置37次谐波有功功率-最小值
+     *
+     * @param harmonicActivePower37Min 37次谐波有功功率-最小值
+     */
+    public void setHarmonicActivePower37Min(Double harmonicActivePower37Min) {
+        this.harmonicActivePower37Min = harmonicActivePower37Min;
+    }
+
+    /**
+     * 获取37次谐波有功功率-平均值
+     *
+     * @return HARMONIC_ACTIVE_POWER_37_AVG - 37次谐波有功功率-平均值
+     */
+    public Double getHarmonicActivePower37Avg() {
+        return harmonicActivePower37Avg;
+    }
+
+    /**
+     * 设置37次谐波有功功率-平均值
+     *
+     * @param harmonicActivePower37Avg 37次谐波有功功率-平均值
+     */
+    public void setHarmonicActivePower37Avg(Double harmonicActivePower37Avg) {
+        this.harmonicActivePower37Avg = harmonicActivePower37Avg;
+    }
+
+    /**
+     * 获取37次谐波有功功率-95值
+     *
+     * @return HARMONIC_ACTIVE_POWER_37_95 - 37次谐波有功功率-95值
+     */
+    public Double getHarmonicActivePower3795() {
+        return harmonicActivePower3795;
+    }
+
+    /**
+     * 设置37次谐波有功功率-95值
+     *
+     * @param harmonicActivePower3795 37次谐波有功功率-95值
+     */
+    public void setHarmonicActivePower3795(Double harmonicActivePower3795) {
+        this.harmonicActivePower3795 = harmonicActivePower3795;
+    }
+
+    /**
+     * 获取38次谐波有功功率-最大值
+     *
+     * @return HARMONIC_ACTIVE_POWER_38_MAX - 38次谐波有功功率-最大值
+     */
+    public Double getHarmonicActivePower38Max() {
+        return harmonicActivePower38Max;
+    }
+
+    /**
+     * 设置38次谐波有功功率-最大值
+     *
+     * @param harmonicActivePower38Max 38次谐波有功功率-最大值
+     */
+    public void setHarmonicActivePower38Max(Double harmonicActivePower38Max) {
+        this.harmonicActivePower38Max = harmonicActivePower38Max;
+    }
+
+    /**
+     * 获取38次谐波有功功率-最小值
+     *
+     * @return HARMONIC_ACTIVE_POWER_38_MIN - 38次谐波有功功率-最小值
+     */
+    public Double getHarmonicActivePower38Min() {
+        return harmonicActivePower38Min;
+    }
+
+    /**
+     * 设置38次谐波有功功率-最小值
+     *
+     * @param harmonicActivePower38Min 38次谐波有功功率-最小值
+     */
+    public void setHarmonicActivePower38Min(Double harmonicActivePower38Min) {
+        this.harmonicActivePower38Min = harmonicActivePower38Min;
+    }
+
+    /**
+     * 获取38次谐波有功功率-平均值
+     *
+     * @return HARMONIC_ACTIVE_POWER_38_AVG - 38次谐波有功功率-平均值
+     */
+    public Double getHarmonicActivePower38Avg() {
+        return harmonicActivePower38Avg;
+    }
+
+    /**
+     * 设置38次谐波有功功率-平均值
+     *
+     * @param harmonicActivePower38Avg 38次谐波有功功率-平均值
+     */
+    public void setHarmonicActivePower38Avg(Double harmonicActivePower38Avg) {
+        this.harmonicActivePower38Avg = harmonicActivePower38Avg;
+    }
+
+    /**
+     * 获取38次谐波有功功率-95值
+     *
+     * @return HARMONIC_ACTIVE_POWER_38_95 - 38次谐波有功功率-95值
+     */
+    public Double getHarmonicActivePower3895() {
+        return harmonicActivePower3895;
+    }
+
+    /**
+     * 设置38次谐波有功功率-95值
+     *
+     * @param harmonicActivePower3895 38次谐波有功功率-95值
+     */
+    public void setHarmonicActivePower3895(Double harmonicActivePower3895) {
+        this.harmonicActivePower3895 = harmonicActivePower3895;
+    }
+
+    /**
+     * 获取39次谐波有功功率-最大值
+     *
+     * @return HARMONIC_ACTIVE_POWER_39_MAX - 39次谐波有功功率-最大值
+     */
+    public Double getHarmonicActivePower39Max() {
+        return harmonicActivePower39Max;
+    }
+
+    /**
+     * 设置39次谐波有功功率-最大值
+     *
+     * @param harmonicActivePower39Max 39次谐波有功功率-最大值
+     */
+    public void setHarmonicActivePower39Max(Double harmonicActivePower39Max) {
+        this.harmonicActivePower39Max = harmonicActivePower39Max;
+    }
+
+    /**
+     * 获取39次谐波有功功率-最小值
+     *
+     * @return HARMONIC_ACTIVE_POWER_39_MIN - 39次谐波有功功率-最小值
+     */
+    public Double getHarmonicActivePower39Min() {
+        return harmonicActivePower39Min;
+    }
+
+    /**
+     * 设置39次谐波有功功率-最小值
+     *
+     * @param harmonicActivePower39Min 39次谐波有功功率-最小值
+     */
+    public void setHarmonicActivePower39Min(Double harmonicActivePower39Min) {
+        this.harmonicActivePower39Min = harmonicActivePower39Min;
+    }
+
+    /**
+     * 获取39次谐波有功功率-平均值
+     *
+     * @return HARMONIC_ACTIVE_POWER_39_AVG - 39次谐波有功功率-平均值
+     */
+    public Double getHarmonicActivePower39Avg() {
+        return harmonicActivePower39Avg;
+    }
+
+    /**
+     * 设置39次谐波有功功率-平均值
+     *
+     * @param harmonicActivePower39Avg 39次谐波有功功率-平均值
+     */
+    public void setHarmonicActivePower39Avg(Double harmonicActivePower39Avg) {
+        this.harmonicActivePower39Avg = harmonicActivePower39Avg;
+    }
+
+    /**
+     * 获取39次谐波有功功率-95值
+     *
+     * @return HARMONIC_ACTIVE_POWER_39_95 - 39次谐波有功功率-95值
+     */
+    public Double getHarmonicActivePower3995() {
+        return harmonicActivePower3995;
+    }
+
+    /**
+     * 设置39次谐波有功功率-95值
+     *
+     * @param harmonicActivePower3995 39次谐波有功功率-95值
+     */
+    public void setHarmonicActivePower3995(Double harmonicActivePower3995) {
+        this.harmonicActivePower3995 = harmonicActivePower3995;
+    }
+
+    /**
+     * 获取40次谐波有功功率-最大值
+     *
+     * @return HARMONIC_ACTIVE_POWER_40_MAX - 40次谐波有功功率-最大值
+     */
+    public Double getHarmonicActivePower40Max() {
+        return harmonicActivePower40Max;
+    }
+
+    /**
+     * 设置40次谐波有功功率-最大值
+     *
+     * @param harmonicActivePower40Max 40次谐波有功功率-最大值
+     */
+    public void setHarmonicActivePower40Max(Double harmonicActivePower40Max) {
+        this.harmonicActivePower40Max = harmonicActivePower40Max;
+    }
+
+    /**
+     * 获取40次谐波有功功率-最小值
+     *
+     * @return HARMONIC_ACTIVE_POWER_40_MIN - 40次谐波有功功率-最小值
+     */
+    public Double getHarmonicActivePower40Min() {
+        return harmonicActivePower40Min;
+    }
+
+    /**
+     * 设置40次谐波有功功率-最小值
+     *
+     * @param harmonicActivePower40Min 40次谐波有功功率-最小值
+     */
+    public void setHarmonicActivePower40Min(Double harmonicActivePower40Min) {
+        this.harmonicActivePower40Min = harmonicActivePower40Min;
+    }
+
+    /**
+     * 获取40次谐波有功功率-平均值
+     *
+     * @return HARMONIC_ACTIVE_POWER_40_AVG - 40次谐波有功功率-平均值
+     */
+    public Double getHarmonicActivePower40Avg() {
+        return harmonicActivePower40Avg;
+    }
+
+    /**
+     * 设置40次谐波有功功率-平均值
+     *
+     * @param harmonicActivePower40Avg 40次谐波有功功率-平均值
+     */
+    public void setHarmonicActivePower40Avg(Double harmonicActivePower40Avg) {
+        this.harmonicActivePower40Avg = harmonicActivePower40Avg;
+    }
+
+    /**
+     * 获取40次谐波有功功率-95值
+     *
+     * @return HARMONIC_ACTIVE_POWER_40_95 - 40次谐波有功功率-95值
+     */
+    public Double getHarmonicActivePower4095() {
+        return harmonicActivePower4095;
+    }
+
+    /**
+     * 设置40次谐波有功功率-95值
+     *
+     * @param harmonicActivePower4095 40次谐波有功功率-95值
+     */
+    public void setHarmonicActivePower4095(Double harmonicActivePower4095) {
+        this.harmonicActivePower4095 = harmonicActivePower4095;
+    }
+
+    /**
+     * 获取41次谐波有功功率-最大值
+     *
+     * @return HARMONIC_ACTIVE_POWER_41_MAX - 41次谐波有功功率-最大值
+     */
+    public Double getHarmonicActivePower41Max() {
+        return harmonicActivePower41Max;
+    }
+
+    /**
+     * 设置41次谐波有功功率-最大值
+     *
+     * @param harmonicActivePower41Max 41次谐波有功功率-最大值
+     */
+    public void setHarmonicActivePower41Max(Double harmonicActivePower41Max) {
+        this.harmonicActivePower41Max = harmonicActivePower41Max;
+    }
+
+    /**
+     * 获取41次谐波有功功率-最小值
+     *
+     * @return HARMONIC_ACTIVE_POWER_41_MIN - 41次谐波有功功率-最小值
+     */
+    public Double getHarmonicActivePower41Min() {
+        return harmonicActivePower41Min;
+    }
+
+    /**
+     * 设置41次谐波有功功率-最小值
+     *
+     * @param harmonicActivePower41Min 41次谐波有功功率-最小值
+     */
+    public void setHarmonicActivePower41Min(Double harmonicActivePower41Min) {
+        this.harmonicActivePower41Min = harmonicActivePower41Min;
+    }
+
+    /**
+     * 获取41次谐波有功功率-平均值
+     *
+     * @return HARMONIC_ACTIVE_POWER_41_AVG - 41次谐波有功功率-平均值
+     */
+    public Double getHarmonicActivePower41Avg() {
+        return harmonicActivePower41Avg;
+    }
+
+    /**
+     * 设置41次谐波有功功率-平均值
+     *
+     * @param harmonicActivePower41Avg 41次谐波有功功率-平均值
+     */
+    public void setHarmonicActivePower41Avg(Double harmonicActivePower41Avg) {
+        this.harmonicActivePower41Avg = harmonicActivePower41Avg;
+    }
+
+    /**
+     * 获取41次谐波有功功率-95值
+     *
+     * @return HARMONIC_ACTIVE_POWER_41_95 - 41次谐波有功功率-95值
+     */
+    public Double getHarmonicActivePower4195() {
+        return harmonicActivePower4195;
+    }
+
+    /**
+     * 设置41次谐波有功功率-95值
+     *
+     * @param harmonicActivePower4195 41次谐波有功功率-95值
+     */
+    public void setHarmonicActivePower4195(Double harmonicActivePower4195) {
+        this.harmonicActivePower4195 = harmonicActivePower4195;
+    }
+
+    /**
+     * 获取42次谐波有功功率-最大值
+     *
+     * @return HARMONIC_ACTIVE_POWER_42_MAX - 42次谐波有功功率-最大值
+     */
+    public Double getHarmonicActivePower42Max() {
+        return harmonicActivePower42Max;
+    }
+
+    /**
+     * 设置42次谐波有功功率-最大值
+     *
+     * @param harmonicActivePower42Max 42次谐波有功功率-最大值
+     */
+    public void setHarmonicActivePower42Max(Double harmonicActivePower42Max) {
+        this.harmonicActivePower42Max = harmonicActivePower42Max;
+    }
+
+    /**
+     * 获取42次谐波有功功率-最小值
+     *
+     * @return HARMONIC_ACTIVE_POWER_42_MIN - 42次谐波有功功率-最小值
+     */
+    public Double getHarmonicActivePower42Min() {
+        return harmonicActivePower42Min;
+    }
+
+    /**
+     * 设置42次谐波有功功率-最小值
+     *
+     * @param harmonicActivePower42Min 42次谐波有功功率-最小值
+     */
+    public void setHarmonicActivePower42Min(Double harmonicActivePower42Min) {
+        this.harmonicActivePower42Min = harmonicActivePower42Min;
+    }
+
+    /**
+     * 获取42次谐波有功功率-平均值
+     *
+     * @return HARMONIC_ACTIVE_POWER_42_AVG - 42次谐波有功功率-平均值
+     */
+    public Double getHarmonicActivePower42Avg() {
+        return harmonicActivePower42Avg;
+    }
+
+    /**
+     * 设置42次谐波有功功率-平均值
+     *
+     * @param harmonicActivePower42Avg 42次谐波有功功率-平均值
+     */
+    public void setHarmonicActivePower42Avg(Double harmonicActivePower42Avg) {
+        this.harmonicActivePower42Avg = harmonicActivePower42Avg;
+    }
+
+    /**
+     * 获取42次谐波有功功率-95值
+     *
+     * @return HARMONIC_ACTIVE_POWER_42_95 - 42次谐波有功功率-95值
+     */
+    public Double getHarmonicActivePower4295() {
+        return harmonicActivePower4295;
+    }
+
+    /**
+     * 设置42次谐波有功功率-95值
+     *
+     * @param harmonicActivePower4295 42次谐波有功功率-95值
+     */
+    public void setHarmonicActivePower4295(Double harmonicActivePower4295) {
+        this.harmonicActivePower4295 = harmonicActivePower4295;
+    }
+
+    /**
+     * 获取43次谐波有功功率-最大值
+     *
+     * @return HARMONIC_ACTIVE_POWER_43_MAX - 43次谐波有功功率-最大值
+     */
+    public Double getHarmonicActivePower43Max() {
+        return harmonicActivePower43Max;
+    }
+
+    /**
+     * 设置43次谐波有功功率-最大值
+     *
+     * @param harmonicActivePower43Max 43次谐波有功功率-最大值
+     */
+    public void setHarmonicActivePower43Max(Double harmonicActivePower43Max) {
+        this.harmonicActivePower43Max = harmonicActivePower43Max;
+    }
+
+    /**
+     * 获取43次谐波有功功率-最小值
+     *
+     * @return HARMONIC_ACTIVE_POWER_43_MIN - 43次谐波有功功率-最小值
+     */
+    public Double getHarmonicActivePower43Min() {
+        return harmonicActivePower43Min;
+    }
+
+    /**
+     * 设置43次谐波有功功率-最小值
+     *
+     * @param harmonicActivePower43Min 43次谐波有功功率-最小值
+     */
+    public void setHarmonicActivePower43Min(Double harmonicActivePower43Min) {
+        this.harmonicActivePower43Min = harmonicActivePower43Min;
+    }
+
+    /**
+     * 获取43次谐波有功功率-平均值
+     *
+     * @return HARMONIC_ACTIVE_POWER_43_AVG - 43次谐波有功功率-平均值
+     */
+    public Double getHarmonicActivePower43Avg() {
+        return harmonicActivePower43Avg;
+    }
+
+    /**
+     * 设置43次谐波有功功率-平均值
+     *
+     * @param harmonicActivePower43Avg 43次谐波有功功率-平均值
+     */
+    public void setHarmonicActivePower43Avg(Double harmonicActivePower43Avg) {
+        this.harmonicActivePower43Avg = harmonicActivePower43Avg;
+    }
+
+    /**
+     * 获取43次谐波有功功率-95值
+     *
+     * @return HARMONIC_ACTIVE_POWER_43_95 - 43次谐波有功功率-95值
+     */
+    public Double getHarmonicActivePower4395() {
+        return harmonicActivePower4395;
+    }
+
+    /**
+     * 设置43次谐波有功功率-95值
+     *
+     * @param harmonicActivePower4395 43次谐波有功功率-95值
+     */
+    public void setHarmonicActivePower4395(Double harmonicActivePower4395) {
+        this.harmonicActivePower4395 = harmonicActivePower4395;
+    }
+
+    /**
+     * 获取44次谐波有功功率-最大值
+     *
+     * @return HARMONIC_ACTIVE_POWER_44_MAX - 44次谐波有功功率-最大值
+     */
+    public Double getHarmonicActivePower44Max() {
+        return harmonicActivePower44Max;
+    }
+
+    /**
+     * 设置44次谐波有功功率-最大值
+     *
+     * @param harmonicActivePower44Max 44次谐波有功功率-最大值
+     */
+    public void setHarmonicActivePower44Max(Double harmonicActivePower44Max) {
+        this.harmonicActivePower44Max = harmonicActivePower44Max;
+    }
+
+    /**
+     * 获取44次谐波有功功率-最小值
+     *
+     * @return HARMONIC_ACTIVE_POWER_44_MIN - 44次谐波有功功率-最小值
+     */
+    public Double getHarmonicActivePower44Min() {
+        return harmonicActivePower44Min;
+    }
+
+    /**
+     * 设置44次谐波有功功率-最小值
+     *
+     * @param harmonicActivePower44Min 44次谐波有功功率-最小值
+     */
+    public void setHarmonicActivePower44Min(Double harmonicActivePower44Min) {
+        this.harmonicActivePower44Min = harmonicActivePower44Min;
+    }
+
+    /**
+     * 获取44次谐波有功功率-平均值
+     *
+     * @return HARMONIC_ACTIVE_POWER_44_AVG - 44次谐波有功功率-平均值
+     */
+    public Double getHarmonicActivePower44Avg() {
+        return harmonicActivePower44Avg;
+    }
+
+    /**
+     * 设置44次谐波有功功率-平均值
+     *
+     * @param harmonicActivePower44Avg 44次谐波有功功率-平均值
+     */
+    public void setHarmonicActivePower44Avg(Double harmonicActivePower44Avg) {
+        this.harmonicActivePower44Avg = harmonicActivePower44Avg;
+    }
+
+    /**
+     * 获取44次谐波有功功率-95值
+     *
+     * @return HARMONIC_ACTIVE_POWER_44_95 - 44次谐波有功功率-95值
+     */
+    public Double getHarmonicActivePower4495() {
+        return harmonicActivePower4495;
+    }
+
+    /**
+     * 设置44次谐波有功功率-95值
+     *
+     * @param harmonicActivePower4495 44次谐波有功功率-95值
+     */
+    public void setHarmonicActivePower4495(Double harmonicActivePower4495) {
+        this.harmonicActivePower4495 = harmonicActivePower4495;
+    }
+
+    /**
+     * 获取45次谐波有功功率-最大值
+     *
+     * @return HARMONIC_ACTIVE_POWER_45_MAX - 45次谐波有功功率-最大值
+     */
+    public Double getHarmonicActivePower45Max() {
+        return harmonicActivePower45Max;
+    }
+
+    /**
+     * 设置45次谐波有功功率-最大值
+     *
+     * @param harmonicActivePower45Max 45次谐波有功功率-最大值
+     */
+    public void setHarmonicActivePower45Max(Double harmonicActivePower45Max) {
+        this.harmonicActivePower45Max = harmonicActivePower45Max;
+    }
+
+    /**
+     * 获取45次谐波有功功率-最小值
+     *
+     * @return HARMONIC_ACTIVE_POWER_45_MIN - 45次谐波有功功率-最小值
+     */
+    public Double getHarmonicActivePower45Min() {
+        return harmonicActivePower45Min;
+    }
+
+    /**
+     * 设置45次谐波有功功率-最小值
+     *
+     * @param harmonicActivePower45Min 45次谐波有功功率-最小值
+     */
+    public void setHarmonicActivePower45Min(Double harmonicActivePower45Min) {
+        this.harmonicActivePower45Min = harmonicActivePower45Min;
+    }
+
+    /**
+     * 获取45次谐波有功功率-平均值
+     *
+     * @return HARMONIC_ACTIVE_POWER_45_AVG - 45次谐波有功功率-平均值
+     */
+    public Double getHarmonicActivePower45Avg() {
+        return harmonicActivePower45Avg;
+    }
+
+    /**
+     * 设置45次谐波有功功率-平均值
+     *
+     * @param harmonicActivePower45Avg 45次谐波有功功率-平均值
+     */
+    public void setHarmonicActivePower45Avg(Double harmonicActivePower45Avg) {
+        this.harmonicActivePower45Avg = harmonicActivePower45Avg;
+    }
+
+    /**
+     * 获取45次谐波有功功率-95值
+     *
+     * @return HARMONIC_ACTIVE_POWER_45_95 - 45次谐波有功功率-95值
+     */
+    public Double getHarmonicActivePower4595() {
+        return harmonicActivePower4595;
+    }
+
+    /**
+     * 设置45次谐波有功功率-95值
+     *
+     * @param harmonicActivePower4595 45次谐波有功功率-95值
+     */
+    public void setHarmonicActivePower4595(Double harmonicActivePower4595) {
+        this.harmonicActivePower4595 = harmonicActivePower4595;
+    }
+
+    /**
+     * 获取46次谐波有功功率-最大值
+     *
+     * @return HARMONIC_ACTIVE_POWER_46_MAX - 46次谐波有功功率-最大值
+     */
+    public Double getHarmonicActivePower46Max() {
+        return harmonicActivePower46Max;
+    }
+
+    /**
+     * 设置46次谐波有功功率-最大值
+     *
+     * @param harmonicActivePower46Max 46次谐波有功功率-最大值
+     */
+    public void setHarmonicActivePower46Max(Double harmonicActivePower46Max) {
+        this.harmonicActivePower46Max = harmonicActivePower46Max;
+    }
+
+    /**
+     * 获取46次谐波有功功率-最小值
+     *
+     * @return HARMONIC_ACTIVE_POWER_46_MIN - 46次谐波有功功率-最小值
+     */
+    public Double getHarmonicActivePower46Min() {
+        return harmonicActivePower46Min;
+    }
+
+    /**
+     * 设置46次谐波有功功率-最小值
+     *
+     * @param harmonicActivePower46Min 46次谐波有功功率-最小值
+     */
+    public void setHarmonicActivePower46Min(Double harmonicActivePower46Min) {
+        this.harmonicActivePower46Min = harmonicActivePower46Min;
+    }
+
+    /**
+     * 获取46次谐波有功功率-平均值
+     *
+     * @return HARMONIC_ACTIVE_POWER_46_AVG - 46次谐波有功功率-平均值
+     */
+    public Double getHarmonicActivePower46Avg() {
+        return harmonicActivePower46Avg;
+    }
+
+    /**
+     * 设置46次谐波有功功率-平均值
+     *
+     * @param harmonicActivePower46Avg 46次谐波有功功率-平均值
+     */
+    public void setHarmonicActivePower46Avg(Double harmonicActivePower46Avg) {
+        this.harmonicActivePower46Avg = harmonicActivePower46Avg;
+    }
+
+    /**
+     * 获取46次谐波有功功率-95值
+     *
+     * @return HARMONIC_ACTIVE_POWER_46_95 - 46次谐波有功功率-95值
+     */
+    public Double getHarmonicActivePower4695() {
+        return harmonicActivePower4695;
+    }
+
+    /**
+     * 设置46次谐波有功功率-95值
+     *
+     * @param harmonicActivePower4695 46次谐波有功功率-95值
+     */
+    public void setHarmonicActivePower4695(Double harmonicActivePower4695) {
+        this.harmonicActivePower4695 = harmonicActivePower4695;
+    }
+
+    /**
+     * 获取47次谐波有功功率-最大值
+     *
+     * @return HARMONIC_ACTIVE_POWER_47_MAX - 47次谐波有功功率-最大值
+     */
+    public Double getHarmonicActivePower47Max() {
+        return harmonicActivePower47Max;
+    }
+
+    /**
+     * 设置47次谐波有功功率-最大值
+     *
+     * @param harmonicActivePower47Max 47次谐波有功功率-最大值
+     */
+    public void setHarmonicActivePower47Max(Double harmonicActivePower47Max) {
+        this.harmonicActivePower47Max = harmonicActivePower47Max;
+    }
+
+    /**
+     * 获取47次谐波有功功率-最小值
+     *
+     * @return HARMONIC_ACTIVE_POWER_47_MIN - 47次谐波有功功率-最小值
+     */
+    public Double getHarmonicActivePower47Min() {
+        return harmonicActivePower47Min;
+    }
+
+    /**
+     * 设置47次谐波有功功率-最小值
+     *
+     * @param harmonicActivePower47Min 47次谐波有功功率-最小值
+     */
+    public void setHarmonicActivePower47Min(Double harmonicActivePower47Min) {
+        this.harmonicActivePower47Min = harmonicActivePower47Min;
+    }
+
+    /**
+     * 获取47次谐波有功功率-平均值
+     *
+     * @return HARMONIC_ACTIVE_POWER_47_AVG - 47次谐波有功功率-平均值
+     */
+    public Double getHarmonicActivePower47Avg() {
+        return harmonicActivePower47Avg;
+    }
+
+    /**
+     * 设置47次谐波有功功率-平均值
+     *
+     * @param harmonicActivePower47Avg 47次谐波有功功率-平均值
+     */
+    public void setHarmonicActivePower47Avg(Double harmonicActivePower47Avg) {
+        this.harmonicActivePower47Avg = harmonicActivePower47Avg;
+    }
+
+    /**
+     * 获取47次谐波有功功率-95值
+     *
+     * @return HARMONIC_ACTIVE_POWER_47_95 - 47次谐波有功功率-95值
+     */
+    public Double getHarmonicActivePower4795() {
+        return harmonicActivePower4795;
+    }
+
+    /**
+     * 设置47次谐波有功功率-95值
+     *
+     * @param harmonicActivePower4795 47次谐波有功功率-95值
+     */
+    public void setHarmonicActivePower4795(Double harmonicActivePower4795) {
+        this.harmonicActivePower4795 = harmonicActivePower4795;
+    }
+
+    /**
+     * 获取48次谐波有功功率-最大值
+     *
+     * @return HARMONIC_ACTIVE_POWER_48_MAX - 48次谐波有功功率-最大值
+     */
+    public Double getHarmonicActivePower48Max() {
+        return harmonicActivePower48Max;
+    }
+
+    /**
+     * 设置48次谐波有功功率-最大值
+     *
+     * @param harmonicActivePower48Max 48次谐波有功功率-最大值
+     */
+    public void setHarmonicActivePower48Max(Double harmonicActivePower48Max) {
+        this.harmonicActivePower48Max = harmonicActivePower48Max;
+    }
+
+    /**
+     * 获取48次谐波有功功率-最小值
+     *
+     * @return HARMONIC_ACTIVE_POWER_48_MIN - 48次谐波有功功率-最小值
+     */
+    public Double getHarmonicActivePower48Min() {
+        return harmonicActivePower48Min;
+    }
+
+    /**
+     * 设置48次谐波有功功率-最小值
+     *
+     * @param harmonicActivePower48Min 48次谐波有功功率-最小值
+     */
+    public void setHarmonicActivePower48Min(Double harmonicActivePower48Min) {
+        this.harmonicActivePower48Min = harmonicActivePower48Min;
+    }
+
+    /**
+     * 获取48次谐波有功功率-平均值
+     *
+     * @return HARMONIC_ACTIVE_POWER_48_AVG - 48次谐波有功功率-平均值
+     */
+    public Double getHarmonicActivePower48Avg() {
+        return harmonicActivePower48Avg;
+    }
+
+    /**
+     * 设置48次谐波有功功率-平均值
+     *
+     * @param harmonicActivePower48Avg 48次谐波有功功率-平均值
+     */
+    public void setHarmonicActivePower48Avg(Double harmonicActivePower48Avg) {
+        this.harmonicActivePower48Avg = harmonicActivePower48Avg;
+    }
+
+    /**
+     * 获取48次谐波有功功率-95值
+     *
+     * @return HARMONIC_ACTIVE_POWER_48_95 - 48次谐波有功功率-95值
+     */
+    public Double getHarmonicActivePower4895() {
+        return harmonicActivePower4895;
+    }
+
+    /**
+     * 设置48次谐波有功功率-95值
+     *
+     * @param harmonicActivePower4895 48次谐波有功功率-95值
+     */
+    public void setHarmonicActivePower4895(Double harmonicActivePower4895) {
+        this.harmonicActivePower4895 = harmonicActivePower4895;
+    }
+
+    /**
+     * 获取49次谐波有功功率-最大值
+     *
+     * @return HARMONIC_ACTIVE_POWER_49_MAX - 49次谐波有功功率-最大值
+     */
+    public Double getHarmonicActivePower49Max() {
+        return harmonicActivePower49Max;
+    }
+
+    /**
+     * 设置49次谐波有功功率-最大值
+     *
+     * @param harmonicActivePower49Max 49次谐波有功功率-最大值
+     */
+    public void setHarmonicActivePower49Max(Double harmonicActivePower49Max) {
+        this.harmonicActivePower49Max = harmonicActivePower49Max;
+    }
+
+    /**
+     * 获取49次谐波有功功率-最小值
+     *
+     * @return HARMONIC_ACTIVE_POWER_49_MIN - 49次谐波有功功率-最小值
+     */
+    public Double getHarmonicActivePower49Min() {
+        return harmonicActivePower49Min;
+    }
+
+    /**
+     * 设置49次谐波有功功率-最小值
+     *
+     * @param harmonicActivePower49Min 49次谐波有功功率-最小值
+     */
+    public void setHarmonicActivePower49Min(Double harmonicActivePower49Min) {
+        this.harmonicActivePower49Min = harmonicActivePower49Min;
+    }
+
+    /**
+     * 获取49次谐波有功功率-平均值
+     *
+     * @return HARMONIC_ACTIVE_POWER_49_AVG - 49次谐波有功功率-平均值
+     */
+    public Double getHarmonicActivePower49Avg() {
+        return harmonicActivePower49Avg;
+    }
+
+    /**
+     * 设置49次谐波有功功率-平均值
+     *
+     * @param harmonicActivePower49Avg 49次谐波有功功率-平均值
+     */
+    public void setHarmonicActivePower49Avg(Double harmonicActivePower49Avg) {
+        this.harmonicActivePower49Avg = harmonicActivePower49Avg;
+    }
+
+    /**
+     * 获取49次谐波有功功率-95值
+     *
+     * @return HARMONIC_ACTIVE_POWER_49_95 - 49次谐波有功功率-95值
+     */
+    public Double getHarmonicActivePower4995() {
+        return harmonicActivePower4995;
+    }
+
+    /**
+     * 设置49次谐波有功功率-95值
+     *
+     * @param harmonicActivePower4995 49次谐波有功功率-95值
+     */
+    public void setHarmonicActivePower4995(Double harmonicActivePower4995) {
+        this.harmonicActivePower4995 = harmonicActivePower4995;
+    }
+
+    /**
+     * 获取50次谐波有功功率-最大值
+     *
+     * @return HARMONIC_ACTIVE_POWER_50_MAX - 50次谐波有功功率-最大值
+     */
+    public Double getHarmonicActivePower50Max() {
+        return harmonicActivePower50Max;
+    }
+
+    /**
+     * 设置50次谐波有功功率-最大值
+     *
+     * @param harmonicActivePower50Max 50次谐波有功功率-最大值
+     */
+    public void setHarmonicActivePower50Max(Double harmonicActivePower50Max) {
+        this.harmonicActivePower50Max = harmonicActivePower50Max;
+    }
+
+    /**
+     * 获取50次谐波有功功率-最小值
+     *
+     * @return HARMONIC_ACTIVE_POWER_50_MIN - 50次谐波有功功率-最小值
+     */
+    public Double getHarmonicActivePower50Min() {
+        return harmonicActivePower50Min;
+    }
+
+    /**
+     * 设置50次谐波有功功率-最小值
+     *
+     * @param harmonicActivePower50Min 50次谐波有功功率-最小值
+     */
+    public void setHarmonicActivePower50Min(Double harmonicActivePower50Min) {
+        this.harmonicActivePower50Min = harmonicActivePower50Min;
+    }
+
+    /**
+     * 获取50次谐波有功功率-平均值
+     *
+     * @return HARMONIC_ACTIVE_POWER_50_AVG - 50次谐波有功功率-平均值
+     */
+    public Double getHarmonicActivePower50Avg() {
+        return harmonicActivePower50Avg;
+    }
+
+    /**
+     * 设置50次谐波有功功率-平均值
+     *
+     * @param harmonicActivePower50Avg 50次谐波有功功率-平均值
+     */
+    public void setHarmonicActivePower50Avg(Double harmonicActivePower50Avg) {
+        this.harmonicActivePower50Avg = harmonicActivePower50Avg;
+    }
+
+    /**
+     * 获取50次谐波有功功率-95值
+     *
+     * @return HARMONIC_ACTIVE_POWER_50_95 - 50次谐波有功功率-95值
+     */
+    public Double getHarmonicActivePower5095() {
+        return harmonicActivePower5095;
+    }
+
+    /**
+     * 设置50次谐波有功功率-95值
+     *
+     * @param harmonicActivePower5095 50次谐波有功功率-95值
+     */
+    public void setHarmonicActivePower5095(Double harmonicActivePower5095) {
+        this.harmonicActivePower5095 = harmonicActivePower5095;
+    }
+}
\ No newline at end of file
diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/pojo/po/line/RMpHarmonicVRateReportDPO.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/pojo/po/line/RMpHarmonicVRateReportDPO.java
new file mode 100644
index 000000000..8eb3f8964
--- /dev/null
+++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/pojo/po/line/RMpHarmonicVRateReportDPO.java
@@ -0,0 +1,5200 @@
+package com.njcn.prepare.harmonic.pojo.po.line;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.github.jeffreyning.mybatisplus.anno.MppMultiId;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.util.Date;
+
+/**
+ * 
+ * Description:
+ * 接口文档访问地址：http://serverIP:port/swagger-ui.html
+ * Date: 2022/10/25  11:11【需求编号】
+ *
+ * @author clam
+ * @version V1.0.0
+ */
+/**
+    * 稳态监测点指标日报-日表(主配网表)  /各次谐波电压含有率 
+    */
+@ApiModel(value="com-njcn-prepare-harmonic-pojo-po-line-RMpHarmonicVRateReportDPO")
+@TableName(value = "r_mp_harmonic_v_rate_report_d")
+public class RMpHarmonicVRateReportDPO {
+    /**
+     * 监测点ID
+     */
+    @MppMultiId(value = "measurement_point_id")
+    @ApiModelProperty(value="监测点ID")
+    private String measurementPointId;
+
+    /**
+     * 生成数据的时间,每日统计一次
+     */
+    @MppMultiId(value = "data_date")
+    @ApiModelProperty(value="生成数据的时间,每日统计一次")
+    private Date dataDate;
+
+    /**
+     * 相别：‘A’ 'B' 'C' 'ABC' 'T'  配网部分相别的数据采用T标志存储
+     */
+    @MppMultiId(value = "phase")
+    @ApiModelProperty(value="相别：‘A’ 'B' 'C' 'ABC' 'T'  配网部分相别的数据采用T标志存储")
+    private String phase;
+
+    /**
+     * 电压总谐波畸变率-最大值
+     */
+    @TableField(value = "voltage_harmonic_thd_max")
+    @ApiModelProperty(value="电压总谐波畸变率-最大值")
+    private Double voltageHarmonicThdMax;
+
+    /**
+     * 电压总谐波畸变率-最小值
+     */
+    @TableField(value = "voltage_harmonic_thd_min")
+    @ApiModelProperty(value="电压总谐波畸变率-最小值")
+    private Double voltageHarmonicThdMin;
+
+    /**
+     * 电压总谐波畸变率-平均值
+     */
+    @TableField(value = "voltage_harmonic_thd_avg")
+    @ApiModelProperty(value="电压总谐波畸变率-平均值")
+    private Double voltageHarmonicThdAvg;
+
+    /**
+     * 电压总谐波畸变率-95值
+     */
+    @TableField(value = "voltage_harmonic_thd_95")
+    @ApiModelProperty(value="电压总谐波畸变率-95值")
+    private Double voltageHarmonicThd95;
+
+    /**
+     * 相（线）电压基波有效值-最大值
+     */
+    @TableField(value = "fundamental_voltage_max")
+    @ApiModelProperty(value="相（线）电压基波有效值-最大值")
+    private Double fundamentalVoltageMax;
+
+    /**
+     * 相（线）电压基波有效值-最小值
+     */
+    @TableField(value = "fundamental_voltage_min")
+    @ApiModelProperty(value="相（线）电压基波有效值-最小值")
+    private Double fundamentalVoltageMin;
+
+    /**
+     * 相（线）电压基波有效值-平均值
+     */
+    @TableField(value = "fundamental_voltage_avg")
+    @ApiModelProperty(value="相（线）电压基波有效值-平均值")
+    private Double fundamentalVoltageAvg;
+
+    /**
+     * 相（线）电压基波有效值-95值
+     */
+    @TableField(value = "fundamental_voltage_95")
+    @ApiModelProperty(value="相（线）电压基波有效值-95值")
+    private Double fundamentalVoltage95;
+
+    /**
+     * 2次谐波电压含有率最大值
+     */
+    @TableField(value = "harmonic_voltage_content_2_max")
+    @ApiModelProperty(value="2次谐波电压含有率最大值")
+    private Double harmonicVoltageContent2Max;
+
+    /**
+     * 2次谐波电压含有率最小值
+     */
+    @TableField(value = "harmonic_voltage_content_2_min")
+    @ApiModelProperty(value="2次谐波电压含有率最小值")
+    private Double harmonicVoltageContent2Min;
+
+    /**
+     * 2次谐波电压含有率平均值
+     */
+    @TableField(value = "harmonic_voltage_content_2_avg")
+    @ApiModelProperty(value="2次谐波电压含有率平均值")
+    private Double harmonicVoltageContent2Avg;
+
+    /**
+     * 2次谐波电压含有率95值
+     */
+    @TableField(value = "harmonic_voltage_content_2_95")
+    @ApiModelProperty(value="2次谐波电压含有率95值")
+    private Double harmonicVoltageContent295;
+
+    /**
+     * 3次谐波电压含有率最大值
+     */
+    @TableField(value = "harmonic_voltage_content_3_max")
+    @ApiModelProperty(value="3次谐波电压含有率最大值")
+    private Double harmonicVoltageContent3Max;
+
+    /**
+     * 3次谐波电压含有率最小值
+     */
+    @TableField(value = "harmonic_voltage_content_3_min")
+    @ApiModelProperty(value="3次谐波电压含有率最小值")
+    private Double harmonicVoltageContent3Min;
+
+    /**
+     * 3次谐波电压含有率平均值
+     */
+    @TableField(value = "harmonic_voltage_content_3_avg")
+    @ApiModelProperty(value="3次谐波电压含有率平均值")
+    private Double harmonicVoltageContent3Avg;
+
+    /**
+     * 3次谐波电压含有率95值
+     */
+    @TableField(value = "harmonic_voltage_content_3_95")
+    @ApiModelProperty(value="3次谐波电压含有率95值")
+    private Double harmonicVoltageContent395;
+
+    /**
+     * 4次谐波电压含有率最大值
+     */
+    @TableField(value = "harmonic_voltage_content_4_max")
+    @ApiModelProperty(value="4次谐波电压含有率最大值")
+    private Double harmonicVoltageContent4Max;
+
+    /**
+     * 4次谐波电压含有率最小值
+     */
+    @TableField(value = "harmonic_voltage_content_4_min")
+    @ApiModelProperty(value="4次谐波电压含有率最小值")
+    private Double harmonicVoltageContent4Min;
+
+    /**
+     * 4次谐波电压含有率平均值
+     */
+    @TableField(value = "harmonic_voltage_content_4_avg")
+    @ApiModelProperty(value="4次谐波电压含有率平均值")
+    private Double harmonicVoltageContent4Avg;
+
+    /**
+     * 4次谐波电压含有率95值
+     */
+    @TableField(value = "harmonic_voltage_content_4_95")
+    @ApiModelProperty(value="4次谐波电压含有率95值")
+    private Double harmonicVoltageContent495;
+
+    /**
+     * 5次谐波电压含有率最大值
+     */
+    @TableField(value = "harmonic_voltage_content_5_max")
+    @ApiModelProperty(value="5次谐波电压含有率最大值")
+    private Double harmonicVoltageContent5Max;
+
+    /**
+     * 5次谐波电压含有率最小值
+     */
+    @TableField(value = "harmonic_voltage_content_5_min")
+    @ApiModelProperty(value="5次谐波电压含有率最小值")
+    private Double harmonicVoltageContent5Min;
+
+    /**
+     * 5次谐波电压含有率平均值
+     */
+    @TableField(value = "harmonic_voltage_content_5_avg")
+    @ApiModelProperty(value="5次谐波电压含有率平均值")
+    private Double harmonicVoltageContent5Avg;
+
+    /**
+     * 5次谐波电压含有率95值
+     */
+    @TableField(value = "harmonic_voltage_content_5_95")
+    @ApiModelProperty(value="5次谐波电压含有率95值")
+    private Double harmonicVoltageContent595;
+
+    /**
+     * 6次谐波电压含有率最大值
+     */
+    @TableField(value = "harmonic_voltage_content_6_max")
+    @ApiModelProperty(value="6次谐波电压含有率最大值")
+    private Double harmonicVoltageContent6Max;
+
+    /**
+     * 6次谐波电压含有率最小值
+     */
+    @TableField(value = "harmonic_voltage_content_6_min")
+    @ApiModelProperty(value="6次谐波电压含有率最小值")
+    private Double harmonicVoltageContent6Min;
+
+    /**
+     * 6次谐波电压含有率平均值
+     */
+    @TableField(value = "harmonic_voltage_content_6_avg")
+    @ApiModelProperty(value="6次谐波电压含有率平均值")
+    private Double harmonicVoltageContent6Avg;
+
+    /**
+     * 6次谐波电压含有率95值
+     */
+    @TableField(value = "harmonic_voltage_content_6_95")
+    @ApiModelProperty(value="6次谐波电压含有率95值")
+    private Double harmonicVoltageContent695;
+
+    /**
+     * 7次谐波电压含有率最大值
+     */
+    @TableField(value = "harmonic_voltage_content_7_max")
+    @ApiModelProperty(value="7次谐波电压含有率最大值")
+    private Double harmonicVoltageContent7Max;
+
+    /**
+     * 7次谐波电压含有率最小值
+     */
+    @TableField(value = "harmonic_voltage_content_7_min")
+    @ApiModelProperty(value="7次谐波电压含有率最小值")
+    private Double harmonicVoltageContent7Min;
+
+    /**
+     * 7次谐波电压含有率平均值
+     */
+    @TableField(value = "harmonic_voltage_content_7_avg")
+    @ApiModelProperty(value="7次谐波电压含有率平均值")
+    private Double harmonicVoltageContent7Avg;
+
+    /**
+     * 7次谐波电压含有率95值
+     */
+    @TableField(value = "harmonic_voltage_content_7_95")
+    @ApiModelProperty(value="7次谐波电压含有率95值")
+    private Double harmonicVoltageContent795;
+
+    /**
+     * 8次谐波电压含有率最大值
+     */
+    @TableField(value = "harmonic_voltage_content_8_max")
+    @ApiModelProperty(value="8次谐波电压含有率最大值")
+    private Double harmonicVoltageContent8Max;
+
+    /**
+     * 8次谐波电压含有率最小值
+     */
+    @TableField(value = "harmonic_voltage_content_8_min")
+    @ApiModelProperty(value="8次谐波电压含有率最小值")
+    private Double harmonicVoltageContent8Min;
+
+    /**
+     * 8次谐波电压含有率平均值
+     */
+    @TableField(value = "harmonic_voltage_content_8_avg")
+    @ApiModelProperty(value="8次谐波电压含有率平均值")
+    private Double harmonicVoltageContent8Avg;
+
+    /**
+     * 8次谐波电压含有率95值
+     */
+    @TableField(value = "harmonic_voltage_content_8_95")
+    @ApiModelProperty(value="8次谐波电压含有率95值")
+    private Double harmonicVoltageContent895;
+
+    /**
+     * 9次谐波电压含有率最大值
+     */
+    @TableField(value = "harmonic_voltage_content_9_max")
+    @ApiModelProperty(value="9次谐波电压含有率最大值")
+    private Double harmonicVoltageContent9Max;
+
+    /**
+     * 9次谐波电压含有率最小值
+     */
+    @TableField(value = "harmonic_voltage_content_9_min")
+    @ApiModelProperty(value="9次谐波电压含有率最小值")
+    private Double harmonicVoltageContent9Min;
+
+    /**
+     * 9次谐波电压含有率平均值
+     */
+    @TableField(value = "harmonic_voltage_content_9_avg")
+    @ApiModelProperty(value="9次谐波电压含有率平均值")
+    private Double harmonicVoltageContent9Avg;
+
+    /**
+     * 9次谐波电压含有率95值
+     */
+    @TableField(value = "harmonic_voltage_content_9_95")
+    @ApiModelProperty(value="9次谐波电压含有率95值")
+    private Double harmonicVoltageContent995;
+
+    /**
+     * 10次谐波电压含有率最大值
+     */
+    @TableField(value = "harmonic_voltage_content_10_max")
+    @ApiModelProperty(value="10次谐波电压含有率最大值")
+    private Double harmonicVoltageContent10Max;
+
+    /**
+     * 10次谐波电压含有率最小值
+     */
+    @TableField(value = "harmonic_voltage_content_10_min")
+    @ApiModelProperty(value="10次谐波电压含有率最小值")
+    private Double harmonicVoltageContent10Min;
+
+    /**
+     * 10次谐波电压含有率平均值
+     */
+    @TableField(value = "harmonic_voltage_content_10_avg")
+    @ApiModelProperty(value="10次谐波电压含有率平均值")
+    private Double harmonicVoltageContent10Avg;
+
+    /**
+     * 10次谐波电压含有率95值
+     */
+    @TableField(value = "harmonic_voltage_content_10_95")
+    @ApiModelProperty(value="10次谐波电压含有率95值")
+    private Double harmonicVoltageContent1095;
+
+    /**
+     * 11次谐波电压含有率最大值
+     */
+    @TableField(value = "harmonic_voltage_content_11_max")
+    @ApiModelProperty(value="11次谐波电压含有率最大值")
+    private Double harmonicVoltageContent11Max;
+
+    /**
+     * 11次谐波电压含有率最小值
+     */
+    @TableField(value = "harmonic_voltage_content_11_min")
+    @ApiModelProperty(value="11次谐波电压含有率最小值")
+    private Double harmonicVoltageContent11Min;
+
+    /**
+     * 11次谐波电压含有率平均值
+     */
+    @TableField(value = "harmonic_voltage_content_11_avg")
+    @ApiModelProperty(value="11次谐波电压含有率平均值")
+    private Double harmonicVoltageContent11Avg;
+
+    /**
+     * 11次谐波电压含有率95值
+     */
+    @TableField(value = "harmonic_voltage_content_11_95")
+    @ApiModelProperty(value="11次谐波电压含有率95值")
+    private Double harmonicVoltageContent1195;
+
+    /**
+     * 12次谐波电压含有率最大值
+     */
+    @TableField(value = "harmonic_voltage_content_12_max")
+    @ApiModelProperty(value="12次谐波电压含有率最大值")
+    private Double harmonicVoltageContent12Max;
+
+    /**
+     * 12次谐波电压含有率最小值
+     */
+    @TableField(value = "harmonic_voltage_content_12_min")
+    @ApiModelProperty(value="12次谐波电压含有率最小值")
+    private Double harmonicVoltageContent12Min;
+
+    /**
+     * 12次谐波电压含有率平均值
+     */
+    @TableField(value = "harmonic_voltage_content_12_avg")
+    @ApiModelProperty(value="12次谐波电压含有率平均值")
+    private Double harmonicVoltageContent12Avg;
+
+    /**
+     * 12次谐波电压含有率95值
+     */
+    @TableField(value = "harmonic_voltage_content_12_95")
+    @ApiModelProperty(value="12次谐波电压含有率95值")
+    private Double harmonicVoltageContent1295;
+
+    /**
+     * 13次谐波电压含有率最大值
+     */
+    @TableField(value = "harmonic_voltage_content_13_max")
+    @ApiModelProperty(value="13次谐波电压含有率最大值")
+    private Double harmonicVoltageContent13Max;
+
+    /**
+     * 13次谐波电压含有率最小值
+     */
+    @TableField(value = "harmonic_voltage_content_13_min")
+    @ApiModelProperty(value="13次谐波电压含有率最小值")
+    private Double harmonicVoltageContent13Min;
+
+    /**
+     * 13次谐波电压含有率平均值
+     */
+    @TableField(value = "harmonic_voltage_content_13_avg")
+    @ApiModelProperty(value="13次谐波电压含有率平均值")
+    private Double harmonicVoltageContent13Avg;
+
+    /**
+     * 13次谐波电压含有率95值
+     */
+    @TableField(value = "harmonic_voltage_content_13_95")
+    @ApiModelProperty(value="13次谐波电压含有率95值")
+    private Double harmonicVoltageContent1395;
+
+    /**
+     * 14次谐波电压含有率最大值
+     */
+    @TableField(value = "harmonic_voltage_content_14_max")
+    @ApiModelProperty(value="14次谐波电压含有率最大值")
+    private Double harmonicVoltageContent14Max;
+
+    /**
+     * 14次谐波电压含有率最小值
+     */
+    @TableField(value = "harmonic_voltage_content_14_min")
+    @ApiModelProperty(value="14次谐波电压含有率最小值")
+    private Double harmonicVoltageContent14Min;
+
+    /**
+     * 14次谐波电压含有率平均值
+     */
+    @TableField(value = "harmonic_voltage_content_14_avg")
+    @ApiModelProperty(value="14次谐波电压含有率平均值")
+    private Double harmonicVoltageContent14Avg;
+
+    /**
+     * 14次谐波电压含有率95值
+     */
+    @TableField(value = "harmonic_voltage_content_14_95")
+    @ApiModelProperty(value="14次谐波电压含有率95值")
+    private Double harmonicVoltageContent1495;
+
+    /**
+     * 15次谐波电压含有率最大值
+     */
+    @TableField(value = "harmonic_voltage_content_15_max")
+    @ApiModelProperty(value="15次谐波电压含有率最大值")
+    private Double harmonicVoltageContent15Max;
+
+    /**
+     * 15次谐波电压含有率最小值
+     */
+    @TableField(value = "harmonic_voltage_content_15_min")
+    @ApiModelProperty(value="15次谐波电压含有率最小值")
+    private Double harmonicVoltageContent15Min;
+
+    /**
+     * 15次谐波电压含有率平均值
+     */
+    @TableField(value = "harmonic_voltage_content_15_avg")
+    @ApiModelProperty(value="15次谐波电压含有率平均值")
+    private Double harmonicVoltageContent15Avg;
+
+    /**
+     * 15次谐波电压含有率95值
+     */
+    @TableField(value = "harmonic_voltage_content_15_95")
+    @ApiModelProperty(value="15次谐波电压含有率95值")
+    private Double harmonicVoltageContent1595;
+
+    /**
+     * 16次谐波电压含有率最大值
+     */
+    @TableField(value = "harmonic_voltage_content_16_max")
+    @ApiModelProperty(value="16次谐波电压含有率最大值")
+    private Double harmonicVoltageContent16Max;
+
+    /**
+     * 16次谐波电压含有率最小值
+     */
+    @TableField(value = "harmonic_voltage_content_16_min")
+    @ApiModelProperty(value="16次谐波电压含有率最小值")
+    private Double harmonicVoltageContent16Min;
+
+    /**
+     * 16次谐波电压含有率平均值
+     */
+    @TableField(value = "harmonic_voltage_content_16_avg")
+    @ApiModelProperty(value="16次谐波电压含有率平均值")
+    private Double harmonicVoltageContent16Avg;
+
+    /**
+     * 16次谐波电压含有率95值
+     */
+    @TableField(value = "harmonic_voltage_content_16_95")
+    @ApiModelProperty(value="16次谐波电压含有率95值")
+    private Double harmonicVoltageContent1695;
+
+    /**
+     * 17次谐波电压含有率最大值
+     */
+    @TableField(value = "harmonic_voltage_content_17_max")
+    @ApiModelProperty(value="17次谐波电压含有率最大值")
+    private Double harmonicVoltageContent17Max;
+
+    /**
+     * 17次谐波电压含有率最小值
+     */
+    @TableField(value = "harmonic_voltage_content_17_min")
+    @ApiModelProperty(value="17次谐波电压含有率最小值")
+    private Double harmonicVoltageContent17Min;
+
+    /**
+     * 17次谐波电压含有率平均值
+     */
+    @TableField(value = "harmonic_voltage_content_17_avg")
+    @ApiModelProperty(value="17次谐波电压含有率平均值")
+    private Double harmonicVoltageContent17Avg;
+
+    /**
+     * 17次谐波电压含有率95值
+     */
+    @TableField(value = "harmonic_voltage_content_17_95")
+    @ApiModelProperty(value="17次谐波电压含有率95值")
+    private Double harmonicVoltageContent1795;
+
+    /**
+     * 18次谐波电压含有率最大值
+     */
+    @TableField(value = "harmonic_voltage_content_18_max")
+    @ApiModelProperty(value="18次谐波电压含有率最大值")
+    private Double harmonicVoltageContent18Max;
+
+    /**
+     * 18次谐波电压含有率最小值
+     */
+    @TableField(value = "harmonic_voltage_content_18_min")
+    @ApiModelProperty(value="18次谐波电压含有率最小值")
+    private Double harmonicVoltageContent18Min;
+
+    /**
+     * 18次谐波电压含有率平均值
+     */
+    @TableField(value = "harmonic_voltage_content_18_avg")
+    @ApiModelProperty(value="18次谐波电压含有率平均值")
+    private Double harmonicVoltageContent18Avg;
+
+    /**
+     * 18次谐波电压含有率95值
+     */
+    @TableField(value = "harmonic_voltage_content_18_95")
+    @ApiModelProperty(value="18次谐波电压含有率95值")
+    private Double harmonicVoltageContent1895;
+
+    /**
+     * 19次谐波电压含有率最大值
+     */
+    @TableField(value = "harmonic_voltage_content_19_max")
+    @ApiModelProperty(value="19次谐波电压含有率最大值")
+    private Double harmonicVoltageContent19Max;
+
+    /**
+     * 19次谐波电压含有率最小值
+     */
+    @TableField(value = "harmonic_voltage_content_19_min")
+    @ApiModelProperty(value="19次谐波电压含有率最小值")
+    private Double harmonicVoltageContent19Min;
+
+    /**
+     * 19次谐波电压含有率平均值
+     */
+    @TableField(value = "harmonic_voltage_content_19_avg")
+    @ApiModelProperty(value="19次谐波电压含有率平均值")
+    private Double harmonicVoltageContent19Avg;
+
+    /**
+     * 19次谐波电压含有率95值
+     */
+    @TableField(value = "harmonic_voltage_content_19_95")
+    @ApiModelProperty(value="19次谐波电压含有率95值")
+    private Double harmonicVoltageContent1995;
+
+    /**
+     * 20次谐波电压含有率最大值
+     */
+    @TableField(value = "harmonic_voltage_content_20_max")
+    @ApiModelProperty(value="20次谐波电压含有率最大值")
+    private Double harmonicVoltageContent20Max;
+
+    /**
+     * 20次谐波电压含有率最小值
+     */
+    @TableField(value = "harmonic_voltage_content_20_min")
+    @ApiModelProperty(value="20次谐波电压含有率最小值")
+    private Double harmonicVoltageContent20Min;
+
+    /**
+     * 20次谐波电压含有率平均值
+     */
+    @TableField(value = "harmonic_voltage_content_20_avg")
+    @ApiModelProperty(value="20次谐波电压含有率平均值")
+    private Double harmonicVoltageContent20Avg;
+
+    /**
+     * 20次谐波电压含有率95值
+     */
+    @TableField(value = "harmonic_voltage_content_20_95")
+    @ApiModelProperty(value="20次谐波电压含有率95值")
+    private Double harmonicVoltageContent2095;
+
+    /**
+     * 21次谐波电压含有率最大值
+     */
+    @TableField(value = "harmonic_voltage_content_21_max")
+    @ApiModelProperty(value="21次谐波电压含有率最大值")
+    private Double harmonicVoltageContent21Max;
+
+    /**
+     * 21次谐波电压含有率最小值
+     */
+    @TableField(value = "harmonic_voltage_content_21_min")
+    @ApiModelProperty(value="21次谐波电压含有率最小值")
+    private Double harmonicVoltageContent21Min;
+
+    /**
+     * 21次谐波电压含有率平均值
+     */
+    @TableField(value = "harmonic_voltage_content_21_avg")
+    @ApiModelProperty(value="21次谐波电压含有率平均值")
+    private Double harmonicVoltageContent21Avg;
+
+    /**
+     * 21次谐波电压含有率95值
+     */
+    @TableField(value = "harmonic_voltage_content_21_95")
+    @ApiModelProperty(value="21次谐波电压含有率95值")
+    private Double harmonicVoltageContent2195;
+
+    /**
+     * 22次谐波电压含有率最大值
+     */
+    @TableField(value = "harmonic_voltage_content_22_max")
+    @ApiModelProperty(value="22次谐波电压含有率最大值")
+    private Double harmonicVoltageContent22Max;
+
+    /**
+     * 22次谐波电压含有率最小值
+     */
+    @TableField(value = "harmonic_voltage_content_22_min")
+    @ApiModelProperty(value="22次谐波电压含有率最小值")
+    private Double harmonicVoltageContent22Min;
+
+    /**
+     * 22次谐波电压含有率平均值
+     */
+    @TableField(value = "harmonic_voltage_content_22_avg")
+    @ApiModelProperty(value="22次谐波电压含有率平均值")
+    private Double harmonicVoltageContent22Avg;
+
+    /**
+     * 22次谐波电压含有率95值
+     */
+    @TableField(value = "harmonic_voltage_content_22_95")
+    @ApiModelProperty(value="22次谐波电压含有率95值")
+    private Double harmonicVoltageContent2295;
+
+    /**
+     * 23次谐波电压含有率最大值
+     */
+    @TableField(value = "harmonic_voltage_content_23_max")
+    @ApiModelProperty(value="23次谐波电压含有率最大值")
+    private Double harmonicVoltageContent23Max;
+
+    /**
+     * 23次谐波电压含有率最小值
+     */
+    @TableField(value = "harmonic_voltage_content_23_min")
+    @ApiModelProperty(value="23次谐波电压含有率最小值")
+    private Double harmonicVoltageContent23Min;
+
+    /**
+     * 23次谐波电压含有率平均值
+     */
+    @TableField(value = "harmonic_voltage_content_23_avg")
+    @ApiModelProperty(value="23次谐波电压含有率平均值")
+    private Double harmonicVoltageContent23Avg;
+
+    /**
+     * 23次谐波电压含有率95值
+     */
+    @TableField(value = "harmonic_voltage_content_23_95")
+    @ApiModelProperty(value="23次谐波电压含有率95值")
+    private Double harmonicVoltageContent2395;
+
+    /**
+     * 24次谐波电压含有率最大值
+     */
+    @TableField(value = "harmonic_voltage_content_24_max")
+    @ApiModelProperty(value="24次谐波电压含有率最大值")
+    private Double harmonicVoltageContent24Max;
+
+    /**
+     * 24次谐波电压含有率最小值
+     */
+    @TableField(value = "harmonic_voltage_content_24_min")
+    @ApiModelProperty(value="24次谐波电压含有率最小值")
+    private Double harmonicVoltageContent24Min;
+
+    /**
+     * 24次谐波电压含有率平均值
+     */
+    @TableField(value = "harmonic_voltage_content_24_avg")
+    @ApiModelProperty(value="24次谐波电压含有率平均值")
+    private Double harmonicVoltageContent24Avg;
+
+    /**
+     * 24次谐波电压含有率95值
+     */
+    @TableField(value = "harmonic_voltage_content_24_95")
+    @ApiModelProperty(value="24次谐波电压含有率95值")
+    private Double harmonicVoltageContent2495;
+
+    /**
+     * 25次谐波电压含有率最大值
+     */
+    @TableField(value = "harmonic_voltage_content_25_max")
+    @ApiModelProperty(value="25次谐波电压含有率最大值")
+    private Double harmonicVoltageContent25Max;
+
+    /**
+     * 25次谐波电压含有率最小值
+     */
+    @TableField(value = "harmonic_voltage_content_25_min")
+    @ApiModelProperty(value="25次谐波电压含有率最小值")
+    private Double harmonicVoltageContent25Min;
+
+    /**
+     * 25次谐波电压含有率平均值
+     */
+    @TableField(value = "harmonic_voltage_content_25_avg")
+    @ApiModelProperty(value="25次谐波电压含有率平均值")
+    private Double harmonicVoltageContent25Avg;
+
+    /**
+     * 25次谐波电压含有率95值
+     */
+    @TableField(value = "harmonic_voltage_content_25_95")
+    @ApiModelProperty(value="25次谐波电压含有率95值")
+    private Double harmonicVoltageContent2595;
+
+    /**
+     * 26次谐波电压含有率最大值
+     */
+    @TableField(value = "harmonic_voltage_content_26_max")
+    @ApiModelProperty(value="26次谐波电压含有率最大值")
+    private Double harmonicVoltageContent26Max;
+
+    /**
+     * 26次谐波电压含有率最小值
+     */
+    @TableField(value = "harmonic_voltage_content_26_min")
+    @ApiModelProperty(value="26次谐波电压含有率最小值")
+    private Double harmonicVoltageContent26Min;
+
+    /**
+     * 26次谐波电压含有率平均值
+     */
+    @TableField(value = "harmonic_voltage_content_26_avg")
+    @ApiModelProperty(value="26次谐波电压含有率平均值")
+    private Double harmonicVoltageContent26Avg;
+
+    /**
+     * 26次谐波电压含有率95值
+     */
+    @TableField(value = "harmonic_voltage_content_26_95")
+    @ApiModelProperty(value="26次谐波电压含有率95值")
+    private Double harmonicVoltageContent2695;
+
+    /**
+     * 27次谐波电压含有率最大值
+     */
+    @TableField(value = "harmonic_voltage_content_27_max")
+    @ApiModelProperty(value="27次谐波电压含有率最大值")
+    private Double harmonicVoltageContent27Max;
+
+    /**
+     * 27次谐波电压含有率最小值
+     */
+    @TableField(value = "harmonic_voltage_content_27_min")
+    @ApiModelProperty(value="27次谐波电压含有率最小值")
+    private Double harmonicVoltageContent27Min;
+
+    /**
+     * 27次谐波电压含有率平均值
+     */
+    @TableField(value = "harmonic_voltage_content_27_avg")
+    @ApiModelProperty(value="27次谐波电压含有率平均值")
+    private Double harmonicVoltageContent27Avg;
+
+    /**
+     * 27次谐波电压含有率95值
+     */
+    @TableField(value = "harmonic_voltage_content_27_95")
+    @ApiModelProperty(value="27次谐波电压含有率95值")
+    private Double harmonicVoltageContent2795;
+
+    /**
+     * 28次谐波电压含有率最大值
+     */
+    @TableField(value = "harmonic_voltage_content_28_max")
+    @ApiModelProperty(value="28次谐波电压含有率最大值")
+    private Double harmonicVoltageContent28Max;
+
+    /**
+     * 28次谐波电压含有率最小值
+     */
+    @TableField(value = "harmonic_voltage_content_28_min")
+    @ApiModelProperty(value="28次谐波电压含有率最小值")
+    private Double harmonicVoltageContent28Min;
+
+    /**
+     * 28次谐波电压含有率平均值
+     */
+    @TableField(value = "harmonic_voltage_content_28_avg")
+    @ApiModelProperty(value="28次谐波电压含有率平均值")
+    private Double harmonicVoltageContent28Avg;
+
+    /**
+     * 28次谐波电压含有率95值
+     */
+    @TableField(value = "harmonic_voltage_content_28_95")
+    @ApiModelProperty(value="28次谐波电压含有率95值")
+    private Double harmonicVoltageContent2895;
+
+    /**
+     * 29次谐波电压含有率最大值
+     */
+    @TableField(value = "harmonic_voltage_content_29_max")
+    @ApiModelProperty(value="29次谐波电压含有率最大值")
+    private Double harmonicVoltageContent29Max;
+
+    /**
+     * 29次谐波电压含有率最小值
+     */
+    @TableField(value = "harmonic_voltage_content_29_min")
+    @ApiModelProperty(value="29次谐波电压含有率最小值")
+    private Double harmonicVoltageContent29Min;
+
+    /**
+     * 29次谐波电压含有率平均值
+     */
+    @TableField(value = "harmonic_voltage_content_29_avg")
+    @ApiModelProperty(value="29次谐波电压含有率平均值")
+    private Double harmonicVoltageContent29Avg;
+
+    /**
+     * 29次谐波电压含有率95值
+     */
+    @TableField(value = "harmonic_voltage_content_29_95")
+    @ApiModelProperty(value="29次谐波电压含有率95值")
+    private Double harmonicVoltageContent2995;
+
+    /**
+     * 30次谐波电压含有率最大值
+     */
+    @TableField(value = "harmonic_voltage_content_30_max")
+    @ApiModelProperty(value="30次谐波电压含有率最大值")
+    private Double harmonicVoltageContent30Max;
+
+    /**
+     * 30次谐波电压含有率最小值
+     */
+    @TableField(value = "harmonic_voltage_content_30_min")
+    @ApiModelProperty(value="30次谐波电压含有率最小值")
+    private Double harmonicVoltageContent30Min;
+
+    /**
+     * 30次谐波电压含有率平均值
+     */
+    @TableField(value = "harmonic_voltage_content_30_avg")
+    @ApiModelProperty(value="30次谐波电压含有率平均值")
+    private Double harmonicVoltageContent30Avg;
+
+    /**
+     * 30次谐波电压含有率95值
+     */
+    @TableField(value = "harmonic_voltage_content_30_95")
+    @ApiModelProperty(value="30次谐波电压含有率95值")
+    private Double harmonicVoltageContent3095;
+
+    /**
+     * 31次谐波电压含有率最大值
+     */
+    @TableField(value = "harmonic_voltage_content_31_max")
+    @ApiModelProperty(value="31次谐波电压含有率最大值")
+    private Double harmonicVoltageContent31Max;
+
+    /**
+     * 31次谐波电压含有率最小值
+     */
+    @TableField(value = "harmonic_voltage_content_31_min")
+    @ApiModelProperty(value="31次谐波电压含有率最小值")
+    private Double harmonicVoltageContent31Min;
+
+    /**
+     * 31次谐波电压含有率平均值
+     */
+    @TableField(value = "harmonic_voltage_content_31_avg")
+    @ApiModelProperty(value="31次谐波电压含有率平均值")
+    private Double harmonicVoltageContent31Avg;
+
+    /**
+     * 31次谐波电压含有率95值
+     */
+    @TableField(value = "harmonic_voltage_content_31_95")
+    @ApiModelProperty(value="31次谐波电压含有率95值")
+    private Double harmonicVoltageContent3195;
+
+    /**
+     * 32次谐波电压含有率最大值
+     */
+    @TableField(value = "harmonic_voltage_content_32_max")
+    @ApiModelProperty(value="32次谐波电压含有率最大值")
+    private Double harmonicVoltageContent32Max;
+
+    /**
+     * 32次谐波电压含有率最小值
+     */
+    @TableField(value = "harmonic_voltage_content_32_min")
+    @ApiModelProperty(value="32次谐波电压含有率最小值")
+    private Double harmonicVoltageContent32Min;
+
+    /**
+     * 32次谐波电压含有率平均值
+     */
+    @TableField(value = "harmonic_voltage_content_32_avg")
+    @ApiModelProperty(value="32次谐波电压含有率平均值")
+    private Double harmonicVoltageContent32Avg;
+
+    /**
+     * 32次谐波电压含有率95值
+     */
+    @TableField(value = "harmonic_voltage_content_32_95")
+    @ApiModelProperty(value="32次谐波电压含有率95值")
+    private Double harmonicVoltageContent3295;
+
+    /**
+     * 33次谐波电压含有率最大值
+     */
+    @TableField(value = "harmonic_voltage_content_33_max")
+    @ApiModelProperty(value="33次谐波电压含有率最大值")
+    private Double harmonicVoltageContent33Max;
+
+    /**
+     * 33次谐波电压含有率最小值
+     */
+    @TableField(value = "harmonic_voltage_content_33_min")
+    @ApiModelProperty(value="33次谐波电压含有率最小值")
+    private Double harmonicVoltageContent33Min;
+
+    /**
+     * 33次谐波电压含有率平均值
+     */
+    @TableField(value = "harmonic_voltage_content_33_avg")
+    @ApiModelProperty(value="33次谐波电压含有率平均值")
+    private Double harmonicVoltageContent33Avg;
+
+    /**
+     * 33次谐波电压含有率95值
+     */
+    @TableField(value = "harmonic_voltage_content_33_95")
+    @ApiModelProperty(value="33次谐波电压含有率95值")
+    private Double harmonicVoltageContent3395;
+
+    /**
+     * 34次谐波电压含有率最大值
+     */
+    @TableField(value = "harmonic_voltage_content_34_max")
+    @ApiModelProperty(value="34次谐波电压含有率最大值")
+    private Double harmonicVoltageContent34Max;
+
+    /**
+     * 34次谐波电压含有率最小值
+     */
+    @TableField(value = "harmonic_voltage_content_34_min")
+    @ApiModelProperty(value="34次谐波电压含有率最小值")
+    private Double harmonicVoltageContent34Min;
+
+    /**
+     * 34次谐波电压含有率平均值
+     */
+    @TableField(value = "harmonic_voltage_content_34_avg")
+    @ApiModelProperty(value="34次谐波电压含有率平均值")
+    private Double harmonicVoltageContent34Avg;
+
+    /**
+     * 34次谐波电压含有率95值
+     */
+    @TableField(value = "harmonic_voltage_content_34_95")
+    @ApiModelProperty(value="34次谐波电压含有率95值")
+    private Double harmonicVoltageContent3495;
+
+    /**
+     * 35次谐波电压含有率最大值
+     */
+    @TableField(value = "harmonic_voltage_content_35_max")
+    @ApiModelProperty(value="35次谐波电压含有率最大值")
+    private Double harmonicVoltageContent35Max;
+
+    /**
+     * 35次谐波电压含有率最小值
+     */
+    @TableField(value = "harmonic_voltage_content_35_min")
+    @ApiModelProperty(value="35次谐波电压含有率最小值")
+    private Double harmonicVoltageContent35Min;
+
+    /**
+     * 35次谐波电压含有率平均值
+     */
+    @TableField(value = "harmonic_voltage_content_35_avg")
+    @ApiModelProperty(value="35次谐波电压含有率平均值")
+    private Double harmonicVoltageContent35Avg;
+
+    /**
+     * 35次谐波电压含有率95值
+     */
+    @TableField(value = "harmonic_voltage_content_35_95")
+    @ApiModelProperty(value="35次谐波电压含有率95值")
+    private Double harmonicVoltageContent3595;
+
+    /**
+     * 36次谐波电压含有率最大值
+     */
+    @TableField(value = "harmonic_voltage_content_36_max")
+    @ApiModelProperty(value="36次谐波电压含有率最大值")
+    private Double harmonicVoltageContent36Max;
+
+    /**
+     * 36次谐波电压含有率最小值
+     */
+    @TableField(value = "harmonic_voltage_content_36_min")
+    @ApiModelProperty(value="36次谐波电压含有率最小值")
+    private Double harmonicVoltageContent36Min;
+
+    /**
+     * 36次谐波电压含有率平均值
+     */
+    @TableField(value = "harmonic_voltage_content_36_avg")
+    @ApiModelProperty(value="36次谐波电压含有率平均值")
+    private Double harmonicVoltageContent36Avg;
+
+    /**
+     * 36次谐波电压含有率95值
+     */
+    @TableField(value = "harmonic_voltage_content_36_95")
+    @ApiModelProperty(value="36次谐波电压含有率95值")
+    private Double harmonicVoltageContent3695;
+
+    /**
+     * 37次谐波电压含有率最大值
+     */
+    @TableField(value = "harmonic_voltage_content_37_max")
+    @ApiModelProperty(value="37次谐波电压含有率最大值")
+    private Double harmonicVoltageContent37Max;
+
+    /**
+     * 37次谐波电压含有率最小值
+     */
+    @TableField(value = "harmonic_voltage_content_37_min")
+    @ApiModelProperty(value="37次谐波电压含有率最小值")
+    private Double harmonicVoltageContent37Min;
+
+    /**
+     * 37次谐波电压含有率平均值
+     */
+    @TableField(value = "harmonic_voltage_content_37_avg")
+    @ApiModelProperty(value="37次谐波电压含有率平均值")
+    private Double harmonicVoltageContent37Avg;
+
+    /**
+     * 37次谐波电压含有率95值
+     */
+    @TableField(value = "harmonic_voltage_content_37_95")
+    @ApiModelProperty(value="37次谐波电压含有率95值")
+    private Double harmonicVoltageContent3795;
+
+    /**
+     * 38次谐波电压含有率最大值
+     */
+    @TableField(value = "harmonic_voltage_content_38_max")
+    @ApiModelProperty(value="38次谐波电压含有率最大值")
+    private Double harmonicVoltageContent38Max;
+
+    /**
+     * 38次谐波电压含有率最小值
+     */
+    @TableField(value = "harmonic_voltage_content_38_min")
+    @ApiModelProperty(value="38次谐波电压含有率最小值")
+    private Double harmonicVoltageContent38Min;
+
+    /**
+     * 38次谐波电压含有率平均值
+     */
+    @TableField(value = "harmonic_voltage_content_38_avg")
+    @ApiModelProperty(value="38次谐波电压含有率平均值")
+    private Double harmonicVoltageContent38Avg;
+
+    /**
+     * 38次谐波电压含有率95值
+     */
+    @TableField(value = "harmonic_voltage_content_38_95")
+    @ApiModelProperty(value="38次谐波电压含有率95值")
+    private Double harmonicVoltageContent3895;
+
+    /**
+     * 39次谐波电压含有率最大值
+     */
+    @TableField(value = "harmonic_voltage_content_39_max")
+    @ApiModelProperty(value="39次谐波电压含有率最大值")
+    private Double harmonicVoltageContent39Max;
+
+    /**
+     * 39次谐波电压含有率最小值
+     */
+    @TableField(value = "harmonic_voltage_content_39_min")
+    @ApiModelProperty(value="39次谐波电压含有率最小值")
+    private Double harmonicVoltageContent39Min;
+
+    /**
+     * 39次谐波电压含有率平均值
+     */
+    @TableField(value = "harmonic_voltage_content_39_avg")
+    @ApiModelProperty(value="39次谐波电压含有率平均值")
+    private Double harmonicVoltageContent39Avg;
+
+    /**
+     * 39次谐波电压含有率95值
+     */
+    @TableField(value = "harmonic_voltage_content_39_95")
+    @ApiModelProperty(value="39次谐波电压含有率95值")
+    private Double harmonicVoltageContent3995;
+
+    /**
+     * 40次谐波电压含有率最大值
+     */
+    @TableField(value = "harmonic_voltage_content_40_max")
+    @ApiModelProperty(value="40次谐波电压含有率最大值")
+    private Double harmonicVoltageContent40Max;
+
+    /**
+     * 40次谐波电压含有率最小值
+     */
+    @TableField(value = "harmonic_voltage_content_40_min")
+    @ApiModelProperty(value="40次谐波电压含有率最小值")
+    private Double harmonicVoltageContent40Min;
+
+    /**
+     * 40次谐波电压含有率平均值
+     */
+    @TableField(value = "harmonic_voltage_content_40_avg")
+    @ApiModelProperty(value="40次谐波电压含有率平均值")
+    private Double harmonicVoltageContent40Avg;
+
+    /**
+     * 40次谐波电压含有率95值
+     */
+    @TableField(value = "harmonic_voltage_content_40_95")
+    @ApiModelProperty(value="40次谐波电压含有率95值")
+    private Double harmonicVoltageContent4095;
+
+    /**
+     * 41次谐波电压含有率最大值
+     */
+    @TableField(value = "harmonic_voltage_content_41_max")
+    @ApiModelProperty(value="41次谐波电压含有率最大值")
+    private Double harmonicVoltageContent41Max;
+
+    /**
+     * 41次谐波电压含有率最小值
+     */
+    @TableField(value = "harmonic_voltage_content_41_min")
+    @ApiModelProperty(value="41次谐波电压含有率最小值")
+    private Double harmonicVoltageContent41Min;
+
+    /**
+     * 41次谐波电压含有率平均值
+     */
+    @TableField(value = "harmonic_voltage_content_41_avg")
+    @ApiModelProperty(value="41次谐波电压含有率平均值")
+    private Double harmonicVoltageContent41Avg;
+
+    /**
+     * 41次谐波电压含有率95值
+     */
+    @TableField(value = "harmonic_voltage_content_41_95")
+    @ApiModelProperty(value="41次谐波电压含有率95值")
+    private Double harmonicVoltageContent4195;
+
+    /**
+     * 42次谐波电压含有率最大值
+     */
+    @TableField(value = "harmonic_voltage_content_42_max")
+    @ApiModelProperty(value="42次谐波电压含有率最大值")
+    private Double harmonicVoltageContent42Max;
+
+    /**
+     * 42次谐波电压含有率最小值
+     */
+    @TableField(value = "harmonic_voltage_content_42_min")
+    @ApiModelProperty(value="42次谐波电压含有率最小值")
+    private Double harmonicVoltageContent42Min;
+
+    /**
+     * 42次谐波电压含有率平均值
+     */
+    @TableField(value = "harmonic_voltage_content_42_avg")
+    @ApiModelProperty(value="42次谐波电压含有率平均值")
+    private Double harmonicVoltageContent42Avg;
+
+    /**
+     * 42次谐波电压含有率95值
+     */
+    @TableField(value = "harmonic_voltage_content_42_95")
+    @ApiModelProperty(value="42次谐波电压含有率95值")
+    private Double harmonicVoltageContent4295;
+
+    /**
+     * 43次谐波电压含有率最大值
+     */
+    @TableField(value = "harmonic_voltage_content_43_max")
+    @ApiModelProperty(value="43次谐波电压含有率最大值")
+    private Double harmonicVoltageContent43Max;
+
+    /**
+     * 43次谐波电压含有率最小值
+     */
+    @TableField(value = "harmonic_voltage_content_43_min")
+    @ApiModelProperty(value="43次谐波电压含有率最小值")
+    private Double harmonicVoltageContent43Min;
+
+    /**
+     * 43次谐波电压含有率平均值
+     */
+    @TableField(value = "harmonic_voltage_content_43_avg")
+    @ApiModelProperty(value="43次谐波电压含有率平均值")
+    private Double harmonicVoltageContent43Avg;
+
+    /**
+     * 43次谐波电压含有率95值
+     */
+    @TableField(value = "harmonic_voltage_content_43_95")
+    @ApiModelProperty(value="43次谐波电压含有率95值")
+    private Double harmonicVoltageContent4395;
+
+    /**
+     * 44次谐波电压含有率最大值
+     */
+    @TableField(value = "harmonic_voltage_content_44_max")
+    @ApiModelProperty(value="44次谐波电压含有率最大值")
+    private Double harmonicVoltageContent44Max;
+
+    /**
+     * 44次谐波电压含有率最小值
+     */
+    @TableField(value = "harmonic_voltage_content_44_min")
+    @ApiModelProperty(value="44次谐波电压含有率最小值")
+    private Double harmonicVoltageContent44Min;
+
+    /**
+     * 44次谐波电压含有率平均值
+     */
+    @TableField(value = "harmonic_voltage_content_44_avg")
+    @ApiModelProperty(value="44次谐波电压含有率平均值")
+    private Double harmonicVoltageContent44Avg;
+
+    /**
+     * 44次谐波电压含有率95值
+     */
+    @TableField(value = "harmonic_voltage_content_44_95")
+    @ApiModelProperty(value="44次谐波电压含有率95值")
+    private Double harmonicVoltageContent4495;
+
+    /**
+     * 45次谐波电压含有率最大值
+     */
+    @TableField(value = "harmonic_voltage_content_45_max")
+    @ApiModelProperty(value="45次谐波电压含有率最大值")
+    private Double harmonicVoltageContent45Max;
+
+    /**
+     * 45次谐波电压含有率最小值
+     */
+    @TableField(value = "harmonic_voltage_content_45_min")
+    @ApiModelProperty(value="45次谐波电压含有率最小值")
+    private Double harmonicVoltageContent45Min;
+
+    /**
+     * 45次谐波电压含有率平均值
+     */
+    @TableField(value = "harmonic_voltage_content_45_avg")
+    @ApiModelProperty(value="45次谐波电压含有率平均值")
+    private Double harmonicVoltageContent45Avg;
+
+    /**
+     * 45次谐波电压含有率95值
+     */
+    @TableField(value = "harmonic_voltage_content_45_95")
+    @ApiModelProperty(value="45次谐波电压含有率95值")
+    private Double harmonicVoltageContent4595;
+
+    /**
+     * 46次谐波电压含有率最大值
+     */
+    @TableField(value = "harmonic_voltage_content_46_max")
+    @ApiModelProperty(value="46次谐波电压含有率最大值")
+    private Double harmonicVoltageContent46Max;
+
+    /**
+     * 46次谐波电压含有率最小值
+     */
+    @TableField(value = "harmonic_voltage_content_46_min")
+    @ApiModelProperty(value="46次谐波电压含有率最小值")
+    private Double harmonicVoltageContent46Min;
+
+    /**
+     * 46次谐波电压含有率平均值
+     */
+    @TableField(value = "harmonic_voltage_content_46_avg")
+    @ApiModelProperty(value="46次谐波电压含有率平均值")
+    private Double harmonicVoltageContent46Avg;
+
+    /**
+     * 46次谐波电压含有率95值
+     */
+    @TableField(value = "harmonic_voltage_content_46_95")
+    @ApiModelProperty(value="46次谐波电压含有率95值")
+    private Double harmonicVoltageContent4695;
+
+    /**
+     * 47次谐波电压含有率最大值
+     */
+    @TableField(value = "harmonic_voltage_content_47_max")
+    @ApiModelProperty(value="47次谐波电压含有率最大值")
+    private Double harmonicVoltageContent47Max;
+
+    /**
+     * 47次谐波电压含有率最小值
+     */
+    @TableField(value = "harmonic_voltage_content_47_min")
+    @ApiModelProperty(value="47次谐波电压含有率最小值")
+    private Double harmonicVoltageContent47Min;
+
+    /**
+     * 47次谐波电压含有率平均值
+     */
+    @TableField(value = "harmonic_voltage_content_47_avg")
+    @ApiModelProperty(value="47次谐波电压含有率平均值")
+    private Double harmonicVoltageContent47Avg;
+
+    /**
+     * 47次谐波电压含有率95值
+     */
+    @TableField(value = "harmonic_voltage_content_47_95")
+    @ApiModelProperty(value="47次谐波电压含有率95值")
+    private Double harmonicVoltageContent4795;
+
+    /**
+     * 48次谐波电压含有率最大值
+     */
+    @TableField(value = "harmonic_voltage_content_48_max")
+    @ApiModelProperty(value="48次谐波电压含有率最大值")
+    private Double harmonicVoltageContent48Max;
+
+    /**
+     * 48次谐波电压含有率最小值
+     */
+    @TableField(value = "harmonic_voltage_content_48_min")
+    @ApiModelProperty(value="48次谐波电压含有率最小值")
+    private Double harmonicVoltageContent48Min;
+
+    /**
+     * 48次谐波电压含有率平均值
+     */
+    @TableField(value = "harmonic_voltage_content_48_avg")
+    @ApiModelProperty(value="48次谐波电压含有率平均值")
+    private Double harmonicVoltageContent48Avg;
+
+    /**
+     * 48次谐波电压含有率95值
+     */
+    @TableField(value = "harmonic_voltage_content_48_95")
+    @ApiModelProperty(value="48次谐波电压含有率95值")
+    private Double harmonicVoltageContent4895;
+
+    /**
+     * 49次谐波电压含有率最大值
+     */
+    @TableField(value = "harmonic_voltage_content_49_max")
+    @ApiModelProperty(value="49次谐波电压含有率最大值")
+    private Double harmonicVoltageContent49Max;
+
+    /**
+     * 49次谐波电压含有率最小值
+     */
+    @TableField(value = "harmonic_voltage_content_49_min")
+    @ApiModelProperty(value="49次谐波电压含有率最小值")
+    private Double harmonicVoltageContent49Min;
+
+    /**
+     * 49次谐波电压含有率平均值
+     */
+    @TableField(value = "harmonic_voltage_content_49_avg")
+    @ApiModelProperty(value="49次谐波电压含有率平均值")
+    private Double harmonicVoltageContent49Avg;
+
+    /**
+     * 49次谐波电压含有率95值
+     */
+    @TableField(value = "harmonic_voltage_content_49_95")
+    @ApiModelProperty(value="49次谐波电压含有率95值")
+    private Double harmonicVoltageContent4995;
+
+    /**
+     * 50次谐波电压含有率最大值
+     */
+    @TableField(value = "harmonic_voltage_content_50_max")
+    @ApiModelProperty(value="50次谐波电压含有率最大值")
+    private Double harmonicVoltageContent50Max;
+
+    /**
+     * 50次谐波电压含有率最小值
+     */
+    @TableField(value = "harmonic_voltage_content_50_min")
+    @ApiModelProperty(value="50次谐波电压含有率最小值")
+    private Double harmonicVoltageContent50Min;
+
+    /**
+     * 50次谐波电压含有率平均值
+     */
+    @TableField(value = "harmonic_voltage_content_50_avg")
+    @ApiModelProperty(value="50次谐波电压含有率平均值")
+    private Double harmonicVoltageContent50Avg;
+
+    /**
+     * 50次谐波电压含有率95值
+     */
+    @TableField(value = "harmonic_voltage_content_50_95")
+    @ApiModelProperty(value="50次谐波电压含有率95值")
+    private Double harmonicVoltageContent5095;
+
+    /**
+     * 获取监测点ID
+     *
+     * @return measurement_point_id - 监测点ID
+     */
+    public String getMeasurementPointId() {
+        return measurementPointId;
+    }
+
+    /**
+     * 设置监测点ID
+     *
+     * @param measurementPointId 监测点ID
+     */
+    public void setMeasurementPointId(String measurementPointId) {
+        this.measurementPointId = measurementPointId;
+    }
+
+    /**
+     * 获取生成数据的时间,每日统计一次
+     *
+     * @return data_date - 生成数据的时间,每日统计一次
+     */
+    public Date getDataDate() {
+        return dataDate;
+    }
+
+    /**
+     * 设置生成数据的时间,每日统计一次
+     *
+     * @param dataDate 生成数据的时间,每日统计一次
+     */
+    public void setDataDate(Date dataDate) {
+        this.dataDate = dataDate;
+    }
+
+    /**
+     * 获取相别：‘A’ 'B' 'C' 'ABC' 'T'  配网部分相别的数据采用T标志存储
+     *
+     * @return phase - 相别：‘A’ 'B' 'C' 'ABC' 'T'  配网部分相别的数据采用T标志存储
+     */
+    public String getPhase() {
+        return phase;
+    }
+
+    /**
+     * 设置相别：‘A’ 'B' 'C' 'ABC' 'T'  配网部分相别的数据采用T标志存储
+     *
+     * @param phase 相别：‘A’ 'B' 'C' 'ABC' 'T'  配网部分相别的数据采用T标志存储
+     */
+    public void setPhase(String phase) {
+        this.phase = phase;
+    }
+
+    /**
+     * 获取电压总谐波畸变率-最大值
+     *
+     * @return voltage_harmonic_thd_max - 电压总谐波畸变率-最大值
+     */
+    public Double getVoltageHarmonicThdMax() {
+        return voltageHarmonicThdMax;
+    }
+
+    /**
+     * 设置电压总谐波畸变率-最大值
+     *
+     * @param voltageHarmonicThdMax 电压总谐波畸变率-最大值
+     */
+    public void setVoltageHarmonicThdMax(Double voltageHarmonicThdMax) {
+        this.voltageHarmonicThdMax = voltageHarmonicThdMax;
+    }
+
+    /**
+     * 获取电压总谐波畸变率-最小值
+     *
+     * @return voltage_harmonic_thd_min - 电压总谐波畸变率-最小值
+     */
+    public Double getVoltageHarmonicThdMin() {
+        return voltageHarmonicThdMin;
+    }
+
+    /**
+     * 设置电压总谐波畸变率-最小值
+     *
+     * @param voltageHarmonicThdMin 电压总谐波畸变率-最小值
+     */
+    public void setVoltageHarmonicThdMin(Double voltageHarmonicThdMin) {
+        this.voltageHarmonicThdMin = voltageHarmonicThdMin;
+    }
+
+    /**
+     * 获取电压总谐波畸变率-平均值
+     *
+     * @return voltage_harmonic_thd_avg - 电压总谐波畸变率-平均值
+     */
+    public Double getVoltageHarmonicThdAvg() {
+        return voltageHarmonicThdAvg;
+    }
+
+    /**
+     * 设置电压总谐波畸变率-平均值
+     *
+     * @param voltageHarmonicThdAvg 电压总谐波畸变率-平均值
+     */
+    public void setVoltageHarmonicThdAvg(Double voltageHarmonicThdAvg) {
+        this.voltageHarmonicThdAvg = voltageHarmonicThdAvg;
+    }
+
+    /**
+     * 获取电压总谐波畸变率-95值
+     *
+     * @return voltage_harmonic_thd_95 - 电压总谐波畸变率-95值
+     */
+    public Double getVoltageHarmonicThd95() {
+        return voltageHarmonicThd95;
+    }
+
+    /**
+     * 设置电压总谐波畸变率-95值
+     *
+     * @param voltageHarmonicThd95 电压总谐波畸变率-95值
+     */
+    public void setVoltageHarmonicThd95(Double voltageHarmonicThd95) {
+        this.voltageHarmonicThd95 = voltageHarmonicThd95;
+    }
+
+    /**
+     * 获取相（线）电压基波有效值-最大值
+     *
+     * @return fundamental_voltage_max - 相（线）电压基波有效值-最大值
+     */
+    public Double getFundamentalVoltageMax() {
+        return fundamentalVoltageMax;
+    }
+
+    /**
+     * 设置相（线）电压基波有效值-最大值
+     *
+     * @param fundamentalVoltageMax 相（线）电压基波有效值-最大值
+     */
+    public void setFundamentalVoltageMax(Double fundamentalVoltageMax) {
+        this.fundamentalVoltageMax = fundamentalVoltageMax;
+    }
+
+    /**
+     * 获取相（线）电压基波有效值-最小值
+     *
+     * @return fundamental_voltage_min - 相（线）电压基波有效值-最小值
+     */
+    public Double getFundamentalVoltageMin() {
+        return fundamentalVoltageMin;
+    }
+
+    /**
+     * 设置相（线）电压基波有效值-最小值
+     *
+     * @param fundamentalVoltageMin 相（线）电压基波有效值-最小值
+     */
+    public void setFundamentalVoltageMin(Double fundamentalVoltageMin) {
+        this.fundamentalVoltageMin = fundamentalVoltageMin;
+    }
+
+    /**
+     * 获取相（线）电压基波有效值-平均值
+     *
+     * @return fundamental_voltage_avg - 相（线）电压基波有效值-平均值
+     */
+    public Double getFundamentalVoltageAvg() {
+        return fundamentalVoltageAvg;
+    }
+
+    /**
+     * 设置相（线）电压基波有效值-平均值
+     *
+     * @param fundamentalVoltageAvg 相（线）电压基波有效值-平均值
+     */
+    public void setFundamentalVoltageAvg(Double fundamentalVoltageAvg) {
+        this.fundamentalVoltageAvg = fundamentalVoltageAvg;
+    }
+
+    /**
+     * 获取相（线）电压基波有效值-95值
+     *
+     * @return fundamental_voltage_95 - 相（线）电压基波有效值-95值
+     */
+    public Double getFundamentalVoltage95() {
+        return fundamentalVoltage95;
+    }
+
+    /**
+     * 设置相（线）电压基波有效值-95值
+     *
+     * @param fundamentalVoltage95 相（线）电压基波有效值-95值
+     */
+    public void setFundamentalVoltage95(Double fundamentalVoltage95) {
+        this.fundamentalVoltage95 = fundamentalVoltage95;
+    }
+
+    /**
+     * 获取2次谐波电压含有率最大值
+     *
+     * @return harmonic_voltage_content_2_max - 2次谐波电压含有率最大值
+     */
+    public Double getHarmonicVoltageContent2Max() {
+        return harmonicVoltageContent2Max;
+    }
+
+    /**
+     * 设置2次谐波电压含有率最大值
+     *
+     * @param harmonicVoltageContent2Max 2次谐波电压含有率最大值
+     */
+    public void setHarmonicVoltageContent2Max(Double harmonicVoltageContent2Max) {
+        this.harmonicVoltageContent2Max = harmonicVoltageContent2Max;
+    }
+
+    /**
+     * 获取2次谐波电压含有率最小值
+     *
+     * @return harmonic_voltage_content_2_min - 2次谐波电压含有率最小值
+     */
+    public Double getHarmonicVoltageContent2Min() {
+        return harmonicVoltageContent2Min;
+    }
+
+    /**
+     * 设置2次谐波电压含有率最小值
+     *
+     * @param harmonicVoltageContent2Min 2次谐波电压含有率最小值
+     */
+    public void setHarmonicVoltageContent2Min(Double harmonicVoltageContent2Min) {
+        this.harmonicVoltageContent2Min = harmonicVoltageContent2Min;
+    }
+
+    /**
+     * 获取2次谐波电压含有率平均值
+     *
+     * @return harmonic_voltage_content_2_avg - 2次谐波电压含有率平均值
+     */
+    public Double getHarmonicVoltageContent2Avg() {
+        return harmonicVoltageContent2Avg;
+    }
+
+    /**
+     * 设置2次谐波电压含有率平均值
+     *
+     * @param harmonicVoltageContent2Avg 2次谐波电压含有率平均值
+     */
+    public void setHarmonicVoltageContent2Avg(Double harmonicVoltageContent2Avg) {
+        this.harmonicVoltageContent2Avg = harmonicVoltageContent2Avg;
+    }
+
+    /**
+     * 获取2次谐波电压含有率95值
+     *
+     * @return harmonic_voltage_content_2_95 - 2次谐波电压含有率95值
+     */
+    public Double getHarmonicVoltageContent295() {
+        return harmonicVoltageContent295;
+    }
+
+    /**
+     * 设置2次谐波电压含有率95值
+     *
+     * @param harmonicVoltageContent295 2次谐波电压含有率95值
+     */
+    public void setHarmonicVoltageContent295(Double harmonicVoltageContent295) {
+        this.harmonicVoltageContent295 = harmonicVoltageContent295;
+    }
+
+    /**
+     * 获取3次谐波电压含有率最大值
+     *
+     * @return harmonic_voltage_content_3_max - 3次谐波电压含有率最大值
+     */
+    public Double getHarmonicVoltageContent3Max() {
+        return harmonicVoltageContent3Max;
+    }
+
+    /**
+     * 设置3次谐波电压含有率最大值
+     *
+     * @param harmonicVoltageContent3Max 3次谐波电压含有率最大值
+     */
+    public void setHarmonicVoltageContent3Max(Double harmonicVoltageContent3Max) {
+        this.harmonicVoltageContent3Max = harmonicVoltageContent3Max;
+    }
+
+    /**
+     * 获取3次谐波电压含有率最小值
+     *
+     * @return harmonic_voltage_content_3_min - 3次谐波电压含有率最小值
+     */
+    public Double getHarmonicVoltageContent3Min() {
+        return harmonicVoltageContent3Min;
+    }
+
+    /**
+     * 设置3次谐波电压含有率最小值
+     *
+     * @param harmonicVoltageContent3Min 3次谐波电压含有率最小值
+     */
+    public void setHarmonicVoltageContent3Min(Double harmonicVoltageContent3Min) {
+        this.harmonicVoltageContent3Min = harmonicVoltageContent3Min;
+    }
+
+    /**
+     * 获取3次谐波电压含有率平均值
+     *
+     * @return harmonic_voltage_content_3_avg - 3次谐波电压含有率平均值
+     */
+    public Double getHarmonicVoltageContent3Avg() {
+        return harmonicVoltageContent3Avg;
+    }
+
+    /**
+     * 设置3次谐波电压含有率平均值
+     *
+     * @param harmonicVoltageContent3Avg 3次谐波电压含有率平均值
+     */
+    public void setHarmonicVoltageContent3Avg(Double harmonicVoltageContent3Avg) {
+        this.harmonicVoltageContent3Avg = harmonicVoltageContent3Avg;
+    }
+
+    /**
+     * 获取3次谐波电压含有率95值
+     *
+     * @return harmonic_voltage_content_3_95 - 3次谐波电压含有率95值
+     */
+    public Double getHarmonicVoltageContent395() {
+        return harmonicVoltageContent395;
+    }
+
+    /**
+     * 设置3次谐波电压含有率95值
+     *
+     * @param harmonicVoltageContent395 3次谐波电压含有率95值
+     */
+    public void setHarmonicVoltageContent395(Double harmonicVoltageContent395) {
+        this.harmonicVoltageContent395 = harmonicVoltageContent395;
+    }
+
+    /**
+     * 获取4次谐波电压含有率最大值
+     *
+     * @return harmonic_voltage_content_4_max - 4次谐波电压含有率最大值
+     */
+    public Double getHarmonicVoltageContent4Max() {
+        return harmonicVoltageContent4Max;
+    }
+
+    /**
+     * 设置4次谐波电压含有率最大值
+     *
+     * @param harmonicVoltageContent4Max 4次谐波电压含有率最大值
+     */
+    public void setHarmonicVoltageContent4Max(Double harmonicVoltageContent4Max) {
+        this.harmonicVoltageContent4Max = harmonicVoltageContent4Max;
+    }
+
+    /**
+     * 获取4次谐波电压含有率最小值
+     *
+     * @return harmonic_voltage_content_4_min - 4次谐波电压含有率最小值
+     */
+    public Double getHarmonicVoltageContent4Min() {
+        return harmonicVoltageContent4Min;
+    }
+
+    /**
+     * 设置4次谐波电压含有率最小值
+     *
+     * @param harmonicVoltageContent4Min 4次谐波电压含有率最小值
+     */
+    public void setHarmonicVoltageContent4Min(Double harmonicVoltageContent4Min) {
+        this.harmonicVoltageContent4Min = harmonicVoltageContent4Min;
+    }
+
+    /**
+     * 获取4次谐波电压含有率平均值
+     *
+     * @return harmonic_voltage_content_4_avg - 4次谐波电压含有率平均值
+     */
+    public Double getHarmonicVoltageContent4Avg() {
+        return harmonicVoltageContent4Avg;
+    }
+
+    /**
+     * 设置4次谐波电压含有率平均值
+     *
+     * @param harmonicVoltageContent4Avg 4次谐波电压含有率平均值
+     */
+    public void setHarmonicVoltageContent4Avg(Double harmonicVoltageContent4Avg) {
+        this.harmonicVoltageContent4Avg = harmonicVoltageContent4Avg;
+    }
+
+    /**
+     * 获取4次谐波电压含有率95值
+     *
+     * @return harmonic_voltage_content_4_95 - 4次谐波电压含有率95值
+     */
+    public Double getHarmonicVoltageContent495() {
+        return harmonicVoltageContent495;
+    }
+
+    /**
+     * 设置4次谐波电压含有率95值
+     *
+     * @param harmonicVoltageContent495 4次谐波电压含有率95值
+     */
+    public void setHarmonicVoltageContent495(Double harmonicVoltageContent495) {
+        this.harmonicVoltageContent495 = harmonicVoltageContent495;
+    }
+
+    /**
+     * 获取5次谐波电压含有率最大值
+     *
+     * @return harmonic_voltage_content_5_max - 5次谐波电压含有率最大值
+     */
+    public Double getHarmonicVoltageContent5Max() {
+        return harmonicVoltageContent5Max;
+    }
+
+    /**
+     * 设置5次谐波电压含有率最大值
+     *
+     * @param harmonicVoltageContent5Max 5次谐波电压含有率最大值
+     */
+    public void setHarmonicVoltageContent5Max(Double harmonicVoltageContent5Max) {
+        this.harmonicVoltageContent5Max = harmonicVoltageContent5Max;
+    }
+
+    /**
+     * 获取5次谐波电压含有率最小值
+     *
+     * @return harmonic_voltage_content_5_min - 5次谐波电压含有率最小值
+     */
+    public Double getHarmonicVoltageContent5Min() {
+        return harmonicVoltageContent5Min;
+    }
+
+    /**
+     * 设置5次谐波电压含有率最小值
+     *
+     * @param harmonicVoltageContent5Min 5次谐波电压含有率最小值
+     */
+    public void setHarmonicVoltageContent5Min(Double harmonicVoltageContent5Min) {
+        this.harmonicVoltageContent5Min = harmonicVoltageContent5Min;
+    }
+
+    /**
+     * 获取5次谐波电压含有率平均值
+     *
+     * @return harmonic_voltage_content_5_avg - 5次谐波电压含有率平均值
+     */
+    public Double getHarmonicVoltageContent5Avg() {
+        return harmonicVoltageContent5Avg;
+    }
+
+    /**
+     * 设置5次谐波电压含有率平均值
+     *
+     * @param harmonicVoltageContent5Avg 5次谐波电压含有率平均值
+     */
+    public void setHarmonicVoltageContent5Avg(Double harmonicVoltageContent5Avg) {
+        this.harmonicVoltageContent5Avg = harmonicVoltageContent5Avg;
+    }
+
+    /**
+     * 获取5次谐波电压含有率95值
+     *
+     * @return harmonic_voltage_content_5_95 - 5次谐波电压含有率95值
+     */
+    public Double getHarmonicVoltageContent595() {
+        return harmonicVoltageContent595;
+    }
+
+    /**
+     * 设置5次谐波电压含有率95值
+     *
+     * @param harmonicVoltageContent595 5次谐波电压含有率95值
+     */
+    public void setHarmonicVoltageContent595(Double harmonicVoltageContent595) {
+        this.harmonicVoltageContent595 = harmonicVoltageContent595;
+    }
+
+    /**
+     * 获取6次谐波电压含有率最大值
+     *
+     * @return harmonic_voltage_content_6_max - 6次谐波电压含有率最大值
+     */
+    public Double getHarmonicVoltageContent6Max() {
+        return harmonicVoltageContent6Max;
+    }
+
+    /**
+     * 设置6次谐波电压含有率最大值
+     *
+     * @param harmonicVoltageContent6Max 6次谐波电压含有率最大值
+     */
+    public void setHarmonicVoltageContent6Max(Double harmonicVoltageContent6Max) {
+        this.harmonicVoltageContent6Max = harmonicVoltageContent6Max;
+    }
+
+    /**
+     * 获取6次谐波电压含有率最小值
+     *
+     * @return harmonic_voltage_content_6_min - 6次谐波电压含有率最小值
+     */
+    public Double getHarmonicVoltageContent6Min() {
+        return harmonicVoltageContent6Min;
+    }
+
+    /**
+     * 设置6次谐波电压含有率最小值
+     *
+     * @param harmonicVoltageContent6Min 6次谐波电压含有率最小值
+     */
+    public void setHarmonicVoltageContent6Min(Double harmonicVoltageContent6Min) {
+        this.harmonicVoltageContent6Min = harmonicVoltageContent6Min;
+    }
+
+    /**
+     * 获取6次谐波电压含有率平均值
+     *
+     * @return harmonic_voltage_content_6_avg - 6次谐波电压含有率平均值
+     */
+    public Double getHarmonicVoltageContent6Avg() {
+        return harmonicVoltageContent6Avg;
+    }
+
+    /**
+     * 设置6次谐波电压含有率平均值
+     *
+     * @param harmonicVoltageContent6Avg 6次谐波电压含有率平均值
+     */
+    public void setHarmonicVoltageContent6Avg(Double harmonicVoltageContent6Avg) {
+        this.harmonicVoltageContent6Avg = harmonicVoltageContent6Avg;
+    }
+
+    /**
+     * 获取6次谐波电压含有率95值
+     *
+     * @return harmonic_voltage_content_6_95 - 6次谐波电压含有率95值
+     */
+    public Double getHarmonicVoltageContent695() {
+        return harmonicVoltageContent695;
+    }
+
+    /**
+     * 设置6次谐波电压含有率95值
+     *
+     * @param harmonicVoltageContent695 6次谐波电压含有率95值
+     */
+    public void setHarmonicVoltageContent695(Double harmonicVoltageContent695) {
+        this.harmonicVoltageContent695 = harmonicVoltageContent695;
+    }
+
+    /**
+     * 获取7次谐波电压含有率最大值
+     *
+     * @return harmonic_voltage_content_7_max - 7次谐波电压含有率最大值
+     */
+    public Double getHarmonicVoltageContent7Max() {
+        return harmonicVoltageContent7Max;
+    }
+
+    /**
+     * 设置7次谐波电压含有率最大值
+     *
+     * @param harmonicVoltageContent7Max 7次谐波电压含有率最大值
+     */
+    public void setHarmonicVoltageContent7Max(Double harmonicVoltageContent7Max) {
+        this.harmonicVoltageContent7Max = harmonicVoltageContent7Max;
+    }
+
+    /**
+     * 获取7次谐波电压含有率最小值
+     *
+     * @return harmonic_voltage_content_7_min - 7次谐波电压含有率最小值
+     */
+    public Double getHarmonicVoltageContent7Min() {
+        return harmonicVoltageContent7Min;
+    }
+
+    /**
+     * 设置7次谐波电压含有率最小值
+     *
+     * @param harmonicVoltageContent7Min 7次谐波电压含有率最小值
+     */
+    public void setHarmonicVoltageContent7Min(Double harmonicVoltageContent7Min) {
+        this.harmonicVoltageContent7Min = harmonicVoltageContent7Min;
+    }
+
+    /**
+     * 获取7次谐波电压含有率平均值
+     *
+     * @return harmonic_voltage_content_7_avg - 7次谐波电压含有率平均值
+     */
+    public Double getHarmonicVoltageContent7Avg() {
+        return harmonicVoltageContent7Avg;
+    }
+
+    /**
+     * 设置7次谐波电压含有率平均值
+     *
+     * @param harmonicVoltageContent7Avg 7次谐波电压含有率平均值
+     */
+    public void setHarmonicVoltageContent7Avg(Double harmonicVoltageContent7Avg) {
+        this.harmonicVoltageContent7Avg = harmonicVoltageContent7Avg;
+    }
+
+    /**
+     * 获取7次谐波电压含有率95值
+     *
+     * @return harmonic_voltage_content_7_95 - 7次谐波电压含有率95值
+     */
+    public Double getHarmonicVoltageContent795() {
+        return harmonicVoltageContent795;
+    }
+
+    /**
+     * 设置7次谐波电压含有率95值
+     *
+     * @param harmonicVoltageContent795 7次谐波电压含有率95值
+     */
+    public void setHarmonicVoltageContent795(Double harmonicVoltageContent795) {
+        this.harmonicVoltageContent795 = harmonicVoltageContent795;
+    }
+
+    /**
+     * 获取8次谐波电压含有率最大值
+     *
+     * @return harmonic_voltage_content_8_max - 8次谐波电压含有率最大值
+     */
+    public Double getHarmonicVoltageContent8Max() {
+        return harmonicVoltageContent8Max;
+    }
+
+    /**
+     * 设置8次谐波电压含有率最大值
+     *
+     * @param harmonicVoltageContent8Max 8次谐波电压含有率最大值
+     */
+    public void setHarmonicVoltageContent8Max(Double harmonicVoltageContent8Max) {
+        this.harmonicVoltageContent8Max = harmonicVoltageContent8Max;
+    }
+
+    /**
+     * 获取8次谐波电压含有率最小值
+     *
+     * @return harmonic_voltage_content_8_min - 8次谐波电压含有率最小值
+     */
+    public Double getHarmonicVoltageContent8Min() {
+        return harmonicVoltageContent8Min;
+    }
+
+    /**
+     * 设置8次谐波电压含有率最小值
+     *
+     * @param harmonicVoltageContent8Min 8次谐波电压含有率最小值
+     */
+    public void setHarmonicVoltageContent8Min(Double harmonicVoltageContent8Min) {
+        this.harmonicVoltageContent8Min = harmonicVoltageContent8Min;
+    }
+
+    /**
+     * 获取8次谐波电压含有率平均值
+     *
+     * @return harmonic_voltage_content_8_avg - 8次谐波电压含有率平均值
+     */
+    public Double getHarmonicVoltageContent8Avg() {
+        return harmonicVoltageContent8Avg;
+    }
+
+    /**
+     * 设置8次谐波电压含有率平均值
+     *
+     * @param harmonicVoltageContent8Avg 8次谐波电压含有率平均值
+     */
+    public void setHarmonicVoltageContent8Avg(Double harmonicVoltageContent8Avg) {
+        this.harmonicVoltageContent8Avg = harmonicVoltageContent8Avg;
+    }
+
+    /**
+     * 获取8次谐波电压含有率95值
+     *
+     * @return harmonic_voltage_content_8_95 - 8次谐波电压含有率95值
+     */
+    public Double getHarmonicVoltageContent895() {
+        return harmonicVoltageContent895;
+    }
+
+    /**
+     * 设置8次谐波电压含有率95值
+     *
+     * @param harmonicVoltageContent895 8次谐波电压含有率95值
+     */
+    public void setHarmonicVoltageContent895(Double harmonicVoltageContent895) {
+        this.harmonicVoltageContent895 = harmonicVoltageContent895;
+    }
+
+    /**
+     * 获取9次谐波电压含有率最大值
+     *
+     * @return harmonic_voltage_content_9_max - 9次谐波电压含有率最大值
+     */
+    public Double getHarmonicVoltageContent9Max() {
+        return harmonicVoltageContent9Max;
+    }
+
+    /**
+     * 设置9次谐波电压含有率最大值
+     *
+     * @param harmonicVoltageContent9Max 9次谐波电压含有率最大值
+     */
+    public void setHarmonicVoltageContent9Max(Double harmonicVoltageContent9Max) {
+        this.harmonicVoltageContent9Max = harmonicVoltageContent9Max;
+    }
+
+    /**
+     * 获取9次谐波电压含有率最小值
+     *
+     * @return harmonic_voltage_content_9_min - 9次谐波电压含有率最小值
+     */
+    public Double getHarmonicVoltageContent9Min() {
+        return harmonicVoltageContent9Min;
+    }
+
+    /**
+     * 设置9次谐波电压含有率最小值
+     *
+     * @param harmonicVoltageContent9Min 9次谐波电压含有率最小值
+     */
+    public void setHarmonicVoltageContent9Min(Double harmonicVoltageContent9Min) {
+        this.harmonicVoltageContent9Min = harmonicVoltageContent9Min;
+    }
+
+    /**
+     * 获取9次谐波电压含有率平均值
+     *
+     * @return harmonic_voltage_content_9_avg - 9次谐波电压含有率平均值
+     */
+    public Double getHarmonicVoltageContent9Avg() {
+        return harmonicVoltageContent9Avg;
+    }
+
+    /**
+     * 设置9次谐波电压含有率平均值
+     *
+     * @param harmonicVoltageContent9Avg 9次谐波电压含有率平均值
+     */
+    public void setHarmonicVoltageContent9Avg(Double harmonicVoltageContent9Avg) {
+        this.harmonicVoltageContent9Avg = harmonicVoltageContent9Avg;
+    }
+
+    /**
+     * 获取9次谐波电压含有率95值
+     *
+     * @return harmonic_voltage_content_9_95 - 9次谐波电压含有率95值
+     */
+    public Double getHarmonicVoltageContent995() {
+        return harmonicVoltageContent995;
+    }
+
+    /**
+     * 设置9次谐波电压含有率95值
+     *
+     * @param harmonicVoltageContent995 9次谐波电压含有率95值
+     */
+    public void setHarmonicVoltageContent995(Double harmonicVoltageContent995) {
+        this.harmonicVoltageContent995 = harmonicVoltageContent995;
+    }
+
+    /**
+     * 获取10次谐波电压含有率最大值
+     *
+     * @return harmonic_voltage_content_10_max - 10次谐波电压含有率最大值
+     */
+    public Double getHarmonicVoltageContent10Max() {
+        return harmonicVoltageContent10Max;
+    }
+
+    /**
+     * 设置10次谐波电压含有率最大值
+     *
+     * @param harmonicVoltageContent10Max 10次谐波电压含有率最大值
+     */
+    public void setHarmonicVoltageContent10Max(Double harmonicVoltageContent10Max) {
+        this.harmonicVoltageContent10Max = harmonicVoltageContent10Max;
+    }
+
+    /**
+     * 获取10次谐波电压含有率最小值
+     *
+     * @return harmonic_voltage_content_10_min - 10次谐波电压含有率最小值
+     */
+    public Double getHarmonicVoltageContent10Min() {
+        return harmonicVoltageContent10Min;
+    }
+
+    /**
+     * 设置10次谐波电压含有率最小值
+     *
+     * @param harmonicVoltageContent10Min 10次谐波电压含有率最小值
+     */
+    public void setHarmonicVoltageContent10Min(Double harmonicVoltageContent10Min) {
+        this.harmonicVoltageContent10Min = harmonicVoltageContent10Min;
+    }
+
+    /**
+     * 获取10次谐波电压含有率平均值
+     *
+     * @return harmonic_voltage_content_10_avg - 10次谐波电压含有率平均值
+     */
+    public Double getHarmonicVoltageContent10Avg() {
+        return harmonicVoltageContent10Avg;
+    }
+
+    /**
+     * 设置10次谐波电压含有率平均值
+     *
+     * @param harmonicVoltageContent10Avg 10次谐波电压含有率平均值
+     */
+    public void setHarmonicVoltageContent10Avg(Double harmonicVoltageContent10Avg) {
+        this.harmonicVoltageContent10Avg = harmonicVoltageContent10Avg;
+    }
+
+    /**
+     * 获取10次谐波电压含有率95值
+     *
+     * @return harmonic_voltage_content_10_95 - 10次谐波电压含有率95值
+     */
+    public Double getHarmonicVoltageContent1095() {
+        return harmonicVoltageContent1095;
+    }
+
+    /**
+     * 设置10次谐波电压含有率95值
+     *
+     * @param harmonicVoltageContent1095 10次谐波电压含有率95值
+     */
+    public void setHarmonicVoltageContent1095(Double harmonicVoltageContent1095) {
+        this.harmonicVoltageContent1095 = harmonicVoltageContent1095;
+    }
+
+    /**
+     * 获取11次谐波电压含有率最大值
+     *
+     * @return harmonic_voltage_content_11_max - 11次谐波电压含有率最大值
+     */
+    public Double getHarmonicVoltageContent11Max() {
+        return harmonicVoltageContent11Max;
+    }
+
+    /**
+     * 设置11次谐波电压含有率最大值
+     *
+     * @param harmonicVoltageContent11Max 11次谐波电压含有率最大值
+     */
+    public void setHarmonicVoltageContent11Max(Double harmonicVoltageContent11Max) {
+        this.harmonicVoltageContent11Max = harmonicVoltageContent11Max;
+    }
+
+    /**
+     * 获取11次谐波电压含有率最小值
+     *
+     * @return harmonic_voltage_content_11_min - 11次谐波电压含有率最小值
+     */
+    public Double getHarmonicVoltageContent11Min() {
+        return harmonicVoltageContent11Min;
+    }
+
+    /**
+     * 设置11次谐波电压含有率最小值
+     *
+     * @param harmonicVoltageContent11Min 11次谐波电压含有率最小值
+     */
+    public void setHarmonicVoltageContent11Min(Double harmonicVoltageContent11Min) {
+        this.harmonicVoltageContent11Min = harmonicVoltageContent11Min;
+    }
+
+    /**
+     * 获取11次谐波电压含有率平均值
+     *
+     * @return harmonic_voltage_content_11_avg - 11次谐波电压含有率平均值
+     */
+    public Double getHarmonicVoltageContent11Avg() {
+        return harmonicVoltageContent11Avg;
+    }
+
+    /**
+     * 设置11次谐波电压含有率平均值
+     *
+     * @param harmonicVoltageContent11Avg 11次谐波电压含有率平均值
+     */
+    public void setHarmonicVoltageContent11Avg(Double harmonicVoltageContent11Avg) {
+        this.harmonicVoltageContent11Avg = harmonicVoltageContent11Avg;
+    }
+
+    /**
+     * 获取11次谐波电压含有率95值
+     *
+     * @return harmonic_voltage_content_11_95 - 11次谐波电压含有率95值
+     */
+    public Double getHarmonicVoltageContent1195() {
+        return harmonicVoltageContent1195;
+    }
+
+    /**
+     * 设置11次谐波电压含有率95值
+     *
+     * @param harmonicVoltageContent1195 11次谐波电压含有率95值
+     */
+    public void setHarmonicVoltageContent1195(Double harmonicVoltageContent1195) {
+        this.harmonicVoltageContent1195 = harmonicVoltageContent1195;
+    }
+
+    /**
+     * 获取12次谐波电压含有率最大值
+     *
+     * @return harmonic_voltage_content_12_max - 12次谐波电压含有率最大值
+     */
+    public Double getHarmonicVoltageContent12Max() {
+        return harmonicVoltageContent12Max;
+    }
+
+    /**
+     * 设置12次谐波电压含有率最大值
+     *
+     * @param harmonicVoltageContent12Max 12次谐波电压含有率最大值
+     */
+    public void setHarmonicVoltageContent12Max(Double harmonicVoltageContent12Max) {
+        this.harmonicVoltageContent12Max = harmonicVoltageContent12Max;
+    }
+
+    /**
+     * 获取12次谐波电压含有率最小值
+     *
+     * @return harmonic_voltage_content_12_min - 12次谐波电压含有率最小值
+     */
+    public Double getHarmonicVoltageContent12Min() {
+        return harmonicVoltageContent12Min;
+    }
+
+    /**
+     * 设置12次谐波电压含有率最小值
+     *
+     * @param harmonicVoltageContent12Min 12次谐波电压含有率最小值
+     */
+    public void setHarmonicVoltageContent12Min(Double harmonicVoltageContent12Min) {
+        this.harmonicVoltageContent12Min = harmonicVoltageContent12Min;
+    }
+
+    /**
+     * 获取12次谐波电压含有率平均值
+     *
+     * @return harmonic_voltage_content_12_avg - 12次谐波电压含有率平均值
+     */
+    public Double getHarmonicVoltageContent12Avg() {
+        return harmonicVoltageContent12Avg;
+    }
+
+    /**
+     * 设置12次谐波电压含有率平均值
+     *
+     * @param harmonicVoltageContent12Avg 12次谐波电压含有率平均值
+     */
+    public void setHarmonicVoltageContent12Avg(Double harmonicVoltageContent12Avg) {
+        this.harmonicVoltageContent12Avg = harmonicVoltageContent12Avg;
+    }
+
+    /**
+     * 获取12次谐波电压含有率95值
+     *
+     * @return harmonic_voltage_content_12_95 - 12次谐波电压含有率95值
+     */
+    public Double getHarmonicVoltageContent1295() {
+        return harmonicVoltageContent1295;
+    }
+
+    /**
+     * 设置12次谐波电压含有率95值
+     *
+     * @param harmonicVoltageContent1295 12次谐波电压含有率95值
+     */
+    public void setHarmonicVoltageContent1295(Double harmonicVoltageContent1295) {
+        this.harmonicVoltageContent1295 = harmonicVoltageContent1295;
+    }
+
+    /**
+     * 获取13次谐波电压含有率最大值
+     *
+     * @return harmonic_voltage_content_13_max - 13次谐波电压含有率最大值
+     */
+    public Double getHarmonicVoltageContent13Max() {
+        return harmonicVoltageContent13Max;
+    }
+
+    /**
+     * 设置13次谐波电压含有率最大值
+     *
+     * @param harmonicVoltageContent13Max 13次谐波电压含有率最大值
+     */
+    public void setHarmonicVoltageContent13Max(Double harmonicVoltageContent13Max) {
+        this.harmonicVoltageContent13Max = harmonicVoltageContent13Max;
+    }
+
+    /**
+     * 获取13次谐波电压含有率最小值
+     *
+     * @return harmonic_voltage_content_13_min - 13次谐波电压含有率最小值
+     */
+    public Double getHarmonicVoltageContent13Min() {
+        return harmonicVoltageContent13Min;
+    }
+
+    /**
+     * 设置13次谐波电压含有率最小值
+     *
+     * @param harmonicVoltageContent13Min 13次谐波电压含有率最小值
+     */
+    public void setHarmonicVoltageContent13Min(Double harmonicVoltageContent13Min) {
+        this.harmonicVoltageContent13Min = harmonicVoltageContent13Min;
+    }
+
+    /**
+     * 获取13次谐波电压含有率平均值
+     *
+     * @return harmonic_voltage_content_13_avg - 13次谐波电压含有率平均值
+     */
+    public Double getHarmonicVoltageContent13Avg() {
+        return harmonicVoltageContent13Avg;
+    }
+
+    /**
+     * 设置13次谐波电压含有率平均值
+     *
+     * @param harmonicVoltageContent13Avg 13次谐波电压含有率平均值
+     */
+    public void setHarmonicVoltageContent13Avg(Double harmonicVoltageContent13Avg) {
+        this.harmonicVoltageContent13Avg = harmonicVoltageContent13Avg;
+    }
+
+    /**
+     * 获取13次谐波电压含有率95值
+     *
+     * @return harmonic_voltage_content_13_95 - 13次谐波电压含有率95值
+     */
+    public Double getHarmonicVoltageContent1395() {
+        return harmonicVoltageContent1395;
+    }
+
+    /**
+     * 设置13次谐波电压含有率95值
+     *
+     * @param harmonicVoltageContent1395 13次谐波电压含有率95值
+     */
+    public void setHarmonicVoltageContent1395(Double harmonicVoltageContent1395) {
+        this.harmonicVoltageContent1395 = harmonicVoltageContent1395;
+    }
+
+    /**
+     * 获取14次谐波电压含有率最大值
+     *
+     * @return harmonic_voltage_content_14_max - 14次谐波电压含有率最大值
+     */
+    public Double getHarmonicVoltageContent14Max() {
+        return harmonicVoltageContent14Max;
+    }
+
+    /**
+     * 设置14次谐波电压含有率最大值
+     *
+     * @param harmonicVoltageContent14Max 14次谐波电压含有率最大值
+     */
+    public void setHarmonicVoltageContent14Max(Double harmonicVoltageContent14Max) {
+        this.harmonicVoltageContent14Max = harmonicVoltageContent14Max;
+    }
+
+    /**
+     * 获取14次谐波电压含有率最小值
+     *
+     * @return harmonic_voltage_content_14_min - 14次谐波电压含有率最小值
+     */
+    public Double getHarmonicVoltageContent14Min() {
+        return harmonicVoltageContent14Min;
+    }
+
+    /**
+     * 设置14次谐波电压含有率最小值
+     *
+     * @param harmonicVoltageContent14Min 14次谐波电压含有率最小值
+     */
+    public void setHarmonicVoltageContent14Min(Double harmonicVoltageContent14Min) {
+        this.harmonicVoltageContent14Min = harmonicVoltageContent14Min;
+    }
+
+    /**
+     * 获取14次谐波电压含有率平均值
+     *
+     * @return harmonic_voltage_content_14_avg - 14次谐波电压含有率平均值
+     */
+    public Double getHarmonicVoltageContent14Avg() {
+        return harmonicVoltageContent14Avg;
+    }
+
+    /**
+     * 设置14次谐波电压含有率平均值
+     *
+     * @param harmonicVoltageContent14Avg 14次谐波电压含有率平均值
+     */
+    public void setHarmonicVoltageContent14Avg(Double harmonicVoltageContent14Avg) {
+        this.harmonicVoltageContent14Avg = harmonicVoltageContent14Avg;
+    }
+
+    /**
+     * 获取14次谐波电压含有率95值
+     *
+     * @return harmonic_voltage_content_14_95 - 14次谐波电压含有率95值
+     */
+    public Double getHarmonicVoltageContent1495() {
+        return harmonicVoltageContent1495;
+    }
+
+    /**
+     * 设置14次谐波电压含有率95值
+     *
+     * @param harmonicVoltageContent1495 14次谐波电压含有率95值
+     */
+    public void setHarmonicVoltageContent1495(Double harmonicVoltageContent1495) {
+        this.harmonicVoltageContent1495 = harmonicVoltageContent1495;
+    }
+
+    /**
+     * 获取15次谐波电压含有率最大值
+     *
+     * @return harmonic_voltage_content_15_max - 15次谐波电压含有率最大值
+     */
+    public Double getHarmonicVoltageContent15Max() {
+        return harmonicVoltageContent15Max;
+    }
+
+    /**
+     * 设置15次谐波电压含有率最大值
+     *
+     * @param harmonicVoltageContent15Max 15次谐波电压含有率最大值
+     */
+    public void setHarmonicVoltageContent15Max(Double harmonicVoltageContent15Max) {
+        this.harmonicVoltageContent15Max = harmonicVoltageContent15Max;
+    }
+
+    /**
+     * 获取15次谐波电压含有率最小值
+     *
+     * @return harmonic_voltage_content_15_min - 15次谐波电压含有率最小值
+     */
+    public Double getHarmonicVoltageContent15Min() {
+        return harmonicVoltageContent15Min;
+    }
+
+    /**
+     * 设置15次谐波电压含有率最小值
+     *
+     * @param harmonicVoltageContent15Min 15次谐波电压含有率最小值
+     */
+    public void setHarmonicVoltageContent15Min(Double harmonicVoltageContent15Min) {
+        this.harmonicVoltageContent15Min = harmonicVoltageContent15Min;
+    }
+
+    /**
+     * 获取15次谐波电压含有率平均值
+     *
+     * @return harmonic_voltage_content_15_avg - 15次谐波电压含有率平均值
+     */
+    public Double getHarmonicVoltageContent15Avg() {
+        return harmonicVoltageContent15Avg;
+    }
+
+    /**
+     * 设置15次谐波电压含有率平均值
+     *
+     * @param harmonicVoltageContent15Avg 15次谐波电压含有率平均值
+     */
+    public void setHarmonicVoltageContent15Avg(Double harmonicVoltageContent15Avg) {
+        this.harmonicVoltageContent15Avg = harmonicVoltageContent15Avg;
+    }
+
+    /**
+     * 获取15次谐波电压含有率95值
+     *
+     * @return harmonic_voltage_content_15_95 - 15次谐波电压含有率95值
+     */
+    public Double getHarmonicVoltageContent1595() {
+        return harmonicVoltageContent1595;
+    }
+
+    /**
+     * 设置15次谐波电压含有率95值
+     *
+     * @param harmonicVoltageContent1595 15次谐波电压含有率95值
+     */
+    public void setHarmonicVoltageContent1595(Double harmonicVoltageContent1595) {
+        this.harmonicVoltageContent1595 = harmonicVoltageContent1595;
+    }
+
+    /**
+     * 获取16次谐波电压含有率最大值
+     *
+     * @return harmonic_voltage_content_16_max - 16次谐波电压含有率最大值
+     */
+    public Double getHarmonicVoltageContent16Max() {
+        return harmonicVoltageContent16Max;
+    }
+
+    /**
+     * 设置16次谐波电压含有率最大值
+     *
+     * @param harmonicVoltageContent16Max 16次谐波电压含有率最大值
+     */
+    public void setHarmonicVoltageContent16Max(Double harmonicVoltageContent16Max) {
+        this.harmonicVoltageContent16Max = harmonicVoltageContent16Max;
+    }
+
+    /**
+     * 获取16次谐波电压含有率最小值
+     *
+     * @return harmonic_voltage_content_16_min - 16次谐波电压含有率最小值
+     */
+    public Double getHarmonicVoltageContent16Min() {
+        return harmonicVoltageContent16Min;
+    }
+
+    /**
+     * 设置16次谐波电压含有率最小值
+     *
+     * @param harmonicVoltageContent16Min 16次谐波电压含有率最小值
+     */
+    public void setHarmonicVoltageContent16Min(Double harmonicVoltageContent16Min) {
+        this.harmonicVoltageContent16Min = harmonicVoltageContent16Min;
+    }
+
+    /**
+     * 获取16次谐波电压含有率平均值
+     *
+     * @return harmonic_voltage_content_16_avg - 16次谐波电压含有率平均值
+     */
+    public Double getHarmonicVoltageContent16Avg() {
+        return harmonicVoltageContent16Avg;
+    }
+
+    /**
+     * 设置16次谐波电压含有率平均值
+     *
+     * @param harmonicVoltageContent16Avg 16次谐波电压含有率平均值
+     */
+    public void setHarmonicVoltageContent16Avg(Double harmonicVoltageContent16Avg) {
+        this.harmonicVoltageContent16Avg = harmonicVoltageContent16Avg;
+    }
+
+    /**
+     * 获取16次谐波电压含有率95值
+     *
+     * @return harmonic_voltage_content_16_95 - 16次谐波电压含有率95值
+     */
+    public Double getHarmonicVoltageContent1695() {
+        return harmonicVoltageContent1695;
+    }
+
+    /**
+     * 设置16次谐波电压含有率95值
+     *
+     * @param harmonicVoltageContent1695 16次谐波电压含有率95值
+     */
+    public void setHarmonicVoltageContent1695(Double harmonicVoltageContent1695) {
+        this.harmonicVoltageContent1695 = harmonicVoltageContent1695;
+    }
+
+    /**
+     * 获取17次谐波电压含有率最大值
+     *
+     * @return harmonic_voltage_content_17_max - 17次谐波电压含有率最大值
+     */
+    public Double getHarmonicVoltageContent17Max() {
+        return harmonicVoltageContent17Max;
+    }
+
+    /**
+     * 设置17次谐波电压含有率最大值
+     *
+     * @param harmonicVoltageContent17Max 17次谐波电压含有率最大值
+     */
+    public void setHarmonicVoltageContent17Max(Double harmonicVoltageContent17Max) {
+        this.harmonicVoltageContent17Max = harmonicVoltageContent17Max;
+    }
+
+    /**
+     * 获取17次谐波电压含有率最小值
+     *
+     * @return harmonic_voltage_content_17_min - 17次谐波电压含有率最小值
+     */
+    public Double getHarmonicVoltageContent17Min() {
+        return harmonicVoltageContent17Min;
+    }
+
+    /**
+     * 设置17次谐波电压含有率最小值
+     *
+     * @param harmonicVoltageContent17Min 17次谐波电压含有率最小值
+     */
+    public void setHarmonicVoltageContent17Min(Double harmonicVoltageContent17Min) {
+        this.harmonicVoltageContent17Min = harmonicVoltageContent17Min;
+    }
+
+    /**
+     * 获取17次谐波电压含有率平均值
+     *
+     * @return harmonic_voltage_content_17_avg - 17次谐波电压含有率平均值
+     */
+    public Double getHarmonicVoltageContent17Avg() {
+        return harmonicVoltageContent17Avg;
+    }
+
+    /**
+     * 设置17次谐波电压含有率平均值
+     *
+     * @param harmonicVoltageContent17Avg 17次谐波电压含有率平均值
+     */
+    public void setHarmonicVoltageContent17Avg(Double harmonicVoltageContent17Avg) {
+        this.harmonicVoltageContent17Avg = harmonicVoltageContent17Avg;
+    }
+
+    /**
+     * 获取17次谐波电压含有率95值
+     *
+     * @return harmonic_voltage_content_17_95 - 17次谐波电压含有率95值
+     */
+    public Double getHarmonicVoltageContent1795() {
+        return harmonicVoltageContent1795;
+    }
+
+    /**
+     * 设置17次谐波电压含有率95值
+     *
+     * @param harmonicVoltageContent1795 17次谐波电压含有率95值
+     */
+    public void setHarmonicVoltageContent1795(Double harmonicVoltageContent1795) {
+        this.harmonicVoltageContent1795 = harmonicVoltageContent1795;
+    }
+
+    /**
+     * 获取18次谐波电压含有率最大值
+     *
+     * @return harmonic_voltage_content_18_max - 18次谐波电压含有率最大值
+     */
+    public Double getHarmonicVoltageContent18Max() {
+        return harmonicVoltageContent18Max;
+    }
+
+    /**
+     * 设置18次谐波电压含有率最大值
+     *
+     * @param harmonicVoltageContent18Max 18次谐波电压含有率最大值
+     */
+    public void setHarmonicVoltageContent18Max(Double harmonicVoltageContent18Max) {
+        this.harmonicVoltageContent18Max = harmonicVoltageContent18Max;
+    }
+
+    /**
+     * 获取18次谐波电压含有率最小值
+     *
+     * @return harmonic_voltage_content_18_min - 18次谐波电压含有率最小值
+     */
+    public Double getHarmonicVoltageContent18Min() {
+        return harmonicVoltageContent18Min;
+    }
+
+    /**
+     * 设置18次谐波电压含有率最小值
+     *
+     * @param harmonicVoltageContent18Min 18次谐波电压含有率最小值
+     */
+    public void setHarmonicVoltageContent18Min(Double harmonicVoltageContent18Min) {
+        this.harmonicVoltageContent18Min = harmonicVoltageContent18Min;
+    }
+
+    /**
+     * 获取18次谐波电压含有率平均值
+     *
+     * @return harmonic_voltage_content_18_avg - 18次谐波电压含有率平均值
+     */
+    public Double getHarmonicVoltageContent18Avg() {
+        return harmonicVoltageContent18Avg;
+    }
+
+    /**
+     * 设置18次谐波电压含有率平均值
+     *
+     * @param harmonicVoltageContent18Avg 18次谐波电压含有率平均值
+     */
+    public void setHarmonicVoltageContent18Avg(Double harmonicVoltageContent18Avg) {
+        this.harmonicVoltageContent18Avg = harmonicVoltageContent18Avg;
+    }
+
+    /**
+     * 获取18次谐波电压含有率95值
+     *
+     * @return harmonic_voltage_content_18_95 - 18次谐波电压含有率95值
+     */
+    public Double getHarmonicVoltageContent1895() {
+        return harmonicVoltageContent1895;
+    }
+
+    /**
+     * 设置18次谐波电压含有率95值
+     *
+     * @param harmonicVoltageContent1895 18次谐波电压含有率95值
+     */
+    public void setHarmonicVoltageContent1895(Double harmonicVoltageContent1895) {
+        this.harmonicVoltageContent1895 = harmonicVoltageContent1895;
+    }
+
+    /**
+     * 获取19次谐波电压含有率最大值
+     *
+     * @return harmonic_voltage_content_19_max - 19次谐波电压含有率最大值
+     */
+    public Double getHarmonicVoltageContent19Max() {
+        return harmonicVoltageContent19Max;
+    }
+
+    /**
+     * 设置19次谐波电压含有率最大值
+     *
+     * @param harmonicVoltageContent19Max 19次谐波电压含有率最大值
+     */
+    public void setHarmonicVoltageContent19Max(Double harmonicVoltageContent19Max) {
+        this.harmonicVoltageContent19Max = harmonicVoltageContent19Max;
+    }
+
+    /**
+     * 获取19次谐波电压含有率最小值
+     *
+     * @return harmonic_voltage_content_19_min - 19次谐波电压含有率最小值
+     */
+    public Double getHarmonicVoltageContent19Min() {
+        return harmonicVoltageContent19Min;
+    }
+
+    /**
+     * 设置19次谐波电压含有率最小值
+     *
+     * @param harmonicVoltageContent19Min 19次谐波电压含有率最小值
+     */
+    public void setHarmonicVoltageContent19Min(Double harmonicVoltageContent19Min) {
+        this.harmonicVoltageContent19Min = harmonicVoltageContent19Min;
+    }
+
+    /**
+     * 获取19次谐波电压含有率平均值
+     *
+     * @return harmonic_voltage_content_19_avg - 19次谐波电压含有率平均值
+     */
+    public Double getHarmonicVoltageContent19Avg() {
+        return harmonicVoltageContent19Avg;
+    }
+
+    /**
+     * 设置19次谐波电压含有率平均值
+     *
+     * @param harmonicVoltageContent19Avg 19次谐波电压含有率平均值
+     */
+    public void setHarmonicVoltageContent19Avg(Double harmonicVoltageContent19Avg) {
+        this.harmonicVoltageContent19Avg = harmonicVoltageContent19Avg;
+    }
+
+    /**
+     * 获取19次谐波电压含有率95值
+     *
+     * @return harmonic_voltage_content_19_95 - 19次谐波电压含有率95值
+     */
+    public Double getHarmonicVoltageContent1995() {
+        return harmonicVoltageContent1995;
+    }
+
+    /**
+     * 设置19次谐波电压含有率95值
+     *
+     * @param harmonicVoltageContent1995 19次谐波电压含有率95值
+     */
+    public void setHarmonicVoltageContent1995(Double harmonicVoltageContent1995) {
+        this.harmonicVoltageContent1995 = harmonicVoltageContent1995;
+    }
+
+    /**
+     * 获取20次谐波电压含有率最大值
+     *
+     * @return harmonic_voltage_content_20_max - 20次谐波电压含有率最大值
+     */
+    public Double getHarmonicVoltageContent20Max() {
+        return harmonicVoltageContent20Max;
+    }
+
+    /**
+     * 设置20次谐波电压含有率最大值
+     *
+     * @param harmonicVoltageContent20Max 20次谐波电压含有率最大值
+     */
+    public void setHarmonicVoltageContent20Max(Double harmonicVoltageContent20Max) {
+        this.harmonicVoltageContent20Max = harmonicVoltageContent20Max;
+    }
+
+    /**
+     * 获取20次谐波电压含有率最小值
+     *
+     * @return harmonic_voltage_content_20_min - 20次谐波电压含有率最小值
+     */
+    public Double getHarmonicVoltageContent20Min() {
+        return harmonicVoltageContent20Min;
+    }
+
+    /**
+     * 设置20次谐波电压含有率最小值
+     *
+     * @param harmonicVoltageContent20Min 20次谐波电压含有率最小值
+     */
+    public void setHarmonicVoltageContent20Min(Double harmonicVoltageContent20Min) {
+        this.harmonicVoltageContent20Min = harmonicVoltageContent20Min;
+    }
+
+    /**
+     * 获取20次谐波电压含有率平均值
+     *
+     * @return harmonic_voltage_content_20_avg - 20次谐波电压含有率平均值
+     */
+    public Double getHarmonicVoltageContent20Avg() {
+        return harmonicVoltageContent20Avg;
+    }
+
+    /**
+     * 设置20次谐波电压含有率平均值
+     *
+     * @param harmonicVoltageContent20Avg 20次谐波电压含有率平均值
+     */
+    public void setHarmonicVoltageContent20Avg(Double harmonicVoltageContent20Avg) {
+        this.harmonicVoltageContent20Avg = harmonicVoltageContent20Avg;
+    }
+
+    /**
+     * 获取20次谐波电压含有率95值
+     *
+     * @return harmonic_voltage_content_20_95 - 20次谐波电压含有率95值
+     */
+    public Double getHarmonicVoltageContent2095() {
+        return harmonicVoltageContent2095;
+    }
+
+    /**
+     * 设置20次谐波电压含有率95值
+     *
+     * @param harmonicVoltageContent2095 20次谐波电压含有率95值
+     */
+    public void setHarmonicVoltageContent2095(Double harmonicVoltageContent2095) {
+        this.harmonicVoltageContent2095 = harmonicVoltageContent2095;
+    }
+
+    /**
+     * 获取21次谐波电压含有率最大值
+     *
+     * @return harmonic_voltage_content_21_max - 21次谐波电压含有率最大值
+     */
+    public Double getHarmonicVoltageContent21Max() {
+        return harmonicVoltageContent21Max;
+    }
+
+    /**
+     * 设置21次谐波电压含有率最大值
+     *
+     * @param harmonicVoltageContent21Max 21次谐波电压含有率最大值
+     */
+    public void setHarmonicVoltageContent21Max(Double harmonicVoltageContent21Max) {
+        this.harmonicVoltageContent21Max = harmonicVoltageContent21Max;
+    }
+
+    /**
+     * 获取21次谐波电压含有率最小值
+     *
+     * @return harmonic_voltage_content_21_min - 21次谐波电压含有率最小值
+     */
+    public Double getHarmonicVoltageContent21Min() {
+        return harmonicVoltageContent21Min;
+    }
+
+    /**
+     * 设置21次谐波电压含有率最小值
+     *
+     * @param harmonicVoltageContent21Min 21次谐波电压含有率最小值
+     */
+    public void setHarmonicVoltageContent21Min(Double harmonicVoltageContent21Min) {
+        this.harmonicVoltageContent21Min = harmonicVoltageContent21Min;
+    }
+
+    /**
+     * 获取21次谐波电压含有率平均值
+     *
+     * @return harmonic_voltage_content_21_avg - 21次谐波电压含有率平均值
+     */
+    public Double getHarmonicVoltageContent21Avg() {
+        return harmonicVoltageContent21Avg;
+    }
+
+    /**
+     * 设置21次谐波电压含有率平均值
+     *
+     * @param harmonicVoltageContent21Avg 21次谐波电压含有率平均值
+     */
+    public void setHarmonicVoltageContent21Avg(Double harmonicVoltageContent21Avg) {
+        this.harmonicVoltageContent21Avg = harmonicVoltageContent21Avg;
+    }
+
+    /**
+     * 获取21次谐波电压含有率95值
+     *
+     * @return harmonic_voltage_content_21_95 - 21次谐波电压含有率95值
+     */
+    public Double getHarmonicVoltageContent2195() {
+        return harmonicVoltageContent2195;
+    }
+
+    /**
+     * 设置21次谐波电压含有率95值
+     *
+     * @param harmonicVoltageContent2195 21次谐波电压含有率95值
+     */
+    public void setHarmonicVoltageContent2195(Double harmonicVoltageContent2195) {
+        this.harmonicVoltageContent2195 = harmonicVoltageContent2195;
+    }
+
+    /**
+     * 获取22次谐波电压含有率最大值
+     *
+     * @return harmonic_voltage_content_22_max - 22次谐波电压含有率最大值
+     */
+    public Double getHarmonicVoltageContent22Max() {
+        return harmonicVoltageContent22Max;
+    }
+
+    /**
+     * 设置22次谐波电压含有率最大值
+     *
+     * @param harmonicVoltageContent22Max 22次谐波电压含有率最大值
+     */
+    public void setHarmonicVoltageContent22Max(Double harmonicVoltageContent22Max) {
+        this.harmonicVoltageContent22Max = harmonicVoltageContent22Max;
+    }
+
+    /**
+     * 获取22次谐波电压含有率最小值
+     *
+     * @return harmonic_voltage_content_22_min - 22次谐波电压含有率最小值
+     */
+    public Double getHarmonicVoltageContent22Min() {
+        return harmonicVoltageContent22Min;
+    }
+
+    /**
+     * 设置22次谐波电压含有率最小值
+     *
+     * @param harmonicVoltageContent22Min 22次谐波电压含有率最小值
+     */
+    public void setHarmonicVoltageContent22Min(Double harmonicVoltageContent22Min) {
+        this.harmonicVoltageContent22Min = harmonicVoltageContent22Min;
+    }
+
+    /**
+     * 获取22次谐波电压含有率平均值
+     *
+     * @return harmonic_voltage_content_22_avg - 22次谐波电压含有率平均值
+     */
+    public Double getHarmonicVoltageContent22Avg() {
+        return harmonicVoltageContent22Avg;
+    }
+
+    /**
+     * 设置22次谐波电压含有率平均值
+     *
+     * @param harmonicVoltageContent22Avg 22次谐波电压含有率平均值
+     */
+    public void setHarmonicVoltageContent22Avg(Double harmonicVoltageContent22Avg) {
+        this.harmonicVoltageContent22Avg = harmonicVoltageContent22Avg;
+    }
+
+    /**
+     * 获取22次谐波电压含有率95值
+     *
+     * @return harmonic_voltage_content_22_95 - 22次谐波电压含有率95值
+     */
+    public Double getHarmonicVoltageContent2295() {
+        return harmonicVoltageContent2295;
+    }
+
+    /**
+     * 设置22次谐波电压含有率95值
+     *
+     * @param harmonicVoltageContent2295 22次谐波电压含有率95值
+     */
+    public void setHarmonicVoltageContent2295(Double harmonicVoltageContent2295) {
+        this.harmonicVoltageContent2295 = harmonicVoltageContent2295;
+    }
+
+    /**
+     * 获取23次谐波电压含有率最大值
+     *
+     * @return harmonic_voltage_content_23_max - 23次谐波电压含有率最大值
+     */
+    public Double getHarmonicVoltageContent23Max() {
+        return harmonicVoltageContent23Max;
+    }
+
+    /**
+     * 设置23次谐波电压含有率最大值
+     *
+     * @param harmonicVoltageContent23Max 23次谐波电压含有率最大值
+     */
+    public void setHarmonicVoltageContent23Max(Double harmonicVoltageContent23Max) {
+        this.harmonicVoltageContent23Max = harmonicVoltageContent23Max;
+    }
+
+    /**
+     * 获取23次谐波电压含有率最小值
+     *
+     * @return harmonic_voltage_content_23_min - 23次谐波电压含有率最小值
+     */
+    public Double getHarmonicVoltageContent23Min() {
+        return harmonicVoltageContent23Min;
+    }
+
+    /**
+     * 设置23次谐波电压含有率最小值
+     *
+     * @param harmonicVoltageContent23Min 23次谐波电压含有率最小值
+     */
+    public void setHarmonicVoltageContent23Min(Double harmonicVoltageContent23Min) {
+        this.harmonicVoltageContent23Min = harmonicVoltageContent23Min;
+    }
+
+    /**
+     * 获取23次谐波电压含有率平均值
+     *
+     * @return harmonic_voltage_content_23_avg - 23次谐波电压含有率平均值
+     */
+    public Double getHarmonicVoltageContent23Avg() {
+        return harmonicVoltageContent23Avg;
+    }
+
+    /**
+     * 设置23次谐波电压含有率平均值
+     *
+     * @param harmonicVoltageContent23Avg 23次谐波电压含有率平均值
+     */
+    public void setHarmonicVoltageContent23Avg(Double harmonicVoltageContent23Avg) {
+        this.harmonicVoltageContent23Avg = harmonicVoltageContent23Avg;
+    }
+
+    /**
+     * 获取23次谐波电压含有率95值
+     *
+     * @return harmonic_voltage_content_23_95 - 23次谐波电压含有率95值
+     */
+    public Double getHarmonicVoltageContent2395() {
+        return harmonicVoltageContent2395;
+    }
+
+    /**
+     * 设置23次谐波电压含有率95值
+     *
+     * @param harmonicVoltageContent2395 23次谐波电压含有率95值
+     */
+    public void setHarmonicVoltageContent2395(Double harmonicVoltageContent2395) {
+        this.harmonicVoltageContent2395 = harmonicVoltageContent2395;
+    }
+
+    /**
+     * 获取24次谐波电压含有率最大值
+     *
+     * @return harmonic_voltage_content_24_max - 24次谐波电压含有率最大值
+     */
+    public Double getHarmonicVoltageContent24Max() {
+        return harmonicVoltageContent24Max;
+    }
+
+    /**
+     * 设置24次谐波电压含有率最大值
+     *
+     * @param harmonicVoltageContent24Max 24次谐波电压含有率最大值
+     */
+    public void setHarmonicVoltageContent24Max(Double harmonicVoltageContent24Max) {
+        this.harmonicVoltageContent24Max = harmonicVoltageContent24Max;
+    }
+
+    /**
+     * 获取24次谐波电压含有率最小值
+     *
+     * @return harmonic_voltage_content_24_min - 24次谐波电压含有率最小值
+     */
+    public Double getHarmonicVoltageContent24Min() {
+        return harmonicVoltageContent24Min;
+    }
+
+    /**
+     * 设置24次谐波电压含有率最小值
+     *
+     * @param harmonicVoltageContent24Min 24次谐波电压含有率最小值
+     */
+    public void setHarmonicVoltageContent24Min(Double harmonicVoltageContent24Min) {
+        this.harmonicVoltageContent24Min = harmonicVoltageContent24Min;
+    }
+
+    /**
+     * 获取24次谐波电压含有率平均值
+     *
+     * @return harmonic_voltage_content_24_avg - 24次谐波电压含有率平均值
+     */
+    public Double getHarmonicVoltageContent24Avg() {
+        return harmonicVoltageContent24Avg;
+    }
+
+    /**
+     * 设置24次谐波电压含有率平均值
+     *
+     * @param harmonicVoltageContent24Avg 24次谐波电压含有率平均值
+     */
+    public void setHarmonicVoltageContent24Avg(Double harmonicVoltageContent24Avg) {
+        this.harmonicVoltageContent24Avg = harmonicVoltageContent24Avg;
+    }
+
+    /**
+     * 获取24次谐波电压含有率95值
+     *
+     * @return harmonic_voltage_content_24_95 - 24次谐波电压含有率95值
+     */
+    public Double getHarmonicVoltageContent2495() {
+        return harmonicVoltageContent2495;
+    }
+
+    /**
+     * 设置24次谐波电压含有率95值
+     *
+     * @param harmonicVoltageContent2495 24次谐波电压含有率95值
+     */
+    public void setHarmonicVoltageContent2495(Double harmonicVoltageContent2495) {
+        this.harmonicVoltageContent2495 = harmonicVoltageContent2495;
+    }
+
+    /**
+     * 获取25次谐波电压含有率最大值
+     *
+     * @return harmonic_voltage_content_25_max - 25次谐波电压含有率最大值
+     */
+    public Double getHarmonicVoltageContent25Max() {
+        return harmonicVoltageContent25Max;
+    }
+
+    /**
+     * 设置25次谐波电压含有率最大值
+     *
+     * @param harmonicVoltageContent25Max 25次谐波电压含有率最大值
+     */
+    public void setHarmonicVoltageContent25Max(Double harmonicVoltageContent25Max) {
+        this.harmonicVoltageContent25Max = harmonicVoltageContent25Max;
+    }
+
+    /**
+     * 获取25次谐波电压含有率最小值
+     *
+     * @return harmonic_voltage_content_25_min - 25次谐波电压含有率最小值
+     */
+    public Double getHarmonicVoltageContent25Min() {
+        return harmonicVoltageContent25Min;
+    }
+
+    /**
+     * 设置25次谐波电压含有率最小值
+     *
+     * @param harmonicVoltageContent25Min 25次谐波电压含有率最小值
+     */
+    public void setHarmonicVoltageContent25Min(Double harmonicVoltageContent25Min) {
+        this.harmonicVoltageContent25Min = harmonicVoltageContent25Min;
+    }
+
+    /**
+     * 获取25次谐波电压含有率平均值
+     *
+     * @return harmonic_voltage_content_25_avg - 25次谐波电压含有率平均值
+     */
+    public Double getHarmonicVoltageContent25Avg() {
+        return harmonicVoltageContent25Avg;
+    }
+
+    /**
+     * 设置25次谐波电压含有率平均值
+     *
+     * @param harmonicVoltageContent25Avg 25次谐波电压含有率平均值
+     */
+    public void setHarmonicVoltageContent25Avg(Double harmonicVoltageContent25Avg) {
+        this.harmonicVoltageContent25Avg = harmonicVoltageContent25Avg;
+    }
+
+    /**
+     * 获取25次谐波电压含有率95值
+     *
+     * @return harmonic_voltage_content_25_95 - 25次谐波电压含有率95值
+     */
+    public Double getHarmonicVoltageContent2595() {
+        return harmonicVoltageContent2595;
+    }
+
+    /**
+     * 设置25次谐波电压含有率95值
+     *
+     * @param harmonicVoltageContent2595 25次谐波电压含有率95值
+     */
+    public void setHarmonicVoltageContent2595(Double harmonicVoltageContent2595) {
+        this.harmonicVoltageContent2595 = harmonicVoltageContent2595;
+    }
+
+    /**
+     * 获取26次谐波电压含有率最大值
+     *
+     * @return harmonic_voltage_content_26_max - 26次谐波电压含有率最大值
+     */
+    public Double getHarmonicVoltageContent26Max() {
+        return harmonicVoltageContent26Max;
+    }
+
+    /**
+     * 设置26次谐波电压含有率最大值
+     *
+     * @param harmonicVoltageContent26Max 26次谐波电压含有率最大值
+     */
+    public void setHarmonicVoltageContent26Max(Double harmonicVoltageContent26Max) {
+        this.harmonicVoltageContent26Max = harmonicVoltageContent26Max;
+    }
+
+    /**
+     * 获取26次谐波电压含有率最小值
+     *
+     * @return harmonic_voltage_content_26_min - 26次谐波电压含有率最小值
+     */
+    public Double getHarmonicVoltageContent26Min() {
+        return harmonicVoltageContent26Min;
+    }
+
+    /**
+     * 设置26次谐波电压含有率最小值
+     *
+     * @param harmonicVoltageContent26Min 26次谐波电压含有率最小值
+     */
+    public void setHarmonicVoltageContent26Min(Double harmonicVoltageContent26Min) {
+        this.harmonicVoltageContent26Min = harmonicVoltageContent26Min;
+    }
+
+    /**
+     * 获取26次谐波电压含有率平均值
+     *
+     * @return harmonic_voltage_content_26_avg - 26次谐波电压含有率平均值
+     */
+    public Double getHarmonicVoltageContent26Avg() {
+        return harmonicVoltageContent26Avg;
+    }
+
+    /**
+     * 设置26次谐波电压含有率平均值
+     *
+     * @param harmonicVoltageContent26Avg 26次谐波电压含有率平均值
+     */
+    public void setHarmonicVoltageContent26Avg(Double harmonicVoltageContent26Avg) {
+        this.harmonicVoltageContent26Avg = harmonicVoltageContent26Avg;
+    }
+
+    /**
+     * 获取26次谐波电压含有率95值
+     *
+     * @return harmonic_voltage_content_26_95 - 26次谐波电压含有率95值
+     */
+    public Double getHarmonicVoltageContent2695() {
+        return harmonicVoltageContent2695;
+    }
+
+    /**
+     * 设置26次谐波电压含有率95值
+     *
+     * @param harmonicVoltageContent2695 26次谐波电压含有率95值
+     */
+    public void setHarmonicVoltageContent2695(Double harmonicVoltageContent2695) {
+        this.harmonicVoltageContent2695 = harmonicVoltageContent2695;
+    }
+
+    /**
+     * 获取27次谐波电压含有率最大值
+     *
+     * @return harmonic_voltage_content_27_max - 27次谐波电压含有率最大值
+     */
+    public Double getHarmonicVoltageContent27Max() {
+        return harmonicVoltageContent27Max;
+    }
+
+    /**
+     * 设置27次谐波电压含有率最大值
+     *
+     * @param harmonicVoltageContent27Max 27次谐波电压含有率最大值
+     */
+    public void setHarmonicVoltageContent27Max(Double harmonicVoltageContent27Max) {
+        this.harmonicVoltageContent27Max = harmonicVoltageContent27Max;
+    }
+
+    /**
+     * 获取27次谐波电压含有率最小值
+     *
+     * @return harmonic_voltage_content_27_min - 27次谐波电压含有率最小值
+     */
+    public Double getHarmonicVoltageContent27Min() {
+        return harmonicVoltageContent27Min;
+    }
+
+    /**
+     * 设置27次谐波电压含有率最小值
+     *
+     * @param harmonicVoltageContent27Min 27次谐波电压含有率最小值
+     */
+    public void setHarmonicVoltageContent27Min(Double harmonicVoltageContent27Min) {
+        this.harmonicVoltageContent27Min = harmonicVoltageContent27Min;
+    }
+
+    /**
+     * 获取27次谐波电压含有率平均值
+     *
+     * @return harmonic_voltage_content_27_avg - 27次谐波电压含有率平均值
+     */
+    public Double getHarmonicVoltageContent27Avg() {
+        return harmonicVoltageContent27Avg;
+    }
+
+    /**
+     * 设置27次谐波电压含有率平均值
+     *
+     * @param harmonicVoltageContent27Avg 27次谐波电压含有率平均值
+     */
+    public void setHarmonicVoltageContent27Avg(Double harmonicVoltageContent27Avg) {
+        this.harmonicVoltageContent27Avg = harmonicVoltageContent27Avg;
+    }
+
+    /**
+     * 获取27次谐波电压含有率95值
+     *
+     * @return harmonic_voltage_content_27_95 - 27次谐波电压含有率95值
+     */
+    public Double getHarmonicVoltageContent2795() {
+        return harmonicVoltageContent2795;
+    }
+
+    /**
+     * 设置27次谐波电压含有率95值
+     *
+     * @param harmonicVoltageContent2795 27次谐波电压含有率95值
+     */
+    public void setHarmonicVoltageContent2795(Double harmonicVoltageContent2795) {
+        this.harmonicVoltageContent2795 = harmonicVoltageContent2795;
+    }
+
+    /**
+     * 获取28次谐波电压含有率最大值
+     *
+     * @return harmonic_voltage_content_28_max - 28次谐波电压含有率最大值
+     */
+    public Double getHarmonicVoltageContent28Max() {
+        return harmonicVoltageContent28Max;
+    }
+
+    /**
+     * 设置28次谐波电压含有率最大值
+     *
+     * @param harmonicVoltageContent28Max 28次谐波电压含有率最大值
+     */
+    public void setHarmonicVoltageContent28Max(Double harmonicVoltageContent28Max) {
+        this.harmonicVoltageContent28Max = harmonicVoltageContent28Max;
+    }
+
+    /**
+     * 获取28次谐波电压含有率最小值
+     *
+     * @return harmonic_voltage_content_28_min - 28次谐波电压含有率最小值
+     */
+    public Double getHarmonicVoltageContent28Min() {
+        return harmonicVoltageContent28Min;
+    }
+
+    /**
+     * 设置28次谐波电压含有率最小值
+     *
+     * @param harmonicVoltageContent28Min 28次谐波电压含有率最小值
+     */
+    public void setHarmonicVoltageContent28Min(Double harmonicVoltageContent28Min) {
+        this.harmonicVoltageContent28Min = harmonicVoltageContent28Min;
+    }
+
+    /**
+     * 获取28次谐波电压含有率平均值
+     *
+     * @return harmonic_voltage_content_28_avg - 28次谐波电压含有率平均值
+     */
+    public Double getHarmonicVoltageContent28Avg() {
+        return harmonicVoltageContent28Avg;
+    }
+
+    /**
+     * 设置28次谐波电压含有率平均值
+     *
+     * @param harmonicVoltageContent28Avg 28次谐波电压含有率平均值
+     */
+    public void setHarmonicVoltageContent28Avg(Double harmonicVoltageContent28Avg) {
+        this.harmonicVoltageContent28Avg = harmonicVoltageContent28Avg;
+    }
+
+    /**
+     * 获取28次谐波电压含有率95值
+     *
+     * @return harmonic_voltage_content_28_95 - 28次谐波电压含有率95值
+     */
+    public Double getHarmonicVoltageContent2895() {
+        return harmonicVoltageContent2895;
+    }
+
+    /**
+     * 设置28次谐波电压含有率95值
+     *
+     * @param harmonicVoltageContent2895 28次谐波电压含有率95值
+     */
+    public void setHarmonicVoltageContent2895(Double harmonicVoltageContent2895) {
+        this.harmonicVoltageContent2895 = harmonicVoltageContent2895;
+    }
+
+    /**
+     * 获取29次谐波电压含有率最大值
+     *
+     * @return harmonic_voltage_content_29_max - 29次谐波电压含有率最大值
+     */
+    public Double getHarmonicVoltageContent29Max() {
+        return harmonicVoltageContent29Max;
+    }
+
+    /**
+     * 设置29次谐波电压含有率最大值
+     *
+     * @param harmonicVoltageContent29Max 29次谐波电压含有率最大值
+     */
+    public void setHarmonicVoltageContent29Max(Double harmonicVoltageContent29Max) {
+        this.harmonicVoltageContent29Max = harmonicVoltageContent29Max;
+    }
+
+    /**
+     * 获取29次谐波电压含有率最小值
+     *
+     * @return harmonic_voltage_content_29_min - 29次谐波电压含有率最小值
+     */
+    public Double getHarmonicVoltageContent29Min() {
+        return harmonicVoltageContent29Min;
+    }
+
+    /**
+     * 设置29次谐波电压含有率最小值
+     *
+     * @param harmonicVoltageContent29Min 29次谐波电压含有率最小值
+     */
+    public void setHarmonicVoltageContent29Min(Double harmonicVoltageContent29Min) {
+        this.harmonicVoltageContent29Min = harmonicVoltageContent29Min;
+    }
+
+    /**
+     * 获取29次谐波电压含有率平均值
+     *
+     * @return harmonic_voltage_content_29_avg - 29次谐波电压含有率平均值
+     */
+    public Double getHarmonicVoltageContent29Avg() {
+        return harmonicVoltageContent29Avg;
+    }
+
+    /**
+     * 设置29次谐波电压含有率平均值
+     *
+     * @param harmonicVoltageContent29Avg 29次谐波电压含有率平均值
+     */
+    public void setHarmonicVoltageContent29Avg(Double harmonicVoltageContent29Avg) {
+        this.harmonicVoltageContent29Avg = harmonicVoltageContent29Avg;
+    }
+
+    /**
+     * 获取29次谐波电压含有率95值
+     *
+     * @return harmonic_voltage_content_29_95 - 29次谐波电压含有率95值
+     */
+    public Double getHarmonicVoltageContent2995() {
+        return harmonicVoltageContent2995;
+    }
+
+    /**
+     * 设置29次谐波电压含有率95值
+     *
+     * @param harmonicVoltageContent2995 29次谐波电压含有率95值
+     */
+    public void setHarmonicVoltageContent2995(Double harmonicVoltageContent2995) {
+        this.harmonicVoltageContent2995 = harmonicVoltageContent2995;
+    }
+
+    /**
+     * 获取30次谐波电压含有率最大值
+     *
+     * @return harmonic_voltage_content_30_max - 30次谐波电压含有率最大值
+     */
+    public Double getHarmonicVoltageContent30Max() {
+        return harmonicVoltageContent30Max;
+    }
+
+    /**
+     * 设置30次谐波电压含有率最大值
+     *
+     * @param harmonicVoltageContent30Max 30次谐波电压含有率最大值
+     */
+    public void setHarmonicVoltageContent30Max(Double harmonicVoltageContent30Max) {
+        this.harmonicVoltageContent30Max = harmonicVoltageContent30Max;
+    }
+
+    /**
+     * 获取30次谐波电压含有率最小值
+     *
+     * @return harmonic_voltage_content_30_min - 30次谐波电压含有率最小值
+     */
+    public Double getHarmonicVoltageContent30Min() {
+        return harmonicVoltageContent30Min;
+    }
+
+    /**
+     * 设置30次谐波电压含有率最小值
+     *
+     * @param harmonicVoltageContent30Min 30次谐波电压含有率最小值
+     */
+    public void setHarmonicVoltageContent30Min(Double harmonicVoltageContent30Min) {
+        this.harmonicVoltageContent30Min = harmonicVoltageContent30Min;
+    }
+
+    /**
+     * 获取30次谐波电压含有率平均值
+     *
+     * @return harmonic_voltage_content_30_avg - 30次谐波电压含有率平均值
+     */
+    public Double getHarmonicVoltageContent30Avg() {
+        return harmonicVoltageContent30Avg;
+    }
+
+    /**
+     * 设置30次谐波电压含有率平均值
+     *
+     * @param harmonicVoltageContent30Avg 30次谐波电压含有率平均值
+     */
+    public void setHarmonicVoltageContent30Avg(Double harmonicVoltageContent30Avg) {
+        this.harmonicVoltageContent30Avg = harmonicVoltageContent30Avg;
+    }
+
+    /**
+     * 获取30次谐波电压含有率95值
+     *
+     * @return harmonic_voltage_content_30_95 - 30次谐波电压含有率95值
+     */
+    public Double getHarmonicVoltageContent3095() {
+        return harmonicVoltageContent3095;
+    }
+
+    /**
+     * 设置30次谐波电压含有率95值
+     *
+     * @param harmonicVoltageContent3095 30次谐波电压含有率95值
+     */
+    public void setHarmonicVoltageContent3095(Double harmonicVoltageContent3095) {
+        this.harmonicVoltageContent3095 = harmonicVoltageContent3095;
+    }
+
+    /**
+     * 获取31次谐波电压含有率最大值
+     *
+     * @return harmonic_voltage_content_31_max - 31次谐波电压含有率最大值
+     */
+    public Double getHarmonicVoltageContent31Max() {
+        return harmonicVoltageContent31Max;
+    }
+
+    /**
+     * 设置31次谐波电压含有率最大值
+     *
+     * @param harmonicVoltageContent31Max 31次谐波电压含有率最大值
+     */
+    public void setHarmonicVoltageContent31Max(Double harmonicVoltageContent31Max) {
+        this.harmonicVoltageContent31Max = harmonicVoltageContent31Max;
+    }
+
+    /**
+     * 获取31次谐波电压含有率最小值
+     *
+     * @return harmonic_voltage_content_31_min - 31次谐波电压含有率最小值
+     */
+    public Double getHarmonicVoltageContent31Min() {
+        return harmonicVoltageContent31Min;
+    }
+
+    /**
+     * 设置31次谐波电压含有率最小值
+     *
+     * @param harmonicVoltageContent31Min 31次谐波电压含有率最小值
+     */
+    public void setHarmonicVoltageContent31Min(Double harmonicVoltageContent31Min) {
+        this.harmonicVoltageContent31Min = harmonicVoltageContent31Min;
+    }
+
+    /**
+     * 获取31次谐波电压含有率平均值
+     *
+     * @return harmonic_voltage_content_31_avg - 31次谐波电压含有率平均值
+     */
+    public Double getHarmonicVoltageContent31Avg() {
+        return harmonicVoltageContent31Avg;
+    }
+
+    /**
+     * 设置31次谐波电压含有率平均值
+     *
+     * @param harmonicVoltageContent31Avg 31次谐波电压含有率平均值
+     */
+    public void setHarmonicVoltageContent31Avg(Double harmonicVoltageContent31Avg) {
+        this.harmonicVoltageContent31Avg = harmonicVoltageContent31Avg;
+    }
+
+    /**
+     * 获取31次谐波电压含有率95值
+     *
+     * @return harmonic_voltage_content_31_95 - 31次谐波电压含有率95值
+     */
+    public Double getHarmonicVoltageContent3195() {
+        return harmonicVoltageContent3195;
+    }
+
+    /**
+     * 设置31次谐波电压含有率95值
+     *
+     * @param harmonicVoltageContent3195 31次谐波电压含有率95值
+     */
+    public void setHarmonicVoltageContent3195(Double harmonicVoltageContent3195) {
+        this.harmonicVoltageContent3195 = harmonicVoltageContent3195;
+    }
+
+    /**
+     * 获取32次谐波电压含有率最大值
+     *
+     * @return harmonic_voltage_content_32_max - 32次谐波电压含有率最大值
+     */
+    public Double getHarmonicVoltageContent32Max() {
+        return harmonicVoltageContent32Max;
+    }
+
+    /**
+     * 设置32次谐波电压含有率最大值
+     *
+     * @param harmonicVoltageContent32Max 32次谐波电压含有率最大值
+     */
+    public void setHarmonicVoltageContent32Max(Double harmonicVoltageContent32Max) {
+        this.harmonicVoltageContent32Max = harmonicVoltageContent32Max;
+    }
+
+    /**
+     * 获取32次谐波电压含有率最小值
+     *
+     * @return harmonic_voltage_content_32_min - 32次谐波电压含有率最小值
+     */
+    public Double getHarmonicVoltageContent32Min() {
+        return harmonicVoltageContent32Min;
+    }
+
+    /**
+     * 设置32次谐波电压含有率最小值
+     *
+     * @param harmonicVoltageContent32Min 32次谐波电压含有率最小值
+     */
+    public void setHarmonicVoltageContent32Min(Double harmonicVoltageContent32Min) {
+        this.harmonicVoltageContent32Min = harmonicVoltageContent32Min;
+    }
+
+    /**
+     * 获取32次谐波电压含有率平均值
+     *
+     * @return harmonic_voltage_content_32_avg - 32次谐波电压含有率平均值
+     */
+    public Double getHarmonicVoltageContent32Avg() {
+        return harmonicVoltageContent32Avg;
+    }
+
+    /**
+     * 设置32次谐波电压含有率平均值
+     *
+     * @param harmonicVoltageContent32Avg 32次谐波电压含有率平均值
+     */
+    public void setHarmonicVoltageContent32Avg(Double harmonicVoltageContent32Avg) {
+        this.harmonicVoltageContent32Avg = harmonicVoltageContent32Avg;
+    }
+
+    /**
+     * 获取32次谐波电压含有率95值
+     *
+     * @return harmonic_voltage_content_32_95 - 32次谐波电压含有率95值
+     */
+    public Double getHarmonicVoltageContent3295() {
+        return harmonicVoltageContent3295;
+    }
+
+    /**
+     * 设置32次谐波电压含有率95值
+     *
+     * @param harmonicVoltageContent3295 32次谐波电压含有率95值
+     */
+    public void setHarmonicVoltageContent3295(Double harmonicVoltageContent3295) {
+        this.harmonicVoltageContent3295 = harmonicVoltageContent3295;
+    }
+
+    /**
+     * 获取33次谐波电压含有率最大值
+     *
+     * @return harmonic_voltage_content_33_max - 33次谐波电压含有率最大值
+     */
+    public Double getHarmonicVoltageContent33Max() {
+        return harmonicVoltageContent33Max;
+    }
+
+    /**
+     * 设置33次谐波电压含有率最大值
+     *
+     * @param harmonicVoltageContent33Max 33次谐波电压含有率最大值
+     */
+    public void setHarmonicVoltageContent33Max(Double harmonicVoltageContent33Max) {
+        this.harmonicVoltageContent33Max = harmonicVoltageContent33Max;
+    }
+
+    /**
+     * 获取33次谐波电压含有率最小值
+     *
+     * @return harmonic_voltage_content_33_min - 33次谐波电压含有率最小值
+     */
+    public Double getHarmonicVoltageContent33Min() {
+        return harmonicVoltageContent33Min;
+    }
+
+    /**
+     * 设置33次谐波电压含有率最小值
+     *
+     * @param harmonicVoltageContent33Min 33次谐波电压含有率最小值
+     */
+    public void setHarmonicVoltageContent33Min(Double harmonicVoltageContent33Min) {
+        this.harmonicVoltageContent33Min = harmonicVoltageContent33Min;
+    }
+
+    /**
+     * 获取33次谐波电压含有率平均值
+     *
+     * @return harmonic_voltage_content_33_avg - 33次谐波电压含有率平均值
+     */
+    public Double getHarmonicVoltageContent33Avg() {
+        return harmonicVoltageContent33Avg;
+    }
+
+    /**
+     * 设置33次谐波电压含有率平均值
+     *
+     * @param harmonicVoltageContent33Avg 33次谐波电压含有率平均值
+     */
+    public void setHarmonicVoltageContent33Avg(Double harmonicVoltageContent33Avg) {
+        this.harmonicVoltageContent33Avg = harmonicVoltageContent33Avg;
+    }
+
+    /**
+     * 获取33次谐波电压含有率95值
+     *
+     * @return harmonic_voltage_content_33_95 - 33次谐波电压含有率95值
+     */
+    public Double getHarmonicVoltageContent3395() {
+        return harmonicVoltageContent3395;
+    }
+
+    /**
+     * 设置33次谐波电压含有率95值
+     *
+     * @param harmonicVoltageContent3395 33次谐波电压含有率95值
+     */
+    public void setHarmonicVoltageContent3395(Double harmonicVoltageContent3395) {
+        this.harmonicVoltageContent3395 = harmonicVoltageContent3395;
+    }
+
+    /**
+     * 获取34次谐波电压含有率最大值
+     *
+     * @return harmonic_voltage_content_34_max - 34次谐波电压含有率最大值
+     */
+    public Double getHarmonicVoltageContent34Max() {
+        return harmonicVoltageContent34Max;
+    }
+
+    /**
+     * 设置34次谐波电压含有率最大值
+     *
+     * @param harmonicVoltageContent34Max 34次谐波电压含有率最大值
+     */
+    public void setHarmonicVoltageContent34Max(Double harmonicVoltageContent34Max) {
+        this.harmonicVoltageContent34Max = harmonicVoltageContent34Max;
+    }
+
+    /**
+     * 获取34次谐波电压含有率最小值
+     *
+     * @return harmonic_voltage_content_34_min - 34次谐波电压含有率最小值
+     */
+    public Double getHarmonicVoltageContent34Min() {
+        return harmonicVoltageContent34Min;
+    }
+
+    /**
+     * 设置34次谐波电压含有率最小值
+     *
+     * @param harmonicVoltageContent34Min 34次谐波电压含有率最小值
+     */
+    public void setHarmonicVoltageContent34Min(Double harmonicVoltageContent34Min) {
+        this.harmonicVoltageContent34Min = harmonicVoltageContent34Min;
+    }
+
+    /**
+     * 获取34次谐波电压含有率平均值
+     *
+     * @return harmonic_voltage_content_34_avg - 34次谐波电压含有率平均值
+     */
+    public Double getHarmonicVoltageContent34Avg() {
+        return harmonicVoltageContent34Avg;
+    }
+
+    /**
+     * 设置34次谐波电压含有率平均值
+     *
+     * @param harmonicVoltageContent34Avg 34次谐波电压含有率平均值
+     */
+    public void setHarmonicVoltageContent34Avg(Double harmonicVoltageContent34Avg) {
+        this.harmonicVoltageContent34Avg = harmonicVoltageContent34Avg;
+    }
+
+    /**
+     * 获取34次谐波电压含有率95值
+     *
+     * @return harmonic_voltage_content_34_95 - 34次谐波电压含有率95值
+     */
+    public Double getHarmonicVoltageContent3495() {
+        return harmonicVoltageContent3495;
+    }
+
+    /**
+     * 设置34次谐波电压含有率95值
+     *
+     * @param harmonicVoltageContent3495 34次谐波电压含有率95值
+     */
+    public void setHarmonicVoltageContent3495(Double harmonicVoltageContent3495) {
+        this.harmonicVoltageContent3495 = harmonicVoltageContent3495;
+    }
+
+    /**
+     * 获取35次谐波电压含有率最大值
+     *
+     * @return harmonic_voltage_content_35_max - 35次谐波电压含有率最大值
+     */
+    public Double getHarmonicVoltageContent35Max() {
+        return harmonicVoltageContent35Max;
+    }
+
+    /**
+     * 设置35次谐波电压含有率最大值
+     *
+     * @param harmonicVoltageContent35Max 35次谐波电压含有率最大值
+     */
+    public void setHarmonicVoltageContent35Max(Double harmonicVoltageContent35Max) {
+        this.harmonicVoltageContent35Max = harmonicVoltageContent35Max;
+    }
+
+    /**
+     * 获取35次谐波电压含有率最小值
+     *
+     * @return harmonic_voltage_content_35_min - 35次谐波电压含有率最小值
+     */
+    public Double getHarmonicVoltageContent35Min() {
+        return harmonicVoltageContent35Min;
+    }
+
+    /**
+     * 设置35次谐波电压含有率最小值
+     *
+     * @param harmonicVoltageContent35Min 35次谐波电压含有率最小值
+     */
+    public void setHarmonicVoltageContent35Min(Double harmonicVoltageContent35Min) {
+        this.harmonicVoltageContent35Min = harmonicVoltageContent35Min;
+    }
+
+    /**
+     * 获取35次谐波电压含有率平均值
+     *
+     * @return harmonic_voltage_content_35_avg - 35次谐波电压含有率平均值
+     */
+    public Double getHarmonicVoltageContent35Avg() {
+        return harmonicVoltageContent35Avg;
+    }
+
+    /**
+     * 设置35次谐波电压含有率平均值
+     *
+     * @param harmonicVoltageContent35Avg 35次谐波电压含有率平均值
+     */
+    public void setHarmonicVoltageContent35Avg(Double harmonicVoltageContent35Avg) {
+        this.harmonicVoltageContent35Avg = harmonicVoltageContent35Avg;
+    }
+
+    /**
+     * 获取35次谐波电压含有率95值
+     *
+     * @return harmonic_voltage_content_35_95 - 35次谐波电压含有率95值
+     */
+    public Double getHarmonicVoltageContent3595() {
+        return harmonicVoltageContent3595;
+    }
+
+    /**
+     * 设置35次谐波电压含有率95值
+     *
+     * @param harmonicVoltageContent3595 35次谐波电压含有率95值
+     */
+    public void setHarmonicVoltageContent3595(Double harmonicVoltageContent3595) {
+        this.harmonicVoltageContent3595 = harmonicVoltageContent3595;
+    }
+
+    /**
+     * 获取36次谐波电压含有率最大值
+     *
+     * @return harmonic_voltage_content_36_max - 36次谐波电压含有率最大值
+     */
+    public Double getHarmonicVoltageContent36Max() {
+        return harmonicVoltageContent36Max;
+    }
+
+    /**
+     * 设置36次谐波电压含有率最大值
+     *
+     * @param harmonicVoltageContent36Max 36次谐波电压含有率最大值
+     */
+    public void setHarmonicVoltageContent36Max(Double harmonicVoltageContent36Max) {
+        this.harmonicVoltageContent36Max = harmonicVoltageContent36Max;
+    }
+
+    /**
+     * 获取36次谐波电压含有率最小值
+     *
+     * @return harmonic_voltage_content_36_min - 36次谐波电压含有率最小值
+     */
+    public Double getHarmonicVoltageContent36Min() {
+        return harmonicVoltageContent36Min;
+    }
+
+    /**
+     * 设置36次谐波电压含有率最小值
+     *
+     * @param harmonicVoltageContent36Min 36次谐波电压含有率最小值
+     */
+    public void setHarmonicVoltageContent36Min(Double harmonicVoltageContent36Min) {
+        this.harmonicVoltageContent36Min = harmonicVoltageContent36Min;
+    }
+
+    /**
+     * 获取36次谐波电压含有率平均值
+     *
+     * @return harmonic_voltage_content_36_avg - 36次谐波电压含有率平均值
+     */
+    public Double getHarmonicVoltageContent36Avg() {
+        return harmonicVoltageContent36Avg;
+    }
+
+    /**
+     * 设置36次谐波电压含有率平均值
+     *
+     * @param harmonicVoltageContent36Avg 36次谐波电压含有率平均值
+     */
+    public void setHarmonicVoltageContent36Avg(Double harmonicVoltageContent36Avg) {
+        this.harmonicVoltageContent36Avg = harmonicVoltageContent36Avg;
+    }
+
+    /**
+     * 获取36次谐波电压含有率95值
+     *
+     * @return harmonic_voltage_content_36_95 - 36次谐波电压含有率95值
+     */
+    public Double getHarmonicVoltageContent3695() {
+        return harmonicVoltageContent3695;
+    }
+
+    /**
+     * 设置36次谐波电压含有率95值
+     *
+     * @param harmonicVoltageContent3695 36次谐波电压含有率95值
+     */
+    public void setHarmonicVoltageContent3695(Double harmonicVoltageContent3695) {
+        this.harmonicVoltageContent3695 = harmonicVoltageContent3695;
+    }
+
+    /**
+     * 获取37次谐波电压含有率最大值
+     *
+     * @return harmonic_voltage_content_37_max - 37次谐波电压含有率最大值
+     */
+    public Double getHarmonicVoltageContent37Max() {
+        return harmonicVoltageContent37Max;
+    }
+
+    /**
+     * 设置37次谐波电压含有率最大值
+     *
+     * @param harmonicVoltageContent37Max 37次谐波电压含有率最大值
+     */
+    public void setHarmonicVoltageContent37Max(Double harmonicVoltageContent37Max) {
+        this.harmonicVoltageContent37Max = harmonicVoltageContent37Max;
+    }
+
+    /**
+     * 获取37次谐波电压含有率最小值
+     *
+     * @return harmonic_voltage_content_37_min - 37次谐波电压含有率最小值
+     */
+    public Double getHarmonicVoltageContent37Min() {
+        return harmonicVoltageContent37Min;
+    }
+
+    /**
+     * 设置37次谐波电压含有率最小值
+     *
+     * @param harmonicVoltageContent37Min 37次谐波电压含有率最小值
+     */
+    public void setHarmonicVoltageContent37Min(Double harmonicVoltageContent37Min) {
+        this.harmonicVoltageContent37Min = harmonicVoltageContent37Min;
+    }
+
+    /**
+     * 获取37次谐波电压含有率平均值
+     *
+     * @return harmonic_voltage_content_37_avg - 37次谐波电压含有率平均值
+     */
+    public Double getHarmonicVoltageContent37Avg() {
+        return harmonicVoltageContent37Avg;
+    }
+
+    /**
+     * 设置37次谐波电压含有率平均值
+     *
+     * @param harmonicVoltageContent37Avg 37次谐波电压含有率平均值
+     */
+    public void setHarmonicVoltageContent37Avg(Double harmonicVoltageContent37Avg) {
+        this.harmonicVoltageContent37Avg = harmonicVoltageContent37Avg;
+    }
+
+    /**
+     * 获取37次谐波电压含有率95值
+     *
+     * @return harmonic_voltage_content_37_95 - 37次谐波电压含有率95值
+     */
+    public Double getHarmonicVoltageContent3795() {
+        return harmonicVoltageContent3795;
+    }
+
+    /**
+     * 设置37次谐波电压含有率95值
+     *
+     * @param harmonicVoltageContent3795 37次谐波电压含有率95值
+     */
+    public void setHarmonicVoltageContent3795(Double harmonicVoltageContent3795) {
+        this.harmonicVoltageContent3795 = harmonicVoltageContent3795;
+    }
+
+    /**
+     * 获取38次谐波电压含有率最大值
+     *
+     * @return harmonic_voltage_content_38_max - 38次谐波电压含有率最大值
+     */
+    public Double getHarmonicVoltageContent38Max() {
+        return harmonicVoltageContent38Max;
+    }
+
+    /**
+     * 设置38次谐波电压含有率最大值
+     *
+     * @param harmonicVoltageContent38Max 38次谐波电压含有率最大值
+     */
+    public void setHarmonicVoltageContent38Max(Double harmonicVoltageContent38Max) {
+        this.harmonicVoltageContent38Max = harmonicVoltageContent38Max;
+    }
+
+    /**
+     * 获取38次谐波电压含有率最小值
+     *
+     * @return harmonic_voltage_content_38_min - 38次谐波电压含有率最小值
+     */
+    public Double getHarmonicVoltageContent38Min() {
+        return harmonicVoltageContent38Min;
+    }
+
+    /**
+     * 设置38次谐波电压含有率最小值
+     *
+     * @param harmonicVoltageContent38Min 38次谐波电压含有率最小值
+     */
+    public void setHarmonicVoltageContent38Min(Double harmonicVoltageContent38Min) {
+        this.harmonicVoltageContent38Min = harmonicVoltageContent38Min;
+    }
+
+    /**
+     * 获取38次谐波电压含有率平均值
+     *
+     * @return harmonic_voltage_content_38_avg - 38次谐波电压含有率平均值
+     */
+    public Double getHarmonicVoltageContent38Avg() {
+        return harmonicVoltageContent38Avg;
+    }
+
+    /**
+     * 设置38次谐波电压含有率平均值
+     *
+     * @param harmonicVoltageContent38Avg 38次谐波电压含有率平均值
+     */
+    public void setHarmonicVoltageContent38Avg(Double harmonicVoltageContent38Avg) {
+        this.harmonicVoltageContent38Avg = harmonicVoltageContent38Avg;
+    }
+
+    /**
+     * 获取38次谐波电压含有率95值
+     *
+     * @return harmonic_voltage_content_38_95 - 38次谐波电压含有率95值
+     */
+    public Double getHarmonicVoltageContent3895() {
+        return harmonicVoltageContent3895;
+    }
+
+    /**
+     * 设置38次谐波电压含有率95值
+     *
+     * @param harmonicVoltageContent3895 38次谐波电压含有率95值
+     */
+    public void setHarmonicVoltageContent3895(Double harmonicVoltageContent3895) {
+        this.harmonicVoltageContent3895 = harmonicVoltageContent3895;
+    }
+
+    /**
+     * 获取39次谐波电压含有率最大值
+     *
+     * @return harmonic_voltage_content_39_max - 39次谐波电压含有率最大值
+     */
+    public Double getHarmonicVoltageContent39Max() {
+        return harmonicVoltageContent39Max;
+    }
+
+    /**
+     * 设置39次谐波电压含有率最大值
+     *
+     * @param harmonicVoltageContent39Max 39次谐波电压含有率最大值
+     */
+    public void setHarmonicVoltageContent39Max(Double harmonicVoltageContent39Max) {
+        this.harmonicVoltageContent39Max = harmonicVoltageContent39Max;
+    }
+
+    /**
+     * 获取39次谐波电压含有率最小值
+     *
+     * @return harmonic_voltage_content_39_min - 39次谐波电压含有率最小值
+     */
+    public Double getHarmonicVoltageContent39Min() {
+        return harmonicVoltageContent39Min;
+    }
+
+    /**
+     * 设置39次谐波电压含有率最小值
+     *
+     * @param harmonicVoltageContent39Min 39次谐波电压含有率最小值
+     */
+    public void setHarmonicVoltageContent39Min(Double harmonicVoltageContent39Min) {
+        this.harmonicVoltageContent39Min = harmonicVoltageContent39Min;
+    }
+
+    /**
+     * 获取39次谐波电压含有率平均值
+     *
+     * @return harmonic_voltage_content_39_avg - 39次谐波电压含有率平均值
+     */
+    public Double getHarmonicVoltageContent39Avg() {
+        return harmonicVoltageContent39Avg;
+    }
+
+    /**
+     * 设置39次谐波电压含有率平均值
+     *
+     * @param harmonicVoltageContent39Avg 39次谐波电压含有率平均值
+     */
+    public void setHarmonicVoltageContent39Avg(Double harmonicVoltageContent39Avg) {
+        this.harmonicVoltageContent39Avg = harmonicVoltageContent39Avg;
+    }
+
+    /**
+     * 获取39次谐波电压含有率95值
+     *
+     * @return harmonic_voltage_content_39_95 - 39次谐波电压含有率95值
+     */
+    public Double getHarmonicVoltageContent3995() {
+        return harmonicVoltageContent3995;
+    }
+
+    /**
+     * 设置39次谐波电压含有率95值
+     *
+     * @param harmonicVoltageContent3995 39次谐波电压含有率95值
+     */
+    public void setHarmonicVoltageContent3995(Double harmonicVoltageContent3995) {
+        this.harmonicVoltageContent3995 = harmonicVoltageContent3995;
+    }
+
+    /**
+     * 获取40次谐波电压含有率最大值
+     *
+     * @return harmonic_voltage_content_40_max - 40次谐波电压含有率最大值
+     */
+    public Double getHarmonicVoltageContent40Max() {
+        return harmonicVoltageContent40Max;
+    }
+
+    /**
+     * 设置40次谐波电压含有率最大值
+     *
+     * @param harmonicVoltageContent40Max 40次谐波电压含有率最大值
+     */
+    public void setHarmonicVoltageContent40Max(Double harmonicVoltageContent40Max) {
+        this.harmonicVoltageContent40Max = harmonicVoltageContent40Max;
+    }
+
+    /**
+     * 获取40次谐波电压含有率最小值
+     *
+     * @return harmonic_voltage_content_40_min - 40次谐波电压含有率最小值
+     */
+    public Double getHarmonicVoltageContent40Min() {
+        return harmonicVoltageContent40Min;
+    }
+
+    /**
+     * 设置40次谐波电压含有率最小值
+     *
+     * @param harmonicVoltageContent40Min 40次谐波电压含有率最小值
+     */
+    public void setHarmonicVoltageContent40Min(Double harmonicVoltageContent40Min) {
+        this.harmonicVoltageContent40Min = harmonicVoltageContent40Min;
+    }
+
+    /**
+     * 获取40次谐波电压含有率平均值
+     *
+     * @return harmonic_voltage_content_40_avg - 40次谐波电压含有率平均值
+     */
+    public Double getHarmonicVoltageContent40Avg() {
+        return harmonicVoltageContent40Avg;
+    }
+
+    /**
+     * 设置40次谐波电压含有率平均值
+     *
+     * @param harmonicVoltageContent40Avg 40次谐波电压含有率平均值
+     */
+    public void setHarmonicVoltageContent40Avg(Double harmonicVoltageContent40Avg) {
+        this.harmonicVoltageContent40Avg = harmonicVoltageContent40Avg;
+    }
+
+    /**
+     * 获取40次谐波电压含有率95值
+     *
+     * @return harmonic_voltage_content_40_95 - 40次谐波电压含有率95值
+     */
+    public Double getHarmonicVoltageContent4095() {
+        return harmonicVoltageContent4095;
+    }
+
+    /**
+     * 设置40次谐波电压含有率95值
+     *
+     * @param harmonicVoltageContent4095 40次谐波电压含有率95值
+     */
+    public void setHarmonicVoltageContent4095(Double harmonicVoltageContent4095) {
+        this.harmonicVoltageContent4095 = harmonicVoltageContent4095;
+    }
+
+    /**
+     * 获取41次谐波电压含有率最大值
+     *
+     * @return harmonic_voltage_content_41_max - 41次谐波电压含有率最大值
+     */
+    public Double getHarmonicVoltageContent41Max() {
+        return harmonicVoltageContent41Max;
+    }
+
+    /**
+     * 设置41次谐波电压含有率最大值
+     *
+     * @param harmonicVoltageContent41Max 41次谐波电压含有率最大值
+     */
+    public void setHarmonicVoltageContent41Max(Double harmonicVoltageContent41Max) {
+        this.harmonicVoltageContent41Max = harmonicVoltageContent41Max;
+    }
+
+    /**
+     * 获取41次谐波电压含有率最小值
+     *
+     * @return harmonic_voltage_content_41_min - 41次谐波电压含有率最小值
+     */
+    public Double getHarmonicVoltageContent41Min() {
+        return harmonicVoltageContent41Min;
+    }
+
+    /**
+     * 设置41次谐波电压含有率最小值
+     *
+     * @param harmonicVoltageContent41Min 41次谐波电压含有率最小值
+     */
+    public void setHarmonicVoltageContent41Min(Double harmonicVoltageContent41Min) {
+        this.harmonicVoltageContent41Min = harmonicVoltageContent41Min;
+    }
+
+    /**
+     * 获取41次谐波电压含有率平均值
+     *
+     * @return harmonic_voltage_content_41_avg - 41次谐波电压含有率平均值
+     */
+    public Double getHarmonicVoltageContent41Avg() {
+        return harmonicVoltageContent41Avg;
+    }
+
+    /**
+     * 设置41次谐波电压含有率平均值
+     *
+     * @param harmonicVoltageContent41Avg 41次谐波电压含有率平均值
+     */
+    public void setHarmonicVoltageContent41Avg(Double harmonicVoltageContent41Avg) {
+        this.harmonicVoltageContent41Avg = harmonicVoltageContent41Avg;
+    }
+
+    /**
+     * 获取41次谐波电压含有率95值
+     *
+     * @return harmonic_voltage_content_41_95 - 41次谐波电压含有率95值
+     */
+    public Double getHarmonicVoltageContent4195() {
+        return harmonicVoltageContent4195;
+    }
+
+    /**
+     * 设置41次谐波电压含有率95值
+     *
+     * @param harmonicVoltageContent4195 41次谐波电压含有率95值
+     */
+    public void setHarmonicVoltageContent4195(Double harmonicVoltageContent4195) {
+        this.harmonicVoltageContent4195 = harmonicVoltageContent4195;
+    }
+
+    /**
+     * 获取42次谐波电压含有率最大值
+     *
+     * @return harmonic_voltage_content_42_max - 42次谐波电压含有率最大值
+     */
+    public Double getHarmonicVoltageContent42Max() {
+        return harmonicVoltageContent42Max;
+    }
+
+    /**
+     * 设置42次谐波电压含有率最大值
+     *
+     * @param harmonicVoltageContent42Max 42次谐波电压含有率最大值
+     */
+    public void setHarmonicVoltageContent42Max(Double harmonicVoltageContent42Max) {
+        this.harmonicVoltageContent42Max = harmonicVoltageContent42Max;
+    }
+
+    /**
+     * 获取42次谐波电压含有率最小值
+     *
+     * @return harmonic_voltage_content_42_min - 42次谐波电压含有率最小值
+     */
+    public Double getHarmonicVoltageContent42Min() {
+        return harmonicVoltageContent42Min;
+    }
+
+    /**
+     * 设置42次谐波电压含有率最小值
+     *
+     * @param harmonicVoltageContent42Min 42次谐波电压含有率最小值
+     */
+    public void setHarmonicVoltageContent42Min(Double harmonicVoltageContent42Min) {
+        this.harmonicVoltageContent42Min = harmonicVoltageContent42Min;
+    }
+
+    /**
+     * 获取42次谐波电压含有率平均值
+     *
+     * @return harmonic_voltage_content_42_avg - 42次谐波电压含有率平均值
+     */
+    public Double getHarmonicVoltageContent42Avg() {
+        return harmonicVoltageContent42Avg;
+    }
+
+    /**
+     * 设置42次谐波电压含有率平均值
+     *
+     * @param harmonicVoltageContent42Avg 42次谐波电压含有率平均值
+     */
+    public void setHarmonicVoltageContent42Avg(Double harmonicVoltageContent42Avg) {
+        this.harmonicVoltageContent42Avg = harmonicVoltageContent42Avg;
+    }
+
+    /**
+     * 获取42次谐波电压含有率95值
+     *
+     * @return harmonic_voltage_content_42_95 - 42次谐波电压含有率95值
+     */
+    public Double getHarmonicVoltageContent4295() {
+        return harmonicVoltageContent4295;
+    }
+
+    /**
+     * 设置42次谐波电压含有率95值
+     *
+     * @param harmonicVoltageContent4295 42次谐波电压含有率95值
+     */
+    public void setHarmonicVoltageContent4295(Double harmonicVoltageContent4295) {
+        this.harmonicVoltageContent4295 = harmonicVoltageContent4295;
+    }
+
+    /**
+     * 获取43次谐波电压含有率最大值
+     *
+     * @return harmonic_voltage_content_43_max - 43次谐波电压含有率最大值
+     */
+    public Double getHarmonicVoltageContent43Max() {
+        return harmonicVoltageContent43Max;
+    }
+
+    /**
+     * 设置43次谐波电压含有率最大值
+     *
+     * @param harmonicVoltageContent43Max 43次谐波电压含有率最大值
+     */
+    public void setHarmonicVoltageContent43Max(Double harmonicVoltageContent43Max) {
+        this.harmonicVoltageContent43Max = harmonicVoltageContent43Max;
+    }
+
+    /**
+     * 获取43次谐波电压含有率最小值
+     *
+     * @return harmonic_voltage_content_43_min - 43次谐波电压含有率最小值
+     */
+    public Double getHarmonicVoltageContent43Min() {
+        return harmonicVoltageContent43Min;
+    }
+
+    /**
+     * 设置43次谐波电压含有率最小值
+     *
+     * @param harmonicVoltageContent43Min 43次谐波电压含有率最小值
+     */
+    public void setHarmonicVoltageContent43Min(Double harmonicVoltageContent43Min) {
+        this.harmonicVoltageContent43Min = harmonicVoltageContent43Min;
+    }
+
+    /**
+     * 获取43次谐波电压含有率平均值
+     *
+     * @return harmonic_voltage_content_43_avg - 43次谐波电压含有率平均值
+     */
+    public Double getHarmonicVoltageContent43Avg() {
+        return harmonicVoltageContent43Avg;
+    }
+
+    /**
+     * 设置43次谐波电压含有率平均值
+     *
+     * @param harmonicVoltageContent43Avg 43次谐波电压含有率平均值
+     */
+    public void setHarmonicVoltageContent43Avg(Double harmonicVoltageContent43Avg) {
+        this.harmonicVoltageContent43Avg = harmonicVoltageContent43Avg;
+    }
+
+    /**
+     * 获取43次谐波电压含有率95值
+     *
+     * @return harmonic_voltage_content_43_95 - 43次谐波电压含有率95值
+     */
+    public Double getHarmonicVoltageContent4395() {
+        return harmonicVoltageContent4395;
+    }
+
+    /**
+     * 设置43次谐波电压含有率95值
+     *
+     * @param harmonicVoltageContent4395 43次谐波电压含有率95值
+     */
+    public void setHarmonicVoltageContent4395(Double harmonicVoltageContent4395) {
+        this.harmonicVoltageContent4395 = harmonicVoltageContent4395;
+    }
+
+    /**
+     * 获取44次谐波电压含有率最大值
+     *
+     * @return harmonic_voltage_content_44_max - 44次谐波电压含有率最大值
+     */
+    public Double getHarmonicVoltageContent44Max() {
+        return harmonicVoltageContent44Max;
+    }
+
+    /**
+     * 设置44次谐波电压含有率最大值
+     *
+     * @param harmonicVoltageContent44Max 44次谐波电压含有率最大值
+     */
+    public void setHarmonicVoltageContent44Max(Double harmonicVoltageContent44Max) {
+        this.harmonicVoltageContent44Max = harmonicVoltageContent44Max;
+    }
+
+    /**
+     * 获取44次谐波电压含有率最小值
+     *
+     * @return harmonic_voltage_content_44_min - 44次谐波电压含有率最小值
+     */
+    public Double getHarmonicVoltageContent44Min() {
+        return harmonicVoltageContent44Min;
+    }
+
+    /**
+     * 设置44次谐波电压含有率最小值
+     *
+     * @param harmonicVoltageContent44Min 44次谐波电压含有率最小值
+     */
+    public void setHarmonicVoltageContent44Min(Double harmonicVoltageContent44Min) {
+        this.harmonicVoltageContent44Min = harmonicVoltageContent44Min;
+    }
+
+    /**
+     * 获取44次谐波电压含有率平均值
+     *
+     * @return harmonic_voltage_content_44_avg - 44次谐波电压含有率平均值
+     */
+    public Double getHarmonicVoltageContent44Avg() {
+        return harmonicVoltageContent44Avg;
+    }
+
+    /**
+     * 设置44次谐波电压含有率平均值
+     *
+     * @param harmonicVoltageContent44Avg 44次谐波电压含有率平均值
+     */
+    public void setHarmonicVoltageContent44Avg(Double harmonicVoltageContent44Avg) {
+        this.harmonicVoltageContent44Avg = harmonicVoltageContent44Avg;
+    }
+
+    /**
+     * 获取44次谐波电压含有率95值
+     *
+     * @return harmonic_voltage_content_44_95 - 44次谐波电压含有率95值
+     */
+    public Double getHarmonicVoltageContent4495() {
+        return harmonicVoltageContent4495;
+    }
+
+    /**
+     * 设置44次谐波电压含有率95值
+     *
+     * @param harmonicVoltageContent4495 44次谐波电压含有率95值
+     */
+    public void setHarmonicVoltageContent4495(Double harmonicVoltageContent4495) {
+        this.harmonicVoltageContent4495 = harmonicVoltageContent4495;
+    }
+
+    /**
+     * 获取45次谐波电压含有率最大值
+     *
+     * @return harmonic_voltage_content_45_max - 45次谐波电压含有率最大值
+     */
+    public Double getHarmonicVoltageContent45Max() {
+        return harmonicVoltageContent45Max;
+    }
+
+    /**
+     * 设置45次谐波电压含有率最大值
+     *
+     * @param harmonicVoltageContent45Max 45次谐波电压含有率最大值
+     */
+    public void setHarmonicVoltageContent45Max(Double harmonicVoltageContent45Max) {
+        this.harmonicVoltageContent45Max = harmonicVoltageContent45Max;
+    }
+
+    /**
+     * 获取45次谐波电压含有率最小值
+     *
+     * @return harmonic_voltage_content_45_min - 45次谐波电压含有率最小值
+     */
+    public Double getHarmonicVoltageContent45Min() {
+        return harmonicVoltageContent45Min;
+    }
+
+    /**
+     * 设置45次谐波电压含有率最小值
+     *
+     * @param harmonicVoltageContent45Min 45次谐波电压含有率最小值
+     */
+    public void setHarmonicVoltageContent45Min(Double harmonicVoltageContent45Min) {
+        this.harmonicVoltageContent45Min = harmonicVoltageContent45Min;
+    }
+
+    /**
+     * 获取45次谐波电压含有率平均值
+     *
+     * @return harmonic_voltage_content_45_avg - 45次谐波电压含有率平均值
+     */
+    public Double getHarmonicVoltageContent45Avg() {
+        return harmonicVoltageContent45Avg;
+    }
+
+    /**
+     * 设置45次谐波电压含有率平均值
+     *
+     * @param harmonicVoltageContent45Avg 45次谐波电压含有率平均值
+     */
+    public void setHarmonicVoltageContent45Avg(Double harmonicVoltageContent45Avg) {
+        this.harmonicVoltageContent45Avg = harmonicVoltageContent45Avg;
+    }
+
+    /**
+     * 获取45次谐波电压含有率95值
+     *
+     * @return harmonic_voltage_content_45_95 - 45次谐波电压含有率95值
+     */
+    public Double getHarmonicVoltageContent4595() {
+        return harmonicVoltageContent4595;
+    }
+
+    /**
+     * 设置45次谐波电压含有率95值
+     *
+     * @param harmonicVoltageContent4595 45次谐波电压含有率95值
+     */
+    public void setHarmonicVoltageContent4595(Double harmonicVoltageContent4595) {
+        this.harmonicVoltageContent4595 = harmonicVoltageContent4595;
+    }
+
+    /**
+     * 获取46次谐波电压含有率最大值
+     *
+     * @return harmonic_voltage_content_46_max - 46次谐波电压含有率最大值
+     */
+    public Double getHarmonicVoltageContent46Max() {
+        return harmonicVoltageContent46Max;
+    }
+
+    /**
+     * 设置46次谐波电压含有率最大值
+     *
+     * @param harmonicVoltageContent46Max 46次谐波电压含有率最大值
+     */
+    public void setHarmonicVoltageContent46Max(Double harmonicVoltageContent46Max) {
+        this.harmonicVoltageContent46Max = harmonicVoltageContent46Max;
+    }
+
+    /**
+     * 获取46次谐波电压含有率最小值
+     *
+     * @return harmonic_voltage_content_46_min - 46次谐波电压含有率最小值
+     */
+    public Double getHarmonicVoltageContent46Min() {
+        return harmonicVoltageContent46Min;
+    }
+
+    /**
+     * 设置46次谐波电压含有率最小值
+     *
+     * @param harmonicVoltageContent46Min 46次谐波电压含有率最小值
+     */
+    public void setHarmonicVoltageContent46Min(Double harmonicVoltageContent46Min) {
+        this.harmonicVoltageContent46Min = harmonicVoltageContent46Min;
+    }
+
+    /**
+     * 获取46次谐波电压含有率平均值
+     *
+     * @return harmonic_voltage_content_46_avg - 46次谐波电压含有率平均值
+     */
+    public Double getHarmonicVoltageContent46Avg() {
+        return harmonicVoltageContent46Avg;
+    }
+
+    /**
+     * 设置46次谐波电压含有率平均值
+     *
+     * @param harmonicVoltageContent46Avg 46次谐波电压含有率平均值
+     */
+    public void setHarmonicVoltageContent46Avg(Double harmonicVoltageContent46Avg) {
+        this.harmonicVoltageContent46Avg = harmonicVoltageContent46Avg;
+    }
+
+    /**
+     * 获取46次谐波电压含有率95值
+     *
+     * @return harmonic_voltage_content_46_95 - 46次谐波电压含有率95值
+     */
+    public Double getHarmonicVoltageContent4695() {
+        return harmonicVoltageContent4695;
+    }
+
+    /**
+     * 设置46次谐波电压含有率95值
+     *
+     * @param harmonicVoltageContent4695 46次谐波电压含有率95值
+     */
+    public void setHarmonicVoltageContent4695(Double harmonicVoltageContent4695) {
+        this.harmonicVoltageContent4695 = harmonicVoltageContent4695;
+    }
+
+    /**
+     * 获取47次谐波电压含有率最大值
+     *
+     * @return harmonic_voltage_content_47_max - 47次谐波电压含有率最大值
+     */
+    public Double getHarmonicVoltageContent47Max() {
+        return harmonicVoltageContent47Max;
+    }
+
+    /**
+     * 设置47次谐波电压含有率最大值
+     *
+     * @param harmonicVoltageContent47Max 47次谐波电压含有率最大值
+     */
+    public void setHarmonicVoltageContent47Max(Double harmonicVoltageContent47Max) {
+        this.harmonicVoltageContent47Max = harmonicVoltageContent47Max;
+    }
+
+    /**
+     * 获取47次谐波电压含有率最小值
+     *
+     * @return harmonic_voltage_content_47_min - 47次谐波电压含有率最小值
+     */
+    public Double getHarmonicVoltageContent47Min() {
+        return harmonicVoltageContent47Min;
+    }
+
+    /**
+     * 设置47次谐波电压含有率最小值
+     *
+     * @param harmonicVoltageContent47Min 47次谐波电压含有率最小值
+     */
+    public void setHarmonicVoltageContent47Min(Double harmonicVoltageContent47Min) {
+        this.harmonicVoltageContent47Min = harmonicVoltageContent47Min;
+    }
+
+    /**
+     * 获取47次谐波电压含有率平均值
+     *
+     * @return harmonic_voltage_content_47_avg - 47次谐波电压含有率平均值
+     */
+    public Double getHarmonicVoltageContent47Avg() {
+        return harmonicVoltageContent47Avg;
+    }
+
+    /**
+     * 设置47次谐波电压含有率平均值
+     *
+     * @param harmonicVoltageContent47Avg 47次谐波电压含有率平均值
+     */
+    public void setHarmonicVoltageContent47Avg(Double harmonicVoltageContent47Avg) {
+        this.harmonicVoltageContent47Avg = harmonicVoltageContent47Avg;
+    }
+
+    /**
+     * 获取47次谐波电压含有率95值
+     *
+     * @return harmonic_voltage_content_47_95 - 47次谐波电压含有率95值
+     */
+    public Double getHarmonicVoltageContent4795() {
+        return harmonicVoltageContent4795;
+    }
+
+    /**
+     * 设置47次谐波电压含有率95值
+     *
+     * @param harmonicVoltageContent4795 47次谐波电压含有率95值
+     */
+    public void setHarmonicVoltageContent4795(Double harmonicVoltageContent4795) {
+        this.harmonicVoltageContent4795 = harmonicVoltageContent4795;
+    }
+
+    /**
+     * 获取48次谐波电压含有率最大值
+     *
+     * @return harmonic_voltage_content_48_max - 48次谐波电压含有率最大值
+     */
+    public Double getHarmonicVoltageContent48Max() {
+        return harmonicVoltageContent48Max;
+    }
+
+    /**
+     * 设置48次谐波电压含有率最大值
+     *
+     * @param harmonicVoltageContent48Max 48次谐波电压含有率最大值
+     */
+    public void setHarmonicVoltageContent48Max(Double harmonicVoltageContent48Max) {
+        this.harmonicVoltageContent48Max = harmonicVoltageContent48Max;
+    }
+
+    /**
+     * 获取48次谐波电压含有率最小值
+     *
+     * @return harmonic_voltage_content_48_min - 48次谐波电压含有率最小值
+     */
+    public Double getHarmonicVoltageContent48Min() {
+        return harmonicVoltageContent48Min;
+    }
+
+    /**
+     * 设置48次谐波电压含有率最小值
+     *
+     * @param harmonicVoltageContent48Min 48次谐波电压含有率最小值
+     */
+    public void setHarmonicVoltageContent48Min(Double harmonicVoltageContent48Min) {
+        this.harmonicVoltageContent48Min = harmonicVoltageContent48Min;
+    }
+
+    /**
+     * 获取48次谐波电压含有率平均值
+     *
+     * @return harmonic_voltage_content_48_avg - 48次谐波电压含有率平均值
+     */
+    public Double getHarmonicVoltageContent48Avg() {
+        return harmonicVoltageContent48Avg;
+    }
+
+    /**
+     * 设置48次谐波电压含有率平均值
+     *
+     * @param harmonicVoltageContent48Avg 48次谐波电压含有率平均值
+     */
+    public void setHarmonicVoltageContent48Avg(Double harmonicVoltageContent48Avg) {
+        this.harmonicVoltageContent48Avg = harmonicVoltageContent48Avg;
+    }
+
+    /**
+     * 获取48次谐波电压含有率95值
+     *
+     * @return harmonic_voltage_content_48_95 - 48次谐波电压含有率95值
+     */
+    public Double getHarmonicVoltageContent4895() {
+        return harmonicVoltageContent4895;
+    }
+
+    /**
+     * 设置48次谐波电压含有率95值
+     *
+     * @param harmonicVoltageContent4895 48次谐波电压含有率95值
+     */
+    public void setHarmonicVoltageContent4895(Double harmonicVoltageContent4895) {
+        this.harmonicVoltageContent4895 = harmonicVoltageContent4895;
+    }
+
+    /**
+     * 获取49次谐波电压含有率最大值
+     *
+     * @return harmonic_voltage_content_49_max - 49次谐波电压含有率最大值
+     */
+    public Double getHarmonicVoltageContent49Max() {
+        return harmonicVoltageContent49Max;
+    }
+
+    /**
+     * 设置49次谐波电压含有率最大值
+     *
+     * @param harmonicVoltageContent49Max 49次谐波电压含有率最大值
+     */
+    public void setHarmonicVoltageContent49Max(Double harmonicVoltageContent49Max) {
+        this.harmonicVoltageContent49Max = harmonicVoltageContent49Max;
+    }
+
+    /**
+     * 获取49次谐波电压含有率最小值
+     *
+     * @return harmonic_voltage_content_49_min - 49次谐波电压含有率最小值
+     */
+    public Double getHarmonicVoltageContent49Min() {
+        return harmonicVoltageContent49Min;
+    }
+
+    /**
+     * 设置49次谐波电压含有率最小值
+     *
+     * @param harmonicVoltageContent49Min 49次谐波电压含有率最小值
+     */
+    public void setHarmonicVoltageContent49Min(Double harmonicVoltageContent49Min) {
+        this.harmonicVoltageContent49Min = harmonicVoltageContent49Min;
+    }
+
+    /**
+     * 获取49次谐波电压含有率平均值
+     *
+     * @return harmonic_voltage_content_49_avg - 49次谐波电压含有率平均值
+     */
+    public Double getHarmonicVoltageContent49Avg() {
+        return harmonicVoltageContent49Avg;
+    }
+
+    /**
+     * 设置49次谐波电压含有率平均值
+     *
+     * @param harmonicVoltageContent49Avg 49次谐波电压含有率平均值
+     */
+    public void setHarmonicVoltageContent49Avg(Double harmonicVoltageContent49Avg) {
+        this.harmonicVoltageContent49Avg = harmonicVoltageContent49Avg;
+    }
+
+    /**
+     * 获取49次谐波电压含有率95值
+     *
+     * @return harmonic_voltage_content_49_95 - 49次谐波电压含有率95值
+     */
+    public Double getHarmonicVoltageContent4995() {
+        return harmonicVoltageContent4995;
+    }
+
+    /**
+     * 设置49次谐波电压含有率95值
+     *
+     * @param harmonicVoltageContent4995 49次谐波电压含有率95值
+     */
+    public void setHarmonicVoltageContent4995(Double harmonicVoltageContent4995) {
+        this.harmonicVoltageContent4995 = harmonicVoltageContent4995;
+    }
+
+    /**
+     * 获取50次谐波电压含有率最大值
+     *
+     * @return harmonic_voltage_content_50_max - 50次谐波电压含有率最大值
+     */
+    public Double getHarmonicVoltageContent50Max() {
+        return harmonicVoltageContent50Max;
+    }
+
+    /**
+     * 设置50次谐波电压含有率最大值
+     *
+     * @param harmonicVoltageContent50Max 50次谐波电压含有率最大值
+     */
+    public void setHarmonicVoltageContent50Max(Double harmonicVoltageContent50Max) {
+        this.harmonicVoltageContent50Max = harmonicVoltageContent50Max;
+    }
+
+    /**
+     * 获取50次谐波电压含有率最小值
+     *
+     * @return harmonic_voltage_content_50_min - 50次谐波电压含有率最小值
+     */
+    public Double getHarmonicVoltageContent50Min() {
+        return harmonicVoltageContent50Min;
+    }
+
+    /**
+     * 设置50次谐波电压含有率最小值
+     *
+     * @param harmonicVoltageContent50Min 50次谐波电压含有率最小值
+     */
+    public void setHarmonicVoltageContent50Min(Double harmonicVoltageContent50Min) {
+        this.harmonicVoltageContent50Min = harmonicVoltageContent50Min;
+    }
+
+    /**
+     * 获取50次谐波电压含有率平均值
+     *
+     * @return harmonic_voltage_content_50_avg - 50次谐波电压含有率平均值
+     */
+    public Double getHarmonicVoltageContent50Avg() {
+        return harmonicVoltageContent50Avg;
+    }
+
+    /**
+     * 设置50次谐波电压含有率平均值
+     *
+     * @param harmonicVoltageContent50Avg 50次谐波电压含有率平均值
+     */
+    public void setHarmonicVoltageContent50Avg(Double harmonicVoltageContent50Avg) {
+        this.harmonicVoltageContent50Avg = harmonicVoltageContent50Avg;
+    }
+
+    /**
+     * 获取50次谐波电压含有率95值
+     *
+     * @return harmonic_voltage_content_50_95 - 50次谐波电压含有率95值
+     */
+    public Double getHarmonicVoltageContent5095() {
+        return harmonicVoltageContent5095;
+    }
+
+    /**
+     * 设置50次谐波电压含有率95值
+     *
+     * @param harmonicVoltageContent5095 50次谐波电压含有率95值
+     */
+    public void setHarmonicVoltageContent5095(Double harmonicVoltageContent5095) {
+        this.harmonicVoltageContent5095 = harmonicVoltageContent5095;
+    }
+}
\ No newline at end of file
diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/pojo/po/line/RMpInharmonicIMagReportDPO.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/pojo/po/line/RMpInharmonicIMagReportDPO.java
new file mode 100644
index 000000000..c75358bbb
--- /dev/null
+++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/pojo/po/line/RMpInharmonicIMagReportDPO.java
@@ -0,0 +1,1444 @@
+package com.njcn.prepare.harmonic.pojo.po.line;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.github.jeffreyning.mybatisplus.anno.MppMultiId;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * Description:
+ * 接口文档访问地址：http://serverIP:port/swagger-ui.html
+ * Date: 2022/10/27  13:52【需求编号】
+ *
+ * @author clam
+ * @version V1.0.0
+ */
+@ApiModel(value = "com-njcn-prepare-harmonic-pojo-po-line-RMpInharmonicIMagReportDPO")
+@Data
+@TableName(value = "r_mp_inharmonic_i_mag_report_d")
+public class RMpInharmonicIMagReportDPO {
+    /**
+     * 监测点ID
+     */
+    @MppMultiId(value = "measurement_point_id")
+    @ApiModelProperty(value = "监测点ID")
+    private String measurementPointId;
+
+    /**
+     * 生成数据的时间,每日统计一次
+     */
+    @MppMultiId(value = "data_date")
+    @ApiModelProperty(value = "生成数据的时间,每日统计一次")
+    private Date dataDate;
+
+    /**
+     * 相别："A" "B" "C" "ABC" "T"  配网部分相别的数据采用T标志存储
+     */
+    @MppMultiId(value = "phase")
+    @ApiModelProperty(value = "相别：'A' 'B' 'C' 'ABC' 'T'  配网部分相别的数据采用T标志存储")
+    private String phase;
+
+    /**
+     * 0.5次间谐波电流有效值最大值
+     */
+    @TableField(value = "simple_harmonic_current_effective_1_max")
+    @ApiModelProperty(value = "0.5次间谐波电流有效值最大值")
+    private Double simpleHarmonicCurrentEffective1Max;
+
+    /**
+     * 0.5次间谐波电流有效值最小值
+     */
+    @TableField(value = "simple_harmonic_current_effective_1_min")
+    @ApiModelProperty(value = "0.5次间谐波电流有效值最小值")
+    private Double simpleHarmonicCurrentEffective1Min;
+
+    /**
+     * 0.5次间谐波电流有效值平均值
+     */
+    @TableField(value = "simple_harmonic_current_effective_1_avg")
+    @ApiModelProperty(value = "0.5次间谐波电流有效值平均值")
+    private Double simpleHarmonicCurrentEffective1Avg;
+
+    /**
+     * 0.5次间谐波电流有效值95值
+     */
+    @TableField(value = "simple_harmonic_current_effective_1_cp95")
+    @ApiModelProperty(value = "0.5次间谐波电流有效值95值")
+    private Double simpleHarmonicCurrentEffective1Cp95;
+
+    /**
+     * 1.5次间谐波电流有效值最大值
+     */
+    @TableField(value = "simple_harmonic_current_effective_2_max")
+    @ApiModelProperty(value = "1.5次间谐波电流有效值最大值")
+    private Double simpleHarmonicCurrentEffective2Max;
+
+    /**
+     * 1.5次间谐波电流有效值最小值
+     */
+    @TableField(value = "simple_harmonic_current_effective_2_min")
+    @ApiModelProperty(value = "1.5次间谐波电流有效值最小值")
+    private Double simpleHarmonicCurrentEffective2Min;
+
+    /**
+     * 1.5次间谐波电流有效值平均值
+     */
+    @TableField(value = "simple_harmonic_current_effective_2_avg")
+    @ApiModelProperty(value = "1.5次间谐波电流有效值平均值")
+    private Double simpleHarmonicCurrentEffective2Avg;
+
+    /**
+     * 1.5次间谐波电流有效值95值
+     */
+    @TableField(value = "simple_harmonic_current_effective_2_cp95")
+    @ApiModelProperty(value = "1.5次间谐波电流有效值95值")
+    private Double simpleHarmonicCurrentEffective2Cp95;
+
+    /**
+     * 2.5次间谐波电流有效值最大值
+     */
+    @TableField(value = "simple_harmonic_current_effective_3_max")
+    @ApiModelProperty(value = "2.5次间谐波电流有效值最大值")
+    private Double simpleHarmonicCurrentEffective3Max;
+
+    /**
+     * 2.5次间谐波电流有效值最小值
+     */
+    @TableField(value = "simple_harmonic_current_effective_3_min")
+    @ApiModelProperty(value = "2.5次间谐波电流有效值最小值")
+    private Double simpleHarmonicCurrentEffective3Min;
+
+    /**
+     * 2.5次间谐波电流有效值平均值
+     */
+    @TableField(value = "simple_harmonic_current_effective_3_avg")
+    @ApiModelProperty(value = "2.5次间谐波电流有效值平均值")
+    private Double simpleHarmonicCurrentEffective3Avg;
+
+    /**
+     * 2.5次间谐波电流有效值95值
+     */
+    @TableField(value = "simple_harmonic_current_effective_3_cp95")
+    @ApiModelProperty(value = "2.5次间谐波电流有效值95值")
+    private Double simpleHarmonicCurrentEffective3Cp95;
+
+    /**
+     * 3.5次间谐波电流有效值最大值
+     */
+    @TableField(value = "simple_harmonic_current_effective_4_max")
+    @ApiModelProperty(value = "3.5次间谐波电流有效值最大值")
+    private Double simpleHarmonicCurrentEffective4Max;
+
+    /**
+     * 3.5次间谐波电流有效值最小值
+     */
+    @TableField(value = "simple_harmonic_current_effective_4_min")
+    @ApiModelProperty(value = "3.5次间谐波电流有效值最小值")
+    private Double simpleHarmonicCurrentEffective4Min;
+
+    /**
+     * 3.5次间谐波电流有效值平均值
+     */
+    @TableField(value = "simple_harmonic_current_effective_4_avg")
+    @ApiModelProperty(value = "3.5次间谐波电流有效值平均值")
+    private Double simpleHarmonicCurrentEffective4Avg;
+
+    /**
+     * 3.5次间谐波电流有效值95值
+     */
+    @TableField(value = "simple_harmonic_current_effective_4_cp95")
+    @ApiModelProperty(value = "3.5次间谐波电流有效值95值")
+    private Double simpleHarmonicCurrentEffective4Cp95;
+
+    /**
+     * 4.5次间谐波电流有效值最大值
+     */
+    @TableField(value = "simple_harmonic_current_effective_5_max")
+    @ApiModelProperty(value = "4.5次间谐波电流有效值最大值")
+    private Double simpleHarmonicCurrentEffective5Max;
+
+    /**
+     * 4.5次间谐波电流有效值最小值
+     */
+    @TableField(value = "simple_harmonic_current_effective_5_min")
+    @ApiModelProperty(value = "4.5次间谐波电流有效值最小值")
+    private Double simpleHarmonicCurrentEffective5Min;
+
+    /**
+     * 4.5次间谐波电流有效值平均值
+     */
+    @TableField(value = "simple_harmonic_current_effective_5_avg")
+    @ApiModelProperty(value = "4.5次间谐波电流有效值平均值")
+    private Double simpleHarmonicCurrentEffective5Avg;
+
+    /**
+     * 4.5次间谐波电流有效值95值
+     */
+    @TableField(value = "simple_harmonic_current_effective_5_cp95")
+    @ApiModelProperty(value = "4.5次间谐波电流有效值95值")
+    private Double simpleHarmonicCurrentEffective5Cp95;
+
+    /**
+     * 5.5次间谐波电流有效值最大值
+     */
+    @TableField(value = "simple_harmonic_current_effective_6_max")
+    @ApiModelProperty(value = "5.5次间谐波电流有效值最大值")
+    private Double simpleHarmonicCurrentEffective6Max;
+
+    /**
+     * 5.5次间谐波电流有效值最小值
+     */
+    @TableField(value = "simple_harmonic_current_effective_6_min")
+    @ApiModelProperty(value = "5.5次间谐波电流有效值最小值")
+    private Double simpleHarmonicCurrentEffective6Min;
+
+    /**
+     * 5.5次间谐波电流有效值平均值
+     */
+    @TableField(value = "simple_harmonic_current_effective_6_avg")
+    @ApiModelProperty(value = "5.5次间谐波电流有效值平均值")
+    private Double simpleHarmonicCurrentEffective6Avg;
+
+    /**
+     * 5.5次间谐波电流有效值95值
+     */
+    @TableField(value = "simple_harmonic_current_effective_6_cp95")
+    @ApiModelProperty(value = "5.5次间谐波电流有效值95值")
+    private Double simpleHarmonicCurrentEffective6Cp95;
+
+    /**
+     * 6.5次间谐波电流有效值最大值
+     */
+    @TableField(value = "simple_harmonic_current_effective_7_max")
+    @ApiModelProperty(value = "6.5次间谐波电流有效值最大值")
+    private Double simpleHarmonicCurrentEffective7Max;
+
+    /**
+     * 6.5次间谐波电流有效值最小值
+     */
+    @TableField(value = "simple_harmonic_current_effective_7_min")
+    @ApiModelProperty(value = "6.5次间谐波电流有效值最小值")
+    private Double simpleHarmonicCurrentEffective7Min;
+
+    /**
+     * 6.5次间谐波电流有效值平均值
+     */
+    @TableField(value = "simple_harmonic_current_effective_7_avg")
+    @ApiModelProperty(value = "6.5次间谐波电流有效值平均值")
+    private Double simpleHarmonicCurrentEffective7Avg;
+
+    /**
+     * 6.5次间谐波电流有效值95值
+     */
+    @TableField(value = "simple_harmonic_current_effective_7_cp95")
+    @ApiModelProperty(value = "6.5次间谐波电流有效值95值")
+    private Double simpleHarmonicCurrentEffective7Cp95;
+
+    /**
+     * 7.5次间谐波电流有效值最大值
+     */
+    @TableField(value = "simple_harmonic_current_effective_8_max")
+    @ApiModelProperty(value = "7.5次间谐波电流有效值最大值")
+    private Double simpleHarmonicCurrentEffective8Max;
+
+    /**
+     * 7.5次间谐波电流有效值最小值
+     */
+    @TableField(value = "simple_harmonic_current_effective_8_min")
+    @ApiModelProperty(value = "7.5次间谐波电流有效值最小值")
+    private Double simpleHarmonicCurrentEffective8Min;
+
+    /**
+     * 7.5次间谐波电流有效值平均值
+     */
+    @TableField(value = "simple_harmonic_current_effective_8_avg")
+    @ApiModelProperty(value = "7.5次间谐波电流有效值平均值")
+    private Double simpleHarmonicCurrentEffective8Avg;
+
+    /**
+     * 7.5次间谐波电流有效值95值
+     */
+    @TableField(value = "simple_harmonic_current_effective_8_cp95")
+    @ApiModelProperty(value = "7.5次间谐波电流有效值95值")
+    private Double simpleHarmonicCurrentEffective8Cp95;
+
+    /**
+     * 8.5次间谐波电流有效值最大值
+     */
+    @TableField(value = "simple_harmonic_current_effective_9_max")
+    @ApiModelProperty(value = "8.5次间谐波电流有效值最大值")
+    private Double simpleHarmonicCurrentEffective9Max;
+
+    /**
+     * 8.5次间谐波电流有效值最小值
+     */
+    @TableField(value = "simple_harmonic_current_effective_9_min")
+    @ApiModelProperty(value = "8.5次间谐波电流有效值最小值")
+    private Double simpleHarmonicCurrentEffective9Min;
+
+    /**
+     * 8.5次间谐波电流有效值平均值
+     */
+    @TableField(value = "simple_harmonic_current_effective_9_avg")
+    @ApiModelProperty(value = "8.5次间谐波电流有效值平均值")
+    private Double simpleHarmonicCurrentEffective9Avg;
+
+    /**
+     * 8.5次间谐波电流有效值95值
+     */
+    @TableField(value = "simple_harmonic_current_effective_9_cp95")
+    @ApiModelProperty(value = "8.5次间谐波电流有效值95值")
+    private Double simpleHarmonicCurrentEffective9Cp95;
+
+    /**
+     * 9.5次间谐波电流有效值最大值
+     */
+    @TableField(value = "simple_harmonic_current_effective_10_max")
+    @ApiModelProperty(value = "9.5次间谐波电流有效值最大值")
+    private Double simpleHarmonicCurrentEffective10Max;
+
+    /**
+     * 9.5次间谐波电流有效值最小值
+     */
+    @TableField(value = "simple_harmonic_current_effective_10_min")
+    @ApiModelProperty(value = "9.5次间谐波电流有效值最小值")
+    private Double simpleHarmonicCurrentEffective10Min;
+
+    /**
+     * 9.5次间谐波电流有效值平均值
+     */
+    @TableField(value = "simple_harmonic_current_effective_10_avg")
+    @ApiModelProperty(value = "9.5次间谐波电流有效值平均值")
+    private Double simpleHarmonicCurrentEffective10Avg;
+
+    /**
+     * 9.5次间谐波电流有效值95值
+     */
+    @TableField(value = "simple_harmonic_current_effective_10_cp95")
+    @ApiModelProperty(value = "9.5次间谐波电流有效值95值")
+    private Double simpleHarmonicCurrentEffective10Cp95;
+
+    /**
+     * 10.5次间谐波电流有效值最大值
+     */
+    @TableField(value = "simple_harmonic_current_effective_11_max")
+    @ApiModelProperty(value = "10.5次间谐波电流有效值最大值")
+    private Double simpleHarmonicCurrentEffective11Max;
+
+    /**
+     * 10.5次间谐波电流有效值最小值
+     */
+    @TableField(value = "simple_harmonic_current_effective_11_min")
+    @ApiModelProperty(value = "10.5次间谐波电流有效值最小值")
+    private Double simpleHarmonicCurrentEffective11Min;
+
+    /**
+     * 10.5次间谐波电流有效值平均值
+     */
+    @TableField(value = "simple_harmonic_current_effective_11_avg")
+    @ApiModelProperty(value = "10.5次间谐波电流有效值平均值")
+    private Double simpleHarmonicCurrentEffective11Avg;
+
+    /**
+     * 10.5次间谐波电流有效值95值
+     */
+    @TableField(value = "simple_harmonic_current_effective_11_cp95")
+    @ApiModelProperty(value = "10.5次间谐波电流有效值95值")
+    private Double simpleHarmonicCurrentEffective11Cp95;
+
+    /**
+     * 11.5次间谐波电流有效值最大值
+     */
+    @TableField(value = "simple_harmonic_current_effective_12_max")
+    @ApiModelProperty(value = "11.5次间谐波电流有效值最大值")
+    private Double simpleHarmonicCurrentEffective12Max;
+
+    /**
+     * 11.5次间谐波电流有效值最小值
+     */
+    @TableField(value = "simple_harmonic_current_effective_12_min")
+    @ApiModelProperty(value = "11.5次间谐波电流有效值最小值")
+    private Double simpleHarmonicCurrentEffective12Min;
+
+    /**
+     * 11.5次间谐波电流有效值平均值
+     */
+    @TableField(value = "simple_harmonic_current_effective_12_avg")
+    @ApiModelProperty(value = "11.5次间谐波电流有效值平均值")
+    private Double simpleHarmonicCurrentEffective12Avg;
+
+    /**
+     * 11.5次间谐波电流有效值95值
+     */
+    @TableField(value = "simple_harmonic_current_effective_12_cp95")
+    @ApiModelProperty(value = "11.5次间谐波电流有效值95值")
+    private Double simpleHarmonicCurrentEffective12Cp95;
+
+    /**
+     * 12.5次间谐波电流有效值最大值
+     */
+    @TableField(value = "simple_harmonic_current_effective_13_max")
+    @ApiModelProperty(value = "12.5次间谐波电流有效值最大值")
+    private Double simpleHarmonicCurrentEffective13Max;
+
+    /**
+     * 12.5次间谐波电流有效值最小值
+     */
+    @TableField(value = "simple_harmonic_current_effective_13_min")
+    @ApiModelProperty(value = "12.5次间谐波电流有效值最小值")
+    private Double simpleHarmonicCurrentEffective13Min;
+
+    /**
+     * 12.5次间谐波电流有效值平均值
+     */
+    @TableField(value = "simple_harmonic_current_effective_13_avg")
+    @ApiModelProperty(value = "12.5次间谐波电流有效值平均值")
+    private Double simpleHarmonicCurrentEffective13Avg;
+
+    /**
+     * 12.5次间谐波电流有效值95值
+     */
+    @TableField(value = "simple_harmonic_current_effective_13_cp95")
+    @ApiModelProperty(value = "12.5次间谐波电流有效值95值")
+    private Double simpleHarmonicCurrentEffective13Cp95;
+
+    /**
+     * 13.5次间谐波电流有效值最大值
+     */
+    @TableField(value = "simple_harmonic_current_effective_14_max")
+    @ApiModelProperty(value = "13.5次间谐波电流有效值最大值")
+    private Double simpleHarmonicCurrentEffective14Max;
+
+    /**
+     * 13.5次间谐波电流有效值最小值
+     */
+    @TableField(value = "simple_harmonic_current_effective_14_min")
+    @ApiModelProperty(value = "13.5次间谐波电流有效值最小值")
+    private Double simpleHarmonicCurrentEffective14Min;
+
+    /**
+     * 13.5次间谐波电流有效值平均值
+     */
+    @TableField(value = "simple_harmonic_current_effective_14_avg")
+    @ApiModelProperty(value = "13.5次间谐波电流有效值平均值")
+    private Double simpleHarmonicCurrentEffective14Avg;
+
+    /**
+     * 13.5次间谐波电流有效值95值
+     */
+    @TableField(value = "simple_harmonic_current_effective_14_cp95")
+    @ApiModelProperty(value = "13.5次间谐波电流有效值95值")
+    private Double simpleHarmonicCurrentEffective14Cp95;
+
+    /**
+     * 14.5次间谐波电流有效值最大值
+     */
+    @TableField(value = "simple_harmonic_current_effective_15_max")
+    @ApiModelProperty(value = "14.5次间谐波电流有效值最大值")
+    private Double simpleHarmonicCurrentEffective15Max;
+
+    /**
+     * 14.5次间谐波电流有效值最小值
+     */
+    @TableField(value = "simple_harmonic_current_effective_15_min")
+    @ApiModelProperty(value = "14.5次间谐波电流有效值最小值")
+    private Double simpleHarmonicCurrentEffective15Min;
+
+    /**
+     * 14.5次间谐波电流有效值平均值
+     */
+    @TableField(value = "simple_harmonic_current_effective_15_avg")
+    @ApiModelProperty(value = "14.5次间谐波电流有效值平均值")
+    private Double simpleHarmonicCurrentEffective15Avg;
+
+    /**
+     * 14.5次间谐波电流有效值95值
+     */
+    @TableField(value = "simple_harmonic_current_effective_15_cp95")
+    @ApiModelProperty(value = "14.5次间谐波电流有效值95值")
+    private Double simpleHarmonicCurrentEffective15Cp95;
+
+    /**
+     * 15.5次间谐波电流有效值最大值
+     */
+    @TableField(value = "simple_harmonic_current_effective_16_max")
+    @ApiModelProperty(value = "15.5次间谐波电流有效值最大值")
+    private Double simpleHarmonicCurrentEffective16Max;
+
+    /**
+     * 15.5次间谐波电流有效值最小值
+     */
+    @TableField(value = "simple_harmonic_current_effective_16_min")
+    @ApiModelProperty(value = "15.5次间谐波电流有效值最小值")
+    private Double simpleHarmonicCurrentEffective16Min;
+
+    /**
+     * 15.5次间谐波电流有效值平均值
+     */
+    @TableField(value = "simple_harmonic_current_effective_16_avg")
+    @ApiModelProperty(value = "15.5次间谐波电流有效值平均值")
+    private Double simpleHarmonicCurrentEffective16Avg;
+
+    /**
+     * 15.5次间谐波电流有效值95值
+     */
+    @TableField(value = "simple_harmonic_current_effective_16_cp95")
+    @ApiModelProperty(value = "15.5次间谐波电流有效值95值")
+    private Double simpleHarmonicCurrentEffective16Cp95;
+
+    /**
+     * 16.5次间谐波电流有效值最大值
+     */
+    @TableField(value = "simple_harmonic_current_effective_17_max")
+    @ApiModelProperty(value = "16.5次间谐波电流有效值最大值")
+    private Double simpleHarmonicCurrentEffective17Max;
+
+    /**
+     * 16.5次间谐波电流有效值最小值
+     */
+    @TableField(value = "simple_harmonic_current_effective_17_min")
+    @ApiModelProperty(value = "16.5次间谐波电流有效值最小值")
+    private Double simpleHarmonicCurrentEffective17Min;
+
+    /**
+     * 16.5次间谐波电流有效值平均值
+     */
+    @TableField(value = "simple_harmonic_current_effective_17_avg")
+    @ApiModelProperty(value = "16.5次间谐波电流有效值平均值")
+    private Double simpleHarmonicCurrentEffective17Avg;
+
+    /**
+     * 16.5次间谐波电流有效值95值
+     */
+    @TableField(value = "simple_harmonic_current_effective_17_cp95")
+    @ApiModelProperty(value = "16.5次间谐波电流有效值95值")
+    private Double simpleHarmonicCurrentEffective17Cp95;
+
+    /**
+     * 17.5次间谐波电流有效值最大值
+     */
+    @TableField(value = "simple_harmonic_current_effective_18_max")
+    @ApiModelProperty(value = "17.5次间谐波电流有效值最大值")
+    private Double simpleHarmonicCurrentEffective18Max;
+
+    /**
+     * 17.5次间谐波电流有效值最小值
+     */
+    @TableField(value = "simple_harmonic_current_effective_18_min")
+    @ApiModelProperty(value = "17.5次间谐波电流有效值最小值")
+    private Double simpleHarmonicCurrentEffective18Min;
+
+    /**
+     * 17.5次间谐波电流有效值平均值
+     */
+    @TableField(value = "simple_harmonic_current_effective_18_avg")
+    @ApiModelProperty(value = "17.5次间谐波电流有效值平均值")
+    private Double simpleHarmonicCurrentEffective18Avg;
+
+    /**
+     * 17.5次间谐波电流有效值95值
+     */
+    @TableField(value = "simple_harmonic_current_effective_18_cp95")
+    @ApiModelProperty(value = "17.5次间谐波电流有效值95值")
+    private Double simpleHarmonicCurrentEffective18Cp95;
+
+    /**
+     * 18.5次间谐波电流有效值最大值
+     */
+    @TableField(value = "simple_harmonic_current_effective_19_max")
+    @ApiModelProperty(value = "18.5次间谐波电流有效值最大值")
+    private Double simpleHarmonicCurrentEffective19Max;
+
+    /**
+     * 18.5次间谐波电流有效值最小值
+     */
+    @TableField(value = "simple_harmonic_current_effective_19_min")
+    @ApiModelProperty(value = "18.5次间谐波电流有效值最小值")
+    private Double simpleHarmonicCurrentEffective19Min;
+
+    /**
+     * 18.5次间谐波电流有效值平均值
+     */
+    @TableField(value = "simple_harmonic_current_effective_19_avg")
+    @ApiModelProperty(value = "18.5次间谐波电流有效值平均值")
+    private Double simpleHarmonicCurrentEffective19Avg;
+
+    /**
+     * 18.5次间谐波电流有效值95值
+     */
+    @TableField(value = "simple_harmonic_current_effective_19_cp95")
+    @ApiModelProperty(value = "18.5次间谐波电流有效值95值")
+    private Double simpleHarmonicCurrentEffective19Cp95;
+
+    /**
+     * 19.5次间谐波电流有效值最大值
+     */
+    @TableField(value = "simple_harmonic_current_effective_20_max")
+    @ApiModelProperty(value = "19.5次间谐波电流有效值最大值")
+    private Double simpleHarmonicCurrentEffective20Max;
+
+    /**
+     * 19.5次间谐波电流有效值最小值
+     */
+    @TableField(value = "simple_harmonic_current_effective_20_min")
+    @ApiModelProperty(value = "19.5次间谐波电流有效值最小值")
+    private Double simpleHarmonicCurrentEffective20Min;
+
+    /**
+     * 19.5次间谐波电流有效值平均值
+     */
+    @TableField(value = "simple_harmonic_current_effective_20_avg")
+    @ApiModelProperty(value = "19.5次间谐波电流有效值平均值")
+    private Double simpleHarmonicCurrentEffective20Avg;
+
+    /**
+     * 19.5次间谐波电流有效值95值
+     */
+    @TableField(value = "simple_harmonic_current_effective_20_cp95")
+    @ApiModelProperty(value = "19.5次间谐波电流有效值95值")
+    private Double simpleHarmonicCurrentEffective20Cp95;
+
+    /**
+     * 20.5次间谐波电流有效值最大值
+     */
+    @TableField(value = "simple_harmonic_current_effective_21_max")
+    @ApiModelProperty(value = "20.5次间谐波电流有效值最大值")
+    private Double simpleHarmonicCurrentEffective21Max;
+
+    /**
+     * 20.5次间谐波电流有效值最小值
+     */
+    @TableField(value = "simple_harmonic_current_effective_21_min")
+    @ApiModelProperty(value = "20.5次间谐波电流有效值最小值")
+    private Double simpleHarmonicCurrentEffective21Min;
+
+    /**
+     * 20.5次间谐波电流有效值平均值
+     */
+    @TableField(value = "simple_harmonic_current_effective_21_avg")
+    @ApiModelProperty(value = "20.5次间谐波电流有效值平均值")
+    private Double simpleHarmonicCurrentEffective21Avg;
+
+    /**
+     * 20.5次间谐波电流有效值95值
+     */
+    @TableField(value = "simple_harmonic_current_effective_21_cp95")
+    @ApiModelProperty(value = "20.5次间谐波电流有效值95值")
+    private Double simpleHarmonicCurrentEffective21Cp95;
+
+    /**
+     * 21.5次间谐波电流有效值最大值
+     */
+    @TableField(value = "simple_harmonic_current_effective_22_max")
+    @ApiModelProperty(value = "21.5次间谐波电流有效值最大值")
+    private Double simpleHarmonicCurrentEffective22Max;
+
+    /**
+     * 21.5次间谐波电流有效值最小值
+     */
+    @TableField(value = "simple_harmonic_current_effective_22_min")
+    @ApiModelProperty(value = "21.5次间谐波电流有效值最小值")
+    private Double simpleHarmonicCurrentEffective22Min;
+
+    /**
+     * 21.5次间谐波电流有效值平均值
+     */
+    @TableField(value = "simple_harmonic_current_effective_22_avg")
+    @ApiModelProperty(value = "21.5次间谐波电流有效值平均值")
+    private Double simpleHarmonicCurrentEffective22Avg;
+
+    /**
+     * 21.5次间谐波电流有效值95值
+     */
+    @TableField(value = "simple_harmonic_current_effective_22_cp95")
+    @ApiModelProperty(value = "21.5次间谐波电流有效值95值")
+    private Double simpleHarmonicCurrentEffective22Cp95;
+
+    /**
+     * 22.5次间谐波电流有效值最大值
+     */
+    @TableField(value = "simple_harmonic_current_effective_23_max")
+    @ApiModelProperty(value = "22.5次间谐波电流有效值最大值")
+    private Double simpleHarmonicCurrentEffective23Max;
+
+    /**
+     * 22.5次间谐波电流有效值最小值
+     */
+    @TableField(value = "simple_harmonic_current_effective_23_min")
+    @ApiModelProperty(value = "22.5次间谐波电流有效值最小值")
+    private Double simpleHarmonicCurrentEffective23Min;
+
+    /**
+     * 22.5次间谐波电流有效值平均值
+     */
+    @TableField(value = "simple_harmonic_current_effective_23_avg")
+    @ApiModelProperty(value = "22.5次间谐波电流有效值平均值")
+    private Double simpleHarmonicCurrentEffective23Avg;
+
+    /**
+     * 22.5次间谐波电流有效值95值
+     */
+    @TableField(value = "simple_harmonic_current_effective_23_cp95")
+    @ApiModelProperty(value = "22.5次间谐波电流有效值95值")
+    private Double simpleHarmonicCurrentEffective23Cp95;
+
+    /**
+     * 23.5次间谐波电流有效值最大值
+     */
+    @TableField(value = "simple_harmonic_current_effective_24_max")
+    @ApiModelProperty(value = "23.5次间谐波电流有效值最大值")
+    private Double simpleHarmonicCurrentEffective24Max;
+
+    /**
+     * 23.5次间谐波电流有效值最小值
+     */
+    @TableField(value = "simple_harmonic_current_effective_24_min")
+    @ApiModelProperty(value = "23.5次间谐波电流有效值最小值")
+    private Double simpleHarmonicCurrentEffective24Min;
+
+    /**
+     * 23.5次间谐波电流有效值平均值
+     */
+    @TableField(value = "simple_harmonic_current_effective_24_avg")
+    @ApiModelProperty(value = "23.5次间谐波电流有效值平均值")
+    private Double simpleHarmonicCurrentEffective24Avg;
+
+    /**
+     * 23.5次间谐波电流有效值95值
+     */
+    @TableField(value = "simple_harmonic_current_effective_24_cp95")
+    @ApiModelProperty(value = "23.5次间谐波电流有效值95值")
+    private Double simpleHarmonicCurrentEffective24Cp95;
+
+    /**
+     * 24.5次间谐波电流有效值最大值
+     */
+    @TableField(value = "simple_harmonic_current_effective_25_max")
+    @ApiModelProperty(value = "24.5次间谐波电流有效值最大值")
+    private Double simpleHarmonicCurrentEffective25Max;
+
+    /**
+     * 24.5次间谐波电流有效值最小值
+     */
+    @TableField(value = "simple_harmonic_current_effective_25_min")
+    @ApiModelProperty(value = "24.5次间谐波电流有效值最小值")
+    private Double simpleHarmonicCurrentEffective25Min;
+
+    /**
+     * 24.5次间谐波电流有效值平均值
+     */
+    @TableField(value = "simple_harmonic_current_effective_25_avg")
+    @ApiModelProperty(value = "24.5次间谐波电流有效值平均值")
+    private Double simpleHarmonicCurrentEffective25Avg;
+
+    /**
+     * 24.5次间谐波电流有效值95值
+     */
+    @TableField(value = "simple_harmonic_current_effective_25_cp95")
+    @ApiModelProperty(value = "24.5次间谐波电流有效值95值")
+    private Double simpleHarmonicCurrentEffective25Cp95;
+
+    /**
+     * 25.5次间谐波电流有效值最大值
+     */
+    @TableField(value = "simple_harmonic_current_effective_26_max")
+    @ApiModelProperty(value = "25.5次间谐波电流有效值最大值")
+    private Double simpleHarmonicCurrentEffective26Max;
+
+    /**
+     * 25.5次间谐波电流有效值最小值
+     */
+    @TableField(value = "simple_harmonic_current_effective_26_min")
+    @ApiModelProperty(value = "25.5次间谐波电流有效值最小值")
+    private Double simpleHarmonicCurrentEffective26Min;
+
+    /**
+     * 25.5次间谐波电流有效值平均值
+     */
+    @TableField(value = "simple_harmonic_current_effective_26_avg")
+    @ApiModelProperty(value = "25.5次间谐波电流有效值平均值")
+    private Double simpleHarmonicCurrentEffective26Avg;
+
+    /**
+     * 25.5次间谐波电流有效值95值
+     */
+    @TableField(value = "simple_harmonic_current_effective_26_cp95")
+    @ApiModelProperty(value = "25.5次间谐波电流有效值95值")
+    private Double simpleHarmonicCurrentEffective26Cp95;
+
+    /**
+     * 26.5次间谐波电流有效值最大值
+     */
+    @TableField(value = "simple_harmonic_current_effective_27_max")
+    @ApiModelProperty(value = "26.5次间谐波电流有效值最大值")
+    private Double simpleHarmonicCurrentEffective27Max;
+
+    /**
+     * 26.5次间谐波电流有效值最小值
+     */
+    @TableField(value = "simple_harmonic_current_effective_27_min")
+    @ApiModelProperty(value = "26.5次间谐波电流有效值最小值")
+    private Double simpleHarmonicCurrentEffective27Min;
+
+    /**
+     * 26.5次间谐波电流有效值平均值
+     */
+    @TableField(value = "simple_harmonic_current_effective_27_avg")
+    @ApiModelProperty(value = "26.5次间谐波电流有效值平均值")
+    private Double simpleHarmonicCurrentEffective27Avg;
+
+    /**
+     * 26.5次间谐波电流有效值95值
+     */
+    @TableField(value = "simple_harmonic_current_effective_27_cp95")
+    @ApiModelProperty(value = "26.5次间谐波电流有效值95值")
+    private Double simpleHarmonicCurrentEffective27Cp95;
+
+    /**
+     * 27.5次间谐波电流有效值最大值
+     */
+    @TableField(value = "simple_harmonic_current_effective_28_max")
+    @ApiModelProperty(value = "27.5次间谐波电流有效值最大值")
+    private Double simpleHarmonicCurrentEffective28Max;
+
+    /**
+     * 27.5次间谐波电流有效值最小值
+     */
+    @TableField(value = "simple_harmonic_current_effective_28_min")
+    @ApiModelProperty(value = "27.5次间谐波电流有效值最小值")
+    private Double simpleHarmonicCurrentEffective28Min;
+
+    /**
+     * 27.5次间谐波电流有效值平均值
+     */
+    @TableField(value = "simple_harmonic_current_effective_28_avg")
+    @ApiModelProperty(value = "27.5次间谐波电流有效值平均值")
+    private Double simpleHarmonicCurrentEffective28Avg;
+
+    /**
+     * 27.5次间谐波电流有效值95值
+     */
+    @TableField(value = "simple_harmonic_current_effective_28_cp95")
+    @ApiModelProperty(value = "27.5次间谐波电流有效值95值")
+    private Double simpleHarmonicCurrentEffective28Cp95;
+
+    /**
+     * 28.5次间谐波电流有效值最大值
+     */
+    @TableField(value = "simple_harmonic_current_effective_29_max")
+    @ApiModelProperty(value = "28.5次间谐波电流有效值最大值")
+    private Double simpleHarmonicCurrentEffective29Max;
+
+    /**
+     * 28.5次间谐波电流有效值最小值
+     */
+    @TableField(value = "simple_harmonic_current_effective_29_min")
+    @ApiModelProperty(value = "28.5次间谐波电流有效值最小值")
+    private Double simpleHarmonicCurrentEffective29Min;
+
+    /**
+     * 28.5次间谐波电流有效值平均值
+     */
+    @TableField(value = "simple_harmonic_current_effective_29_avg")
+    @ApiModelProperty(value = "28.5次间谐波电流有效值平均值")
+    private Double simpleHarmonicCurrentEffective29Avg;
+
+    /**
+     * 28.5次间谐波电流有效值95值
+     */
+    @TableField(value = "simple_harmonic_current_effective_29_cp95")
+    @ApiModelProperty(value = "28.5次间谐波电流有效值95值")
+    private Double simpleHarmonicCurrentEffective29Cp95;
+
+    /**
+     * 29.5次间谐波电流有效值最大值
+     */
+    @TableField(value = "simple_harmonic_current_effective_30_max")
+    @ApiModelProperty(value = "29.5次间谐波电流有效值最大值")
+    private Double simpleHarmonicCurrentEffective30Max;
+
+    /**
+     * 29.5次间谐波电流有效值最小值
+     */
+    @TableField(value = "simple_harmonic_current_effective_30_min")
+    @ApiModelProperty(value = "29.5次间谐波电流有效值最小值")
+    private Double simpleHarmonicCurrentEffective30Min;
+
+    /**
+     * 29.5次间谐波电流有效值平均值
+     */
+    @TableField(value = "simple_harmonic_current_effective_30_avg")
+    @ApiModelProperty(value = "29.5次间谐波电流有效值平均值")
+    private Double simpleHarmonicCurrentEffective30Avg;
+
+    /**
+     * 29.5次间谐波电流有效值95值
+     */
+    @TableField(value = "simple_harmonic_current_effective_30_cp95")
+    @ApiModelProperty(value = "29.5次间谐波电流有效值95值")
+    private Double simpleHarmonicCurrentEffective30Cp95;
+
+    /**
+     * 30.5次间谐波电流有效值最大值
+     */
+    @TableField(value = "simple_harmonic_current_effective_31_max")
+    @ApiModelProperty(value = "30.5次间谐波电流有效值最大值")
+    private Double simpleHarmonicCurrentEffective31Max;
+
+    /**
+     * 30.5次间谐波电流有效值最小值
+     */
+    @TableField(value = "simple_harmonic_current_effective_31_min")
+    @ApiModelProperty(value = "30.5次间谐波电流有效值最小值")
+    private Double simpleHarmonicCurrentEffective31Min;
+
+    /**
+     * 30.5次间谐波电流有效值平均值
+     */
+    @TableField(value = "simple_harmonic_current_effective_31_avg")
+    @ApiModelProperty(value = "30.5次间谐波电流有效值平均值")
+    private Double simpleHarmonicCurrentEffective31Avg;
+
+    /**
+     * 30.5次间谐波电流有效值95值
+     */
+    @TableField(value = "simple_harmonic_current_effective_31_cp95")
+    @ApiModelProperty(value = "30.5次间谐波电流有效值95值")
+    private Double simpleHarmonicCurrentEffective31Cp95;
+
+    /**
+     * 31.5次间谐波电流有效值最大值
+     */
+    @TableField(value = "simple_harmonic_current_effective_32_max")
+    @ApiModelProperty(value = "31.5次间谐波电流有效值最大值")
+    private Double simpleHarmonicCurrentEffective32Max;
+
+    /**
+     * 31.5次间谐波电流有效值最小值
+     */
+    @TableField(value = "simple_harmonic_current_effective_32_min")
+    @ApiModelProperty(value = "31.5次间谐波电流有效值最小值")
+    private Double simpleHarmonicCurrentEffective32Min;
+
+    /**
+     * 31.5次间谐波电流有效值平均值
+     */
+    @TableField(value = "simple_harmonic_current_effective_32_avg")
+    @ApiModelProperty(value = "31.5次间谐波电流有效值平均值")
+    private Double simpleHarmonicCurrentEffective32Avg;
+
+    /**
+     * 31.5次间谐波电流有效值95值
+     */
+    @TableField(value = "simple_harmonic_current_effective_32_cp95")
+    @ApiModelProperty(value = "31.5次间谐波电流有效值95值")
+    private Double simpleHarmonicCurrentEffective32Cp95;
+
+    /**
+     * 32.5次间谐波电流有效值最大值
+     */
+    @TableField(value = "simple_harmonic_current_effective_33_max")
+    @ApiModelProperty(value = "32.5次间谐波电流有效值最大值")
+    private Double simpleHarmonicCurrentEffective33Max;
+
+    /**
+     * 32.5次间谐波电流有效值最小值
+     */
+    @TableField(value = "simple_harmonic_current_effective_33_min")
+    @ApiModelProperty(value = "32.5次间谐波电流有效值最小值")
+    private Double simpleHarmonicCurrentEffective33Min;
+
+    /**
+     * 32.5次间谐波电流有效值平均值
+     */
+    @TableField(value = "simple_harmonic_current_effective_33_avg")
+    @ApiModelProperty(value = "32.5次间谐波电流有效值平均值")
+    private Double simpleHarmonicCurrentEffective33Avg;
+
+    /**
+     * 32.5次间谐波电流有效值95值
+     */
+    @TableField(value = "simple_harmonic_current_effective_33_cp95")
+    @ApiModelProperty(value = "32.5次间谐波电流有效值95值")
+    private Double simpleHarmonicCurrentEffective33Cp95;
+
+    /**
+     * 33.5次间谐波电流有效值最大值
+     */
+    @TableField(value = "simple_harmonic_current_effective_34_max")
+    @ApiModelProperty(value = "33.5次间谐波电流有效值最大值")
+    private Double simpleHarmonicCurrentEffective34Max;
+
+    /**
+     * 33.5次间谐波电流有效值最小值
+     */
+    @TableField(value = "simple_harmonic_current_effective_34_min")
+    @ApiModelProperty(value = "33.5次间谐波电流有效值最小值")
+    private Double simpleHarmonicCurrentEffective34Min;
+
+    /**
+     * 33.5次间谐波电流有效值平均值
+     */
+    @TableField(value = "simple_harmonic_current_effective_34_avg")
+    @ApiModelProperty(value = "33.5次间谐波电流有效值平均值")
+    private Double simpleHarmonicCurrentEffective34Avg;
+
+    /**
+     * 33.5次间谐波电流有效值95值
+     */
+    @TableField(value = "simple_harmonic_current_effective_34_cp95")
+    @ApiModelProperty(value = "33.5次间谐波电流有效值95值")
+    private Double simpleHarmonicCurrentEffective34Cp95;
+
+    /**
+     * 34.5次间谐波电流有效值最大值
+     */
+    @TableField(value = "simple_harmonic_current_effective_35_max")
+    @ApiModelProperty(value = "34.5次间谐波电流有效值最大值")
+    private Double simpleHarmonicCurrentEffective35Max;
+
+    /**
+     * 34.5次间谐波电流有效值最小值
+     */
+    @TableField(value = "simple_harmonic_current_effective_35_min")
+    @ApiModelProperty(value = "34.5次间谐波电流有效值最小值")
+    private Double simpleHarmonicCurrentEffective35Min;
+
+    /**
+     * 34.5次间谐波电流有效值平均值
+     */
+    @TableField(value = "simple_harmonic_current_effective_35_avg")
+    @ApiModelProperty(value = "34.5次间谐波电流有效值平均值")
+    private Double simpleHarmonicCurrentEffective35Avg;
+
+    /**
+     * 34.5次间谐波电流有效值95值
+     */
+    @TableField(value = "simple_harmonic_current_effective_35_cp95")
+    @ApiModelProperty(value = "34.5次间谐波电流有效值95值")
+    private Double simpleHarmonicCurrentEffective35Cp95;
+
+    /**
+     * 35.5次间谐波电流有效值最大值
+     */
+    @TableField(value = "simple_harmonic_current_effective_36_max")
+    @ApiModelProperty(value = "35.5次间谐波电流有效值最大值")
+    private Double simpleHarmonicCurrentEffective36Max;
+
+    /**
+     * 35.5次间谐波电流有效值最小值
+     */
+    @TableField(value = "simple_harmonic_current_effective_36_min")
+    @ApiModelProperty(value = "35.5次间谐波电流有效值最小值")
+    private Double simpleHarmonicCurrentEffective36Min;
+
+    /**
+     * 35.5次间谐波电流有效值平均值
+     */
+    @TableField(value = "simple_harmonic_current_effective_36_avg")
+    @ApiModelProperty(value = "35.5次间谐波电流有效值平均值")
+    private Double simpleHarmonicCurrentEffective36Avg;
+
+    /**
+     * 35.5次间谐波电流有效值95值
+     */
+    @TableField(value = "simple_harmonic_current_effective_36_cp95")
+    @ApiModelProperty(value = "35.5次间谐波电流有效值95值")
+    private Double simpleHarmonicCurrentEffective36Cp95;
+
+    /**
+     * 36.5次间谐波电流有效值最大值
+     */
+    @TableField(value = "simple_harmonic_current_effective_37_max")
+    @ApiModelProperty(value = "36.5次间谐波电流有效值最大值")
+    private Double simpleHarmonicCurrentEffective37Max;
+
+    /**
+     * 36.5次间谐波电流有效值最小值
+     */
+    @TableField(value = "simple_harmonic_current_effective_37_min")
+    @ApiModelProperty(value = "36.5次间谐波电流有效值最小值")
+    private Double simpleHarmonicCurrentEffective37Min;
+
+    /**
+     * 36.5次间谐波电流有效值平均值
+     */
+    @TableField(value = "simple_harmonic_current_effective_37_avg")
+    @ApiModelProperty(value = "36.5次间谐波电流有效值平均值")
+    private Double simpleHarmonicCurrentEffective37Avg;
+
+    /**
+     * 36.5次间谐波电流有效值95值
+     */
+    @TableField(value = "simple_harmonic_current_effective_37_cp95")
+    @ApiModelProperty(value = "36.5次间谐波电流有效值95值")
+    private Double simpleHarmonicCurrentEffective37Cp95;
+
+    /**
+     * 37.5次间谐波电流有效值最大值
+     */
+    @TableField(value = "simple_harmonic_current_effective_38_max")
+    @ApiModelProperty(value = "37.5次间谐波电流有效值最大值")
+    private Double simpleHarmonicCurrentEffective38Max;
+
+    /**
+     * 37.5次间谐波电流有效值最小值
+     */
+    @TableField(value = "simple_harmonic_current_effective_38_min")
+    @ApiModelProperty(value = "37.5次间谐波电流有效值最小值")
+    private Double simpleHarmonicCurrentEffective38Min;
+
+    /**
+     * 37.5次间谐波电流有效值平均值
+     */
+    @TableField(value = "simple_harmonic_current_effective_38_avg")
+    @ApiModelProperty(value = "37.5次间谐波电流有效值平均值")
+    private Double simpleHarmonicCurrentEffective38Avg;
+
+    /**
+     * 37.5次间谐波电流有效值95值
+     */
+    @TableField(value = "simple_harmonic_current_effective_38_cp95")
+    @ApiModelProperty(value = "37.5次间谐波电流有效值95值")
+    private Double simpleHarmonicCurrentEffective38Cp95;
+
+    /**
+     * 38.5次间谐波电流有效值最大值
+     */
+    @TableField(value = "simple_harmonic_current_effective_39_max")
+    @ApiModelProperty(value = "38.5次间谐波电流有效值最大值")
+    private Double simpleHarmonicCurrentEffective39Max;
+
+    /**
+     * 38.5次间谐波电流有效值最小值
+     */
+    @TableField(value = "simple_harmonic_current_effective_39_min")
+    @ApiModelProperty(value = "38.5次间谐波电流有效值最小值")
+    private Double simpleHarmonicCurrentEffective39Min;
+
+    /**
+     * 38.5次间谐波电流有效值平均值
+     */
+    @TableField(value = "simple_harmonic_current_effective_39_avg")
+    @ApiModelProperty(value = "38.5次间谐波电流有效值平均值")
+    private Double simpleHarmonicCurrentEffective39Avg;
+
+    /**
+     * 38.5次间谐波电流有效值95值
+     */
+    @TableField(value = "simple_harmonic_current_effective_39_cp95")
+    @ApiModelProperty(value = "38.5次间谐波电流有效值95值")
+    private Double simpleHarmonicCurrentEffective39Cp95;
+
+    /**
+     * 39.5次间谐波电流有效值最大值
+     */
+    @TableField(value = "simple_harmonic_current_effective_40_max")
+    @ApiModelProperty(value = "39.5次间谐波电流有效值最大值")
+    private Double simpleHarmonicCurrentEffective40Max;
+
+    /**
+     * 39.5次间谐波电流有效值最小值
+     */
+    @TableField(value = "simple_harmonic_current_effective_40_min")
+    @ApiModelProperty(value = "39.5次间谐波电流有效值最小值")
+    private Double simpleHarmonicCurrentEffective40Min;
+
+    /**
+     * 39.5次间谐波电流有效值平均值
+     */
+    @TableField(value = "simple_harmonic_current_effective_40_avg")
+    @ApiModelProperty(value = "39.5次间谐波电流有效值平均值")
+    private Double simpleHarmonicCurrentEffective40Avg;
+
+    /**
+     * 39.5次间谐波电流有效值95值
+     */
+    @TableField(value = "simple_harmonic_current_effective_40_cp95")
+    @ApiModelProperty(value = "39.5次间谐波电流有效值95值")
+    private Double simpleHarmonicCurrentEffective40Cp95;
+
+    /**
+     * 40.5次间谐波电流有效值最大值
+     */
+    @TableField(value = "simple_harmonic_current_effective_41_max")
+    @ApiModelProperty(value = "40.5次间谐波电流有效值最大值")
+    private Double simpleHarmonicCurrentEffective41Max;
+
+    /**
+     * 40.5次间谐波电流有效值最小值
+     */
+    @TableField(value = "simple_harmonic_current_effective_41_min")
+    @ApiModelProperty(value = "40.5次间谐波电流有效值最小值")
+    private Double simpleHarmonicCurrentEffective41Min;
+
+    /**
+     * 40.5次间谐波电流有效值平均值
+     */
+    @TableField(value = "simple_harmonic_current_effective_41_avg")
+    @ApiModelProperty(value = "40.5次间谐波电流有效值平均值")
+    private Double simpleHarmonicCurrentEffective41Avg;
+
+    /**
+     * 40.5次间谐波电流有效值95值
+     */
+    @TableField(value = "simple_harmonic_current_effective_41_cp95")
+    @ApiModelProperty(value = "40.5次间谐波电流有效值95值")
+    private Double simpleHarmonicCurrentEffective41Cp95;
+
+    /**
+     * 41.5次间谐波电流有效值最大值
+     */
+    @TableField(value = "simple_harmonic_current_effective_42_max")
+    @ApiModelProperty(value = "41.5次间谐波电流有效值最大值")
+    private Double simpleHarmonicCurrentEffective42Max;
+
+    /**
+     * 41.5次间谐波电流有效值最小值
+     */
+    @TableField(value = "simple_harmonic_current_effective_42_min")
+    @ApiModelProperty(value = "41.5次间谐波电流有效值最小值")
+    private Double simpleHarmonicCurrentEffective42Min;
+
+    /**
+     * 41.5次间谐波电流有效值平均值
+     */
+    @TableField(value = "simple_harmonic_current_effective_42_avg")
+    @ApiModelProperty(value = "41.5次间谐波电流有效值平均值")
+    private Double simpleHarmonicCurrentEffective42Avg;
+
+    /**
+     * 41.5次间谐波电流有效值95值
+     */
+    @TableField(value = "simple_harmonic_current_effective_42_cp95")
+    @ApiModelProperty(value = "41.5次间谐波电流有效值95值")
+    private Double simpleHarmonicCurrentEffective42Cp95;
+
+    /**
+     * 42.5次间谐波电流有效值最大值
+     */
+    @TableField(value = "simple_harmonic_current_effective_43_max")
+    @ApiModelProperty(value = "42.5次间谐波电流有效值最大值")
+    private Double simpleHarmonicCurrentEffective43Max;
+
+    /**
+     * 42.5次间谐波电流有效值最小值
+     */
+    @TableField(value = "simple_harmonic_current_effective_43_min")
+    @ApiModelProperty(value = "42.5次间谐波电流有效值最小值")
+    private Double simpleHarmonicCurrentEffective43Min;
+
+    /**
+     * 42.5次间谐波电流有效值平均值
+     */
+    @TableField(value = "simple_harmonic_current_effective_43_avg")
+    @ApiModelProperty(value = "42.5次间谐波电流有效值平均值")
+    private Double simpleHarmonicCurrentEffective43Avg;
+
+    /**
+     * 42.5次间谐波电流有效值95值
+     */
+    @TableField(value = "simple_harmonic_current_effective_43_cp95")
+    @ApiModelProperty(value = "42.5次间谐波电流有效值95值")
+    private Double simpleHarmonicCurrentEffective43Cp95;
+
+    /**
+     * 43.5次间谐波电流有效值最大值
+     */
+    @TableField(value = "simple_harmonic_current_effective_44_max")
+    @ApiModelProperty(value = "43.5次间谐波电流有效值最大值")
+    private Double simpleHarmonicCurrentEffective44Max;
+
+    /**
+     * 43.5次间谐波电流有效值最小值
+     */
+    @TableField(value = "simple_harmonic_current_effective_44_min")
+    @ApiModelProperty(value = "43.5次间谐波电流有效值最小值")
+    private Double simpleHarmonicCurrentEffective44Min;
+
+    /**
+     * 43.5次间谐波电流有效值平均值
+     */
+    @TableField(value = "simple_harmonic_current_effective_44_avg")
+    @ApiModelProperty(value = "43.5次间谐波电流有效值平均值")
+    private Double simpleHarmonicCurrentEffective44Avg;
+
+    /**
+     * 43.5次间谐波电流有效值95值
+     */
+    @TableField(value = "simple_harmonic_current_effective_44_cp95")
+    @ApiModelProperty(value = "43.5次间谐波电流有效值95值")
+    private Double simpleHarmonicCurrentEffective44Cp95;
+
+    /**
+     * 44.5次间谐波电流有效值最大值
+     */
+    @TableField(value = "simple_harmonic_current_effective_45_max")
+    @ApiModelProperty(value = "44.5次间谐波电流有效值最大值")
+    private Double simpleHarmonicCurrentEffective45Max;
+
+    /**
+     * 44.5次间谐波电流有效值最小值
+     */
+    @TableField(value = "simple_harmonic_current_effective_45_min")
+    @ApiModelProperty(value = "44.5次间谐波电流有效值最小值")
+    private Double simpleHarmonicCurrentEffective45Min;
+
+    /**
+     * 44.5次间谐波电流有效值平均值
+     */
+    @TableField(value = "simple_harmonic_current_effective_45_avg")
+    @ApiModelProperty(value = "44.5次间谐波电流有效值平均值")
+    private Double simpleHarmonicCurrentEffective45Avg;
+
+    /**
+     * 44.5次间谐波电流有效值95值
+     */
+    @TableField(value = "simple_harmonic_current_effective_45_cp95")
+    @ApiModelProperty(value = "44.5次间谐波电流有效值95值")
+    private Double simpleHarmonicCurrentEffective45Cp95;
+
+    /**
+     * 45.5次间谐波电流有效值最大值
+     */
+    @TableField(value = "simple_harmonic_current_effective_46_max")
+    @ApiModelProperty(value = "45.5次间谐波电流有效值最大值")
+    private Double simpleHarmonicCurrentEffective46Max;
+
+    /**
+     * 45.5次间谐波电流有效值最小值
+     */
+    @TableField(value = "simple_harmonic_current_effective_46_min")
+    @ApiModelProperty(value = "45.5次间谐波电流有效值最小值")
+    private Double simpleHarmonicCurrentEffective46Min;
+
+    /**
+     * 45.5次间谐波电流有效值平均值
+     */
+    @TableField(value = "simple_harmonic_current_effective_46_avg")
+    @ApiModelProperty(value = "45.5次间谐波电流有效值平均值")
+    private Double simpleHarmonicCurrentEffective46Avg;
+
+    /**
+     * 45.5次间谐波电流有效值95值
+     */
+    @TableField(value = "simple_harmonic_current_effective_46_cp95")
+    @ApiModelProperty(value = "45.5次间谐波电流有效值95值")
+    private Double simpleHarmonicCurrentEffective46Cp95;
+
+    /**
+     * 46.5次间谐波电流有效值最大值
+     */
+    @TableField(value = "simple_harmonic_current_effective_47_max")
+    @ApiModelProperty(value = "46.5次间谐波电流有效值最大值")
+    private Double simpleHarmonicCurrentEffective47Max;
+
+    /**
+     * 46.5次间谐波电流有效值最小值
+     */
+    @TableField(value = "simple_harmonic_current_effective_47_min")
+    @ApiModelProperty(value = "46.5次间谐波电流有效值最小值")
+    private Double simpleHarmonicCurrentEffective47Min;
+
+    /**
+     * 46.5次间谐波电流有效值平均值
+     */
+    @TableField(value = "simple_harmonic_current_effective_47_avg")
+    @ApiModelProperty(value = "46.5次间谐波电流有效值平均值")
+    private Double simpleHarmonicCurrentEffective47Avg;
+
+    /**
+     * 46.5次间谐波电流有效值95值
+     */
+    @TableField(value = "simple_harmonic_current_effective_47_cp95")
+    @ApiModelProperty(value = "46.5次间谐波电流有效值95值")
+    private Double simpleHarmonicCurrentEffective47Cp95;
+
+    /**
+     * 47.5次间谐波电流有效值最大值
+     */
+    @TableField(value = "simple_harmonic_current_effective_48_max")
+    @ApiModelProperty(value = "47.5次间谐波电流有效值最大值")
+    private Double simpleHarmonicCurrentEffective48Max;
+
+    /**
+     * 47.5次间谐波电流有效值最小值
+     */
+    @TableField(value = "simple_harmonic_current_effective_48_min")
+    @ApiModelProperty(value = "47.5次间谐波电流有效值最小值")
+    private Double simpleHarmonicCurrentEffective48Min;
+
+    /**
+     * 47.5次间谐波电流有效值平均值
+     */
+    @TableField(value = "simple_harmonic_current_effective_48_avg")
+    @ApiModelProperty(value = "47.5次间谐波电流有效值平均值")
+    private Double simpleHarmonicCurrentEffective48Avg;
+
+    /**
+     * 47.5次间谐波电流有效值95值
+     */
+    @TableField(value = "simple_harmonic_current_effective_48_cp95")
+    @ApiModelProperty(value = "47.5次间谐波电流有效值95值")
+    private Double simpleHarmonicCurrentEffective48Cp95;
+
+    /**
+     * 48.5次间谐波电流有效值最大值
+     */
+    @TableField(value = "simple_harmonic_current_effective_49_max")
+    @ApiModelProperty(value = "48.5次间谐波电流有效值最大值")
+    private Double simpleHarmonicCurrentEffective49Max;
+
+    /**
+     * 48.5次间谐波电流有效值最小值
+     */
+    @TableField(value = "simple_harmonic_current_effective_49_min")
+    @ApiModelProperty(value = "48.5次间谐波电流有效值最小值")
+    private Double simpleHarmonicCurrentEffective49Min;
+
+    /**
+     * 48.5次间谐波电流有效值平均值
+     */
+    @TableField(value = "simple_harmonic_current_effective_49_avg")
+    @ApiModelProperty(value = "48.5次间谐波电流有效值平均值")
+    private Double simpleHarmonicCurrentEffective49Avg;
+
+    /**
+     * 48.5次间谐波电流有效值95值
+     */
+    @TableField(value = "simple_harmonic_current_effective_49_cp95")
+    @ApiModelProperty(value = "48.5次间谐波电流有效值95值")
+    private Double simpleHarmonicCurrentEffective49Cp95;
+
+    /**
+     * 49.5次间谐波电流有效值最大值
+     */
+    @TableField(value = "simple_harmonic_current_effective_50_max")
+    @ApiModelProperty(value = "49.5次间谐波电流有效值最大值")
+    private Double simpleHarmonicCurrentEffective50Max;
+
+    /**
+     * 49.5次间谐波电流有效值最小值
+     */
+    @TableField(value = "simple_harmonic_current_effective_50_min")
+    @ApiModelProperty(value = "49.5次间谐波电流有效值最小值")
+    private Double simpleHarmonicCurrentEffective50Min;
+
+    /**
+     * 49.5次间谐波电流有效值平均值
+     */
+    @TableField(value = "simple_harmonic_current_effective_50_avg")
+    @ApiModelProperty(value = "49.5次间谐波电流有效值平均值")
+    private Double simpleHarmonicCurrentEffective50Avg;
+
+    /**
+     * 49.5次间谐波电流有效值95值
+     */
+    @TableField(value = "simple_harmonic_current_effective_50_cp95")
+    @ApiModelProperty(value = "49.5次间谐波电流有效值95值")
+    private Double simpleHarmonicCurrentEffective50Cp95;
+}
\ No newline at end of file
diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/pojo/po/line/RMpInharmonicIRateReportDPO.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/pojo/po/line/RMpInharmonicIRateReportDPO.java
new file mode 100644
index 000000000..8db505cda
--- /dev/null
+++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/pojo/po/line/RMpInharmonicIRateReportDPO.java
@@ -0,0 +1,1420 @@
+package com.njcn.prepare.harmonic.pojo.po.line;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.github.jeffreyning.mybatisplus.anno.MppMultiId;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 
+ * Description:
+ * 接口文档访问地址：http://serverIP:port/swagger-ui.html
+ * Date: 2022/10/26  19:36【需求编号】
+ *
+ * @author clam
+ * @version V1.0.0
+ */
+/**
+    * 稳态监测点指标日报-日表(主网表)  /各次间谐波电流含有率
+    */
+@ApiModel(value="com-njcn-prepare-harmonic-pojo-po-line-RMpInharmonicIRateReportDPO")
+@Data
+@TableName(value = "r_mp_inharmonic_i_rate_report_d")
+public class RMpInharmonicIRateReportDPO {
+    /**
+     * 监测点ID
+     */
+    @MppMultiId(value = "measurement_point_id")
+    @ApiModelProperty(value="监测点ID")
+    private String measurementPointId;
+
+    /**
+     * 生成数据的时间,每日统计一次
+     */
+    @MppMultiId(value = "data_date")
+    @ApiModelProperty(value="生成数据的时间,每日统计一次")
+    private Date dataDate;
+
+    /**
+     * 相别：‘A’ 'B' 'C' 'ABC' 'T'  配网部分相别的数据采用T标志存储
+     */
+    @MppMultiId(value = "phase")
+    @ApiModelProperty(value="相别：‘A’ 'B' 'C' 'ABC' 'T'  配网部分相别的数据采用T标志存储")
+    private String phase;
+
+    /**
+     * 2次间谐波电流含有率-最大值
+     */
+    @TableField(value = "inharm_i_2_max")
+    @ApiModelProperty(value="2次间谐波电流含有率-最大值")
+    private Double inharmI2Max;
+
+    /**
+     * 2次间谐波电流含有率-最小值
+     */
+    @TableField(value = "inharm_i_2_min")
+    @ApiModelProperty(value="2次间谐波电流含有率-最小值")
+    private Double inharmI2Min;
+
+    /**
+     * 2次间谐波电流含有率-平均值
+     */
+    @TableField(value = "inharm_i_2_avg")
+    @ApiModelProperty(value="2次间谐波电流含有率-平均值")
+    private Double inharmI2Avg;
+
+    /**
+     * 2次间谐波电流含有率-cp95值
+     */
+    @TableField(value = "inharm_i_2_cp95")
+    @ApiModelProperty(value="2次间谐波电流含有率-cp95值")
+    private Double inharmI2Cp95;
+
+    /**
+     * 3次间谐波电流含有率-最大值
+     */
+    @TableField(value = "inharm_i_3_max")
+    @ApiModelProperty(value="3次间谐波电流含有率-最大值")
+    private Double inharmI3Max;
+
+    /**
+     * 3次间谐波电流含有率-最小值
+     */
+    @TableField(value = "inharm_i_3_min")
+    @ApiModelProperty(value="3次间谐波电流含有率-最小值")
+    private Double inharmI3Min;
+
+    /**
+     * 3次间谐波电流含有率-平均值
+     */
+    @TableField(value = "inharm_i_3_avg")
+    @ApiModelProperty(value="3次间谐波电流含有率-平均值")
+    private Double inharmI3Avg;
+
+    /**
+     * 3次间谐波电流含有率-cp95值
+     */
+    @TableField(value = "inharm_i_3_cp95")
+    @ApiModelProperty(value="3次间谐波电流含有率-cp95值")
+    private Double inharmI3Cp95;
+
+    /**
+     * 4次间谐波电流含有率-最大值
+     */
+    @TableField(value = "inharm_i_4_max")
+    @ApiModelProperty(value="4次间谐波电流含有率-最大值")
+    private Double inharmI4Max;
+
+    /**
+     * 4次间谐波电流含有率-最小值
+     */
+    @TableField(value = "inharm_i_4_min")
+    @ApiModelProperty(value="4次间谐波电流含有率-最小值")
+    private Double inharmI4Min;
+
+    /**
+     * 4次间谐波电流含有率-平均值
+     */
+    @TableField(value = "inharm_i_4_avg")
+    @ApiModelProperty(value="4次间谐波电流含有率-平均值")
+    private Double inharmI4Avg;
+
+    /**
+     * 4次间谐波电流含有率-cp95值
+     */
+    @TableField(value = "inharm_i_4_cp95")
+    @ApiModelProperty(value="4次间谐波电流含有率-cp95值")
+    private Double inharmI4Cp95;
+
+    /**
+     * 5次间谐波电流含有率-最大值
+     */
+    @TableField(value = "inharm_i_5_max")
+    @ApiModelProperty(value="5次间谐波电流含有率-最大值")
+    private Double inharmI5Max;
+
+    /**
+     * 5次间谐波电流含有率-最小值
+     */
+    @TableField(value = "inharm_i_5_min")
+    @ApiModelProperty(value="5次间谐波电流含有率-最小值")
+    private Double inharmI5Min;
+
+    /**
+     * 5次间谐波电流含有率-平均值
+     */
+    @TableField(value = "inharm_i_5_avg")
+    @ApiModelProperty(value="5次间谐波电流含有率-平均值")
+    private Double inharmI5Avg;
+
+    /**
+     * 5次间谐波电流含有率-cp95值
+     */
+    @TableField(value = "inharm_i_5_cp95")
+    @ApiModelProperty(value="5次间谐波电流含有率-cp95值")
+    private Double inharmI5Cp95;
+
+    /**
+     * 6次间谐波电流含有率-最大值
+     */
+    @TableField(value = "inharm_i_6_max")
+    @ApiModelProperty(value="6次间谐波电流含有率-最大值")
+    private Double inharmI6Max;
+
+    /**
+     * 6次间谐波电流含有率-最小值
+     */
+    @TableField(value = "inharm_i_6_min")
+    @ApiModelProperty(value="6次间谐波电流含有率-最小值")
+    private Double inharmI6Min;
+
+    /**
+     * 6次间谐波电流含有率-平均值
+     */
+    @TableField(value = "inharm_i_6_avg")
+    @ApiModelProperty(value="6次间谐波电流含有率-平均值")
+    private Double inharmI6Avg;
+
+    /**
+     * 6次间谐波电流含有率-cp95值
+     */
+    @TableField(value = "inharm_i_6_cp95")
+    @ApiModelProperty(value="6次间谐波电流含有率-cp95值")
+    private Double inharmI6Cp95;
+
+    /**
+     * 7次间谐波电流含有率-最大值
+     */
+    @TableField(value = "inharm_i_7_max")
+    @ApiModelProperty(value="7次间谐波电流含有率-最大值")
+    private Double inharmI7Max;
+
+    /**
+     * 7次间谐波电流含有率-最小值
+     */
+    @TableField(value = "inharm_i_7_min")
+    @ApiModelProperty(value="7次间谐波电流含有率-最小值")
+    private Double inharmI7Min;
+
+    /**
+     * 7次间谐波电流含有率-平均值
+     */
+    @TableField(value = "inharm_i_7_avg")
+    @ApiModelProperty(value="7次间谐波电流含有率-平均值")
+    private Double inharmI7Avg;
+
+    /**
+     * 7次间谐波电流含有率-cp95值
+     */
+    @TableField(value = "inharm_i_7_cp95")
+    @ApiModelProperty(value="7次间谐波电流含有率-cp95值")
+    private Double inharmI7Cp95;
+
+    /**
+     * 8次间谐波电流含有率-最大值
+     */
+    @TableField(value = "inharm_i_8_max")
+    @ApiModelProperty(value="8次间谐波电流含有率-最大值")
+    private Double inharmI8Max;
+
+    /**
+     * 8次间谐波电流含有率-最小值
+     */
+    @TableField(value = "inharm_i_8_min")
+    @ApiModelProperty(value="8次间谐波电流含有率-最小值")
+    private Double inharmI8Min;
+
+    /**
+     * 8次间谐波电流含有率-平均值
+     */
+    @TableField(value = "inharm_i_8_avg")
+    @ApiModelProperty(value="8次间谐波电流含有率-平均值")
+    private Double inharmI8Avg;
+
+    /**
+     * 8次间谐波电流含有率-cp95值
+     */
+    @TableField(value = "inharm_i_8_cp95")
+    @ApiModelProperty(value="8次间谐波电流含有率-cp95值")
+    private Double inharmI8Cp95;
+
+    /**
+     * 9次间谐波电流含有率-最大值
+     */
+    @TableField(value = "inharm_i_9_max")
+    @ApiModelProperty(value="9次间谐波电流含有率-最大值")
+    private Double inharmI9Max;
+
+    /**
+     * 9次间谐波电流含有率-最小值
+     */
+    @TableField(value = "inharm_i_9_min")
+    @ApiModelProperty(value="9次间谐波电流含有率-最小值")
+    private Double inharmI9Min;
+
+    /**
+     * 9次间谐波电流含有率-平均值
+     */
+    @TableField(value = "inharm_i_9_avg")
+    @ApiModelProperty(value="9次间谐波电流含有率-平均值")
+    private Double inharmI9Avg;
+
+    /**
+     * 9次间谐波电流含有率-cp95值
+     */
+    @TableField(value = "inharm_i_9_cp95")
+    @ApiModelProperty(value="9次间谐波电流含有率-cp95值")
+    private Double inharmI9Cp95;
+
+    /**
+     * 10次间谐波电流含有率-最大值
+     */
+    @TableField(value = "inharm_i_10_max")
+    @ApiModelProperty(value="10次间谐波电流含有率-最大值")
+    private Double inharmI10Max;
+
+    /**
+     * 10次间谐波电流含有率-最小值
+     */
+    @TableField(value = "inharm_i_10_min")
+    @ApiModelProperty(value="10次间谐波电流含有率-最小值")
+    private Double inharmI10Min;
+
+    /**
+     * 10次间谐波电流含有率-平均值
+     */
+    @TableField(value = "inharm_i_10_avg")
+    @ApiModelProperty(value="10次间谐波电流含有率-平均值")
+    private Double inharmI10Avg;
+
+    /**
+     * 10次间谐波电流含有率-cp95值
+     */
+    @TableField(value = "inharm_i_10_cp95")
+    @ApiModelProperty(value="10次间谐波电流含有率-cp95值")
+    private Double inharmI10Cp95;
+
+    /**
+     * 11次间谐波电流含有率-最大值
+     */
+    @TableField(value = "inharm_i_11_max")
+    @ApiModelProperty(value="11次间谐波电流含有率-最大值")
+    private Double inharmI11Max;
+
+    /**
+     * 11次间谐波电流含有率-最小值
+     */
+    @TableField(value = "inharm_i_11_min")
+    @ApiModelProperty(value="11次间谐波电流含有率-最小值")
+    private Double inharmI11Min;
+
+    /**
+     * 11次间谐波电流含有率-平均值
+     */
+    @TableField(value = "inharm_i_11_avg")
+    @ApiModelProperty(value="11次间谐波电流含有率-平均值")
+    private Double inharmI11Avg;
+
+    /**
+     * 11次间谐波电流含有率-cp95值
+     */
+    @TableField(value = "inharm_i_11_cp95")
+    @ApiModelProperty(value="11次间谐波电流含有率-cp95值")
+    private Double inharmI11Cp95;
+
+    /**
+     * 12次间谐波电流含有率-最大值
+     */
+    @TableField(value = "inharm_i_12_max")
+    @ApiModelProperty(value="12次间谐波电流含有率-最大值")
+    private Double inharmI12Max;
+
+    /**
+     * 12次间谐波电流含有率-最小值
+     */
+    @TableField(value = "inharm_i_12_min")
+    @ApiModelProperty(value="12次间谐波电流含有率-最小值")
+    private Double inharmI12Min;
+
+    /**
+     * 12次间谐波电流含有率-平均值
+     */
+    @TableField(value = "inharm_i_12_avg")
+    @ApiModelProperty(value="12次间谐波电流含有率-平均值")
+    private Double inharmI12Avg;
+
+    /**
+     * 12次间谐波电流含有率-cp95值
+     */
+    @TableField(value = "inharm_i_12_cp95")
+    @ApiModelProperty(value="12次间谐波电流含有率-cp95值")
+    private Double inharmI12Cp95;
+
+    /**
+     * 13次间谐波电流含有率-最大值
+     */
+    @TableField(value = "inharm_i_13_max")
+    @ApiModelProperty(value="13次间谐波电流含有率-最大值")
+    private Double inharmI13Max;
+
+    /**
+     * 13次间谐波电流含有率-最小值
+     */
+    @TableField(value = "inharm_i_13_min")
+    @ApiModelProperty(value="13次间谐波电流含有率-最小值")
+    private Double inharmI13Min;
+
+    /**
+     * 13次间谐波电流含有率-平均值
+     */
+    @TableField(value = "inharm_i_13_avg")
+    @ApiModelProperty(value="13次间谐波电流含有率-平均值")
+    private Double inharmI13Avg;
+
+    /**
+     * 13次间谐波电流含有率-cp95值
+     */
+    @TableField(value = "inharm_i_13_cp95")
+    @ApiModelProperty(value="13次间谐波电流含有率-cp95值")
+    private Double inharmI13Cp95;
+
+    /**
+     * 14次间谐波电流含有率-最大值
+     */
+    @TableField(value = "inharm_i_14_max")
+    @ApiModelProperty(value="14次间谐波电流含有率-最大值")
+    private Double inharmI14Max;
+
+    /**
+     * 14次间谐波电流含有率-最小值
+     */
+    @TableField(value = "inharm_i_14_min")
+    @ApiModelProperty(value="14次间谐波电流含有率-最小值")
+    private Double inharmI14Min;
+
+    /**
+     * 14次间谐波电流含有率-平均值
+     */
+    @TableField(value = "inharm_i_14_avg")
+    @ApiModelProperty(value="14次间谐波电流含有率-平均值")
+    private Double inharmI14Avg;
+
+    /**
+     * 14次间谐波电流含有率-cp95值
+     */
+    @TableField(value = "inharm_i_14_cp95")
+    @ApiModelProperty(value="14次间谐波电流含有率-cp95值")
+    private Double inharmI14Cp95;
+
+    /**
+     * 15次间谐波电流含有率-最大值
+     */
+    @TableField(value = "inharm_i_15_max")
+    @ApiModelProperty(value="15次间谐波电流含有率-最大值")
+    private Double inharmI15Max;
+
+    /**
+     * 15次间谐波电流含有率-最小值
+     */
+    @TableField(value = "inharm_i_15_min")
+    @ApiModelProperty(value="15次间谐波电流含有率-最小值")
+    private Double inharmI15Min;
+
+    /**
+     * 15次间谐波电流含有率-平均值
+     */
+    @TableField(value = "inharm_i_15_avg")
+    @ApiModelProperty(value="15次间谐波电流含有率-平均值")
+    private Double inharmI15Avg;
+
+    /**
+     * 15次间谐波电流含有率-cp95值
+     */
+    @TableField(value = "inharm_i_15_cp95")
+    @ApiModelProperty(value="15次间谐波电流含有率-cp95值")
+    private Double inharmI15Cp95;
+
+    /**
+     * 16次间谐波电流含有率-最大值
+     */
+    @TableField(value = "inharm_i_16_max")
+    @ApiModelProperty(value="16次间谐波电流含有率-最大值")
+    private Double inharmI16Max;
+
+    /**
+     * 16次间谐波电流含有率-最小值
+     */
+    @TableField(value = "inharm_i_16_min")
+    @ApiModelProperty(value="16次间谐波电流含有率-最小值")
+    private Double inharmI16Min;
+
+    /**
+     * 16次间谐波电流含有率-平均值
+     */
+    @TableField(value = "inharm_i_16_avg")
+    @ApiModelProperty(value="16次间谐波电流含有率-平均值")
+    private Double inharmI16Avg;
+
+    /**
+     * 16次间谐波电流含有率-cp95值
+     */
+    @TableField(value = "inharm_i_16_cp95")
+    @ApiModelProperty(value="16次间谐波电流含有率-cp95值")
+    private Double inharmI16Cp95;
+
+    /**
+     * 17次间谐波电流含有率-最大值
+     */
+    @TableField(value = "inharm_i_17_max")
+    @ApiModelProperty(value="17次间谐波电流含有率-最大值")
+    private Double inharmI17Max;
+
+    /**
+     * 17次间谐波电流含有率-最小值
+     */
+    @TableField(value = "inharm_i_17_min")
+    @ApiModelProperty(value="17次间谐波电流含有率-最小值")
+    private Double inharmI17Min;
+
+    /**
+     * 17次间谐波电流含有率-平均值
+     */
+    @TableField(value = "inharm_i_17_avg")
+    @ApiModelProperty(value="17次间谐波电流含有率-平均值")
+    private Double inharmI17Avg;
+
+    /**
+     * 17次间谐波电流含有率-cp95值
+     */
+    @TableField(value = "inharm_i_17_cp95")
+    @ApiModelProperty(value="17次间谐波电流含有率-cp95值")
+    private Double inharmI17Cp95;
+
+    /**
+     * 18次间谐波电流含有率-最大值
+     */
+    @TableField(value = "inharm_i_18_max")
+    @ApiModelProperty(value="18次间谐波电流含有率-最大值")
+    private Double inharmI18Max;
+
+    /**
+     * 18次间谐波电流含有率-最小值
+     */
+    @TableField(value = "inharm_i_18_min")
+    @ApiModelProperty(value="18次间谐波电流含有率-最小值")
+    private Double inharmI18Min;
+
+    /**
+     * 18次间谐波电流含有率-平均值
+     */
+    @TableField(value = "inharm_i_18_avg")
+    @ApiModelProperty(value="18次间谐波电流含有率-平均值")
+    private Double inharmI18Avg;
+
+    /**
+     * 18次间谐波电流含有率-cp95值
+     */
+    @TableField(value = "inharm_i_18_cp95")
+    @ApiModelProperty(value="18次间谐波电流含有率-cp95值")
+    private Double inharmI18Cp95;
+
+    /**
+     * 19次间谐波电流含有率-最大值
+     */
+    @TableField(value = "inharm_i_19_max")
+    @ApiModelProperty(value="19次间谐波电流含有率-最大值")
+    private Double inharmI19Max;
+
+    /**
+     * 19次间谐波电流含有率-最小值
+     */
+    @TableField(value = "inharm_i_19_min")
+    @ApiModelProperty(value="19次间谐波电流含有率-最小值")
+    private Double inharmI19Min;
+
+    /**
+     * 19次间谐波电流含有率-平均值
+     */
+    @TableField(value = "inharm_i_19_avg")
+    @ApiModelProperty(value="19次间谐波电流含有率-平均值")
+    private Double inharmI19Avg;
+
+    /**
+     * 19次间谐波电流含有率-cp95值
+     */
+    @TableField(value = "inharm_i_19_cp95")
+    @ApiModelProperty(value="19次间谐波电流含有率-cp95值")
+    private Double inharmI19Cp95;
+
+    /**
+     * 20次间谐波电流含有率-最大值
+     */
+    @TableField(value = "inharm_i_20_max")
+    @ApiModelProperty(value="20次间谐波电流含有率-最大值")
+    private Double inharmI20Max;
+
+    /**
+     * 20次间谐波电流含有率-最小值
+     */
+    @TableField(value = "inharm_i_20_min")
+    @ApiModelProperty(value="20次间谐波电流含有率-最小值")
+    private Double inharmI20Min;
+
+    /**
+     * 20次间谐波电流含有率-平均值
+     */
+    @TableField(value = "inharm_i_20_avg")
+    @ApiModelProperty(value="20次间谐波电流含有率-平均值")
+    private Double inharmI20Avg;
+
+    /**
+     * 20次间谐波电流含有率-cp95值
+     */
+    @TableField(value = "inharm_i_20_cp95")
+    @ApiModelProperty(value="20次间谐波电流含有率-cp95值")
+    private Double inharmI20Cp95;
+
+    /**
+     * 21次间谐波电流含有率-最大值
+     */
+    @TableField(value = "inharm_i_21_max")
+    @ApiModelProperty(value="21次间谐波电流含有率-最大值")
+    private Double inharmI21Max;
+
+    /**
+     * 21次间谐波电流含有率-最小值
+     */
+    @TableField(value = "inharm_i_21_min")
+    @ApiModelProperty(value="21次间谐波电流含有率-最小值")
+    private Double inharmI21Min;
+
+    /**
+     * 21次间谐波电流含有率-平均值
+     */
+    @TableField(value = "inharm_i_21_avg")
+    @ApiModelProperty(value="21次间谐波电流含有率-平均值")
+    private Double inharmI21Avg;
+
+    /**
+     * 21次间谐波电流含有率-cp95值
+     */
+    @TableField(value = "inharm_i_21_cp95")
+    @ApiModelProperty(value="21次间谐波电流含有率-cp95值")
+    private Double inharmI21Cp95;
+
+    /**
+     * 22次间谐波电流含有率-最大值
+     */
+    @TableField(value = "inharm_i_22_max")
+    @ApiModelProperty(value="22次间谐波电流含有率-最大值")
+    private Double inharmI22Max;
+
+    /**
+     * 22次间谐波电流含有率-最小值
+     */
+    @TableField(value = "inharm_i_22_min")
+    @ApiModelProperty(value="22次间谐波电流含有率-最小值")
+    private Double inharmI22Min;
+
+    /**
+     * 22次间谐波电流含有率-平均值
+     */
+    @TableField(value = "inharm_i_22_avg")
+    @ApiModelProperty(value="22次间谐波电流含有率-平均值")
+    private Double inharmI22Avg;
+
+    /**
+     * 22次间谐波电流含有率-cp95值
+     */
+    @TableField(value = "inharm_i_22_cp95")
+    @ApiModelProperty(value="22次间谐波电流含有率-cp95值")
+    private Double inharmI22Cp95;
+
+    /**
+     * 23次间谐波电流含有率-最大值
+     */
+    @TableField(value = "inharm_i_23_max")
+    @ApiModelProperty(value="23次间谐波电流含有率-最大值")
+    private Double inharmI23Max;
+
+    /**
+     * 23次间谐波电流含有率-最小值
+     */
+    @TableField(value = "inharm_i_23_min")
+    @ApiModelProperty(value="23次间谐波电流含有率-最小值")
+    private Double inharmI23Min;
+
+    /**
+     * 23次间谐波电流含有率-平均值
+     */
+    @TableField(value = "inharm_i_23_avg")
+    @ApiModelProperty(value="23次间谐波电流含有率-平均值")
+    private Double inharmI23Avg;
+
+    /**
+     * 23次间谐波电流含有率-cp95值
+     */
+    @TableField(value = "inharm_i_23_cp95")
+    @ApiModelProperty(value="23次间谐波电流含有率-cp95值")
+    private Double inharmI23Cp95;
+
+    /**
+     * 24次间谐波电流含有率-最大值
+     */
+    @TableField(value = "inharm_i_24_max")
+    @ApiModelProperty(value="24次间谐波电流含有率-最大值")
+    private Double inharmI24Max;
+
+    /**
+     * 24次间谐波电流含有率-最小值
+     */
+    @TableField(value = "inharm_i_24_min")
+    @ApiModelProperty(value="24次间谐波电流含有率-最小值")
+    private Double inharmI24Min;
+
+    /**
+     * 24次间谐波电流含有率-平均值
+     */
+    @TableField(value = "inharm_i_24_avg")
+    @ApiModelProperty(value="24次间谐波电流含有率-平均值")
+    private Double inharmI24Avg;
+
+    /**
+     * 24次间谐波电流含有率-cp95值
+     */
+    @TableField(value = "inharm_i_24_cp95")
+    @ApiModelProperty(value="24次间谐波电流含有率-cp95值")
+    private Double inharmI24Cp95;
+
+    /**
+     * 25次间谐波电流含有率-最大值
+     */
+    @TableField(value = "inharm_i_25_max")
+    @ApiModelProperty(value="25次间谐波电流含有率-最大值")
+    private Double inharmI25Max;
+
+    /**
+     * 25次间谐波电流含有率-最小值
+     */
+    @TableField(value = "inharm_i_25_min")
+    @ApiModelProperty(value="25次间谐波电流含有率-最小值")
+    private Double inharmI25Min;
+
+    /**
+     * 25次间谐波电流含有率-平均值
+     */
+    @TableField(value = "inharm_i_25_avg")
+    @ApiModelProperty(value="25次间谐波电流含有率-平均值")
+    private Double inharmI25Avg;
+
+    /**
+     * 25次间谐波电流含有率-cp95值
+     */
+    @TableField(value = "inharm_i_25_cp95")
+    @ApiModelProperty(value="25次间谐波电流含有率-cp95值")
+    private Double inharmI25Cp95;
+
+    /**
+     * 26次间谐波电流含有率-最大值
+     */
+    @TableField(value = "inharm_i_26_max")
+    @ApiModelProperty(value="26次间谐波电流含有率-最大值")
+    private Double inharmI26Max;
+
+    /**
+     * 26次间谐波电流含有率-最小值
+     */
+    @TableField(value = "inharm_i_26_min")
+    @ApiModelProperty(value="26次间谐波电流含有率-最小值")
+    private Double inharmI26Min;
+
+    /**
+     * 26次间谐波电流含有率-平均值
+     */
+    @TableField(value = "inharm_i_26_avg")
+    @ApiModelProperty(value="26次间谐波电流含有率-平均值")
+    private Double inharmI26Avg;
+
+    /**
+     * 26次间谐波电流含有率-cp95值
+     */
+    @TableField(value = "inharm_i_26_cp95")
+    @ApiModelProperty(value="26次间谐波电流含有率-cp95值")
+    private Double inharmI26Cp95;
+
+    /**
+     * 27次间谐波电流含有率-最大值
+     */
+    @TableField(value = "inharm_i_27_max")
+    @ApiModelProperty(value="27次间谐波电流含有率-最大值")
+    private Double inharmI27Max;
+
+    /**
+     * 27次间谐波电流含有率-最小值
+     */
+    @TableField(value = "inharm_i_27_min")
+    @ApiModelProperty(value="27次间谐波电流含有率-最小值")
+    private Double inharmI27Min;
+
+    /**
+     * 27次间谐波电流含有率-平均值
+     */
+    @TableField(value = "inharm_i_27_avg")
+    @ApiModelProperty(value="27次间谐波电流含有率-平均值")
+    private Double inharmI27Avg;
+
+    /**
+     * 27次间谐波电流含有率-cp95值
+     */
+    @TableField(value = "inharm_i_27_cp95")
+    @ApiModelProperty(value="27次间谐波电流含有率-cp95值")
+    private Double inharmI27Cp95;
+
+    /**
+     * 28次间谐波电流含有率-最大值
+     */
+    @TableField(value = "inharm_i_28_max")
+    @ApiModelProperty(value="28次间谐波电流含有率-最大值")
+    private Double inharmI28Max;
+
+    /**
+     * 28次间谐波电流含有率-最小值
+     */
+    @TableField(value = "inharm_i_28_min")
+    @ApiModelProperty(value="28次间谐波电流含有率-最小值")
+    private Double inharmI28Min;
+
+    /**
+     * 28次间谐波电流含有率-平均值
+     */
+    @TableField(value = "inharm_i_28_avg")
+    @ApiModelProperty(value="28次间谐波电流含有率-平均值")
+    private Double inharmI28Avg;
+
+    /**
+     * 28次间谐波电流含有率-cp95值
+     */
+    @TableField(value = "inharm_i_28_cp95")
+    @ApiModelProperty(value="28次间谐波电流含有率-cp95值")
+    private Double inharmI28Cp95;
+
+    /**
+     * 29次间谐波电流含有率-最大值
+     */
+    @TableField(value = "inharm_i_29_max")
+    @ApiModelProperty(value="29次间谐波电流含有率-最大值")
+    private Double inharmI29Max;
+
+    /**
+     * 29次间谐波电流含有率-最小值
+     */
+    @TableField(value = "inharm_i_29_min")
+    @ApiModelProperty(value="29次间谐波电流含有率-最小值")
+    private Double inharmI29Min;
+
+    /**
+     * 29次间谐波电流含有率-平均值
+     */
+    @TableField(value = "inharm_i_29_avg")
+    @ApiModelProperty(value="29次间谐波电流含有率-平均值")
+    private Double inharmI29Avg;
+
+    /**
+     * 29次间谐波电流含有率-cp95值
+     */
+    @TableField(value = "inharm_i_29_cp95")
+    @ApiModelProperty(value="29次间谐波电流含有率-cp95值")
+    private Double inharmI29Cp95;
+
+    /**
+     * 30次间谐波电流含有率-最大值
+     */
+    @TableField(value = "inharm_i_30_max")
+    @ApiModelProperty(value="30次间谐波电流含有率-最大值")
+    private Double inharmI30Max;
+
+    /**
+     * 30次间谐波电流含有率-最小值
+     */
+    @TableField(value = "inharm_i_30_min")
+    @ApiModelProperty(value="30次间谐波电流含有率-最小值")
+    private Double inharmI30Min;
+
+    /**
+     * 30次间谐波电流含有率-平均值
+     */
+    @TableField(value = "inharm_i_30_avg")
+    @ApiModelProperty(value="30次间谐波电流含有率-平均值")
+    private Double inharmI30Avg;
+
+    /**
+     * 30次间谐波电流含有率-cp95值
+     */
+    @TableField(value = "inharm_i_30_cp95")
+    @ApiModelProperty(value="30次间谐波电流含有率-cp95值")
+    private Double inharmI30Cp95;
+
+    /**
+     * 31次间谐波电流含有率-最大值
+     */
+    @TableField(value = "inharm_i_31_max")
+    @ApiModelProperty(value="31次间谐波电流含有率-最大值")
+    private Double inharmI31Max;
+
+    /**
+     * 31次间谐波电流含有率-最小值
+     */
+    @TableField(value = "inharm_i_31_min")
+    @ApiModelProperty(value="31次间谐波电流含有率-最小值")
+    private Double inharmI31Min;
+
+    /**
+     * 31次间谐波电流含有率-平均值
+     */
+    @TableField(value = "inharm_i_31_avg")
+    @ApiModelProperty(value="31次间谐波电流含有率-平均值")
+    private Double inharmI31Avg;
+
+    /**
+     * 31次间谐波电流含有率-cp95值
+     */
+    @TableField(value = "inharm_i_31_cp95")
+    @ApiModelProperty(value="31次间谐波电流含有率-cp95值")
+    private Double inharmI31Cp95;
+
+    /**
+     * 32次间谐波电流含有率-最大值
+     */
+    @TableField(value = "inharm_i_32_max")
+    @ApiModelProperty(value="32次间谐波电流含有率-最大值")
+    private Double inharmI32Max;
+
+    /**
+     * 32次间谐波电流含有率-最小值
+     */
+    @TableField(value = "inharm_i_32_min")
+    @ApiModelProperty(value="32次间谐波电流含有率-最小值")
+    private Double inharmI32Min;
+
+    /**
+     * 32次间谐波电流含有率-平均值
+     */
+    @TableField(value = "inharm_i_32_avg")
+    @ApiModelProperty(value="32次间谐波电流含有率-平均值")
+    private Double inharmI32Avg;
+
+    /**
+     * 32次间谐波电流含有率-cp95值
+     */
+    @TableField(value = "inharm_i_32_cp95")
+    @ApiModelProperty(value="32次间谐波电流含有率-cp95值")
+    private Double inharmI32Cp95;
+
+    /**
+     * 33次间谐波电流含有率-最大值
+     */
+    @TableField(value = "inharm_i_33_max")
+    @ApiModelProperty(value="33次间谐波电流含有率-最大值")
+    private Double inharmI33Max;
+
+    /**
+     * 33次间谐波电流含有率-最小值
+     */
+    @TableField(value = "inharm_i_33_min")
+    @ApiModelProperty(value="33次间谐波电流含有率-最小值")
+    private Double inharmI33Min;
+
+    /**
+     * 33次间谐波电流含有率-平均值
+     */
+    @TableField(value = "inharm_i_33_avg")
+    @ApiModelProperty(value="33次间谐波电流含有率-平均值")
+    private Double inharmI33Avg;
+
+    /**
+     * 33次间谐波电流含有率-cp95值
+     */
+    @TableField(value = "inharm_i_33_cp95")
+    @ApiModelProperty(value="33次间谐波电流含有率-cp95值")
+    private Double inharmI33Cp95;
+
+    /**
+     * 34次间谐波电流含有率-最大值
+     */
+    @TableField(value = "inharm_i_34_max")
+    @ApiModelProperty(value="34次间谐波电流含有率-最大值")
+    private Double inharmI34Max;
+
+    /**
+     * 34次间谐波电流含有率-最小值
+     */
+    @TableField(value = "inharm_i_34_min")
+    @ApiModelProperty(value="34次间谐波电流含有率-最小值")
+    private Double inharmI34Min;
+
+    /**
+     * 34次间谐波电流含有率-平均值
+     */
+    @TableField(value = "inharm_i_34_avg")
+    @ApiModelProperty(value="34次间谐波电流含有率-平均值")
+    private Double inharmI34Avg;
+
+    /**
+     * 34次间谐波电流含有率-cp95值
+     */
+    @TableField(value = "inharm_i_34_cp95")
+    @ApiModelProperty(value="34次间谐波电流含有率-cp95值")
+    private Double inharmI34Cp95;
+
+    /**
+     * 35次间谐波电流含有率-最大值
+     */
+    @TableField(value = "inharm_i_35_max")
+    @ApiModelProperty(value="35次间谐波电流含有率-最大值")
+    private Double inharmI35Max;
+
+    /**
+     * 35次间谐波电流含有率-最小值
+     */
+    @TableField(value = "inharm_i_35_min")
+    @ApiModelProperty(value="35次间谐波电流含有率-最小值")
+    private Double inharmI35Min;
+
+    /**
+     * 35次间谐波电流含有率-平均值
+     */
+    @TableField(value = "inharm_i_35_avg")
+    @ApiModelProperty(value="35次间谐波电流含有率-平均值")
+    private Double inharmI35Avg;
+
+    /**
+     * 35次间谐波电流含有率-cp95值
+     */
+    @TableField(value = "inharm_i_35_cp95")
+    @ApiModelProperty(value="35次间谐波电流含有率-cp95值")
+    private Double inharmI35Cp95;
+
+    /**
+     * 36次间谐波电流含有率-最大值
+     */
+    @TableField(value = "inharm_i_36_max")
+    @ApiModelProperty(value="36次间谐波电流含有率-最大值")
+    private Double inharmI36Max;
+
+    /**
+     * 36次间谐波电流含有率-最小值
+     */
+    @TableField(value = "inharm_i_36_min")
+    @ApiModelProperty(value="36次间谐波电流含有率-最小值")
+    private Double inharmI36Min;
+
+    /**
+     * 36次间谐波电流含有率-平均值
+     */
+    @TableField(value = "inharm_i_36_avg")
+    @ApiModelProperty(value="36次间谐波电流含有率-平均值")
+    private Double inharmI36Avg;
+
+    /**
+     * 36次间谐波电流含有率-cp95值
+     */
+    @TableField(value = "inharm_i_36_cp95")
+    @ApiModelProperty(value="36次间谐波电流含有率-cp95值")
+    private Double inharmI36Cp95;
+
+    /**
+     * 37次间谐波电流含有率-最大值
+     */
+    @TableField(value = "inharm_i_37_max")
+    @ApiModelProperty(value="37次间谐波电流含有率-最大值")
+    private Double inharmI37Max;
+
+    /**
+     * 37次间谐波电流含有率-最小值
+     */
+    @TableField(value = "inharm_i_37_min")
+    @ApiModelProperty(value="37次间谐波电流含有率-最小值")
+    private Double inharmI37Min;
+
+    /**
+     * 37次间谐波电流含有率-平均值
+     */
+    @TableField(value = "inharm_i_37_avg")
+    @ApiModelProperty(value="37次间谐波电流含有率-平均值")
+    private Double inharmI37Avg;
+
+    /**
+     * 37次间谐波电流含有率-cp95值
+     */
+    @TableField(value = "inharm_i_37_cp95")
+    @ApiModelProperty(value="37次间谐波电流含有率-cp95值")
+    private Double inharmI37Cp95;
+
+    /**
+     * 38次间谐波电流含有率-最大值
+     */
+    @TableField(value = "inharm_i_38_max")
+    @ApiModelProperty(value="38次间谐波电流含有率-最大值")
+    private Double inharmI38Max;
+
+    /**
+     * 38次间谐波电流含有率-最小值
+     */
+    @TableField(value = "inharm_i_38_min")
+    @ApiModelProperty(value="38次间谐波电流含有率-最小值")
+    private Double inharmI38Min;
+
+    /**
+     * 38次间谐波电流含有率-平均值
+     */
+    @TableField(value = "inharm_i_38_avg")
+    @ApiModelProperty(value="38次间谐波电流含有率-平均值")
+    private Double inharmI38Avg;
+
+    /**
+     * 38次间谐波电流含有率-cp95值
+     */
+    @TableField(value = "inharm_i_38_cp95")
+    @ApiModelProperty(value="38次间谐波电流含有率-cp95值")
+    private Double inharmI38Cp95;
+
+    /**
+     * 39次间谐波电流含有率-最大值
+     */
+    @TableField(value = "inharm_i_39_max")
+    @ApiModelProperty(value="39次间谐波电流含有率-最大值")
+    private Double inharmI39Max;
+
+    /**
+     * 39次间谐波电流含有率-最小值
+     */
+    @TableField(value = "inharm_i_39_min")
+    @ApiModelProperty(value="39次间谐波电流含有率-最小值")
+    private Double inharmI39Min;
+
+    /**
+     * 39次间谐波电流含有率-平均值
+     */
+    @TableField(value = "inharm_i_39_avg")
+    @ApiModelProperty(value="39次间谐波电流含有率-平均值")
+    private Double inharmI39Avg;
+
+    /**
+     * 39次间谐波电流含有率-cp95值
+     */
+    @TableField(value = "inharm_i_39_cp95")
+    @ApiModelProperty(value="39次间谐波电流含有率-cp95值")
+    private Double inharmI39Cp95;
+
+    /**
+     * 40次间谐波电流含有率-最大值
+     */
+    @TableField(value = "inharm_i_40_max")
+    @ApiModelProperty(value="40次间谐波电流含有率-最大值")
+    private Double inharmI40Max;
+
+    /**
+     * 40次间谐波电流含有率-最小值
+     */
+    @TableField(value = "inharm_i_40_min")
+    @ApiModelProperty(value="40次间谐波电流含有率-最小值")
+    private Double inharmI40Min;
+
+    /**
+     * 40次间谐波电流含有率-平均值
+     */
+    @TableField(value = "inharm_i_40_avg")
+    @ApiModelProperty(value="40次间谐波电流含有率-平均值")
+    private Double inharmI40Avg;
+
+    /**
+     * 40次间谐波电流含有率-cp95值
+     */
+    @TableField(value = "inharm_i_40_cp95")
+    @ApiModelProperty(value="40次间谐波电流含有率-cp95值")
+    private Double inharmI40Cp95;
+
+    /**
+     * 41次间谐波电流含有率-最大值
+     */
+    @TableField(value = "inharm_i_41_max")
+    @ApiModelProperty(value="41次间谐波电流含有率-最大值")
+    private Double inharmI41Max;
+
+    /**
+     * 41次间谐波电流含有率-最小值
+     */
+    @TableField(value = "inharm_i_41_min")
+    @ApiModelProperty(value="41次间谐波电流含有率-最小值")
+    private Double inharmI41Min;
+
+    /**
+     * 41次间谐波电流含有率-平均值
+     */
+    @TableField(value = "inharm_i_41_avg")
+    @ApiModelProperty(value="41次间谐波电流含有率-平均值")
+    private Double inharmI41Avg;
+
+    /**
+     * 41次间谐波电流含有率-cp95值
+     */
+    @TableField(value = "inharm_i_41_cp95")
+    @ApiModelProperty(value="41次间谐波电流含有率-cp95值")
+    private Double inharmI41Cp95;
+
+    /**
+     * 42次间谐波电流含有率-最大值
+     */
+    @TableField(value = "inharm_i_42_max")
+    @ApiModelProperty(value="42次间谐波电流含有率-最大值")
+    private Double inharmI42Max;
+
+    /**
+     * 42次间谐波电流含有率-最小值
+     */
+    @TableField(value = "inharm_i_42_min")
+    @ApiModelProperty(value="42次间谐波电流含有率-最小值")
+    private Double inharmI42Min;
+
+    /**
+     * 42次间谐波电流含有率-平均值
+     */
+    @TableField(value = "inharm_i_42_avg")
+    @ApiModelProperty(value="42次间谐波电流含有率-平均值")
+    private Double inharmI42Avg;
+
+    /**
+     * 42次间谐波电流含有率-cp95值
+     */
+    @TableField(value = "inharm_i_42_cp95")
+    @ApiModelProperty(value="42次间谐波电流含有率-cp95值")
+    private Double inharmI42Cp95;
+
+    /**
+     * 43次间谐波电流含有率-最大值
+     */
+    @TableField(value = "inharm_i_43_max")
+    @ApiModelProperty(value="43次间谐波电流含有率-最大值")
+    private Double inharmI43Max;
+
+    /**
+     * 43次间谐波电流含有率-最小值
+     */
+    @TableField(value = "inharm_i_43_min")
+    @ApiModelProperty(value="43次间谐波电流含有率-最小值")
+    private Double inharmI43Min;
+
+    /**
+     * 43次间谐波电流含有率-平均值
+     */
+    @TableField(value = "inharm_i_43_avg")
+    @ApiModelProperty(value="43次间谐波电流含有率-平均值")
+    private Double inharmI43Avg;
+
+    /**
+     * 43次间谐波电流含有率-cp95值
+     */
+    @TableField(value = "inharm_i_43_cp95")
+    @ApiModelProperty(value="43次间谐波电流含有率-cp95值")
+    private Double inharmI43Cp95;
+
+    /**
+     * 44次间谐波电流含有率-最大值
+     */
+    @TableField(value = "inharm_i_44_max")
+    @ApiModelProperty(value="44次间谐波电流含有率-最大值")
+    private Double inharmI44Max;
+
+    /**
+     * 44次间谐波电流含有率-最小值
+     */
+    @TableField(value = "inharm_i_44_min")
+    @ApiModelProperty(value="44次间谐波电流含有率-最小值")
+    private Double inharmI44Min;
+
+    /**
+     * 44次间谐波电流含有率-平均值
+     */
+    @TableField(value = "inharm_i_44_avg")
+    @ApiModelProperty(value="44次间谐波电流含有率-平均值")
+    private Double inharmI44Avg;
+
+    /**
+     * 44次间谐波电流含有率-cp95值
+     */
+    @TableField(value = "inharm_i_44_cp95")
+    @ApiModelProperty(value="44次间谐波电流含有率-cp95值")
+    private Double inharmI44Cp95;
+
+    /**
+     * 45次间谐波电流含有率-最大值
+     */
+    @TableField(value = "inharm_i_45_max")
+    @ApiModelProperty(value="45次间谐波电流含有率-最大值")
+    private Double inharmI45Max;
+
+    /**
+     * 45次间谐波电流含有率-最小值
+     */
+    @TableField(value = "inharm_i_45_min")
+    @ApiModelProperty(value="45次间谐波电流含有率-最小值")
+    private Double inharmI45Min;
+
+    /**
+     * 45次间谐波电流含有率-平均值
+     */
+    @TableField(value = "inharm_i_45_avg")
+    @ApiModelProperty(value="45次间谐波电流含有率-平均值")
+    private Double inharmI45Avg;
+
+    /**
+     * 45次间谐波电流含有率-cp95值
+     */
+    @TableField(value = "inharm_i_45_cp95")
+    @ApiModelProperty(value="45次间谐波电流含有率-cp95值")
+    private Double inharmI45Cp95;
+
+    /**
+     * 46次间谐波电流含有率-最大值
+     */
+    @TableField(value = "inharm_i_46_max")
+    @ApiModelProperty(value="46次间谐波电流含有率-最大值")
+    private Double inharmI46Max;
+
+    /**
+     * 46次间谐波电流含有率-最小值
+     */
+    @TableField(value = "inharm_i_46_min")
+    @ApiModelProperty(value="46次间谐波电流含有率-最小值")
+    private Double inharmI46Min;
+
+    /**
+     * 46次间谐波电流含有率-平均值
+     */
+    @TableField(value = "inharm_i_46_avg")
+    @ApiModelProperty(value="46次间谐波电流含有率-平均值")
+    private Double inharmI46Avg;
+
+    /**
+     * 46次间谐波电流含有率-cp95值
+     */
+    @TableField(value = "inharm_i_46_cp95")
+    @ApiModelProperty(value="46次间谐波电流含有率-cp95值")
+    private Double inharmI46Cp95;
+
+    /**
+     * 47次间谐波电流含有率-最大值
+     */
+    @TableField(value = "inharm_i_47_max")
+    @ApiModelProperty(value="47次间谐波电流含有率-最大值")
+    private Double inharmI47Max;
+
+    /**
+     * 47次间谐波电流含有率-最小值
+     */
+    @TableField(value = "inharm_i_47_min")
+    @ApiModelProperty(value="47次间谐波电流含有率-最小值")
+    private Double inharmI47Min;
+
+    /**
+     * 47次间谐波电流含有率-平均值
+     */
+    @TableField(value = "inharm_i_47_avg")
+    @ApiModelProperty(value="47次间谐波电流含有率-平均值")
+    private Double inharmI47Avg;
+
+    /**
+     * 47次间谐波电流含有率-cp95值
+     */
+    @TableField(value = "inharm_i_47_cp95")
+    @ApiModelProperty(value="47次间谐波电流含有率-cp95值")
+    private Double inharmI47Cp95;
+
+    /**
+     * 48次间谐波电流含有率-最大值
+     */
+    @TableField(value = "inharm_i_48_max")
+    @ApiModelProperty(value="48次间谐波电流含有率-最大值")
+    private Double inharmI48Max;
+
+    /**
+     * 48次间谐波电流含有率-最小值
+     */
+    @TableField(value = "inharm_i_48_min")
+    @ApiModelProperty(value="48次间谐波电流含有率-最小值")
+    private Double inharmI48Min;
+
+    /**
+     * 48次间谐波电流含有率-平均值
+     */
+    @TableField(value = "inharm_i_48_avg")
+    @ApiModelProperty(value="48次间谐波电流含有率-平均值")
+    private Double inharmI48Avg;
+
+    /**
+     * 48次间谐波电流含有率-cp95值
+     */
+    @TableField(value = "inharm_i_48_cp95")
+    @ApiModelProperty(value="48次间谐波电流含有率-cp95值")
+    private Double inharmI48Cp95;
+
+    /**
+     * 49次间谐波电流含有率-最大值
+     */
+    @TableField(value = "inharm_i_49_max")
+    @ApiModelProperty(value="49次间谐波电流含有率-最大值")
+    private Double inharmI49Max;
+
+    /**
+     * 49次间谐波电流含有率-最小值
+     */
+    @TableField(value = "inharm_i_49_min")
+    @ApiModelProperty(value="49次间谐波电流含有率-最小值")
+    private Double inharmI49Min;
+
+    /**
+     * 49次间谐波电流含有率-平均值
+     */
+    @TableField(value = "inharm_i_49_avg")
+    @ApiModelProperty(value="49次间谐波电流含有率-平均值")
+    private Double inharmI49Avg;
+
+    /**
+     * 49次间谐波电流含有率-cp95值
+     */
+    @TableField(value = "inharm_i_49_cp95")
+    @ApiModelProperty(value="49次间谐波电流含有率-cp95值")
+    private Double inharmI49Cp95;
+
+    /**
+     * 50次间谐波电流含有率-最大值
+     */
+    @TableField(value = "inharm_i_50_max")
+    @ApiModelProperty(value="50次间谐波电流含有率-最大值")
+    private Double inharmI50Max;
+
+    /**
+     * 50次间谐波电流含有率-最小值
+     */
+    @TableField(value = "inharm_i_50_min")
+    @ApiModelProperty(value="50次间谐波电流含有率-最小值")
+    private Double inharmI50Min;
+
+    /**
+     * 50次间谐波电流含有率-平均值
+     */
+    @TableField(value = "inharm_i_50_avg")
+    @ApiModelProperty(value="50次间谐波电流含有率-平均值")
+    private Double inharmI50Avg;
+
+    /**
+     * 50次间谐波电流含有率-cp95值
+     */
+    @TableField(value = "inharm_i_50_cp95")
+    @ApiModelProperty(value="50次间谐波电流含有率-cp95值")
+    private Double inharmI50Cp95;
+}
\ No newline at end of file
diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/pojo/po/line/RMpInharmonicVRateReportDPO.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/pojo/po/line/RMpInharmonicVRateReportDPO.java
new file mode 100644
index 000000000..048376809
--- /dev/null
+++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/pojo/po/line/RMpInharmonicVRateReportDPO.java
@@ -0,0 +1,1444 @@
+package com.njcn.prepare.harmonic.pojo.po.line;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.github.jeffreyning.mybatisplus.anno.MppMultiId;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * Description:
+ * 接口文档访问地址：http://serverIP:port/swagger-ui.html
+ * Date: 2022/10/27  13:52【需求编号】
+ *
+ * @author clam
+ * @version V1.0.0
+ */
+@ApiModel(value = "com-njcn-prepare-harmonic-pojo-po-line-RMpInharmonicVRateReportDPO")
+@Data
+@TableName(value = "r_mp_inharmonic_v_rate_report_d")
+public class RMpInharmonicVRateReportDPO {
+    /**
+     * 监测点ID
+     */
+    @MppMultiId(value = "measurement_point_id")
+    @ApiModelProperty(value = "监测点ID")
+    private String measurementPointId;
+
+    /**
+     * 生成数据的时间,每日统计一次
+     */
+    @MppMultiId(value = "data_date")
+    @ApiModelProperty(value = "生成数据的时间,每日统计一次")
+    private Date dataDate;
+
+    /**
+     * 相别："A" "B" "C" "ABC" "T"  配网部分相别的数据采用T标志存储
+     */
+    @MppMultiId(value = "phase")
+    @ApiModelProperty(value = "相别：'A' 'B' 'C' 'ABC' 'T'  配网部分相别的数据采用T标志存储")
+    private String phase;
+
+    /**
+     * 0.5次间谐波电压含有率最大值
+     */
+    @TableField(value = "centre_harmonic_voltage_content1_max")
+    @ApiModelProperty(value = "0.5次间谐波电压含有率最大值")
+    private Double centreHarmonicVoltageContent1Max;
+
+    /**
+     * 0.5次间谐波电压含有率最小值
+     */
+    @TableField(value = "centre_harmonic_voltage_content1_min")
+    @ApiModelProperty(value = "0.5次间谐波电压含有率最小值")
+    private Double centreHarmonicVoltageContent1Min;
+
+    /**
+     * 0.5次间谐波电压含有率平均值
+     */
+    @TableField(value = "centre_harmonic_voltage_content1_avg")
+    @ApiModelProperty(value = "0.5次间谐波电压含有率平均值")
+    private Double centreHarmonicVoltageContent1Avg;
+
+    /**
+     * 0.5次间谐波电压含有率95值
+     */
+    @TableField(value = "centre_harmonic_voltage_content1_cp95")
+    @ApiModelProperty(value = "0.5次间谐波电压含有率95值")
+    private Double centreHarmonicVoltageContent1Cp95;
+
+    /**
+     * 1.5次间谐波电压含有率最大值
+     */
+    @TableField(value = "centre_harmonic_voltage_content2_max")
+    @ApiModelProperty(value = "1.5次间谐波电压含有率最大值")
+    private Double centreHarmonicVoltageContent2Max;
+
+    /**
+     * 1.5次间谐波电压含有率最小值
+     */
+    @TableField(value = "centre_harmonic_voltage_content2_min")
+    @ApiModelProperty(value = "1.5次间谐波电压含有率最小值")
+    private Double centreHarmonicVoltageContent2Min;
+
+    /**
+     * 1.5次间谐波电压含有率平均值
+     */
+    @TableField(value = "centre_harmonic_voltage_content2_avg")
+    @ApiModelProperty(value = "1.5次间谐波电压含有率平均值")
+    private Double centreHarmonicVoltageContent2Avg;
+
+    /**
+     * 1.5次间谐波电压含有率95值
+     */
+    @TableField(value = "centre_harmonic_voltage_content2_cp95")
+    @ApiModelProperty(value = "1.5次间谐波电压含有率95值")
+    private Double centreHarmonicVoltageContent2Cp95;
+
+    /**
+     * 2.5次间谐波电压含有率最大值
+     */
+    @TableField(value = "centre_harmonic_voltage_content3_max")
+    @ApiModelProperty(value = "2.5次间谐波电压含有率最大值")
+    private Double centreHarmonicVoltageContent3Max;
+
+    /**
+     * 2.5次间谐波电压含有率最小值
+     */
+    @TableField(value = "centre_harmonic_voltage_content3_min")
+    @ApiModelProperty(value = "2.5次间谐波电压含有率最小值")
+    private Double centreHarmonicVoltageContent3Min;
+
+    /**
+     * 2.5次间谐波电压含有率平均值
+     */
+    @TableField(value = "centre_harmonic_voltage_content3_avg")
+    @ApiModelProperty(value = "2.5次间谐波电压含有率平均值")
+    private Double centreHarmonicVoltageContent3Avg;
+
+    /**
+     * 2.5次间谐波电压含有率95值
+     */
+    @TableField(value = "centre_harmonic_voltage_content3_cp95")
+    @ApiModelProperty(value = "2.5次间谐波电压含有率95值")
+    private Double centreHarmonicVoltageContent3Cp95;
+
+    /**
+     * 3.5次间谐波电压含有率最大值
+     */
+    @TableField(value = "centre_harmonic_voltage_content4_max")
+    @ApiModelProperty(value = "3.5次间谐波电压含有率最大值")
+    private Double centreHarmonicVoltageContent4Max;
+
+    /**
+     * 3.5次间谐波电压含有率最小值
+     */
+    @TableField(value = "centre_harmonic_voltage_content4_min")
+    @ApiModelProperty(value = "3.5次间谐波电压含有率最小值")
+    private Double centreHarmonicVoltageContent4Min;
+
+    /**
+     * 3.5次间谐波电压含有率平均值
+     */
+    @TableField(value = "centre_harmonic_voltage_content4_avg")
+    @ApiModelProperty(value = "3.5次间谐波电压含有率平均值")
+    private Double centreHarmonicVoltageContent4Avg;
+
+    /**
+     * 3.5次间谐波电压含有率95值
+     */
+    @TableField(value = "centre_harmonic_voltage_content4_cp95")
+    @ApiModelProperty(value = "3.5次间谐波电压含有率95值")
+    private Double centreHarmonicVoltageContent4Cp95;
+
+    /**
+     * 4.5次间谐波电压含有率最大值
+     */
+    @TableField(value = "centre_harmonic_voltage_content5_max")
+    @ApiModelProperty(value = "4.5次间谐波电压含有率最大值")
+    private Double centreHarmonicVoltageContent5Max;
+
+    /**
+     * 4.5次间谐波电压含有率最小值
+     */
+    @TableField(value = "centre_harmonic_voltage_content5_min")
+    @ApiModelProperty(value = "4.5次间谐波电压含有率最小值")
+    private Double centreHarmonicVoltageContent5Min;
+
+    /**
+     * 4.5次间谐波电压含有率平均值
+     */
+    @TableField(value = "centre_harmonic_voltage_content5_avg")
+    @ApiModelProperty(value = "4.5次间谐波电压含有率平均值")
+    private Double centreHarmonicVoltageContent5Avg;
+
+    /**
+     * 4.5次间谐波电压含有率95值
+     */
+    @TableField(value = "centre_harmonic_voltage_content5_cp95")
+    @ApiModelProperty(value = "4.5次间谐波电压含有率95值")
+    private Double centreHarmonicVoltageContent5Cp95;
+
+    /**
+     * 5.5次间谐波电压含有率最大值
+     */
+    @TableField(value = "centre_harmonic_voltage_content6_max")
+    @ApiModelProperty(value = "5.5次间谐波电压含有率最大值")
+    private Double centreHarmonicVoltageContent6Max;
+
+    /**
+     * 5.5次间谐波电压含有率最小值
+     */
+    @TableField(value = "centre_harmonic_voltage_content6_min")
+    @ApiModelProperty(value = "5.5次间谐波电压含有率最小值")
+    private Double centreHarmonicVoltageContent6Min;
+
+    /**
+     * 5.5次间谐波电压含有率平均值
+     */
+    @TableField(value = "centre_harmonic_voltage_content6_avg")
+    @ApiModelProperty(value = "5.5次间谐波电压含有率平均值")
+    private Double centreHarmonicVoltageContent6Avg;
+
+    /**
+     * 5.5次间谐波电压含有率95值
+     */
+    @TableField(value = "centre_harmonic_voltage_content6_cp95")
+    @ApiModelProperty(value = "5.5次间谐波电压含有率95值")
+    private Double centreHarmonicVoltageContent6Cp95;
+
+    /**
+     * 6.5次间谐波电压含有率最大值
+     */
+    @TableField(value = "centre_harmonic_voltage_content7_max")
+    @ApiModelProperty(value = "6.5次间谐波电压含有率最大值")
+    private Double centreHarmonicVoltageContent7Max;
+
+    /**
+     * 6.5次间谐波电压含有率最小值
+     */
+    @TableField(value = "centre_harmonic_voltage_content7_min")
+    @ApiModelProperty(value = "6.5次间谐波电压含有率最小值")
+    private Double centreHarmonicVoltageContent7Min;
+
+    /**
+     * 6.5次间谐波电压含有率平均值
+     */
+    @TableField(value = "centre_harmonic_voltage_content7_avg")
+    @ApiModelProperty(value = "6.5次间谐波电压含有率平均值")
+    private Double centreHarmonicVoltageContent7Avg;
+
+    /**
+     * 6.5次间谐波电压含有率95值
+     */
+    @TableField(value = "centre_harmonic_voltage_content7_cp95")
+    @ApiModelProperty(value = "6.5次间谐波电压含有率95值")
+    private Double centreHarmonicVoltageContent7Cp95;
+
+    /**
+     * 7.5次间谐波电压含有率最大值
+     */
+    @TableField(value = "centre_harmonic_voltage_content8_max")
+    @ApiModelProperty(value = "7.5次间谐波电压含有率最大值")
+    private Double centreHarmonicVoltageContent8Max;
+
+    /**
+     * 7.5次间谐波电压含有率最小值
+     */
+    @TableField(value = "centre_harmonic_voltage_content8_min")
+    @ApiModelProperty(value = "7.5次间谐波电压含有率最小值")
+    private Double centreHarmonicVoltageContent8Min;
+
+    /**
+     * 7.5次间谐波电压含有率平均值
+     */
+    @TableField(value = "centre_harmonic_voltage_content8_avg")
+    @ApiModelProperty(value = "7.5次间谐波电压含有率平均值")
+    private Double centreHarmonicVoltageContent8Avg;
+
+    /**
+     * 7.5次间谐波电压含有率95值
+     */
+    @TableField(value = "centre_harmonic_voltage_content8_cp95")
+    @ApiModelProperty(value = "7.5次间谐波电压含有率95值")
+    private Double centreHarmonicVoltageContent8Cp95;
+
+    /**
+     * 8.5次间谐波电压含有率最大值
+     */
+    @TableField(value = "centre_harmonic_voltage_content9_max")
+    @ApiModelProperty(value = "8.5次间谐波电压含有率最大值")
+    private Double centreHarmonicVoltageContent9Max;
+
+    /**
+     * 8.5次间谐波电压含有率最小值
+     */
+    @TableField(value = "centre_harmonic_voltage_content9_min")
+    @ApiModelProperty(value = "8.5次间谐波电压含有率最小值")
+    private Double centreHarmonicVoltageContent9Min;
+
+    /**
+     * 8.5次间谐波电压含有率平均值
+     */
+    @TableField(value = "centre_harmonic_voltage_content9_avg")
+    @ApiModelProperty(value = "8.5次间谐波电压含有率平均值")
+    private Double centreHarmonicVoltageContent9Avg;
+
+    /**
+     * 8.5次间谐波电压含有率95值
+     */
+    @TableField(value = "centre_harmonic_voltage_content9_cp95")
+    @ApiModelProperty(value = "8.5次间谐波电压含有率95值")
+    private Double centreHarmonicVoltageContent9Cp95;
+
+    /**
+     * 9.5次间谐波电压含有率最大值
+     */
+    @TableField(value = "centre_harmonic_voltage_content10_max")
+    @ApiModelProperty(value = "9.5次间谐波电压含有率最大值")
+    private Double centreHarmonicVoltageContent10Max;
+
+    /**
+     * 9.5次间谐波电压含有率最小值
+     */
+    @TableField(value = "centre_harmonic_voltage_content10_min")
+    @ApiModelProperty(value = "9.5次间谐波电压含有率最小值")
+    private Double centreHarmonicVoltageContent10Min;
+
+    /**
+     * 9.5次间谐波电压含有率平均值
+     */
+    @TableField(value = "centre_harmonic_voltage_content10_avg")
+    @ApiModelProperty(value = "9.5次间谐波电压含有率平均值")
+    private Double centreHarmonicVoltageContent10Avg;
+
+    /**
+     * 9.5次间谐波电压含有率95值
+     */
+    @TableField(value = "centre_harmonic_voltage_content10_cp95")
+    @ApiModelProperty(value = "9.5次间谐波电压含有率95值")
+    private Double centreHarmonicVoltageContent10Cp95;
+
+    /**
+     * 10.5次间谐波电压含有率最大值
+     */
+    @TableField(value = "centre_harmonic_voltage_content11_max")
+    @ApiModelProperty(value = "10.5次间谐波电压含有率最大值")
+    private Double centreHarmonicVoltageContent11Max;
+
+    /**
+     * 10.5次间谐波电压含有率最小值
+     */
+    @TableField(value = "centre_harmonic_voltage_content11_min")
+    @ApiModelProperty(value = "10.5次间谐波电压含有率最小值")
+    private Double centreHarmonicVoltageContent11Min;
+
+    /**
+     * 10.5次间谐波电压含有率平均值
+     */
+    @TableField(value = "centre_harmonic_voltage_content11_avg")
+    @ApiModelProperty(value = "10.5次间谐波电压含有率平均值")
+    private Double centreHarmonicVoltageContent11Avg;
+
+    /**
+     * 10.5次间谐波电压含有率95值
+     */
+    @TableField(value = "centre_harmonic_voltage_content11_cp95")
+    @ApiModelProperty(value = "10.5次间谐波电压含有率95值")
+    private Double centreHarmonicVoltageContent11Cp95;
+
+    /**
+     * 11.5次间谐波电压含有率最大值
+     */
+    @TableField(value = "centre_harmonic_voltage_content12_max")
+    @ApiModelProperty(value = "11.5次间谐波电压含有率最大值")
+    private Double centreHarmonicVoltageContent12Max;
+
+    /**
+     * 11.5次间谐波电压含有率最小值
+     */
+    @TableField(value = "centre_harmonic_voltage_content12_min")
+    @ApiModelProperty(value = "11.5次间谐波电压含有率最小值")
+    private Double centreHarmonicVoltageContent12Min;
+
+    /**
+     * 11.5次间谐波电压含有率平均值
+     */
+    @TableField(value = "centre_harmonic_voltage_content12_avg")
+    @ApiModelProperty(value = "11.5次间谐波电压含有率平均值")
+    private Double centreHarmonicVoltageContent12Avg;
+
+    /**
+     * 11.5次间谐波电压含有率95值
+     */
+    @TableField(value = "centre_harmonic_voltage_content12_cp95")
+    @ApiModelProperty(value = "11.5次间谐波电压含有率95值")
+    private Double centreHarmonicVoltageContent12Cp95;
+
+    /**
+     * 12.5次间谐波电压含有率最大值
+     */
+    @TableField(value = "centre_harmonic_voltage_content13_max")
+    @ApiModelProperty(value = "12.5次间谐波电压含有率最大值")
+    private Double centreHarmonicVoltageContent13Max;
+
+    /**
+     * 12.5次间谐波电压含有率最小值
+     */
+    @TableField(value = "centre_harmonic_voltage_content13_min")
+    @ApiModelProperty(value = "12.5次间谐波电压含有率最小值")
+    private Double centreHarmonicVoltageContent13Min;
+
+    /**
+     * 12.5次间谐波电压含有率平均值
+     */
+    @TableField(value = "centre_harmonic_voltage_content13_avg")
+    @ApiModelProperty(value = "12.5次间谐波电压含有率平均值")
+    private Double centreHarmonicVoltageContent13Avg;
+
+    /**
+     * 12.5次间谐波电压含有率95值
+     */
+    @TableField(value = "centre_harmonic_voltage_content13_cp95")
+    @ApiModelProperty(value = "12.5次间谐波电压含有率95值")
+    private Double centreHarmonicVoltageContent13Cp95;
+
+    /**
+     * 13.5次间谐波电压含有率最大值
+     */
+    @TableField(value = "centre_harmonic_voltage_content14_max")
+    @ApiModelProperty(value = "13.5次间谐波电压含有率最大值")
+    private Double centreHarmonicVoltageContent14Max;
+
+    /**
+     * 13.5次间谐波电压含有率最小值
+     */
+    @TableField(value = "centre_harmonic_voltage_content14_min")
+    @ApiModelProperty(value = "13.5次间谐波电压含有率最小值")
+    private Double centreHarmonicVoltageContent14Min;
+
+    /**
+     * 13.5次间谐波电压含有率平均值
+     */
+    @TableField(value = "centre_harmonic_voltage_content14_avg")
+    @ApiModelProperty(value = "13.5次间谐波电压含有率平均值")
+    private Double centreHarmonicVoltageContent14Avg;
+
+    /**
+     * 13.5次间谐波电压含有率95值
+     */
+    @TableField(value = "centre_harmonic_voltage_content14_cp95")
+    @ApiModelProperty(value = "13.5次间谐波电压含有率95值")
+    private Double centreHarmonicVoltageContent14Cp95;
+
+    /**
+     * 14.5次间谐波电压含有率最大值
+     */
+    @TableField(value = "centre_harmonic_voltage_content15_max")
+    @ApiModelProperty(value = "14.5次间谐波电压含有率最大值")
+    private Double centreHarmonicVoltageContent15Max;
+
+    /**
+     * 14.5次间谐波电压含有率最小值
+     */
+    @TableField(value = "centre_harmonic_voltage_content15_min")
+    @ApiModelProperty(value = "14.5次间谐波电压含有率最小值")
+    private Double centreHarmonicVoltageContent15Min;
+
+    /**
+     * 14.5次间谐波电压含有率平均值
+     */
+    @TableField(value = "centre_harmonic_voltage_content15_avg")
+    @ApiModelProperty(value = "14.5次间谐波电压含有率平均值")
+    private Double centreHarmonicVoltageContent15Avg;
+
+    /**
+     * 14.5次间谐波电压含有率95值
+     */
+    @TableField(value = "centre_harmonic_voltage_content15_cp95")
+    @ApiModelProperty(value = "14.5次间谐波电压含有率95值")
+    private Double centreHarmonicVoltageContent15Cp95;
+
+    /**
+     * 15.5次间谐波电压含有率最大值
+     */
+    @TableField(value = "centre_harmonic_voltage_content16_max")
+    @ApiModelProperty(value = "15.5次间谐波电压含有率最大值")
+    private Double centreHarmonicVoltageContent16Max;
+
+    /**
+     * 15.5次间谐波电压含有率最小值
+     */
+    @TableField(value = "centre_harmonic_voltage_content16_min")
+    @ApiModelProperty(value = "15.5次间谐波电压含有率最小值")
+    private Double centreHarmonicVoltageContent16Min;
+
+    /**
+     * 15.5次间谐波电压含有率平均值
+     */
+    @TableField(value = "centre_harmonic_voltage_content16_avg")
+    @ApiModelProperty(value = "15.5次间谐波电压含有率平均值")
+    private Double centreHarmonicVoltageContent16Avg;
+
+    /**
+     * 15.5次间谐波电压含有率95值
+     */
+    @TableField(value = "centre_harmonic_voltage_content16_cp95")
+    @ApiModelProperty(value = "15.5次间谐波电压含有率95值")
+    private Double centreHarmonicVoltageContent16Cp95;
+
+    /**
+     * 16.5次间谐波电压含有率最大值
+     */
+    @TableField(value = "centre_harmonic_voltage_content17_max")
+    @ApiModelProperty(value = "16.5次间谐波电压含有率最大值")
+    private Double centreHarmonicVoltageContent17Max;
+
+    /**
+     * 16.5次间谐波电压含有率最小值
+     */
+    @TableField(value = "centre_harmonic_voltage_content17_min")
+    @ApiModelProperty(value = "16.5次间谐波电压含有率最小值")
+    private Double centreHarmonicVoltageContent17Min;
+
+    /**
+     * 16.5次间谐波电压含有率平均值
+     */
+    @TableField(value = "centre_harmonic_voltage_content17_avg")
+    @ApiModelProperty(value = "16.5次间谐波电压含有率平均值")
+    private Double centreHarmonicVoltageContent17Avg;
+
+    /**
+     * 16.5次间谐波电压含有率95值
+     */
+    @TableField(value = "centre_harmonic_voltage_content17_cp95")
+    @ApiModelProperty(value = "16.5次间谐波电压含有率95值")
+    private Double centreHarmonicVoltageContent17Cp95;
+
+    /**
+     * 17.5次间谐波电压含有率最大值
+     */
+    @TableField(value = "centre_harmonic_voltage_content18_max")
+    @ApiModelProperty(value = "17.5次间谐波电压含有率最大值")
+    private Double centreHarmonicVoltageContent18Max;
+
+    /**
+     * 17.5次间谐波电压含有率最小值
+     */
+    @TableField(value = "centre_harmonic_voltage_content18_min")
+    @ApiModelProperty(value = "17.5次间谐波电压含有率最小值")
+    private Double centreHarmonicVoltageContent18Min;
+
+    /**
+     * 17.5次间谐波电压含有率平均值
+     */
+    @TableField(value = "centre_harmonic_voltage_content18_avg")
+    @ApiModelProperty(value = "17.5次间谐波电压含有率平均值")
+    private Double centreHarmonicVoltageContent18Avg;
+
+    /**
+     * 17.5次间谐波电压含有率95值
+     */
+    @TableField(value = "centre_harmonic_voltage_content18_cp95")
+    @ApiModelProperty(value = "17.5次间谐波电压含有率95值")
+    private Double centreHarmonicVoltageContent18Cp95;
+
+    /**
+     * 18.5次间谐波电压含有率最大值
+     */
+    @TableField(value = "centre_harmonic_voltage_content19_max")
+    @ApiModelProperty(value = "18.5次间谐波电压含有率最大值")
+    private Double centreHarmonicVoltageContent19Max;
+
+    /**
+     * 18.5次间谐波电压含有率最小值
+     */
+    @TableField(value = "centre_harmonic_voltage_content19_min")
+    @ApiModelProperty(value = "18.5次间谐波电压含有率最小值")
+    private Double centreHarmonicVoltageContent19Min;
+
+    /**
+     * 18.5次间谐波电压含有率平均值
+     */
+    @TableField(value = "centre_harmonic_voltage_content19_avg")
+    @ApiModelProperty(value = "18.5次间谐波电压含有率平均值")
+    private Double centreHarmonicVoltageContent19Avg;
+
+    /**
+     * 18.5次间谐波电压含有率95值
+     */
+    @TableField(value = "centre_harmonic_voltage_content19_cp95")
+    @ApiModelProperty(value = "18.5次间谐波电压含有率95值")
+    private Double centreHarmonicVoltageContent19Cp95;
+
+    /**
+     * 19.5次间谐波电压含有率最大值
+     */
+    @TableField(value = "centre_harmonic_voltage_content20_max")
+    @ApiModelProperty(value = "19.5次间谐波电压含有率最大值")
+    private Double centreHarmonicVoltageContent20Max;
+
+    /**
+     * 19.5次间谐波电压含有率最小值
+     */
+    @TableField(value = "centre_harmonic_voltage_content20_min")
+    @ApiModelProperty(value = "19.5次间谐波电压含有率最小值")
+    private Double centreHarmonicVoltageContent20Min;
+
+    /**
+     * 19.5次间谐波电压含有率平均值
+     */
+    @TableField(value = "centre_harmonic_voltage_content20_avg")
+    @ApiModelProperty(value = "19.5次间谐波电压含有率平均值")
+    private Double centreHarmonicVoltageContent20Avg;
+
+    /**
+     * 19.5次间谐波电压含有率95值
+     */
+    @TableField(value = "centre_harmonic_voltage_content20_cp95")
+    @ApiModelProperty(value = "19.5次间谐波电压含有率95值")
+    private Double centreHarmonicVoltageContent20Cp95;
+
+    /**
+     * 20.5次间谐波电压含有率最大值
+     */
+    @TableField(value = "centre_harmonic_voltage_content21_max")
+    @ApiModelProperty(value = "20.5次间谐波电压含有率最大值")
+    private Double centreHarmonicVoltageContent21Max;
+
+    /**
+     * 20.5次间谐波电压含有率最小值
+     */
+    @TableField(value = "centre_harmonic_voltage_content21_min")
+    @ApiModelProperty(value = "20.5次间谐波电压含有率最小值")
+    private Double centreHarmonicVoltageContent21Min;
+
+    /**
+     * 20.5次间谐波电压含有率平均值
+     */
+    @TableField(value = "centre_harmonic_voltage_content21_avg")
+    @ApiModelProperty(value = "20.5次间谐波电压含有率平均值")
+    private Double centreHarmonicVoltageContent21Avg;
+
+    /**
+     * 20.5次间谐波电压含有率95值
+     */
+    @TableField(value = "centre_harmonic_voltage_content21_cp95")
+    @ApiModelProperty(value = "20.5次间谐波电压含有率95值")
+    private Double centreHarmonicVoltageContent21Cp95;
+
+    /**
+     * 21.5次间谐波电压含有率最大值
+     */
+    @TableField(value = "centre_harmonic_voltage_content22_max")
+    @ApiModelProperty(value = "21.5次间谐波电压含有率最大值")
+    private Double centreHarmonicVoltageContent22Max;
+
+    /**
+     * 21.5次间谐波电压含有率最小值
+     */
+    @TableField(value = "centre_harmonic_voltage_content22_min")
+    @ApiModelProperty(value = "21.5次间谐波电压含有率最小值")
+    private Double centreHarmonicVoltageContent22Min;
+
+    /**
+     * 21.5次间谐波电压含有率平均值
+     */
+    @TableField(value = "centre_harmonic_voltage_content22_avg")
+    @ApiModelProperty(value = "21.5次间谐波电压含有率平均值")
+    private Double centreHarmonicVoltageContent22Avg;
+
+    /**
+     * 21.5次间谐波电压含有率95值
+     */
+    @TableField(value = "centre_harmonic_voltage_content22_cp95")
+    @ApiModelProperty(value = "21.5次间谐波电压含有率95值")
+    private Double centreHarmonicVoltageContent22Cp95;
+
+    /**
+     * 22.5次间谐波电压含有率最大值
+     */
+    @TableField(value = "centre_harmonic_voltage_content23_max")
+    @ApiModelProperty(value = "22.5次间谐波电压含有率最大值")
+    private Double centreHarmonicVoltageContent23Max;
+
+    /**
+     * 22.5次间谐波电压含有率最小值
+     */
+    @TableField(value = "centre_harmonic_voltage_content23_min")
+    @ApiModelProperty(value = "22.5次间谐波电压含有率最小值")
+    private Double centreHarmonicVoltageContent23Min;
+
+    /**
+     * 22.5次间谐波电压含有率平均值
+     */
+    @TableField(value = "centre_harmonic_voltage_content23_avg")
+    @ApiModelProperty(value = "22.5次间谐波电压含有率平均值")
+    private Double centreHarmonicVoltageContent23Avg;
+
+    /**
+     * 22.5次间谐波电压含有率95值
+     */
+    @TableField(value = "centre_harmonic_voltage_content23_cp95")
+    @ApiModelProperty(value = "22.5次间谐波电压含有率95值")
+    private Double centreHarmonicVoltageContent23Cp95;
+
+    /**
+     * 23.5次间谐波电压含有率最大值
+     */
+    @TableField(value = "centre_harmonic_voltage_content24_max")
+    @ApiModelProperty(value = "23.5次间谐波电压含有率最大值")
+    private Double centreHarmonicVoltageContent24Max;
+
+    /**
+     * 23.5次间谐波电压含有率最小值
+     */
+    @TableField(value = "centre_harmonic_voltage_content24_min")
+    @ApiModelProperty(value = "23.5次间谐波电压含有率最小值")
+    private Double centreHarmonicVoltageContent24Min;
+
+    /**
+     * 23.5次间谐波电压含有率平均值
+     */
+    @TableField(value = "centre_harmonic_voltage_content24_avg")
+    @ApiModelProperty(value = "23.5次间谐波电压含有率平均值")
+    private Double centreHarmonicVoltageContent24Avg;
+
+    /**
+     * 23.5次间谐波电压含有率95值
+     */
+    @TableField(value = "centre_harmonic_voltage_content24_cp95")
+    @ApiModelProperty(value = "23.5次间谐波电压含有率95值")
+    private Double centreHarmonicVoltageContent24Cp95;
+
+    /**
+     * 24.5次间谐波电压含有率最大值
+     */
+    @TableField(value = "centre_harmonic_voltage_content25_max")
+    @ApiModelProperty(value = "24.5次间谐波电压含有率最大值")
+    private Double centreHarmonicVoltageContent25Max;
+
+    /**
+     * 24.5次间谐波电压含有率最小值
+     */
+    @TableField(value = "centre_harmonic_voltage_content25_min")
+    @ApiModelProperty(value = "24.5次间谐波电压含有率最小值")
+    private Double centreHarmonicVoltageContent25Min;
+
+    /**
+     * 24.5次间谐波电压含有率平均值
+     */
+    @TableField(value = "centre_harmonic_voltage_content25_avg")
+    @ApiModelProperty(value = "24.5次间谐波电压含有率平均值")
+    private Double centreHarmonicVoltageContent25Avg;
+
+    /**
+     * 24.5次间谐波电压含有率95值
+     */
+    @TableField(value = "centre_harmonic_voltage_content25_cp95")
+    @ApiModelProperty(value = "24.5次间谐波电压含有率95值")
+    private Double centreHarmonicVoltageContent25Cp95;
+
+    /**
+     * 25.5次间谐波电压含有率最大值
+     */
+    @TableField(value = "centre_harmonic_voltage_content26_max")
+    @ApiModelProperty(value = "25.5次间谐波电压含有率最大值")
+    private Double centreHarmonicVoltageContent26Max;
+
+    /**
+     * 25.5次间谐波电压含有率最小值
+     */
+    @TableField(value = "centre_harmonic_voltage_content26_min")
+    @ApiModelProperty(value = "25.5次间谐波电压含有率最小值")
+    private Double centreHarmonicVoltageContent26Min;
+
+    /**
+     * 25.5次间谐波电压含有率平均值
+     */
+    @TableField(value = "centre_harmonic_voltage_content26_avg")
+    @ApiModelProperty(value = "25.5次间谐波电压含有率平均值")
+    private Double centreHarmonicVoltageContent26Avg;
+
+    /**
+     * 25.5次间谐波电压含有率95值
+     */
+    @TableField(value = "centre_harmonic_voltage_content26_cp95")
+    @ApiModelProperty(value = "25.5次间谐波电压含有率95值")
+    private Double centreHarmonicVoltageContent26Cp95;
+
+    /**
+     * 26.5次间谐波电压含有率最大值
+     */
+    @TableField(value = "centre_harmonic_voltage_content27_max")
+    @ApiModelProperty(value = "26.5次间谐波电压含有率最大值")
+    private Double centreHarmonicVoltageContent27Max;
+
+    /**
+     * 26.5次间谐波电压含有率最小值
+     */
+    @TableField(value = "centre_harmonic_voltage_content27_min")
+    @ApiModelProperty(value = "26.5次间谐波电压含有率最小值")
+    private Double centreHarmonicVoltageContent27Min;
+
+    /**
+     * 26.5次间谐波电压含有率平均值
+     */
+    @TableField(value = "centre_harmonic_voltage_content27_avg")
+    @ApiModelProperty(value = "26.5次间谐波电压含有率平均值")
+    private Double centreHarmonicVoltageContent27Avg;
+
+    /**
+     * 26.5次间谐波电压含有率95值
+     */
+    @TableField(value = "centre_harmonic_voltage_content27_cp95")
+    @ApiModelProperty(value = "26.5次间谐波电压含有率95值")
+    private Double centreHarmonicVoltageContent27Cp95;
+
+    /**
+     * 27.5次间谐波电压含有率最大值
+     */
+    @TableField(value = "centre_harmonic_voltage_content28_max")
+    @ApiModelProperty(value = "27.5次间谐波电压含有率最大值")
+    private Double centreHarmonicVoltageContent28Max;
+
+    /**
+     * 27.5次间谐波电压含有率最小值
+     */
+    @TableField(value = "centre_harmonic_voltage_content28_min")
+    @ApiModelProperty(value = "27.5次间谐波电压含有率最小值")
+    private Double centreHarmonicVoltageContent28Min;
+
+    /**
+     * 27.5次间谐波电压含有率平均值
+     */
+    @TableField(value = "centre_harmonic_voltage_content28_avg")
+    @ApiModelProperty(value = "27.5次间谐波电压含有率平均值")
+    private Double centreHarmonicVoltageContent28Avg;
+
+    /**
+     * 27.5次间谐波电压含有率95值
+     */
+    @TableField(value = "centre_harmonic_voltage_content28_cp95")
+    @ApiModelProperty(value = "27.5次间谐波电压含有率95值")
+    private Double centreHarmonicVoltageContent28Cp95;
+
+    /**
+     * 28.5次间谐波电压含有率最大值
+     */
+    @TableField(value = "centre_harmonic_voltage_content29_max")
+    @ApiModelProperty(value = "28.5次间谐波电压含有率最大值")
+    private Double centreHarmonicVoltageContent29Max;
+
+    /**
+     * 28.5次间谐波电压含有率最小值
+     */
+    @TableField(value = "centre_harmonic_voltage_content29_min")
+    @ApiModelProperty(value = "28.5次间谐波电压含有率最小值")
+    private Double centreHarmonicVoltageContent29Min;
+
+    /**
+     * 28.5次间谐波电压含有率平均值
+     */
+    @TableField(value = "centre_harmonic_voltage_content29_avg")
+    @ApiModelProperty(value = "28.5次间谐波电压含有率平均值")
+    private Double centreHarmonicVoltageContent29Avg;
+
+    /**
+     * 28.5次间谐波电压含有率95值
+     */
+    @TableField(value = "centre_harmonic_voltage_content29_cp95")
+    @ApiModelProperty(value = "28.5次间谐波电压含有率95值")
+    private Double centreHarmonicVoltageContent29Cp95;
+
+    /**
+     * 29.5次间谐波电压含有率最大值
+     */
+    @TableField(value = "centre_harmonic_voltage_content30_max")
+    @ApiModelProperty(value = "29.5次间谐波电压含有率最大值")
+    private Double centreHarmonicVoltageContent30Max;
+
+    /**
+     * 29.5次间谐波电压含有率最小值
+     */
+    @TableField(value = "centre_harmonic_voltage_content30_min")
+    @ApiModelProperty(value = "29.5次间谐波电压含有率最小值")
+    private Double centreHarmonicVoltageContent30Min;
+
+    /**
+     * 29.5次间谐波电压含有率平均值
+     */
+    @TableField(value = "centre_harmonic_voltage_content30_avg")
+    @ApiModelProperty(value = "29.5次间谐波电压含有率平均值")
+    private Double centreHarmonicVoltageContent30Avg;
+
+    /**
+     * 29.5次间谐波电压含有率95值
+     */
+    @TableField(value = "centre_harmonic_voltage_content30_cp95")
+    @ApiModelProperty(value = "29.5次间谐波电压含有率95值")
+    private Double centreHarmonicVoltageContent30Cp95;
+
+    /**
+     * 30.5次间谐波电压含有率最大值
+     */
+    @TableField(value = "centre_harmonic_voltage_content31_max")
+    @ApiModelProperty(value = "30.5次间谐波电压含有率最大值")
+    private Double centreHarmonicVoltageContent31Max;
+
+    /**
+     * 30.5次间谐波电压含有率最小值
+     */
+    @TableField(value = "centre_harmonic_voltage_content31_min")
+    @ApiModelProperty(value = "30.5次间谐波电压含有率最小值")
+    private Double centreHarmonicVoltageContent31Min;
+
+    /**
+     * 30.5次间谐波电压含有率平均值
+     */
+    @TableField(value = "centre_harmonic_voltage_content31_avg")
+    @ApiModelProperty(value = "30.5次间谐波电压含有率平均值")
+    private Double centreHarmonicVoltageContent31Avg;
+
+    /**
+     * 30.5次间谐波电压含有率95值
+     */
+    @TableField(value = "centre_harmonic_voltage_content31_cp95")
+    @ApiModelProperty(value = "30.5次间谐波电压含有率95值")
+    private Double centreHarmonicVoltageContent31Cp95;
+
+    /**
+     * 31.5次间谐波电压含有率最大值
+     */
+    @TableField(value = "centre_harmonic_voltage_content32_max")
+    @ApiModelProperty(value = "31.5次间谐波电压含有率最大值")
+    private Double centreHarmonicVoltageContent32Max;
+
+    /**
+     * 31.5次间谐波电压含有率最小值
+     */
+    @TableField(value = "centre_harmonic_voltage_content32_min")
+    @ApiModelProperty(value = "31.5次间谐波电压含有率最小值")
+    private Double centreHarmonicVoltageContent32Min;
+
+    /**
+     * 31.5次间谐波电压含有率平均值
+     */
+    @TableField(value = "centre_harmonic_voltage_content32_avg")
+    @ApiModelProperty(value = "31.5次间谐波电压含有率平均值")
+    private Double centreHarmonicVoltageContent32Avg;
+
+    /**
+     * 31.5次间谐波电压含有率95值
+     */
+    @TableField(value = "centre_harmonic_voltage_content32_cp95")
+    @ApiModelProperty(value = "31.5次间谐波电压含有率95值")
+    private Double centreHarmonicVoltageContent32Cp95;
+
+    /**
+     * 32.5次间谐波电压含有率最大值
+     */
+    @TableField(value = "centre_harmonic_voltage_content33_max")
+    @ApiModelProperty(value = "32.5次间谐波电压含有率最大值")
+    private Double centreHarmonicVoltageContent33Max;
+
+    /**
+     * 32.5次间谐波电压含有率最小值
+     */
+    @TableField(value = "centre_harmonic_voltage_content33_min")
+    @ApiModelProperty(value = "32.5次间谐波电压含有率最小值")
+    private Double centreHarmonicVoltageContent33Min;
+
+    /**
+     * 32.5次间谐波电压含有率平均值
+     */
+    @TableField(value = "centre_harmonic_voltage_content33_avg")
+    @ApiModelProperty(value = "32.5次间谐波电压含有率平均值")
+    private Double centreHarmonicVoltageContent33Avg;
+
+    /**
+     * 32.5次间谐波电压含有率95值
+     */
+    @TableField(value = "centre_harmonic_voltage_content33_cp95")
+    @ApiModelProperty(value = "32.5次间谐波电压含有率95值")
+    private Double centreHarmonicVoltageContent33Cp95;
+
+    /**
+     * 33.5次间谐波电压含有率最大值
+     */
+    @TableField(value = "centre_harmonic_voltage_content34_max")
+    @ApiModelProperty(value = "33.5次间谐波电压含有率最大值")
+    private Double centreHarmonicVoltageContent34Max;
+
+    /**
+     * 33.5次间谐波电压含有率最小值
+     */
+    @TableField(value = "centre_harmonic_voltage_content34_min")
+    @ApiModelProperty(value = "33.5次间谐波电压含有率最小值")
+    private Double centreHarmonicVoltageContent34Min;
+
+    /**
+     * 33.5次间谐波电压含有率平均值
+     */
+    @TableField(value = "centre_harmonic_voltage_content34_avg")
+    @ApiModelProperty(value = "33.5次间谐波电压含有率平均值")
+    private Double centreHarmonicVoltageContent34Avg;
+
+    /**
+     * 33.5次间谐波电压含有率95值
+     */
+    @TableField(value = "centre_harmonic_voltage_content34_cp95")
+    @ApiModelProperty(value = "33.5次间谐波电压含有率95值")
+    private Double centreHarmonicVoltageContent34Cp95;
+
+    /**
+     * 34.5次间谐波电压含有率最大值
+     */
+    @TableField(value = "centre_harmonic_voltage_content35_max")
+    @ApiModelProperty(value = "34.5次间谐波电压含有率最大值")
+    private Double centreHarmonicVoltageContent35Max;
+
+    /**
+     * 34.5次间谐波电压含有率最小值
+     */
+    @TableField(value = "centre_harmonic_voltage_content35_min")
+    @ApiModelProperty(value = "34.5次间谐波电压含有率最小值")
+    private Double centreHarmonicVoltageContent35Min;
+
+    /**
+     * 34.5次间谐波电压含有率平均值
+     */
+    @TableField(value = "centre_harmonic_voltage_content35_avg")
+    @ApiModelProperty(value = "34.5次间谐波电压含有率平均值")
+    private Double centreHarmonicVoltageContent35Avg;
+
+    /**
+     * 34.5次间谐波电压含有率95值
+     */
+    @TableField(value = "centre_harmonic_voltage_content35_cp95")
+    @ApiModelProperty(value = "34.5次间谐波电压含有率95值")
+    private Double centreHarmonicVoltageContent35Cp95;
+
+    /**
+     * 35.5次间谐波电压含有率最大值
+     */
+    @TableField(value = "centre_harmonic_voltage_content36_max")
+    @ApiModelProperty(value = "35.5次间谐波电压含有率最大值")
+    private Double centreHarmonicVoltageContent36Max;
+
+    /**
+     * 35.5次间谐波电压含有率最小值
+     */
+    @TableField(value = "centre_harmonic_voltage_content36_min")
+    @ApiModelProperty(value = "35.5次间谐波电压含有率最小值")
+    private Double centreHarmonicVoltageContent36Min;
+
+    /**
+     * 35.5次间谐波电压含有率平均值
+     */
+    @TableField(value = "centre_harmonic_voltage_content36_avg")
+    @ApiModelProperty(value = "35.5次间谐波电压含有率平均值")
+    private Double centreHarmonicVoltageContent36Avg;
+
+    /**
+     * 35.5次间谐波电压含有率95值
+     */
+    @TableField(value = "centre_harmonic_voltage_content36_cp95")
+    @ApiModelProperty(value = "35.5次间谐波电压含有率95值")
+    private Double centreHarmonicVoltageContent36Cp95;
+
+    /**
+     * 36.5次间谐波电压含有率最大值
+     */
+    @TableField(value = "centre_harmonic_voltage_content37_max")
+    @ApiModelProperty(value = "36.5次间谐波电压含有率最大值")
+    private Double centreHarmonicVoltageContent37Max;
+
+    /**
+     * 36.5次间谐波电压含有率最小值
+     */
+    @TableField(value = "centre_harmonic_voltage_content37_min")
+    @ApiModelProperty(value = "36.5次间谐波电压含有率最小值")
+    private Double centreHarmonicVoltageContent37Min;
+
+    /**
+     * 36.5次间谐波电压含有率平均值
+     */
+    @TableField(value = "centre_harmonic_voltage_content37_avg")
+    @ApiModelProperty(value = "36.5次间谐波电压含有率平均值")
+    private Double centreHarmonicVoltageContent37Avg;
+
+    /**
+     * 36.5次间谐波电压含有率95值
+     */
+    @TableField(value = "centre_harmonic_voltage_content37_cp95")
+    @ApiModelProperty(value = "36.5次间谐波电压含有率95值")
+    private Double centreHarmonicVoltageContent37Cp95;
+
+    /**
+     * 37.5次间谐波电压含有率最大值
+     */
+    @TableField(value = "centre_harmonic_voltage_content38_max")
+    @ApiModelProperty(value = "37.5次间谐波电压含有率最大值")
+    private Double centreHarmonicVoltageContent38Max;
+
+    /**
+     * 37.5次间谐波电压含有率最小值
+     */
+    @TableField(value = "centre_harmonic_voltage_content38_min")
+    @ApiModelProperty(value = "37.5次间谐波电压含有率最小值")
+    private Double centreHarmonicVoltageContent38Min;
+
+    /**
+     * 37.5次间谐波电压含有率平均值
+     */
+    @TableField(value = "centre_harmonic_voltage_content38_avg")
+    @ApiModelProperty(value = "37.5次间谐波电压含有率平均值")
+    private Double centreHarmonicVoltageContent38Avg;
+
+    /**
+     * 37.5次间谐波电压含有率95值
+     */
+    @TableField(value = "centre_harmonic_voltage_content38_cp95")
+    @ApiModelProperty(value = "37.5次间谐波电压含有率95值")
+    private Double centreHarmonicVoltageContent38Cp95;
+
+    /**
+     * 38.5次间谐波电压含有率最大值
+     */
+    @TableField(value = "centre_harmonic_voltage_content39_max")
+    @ApiModelProperty(value = "38.5次间谐波电压含有率最大值")
+    private Double centreHarmonicVoltageContent39Max;
+
+    /**
+     * 38.5次间谐波电压含有率最小值
+     */
+    @TableField(value = "centre_harmonic_voltage_content39_min")
+    @ApiModelProperty(value = "38.5次间谐波电压含有率最小值")
+    private Double centreHarmonicVoltageContent39Min;
+
+    /**
+     * 38.5次间谐波电压含有率平均值
+     */
+    @TableField(value = "centre_harmonic_voltage_content39_avg")
+    @ApiModelProperty(value = "38.5次间谐波电压含有率平均值")
+    private Double centreHarmonicVoltageContent39Avg;
+
+    /**
+     * 38.5次间谐波电压含有率95值
+     */
+    @TableField(value = "centre_harmonic_voltage_content39_cp95")
+    @ApiModelProperty(value = "38.5次间谐波电压含有率95值")
+    private Double centreHarmonicVoltageContent39Cp95;
+
+    /**
+     * 39.5次间谐波电压含有率最大值
+     */
+    @TableField(value = "centre_harmonic_voltage_content40_max")
+    @ApiModelProperty(value = "39.5次间谐波电压含有率最大值")
+    private Double centreHarmonicVoltageContent40Max;
+
+    /**
+     * 39.5次间谐波电压含有率最小值
+     */
+    @TableField(value = "centre_harmonic_voltage_content40_min")
+    @ApiModelProperty(value = "39.5次间谐波电压含有率最小值")
+    private Double centreHarmonicVoltageContent40Min;
+
+    /**
+     * 39.5次间谐波电压含有率平均值
+     */
+    @TableField(value = "centre_harmonic_voltage_content40_avg")
+    @ApiModelProperty(value = "39.5次间谐波电压含有率平均值")
+    private Double centreHarmonicVoltageContent40Avg;
+
+    /**
+     * 39.5次间谐波电压含有率95值
+     */
+    @TableField(value = "centre_harmonic_voltage_content40_cp95")
+    @ApiModelProperty(value = "39.5次间谐波电压含有率95值")
+    private Double centreHarmonicVoltageContent40Cp95;
+
+    /**
+     * 40.5次间谐波电压含有率最大值
+     */
+    @TableField(value = "centre_harmonic_voltage_content41_max")
+    @ApiModelProperty(value = "40.5次间谐波电压含有率最大值")
+    private Double centreHarmonicVoltageContent41Max;
+
+    /**
+     * 40.5次间谐波电压含有率最小值
+     */
+    @TableField(value = "centre_harmonic_voltage_content41_min")
+    @ApiModelProperty(value = "40.5次间谐波电压含有率最小值")
+    private Double centreHarmonicVoltageContent41Min;
+
+    /**
+     * 40.5次间谐波电压含有率平均值
+     */
+    @TableField(value = "centre_harmonic_voltage_content41_avg")
+    @ApiModelProperty(value = "40.5次间谐波电压含有率平均值")
+    private Double centreHarmonicVoltageContent41Avg;
+
+    /**
+     * 40.5次间谐波电压含有率95值
+     */
+    @TableField(value = "centre_harmonic_voltage_content41_cp95")
+    @ApiModelProperty(value = "40.5次间谐波电压含有率95值")
+    private Double centreHarmonicVoltageContent41Cp95;
+
+    /**
+     * 41.5次间谐波电压含有率最大值
+     */
+    @TableField(value = "centre_harmonic_voltage_content42_max")
+    @ApiModelProperty(value = "41.5次间谐波电压含有率最大值")
+    private Double centreHarmonicVoltageContent42Max;
+
+    /**
+     * 41.5次间谐波电压含有率最小值
+     */
+    @TableField(value = "centre_harmonic_voltage_content42_min")
+    @ApiModelProperty(value = "41.5次间谐波电压含有率最小值")
+    private Double centreHarmonicVoltageContent42Min;
+
+    /**
+     * 41.5次间谐波电压含有率平均值
+     */
+    @TableField(value = "centre_harmonic_voltage_content42_avg")
+    @ApiModelProperty(value = "41.5次间谐波电压含有率平均值")
+    private Double centreHarmonicVoltageContent42Avg;
+
+    /**
+     * 41.5次间谐波电压含有率95值
+     */
+    @TableField(value = "centre_harmonic_voltage_content42_cp95")
+    @ApiModelProperty(value = "41.5次间谐波电压含有率95值")
+    private Double centreHarmonicVoltageContent42Cp95;
+
+    /**
+     * 42.5次间谐波电压含有率最大值
+     */
+    @TableField(value = "centre_harmonic_voltage_content43_max")
+    @ApiModelProperty(value = "42.5次间谐波电压含有率最大值")
+    private Double centreHarmonicVoltageContent43Max;
+
+    /**
+     * 42.5次间谐波电压含有率最小值
+     */
+    @TableField(value = "centre_harmonic_voltage_content43_min")
+    @ApiModelProperty(value = "42.5次间谐波电压含有率最小值")
+    private Double centreHarmonicVoltageContent43Min;
+
+    /**
+     * 42.5次间谐波电压含有率平均值
+     */
+    @TableField(value = "centre_harmonic_voltage_content43_avg")
+    @ApiModelProperty(value = "42.5次间谐波电压含有率平均值")
+    private Double centreHarmonicVoltageContent43Avg;
+
+    /**
+     * 42.5次间谐波电压含有率95值
+     */
+    @TableField(value = "centre_harmonic_voltage_content43_cp95")
+    @ApiModelProperty(value = "42.5次间谐波电压含有率95值")
+    private Double centreHarmonicVoltageContent43Cp95;
+
+    /**
+     * 43.5次间谐波电压含有率最大值
+     */
+    @TableField(value = "centre_harmonic_voltage_content44_max")
+    @ApiModelProperty(value = "43.5次间谐波电压含有率最大值")
+    private Double centreHarmonicVoltageContent44Max;
+
+    /**
+     * 43.5次间谐波电压含有率最小值
+     */
+    @TableField(value = "centre_harmonic_voltage_content44_min")
+    @ApiModelProperty(value = "43.5次间谐波电压含有率最小值")
+    private Double centreHarmonicVoltageContent44Min;
+
+    /**
+     * 43.5次间谐波电压含有率平均值
+     */
+    @TableField(value = "centre_harmonic_voltage_content44_avg")
+    @ApiModelProperty(value = "43.5次间谐波电压含有率平均值")
+    private Double centreHarmonicVoltageContent44Avg;
+
+    /**
+     * 43.5次间谐波电压含有率95值
+     */
+    @TableField(value = "centre_harmonic_voltage_content44_cp95")
+    @ApiModelProperty(value = "43.5次间谐波电压含有率95值")
+    private Double centreHarmonicVoltageContent44Cp95;
+
+    /**
+     * 44.5次间谐波电压含有率最大值
+     */
+    @TableField(value = "centre_harmonic_voltage_content45_max")
+    @ApiModelProperty(value = "44.5次间谐波电压含有率最大值")
+    private Double centreHarmonicVoltageContent45Max;
+
+    /**
+     * 44.5次间谐波电压含有率最小值
+     */
+    @TableField(value = "centre_harmonic_voltage_content45_min")
+    @ApiModelProperty(value = "44.5次间谐波电压含有率最小值")
+    private Double centreHarmonicVoltageContent45Min;
+
+    /**
+     * 44.5次间谐波电压含有率平均值
+     */
+    @TableField(value = "centre_harmonic_voltage_content45_avg")
+    @ApiModelProperty(value = "44.5次间谐波电压含有率平均值")
+    private Double centreHarmonicVoltageContent45Avg;
+
+    /**
+     * 44.5次间谐波电压含有率95值
+     */
+    @TableField(value = "centre_harmonic_voltage_content45_cp95")
+    @ApiModelProperty(value = "44.5次间谐波电压含有率95值")
+    private Double centreHarmonicVoltageContent45Cp95;
+
+    /**
+     * 45.5次间谐波电压含有率最大值
+     */
+    @TableField(value = "centre_harmonic_voltage_content46_max")
+    @ApiModelProperty(value = "45.5次间谐波电压含有率最大值")
+    private Double centreHarmonicVoltageContent46Max;
+
+    /**
+     * 45.5次间谐波电压含有率最小值
+     */
+    @TableField(value = "centre_harmonic_voltage_content46_min")
+    @ApiModelProperty(value = "45.5次间谐波电压含有率最小值")
+    private Double centreHarmonicVoltageContent46Min;
+
+    /**
+     * 45.5次间谐波电压含有率平均值
+     */
+    @TableField(value = "centre_harmonic_voltage_content46_avg")
+    @ApiModelProperty(value = "45.5次间谐波电压含有率平均值")
+    private Double centreHarmonicVoltageContent46Avg;
+
+    /**
+     * 45.5次间谐波电压含有率95值
+     */
+    @TableField(value = "centre_harmonic_voltage_content46_cp95")
+    @ApiModelProperty(value = "45.5次间谐波电压含有率95值")
+    private Double centreHarmonicVoltageContent46Cp95;
+
+    /**
+     * 46.5次间谐波电压含有率最大值
+     */
+    @TableField(value = "centre_harmonic_voltage_content47_max")
+    @ApiModelProperty(value = "46.5次间谐波电压含有率最大值")
+    private Double centreHarmonicVoltageContent47Max;
+
+    /**
+     * 46.5次间谐波电压含有率最小值
+     */
+    @TableField(value = "centre_harmonic_voltage_content47_min")
+    @ApiModelProperty(value = "46.5次间谐波电压含有率最小值")
+    private Double centreHarmonicVoltageContent47Min;
+
+    /**
+     * 46.5次间谐波电压含有率平均值
+     */
+    @TableField(value = "centre_harmonic_voltage_content47_avg")
+    @ApiModelProperty(value = "46.5次间谐波电压含有率平均值")
+    private Double centreHarmonicVoltageContent47Avg;
+
+    /**
+     * 46.5次间谐波电压含有率95值
+     */
+    @TableField(value = "centre_harmonic_voltage_content47_cp95")
+    @ApiModelProperty(value = "46.5次间谐波电压含有率95值")
+    private Double centreHarmonicVoltageContent47Cp95;
+
+    /**
+     * 47.5次间谐波电压含有率最大值
+     */
+    @TableField(value = "centre_harmonic_voltage_content48_max")
+    @ApiModelProperty(value = "47.5次间谐波电压含有率最大值")
+    private Double centreHarmonicVoltageContent48Max;
+
+    /**
+     * 47.5次间谐波电压含有率最小值
+     */
+    @TableField(value = "centre_harmonic_voltage_content48_min")
+    @ApiModelProperty(value = "47.5次间谐波电压含有率最小值")
+    private Double centreHarmonicVoltageContent48Min;
+
+    /**
+     * 47.5次间谐波电压含有率平均值
+     */
+    @TableField(value = "centre_harmonic_voltage_content48_avg")
+    @ApiModelProperty(value = "47.5次间谐波电压含有率平均值")
+    private Double centreHarmonicVoltageContent48Avg;
+
+    /**
+     * 47.5次间谐波电压含有率95值
+     */
+    @TableField(value = "centre_harmonic_voltage_content48_cp95")
+    @ApiModelProperty(value = "47.5次间谐波电压含有率95值")
+    private Double centreHarmonicVoltageContent48Cp95;
+
+    /**
+     * 48.5次间谐波电压含有率最大值
+     */
+    @TableField(value = "centre_harmonic_voltage_content49_max")
+    @ApiModelProperty(value = "48.5次间谐波电压含有率最大值")
+    private Double centreHarmonicVoltageContent49Max;
+
+    /**
+     * 48.5次间谐波电压含有率最小值
+     */
+    @TableField(value = "centre_harmonic_voltage_content49_min")
+    @ApiModelProperty(value = "48.5次间谐波电压含有率最小值")
+    private Double centreHarmonicVoltageContent49Min;
+
+    /**
+     * 48.5次间谐波电压含有率平均值
+     */
+    @TableField(value = "centre_harmonic_voltage_content49_avg")
+    @ApiModelProperty(value = "48.5次间谐波电压含有率平均值")
+    private Double centreHarmonicVoltageContent49Avg;
+
+    /**
+     * 48.5次间谐波电压含有率95值
+     */
+    @TableField(value = "centre_harmonic_voltage_content49_cp95")
+    @ApiModelProperty(value = "48.5次间谐波电压含有率95值")
+    private Double centreHarmonicVoltageContent49Cp95;
+
+    /**
+     * 49.5次间谐波电压含有率最大值
+     */
+    @TableField(value = "centre_harmonic_voltage_content50_max")
+    @ApiModelProperty(value = "49.5次间谐波电压含有率最大值")
+    private Double centreHarmonicVoltageContent50Max;
+
+    /**
+     * 49.5次间谐波电压含有率最小值
+     */
+    @TableField(value = "centre_harmonic_voltage_content50_min")
+    @ApiModelProperty(value = "49.5次间谐波电压含有率最小值")
+    private Double centreHarmonicVoltageContent50Min;
+
+    /**
+     * 49.5次间谐波电压含有率平均值
+     */
+    @TableField(value = "centre_harmonic_voltage_content50_avg")
+    @ApiModelProperty(value = "49.5次间谐波电压含有率平均值")
+    private Double centreHarmonicVoltageContent50Avg;
+
+    /**
+     * 49.5次间谐波电压含有率95值
+     */
+    @TableField(value = "centre_harmonic_voltage_content50_cp95")
+    @ApiModelProperty(value = "49.5次间谐波电压含有率95值")
+    private Double centreHarmonicVoltageContent50Cp95;
+}
\ No newline at end of file
diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/pojo/po/line/RMpMeasurePhaseReportDPO.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/pojo/po/line/RMpMeasurePhaseReportDPO.java
new file mode 100644
index 000000000..db40a7c61
--- /dev/null
+++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/pojo/po/line/RMpMeasurePhaseReportDPO.java
@@ -0,0 +1,325 @@
+package com.njcn.prepare.harmonic.pojo.po.line;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.github.jeffreyning.mybatisplus.anno.MppMultiId;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 
+ * Description:
+ * 接口文档访问地址：http://serverIP:port/swagger-ui.html
+ * Date: 2022/10/28  10:53【需求编号】
+ *
+ * @author clam
+ * @version V1.0.0
+ */
+@ApiModel(value="com-njcn-prepare-harmonic-pojo-po-line-RMpMeasurePhaseReportDPO")
+@Data
+@TableName(value = "r_mp_measure_phase_report_d")
+public class RMpMeasurePhaseReportDPO {
+    /**
+     * 监测点ID
+     */
+    @MppMultiId(value = "measurement_point_id")
+    @ApiModelProperty(value="监测点ID")
+    private String measurementPointId;
+
+    /**
+     * 生成数据的时间,每日统计一次
+     */
+    @MppMultiId(value = "data_date")
+    @ApiModelProperty(value="生成数据的时间,每日统计一次")
+    private Date dataDate;
+
+    /**
+     * 相别：‘A’ ‘B’ ‘C’ ‘ABC’ ‘T’  配网部分相别的数据采用T标志存储
+     */
+    @MppMultiId(value = "phase")
+    @ApiModelProperty(value="相别：‘A’ ‘B’ ‘C’ ‘ABC’ ‘T’  配网部分相别的数据采用T标志存储")
+    private String phase;
+
+    /**
+     * 相电压有效值-最大值
+     */
+    @TableField(value = "phase_voltage_effective_max")
+    @ApiModelProperty(value="相电压有效值-最大值")
+    private Double phaseVoltageEffectiveMax;
+
+    /**
+     * 相电压有效值-最小值
+     */
+    @TableField(value = "phase_voltage_effective_min")
+    @ApiModelProperty(value="相电压有效值-最小值")
+    private Double phaseVoltageEffectiveMin;
+
+    /**
+     * 相电压有效值-平均值
+     */
+    @TableField(value = "phase_voltage_effective_avg")
+    @ApiModelProperty(value="相电压有效值-平均值")
+    private Double phaseVoltageEffectiveAvg;
+
+    /**
+     * 相电压有效值-95值
+     */
+    @TableField(value = "phase_voltage_effective_95")
+    @ApiModelProperty(value="相电压有效值-95值")
+    private Double phaseVoltageEffective95;
+
+    /**
+     * 线电压有效值-最大值
+     */
+    @TableField(value = "line_voltage_effective_max")
+    @ApiModelProperty(value="线电压有效值-最大值")
+    private Double lineVoltageEffectiveMax;
+
+    /**
+     * 线电压有效值-最小值
+     */
+    @TableField(value = "line_voltage_effective_min")
+    @ApiModelProperty(value="线电压有效值-最小值")
+    private Double lineVoltageEffectiveMin;
+
+    /**
+     * 线电压有效值-平均值
+     */
+    @TableField(value = "line_voltage_effective_avg")
+    @ApiModelProperty(value="线电压有效值-平均值")
+    private Double lineVoltageEffectiveAvg;
+
+    /**
+     * 线电压有效值-95值
+     */
+    @TableField(value = "line_voltage_effective_95")
+    @ApiModelProperty(value="线电压有效值-95值")
+    private Double lineVoltageEffective95;
+
+    /**
+     * 电压上偏差-最大值
+     */
+    @TableField(value = "v_de_up_max")
+    @ApiModelProperty(value="电压上偏差-最大值")
+    private Double vDeUpMax;
+
+    /**
+     * 电压上偏差-最小值
+     */
+    @TableField(value = "v_de_up_min")
+    @ApiModelProperty(value="电压上偏差-最小值")
+    private Double vDeUpMin;
+
+    /**
+     * 电压上偏差-平均值
+     */
+    @TableField(value = "v_de_up_avg")
+    @ApiModelProperty(value="电压上偏差-平均值")
+    private Double vDeUpAvg;
+
+    /**
+     * 电压上偏差-95值
+     */
+    @TableField(value = "v_de_up_95")
+    @ApiModelProperty(value="电压上偏差-95值")
+    private Double vDeUp95;
+
+    /**
+     * 电压下偏差-最大值
+     */
+    @TableField(value = "v_de_low_max")
+    @ApiModelProperty(value="电压下偏差-最大值")
+    private Double vDeLowMax;
+
+    /**
+     * 电压下偏差-最小值
+     */
+    @TableField(value = "v_de_low_min")
+    @ApiModelProperty(value="电压下偏差-最小值")
+    private Double vDeLowMin;
+
+    /**
+     * 电压下偏差-平均值
+     */
+    @TableField(value = "v_de_low_avg")
+    @ApiModelProperty(value="电压下偏差-平均值")
+    private Double vDeLowAvg;
+
+    /**
+     * 电压下偏差-95值
+     */
+    @TableField(value = "v_de_low_95")
+    @ApiModelProperty(value="电压下偏差-95值")
+    private Double vDeLow95;
+
+    /**
+     * 电流有效值-最大值
+     */
+    @TableField(value = "current_effective_max")
+    @ApiModelProperty(value="电流有效值-最大值")
+    private Double currentEffectiveMax;
+
+    /**
+     * 电流有效值-最小值
+     */
+    @TableField(value = "current_effective_min")
+    @ApiModelProperty(value="电流有效值-最小值")
+    private Double currentEffectiveMin;
+
+    /**
+     * 电流有效值-平均值
+     */
+    @TableField(value = "current_effective_avg")
+    @ApiModelProperty(value="电流有效值-平均值")
+    private Double currentEffectiveAvg;
+
+    /**
+     * 电流有效值-95值
+     */
+    @TableField(value = "current_effective_95")
+    @ApiModelProperty(value="电流有效值-95值")
+    private Double currentEffective95;
+
+    /**
+     * 单相有功功率-最大值
+     */
+    @TableField(value = "sp_active_power_max")
+    @ApiModelProperty(value="单相有功功率-最大值")
+    private Double spActivePowerMax;
+
+    /**
+     * 单相有功功率-最小值
+     */
+    @TableField(value = "sp_active_power_min")
+    @ApiModelProperty(value="单相有功功率-最小值")
+    private Double spActivePowerMin;
+
+    /**
+     * 单相有功功率-平均值
+     */
+    @TableField(value = "sp_active_power_avg")
+    @ApiModelProperty(value="单相有功功率-平均值")
+    private Double spActivePowerAvg;
+
+    /**
+     * 单相有功功率-95值
+     */
+    @TableField(value = "sp_active_power_95")
+    @ApiModelProperty(value="单相有功功率-95值")
+    private Double spActivePower95;
+
+    /**
+     * 单相无功功率-最大值
+     */
+    @TableField(value = "sp_reactive_power_max")
+    @ApiModelProperty(value="单相无功功率-最大值")
+    private Double spReactivePowerMax;
+
+    /**
+     * 单相无功功率-最小值
+     */
+    @TableField(value = "sp_reactive_power_min")
+    @ApiModelProperty(value="单相无功功率-最小值")
+    private Double spReactivePowerMin;
+
+    /**
+     * 单相无功功率-平均值
+     */
+    @TableField(value = "sp_reactive_power_avg")
+    @ApiModelProperty(value="单相无功功率-平均值")
+    private Double spReactivePowerAvg;
+
+    /**
+     * 单相无功功率-95值
+     */
+    @TableField(value = "sp_reactive_power_95")
+    @ApiModelProperty(value="单相无功功率-95值")
+    private Double spReactivePower95;
+
+    /**
+     * 单相视在功率-最大值
+     */
+    @TableField(value = "sp_apparent_power_max")
+    @ApiModelProperty(value="单相视在功率-最大值")
+    private Double spApparentPowerMax;
+
+    /**
+     * 单相视在功率-最小值
+     */
+    @TableField(value = "sp_apparent_power_min")
+    @ApiModelProperty(value="单相视在功率-最小值")
+    private Double spApparentPowerMin;
+
+    /**
+     * 单相视在功率-平均值
+     */
+    @TableField(value = "sp_apparent_power_avg")
+    @ApiModelProperty(value="单相视在功率-平均值")
+    private Double spApparentPowerAvg;
+
+    /**
+     * 单相视在功率-95值
+     */
+    @TableField(value = "sp_apparent_power_95")
+    @ApiModelProperty(value="单相视在功率-95值")
+    private Double spApparentPower95;
+
+    /**
+     * 单相功率因数-最大值
+     */
+    @TableField(value = "sp_power_factor_max")
+    @ApiModelProperty(value="单相功率因数-最大值")
+    private Double spPowerFactorMax;
+
+    /**
+     * 单相功率因数-最小值
+     */
+    @TableField(value = "sp_power_factor_min")
+    @ApiModelProperty(value="单相功率因数-最小值")
+    private Double spPowerFactorMin;
+
+    /**
+     * 单相功率因数-平均值
+     */
+    @TableField(value = "sp_power_factor_avg")
+    @ApiModelProperty(value="单相功率因数-平均值")
+    private Double spPowerFactorAvg;
+
+    /**
+     * 单相功率因数-95值
+     */
+    @TableField(value = "sp_power_factor_95")
+    @ApiModelProperty(value="单相功率因数-95值")
+    private Double spPowerFactor95;
+
+    /**
+     * 单相基波功率因数-最大值
+     */
+    @TableField(value = "sp_fundamental_power_factor_max")
+    @ApiModelProperty(value="单相基波功率因数-最大值")
+    private Double spFundamentalPowerFactorMax;
+
+    /**
+     * 单相基波功率因数-最小值
+     */
+    @TableField(value = "sp_fundamental_power_factor_min")
+    @ApiModelProperty(value="单相基波功率因数-最小值")
+    private Double spFundamentalPowerFactorMin;
+
+    /**
+     * 单相基波功率因数-平均值
+     */
+    @TableField(value = "sp_fundamental_power_factor_avg")
+    @ApiModelProperty(value="单相基波功率因数-平均值")
+    private Double spFundamentalPowerFactorAvg;
+
+    /**
+     * 单相基波功率因数-95值
+     */
+    @TableField(value = "sp_fundamental_power_factor_95")
+    @ApiModelProperty(value="单相基波功率因数-95值")
+    private Double spFundamentalPowerFactor95;
+}
\ No newline at end of file
diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/pojo/po/line/RMpMeasureReportDPO.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/pojo/po/line/RMpMeasureReportDPO.java
new file mode 100644
index 000000000..cabca7369
--- /dev/null
+++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/pojo/po/line/RMpMeasureReportDPO.java
@@ -0,0 +1,682 @@
+package com.njcn.prepare.harmonic.pojo.po.line;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.github.jeffreyning.mybatisplus.anno.MppMultiId;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 
+ * Description:
+ * 接口文档访问地址：http://serverIP:port/swagger-ui.html
+ * Date: 2022/10/28  10:54【需求编号】
+ *
+ * @author clam
+ * @version V1.0.0
+ */
+@ApiModel(value="com-njcn-prepare-harmonic-pojo-po-line-RMpMeasureReportDPO")
+@Data
+@TableName(value = "r_mp_measure_report_d")
+public class RMpMeasureReportDPO {
+    /**
+     * 监测点ID
+     */
+    @MppMultiId(value = "measurement_point_id")
+    @ApiModelProperty(value="监测点ID")
+    private String measurementPointId;
+
+    /**
+     * 生成数据的时间,每日统计一次
+     */
+    @MppMultiId(value = "data_date")
+    @ApiModelProperty(value="生成数据的时间,每日统计一次")
+    private Date dataDate;
+
+    /**
+     * 频率-最大值
+     */
+    @TableField(value = "frequency_max")
+    @ApiModelProperty(value="频率-最大值")
+    private Double frequencyMax;
+
+    /**
+     * 频率-最小值
+     */
+    @TableField(value = "frequency_min")
+    @ApiModelProperty(value="频率-最小值")
+    private Double frequencyMin;
+
+    /**
+     * 频率-平均值
+     */
+    @TableField(value = "frequency_avg")
+    @ApiModelProperty(value="频率-平均值")
+    private Double frequencyAvg;
+
+    /**
+     * 频率-95值
+     */
+    @TableField(value = "frequency_95")
+    @ApiModelProperty(value="频率-95值")
+    private Double frequency95;
+
+    /**
+     * 频率偏差-最大值
+     */
+    @TableField(value = "frequency_deviation_max")
+    @ApiModelProperty(value="频率偏差-最大值")
+    private Double frequencyDeviationMax;
+
+    /**
+     * 频率偏差-最小值
+     */
+    @TableField(value = "frequency_deviation_min")
+    @ApiModelProperty(value="频率偏差-最小值")
+    private Double frequencyDeviationMin;
+
+    /**
+     * 频率偏差-平均值
+     */
+    @TableField(value = "frequency_deviation_avg")
+    @ApiModelProperty(value="频率偏差-平均值")
+    private Double frequencyDeviationAvg;
+
+    /**
+     * 频率偏差-95值
+     */
+    @TableField(value = "frequency_deviation_95")
+    @ApiModelProperty(value="频率偏差-95值")
+    private Double frequencyDeviation95;
+
+    /**
+     * 总有功功率-最大值
+     */
+    @TableField(value = "total_active_power_max")
+    @ApiModelProperty(value="总有功功率-最大值")
+    private Double totalActivePowerMax;
+
+    /**
+     * 总有功功率-最小值
+     */
+    @TableField(value = "total_active_power_min")
+    @ApiModelProperty(value="总有功功率-最小值")
+    private Double totalActivePowerMin;
+
+    /**
+     * 总有功功率-平均值
+     */
+    @TableField(value = "total_active_power_avg")
+    @ApiModelProperty(value="总有功功率-平均值")
+    private Double totalActivePowerAvg;
+
+    /**
+     * 总有功功率-95值
+     */
+    @TableField(value = "total_active_power_95")
+    @ApiModelProperty(value="总有功功率-95值")
+    private Double totalActivePower95;
+
+    /**
+     * 总无功功率-最大值
+     */
+    @TableField(value = "total_reactive_power_max")
+    @ApiModelProperty(value="总无功功率-最大值")
+    private Double totalReactivePowerMax;
+
+    /**
+     * 总无功功率-最小值
+     */
+    @TableField(value = "total_reactive_power_min")
+    @ApiModelProperty(value="总无功功率-最小值")
+    private Double totalReactivePowerMin;
+
+    /**
+     * 总无功功率-平均值
+     */
+    @TableField(value = "total_reactive_power_avg")
+    @ApiModelProperty(value="总无功功率-平均值")
+    private Double totalReactivePowerAvg;
+
+    /**
+     * 总无功功率-95值
+     */
+    @TableField(value = "total_reactive_power_95")
+    @ApiModelProperty(value="总无功功率-95值")
+    private Double totalReactivePower95;
+
+    /**
+     * 总视在功率-最大值
+     */
+    @TableField(value = "total_apparent_power_max")
+    @ApiModelProperty(value="总视在功率-最大值")
+    private Double totalApparentPowerMax;
+
+    /**
+     * 总视在功率-最小值
+     */
+    @TableField(value = "total_apparent_power_min")
+    @ApiModelProperty(value="总视在功率-最小值")
+    private Double totalApparentPowerMin;
+
+    /**
+     * 总视在功率-平均值
+     */
+    @TableField(value = "total_apparent_power_avg")
+    @ApiModelProperty(value="总视在功率-平均值")
+    private Double totalApparentPowerAvg;
+
+    /**
+     * 总视在功率-95值
+     */
+    @TableField(value = "total_apparent_power_95")
+    @ApiModelProperty(value="总视在功率-95值")
+    private Double totalApparentPower95;
+
+    /**
+     * 三相功率因数-最大值
+     */
+    @TableField(value = "tp_power_factor_max")
+    @ApiModelProperty(value="三相功率因数-最大值")
+    private Double tpPowerFactorMax;
+
+    /**
+     * 三相功率因数-最小值
+     */
+    @TableField(value = "tp_power_factor_min")
+    @ApiModelProperty(value="三相功率因数-最小值")
+    private Double tpPowerFactorMin;
+
+    /**
+     * 三相功率因数-平均值
+     */
+    @TableField(value = "tp_power_factor_avg")
+    @ApiModelProperty(value="三相功率因数-平均值")
+    private Double tpPowerFactorAvg;
+
+    /**
+     * 三相功率因数-95值
+     */
+    @TableField(value = "tp_power_factor_95")
+    @ApiModelProperty(value="三相功率因数-95值")
+    private Double tpPowerFactor95;
+
+    /**
+     * 基波功率因数-最大值
+     */
+    @TableField(value = "fundamental_power_factor_max")
+    @ApiModelProperty(value="基波功率因数-最大值")
+    private Double fundamentalPowerFactorMax;
+
+    /**
+     * 基波功率因数-最小值
+     */
+    @TableField(value = "fundamental_power_factor_min")
+    @ApiModelProperty(value="基波功率因数-最小值")
+    private Double fundamentalPowerFactorMin;
+
+    /**
+     * 基波功率因数-平均值
+     */
+    @TableField(value = "fundamental_power_factor_avg")
+    @ApiModelProperty(value="基波功率因数-平均值")
+    private Double fundamentalPowerFactorAvg;
+
+    /**
+     * 基波功率因数-95值
+     */
+    @TableField(value = "fundamental_power_factor_95")
+    @ApiModelProperty(value="基波功率因数-95值")
+    private Double fundamentalPowerFactor95;
+
+    /**
+     * 正序电压-最大值
+     */
+    @TableField(value = "positive_sequence_voltage_max")
+    @ApiModelProperty(value="正序电压-最大值")
+    private Double positiveSequenceVoltageMax;
+
+    /**
+     * 正序电压-最小值
+     */
+    @TableField(value = "positive_sequence_voltage_min")
+    @ApiModelProperty(value="正序电压-最小值")
+    private Double positiveSequenceVoltageMin;
+
+    /**
+     * 正序电压-平均值
+     */
+    @TableField(value = "positive_sequence_voltage_avg")
+    @ApiModelProperty(value="正序电压-平均值")
+    private Double positiveSequenceVoltageAvg;
+
+    /**
+     * 正序电压-95值
+     */
+    @TableField(value = "positive_sequence_voltage_95")
+    @ApiModelProperty(value="正序电压-95值")
+    private Double positiveSequenceVoltage95;
+
+    /**
+     * 负序电压-最大值
+     */
+    @TableField(value = "negative_sequence_voltage_max")
+    @ApiModelProperty(value="负序电压-最大值")
+    private Double negativeSequenceVoltageMax;
+
+    /**
+     * 负序电压-最小值
+     */
+    @TableField(value = "negative_sequence_voltage_min")
+    @ApiModelProperty(value="负序电压-最小值")
+    private Double negativeSequenceVoltageMin;
+
+    /**
+     * 负序电压-平均值
+     */
+    @TableField(value = "negative_sequence_voltage_avg")
+    @ApiModelProperty(value="负序电压-平均值")
+    private Double negativeSequenceVoltageAvg;
+
+    /**
+     * 负序电压-95值
+     */
+    @TableField(value = "negative_sequence_voltage_95")
+    @ApiModelProperty(value="负序电压-95值")
+    private Double negativeSequenceVoltage95;
+
+    /**
+     * 零序电压-最大值
+     */
+    @TableField(value = "zero_sequence_voltage_max")
+    @ApiModelProperty(value="零序电压-最大值")
+    private Double zeroSequenceVoltageMax;
+
+    /**
+     * 零序电压-最小值
+     */
+    @TableField(value = "zero_sequence_voltage_min")
+    @ApiModelProperty(value="零序电压-最小值")
+    private Double zeroSequenceVoltageMin;
+
+    /**
+     * 零序电压-平均值
+     */
+    @TableField(value = "zero_sequence_voltage_avg")
+    @ApiModelProperty(value="零序电压-平均值")
+    private Double zeroSequenceVoltageAvg;
+
+    /**
+     * 零序电压-95值
+     */
+    @TableField(value = "zero_sequence_voltage_95")
+    @ApiModelProperty(value="零序电压-95值")
+    private Double zeroSequenceVoltage95;
+
+    /**
+     * 负序电压不平衡度-最大值
+     */
+    @TableField(value = "negative_sequence_voltage_unbalance_max")
+    @ApiModelProperty(value="负序电压不平衡度-最大值")
+    private Double negativeSequenceVoltageUnbalanceMax;
+
+    /**
+     * 负序电压不平衡度-最小值
+     */
+    @TableField(value = "negative_sequence_voltage_unbalance_min")
+    @ApiModelProperty(value="负序电压不平衡度-最小值")
+    private Double negativeSequenceVoltageUnbalanceMin;
+
+    /**
+     * 负序电压不平衡度-平均值
+     */
+    @TableField(value = "negative_sequence_voltage_unbalance_avg")
+    @ApiModelProperty(value="负序电压不平衡度-平均值")
+    private Double negativeSequenceVoltageUnbalanceAvg;
+
+    /**
+     * 负序电压不平衡度-95值
+     */
+    @TableField(value = "negative_sequence_voltage_unbalance_95")
+    @ApiModelProperty(value="负序电压不平衡度-95值")
+    private Double negativeSequenceVoltageUnbalance95;
+
+    /**
+     * 零序电压不平衡度-最大值
+     */
+    @TableField(value = "zero_sequence_voltage_unbalance_max")
+    @ApiModelProperty(value="零序电压不平衡度-最大值")
+    private Double zeroSequenceVoltageUnbalanceMax;
+
+    /**
+     * 零序电压不平衡度-最小值
+     */
+    @TableField(value = "zero_sequence_voltage_unbalance_min")
+    @ApiModelProperty(value="零序电压不平衡度-最小值")
+    private Double zeroSequenceVoltageUnbalanceMin;
+
+    /**
+     * 零序电压不平衡度-平均值
+     */
+    @TableField(value = "zero_sequence_voltage_unbalance_avg")
+    @ApiModelProperty(value="零序电压不平衡度-平均值")
+    private Double zeroSequenceVoltageUnbalanceAvg;
+
+    /**
+     * 零序电压不平衡度-95值
+     */
+    @TableField(value = "zero_sequence_voltage_unbalance_95")
+    @ApiModelProperty(value="零序电压不平衡度-95值")
+    private Double zeroSequenceVoltageUnbalance95;
+
+    /**
+     * 正序电流-最大值
+     */
+    @TableField(value = "positive_sequence_current_max")
+    @ApiModelProperty(value="正序电流-最大值")
+    private Double positiveSequenceCurrentMax;
+
+    /**
+     * 正序电流-最小值
+     */
+    @TableField(value = "positive_sequence_current_min")
+    @ApiModelProperty(value="正序电流-最小值")
+    private Double positiveSequenceCurrentMin;
+
+    /**
+     * 正序电流-平均值
+     */
+    @TableField(value = "positive_sequence_current_avg")
+    @ApiModelProperty(value="正序电流-平均值")
+    private Double positiveSequenceCurrentAvg;
+
+    /**
+     * 正序电流-95值
+     */
+    @TableField(value = "positive_sequence_current_95")
+    @ApiModelProperty(value="正序电流-95值")
+    private Double positiveSequenceCurrent95;
+
+    /**
+     * 负序电流-最大值
+     */
+    @TableField(value = "negative_sequence_current_max")
+    @ApiModelProperty(value="负序电流-最大值")
+    private Double negativeSequenceCurrentMax;
+
+    /**
+     * 负序电流-最小值
+     */
+    @TableField(value = "negative_sequence_current_min")
+    @ApiModelProperty(value="负序电流-最小值")
+    private Double negativeSequenceCurrentMin;
+
+    /**
+     * 负序电流-平均值
+     */
+    @TableField(value = "negative_sequence_current_avg")
+    @ApiModelProperty(value="负序电流-平均值")
+    private Double negativeSequenceCurrentAvg;
+
+    /**
+     * 负序电流-95值
+     */
+    @TableField(value = "negative_sequence_current_95")
+    @ApiModelProperty(value="负序电流-95值")
+    private Double negativeSequenceCurrent95;
+
+    /**
+     * 零序电流-最大值
+     */
+    @TableField(value = "zero_sequence_current_max")
+    @ApiModelProperty(value="零序电流-最大值")
+    private Double zeroSequenceCurrentMax;
+
+    /**
+     * 零序电流-最小值
+     */
+    @TableField(value = "zero_sequence_current_min")
+    @ApiModelProperty(value="零序电流-最小值")
+    private Double zeroSequenceCurrentMin;
+
+    /**
+     * 零序电流-平均值
+     */
+    @TableField(value = "zero_sequence_current_avg")
+    @ApiModelProperty(value="零序电流-平均值")
+    private Double zeroSequenceCurrentAvg;
+
+    /**
+     * 零序电流-95值
+     */
+    @TableField(value = "zero_sequence_current_95")
+    @ApiModelProperty(value="零序电流-95值")
+    private Double zeroSequenceCurrent95;
+
+    /**
+     * 负序电流不平衡度-最大值
+     */
+    @TableField(value = "negative_sequence_current_unbalance_max")
+    @ApiModelProperty(value="负序电流不平衡度-最大值")
+    private Double negativeSequenceCurrentUnbalanceMax;
+
+    /**
+     * 负序电流不平衡度-最小值
+     */
+    @TableField(value = "negative_sequence_current_unbalance_min")
+    @ApiModelProperty(value="负序电流不平衡度-最小值")
+    private Double negativeSequenceCurrentUnbalanceMin;
+
+    /**
+     * 负序电流不平衡度-平均值
+     */
+    @TableField(value = "negative_sequence_current_unbalance_avg")
+    @ApiModelProperty(value="负序电流不平衡度-平均值")
+    private Double negativeSequenceCurrentUnbalanceAvg;
+
+    /**
+     * 负序电流不平衡度-95值
+     */
+    @TableField(value = "negative_sequence_current_unbalance_95")
+    @ApiModelProperty(value="负序电流不平衡度-95值")
+    private Double negativeSequenceCurrentUnbalance95;
+
+    /**
+     * 零序电流不平衡度-最大值
+     */
+    @TableField(value = "zero_sequence_current_imbalance_max")
+    @ApiModelProperty(value="零序电流不平衡度-最大值")
+    private Double zeroSequenceCurrentImbalanceMax;
+
+    /**
+     * 零序电流不平衡度-最小值
+     */
+    @TableField(value = "zero_sequence_current_imbalance_min")
+    @ApiModelProperty(value="零序电流不平衡度-最小值")
+    private Double zeroSequenceCurrentImbalanceMin;
+
+    /**
+     * 零序电流不平衡度-平均值
+     */
+    @TableField(value = "zero_sequence_current_imbalance_avg")
+    @ApiModelProperty(value="零序电流不平衡度-平均值")
+    private Double zeroSequenceCurrentImbalanceAvg;
+
+    /**
+     * 零序电流不平衡度-95值
+     */
+    @TableField(value = "zero_sequence_current_imbalance_95")
+    @ApiModelProperty(value="零序电流不平衡度-95值")
+    private Double zeroSequenceCurrentImbalance95;
+
+    /**
+     * 等效视在功率-最大值
+     */
+    @TableField(value = "equivalent_apparent_power_max")
+    @ApiModelProperty(value="等效视在功率-最大值")
+    private Double equivalentApparentPowerMax;
+
+    /**
+     * 等效视在功率-最小值
+     */
+    @TableField(value = "equivalent_apparent_power_min")
+    @ApiModelProperty(value="等效视在功率-最小值")
+    private Double equivalentApparentPowerMin;
+
+    /**
+     * 等效视在功率-平均值
+     */
+    @TableField(value = "equivalent_apparent_power_avg")
+    @ApiModelProperty(value="等效视在功率-平均值")
+    private Double equivalentApparentPowerAvg;
+
+    /**
+     * 等效视在功率-95值
+     */
+    @TableField(value = "equivalent_apparent_power_95")
+    @ApiModelProperty(value="等效视在功率-95值")
+    private Double equivalentApparentPower95;
+
+    /**
+     * 等效功率因数-最大值
+     */
+    @TableField(value = "equivalent_power_factor_max")
+    @ApiModelProperty(value="等效功率因数-最大值")
+    private Double equivalentPowerFactorMax;
+
+    /**
+     * 等效功率因数-最小值
+     */
+    @TableField(value = "equivalent_power_factor_min")
+    @ApiModelProperty(value="等效功率因数-最小值")
+    private Double equivalentPowerFactorMin;
+
+    /**
+     * 等效功率因数-平均值
+     */
+    @TableField(value = "equivalent_power_factor_avg")
+    @ApiModelProperty(value="等效功率因数-平均值")
+    private Double equivalentPowerFactorAvg;
+
+    /**
+     * 等效功率因数-95值
+     */
+    @TableField(value = "equivalent_power_factor_95")
+    @ApiModelProperty(value="等效功率因数-95值")
+    private Double equivalentPowerFactor95;
+
+    /**
+     * 基波正序视在功率-最大值
+     */
+    @TableField(value = "fundamental_wave_rateo_max")
+    @ApiModelProperty(value="基波正序视在功率-最大值")
+    private Double fundamentalWaveRateoMax;
+
+    /**
+     * 基波正序视在功率-最小值
+     */
+    @TableField(value = "fundamental_wave_rateo_min")
+    @ApiModelProperty(value="基波正序视在功率-最小值")
+    private Double fundamentalWaveRateoMin;
+
+    /**
+     * 基波正序视在功率-平均值
+     */
+    @TableField(value = "fundamental_wave_rateo_avg")
+    @ApiModelProperty(value="基波正序视在功率-平均值")
+    private Double fundamentalWaveRateoAvg;
+
+    /**
+     * 基波正序视在功率-95值
+     */
+    @TableField(value = "fundamental_wave_rateo_95")
+    @ApiModelProperty(value="基波正序视在功率-95值")
+    private Double fundamentalWaveRateo95;
+
+    /**
+     * 基波等效视在功率-最大值
+     */
+    @TableField(value = "fundamental_wave_apparent_max")
+    @ApiModelProperty(value="基波等效视在功率-最大值")
+    private Double fundamentalWaveApparentMax;
+
+    /**
+     * 基波等效视在功率-最小值
+     */
+    @TableField(value = "fundamental_wave_apparent_min")
+    @ApiModelProperty(value="基波等效视在功率-最小值")
+    private Double fundamentalWaveApparentMin;
+
+    /**
+     * 基波等效视在功率-平均值
+     */
+    @TableField(value = "fundamental_wave_apparent_avg")
+    @ApiModelProperty(value="基波等效视在功率-平均值")
+    private Double fundamentalWaveApparentAvg;
+
+    /**
+     * 基波等效视在功率-95值
+     */
+    @TableField(value = "fundamental_wave_apparent_95")
+    @ApiModelProperty(value="基波等效视在功率-95值")
+    private Double fundamentalWaveApparent95;
+
+    /**
+     * 非基波等效视在功率-最大值
+     */
+    @TableField(value = "nonfundamental_wave_rateo_max")
+    @ApiModelProperty(value="非基波等效视在功率-最大值")
+    private Double nonfundamentalWaveRateoMax;
+
+    /**
+     * 非基波等效视在功率-最小值
+     */
+    @TableField(value = "nonfundamental_wave_rateo_min")
+    @ApiModelProperty(value="非基波等效视在功率-最小值")
+    private Double nonfundamentalWaveRateoMin;
+
+    /**
+     * 非基波等效视在功率-平均值
+     */
+    @TableField(value = "nonfundamental_wave_rateo_avg")
+    @ApiModelProperty(value="非基波等效视在功率-平均值")
+    private Double nonfundamentalWaveRateoAvg;
+
+    /**
+     * 非基波等效视在功率-95值
+     */
+    @TableField(value = "nonfundamental_wave_rateo_95")
+    @ApiModelProperty(value="非基波等效视在功率-95值")
+    private Double nonfundamentalWaveRateo95;
+
+    /**
+     * 不平衡视在功率-最大值
+     */
+    @TableField(value = "unbalanced_apparent_power_max")
+    @ApiModelProperty(value="不平衡视在功率-最大值")
+    private Double unbalancedApparentPowerMax;
+
+    /**
+     * 不平衡视在功率-最小值
+     */
+    @TableField(value = "unbalanced_apparent_power_min")
+    @ApiModelProperty(value="不平衡视在功率-最小值")
+    private Double unbalancedApparentPowerMin;
+
+    /**
+     * 不平衡视在功率-平均值
+     */
+    @TableField(value = "unbalanced_apparent_power_avg")
+    @ApiModelProperty(value="不平衡视在功率-平均值")
+    private Double unbalancedApparentPowerAvg;
+
+    /**
+     * 不平衡视在功率-95值
+     */
+    @TableField(value = "unbalanced_apparent_power_95")
+    @ApiModelProperty(value="不平衡视在功率-95值")
+    private Double unbalancedApparentPower95;
+}
\ No newline at end of file
diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/pojo/po/line/RMpPltReportDPO.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/pojo/po/line/RMpPltReportDPO.java
new file mode 100644
index 000000000..1ccb8d156
--- /dev/null
+++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/pojo/po/line/RMpPltReportDPO.java
@@ -0,0 +1,73 @@
+package com.njcn.prepare.harmonic.pojo.po.line;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.github.jeffreyning.mybatisplus.anno.MppMultiId;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 
+ * Description:
+ * 接口文档访问地址：http://serverIP:port/swagger-ui.html
+ * Date: 2022/10/26  15:26【需求编号】
+ *
+ * @author clam
+ * @version V1.0.0
+ */
+@ApiModel(value="com-njcn-prepare-harmonic-pojo-po-line-RMpPltReportDPO")
+@Data
+@TableName(value = "r_mp_plt_report_d")
+public class RMpPltReportDPO {
+    /**
+     * 监测点ID
+     */
+    @MppMultiId(value = "measurement_point_id")
+    @ApiModelProperty(value="监测点ID")
+    private String measurementPointId;
+
+    /**
+     * 生成数据的时间,每日统计一次
+     */
+    @MppMultiId(value = "data_date")
+    @ApiModelProperty(value="生成数据的时间,每日统计一次")
+    private Date dataDate;
+
+    /**
+     * 相别："A" "B" "C" "ABC" "T"  配网部分相别的数据采用T标志存储
+     */
+    @MppMultiId(value = "phase")
+    @ApiModelProperty(value="相别：'A' 'B' 'C' 'ABC' 'T'  配网部分相别的数据采用T标志存储")
+    private String phase;
+
+    /**
+     * 长时间闪变值-最大值
+     */
+    @TableField(value = "long_time_flashing_max")
+    @ApiModelProperty(value="长时间闪变值-最大值")
+    private Double longTimeFlashingMax;
+
+    /**
+     * 长时间闪变值-最小值
+     */
+    @TableField(value = "long_time_flashing_min")
+    @ApiModelProperty(value="长时间闪变值-最小值")
+    private Double longTimeFlashingMin;
+
+    /**
+     * 长时间闪变值-平均值
+     */
+    @TableField(value = "long_time_flashing_avg")
+    @ApiModelProperty(value="长时间闪变值-平均值")
+    private Double longTimeFlashingAvg;
+
+    /**
+     * 长时间闪变值-95值
+     */
+    @TableField(value = "long_time_flashing_95")
+    @ApiModelProperty(value="长时间闪变值-95值")
+    private Double longTimeFlashing95;
+}
\ No newline at end of file
diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/pojo/vo/AbnormalVO.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/pojo/vo/AbnormalVO.java
new file mode 100644
index 000000000..b6c09587e
--- /dev/null
+++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/pojo/vo/AbnormalVO.java
@@ -0,0 +1,19 @@
+package com.njcn.prepare.harmonic.pojo.vo;
+
+import lombok.Data;
+import org.influxdb.annotation.Measurement;
+
+import java.io.Serializable;
+
+/**
+ * @author denghuajun
+ * @version 1.0.0
+ * @date 2022年10月18日 11:18
+ */
+@Data
+public class AbnormalVO implements Serializable {
+
+    private Float normValue;
+
+    private String valueType;
+}
diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/pojo/vo/LineVO.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/pojo/vo/LineVO.java
new file mode 100644
index 000000000..9d352b94f
--- /dev/null
+++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/pojo/vo/LineVO.java
@@ -0,0 +1,9 @@
+package com.njcn.prepare.harmonic.pojo.vo;
+
+/**
+ * @author denghuajun
+ * @version 1.0.0
+ * @date 2022年10月17日 20:16
+ */
+public class LineVO {
+}
diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/pojo/vo/ReportTemplateVO.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/pojo/vo/ReportTemplateVO.java
new file mode 100644
index 000000000..7bc685cb3
--- /dev/null
+++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/pojo/vo/ReportTemplateVO.java
@@ -0,0 +1,29 @@
+package com.njcn.prepare.harmonic.pojo.vo;
+
+import com.njcn.db.bo.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 自定义报表
+ * @author qijian
+ * @since 2022-10-14 10:44:54
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class ReportTemplateVO extends BaseEntity {
+    private String id;
+
+    private String name;
+
+    private String content;
+
+    private String deptId;
+
+    private Integer activation;
+
+    private Integer state;
+
+    private String deptName;
+
+}
diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/Impl/area/AreaServiceImpl.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/Impl/area/AreaServiceImpl.java
new file mode 100644
index 000000000..fd90fbe47
--- /dev/null
+++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/Impl/area/AreaServiceImpl.java
@@ -0,0 +1,9 @@
+package com.njcn.prepare.harmonic.service.Impl.area;
+
+/**
+ * @author denghuajun
+ * @version 1.0.0
+ * @date 2022年10月17日 20:19
+ */
+public class AreaServiceImpl {
+}
diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/Impl/device/DeviceServiceImpl.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/Impl/device/DeviceServiceImpl.java
new file mode 100644
index 000000000..f26538010
--- /dev/null
+++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/Impl/device/DeviceServiceImpl.java
@@ -0,0 +1,9 @@
+package com.njcn.prepare.harmonic.service.Impl.device;
+
+/**
+ * @author denghuajun
+ * @version 1.0.0
+ * @date 2022年10月17日 20:19
+ */
+public class DeviceServiceImpl {
+}
diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/Impl/line/DayDataServiceImpl.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/Impl/line/DayDataServiceImpl.java
new file mode 100644
index 000000000..f264a9fba
--- /dev/null
+++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/Impl/line/DayDataServiceImpl.java
@@ -0,0 +1,3402 @@
+package com.njcn.prepare.harmonic.service.Impl.line;
+
+import com.njcn.influxdb.config.InfluxDbConfig;
+import com.njcn.influxdb.param.InfluxDBPublicParam;
+import com.njcn.influxdb.utils.InfluxDbUtils;
+import com.njcn.prepare.harmonic.constant.InfluxdbPOConverter;
+import com.njcn.prepare.harmonic.pojo.po.*;
+import com.njcn.prepare.harmonic.pojo.po.line.*;
+import com.njcn.prepare.harmonic.service.*;
+import com.njcn.prepare.harmonic.service.line.DayDataService;
+import com.njcn.prepare.harmonic.service.line.RMpHarmonicPReportDPOService;
+import com.njcn.prepare.harmonic.service.line.RMpHarmonicVRateReportDPOService;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.influxdb.InfluxDB;
+import org.influxdb.dto.BatchPoints;
+import org.influxdb.dto.Point;
+import org.influxdb.dto.QueryResult;
+import org.influxdb.impl.InfluxDBResultMapper;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.BeanWrapper;
+import org.springframework.beans.BeanWrapperImpl;
+import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
+
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.time.Instant;
+import java.util.*;
+import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;
+
+/**
+ * Description:
+ * 接口文档访问地址：http://serverIP:port/swagger-ui.html
+ * Date: 2022/10/24  9:46【需求编号】
+ *
+ * @author clam
+ * @version V1.0.0
+ */
+
+@Slf4j
+@Component
+@RequiredArgsConstructor
+public class DayDataServiceImpl  implements DayDataService {
+
+    private final RMpHarmonicVRateReportDPOService rMpHarmonicVRateReportDPOService;
+    private final RMpHarmonicIMagReportDPOService rMpHarmonicIMagReportDPOService;
+    private final RMpFlickerReportDPOService rMpFlickerReportDPOService;
+    private final RMpPltReportDPOService rMpPltReportDPOService;
+    private final RMpHarmonicIRateReportDPOService rMpHarmonicIRateReportDPOService;
+    private final RMpInharmonicIRateReportDPOService rMpInharmonicIRateReportDPOService;
+    private final  RMpInharmonicIMagReportDPOService rMpInharmonicIMagReportDPOService;
+    private final  RMpInharmonicVRateReportDPOService rMpInharmonicVRateReportDPOService;
+    private final RMpHarmonicPReportDPOService rMpHarmonicPReportDPOService;
+
+
+    private final InfluxDbUtils influxDbUtils;
+
+    /**
+     * @param indexLists
+     * @param startTime
+     * @param endTime
+     * @Description: 生成day表相关数据
+     * @Param: [indexLists, startTime, endTime]
+     * @return: void
+     * @Author: clam
+     * @Date: 2022/10/24
+     */
+    @Override
+    @Transactional(
+            rollbackFor = {Exception.class}
+    )
+    public void dayDataJobHandler(List<String> indexLists, String startTime, String endTime) {
+
+
+        Instant instant = null;
+//        influxDbUtils.setDbName ("pqsbase");
+        try {
+            instant = new SimpleDateFormat ("yyyy-MM-dd").parse (startTime).toInstant ( );
+        } catch (ParseException e) {
+            e.printStackTrace ( );
+        }
+        Long time= instant.toEpochMilli();
+
+        List<DataVPO> dataVPOList = new ArrayList<> ();
+        List<DataIPO> dataIPOList = new ArrayList<> ();
+        List<DataFlickerPO> dataFlickerPOList = new ArrayList<> ();
+        List<DataFlucPO> dataFlucPOList = new ArrayList<> ();
+        List<DataHarmPhasicIPO> dataHarmPhasicIPOList = new ArrayList<> ();
+        List<DataHarmPhasicVPO> dataHarmPhasicVPOList = new ArrayList<> ();
+        List<DataHarmPowerPPO> dataHarmPowerPPOList = new ArrayList<> ();
+        List<DataHarmPowerQPO> dataHarmPowerQPOList = new ArrayList<> ();
+        List<DataHarmPowerSPO> dataHarmPowerSPOList = new ArrayList<> ();
+        List<DataHarmRateIPO> dataHarmRateIPOList = new ArrayList<> ();
+        List<DataHarmRateVPO> dataHarmRateVPOList = new ArrayList<> ();
+        List<DataInHarmIPO> dataInHarmIPOList  = new ArrayList<> ();
+        List<DataInHarmVPO> dataInHarmVPOList = new ArrayList<> ();
+        List<DataInHarmRateIPO> dataInHarmRateIPOList = new ArrayList<> ();
+        List<DataInHarmRateVPO> dataInHarmRateVPOList = new ArrayList<> ();
+        List<DataPltPO> dataPltPOList = new ArrayList<> ();
+
+        List<RMpHarmonicVRateReportDPO> rMpHarmonicVRateReportDPOList = new ArrayList<> ();
+        List<RMpHarmonicIMagReportDPO> rMpHarmonicIMagReportDPOList = new ArrayList<> ();
+        List<RMpFlickerReportDPO> rMpFlickerReportDPOList = new ArrayList<> ();
+        List<RMpPltReportDPO> rMpPltReportDPOList = new ArrayList<> ();
+        List<RMpHarmonicIRateReportDPO> rMpHarmonicIRateReportDPOList = new ArrayList<> ();
+        List<RMpInharmonicIRateReportDPO> rMpInharmonicIRateReportDPOList = new ArrayList<> ();
+        List<RMpInharmonicIMagReportDPO> rMpInharmonicIMagReportDPOList = new ArrayList<> ();
+        List<RMpInharmonicVRateReportDPO> rMpInharmonicVRateReportDPOList = new ArrayList<> ();
+        List<RMpHarmonicPReportDPO>  rMpHarmonicPReportDPOList = new ArrayList<> ();
+        List<RMpMeasurePhaseReportDPO>  rMpMeasurePhaseReportDPOArrayList = new ArrayList<> ();
+
+
+
+
+
+
+
+
+        for (int i = 0; i <indexLists.size () ; i++) {
+
+            String lineIndex =indexLists.get (i);
+            /*生成dayV表*/
+            List<DataVPO> dataV = getDataV(lineIndex,startTime,endTime);
+            if(!CollectionUtils.isEmpty (dataV)){
+                dataVPOList.addAll (dataV);
+            }
+            /*生成dayI表*/
+            List<DataIPO> dataI = getDataI(lineIndex,startTime,endTime);
+            if(!CollectionUtils.isEmpty (dataI)){
+                dataIPOList.addAll (dataI);
+            }
+            List<DataFlickerPO> dataFlickerPO = getDataFlicker(lineIndex,startTime,endTime);
+            if(!CollectionUtils.isEmpty (dataFlickerPO)){
+                dataFlickerPOList.addAll (dataFlickerPO);
+            }
+            /*生成dayFluc表*/
+            List<DataFlucPO> dataFlucPO = getDataFluc(lineIndex,startTime,endTime);
+            if(!CollectionUtils.isEmpty (dataFlucPO)){
+                dataFlucPOList.addAll (dataFlucPO);
+            }
+
+            /*生成dayHarmphasicI表*/
+            List<DataHarmPhasicIPO> dataHarmphasicIPO = getDataHarmphasicI(lineIndex,startTime,endTime);
+            if(!CollectionUtils.isEmpty (dataHarmphasicIPO)){
+                dataHarmPhasicIPOList.addAll (dataHarmphasicIPO);
+            }
+
+            /*生成dayHarmphasicV表*/
+            List<DataHarmPhasicVPO> dataHarmphasicVPO = getDataHarmphasicV(lineIndex,startTime,endTime);
+            if(!CollectionUtils.isEmpty (dataHarmphasicVPO)){
+                dataHarmPhasicVPOList.addAll (dataHarmphasicVPO);
+            }
+
+            /*生成dayHarmPowerP表*/
+            List<DataHarmPowerPPO> dataHarmPowerPPO = getDataHarmPowerP(lineIndex,startTime,endTime);
+            if(!CollectionUtils.isEmpty (dataHarmPowerPPO)){
+                dataHarmPowerPPOList.addAll (dataHarmPowerPPO);
+            }
+            /*生成dayHarmPowerQ表*/
+            List<DataHarmPowerQPO> dataHarmPowerQPO = getDataHarmPowerQ(lineIndex,startTime,endTime);
+            if(!CollectionUtils.isEmpty (dataHarmPowerQPO)){
+                dataHarmPowerQPOList.addAll (dataHarmPowerQPO);
+            }
+
+            /*生成dayHarmPowerS表*/
+            List<DataHarmPowerSPO> dataHarmPowers = getDataHarmPowerS(lineIndex,startTime,endTime);
+            if(!CollectionUtils.isEmpty (dataHarmPowers)){
+                dataHarmPowerSPOList.addAll (dataHarmPowers);
+            }
+
+            /*生成dayHarmRateI*/
+            List<DataHarmRateIPO> dataHarmRateI = getDataHarmRateI(lineIndex,startTime,endTime);
+            if(!CollectionUtils.isEmpty (dataHarmRateI)){
+                dataHarmRateIPOList.addAll (dataHarmRateI);
+
+            }
+
+            /*生成dayHarmRateV*/
+            List<DataHarmRateVPO> dataHarmRateVPO = getDataHarmRateV(lineIndex,startTime,endTime);
+            if(!CollectionUtils.isEmpty (dataHarmRateVPO)){
+                dataHarmRateVPOList.addAll (dataHarmRateVPO);
+            }
+
+            /*生成dayInHarmI*/
+            List<DataInHarmIPO> dataInHarmIPO = getDataInHarmI(lineIndex,startTime,endTime);
+            if(!CollectionUtils.isEmpty (dataInHarmIPO)){
+                dataInHarmIPOList.addAll (dataInHarmIPO);
+            }
+
+            /*生成dayInHarmV*/
+            List<DataInHarmVPO> dataInHarmVPO = getDataInHarmV(lineIndex,startTime,endTime);
+            if(!CollectionUtils.isEmpty (dataInHarmVPO)){
+                dataInHarmVPOList.addAll (dataInHarmVPO);
+            }
+
+            /*生成dayInHarmRateI*/
+            List<DataInHarmRateIPO> dataInHarmRateIPO = getDataInHarmRateI(lineIndex,startTime,endTime);
+            if(!CollectionUtils.isEmpty (dataInHarmRateIPO)){
+                dataInHarmRateIPOList.addAll (dataInHarmRateIPO);
+            }
+
+            /*生成dayInHarmRateV*/
+            List<DataInHarmRateVPO> dataInHarmRateVPO = getDataInHarmRateV(lineIndex,startTime,endTime);
+            if(!CollectionUtils.isEmpty (dataInHarmRateVPO)){
+                dataInHarmRateVPOList.addAll (dataInHarmRateVPO);
+            }
+
+            /*生成dayPlt*/
+            List<DataPltPO> dataPlt = getDataPlt(lineIndex,startTime,endTime);
+            if(!CollectionUtils.isEmpty (dataPlt)){
+                dataPltPOList.addAll (dataPlt);
+            }
+
+            /*mysql数据转化 */
+            /*RMpHarmonicVRateReportDPO*/
+//            if(!CollectionUtils.isEmpty (dataV)&&!CollectionUtils.isEmpty (dataHarmRateVPO)){
+//                /*转成mysql对应po*/
+//                /*dataVPO.getPhaseType ()="A"数据*/
+//                RMpHarmonicVRateReportDPO rMpHarmonicVRateReportDPOA = packageRMpHarmonicVRateReportDPO (dataV, dataHarmRateVPO,"A");
+//                Optional.ofNullable (rMpHarmonicVRateReportDPOA).ifPresent (temp ->rMpHarmonicVRateReportDPOList.add (temp));
+//                /*dataVPO.getPhaseType ()="B"数据*/
+//                RMpHarmonicVRateReportDPO rMpHarmonicVRateReportDPOB = packageRMpHarmonicVRateReportDPO (dataV, dataHarmRateVPO,"B");
+//                Optional.ofNullable (rMpHarmonicVRateReportDPOB).ifPresent (temp ->rMpHarmonicVRateReportDPOList.add (temp));
+//
+//                /*dataVPO.getPhaseType ()="C"数据*/
+//                RMpHarmonicVRateReportDPO rMpHarmonicVRateReportDPOC = packageRMpHarmonicVRateReportDPO (dataV, dataHarmRateVPO, "C");
+//                Optional.ofNullable (rMpHarmonicVRateReportDPOC).ifPresent (temp ->rMpHarmonicVRateReportDPOList.add (temp));
+//
+//                /*dataVPO.getPhaseType ()="T"数据*/
+//                RMpHarmonicVRateReportDPO rMpHarmonicVRateReportDPOT = packageRMpHarmonicVRateReportDPO (dataV, dataHarmRateVPO,"T");
+//                Optional.ofNullable (rMpHarmonicVRateReportDPOT).ifPresent (temp ->rMpHarmonicVRateReportDPOList.add (temp));
+//
+//
+//            }
+//            /*RMpHarmonicIMagReportDPO*/
+//            if(!CollectionUtils.isEmpty (dataI)){
+//
+//                /*转成mysql对应po*/
+//                /*dataI.getPhaseType ()="A"数据*/
+//                RMpHarmonicIMagReportDPO a = packageRMpHarmonicIMagReportDPO (dataI, "A");
+//                Optional.ofNullable (a).ifPresent (temp ->rMpHarmonicIMagReportDPOList.add (temp));
+//                /*dataI.getPhaseType ()="B"数据*/
+//                RMpHarmonicIMagReportDPO b = packageRMpHarmonicIMagReportDPO(dataI,"B");
+//                Optional.ofNullable (b).ifPresent (temp ->rMpHarmonicIMagReportDPOList.add (temp));
+//                /*dataI.getPhaseType ()="C"数据*/
+//                RMpHarmonicIMagReportDPO c = packageRMpHarmonicIMagReportDPO(dataI,"C");
+//                Optional.ofNullable (c).ifPresent (temp ->rMpHarmonicIMagReportDPOList.add (temp));
+//                /*dataI.getPhaseType ()="T"数据*/
+//                RMpHarmonicIMagReportDPO t = packageRMpHarmonicIMagReportDPO(dataI,"T");
+//                Optional.ofNullable (t).ifPresent (temp ->rMpHarmonicIMagReportDPOList.add (temp));
+//
+//
+//            }
+//            /*生成dayFlicker表*/
+//            if(!CollectionUtils.isEmpty (dataFlickerPO)){
+//                /*生成dayFlicker表*/
+//                /*dataFlickerPO.getPhaseType ()="A"数据*/
+//                RMpFlickerReportDPO a = packageRMpFlickerReportDPOPO (dataFlickerPO, "A");
+//                Optional.ofNullable (a).ifPresent (temp ->rMpFlickerReportDPOList.add (temp));
+//
+//                /*dataFlickerPO.getPhaseType ()="B"数据*/
+//                RMpFlickerReportDPO b = packageRMpFlickerReportDPOPO(dataFlickerPO,"B");
+//                Optional.ofNullable (b).ifPresent (temp ->rMpFlickerReportDPOList.add (temp));
+//
+//                /*dataFlickerPO.getPhaseType ()="C"数据*/
+//                RMpFlickerReportDPO c = packageRMpFlickerReportDPOPO(dataFlickerPO,"C");
+//                Optional.ofNullable (c).ifPresent (temp ->rMpFlickerReportDPOList.add (temp));
+//
+////                /*dataFlickerPO.getPhaseType ()="T"数据*/
+////                RMpFlickerReportDPO t = packageRMpFlickerReportDPOPO(dataFlickerPO,"T");
+//
+//
+//            }
+//            if(!CollectionUtils.isEmpty (dataPlt)){
+//                /*转成mysql对应po*/
+//                /*DataPltPO.getPhaseType ()="A"数据*/
+//                RMpPltReportDPO a = packageRMpPltReportDPO (dataPlt, "A");
+//                Optional.ofNullable (a).ifPresent (temp ->rMpPltReportDPOList.add (temp));
+//                /*DataPltPO.getPhaseType ()="B"数据*/
+//                RMpPltReportDPO b = packageRMpPltReportDPO(dataPlt,"B");
+//                Optional.ofNullable (b).ifPresent (temp ->rMpPltReportDPOList.add (temp));
+//                /*DataPltPO.getPhaseType ()="C"数据*/
+//                RMpPltReportDPO c = packageRMpPltReportDPO(dataPlt,"C");
+//                Optional.ofNullable (c).ifPresent (temp ->rMpPltReportDPOList.add (temp));
+////                /*DataPltPO.getPhaseType ()="T"数据*/
+////                RMpPltReportDPO t = packageRMpPltReportDPO(dataPlt,"T");
+//            }
+//            if(!CollectionUtils.isEmpty (dataHarmRateI)) {
+//                /*转成mysql对应po*/
+//                /*DataHarmRateIPO.getPhaseType ()="A"数据*/
+//                RMpHarmonicIRateReportDPO a = packageRMpHarmonicIRateReportDPO (dataHarmRateI, "A");
+//                Optional.ofNullable (a).ifPresent (temp -> rMpHarmonicIRateReportDPOList.add (temp));
+//
+//                /*DataHarmRateIPO.getPhaseType ()="B"数据*/
+//                RMpHarmonicIRateReportDPO b = packageRMpHarmonicIRateReportDPO (dataHarmRateI, "B");
+//                Optional.ofNullable (b).ifPresent (temp -> rMpHarmonicIRateReportDPOList.add (temp));
+//
+//                /*DataHarmRateIPO.getPhaseType ()="C"数据*/
+//                RMpHarmonicIRateReportDPO c = packageRMpHarmonicIRateReportDPO (dataHarmRateI, "C");
+//                Optional.ofNullable (c).ifPresent (temp -> rMpHarmonicIRateReportDPOList.add (temp));
+//
+//                /*DataInHarmRateIPO.getPhaseType ()="T"数据*/
+//                RMpHarmonicIRateReportDPO t = packageRMpHarmonicIRateReportDPO (dataHarmRateI, "T");
+//                Optional.ofNullable (t).ifPresent (temp -> rMpHarmonicIRateReportDPOList.add (temp));
+//            }
+//
+//            if(!CollectionUtils.isEmpty (dataInHarmRateIPO)){
+//                /*转成mysql对应po*/
+//                /*DataInHarmRateIPO.getPhaseType ()="A"数据*/
+//                RMpInharmonicIRateReportDPO a = packageRMpInharmonicIRateReportDPO(dataInHarmRateIPO, "A");
+//                Optional.ofNullable (a).ifPresent (temp ->rMpInharmonicIRateReportDPOList.add (temp));
+//
+//                /*DataInHarmRateIPO.getPhaseType ()="B"数据*/
+//                RMpInharmonicIRateReportDPO b = packageRMpInharmonicIRateReportDPO(dataInHarmRateIPO,"B");
+//                Optional.ofNullable (b).ifPresent (temp ->rMpInharmonicIRateReportDPOList.add (temp));
+//
+//                /*DataInHarmRateIPO.getPhaseType ()="C"数据*/
+//                RMpInharmonicIRateReportDPO c = packageRMpInharmonicIRateReportDPO(dataInHarmRateIPO,"C");
+//                Optional.ofNullable (c).ifPresent (temp ->rMpInharmonicIRateReportDPOList.add (temp));
+//
+//                /*DataInHarmRateIPO.getPhaseType ()="T"数据*/
+//                RMpInharmonicIRateReportDPO t = packageRMpInharmonicIRateReportDPO(dataInHarmRateIPO,"T");
+//                Optional.ofNullable (t).ifPresent (temp ->rMpInharmonicIRateReportDPOList.add (temp));
+//
+//
+//            }
+//
+//            if(!CollectionUtils.isEmpty (dataInHarmIPO)){
+//                /*转成mysql对应po*/
+//                /*dataInHarmIPO.getPhaseType ()="A"数据*/
+//                RMpInharmonicIMagReportDPO a = packageRMpInharmonicIMagReportDPO(dataInHarmIPO, "A");
+//                Optional.ofNullable (a).ifPresent (temp ->rMpInharmonicIMagReportDPOList.add (temp));
+//                /*dataInHarmIPO.getPhaseType ()="B"数据*/
+//                RMpInharmonicIMagReportDPO b = packageRMpInharmonicIMagReportDPO(dataInHarmIPO,"B");
+//                Optional.ofNullable (b).ifPresent (temp ->rMpInharmonicIMagReportDPOList.add (temp));
+//                /*dataInHarmIPO.getPhaseType ()="C"数据*/
+//                RMpInharmonicIMagReportDPO c = packageRMpInharmonicIMagReportDPO(dataInHarmIPO,"C");
+//                Optional.ofNullable (c).ifPresent (temp ->rMpInharmonicIMagReportDPOList.add (temp));
+//                /*dataInHarmIPO.getPhaseType ()="T"数据*/
+//                RMpInharmonicIMagReportDPO t = packageRMpInharmonicIMagReportDPO(dataInHarmIPO,"T");
+//                Optional.ofNullable (t).ifPresent (temp ->rMpInharmonicIMagReportDPOList.add (temp));
+//
+//            }
+//            if(!CollectionUtils.isEmpty (dataInHarmRateVPO)){
+//                /*转成mysql对应po*/
+//                /*dataInHarmRateVPO.getPhaseType ()="A"数据*/
+//                RMpInharmonicVRateReportDPO a = packageRMpInharmonicVRateReportDPO(dataInHarmRateVPO, "A");
+//                Optional.ofNullable (a).ifPresent (temp ->rMpInharmonicVRateReportDPOList.add (temp));
+//                /*dataInHarmRateVPO.getPhaseType ()="B"数据*/
+//                RMpInharmonicVRateReportDPO b = packageRMpInharmonicVRateReportDPO(dataInHarmRateVPO,"B");
+//                Optional.ofNullable (b).ifPresent (temp ->rMpInharmonicVRateReportDPOList.add (temp));
+//                /*dataInHarmRateVPO.getPhaseType ()="C"数据*/
+//                RMpInharmonicVRateReportDPO c = packageRMpInharmonicVRateReportDPO(dataInHarmRateVPO,"C");
+//                Optional.ofNullable (c).ifPresent (temp ->rMpInharmonicVRateReportDPOList.add (temp));
+//                /*dataInHarmRateVPO.getPhaseType ()="T"数据*/
+//                RMpInharmonicVRateReportDPO t = packageRMpInharmonicVRateReportDPO(dataInHarmRateVPO,"T");
+//                Optional.ofNullable (t).ifPresent (temp ->rMpInharmonicVRateReportDPOList.add (temp));
+//
+//            }
+//
+//            if(!CollectionUtils.isEmpty (dataHarmPowerPPO)&&!CollectionUtils.isEmpty (dataHarmPowerQPO)){
+//                /*转成mysql对应po*/
+//                /*dataInHarmRateVPO.getPhaseType ()="A"数据*/
+//                RMpHarmonicPReportDPO a = packageRMpHarmonicPReportDPO(dataHarmPowerPPO,dataHarmPowerQPO, "A");
+//                Optional.ofNullable (a).ifPresent (temp ->rMpHarmonicPReportDPOList.add (temp));
+//                /*dataInHarmRateVPO.getPhaseType ()="B"数据*/
+//                RMpHarmonicPReportDPO b = packageRMpHarmonicPReportDPO(dataHarmPowerPPO,dataHarmPowerQPO,"B");
+//                Optional.ofNullable (b).ifPresent (temp ->rMpHarmonicPReportDPOList.add (temp));
+//                /*dataInHarmRateVPO.getPhaseType ()="C"数据*/
+//                RMpHarmonicPReportDPO c = packageRMpHarmonicPReportDPO(dataHarmPowerPPO,dataHarmPowerQPO,"C");
+//                Optional.ofNullable (c).ifPresent (temp ->rMpHarmonicPReportDPOList.add (temp));
+//                /*dataInHarmRateVPO.getPhaseType ()="T"数据*/
+//                RMpHarmonicPReportDPO t = packageRMpHarmonicPReportDPO(dataHarmPowerPPO,dataHarmPowerQPO,"T");
+//                Optional.ofNullable (t).ifPresent (temp ->rMpHarmonicPReportDPOList.add (temp));
+//
+//            }
+
+//
+//            if (!CollectionUtils.isEmpty (dataV) &&
+//                        !CollectionUtils.isEmpty (dataI) &&
+//                            !CollectionUtils.isEmpty (dataHarmPowerPPO) &&
+//                                !CollectionUtils.isEmpty (dataHarmPowers) &&
+//                                    !CollectionUtils.isEmpty (dataHarmPowerQPO)) {
+//                /*转成mysql对应po*/
+//                /*dataInHarmRateVPO.getPhaseType ()="A"数据*/
+//                RMpMeasurePhaseReportDPO a = packageRMpMeasurePhaseReportDPO(dataV,dataI,dataHarmPowerPPO,dataHarmPowers,dataHarmPowerQPO,"A");
+//                Optional.ofNullable (a).ifPresent (temp ->rMpMeasurePhaseReportDPOArrayList.add (temp));
+//                /*dataInHarmRateVPO.getPhaseType ()="B"数据*/
+//                RMpMeasurePhaseReportDPO b = packageRMpMeasurePhaseReportDPO(dataV,dataI,dataHarmPowerPPO,dataHarmPowers,dataHarmPowerQPO,"B");
+//                Optional.ofNullable (b).ifPresent (temp ->rMpMeasurePhaseReportDPOArrayList.add (temp));
+//                /*dataInHarmRateVPO.getPhaseType ()="C"数据*/
+//                RMpMeasurePhaseReportDPO c = packageRMpMeasurePhaseReportDPO(dataV,dataI,dataHarmPowerPPO,dataHarmPowers,dataHarmPowerQPO,"C");
+//                Optional.ofNullable (c).ifPresent (temp ->rMpMeasurePhaseReportDPOArrayList.add (temp));
+//                /*dataInHarmRateVPO.getPhaseType ()="T"数据*/
+//                RMpMeasurePhaseReportDPO t = packageRMpMeasurePhaseReportDPO(dataV,dataI,dataHarmPowerPPO,dataHarmPowers,dataHarmPowerQPO,"T");
+//                Optional.ofNullable (t).ifPresent (temp ->rMpMeasurePhaseReportDPOArrayList.add (temp));
+//
+//            }
+            /* todo
+            *   r_mp_measure_phase_report_d
+            *   r_mp_measure_report_d
+            * */
+
+
+        }
+        /*插入mysql*/
+//        if (!CollectionUtils.isEmpty(rMpHarmonicVRateReportDPOList)){
+//            rMpHarmonicVRateReportDPOService.saveOrUpdateBatchByMultiId (rMpHarmonicVRateReportDPOList, 50);
+//        }
+//
+//        if (!CollectionUtils.isEmpty(rMpHarmonicIMagReportDPOList)){
+//            rMpHarmonicIMagReportDPOService.saveOrUpdateBatchByMultiId (rMpHarmonicIMagReportDPOList, 50);
+//        }
+//
+//        if (!CollectionUtils.isEmpty(rMpFlickerReportDPOList)){
+//            rMpFlickerReportDPOService.saveOrUpdateBatchByMultiId (rMpFlickerReportDPOList, 50);
+//        }
+//
+//        if (!CollectionUtils.isEmpty(rMpPltReportDPOList)){
+//            rMpPltReportDPOService.saveOrUpdateBatchByMultiId (rMpPltReportDPOList, 50);
+//        }
+//
+//        if (!CollectionUtils.isEmpty(rMpHarmonicIRateReportDPOList)){
+//            rMpHarmonicIRateReportDPOService.saveOrUpdateBatchByMultiId (rMpHarmonicIRateReportDPOList, 50);
+//        }
+//
+//        if (!CollectionUtils.isEmpty(rMpInharmonicIRateReportDPOList)){
+//            rMpInharmonicIRateReportDPOService.saveOrUpdateBatchByMultiId (rMpInharmonicIRateReportDPOList, 50);
+//        }
+//
+//        if (!CollectionUtils.isEmpty(rMpInharmonicIMagReportDPOList)){
+//            rMpInharmonicIMagReportDPOService.saveOrUpdateBatchByMultiId (rMpInharmonicIMagReportDPOList, 50);
+//        }
+//
+//        if (!CollectionUtils.isEmpty(rMpInharmonicVRateReportDPOList)){
+//            rMpInharmonicVRateReportDPOService.saveOrUpdateBatchByMultiId (rMpInharmonicVRateReportDPOList, 50);
+//        }
+//
+//        if (!CollectionUtils.isEmpty(rMpHarmonicPReportDPOList)){
+//            rMpHarmonicPReportDPOService.saveOrUpdateBatchByMultiId (rMpHarmonicPReportDPOList, 50);
+//        }
+
+
+
+        if (!CollectionUtils.isEmpty(dataVPOList)){
+            insertDayV(dataVPOList,time);
+        }
+
+        if (!CollectionUtils.isEmpty(dataIPOList)){
+            insertDayI(dataIPOList,time);
+        }
+        if (!CollectionUtils.isEmpty(dataFlickerPOList)){
+            insertDayFlicker(dataFlickerPOList,time);
+        }
+        if (!CollectionUtils.isEmpty(dataFlucPOList)){
+            insertDayFluc(dataFlucPOList,time);
+        }
+        if (!CollectionUtils.isEmpty(dataHarmPhasicIPOList)){
+            insertDayHarmphasicI(dataHarmPhasicIPOList,time);
+        }
+        if (!CollectionUtils.isEmpty(dataHarmPhasicVPOList)){
+            insertDayHarmphasicV(dataHarmPhasicVPOList,time);
+        }
+        if (!CollectionUtils.isEmpty(dataHarmPowerPPOList)){
+            insertDayHarmPowerP(dataHarmPowerPPOList,time);
+        }
+        if (!CollectionUtils.isEmpty(dataHarmPowerQPOList)){
+            insertDayHarmPowerQ(dataHarmPowerQPOList,time);
+        }
+        if (!CollectionUtils.isEmpty(dataHarmPowerSPOList)){
+            insertDayHarmPowerS(dataHarmPowerSPOList,time);
+        }
+        if (!CollectionUtils.isEmpty(dataHarmRateIPOList)){
+            insertDayHarmRateI(dataHarmRateIPOList,time);
+        }
+        if (!CollectionUtils.isEmpty(dataHarmRateVPOList)){
+            insertDayHarmRateV(dataHarmRateVPOList,time);
+        }
+        if (!CollectionUtils.isEmpty(dataInHarmIPOList)){
+            insertDayInHarmI(dataInHarmIPOList,time);
+        }
+        if (!CollectionUtils.isEmpty(dataInHarmVPOList)){
+            insertDayInHarmV(dataInHarmVPOList,time);
+        }
+        if (!CollectionUtils.isEmpty(dataInHarmRateIPOList)){
+            insertDayInHarmRateI(dataInHarmRateIPOList,time);
+        }
+        if (!CollectionUtils.isEmpty(dataInHarmRateVPOList)){
+            insertDayInHarmRateV(dataInHarmRateVPOList,time);
+        }
+        if (!CollectionUtils.isEmpty(dataPltPOList)){
+            insertDayPlt(dataPltPOList,time);
+        }
+
+
+    }
+
+
+
+    /**
+     * 功能描述:获取dataV数据
+     * @author xy
+     * @param lineIndex    监测点集ID
+     * @param startTime   起始时间
+     * @param endTime     结束时间
+     * @date 2022/5/10 14:56
+     * @return List<DataV>
+     */
+    public List<DataVPO> getDataV(String lineIndex, String startTime, String endTime){
+        List<DataVPO> result = new ArrayList<> ();
+        //最小值
+        StringBuilder stringBuilder1 = new StringBuilder();
+        StringBuilder stringBuilder2 = new StringBuilder();
+        stringBuilder1.append("min(freq) AS freq,min(freq_dev) AS freq_dev,min(rms) AS rms,min(rms_lvr) AS rms_lvr,min(v_neg) AS v_neg,min(v_pos) AS v_pos,min(v_thd) AS v_thd,min(v_unbalance) AS v_unbalance,min(v_zero) AS v_zero,min(vl_dev) AS vl_dev,min(vu_dev) AS vu_dev,");
+        for (int i = 1; i <=50 ; i++) {
+            if (i==50){
+                stringBuilder1.append("min(v_").append(i).append(") AS v_").append(i);
+            } else {
+                stringBuilder1.append("min(v_").append(i).append(") AS v_").append(i).append(",");
+            }
+        }
+        stringBuilder2.append ("line_id='").append (lineIndex).append ("' and ").append(InfluxDBPublicParam.TIME + " >= '").append(startTime).append("' and ").append(InfluxDBPublicParam.TIME).append(" <= '").append(endTime).append("' and value_type = 'MIN' group by line_id,phasic_type,value_type,quality_flag ").append(InfluxDBPublicParam.TIME_ZONE);
+        String sql1 = "select "+stringBuilder1+" from "+ InfluxDBPublicParam.DATA_V+" where "+stringBuilder2;
+        QueryResult sqlResult1 = influxDbUtils.query(sql1);
+        InfluxDBResultMapper resultMapper1 = new InfluxDBResultMapper();
+        List<DataVPO> list1 = resultMapper1.toPOJO(sqlResult1, DataVPO.class);
+        //最大值
+        StringBuilder stringBuilder3 = new StringBuilder();
+        StringBuilder stringBuilder4 = new StringBuilder();
+        stringBuilder3.append("max(freq) AS freq,max(freq_dev) AS freq_dev,max(rms) AS rms,max(rms_lvr) AS rms_lvr,max(v_neg) AS v_neg,max(v_pos) AS v_pos,max(v_thd) AS v_thd,max(v_unbalance) AS v_unbalance,max(v_zero) AS v_zero,max(vl_dev) AS vl_dev,max(vu_dev) AS vu_dev,");
+        for (int i = 1; i <=50 ; i++) {
+            if (i==50){
+                stringBuilder3.append("max(v_").append(i).append(") AS v_").append(i);
+            } else {
+                stringBuilder3.append("max(v_").append(i).append(") AS v_").append(i).append(",");
+            }
+        }
+        stringBuilder4.append ("line_id='").append (lineIndex).append ("' and ").append(InfluxDBPublicParam.TIME + " >= '").append(startTime).append("' and ").append(InfluxDBPublicParam.TIME).append(" <= '").append(endTime).append("' and value_type = 'MAX' group by line_id,phasic_type,value_type,quality_flag ").append(InfluxDBPublicParam.TIME_ZONE);
+        String sql2 = "select "+stringBuilder3+" from "+ InfluxDBPublicParam.DATA_V+" where "+stringBuilder4;
+        QueryResult sqlResult2 = influxDbUtils.query(sql2);
+        InfluxDBResultMapper resultMapper2 = new InfluxDBResultMapper();
+        List<DataVPO> list2 = resultMapper2.toPOJO(sqlResult2, DataVPO.class);
+        //平均值
+        StringBuilder stringBuilder5 = new StringBuilder();
+        StringBuilder stringBuilder6 = new StringBuilder();
+        stringBuilder5.append("mean(freq) AS freq,mean(freq_dev) AS freq_dev,mean(rms) AS rms,mean(rms_lvr) AS rms_lvr,mean(v_neg) AS v_neg,mean(v_pos) AS v_pos,mean(v_thd) AS v_thd,mean(v_unbalance) AS v_unbalance,mean(v_zero) AS v_zero,mean(vl_dev) AS vl_dev,mean(vu_dev) AS vu_dev,");
+        for (int i = 1; i <=50 ; i++) {
+            if (i==50){
+                stringBuilder5.append("mean(v_").append(i).append(") AS v_").append(i);
+            } else {
+                stringBuilder5.append("mean(v_").append(i).append(") AS v_").append(i).append(",");
+            }
+        }
+        stringBuilder6.append ("line_id='").append (lineIndex).append ("' and ").append(InfluxDBPublicParam.TIME + " >= '").append(startTime).append("' and ").append(InfluxDBPublicParam.TIME).append(" <= '").append(endTime).append("' and value_type = 'AVG' group by line_id,phasic_type,value_type,quality_flag ").append(InfluxDBPublicParam.TIME_ZONE);
+        String sql3 = "select "+stringBuilder5+" from "+ InfluxDBPublicParam.DATA_V+" where "+stringBuilder6;
+        QueryResult sqlResult3 = influxDbUtils.query(sql3);
+        InfluxDBResultMapper resultMapper3 = new InfluxDBResultMapper();
+        List<DataVPO> list3 = resultMapper3.toPOJO(sqlResult3, DataVPO.class);
+        //CP95值
+        StringBuilder stringBuilder7 = new StringBuilder();
+        StringBuilder stringBuilder8 = new StringBuilder();
+        stringBuilder7.append("percentile(freq,95) AS freq,percentile(freq_dev,95) AS freq_dev,percentile(rms,95) AS rms,percentile(rms_lvr,95) AS rms_lvr,percentile(v_neg,95) AS v_neg,percentile(v_pos,95) AS v_pos,percentile(v_thd,95) AS v_thd,percentile(v_unbalance,95) AS v_unbalance,percentile(v_zero,95) AS v_zero,percentile(vl_dev,95) AS vl_dev,percentile(vu_dev,95) AS vu_dev,");
+        for (int i = 1; i <=50 ; i++) {
+            if (i==50){
+                stringBuilder7.append("percentile(v_").append(i).append(",95) AS v_").append(i);
+            } else {
+                stringBuilder7.append("percentile(v_").append(i).append(",95) AS v_").append(i).append(",");
+            }
+        }
+        stringBuilder8.append ("line_id='").append (lineIndex).append ("' and ").append(InfluxDBPublicParam.TIME + " >= '").append(startTime).append("' and ").append(InfluxDBPublicParam.TIME).append(" <= '").append(endTime).append("' and value_type = 'AVG' group by line_id,phasic_type,value_type,quality_flag ").append(InfluxDBPublicParam.TIME_ZONE);
+        String sql4 = "select "+stringBuilder7+" from "+ InfluxDBPublicParam.DATA_V+" where "+stringBuilder8;
+        QueryResult sqlResult4 = influxDbUtils.query(sql4);
+        InfluxDBResultMapper resultMapper4 = new InfluxDBResultMapper();
+        List<DataVPO> list4 = resultMapper4.toPOJO(sqlResult4, DataVPO.class);
+        list4.forEach(item->{
+            item.setValueType("CP95");
+        });
+        result.addAll(list1);
+        result.addAll(list2);
+        result.addAll(list3);
+        result.addAll(list4);
+        return result;
+    }
+
+
+    /**
+     * 功能描述:获取dataI数据
+     * @author xy
+     * @param lineIndex    监测点ID
+     * @param startTime   起始时间
+     * @param endTime     结束时间
+     * @date 2022/5/10 14:56
+     * @return List<DataIPO>
+     */
+    public List<DataIPO> getDataI(String lineIndex, String startTime, String endTime){
+        List<DataIPO> result = new ArrayList<>();
+        //最小值
+        StringBuilder stringBuilder1 = new StringBuilder();
+        StringBuilder stringBuilder2 = new StringBuilder();
+        stringBuilder1.append("min(rms) AS rms,min(i_neg) AS i_neg,min(i_pos) AS i_pos,min(i_thd) AS i_thd,min(i_unbalance) AS i_unbalance,min(i_zero) AS i_zero,");
+        for (int i = 1; i <=50 ; i++) {
+            if (i==50){
+                stringBuilder1.append("min(i_").append(i).append(") AS i_").append(i);
+            } else {
+                stringBuilder1.append("min(i_").append(i).append(") AS i_").append(i).append(",");
+            }
+        }
+        stringBuilder2.append ("line_id='").append (lineIndex).append ("' and ").append(InfluxDBPublicParam.TIME + " >= '").append(startTime).append("' and ").append(InfluxDBPublicParam.TIME).append(" <= '").append(endTime).append("' and value_type = 'MIN' group by line_id,phasic_type,value_type,quality_flag ").append(InfluxDBPublicParam.TIME_ZONE);
+        String sql1 = "select "+stringBuilder1+" from "+ InfluxDBPublicParam.DATA_I+" where "+stringBuilder2;
+        QueryResult sqlResult1 = influxDbUtils.query(sql1);
+        InfluxDBResultMapper resultMapper1 = new InfluxDBResultMapper();
+        List<DataIPO> list1 = resultMapper1.toPOJO(sqlResult1, DataIPO.class);
+        //最大值
+        StringBuilder stringBuilder3 = new StringBuilder();
+        StringBuilder stringBuilder4 = new StringBuilder();
+        stringBuilder3.append("max(rms) AS rms,max(i_neg) AS i_neg,max(i_pos) AS i_pos,max(i_thd) AS i_thd,max(i_unbalance) AS i_unbalance,max(i_zero) AS i_zero,");
+        for (int i = 1; i <=50 ; i++) {
+            if (i==50){
+                stringBuilder3.append("max(i_").append(i).append(") AS i_").append(i);
+            } else {
+                stringBuilder3.append("max(i_").append(i).append(") AS i_").append(i).append(",");
+            }
+        }
+        stringBuilder4.append ("line_id='").append (lineIndex).append ("' and ").append(InfluxDBPublicParam.TIME + " >= '").append(startTime).append("' and ").append(InfluxDBPublicParam.TIME).append(" <= '").append(endTime).append("' and value_type = 'MAX' group by line_id,phasic_type,value_type,quality_flag ").append(InfluxDBPublicParam.TIME_ZONE);
+        String sql2 = "select "+stringBuilder3+" from "+ InfluxDBPublicParam.DATA_I+" where "+stringBuilder4;
+        QueryResult sqlResult2 = influxDbUtils.query(sql2);
+        InfluxDBResultMapper resultMapper2 = new InfluxDBResultMapper();
+        List<DataIPO> list2 = resultMapper2.toPOJO(sqlResult2, DataIPO.class);
+        //平均值
+        StringBuilder stringBuilder5 = new StringBuilder();
+        StringBuilder stringBuilder6 = new StringBuilder();
+        stringBuilder5.append("mean(rms) AS rms,mean(i_neg) AS i_neg,mean(i_pos) AS i_pos,mean(i_thd) AS i_thd,mean(i_unbalance) AS i_unbalance,mean(i_zero) AS i_zero,");
+        for (int i = 1; i <=50 ; i++) {
+            if (i==50){
+                stringBuilder5.append("mean(i_").append(i).append(") AS i_").append(i);
+            } else {
+                stringBuilder5.append("mean(i_").append(i).append(") AS i_").append(i).append(",");
+            }
+        }
+        stringBuilder6.append ("line_id='").append (lineIndex).append ("' and ").append(InfluxDBPublicParam.TIME + " >= '").append(startTime).append("' and ").append(InfluxDBPublicParam.TIME).append(" <= '").append(endTime).append("' and value_type = 'AVG' group by line_id,phasic_type,value_type,quality_flag ").append(InfluxDBPublicParam.TIME_ZONE);
+        String sql3 = "select "+stringBuilder5+" from "+ InfluxDBPublicParam.DATA_I+" where "+stringBuilder6;
+        QueryResult sqlResult3 = influxDbUtils.query(sql3);
+        InfluxDBResultMapper resultMapper3 = new InfluxDBResultMapper();
+        List<DataIPO> list3 = resultMapper3.toPOJO(sqlResult3, DataIPO.class);
+        //CP95值
+        StringBuilder stringBuilder7 = new StringBuilder();
+        StringBuilder stringBuilder8 = new StringBuilder();
+        stringBuilder7.append("percentile(rms,95) AS rms,percentile(i_neg,95) AS i_neg,percentile(i_pos,95) AS i_pos,percentile(i_thd,95) AS i_thd,percentile(i_unbalance,95) AS i_unbalance,percentile(i_zero,95) AS i_zero,");
+        for (int i = 1; i <=50 ; i++) {
+            if (i==50){
+                stringBuilder7.append("percentile(i_").append(i).append(",95) AS i_").append(i);
+            } else {
+                stringBuilder7.append("percentile(i_").append(i).append(",95) AS i_").append(i).append(",");
+            }
+        }
+        stringBuilder8.append ("line_id='").append (lineIndex).append ("' and ").append(InfluxDBPublicParam.TIME + " >= '").append(startTime).append("' and ").append(InfluxDBPublicParam.TIME).append(" <= '").append(endTime).append("' and value_type = 'AVG' group by line_id,phasic_type,value_type,quality_flag ").append(InfluxDBPublicParam.TIME_ZONE);
+        String sql4 = "select "+stringBuilder7+" from "+ InfluxDBPublicParam.DATA_I+" where "+stringBuilder8;
+        QueryResult sqlResult4 = influxDbUtils.query(sql4);
+        InfluxDBResultMapper resultMapper4 = new InfluxDBResultMapper();
+        List<DataIPO> list4 = resultMapper4.toPOJO(sqlResult4, DataIPO.class);
+        list4.forEach(item->{
+            item.setValueType("CP95");
+        });
+        result.addAll(list1);
+        result.addAll(list2);
+        result.addAll(list3);
+        result.addAll(list4);
+        return result;
+    }
+
+    /**
+     * 功能描述:获取dataFlicker数据
+     * @author xy
+     * @param startTime   起始时间
+     * @param endTime     结束时间
+     * @date 2022/5/10 14:56
+     * @return List<DataFlickerPO>
+     */
+    public List<DataFlickerPO> getDataFlicker(String lineIndex, String startTime, String endTime){
+        List<DataFlickerPO> result = new ArrayList<>();
+        StringBuilder stringBuilder = new StringBuilder();
+        stringBuilder.append ("line_id='").append (lineIndex).append ("' and ");
+        //最小值
+        String sql1 = "select min(fluc) AS fluc,min(plt) AS plt,min(pst) AS pst from "+ InfluxDBPublicParam.DATA_FLICKER+" where "+stringBuilder+" time >= '" + startTime + "' and time <= '" + endTime + "' group by line_id,phasic_type,quality_flag "+ InfluxDBPublicParam.TIME_ZONE;
+        QueryResult sqlResult1 = influxDbUtils.query(sql1);
+        InfluxDBResultMapper resultMapper1 = new InfluxDBResultMapper();
+        List<DataFlickerPO> list1 = resultMapper1.toPOJO(sqlResult1, DataFlickerPO.class);
+        list1.forEach(item->{
+            item.setValueType("MIN");
+        });
+        //最大值
+        String sql2 = "select max(fluc) AS fluc,max(plt) AS plt,max(pst) AS pst from "+ InfluxDBPublicParam.DATA_FLICKER+" where "+stringBuilder+" time >= '" + startTime + "' and time <= '" + endTime + "' group by line_id,phasic_type,quality_flag "+ InfluxDBPublicParam.TIME_ZONE;
+        QueryResult sqlResult2 = influxDbUtils.query(sql2);
+        InfluxDBResultMapper resultMapper2 = new InfluxDBResultMapper();
+        List<DataFlickerPO> list2 = resultMapper2.toPOJO(sqlResult2, DataFlickerPO.class);
+        list2.forEach(item->{
+            item.setValueType("MAX");
+        });
+        //平均值
+        String sql3 = "select mean(fluc) AS fluc,mean(plt) AS plt,mean(pst) AS pst from "+ InfluxDBPublicParam.DATA_FLICKER+" where "+stringBuilder+" time >= '" + startTime + "' and time <= '" + endTime + "' group by line_id,phasic_type,quality_flag "+ InfluxDBPublicParam.TIME_ZONE;
+        QueryResult sqlResult3 = influxDbUtils.query(sql3);
+        InfluxDBResultMapper resultMapper3= new InfluxDBResultMapper();
+        List<DataFlickerPO> list3 = resultMapper3.toPOJO(sqlResult3, DataFlickerPO.class);
+        list3.forEach(item->{
+            item.setValueType("AVG");
+        });
+        //CP95值
+        String sql4 = "select percentile(fluc,95) AS fluc,percentile(plt,95) AS plt,percentile(pst,95) AS pst from "+ InfluxDBPublicParam.DATA_FLICKER+" where "+stringBuilder+" time >= '" + startTime + "' and time <= '" + endTime + "' group by line_id,phasic_type,quality_flag "+ InfluxDBPublicParam.TIME_ZONE;;
+        QueryResult sqlResult4 = influxDbUtils.query(sql4);
+        InfluxDBResultMapper resultMapper4= new InfluxDBResultMapper();
+        List<DataFlickerPO> list4 = resultMapper4.toPOJO(sqlResult4, DataFlickerPO.class);
+        list4.forEach(item->{
+            item.setValueType("CP95");
+        });
+        result.addAll(list1);
+        result.addAll(list2);
+        result.addAll(list3);
+        result.addAll(list4);
+        return result;
+    }
+
+    /**
+     * 功能描述:获取dataFluc数据
+     * @author xy
+     * @param startTime   起始时间
+     * @param endTime     结束时间
+     * @date 2022/5/10 14:56
+     * @return List<DataFlucPO>
+     */
+    public List<DataFlucPO> getDataFluc(String lineIndex, String startTime, String endTime){
+        List<DataFlucPO> result = new ArrayList<>();
+        StringBuilder stringBuilder = new StringBuilder();
+        stringBuilder.append ("line_id='").append (lineIndex).append ("' and ");
+        //最小值
+        String sql1 = "select min(fluc) AS fluc,min(fluccf) AS fluccf from "+ InfluxDBPublicParam.DATA_FLUC+" where "+stringBuilder+" time >= '" + startTime + "' and time <= '" + endTime + "' group by line_id,phasic_type,quality_flag "+ InfluxDBPublicParam.TIME_ZONE;
+        QueryResult sqlResult1 = influxDbUtils.query(sql1);
+        InfluxDBResultMapper resultMapper1 = new InfluxDBResultMapper();
+        List<DataFlucPO> list1 = resultMapper1.toPOJO(sqlResult1, DataFlucPO.class);
+        list1.forEach(item->{
+            item.setValueType("MIN");
+        });
+        //最大值
+        String sql2 = "select max(fluc) AS fluc,max(fluccf) AS fluccf from "+ InfluxDBPublicParam.DATA_FLUC+" where "+stringBuilder+" time >= '" + startTime + "' and time <= '" + endTime + "' group by line_id,phasic_type,quality_flag "+ InfluxDBPublicParam.TIME_ZONE;
+        QueryResult sqlResult2 = influxDbUtils.query(sql2);
+        InfluxDBResultMapper resultMapper2 = new InfluxDBResultMapper();
+        List<DataFlucPO> list2 = resultMapper2.toPOJO(sqlResult2, DataFlucPO.class);
+        list2.forEach(item->{
+            item.setValueType("MAX");
+        });
+        //平均值
+        String sql3 = "select mean(fluc) AS fluc,mean(fluccf) AS fluccf from "+ InfluxDBPublicParam.DATA_FLUC+" where "+stringBuilder+" time >= '" + startTime + "' and time <= '" + endTime + "' group by line_id,phasic_type,quality_flag "+ InfluxDBPublicParam.TIME_ZONE;
+        QueryResult sqlResult3 = influxDbUtils.query(sql3);
+        InfluxDBResultMapper resultMapper3= new InfluxDBResultMapper();
+        List<DataFlucPO> list3 = resultMapper3.toPOJO(sqlResult3, DataFlucPO.class);
+        list3.forEach(item->{
+            item.setValueType("AVG");
+        });
+        //CP95值
+        String sql4 = "select percentile(fluc,95) AS fluc,percentile(fluccf,95) AS fluccf from "+ InfluxDBPublicParam.DATA_FLUC+" where "+stringBuilder+" time >= '" + startTime + "' and time <= '" + endTime + "' group by line_id,phasic_type,quality_flag "+ InfluxDBPublicParam.TIME_ZONE;
+        QueryResult sqlResult4 = influxDbUtils.query(sql4);
+        InfluxDBResultMapper resultMapper4= new InfluxDBResultMapper();
+        List<DataFlucPO> list4 = resultMapper4.toPOJO(sqlResult4, DataFlucPO.class);
+        list4.forEach(item->{
+            item.setValueType("CP95");
+        });
+        result.addAll(list1);
+        result.addAll(list2);
+        result.addAll(list3);
+        result.addAll(list4);
+        return result;
+    }
+
+    /**
+     * 功能描述:获取data_harmphasic_i数据
+     * @author xy
+     * @param startTime   起始时间
+     * @param endTime     结束时间
+     * @date 2022/5/10 14:56
+     * @return List<DataHarmPhasicIPO>
+     */
+    public List<DataHarmPhasicIPO> getDataHarmphasicI(String lineIndex, String startTime, String endTime){
+        List<DataHarmPhasicIPO> result = new ArrayList<>();
+
+        StringBuilder stringBuilder = new StringBuilder();
+        stringBuilder.append ("line_id='").append (lineIndex).append ("' and ");
+
+        //最小值
+        StringBuilder stringBuilder1 = new StringBuilder();
+        StringBuilder stringBuilder2 = new StringBuilder();
+        for (int i = 1; i <=50 ; i++) {
+            if (i==50){
+                stringBuilder1.append("min(i_").append(i).append(") AS i_").append(i);
+            } else {
+                stringBuilder1.append("min(i_").append(i).append(") AS i_").append(i).append(",");
+            }
+        }
+        stringBuilder2.append(InfluxDBPublicParam.TIME + " >= '").append(startTime).append("' and ").append(InfluxDBPublicParam.TIME).append(" <= '").append(endTime).append("' and value_type = 'MIN' group by line_id,phasic_type,value_type,quality_flag ").append(InfluxDBPublicParam.TIME_ZONE);
+        String sql1 = "select "+stringBuilder1+" from "+ InfluxDBPublicParam.DATA_HARM_PHASIC_I+" where "+stringBuilder+stringBuilder2;
+        QueryResult sqlResult1 = influxDbUtils.query(sql1);
+        InfluxDBResultMapper resultMapper1 = new InfluxDBResultMapper();
+        List<DataHarmPhasicIPO> list1 = resultMapper1.toPOJO(sqlResult1, DataHarmPhasicIPO.class);
+        //最大值
+        StringBuilder stringBuilder3 = new StringBuilder();
+        StringBuilder stringBuilder4 = new StringBuilder();
+        for (int i = 1; i <=50 ; i++) {
+            if (i==50){
+                stringBuilder3.append("max(i_").append(i).append(") AS i_").append(i);
+            } else {
+                stringBuilder3.append("max(i_").append(i).append(") AS i_").append(i).append(",");
+            }
+        }
+        stringBuilder4.append(InfluxDBPublicParam.TIME + " >= '").append(startTime).append("' and ").append(InfluxDBPublicParam.TIME).append(" <= '").append(endTime).append("' and value_type = 'MAX' group by line_id,phasic_type,value_type,quality_flag ").append(InfluxDBPublicParam.TIME_ZONE);
+        String sql2 = "select "+stringBuilder3+" from "+ InfluxDBPublicParam.DATA_HARM_PHASIC_I+" where "+stringBuilder+stringBuilder4;
+        QueryResult sqlResult2 = influxDbUtils.query(sql2);
+        InfluxDBResultMapper resultMapper2 = new InfluxDBResultMapper();
+        List<DataHarmPhasicIPO> list2 = resultMapper2.toPOJO(sqlResult2, DataHarmPhasicIPO.class);
+        //平均值
+        StringBuilder stringBuilder5 = new StringBuilder();
+        StringBuilder stringBuilder6 = new StringBuilder();
+        for (int i = 1; i <=50 ; i++) {
+            if (i==50){
+                stringBuilder5.append("mean(i_").append(i).append(") AS i_").append(i);
+            } else {
+                stringBuilder5.append("mean(i_").append(i).append(") AS i_").append(i).append(",");
+            }
+        }
+        stringBuilder6.append(InfluxDBPublicParam.TIME + " >= '").append(startTime).append("' and ").append(InfluxDBPublicParam.TIME).append(" <= '").append(endTime).append("' and value_type = 'AVG' group by line_id,phasic_type,value_type,quality_flag ").append(InfluxDBPublicParam.TIME_ZONE);
+        String sql3 = "select "+stringBuilder5+" from "+ InfluxDBPublicParam.DATA_HARM_PHASIC_I+" where "+stringBuilder+stringBuilder6;
+        QueryResult sqlResult3 = influxDbUtils.query(sql3);
+        InfluxDBResultMapper resultMapper3 = new InfluxDBResultMapper();
+        List<DataHarmPhasicIPO> list3 = resultMapper3.toPOJO(sqlResult3, DataHarmPhasicIPO.class);
+        //CP95值
+        StringBuilder stringBuilder7 = new StringBuilder();
+        StringBuilder stringBuilder8 = new StringBuilder();
+        for (int i = 1; i <=50 ; i++) {
+            if (i==50){
+                stringBuilder7.append("percentile(i_").append(i).append(",95) AS i_").append(i);
+            } else {
+                stringBuilder7.append("percentile(i_").append(i).append(",95) AS i_").append(i).append(",");
+            }
+        }
+        stringBuilder8.append(InfluxDBPublicParam.TIME + " >= '").append(startTime).append("' and ").append(InfluxDBPublicParam.TIME).append(" <= '").append(endTime).append("' and value_type = 'AVG' group by line_id,phasic_type,value_type,quality_flag ").append(InfluxDBPublicParam.TIME_ZONE);
+        String sql4 = "select "+stringBuilder7+" from "+ InfluxDBPublicParam.DATA_HARM_PHASIC_I+" where "+stringBuilder+stringBuilder8;
+        QueryResult sqlResult4 = influxDbUtils.query(sql4);
+        InfluxDBResultMapper resultMapper4 = new InfluxDBResultMapper();
+        List<DataHarmPhasicIPO> list4 = resultMapper4.toPOJO(sqlResult4, DataHarmPhasicIPO.class);
+        list4.forEach(item->{
+            item.setValueType("CP95");
+        });
+        result.addAll(list1);
+        result.addAll(list2);
+        result.addAll(list3);
+        result.addAll(list4);
+        return result;
+    }
+
+
+    /**
+     * 功能描述:获取data_harmphasic_v数据
+     * @author xy
+     * @param startTime   起始时间
+     * @param endTime     结束时间
+     * @date 2022/5/10 14:56
+     * @return List<DataHarmPhasicVPO>
+     */
+    public List<DataHarmPhasicVPO> getDataHarmphasicV(String lineIndex, String startTime, String endTime){
+        List<DataHarmPhasicVPO> result = new ArrayList<>();
+
+        StringBuilder stringBuilder = new StringBuilder();
+        stringBuilder.append ("line_id='").append (lineIndex).append ("' and ");
+        //最小值
+        StringBuilder stringBuilder1 = new StringBuilder();
+        StringBuilder stringBuilder2 = new StringBuilder();
+        for (int i = 1; i <=50 ; i++) {
+            if (i==50){
+                stringBuilder1.append("min(v_").append(i).append(") AS v_").append(i);
+            } else {
+                stringBuilder1.append("min(v_").append(i).append(") AS v_").append(i).append(",");
+            }
+        }
+        stringBuilder2.append(InfluxDBPublicParam.TIME + " >= '").append(startTime).append("' and ").append(InfluxDBPublicParam.TIME).append(" <= '").append(endTime).append("' and value_type = 'MIN' group by line_id,phasic_type,value_type,quality_flag ").append(InfluxDBPublicParam.TIME_ZONE);
+        String sql1 = "select "+stringBuilder1+" from "+ InfluxDBPublicParam.DATA_HARM_PHASIC_V+" where "+stringBuilder+stringBuilder2;
+        QueryResult sqlResult1 = influxDbUtils.query(sql1);
+        InfluxDBResultMapper resultMapper1 = new InfluxDBResultMapper();
+        List<DataHarmPhasicVPO> list1 = resultMapper1.toPOJO(sqlResult1, DataHarmPhasicVPO.class);
+        //最大值
+        StringBuilder stringBuilder3 = new StringBuilder();
+        StringBuilder stringBuilder4 = new StringBuilder();
+        for (int i = 1; i <=50 ; i++) {
+            if (i==50){
+                stringBuilder3.append("max(v_").append(i).append(") AS v_").append(i);
+            } else {
+                stringBuilder3.append("max(v_").append(i).append(") AS v_").append(i).append(",");
+            }
+        }
+        stringBuilder4.append(InfluxDBPublicParam.TIME + " >= '").append(startTime).append("' and ").append(InfluxDBPublicParam.TIME).append(" <= '").append(endTime).append("' and value_type = 'MAX' group by line_id,phasic_type,value_type,quality_flag ").append(InfluxDBPublicParam.TIME_ZONE);
+        String sql2 = "select "+stringBuilder3+" from "+ InfluxDBPublicParam.DATA_HARM_PHASIC_V+" where "+stringBuilder+stringBuilder4;
+        QueryResult sqlResult2 = influxDbUtils.query(sql2);
+        InfluxDBResultMapper resultMapper2 = new InfluxDBResultMapper();
+        List<DataHarmPhasicVPO> list2 = resultMapper2.toPOJO(sqlResult2, DataHarmPhasicVPO.class);
+        //平均值
+        StringBuilder stringBuilder5 = new StringBuilder();
+        StringBuilder stringBuilder6 = new StringBuilder();
+        for (int i = 1; i <=50 ; i++) {
+            if (i==50){
+                stringBuilder5.append("mean(v_").append(i).append(") AS v_").append(i);
+            } else {
+                stringBuilder5.append("mean(v_").append(i).append(") AS v_").append(i).append(",");
+            }
+        }
+        stringBuilder6.append(InfluxDBPublicParam.TIME + " >= '").append(startTime).append("' and ").append(InfluxDBPublicParam.TIME).append(" <= '").append(endTime).append("' and value_type = 'AVG' group by line_id,phasic_type,value_type,quality_flag ").append(InfluxDBPublicParam.TIME_ZONE);
+        String sql3 = "select "+stringBuilder5+" from "+ InfluxDBPublicParam.DATA_HARM_PHASIC_V+" where "+stringBuilder+stringBuilder6;
+        QueryResult sqlResult3 = influxDbUtils.query(sql3);
+        InfluxDBResultMapper resultMapper3 = new InfluxDBResultMapper();
+        List<DataHarmPhasicVPO> list3 = resultMapper3.toPOJO(sqlResult3, DataHarmPhasicVPO.class);
+        //CP95值
+        StringBuilder stringBuilder7 = new StringBuilder();
+        StringBuilder stringBuilder8 = new StringBuilder();
+        for (int i = 1; i <=50 ; i++) {
+            if (i==50){
+                stringBuilder7.append("percentile(v_").append(i).append(",95) AS v_").append(i);
+            } else {
+                stringBuilder7.append("percentile(v_").append(i).append(",95) AS v_").append(i).append(",");
+            }
+        }
+        stringBuilder8.append(InfluxDBPublicParam.TIME + " >= '").append(startTime).append("' and ").append(InfluxDBPublicParam.TIME).append(" <= '").append(endTime).append("' and value_type = 'AVG' group by line_id,phasic_type,value_type,quality_flag ").append(InfluxDBPublicParam.TIME_ZONE);
+        String sql4 = "select "+stringBuilder7+" from "+ InfluxDBPublicParam.DATA_HARM_PHASIC_V+" where "+stringBuilder+stringBuilder8;
+        QueryResult sqlResult4 = influxDbUtils.query(sql4);
+        InfluxDBResultMapper resultMapper4 = new InfluxDBResultMapper();
+        List<DataHarmPhasicVPO> list4 = resultMapper4.toPOJO(sqlResult4, DataHarmPhasicVPO.class);
+        list4.forEach(item->{
+            item.setValueType("CP95");
+        });
+        result.addAll(list1);
+        result.addAll(list2);
+        result.addAll(list3);
+        result.addAll(list4);
+        return result;
+    }
+
+
+    /**
+     * 功能描述:获取data_harmpower_p数据
+     * @author xy
+     * @param startTime   起始时间
+     * @param endTime     结束时间
+     * @date 2022/5/10 14:56
+     * @return List<DataHarmPowerPPO>
+     */
+    public List<DataHarmPowerPPO> getDataHarmPowerP(String lineIndex, String startTime, String endTime){
+        List<DataHarmPowerPPO> result = new ArrayList<>();
+
+        StringBuilder stringBuilder = new StringBuilder();
+        stringBuilder.append ("line_id='").append (lineIndex).append ("' and ");
+        //最小值
+        StringBuilder stringBuilder1 = new StringBuilder();
+        StringBuilder stringBuilder2 = new StringBuilder();
+        stringBuilder1.append("min(p) AS p,min(df) AS df,min(pf) AS pf,");
+        for (int i = 1; i <=50 ; i++) {
+            if (i==50){
+                stringBuilder1.append("min(p_").append(i).append(") AS p_").append(i);
+            } else {
+                stringBuilder1.append("min(p_").append(i).append(") AS p_").append(i).append(",");
+            }
+        }
+        stringBuilder2.append(InfluxDBPublicParam.TIME + " >= '").append(startTime).append("' and ").append(InfluxDBPublicParam.TIME).append(" <= '").append(endTime).append("' and value_type = 'MIN' group by line_id,phasic_type,value_type,quality_flag ").append(InfluxDBPublicParam.TIME_ZONE);
+        String sql1 = "select "+stringBuilder1+" from "+ InfluxDBPublicParam.DATA_HARM_POWER_P+" where "+stringBuilder+stringBuilder2;
+        QueryResult sqlResult1 = influxDbUtils.query(sql1);
+        InfluxDBResultMapper resultMapper1 = new InfluxDBResultMapper();
+        List<DataHarmPowerPPO> list1 = resultMapper1.toPOJO(sqlResult1, DataHarmPowerPPO.class);
+        //最大值
+        StringBuilder stringBuilder3 = new StringBuilder();
+        StringBuilder stringBuilder4 = new StringBuilder();
+        stringBuilder3.append("max(p) AS p,max(df) AS df,max(pf) AS pf,");
+        for (int i = 1; i <=50 ; i++) {
+            if (i==50){
+                stringBuilder3.append("max(p_").append(i).append(") AS p_").append(i);
+            } else {
+                stringBuilder3.append("max(p_").append(i).append(") AS p_").append(i).append(",");
+            }
+        }
+        stringBuilder4.append(InfluxDBPublicParam.TIME + " >= '").append(startTime).append("' and ").append(InfluxDBPublicParam.TIME).append(" <= '").append(endTime).append("' and value_type = 'MAX' group by line_id,phasic_type,value_type,quality_flag ").append(InfluxDBPublicParam.TIME_ZONE);
+        String sql2 = "select "+stringBuilder3+" from "+ InfluxDBPublicParam.DATA_HARM_POWER_P+" where "+stringBuilder+stringBuilder4;
+        QueryResult sqlResult2 = influxDbUtils.query(sql2);
+        InfluxDBResultMapper resultMapper2 = new InfluxDBResultMapper();
+        List<DataHarmPowerPPO> list2 = resultMapper2.toPOJO(sqlResult2, DataHarmPowerPPO.class);
+        //平均值
+        StringBuilder stringBuilder5 = new StringBuilder();
+        StringBuilder stringBuilder6 = new StringBuilder();
+        stringBuilder5.append("mean(p) AS p,mean(df) AS df,mean(pf) AS pf,");
+        for (int i = 1; i <=50 ; i++) {
+            if (i==50){
+                stringBuilder5.append("mean(p_").append(i).append(") AS p_").append(i);
+            } else {
+                stringBuilder5.append("mean(p_").append(i).append(") AS p_").append(i).append(",");
+            }
+        }
+        stringBuilder6.append(InfluxDBPublicParam.TIME + " >= '").append(startTime).append("' and ").append(InfluxDBPublicParam.TIME).append(" <= '").append(endTime).append("' and value_type = 'AVG' group by line_id,phasic_type,value_type,quality_flag ").append(InfluxDBPublicParam.TIME_ZONE);
+        String sql3 = "select "+stringBuilder5+" from "+ InfluxDBPublicParam.DATA_HARM_POWER_P+" where "+stringBuilder+stringBuilder6;
+        QueryResult sqlResult3 = influxDbUtils.query(sql3);
+        InfluxDBResultMapper resultMapper3 = new InfluxDBResultMapper();
+        List<DataHarmPowerPPO> list3 = resultMapper3.toPOJO(sqlResult3, DataHarmPowerPPO.class);
+        //CP95值
+        StringBuilder stringBuilder7 = new StringBuilder();
+        StringBuilder stringBuilder8 = new StringBuilder();
+        stringBuilder7.append("percentile(p,95) AS p,percentile(df,95) AS df,percentile(pf,95) AS pf,");
+        for (int i = 1; i <=50 ; i++) {
+            if (i==50){
+                stringBuilder7.append("percentile(p_").append(i).append(",95) AS p_").append(i);
+            } else {
+                stringBuilder7.append("percentile(p_").append(i).append(",95) AS p_").append(i).append(",");
+            }
+        }
+        stringBuilder8.append(InfluxDBPublicParam.TIME + " >= '").append(startTime).append("' and ").append(InfluxDBPublicParam.TIME).append(" <= '").append(endTime).append("' and value_type = 'AVG' group by line_id,phasic_type,value_type,quality_flag ").append(InfluxDBPublicParam.TIME_ZONE);
+        String sql4 = "select "+stringBuilder7+" from "+ InfluxDBPublicParam.DATA_HARM_POWER_P+" where "+stringBuilder+stringBuilder8;
+        QueryResult sqlResult4 = influxDbUtils.query(sql4);
+        InfluxDBResultMapper resultMapper4 = new InfluxDBResultMapper();
+        List<DataHarmPowerPPO> list4 = resultMapper4.toPOJO(sqlResult4, DataHarmPowerPPO.class);
+        list4.forEach(item->{
+            item.setValueType("CP95");
+        });
+        result.addAll(list1);
+        result.addAll(list2);
+        result.addAll(list3);
+        result.addAll(list4);
+        return result;
+    }
+
+    /**
+     * 功能描述:获取data_harmpower_q数据
+     * @author xy
+     * @param startTime   起始时间
+     * @param endTime     结束时间
+     * @date 2022/5/10 14:56
+     * @return List<DataHarmPowerQPO>
+     */
+    public List<DataHarmPowerQPO> getDataHarmPowerQ(String lineIndex, String startTime, String endTime){
+        List<DataHarmPowerQPO> result = new ArrayList<>();
+
+        StringBuilder stringBuilder = new StringBuilder();
+        stringBuilder.append ("line_id='").append (lineIndex).append ("' and ");
+        //最小值
+        StringBuilder stringBuilder1 = new StringBuilder();
+        StringBuilder stringBuilder2 = new StringBuilder();
+        stringBuilder1.append("min(q) AS q,");
+        for (int i = 1; i <=50 ; i++) {
+            if (i==50){
+                stringBuilder1.append("min(q_").append(i).append(") AS q_").append(i);
+            } else {
+                stringBuilder1.append("min(q_").append(i).append(") AS q_").append(i).append(",");
+            }
+        }
+        stringBuilder2.append(InfluxDBPublicParam.TIME + " >= '").append(startTime).append("' and ").append(InfluxDBPublicParam.TIME).append(" <= '").append(endTime).append("' and value_type = 'MIN' group by line_id,phasic_type,value_type,quality_flag ").append(InfluxDBPublicParam.TIME_ZONE);
+        String sql1 = "select "+stringBuilder1+" from "+ InfluxDBPublicParam.DATA_HARM_POWER_Q+" where "+stringBuilder+stringBuilder2;
+        QueryResult sqlResult1 = influxDbUtils.query(sql1);
+        InfluxDBResultMapper resultMapper1 = new InfluxDBResultMapper();
+        List<DataHarmPowerQPO> list1 = resultMapper1.toPOJO(sqlResult1, DataHarmPowerQPO.class);
+        //最大值
+        StringBuilder stringBuilder3 = new StringBuilder();
+        StringBuilder stringBuilder4 = new StringBuilder();
+        stringBuilder3.append("max(q) AS q,");
+        for (int i = 1; i <=50 ; i++) {
+            if (i==50){
+                stringBuilder3.append("max(q_").append(i).append(") AS q_").append(i);
+            } else {
+                stringBuilder3.append("max(q_").append(i).append(") AS q_").append(i).append(",");
+            }
+        }
+        stringBuilder4.append(InfluxDBPublicParam.TIME + " >= '").append(startTime).append("' and ").append(InfluxDBPublicParam.TIME).append(" <= '").append(endTime).append("' and value_type = 'MAX' group by line_id,phasic_type,value_type,quality_flag ").append(InfluxDBPublicParam.TIME_ZONE);
+        String sql2 = "select "+stringBuilder3+" from "+ InfluxDBPublicParam.DATA_HARM_POWER_Q+" where "+stringBuilder+stringBuilder4;
+        QueryResult sqlResult2 = influxDbUtils.query(sql2);
+        InfluxDBResultMapper resultMapper2 = new InfluxDBResultMapper();
+        List<DataHarmPowerQPO> list2 = resultMapper2.toPOJO(sqlResult2, DataHarmPowerQPO.class);
+        //平均值
+        StringBuilder stringBuilder5 = new StringBuilder();
+        StringBuilder stringBuilder6 = new StringBuilder();
+        stringBuilder5.append("mean(q) AS q,");
+        for (int i = 1; i <=50 ; i++) {
+            if (i==50){
+                stringBuilder5.append("mean(q_").append(i).append(") AS q_").append(i);
+            } else {
+                stringBuilder5.append("mean(q_").append(i).append(") AS q_").append(i).append(",");
+            }
+        }
+        stringBuilder6.append(InfluxDBPublicParam.TIME + " >= '").append(startTime).append("' and ").append(InfluxDBPublicParam.TIME).append(" <= '").append(endTime).append("' and value_type = 'AVG' group by line_id,phasic_type,value_type,quality_flag ").append(InfluxDBPublicParam.TIME_ZONE);
+        String sql3 = "select "+stringBuilder5+" from "+ InfluxDBPublicParam.DATA_HARM_POWER_Q+" where "+stringBuilder+stringBuilder6;
+        QueryResult sqlResult3 = influxDbUtils.query(sql3);
+        InfluxDBResultMapper resultMapper3 = new InfluxDBResultMapper();
+        List<DataHarmPowerQPO> list3 = resultMapper3.toPOJO(sqlResult3, DataHarmPowerQPO.class);
+        //CP95值
+        StringBuilder stringBuilder7 = new StringBuilder();
+        StringBuilder stringBuilder8 = new StringBuilder();
+        stringBuilder7.append("percentile(q,95) AS q,");
+        for (int i = 1; i <=50 ; i++) {
+            if (i==50){
+                stringBuilder7.append("percentile(q_").append(i).append(",95) AS q_").append(i);
+            } else {
+                stringBuilder7.append("percentile(q_").append(i).append(",95) AS q_").append(i).append(",");
+            }
+        }
+        stringBuilder8.append(InfluxDBPublicParam.TIME + " >= '").append(startTime).append("' and ").append(InfluxDBPublicParam.TIME).append(" <= '").append(endTime).append("' and value_type = 'AVG' group by line_id,phasic_type,value_type,quality_flag ").append(InfluxDBPublicParam.TIME_ZONE);
+        String sql4 = "select "+stringBuilder7+" from "+ InfluxDBPublicParam.DATA_HARM_POWER_Q+" where "+stringBuilder+stringBuilder8;
+        QueryResult sqlResult4 = influxDbUtils.query(sql4);
+        InfluxDBResultMapper resultMapper4 = new InfluxDBResultMapper();
+        List<DataHarmPowerQPO> list4 = resultMapper4.toPOJO(sqlResult4, DataHarmPowerQPO.class);
+        list4.forEach(item->{
+            item.setValueType("CP95");
+        });
+        result.addAll(list1);
+        result.addAll(list2);
+        result.addAll(list3);
+        result.addAll(list4);
+        return result;
+    }
+
+    /**
+     * 功能描述:获取data_harmpower_s数据
+     * @author xy
+     * @param startTime   起始时间
+     * @param endTime     结束时间
+     * @date 2022/5/10 14:56
+     * @return List<DataHarmPowerSPO>
+     */
+    public List<DataHarmPowerSPO> getDataHarmPowerS(String lineIndex, String startTime, String endTime){
+        List<DataHarmPowerSPO> result = new ArrayList<>();
+
+        StringBuilder stringBuilder = new StringBuilder();
+        stringBuilder.append ("line_id='").append (lineIndex).append ("' and ");
+        //最小值
+        StringBuilder stringBuilder1 = new StringBuilder();
+        StringBuilder stringBuilder2 = new StringBuilder();
+        stringBuilder1.append("min(s) AS s,");
+        for (int i = 1; i <=50 ; i++) {
+            if (i==50){
+                stringBuilder1.append("min(s_").append(i).append(") AS s_").append(i);
+            } else {
+                stringBuilder1.append("min(s_").append(i).append(") AS s_").append(i).append(",");
+            }
+        }
+        stringBuilder2.append(InfluxDBPublicParam.TIME + " >= '").append(startTime).append("' and ").append(InfluxDBPublicParam.TIME).append(" <= '").append(endTime).append("' and value_type = 'MIN' group by line_id,phasic_type,value_type,quality_flag ").append(InfluxDBPublicParam.TIME_ZONE);
+        String sql1 = "select "+stringBuilder1+" from "+ InfluxDBPublicParam.DATA_HARM_POWER_S+" where "+stringBuilder+stringBuilder2;
+        QueryResult sqlResult1 = influxDbUtils.query(sql1);
+        InfluxDBResultMapper resultMapper1 = new InfluxDBResultMapper();
+        List<DataHarmPowerSPO> list1 = resultMapper1.toPOJO(sqlResult1, DataHarmPowerSPO.class);
+        //最大值
+        StringBuilder stringBuilder3 = new StringBuilder();
+        StringBuilder stringBuilder4 = new StringBuilder();
+        stringBuilder3.append("max(s) AS s,");
+        for (int i = 1; i <=50 ; i++) {
+            if (i==50){
+                stringBuilder3.append("max(s_").append(i).append(") AS s_").append(i);
+            } else {
+                stringBuilder3.append("max(s_").append(i).append(") AS s_").append(i).append(",");
+            }
+        }
+        stringBuilder4.append(InfluxDBPublicParam.TIME + " >= '").append(startTime).append("' and ").append(InfluxDBPublicParam.TIME).append(" <= '").append(endTime).append("' and value_type = 'MAX' group by line_id,phasic_type,value_type,quality_flag ").append(InfluxDBPublicParam.TIME_ZONE);
+        String sql2 = "select "+stringBuilder3+" from "+ InfluxDBPublicParam.DATA_HARM_POWER_S+" where "+stringBuilder+stringBuilder4;
+        QueryResult sqlResult2 = influxDbUtils.query(sql2);
+        InfluxDBResultMapper resultMapper2 = new InfluxDBResultMapper();
+        List<DataHarmPowerSPO> list2 = resultMapper2.toPOJO(sqlResult2, DataHarmPowerSPO.class);
+        //平均值
+        StringBuilder stringBuilder5 = new StringBuilder();
+        StringBuilder stringBuilder6 = new StringBuilder();
+        stringBuilder5.append("mean(s) AS s,");
+        for (int i = 1; i <=50 ; i++) {
+            if (i==50){
+                stringBuilder5.append("mean(s_").append(i).append(") AS s_").append(i);
+            } else {
+                stringBuilder5.append("mean(s_").append(i).append(") AS s_").append(i).append(",");
+            }
+        }
+        stringBuilder6.append(InfluxDBPublicParam.TIME + " >= '").append(startTime).append("' and ").append(InfluxDBPublicParam.TIME).append(" <= '").append(endTime).append("' and value_type = 'AVG' group by line_id,phasic_type,value_type,quality_flag ").append(InfluxDBPublicParam.TIME_ZONE);
+        String sql3 = "select "+stringBuilder5+" from "+ InfluxDBPublicParam.DATA_HARM_POWER_S+" where "+stringBuilder+stringBuilder6;
+        QueryResult sqlResult3 = influxDbUtils.query(sql3);
+        InfluxDBResultMapper resultMapper3 = new InfluxDBResultMapper();
+        List<DataHarmPowerSPO> list3 = resultMapper3.toPOJO(sqlResult3, DataHarmPowerSPO.class);
+        //CP95值
+        StringBuilder stringBuilder7 = new StringBuilder();
+        StringBuilder stringBuilder8 = new StringBuilder();
+        stringBuilder7.append("percentile(s,95) AS s,");
+        for (int i = 1; i <=50 ; i++) {
+            if (i==50){
+                stringBuilder7.append("percentile(s_").append(i).append(",95) AS s_").append(i);
+            } else {
+                stringBuilder7.append("percentile(s_").append(i).append(",95) AS s_").append(i).append(",");
+            }
+        }
+        stringBuilder8.append(InfluxDBPublicParam.TIME + " >= '").append(startTime).append("' and ").append(InfluxDBPublicParam.TIME).append(" <= '").append(endTime).append("' and value_type = 'AVG' group by line_id,phasic_type,value_type,quality_flag ").append(InfluxDBPublicParam.TIME_ZONE);
+        String sql4 = "select "+stringBuilder7+" from "+ InfluxDBPublicParam.DATA_HARM_POWER_S+" where "+stringBuilder+stringBuilder8;
+        QueryResult sqlResult4 = influxDbUtils.query(sql4);
+        InfluxDBResultMapper resultMapper4 = new InfluxDBResultMapper();
+        List<DataHarmPowerSPO> list4 = resultMapper4.toPOJO(sqlResult4, DataHarmPowerSPO.class);
+        list4.forEach(item->{
+            item.setValueType("CP95");
+        });
+        result.addAll(list1);
+        result.addAll(list2);
+        result.addAll(list3);
+        result.addAll(list4);
+        return result;
+    }
+
+
+    /**
+     * 功能描述:获取data_harmrate_i数据
+     * @author xy
+     * @param startTime   起始时间
+     * @param endTime     结束时间
+     * @date 2022/5/10 14:56
+     * @return List<DataHarmRateIPO>
+     */
+    public List<DataHarmRateIPO> getDataHarmRateI(String lineIndex, String startTime, String endTime){
+        List<DataHarmRateIPO> result = new ArrayList<>();
+
+        StringBuilder stringBuilder = new StringBuilder();
+        stringBuilder.append ("line_id='").append (lineIndex).append ("' and ");
+        //最小值
+        StringBuilder stringBuilder1 = new StringBuilder();
+        StringBuilder stringBuilder2 = new StringBuilder();
+        for (int i = 1; i <=50 ; i++) {
+            if (i==50){
+                stringBuilder1.append("min(i_").append(i).append(") AS i_").append(i);
+            } else {
+                stringBuilder1.append("min(i_").append(i).append(") AS i_").append(i).append(",");
+            }
+        }
+        stringBuilder2.append(InfluxDBPublicParam.TIME + " >= '").append(startTime).append("' and ").append(InfluxDBPublicParam.TIME).append(" <= '").append(endTime).append("' and value_type = 'MIN' group by line_id,phasic_type,value_type,quality_flag ").append(InfluxDBPublicParam.TIME_ZONE);
+        String sql1 = "select "+stringBuilder1+" from "+ InfluxDBPublicParam.DATA_HARM_RATE_I+" where "+stringBuilder+stringBuilder2;
+        QueryResult sqlResult1 = influxDbUtils.query(sql1);
+        InfluxDBResultMapper resultMapper1 = new InfluxDBResultMapper();
+        List<DataHarmRateIPO> list1 = resultMapper1.toPOJO(sqlResult1, DataHarmRateIPO.class);
+        //最大值
+        StringBuilder stringBuilder3 = new StringBuilder();
+        StringBuilder stringBuilder4 = new StringBuilder();
+        for (int i = 1; i <=50 ; i++) {
+            if (i==50){
+                stringBuilder3.append("max(i_").append(i).append(") AS i_").append(i);
+            } else {
+                stringBuilder3.append("max(i_").append(i).append(") AS i_").append(i).append(",");
+            }
+        }
+        stringBuilder4.append(InfluxDBPublicParam.TIME + " >= '").append(startTime).append("' and ").append(InfluxDBPublicParam.TIME).append(" <= '").append(endTime).append("' and value_type = 'MAX' group by line_id,phasic_type,value_type,quality_flag ").append(InfluxDBPublicParam.TIME_ZONE);
+        String sql2 = "select "+stringBuilder3+" from "+ InfluxDBPublicParam.DATA_HARM_RATE_I+" where "+stringBuilder+stringBuilder4;
+        QueryResult sqlResult2 = influxDbUtils.query(sql2);
+        InfluxDBResultMapper resultMapper2 = new InfluxDBResultMapper();
+        List<DataHarmRateIPO> list2 = resultMapper2.toPOJO(sqlResult2, DataHarmRateIPO.class);
+        //平均值
+        StringBuilder stringBuilder5 = new StringBuilder();
+        StringBuilder stringBuilder6 = new StringBuilder();
+        for (int i = 1; i <=50 ; i++) {
+            if (i==50){
+                stringBuilder5.append("mean(i_").append(i).append(") AS i_").append(i);
+            } else {
+                stringBuilder5.append("mean(i_").append(i).append(") AS i_").append(i).append(",");
+            }
+        }
+        stringBuilder6.append(InfluxDBPublicParam.TIME + " >= '").append(startTime).append("' and ").append(InfluxDBPublicParam.TIME).append(" <= '").append(endTime).append("' and value_type = 'AVG' group by line_id,phasic_type,value_type,quality_flag ").append(InfluxDBPublicParam.TIME_ZONE);
+        String sql3 = "select "+stringBuilder5+" from "+ InfluxDBPublicParam.DATA_HARM_RATE_I+" where "+stringBuilder+stringBuilder6;
+        QueryResult sqlResult3 = influxDbUtils.query(sql3);
+        InfluxDBResultMapper resultMapper3 = new InfluxDBResultMapper();
+        List<DataHarmRateIPO> list3 = resultMapper3.toPOJO(sqlResult3, DataHarmRateIPO.class);
+        //CP95值
+        StringBuilder stringBuilder7 = new StringBuilder();
+        StringBuilder stringBuilder8 = new StringBuilder();
+        for (int i = 1; i <=50 ; i++) {
+            if (i==50){
+                stringBuilder7.append("percentile(i_").append(i).append(",95) AS i_").append(i);
+            } else {
+                stringBuilder7.append("percentile(i_").append(i).append(",95) AS i_").append(i).append(",");
+            }
+        }
+        stringBuilder8.append(InfluxDBPublicParam.TIME + " >= '").append(startTime).append("' and ").append(InfluxDBPublicParam.TIME).append(" <= '").append(endTime).append("' and value_type = 'AVG' group by line_id,phasic_type,value_type,quality_flag ").append(InfluxDBPublicParam.TIME_ZONE);
+        String sql4 = "select "+stringBuilder7+" from "+ InfluxDBPublicParam.DATA_HARM_RATE_I+" where "+stringBuilder+stringBuilder8;
+        QueryResult sqlResult4 = influxDbUtils.query(sql4);
+        InfluxDBResultMapper resultMapper4 = new InfluxDBResultMapper();
+        List<DataHarmRateIPO> list4 = resultMapper4.toPOJO(sqlResult4, DataHarmRateIPO.class);
+        list4.forEach(item->{
+            item.setValueType("CP95");
+        });
+        result.addAll(list1);
+        result.addAll(list2);
+        result.addAll(list3);
+        result.addAll(list4);
+        return result;
+    }
+
+    /**
+     * 功能描述:获取data_harmrate_v数据
+     * @author xy
+     * @param startTime   起始时间
+     * @param endTime     结束时间
+     * @date 2022/5/10 14:56
+     * @return List<DataHarmRateVPO>
+     */
+    public List<DataHarmRateVPO> getDataHarmRateV(String lineIndex, String startTime, String endTime){
+        List<DataHarmRateVPO> result = new ArrayList<>();
+
+        StringBuilder stringBuilder = new StringBuilder();
+        stringBuilder.append ("line_id='").append (lineIndex).append ("' and ");
+        //最小值
+        StringBuilder stringBuilder1 = new StringBuilder();
+        StringBuilder stringBuilder2 = new StringBuilder();
+        for (int i = 1; i <=50 ; i++) {
+            if (i==50){
+                stringBuilder1.append("min(v_").append(i).append(") AS v_").append(i);
+            } else {
+                stringBuilder1.append("min(v_").append(i).append(") AS v_").append(i).append(",");
+            }
+        }
+        stringBuilder2.append(InfluxDBPublicParam.TIME + " >= '").append(startTime).append("' and ").append(InfluxDBPublicParam.TIME).append(" <= '").append(endTime).append("' and value_type = 'MIN' group by line_id,phasic_type,value_type,quality_flag ").append(InfluxDBPublicParam.TIME_ZONE);
+        String sql1 = "select "+stringBuilder1+" from "+ InfluxDBPublicParam.DATA_HARM_RATE_V+" where "+stringBuilder+stringBuilder2;
+        QueryResult sqlResult1 = influxDbUtils.query(sql1);
+        InfluxDBResultMapper resultMapper1 = new InfluxDBResultMapper();
+        List<DataHarmRateVPO> list1 = resultMapper1.toPOJO(sqlResult1, DataHarmRateVPO.class);
+        //最大值
+        StringBuilder stringBuilder3 = new StringBuilder();
+        StringBuilder stringBuilder4 = new StringBuilder();
+        for (int i = 1; i <=50 ; i++) {
+            if (i==50){
+                stringBuilder3.append("max(v_").append(i).append(") AS v_").append(i);
+            } else {
+                stringBuilder3.append("max(v_").append(i).append(") AS v_").append(i).append(",");
+            }
+        }
+        stringBuilder4.append(InfluxDBPublicParam.TIME + " >= '").append(startTime).append("' and ").append(InfluxDBPublicParam.TIME).append(" <= '").append(endTime).append("' and value_type = 'MAX' group by line_id,phasic_type,value_type,quality_flag ").append(InfluxDBPublicParam.TIME_ZONE);
+        String sql2 = "select "+stringBuilder3+" from "+ InfluxDBPublicParam.DATA_HARM_RATE_V+" where "+stringBuilder+stringBuilder4;
+        QueryResult sqlResult2 = influxDbUtils.query(sql2);
+        InfluxDBResultMapper resultMapper2 = new InfluxDBResultMapper();
+        List<DataHarmRateVPO> list2 = resultMapper2.toPOJO(sqlResult2, DataHarmRateVPO.class);
+        //平均值
+        StringBuilder stringBuilder5 = new StringBuilder();
+        StringBuilder stringBuilder6 = new StringBuilder();
+        for (int i = 1; i <=50 ; i++) {
+            if (i==50){
+                stringBuilder5.append("mean(v_").append(i).append(") AS v_").append(i);
+            } else {
+                stringBuilder5.append("mean(v_").append(i).append(") AS v_").append(i).append(",");
+            }
+        }
+        stringBuilder6.append(InfluxDBPublicParam.TIME + " >= '").append(startTime).append("' and ").append(InfluxDBPublicParam.TIME).append(" <= '").append(endTime).append("' and value_type = 'AVG' group by line_id,phasic_type,value_type,quality_flag ").append(InfluxDBPublicParam.TIME_ZONE);
+        String sql3 = "select "+stringBuilder5+" from "+ InfluxDBPublicParam.DATA_HARM_RATE_V+" where "+stringBuilder+stringBuilder6;
+        QueryResult sqlResult3 = influxDbUtils.query(sql3);
+        InfluxDBResultMapper resultMapper3 = new InfluxDBResultMapper();
+        List<DataHarmRateVPO> list3 = resultMapper3.toPOJO(sqlResult3, DataHarmRateVPO.class);
+        //CP95值
+        StringBuilder stringBuilder7 = new StringBuilder();
+        StringBuilder stringBuilder8 = new StringBuilder();
+        for (int i = 1; i <=50 ; i++) {
+            if (i==50){
+                stringBuilder7.append("percentile(v_").append(i).append(",95) AS v_").append(i);
+            } else {
+                stringBuilder7.append("percentile(v_").append(i).append(",95) AS v_").append(i).append(",");
+            }
+        }
+        stringBuilder8.append(InfluxDBPublicParam.TIME + " >= '").append(startTime).append("' and ").append(InfluxDBPublicParam.TIME).append(" <= '").append(endTime).append("' and value_type = 'AVG' group by line_id,phasic_type,value_type,quality_flag ").append(InfluxDBPublicParam.TIME_ZONE);
+        String sql4 = "select "+stringBuilder7+" from "+ InfluxDBPublicParam.DATA_HARM_RATE_V+" where "+stringBuilder+stringBuilder8;
+        QueryResult sqlResult4 = influxDbUtils.query(sql4);
+        InfluxDBResultMapper resultMapper4 = new InfluxDBResultMapper();
+        List<DataHarmRateVPO> list4 = resultMapper4.toPOJO(sqlResult4, DataHarmRateVPO.class);
+        list4.forEach(item->{
+            item.setValueType("CP95");
+        });
+        result.addAll(list1);
+        result.addAll(list2);
+        result.addAll(list3);
+        result.addAll(list4);
+        return result;
+    }
+
+    /**
+     * 功能描述:获取data_inharm_i数据
+     * @author xy
+     * @param startTime   起始时间
+     * @param endTime     结束时间
+     * @date 2022/5/10 14:56
+     * @return List<DataInHarmIPO>
+     */
+    public List<DataInHarmIPO> getDataInHarmI(String lineIndex, String startTime, String endTime){
+        List<DataInHarmIPO> result = new ArrayList<>();
+
+
+        StringBuilder stringBuilder = new StringBuilder();
+        stringBuilder.append ("line_id='").append (lineIndex).append ("' and ");
+        //最小值
+        StringBuilder stringBuilder1 = new StringBuilder();
+        StringBuilder stringBuilder2 = new StringBuilder();
+        for (int i = 1; i <=50 ; i++) {
+            if (i==50){
+                stringBuilder1.append("min(i_").append(i).append(") AS i_").append(i);
+            } else {
+                stringBuilder1.append("min(i_").append(i).append(") AS i_").append(i).append(",");
+            }
+        }
+        stringBuilder2.append(InfluxDBPublicParam.TIME + " >= '").append(startTime).append("' and ").append(InfluxDBPublicParam.TIME).append(" <= '").append(endTime).append("' and value_type = 'MIN' group by line_id,phasic_type,value_type,quality_flag ").append(InfluxDBPublicParam.TIME_ZONE);
+        String sql1 = "select "+stringBuilder1+" from "+ InfluxDBPublicParam.DATA_IN_HARM_I+" where "+stringBuilder+stringBuilder2;
+        QueryResult sqlResult1 = influxDbUtils.query(sql1);
+        InfluxDBResultMapper resultMapper1 = new InfluxDBResultMapper();
+        List<DataInHarmIPO> list1 = resultMapper1.toPOJO(sqlResult1, DataInHarmIPO.class);
+        //最大值
+        StringBuilder stringBuilder3 = new StringBuilder();
+        StringBuilder stringBuilder4 = new StringBuilder();
+        for (int i = 1; i <=50 ; i++) {
+            if (i==50){
+                stringBuilder3.append("max(i_").append(i).append(") AS i_").append(i);
+            } else {
+                stringBuilder3.append("max(i_").append(i).append(") AS i_").append(i).append(",");
+            }
+        }
+        stringBuilder4.append(InfluxDBPublicParam.TIME + " >= '").append(startTime).append("' and ").append(InfluxDBPublicParam.TIME).append(" <= '").append(endTime).append("' and value_type = 'MAX' group by line_id,phasic_type,value_type,quality_flag ").append(InfluxDBPublicParam.TIME_ZONE);
+        String sql2 = "select "+stringBuilder3+" from "+ InfluxDBPublicParam.DATA_IN_HARM_I+" where "+stringBuilder+stringBuilder4;
+        QueryResult sqlResult2 = influxDbUtils.query(sql2);
+        InfluxDBResultMapper resultMapper2 = new InfluxDBResultMapper();
+        List<DataInHarmIPO> list2 = resultMapper2.toPOJO(sqlResult2, DataInHarmIPO.class);
+        //平均值
+        StringBuilder stringBuilder5 = new StringBuilder();
+        StringBuilder stringBuilder6 = new StringBuilder();
+        for (int i = 1; i <=50 ; i++) {
+            if (i==50){
+                stringBuilder5.append("mean(i_").append(i).append(") AS i_").append(i);
+            } else {
+                stringBuilder5.append("mean(i_").append(i).append(") AS i_").append(i).append(",");
+            }
+        }
+        stringBuilder6.append(InfluxDBPublicParam.TIME + " >= '").append(startTime).append("' and ").append(InfluxDBPublicParam.TIME).append(" <= '").append(endTime).append("' and value_type = 'AVG' group by line_id,phasic_type,value_type,quality_flag ").append(InfluxDBPublicParam.TIME_ZONE);
+        String sql3 = "select "+stringBuilder5+" from "+ InfluxDBPublicParam.DATA_IN_HARM_I+" where "+stringBuilder+stringBuilder6;
+        QueryResult sqlResult3 = influxDbUtils.query(sql3);
+        InfluxDBResultMapper resultMapper3 = new InfluxDBResultMapper();
+        List<DataInHarmIPO> list3 = resultMapper3.toPOJO(sqlResult3, DataInHarmIPO.class);
+        //CP95值
+        StringBuilder stringBuilder7 = new StringBuilder();
+        StringBuilder stringBuilder8 = new StringBuilder();
+        for (int i = 1; i <=50 ; i++) {
+            if (i==50){
+                stringBuilder7.append("percentile(i_").append(i).append(",95) AS i_").append(i);
+            } else {
+                stringBuilder7.append("percentile(i_").append(i).append(",95) AS i_").append(i).append(",");
+            }
+        }
+        stringBuilder8.append(InfluxDBPublicParam.TIME + " >= '").append(startTime).append("' and ").append(InfluxDBPublicParam.TIME).append(" <= '").append(endTime).append("' and value_type = 'AVG' group by line_id,phasic_type,value_type,quality_flag ").append(InfluxDBPublicParam.TIME_ZONE);
+        String sql4 = "select "+stringBuilder7+" from "+ InfluxDBPublicParam.DATA_IN_HARM_I+" where "+stringBuilder+stringBuilder8;
+        QueryResult sqlResult4 = influxDbUtils.query(sql4);
+        InfluxDBResultMapper resultMapper4 = new InfluxDBResultMapper();
+        List<DataInHarmIPO> list4 = resultMapper4.toPOJO(sqlResult4, DataInHarmIPO.class);
+        list4.forEach(item->{
+            item.setValueType("CP95");
+        });
+        result.addAll(list1);
+        result.addAll(list2);
+        result.addAll(list3);
+        result.addAll(list4);
+        return result;
+    }
+
+
+    /**
+     * 功能描述:获取data_inharm_v数据
+     * @author xy
+     * @param startTime   起始时间
+     * @param endTime     结束时间
+     * @date 2022/5/10 14:56
+     * @return List<DataInHarmVPO>
+     */
+    public List<DataInHarmVPO> getDataInHarmV(String lineIndex, String startTime, String endTime){
+        List<DataInHarmVPO> result = new ArrayList<>();
+
+        StringBuilder stringBuilder = new StringBuilder();
+        stringBuilder.append ("line_id='").append (lineIndex).append ("' and ");
+        //最小值
+        StringBuilder stringBuilder1 = new StringBuilder();
+        StringBuilder stringBuilder2 = new StringBuilder();
+        for (int i = 1; i <=50 ; i++) {
+            if (i==50){
+                stringBuilder1.append("min(v_").append(i).append(") AS v_").append(i);
+            } else {
+                stringBuilder1.append("min(v_").append(i).append(") AS v_").append(i).append(",");
+            }
+        }
+        stringBuilder2.append(InfluxDBPublicParam.TIME + " >= '").append(startTime).append("' and ").append(InfluxDBPublicParam.TIME).append(" <= '").append(endTime).append("' and value_type = 'MIN' group by line_id,phasic_type,value_type,quality_flag ").append(InfluxDBPublicParam.TIME_ZONE);
+        String sql1 = "select "+stringBuilder1+" from "+ InfluxDBPublicParam.DATA_IN_HARM_V+" where "+stringBuilder+stringBuilder2;
+        QueryResult sqlResult1 = influxDbUtils.query(sql1);
+        InfluxDBResultMapper resultMapper1 = new InfluxDBResultMapper();
+        List<DataInHarmVPO> list1 = resultMapper1.toPOJO(sqlResult1, DataInHarmVPO.class);
+        //最大值
+        StringBuilder stringBuilder3 = new StringBuilder();
+        StringBuilder stringBuilder4 = new StringBuilder();
+        for (int i = 1; i <=50 ; i++) {
+            if (i==50){
+                stringBuilder3.append("max(v_").append(i).append(") AS v_").append(i);
+            } else {
+                stringBuilder3.append("max(v_").append(i).append(") AS v_").append(i).append(",");
+            }
+        }
+        stringBuilder4.append(InfluxDBPublicParam.TIME + " >= '").append(startTime).append("' and ").append(InfluxDBPublicParam.TIME).append(" <= '").append(endTime).append("' and value_type = 'MAX' group by line_id,phasic_type,value_type,quality_flag ").append(InfluxDBPublicParam.TIME_ZONE);
+        String sql2 = "select "+stringBuilder3+" from "+ InfluxDBPublicParam.DATA_IN_HARM_V+" where "+stringBuilder+stringBuilder4;
+        QueryResult sqlResult2 = influxDbUtils.query(sql2);
+        InfluxDBResultMapper resultMapper2 = new InfluxDBResultMapper();
+        List<DataInHarmVPO> list2 = resultMapper2.toPOJO(sqlResult2, DataInHarmVPO.class);
+        //平均值
+        StringBuilder stringBuilder5 = new StringBuilder();
+        StringBuilder stringBuilder6 = new StringBuilder();
+        for (int i = 1; i <=50 ; i++) {
+            if (i==50){
+                stringBuilder5.append("mean(v_").append(i).append(") AS v_").append(i);
+            } else {
+                stringBuilder5.append("mean(v_").append(i).append(") AS v_").append(i).append(",");
+            }
+        }
+        stringBuilder6.append(InfluxDBPublicParam.TIME + " >= '").append(startTime).append("' and ").append(InfluxDBPublicParam.TIME).append(" <= '").append(endTime).append("' and value_type = 'AVG' group by line_id,phasic_type,value_type,quality_flag ").append(InfluxDBPublicParam.TIME_ZONE);
+        String sql3 = "select "+stringBuilder5+" from "+ InfluxDBPublicParam.DATA_IN_HARM_V+" where "+stringBuilder+stringBuilder6;
+        QueryResult sqlResult3 = influxDbUtils.query(sql3);
+        InfluxDBResultMapper resultMapper3 = new InfluxDBResultMapper();
+        List<DataInHarmVPO> list3 = resultMapper3.toPOJO(sqlResult3, DataInHarmVPO.class);
+        //CP95值
+        StringBuilder stringBuilder7 = new StringBuilder();
+        StringBuilder stringBuilder8 = new StringBuilder();
+        for (int i = 1; i <=50 ; i++) {
+            if (i==50){
+                stringBuilder7.append("percentile(v_").append(i).append(",95) AS v_").append(i);
+            } else {
+                stringBuilder7.append("percentile(v_").append(i).append(",95) AS v_").append(i).append(",");
+            }
+        }
+        stringBuilder8.append(InfluxDBPublicParam.TIME + " >= '").append(startTime).append("' and ").append(InfluxDBPublicParam.TIME).append(" <= '").append(endTime).append("' and value_type = 'AVG' group by line_id,phasic_type,value_type,quality_flag ").append(InfluxDBPublicParam.TIME_ZONE);
+        String sql4 = "select "+stringBuilder7+" from "+ InfluxDBPublicParam.DATA_IN_HARM_V+" where "+stringBuilder+stringBuilder8;
+        QueryResult sqlResult4 = influxDbUtils.query(sql4);
+        InfluxDBResultMapper resultMapper4 = new InfluxDBResultMapper();
+        List<DataInHarmVPO> list4 = resultMapper4.toPOJO(sqlResult4, DataInHarmVPO.class);
+        list4.forEach(item->{
+            item.setValueType("CP95");
+        });
+        result.addAll(list1);
+        result.addAll(list2);
+        result.addAll(list3);
+        result.addAll(list4);
+        return result;
+    }
+
+    /**
+     * 功能描述:获取data_inharmrate_i数据
+     * @author xy
+     * @param startTime   起始时间
+     * @param endTime     结束时间
+     * @date 2022/5/10 14:56
+     * @return List<DataInHarmRateIPO>
+     */
+    public List<DataInHarmRateIPO> getDataInHarmRateI(String lineIndex, String startTime, String endTime){
+        List<DataInHarmRateIPO> result = new ArrayList<>();
+
+        StringBuilder stringBuilder = new StringBuilder();
+        stringBuilder.append ("line_id='").append (lineIndex).append ("' and ");
+        //最小值
+        StringBuilder stringBuilder1 = new StringBuilder();
+        StringBuilder stringBuilder2 = new StringBuilder();
+        for (int i = 1; i <=50 ; i++) {
+            if (i==50){
+                stringBuilder1.append("min(i_").append(i).append(") AS i_").append(i);
+            } else {
+                stringBuilder1.append("min(i_").append(i).append(") AS i_").append(i).append(",");
+            }
+        }
+        stringBuilder2.append(InfluxDBPublicParam.TIME + " >= '").append(startTime).append("' and ").append(InfluxDBPublicParam.TIME).append(" <= '").append(endTime).append("' and value_type = 'MIN' group by line_id,phasic_type,value_type,quality_flag ").append(InfluxDBPublicParam.TIME_ZONE);
+        String sql1 = "select "+stringBuilder1+" from "+ InfluxDBPublicParam.DATA_IN_HARM_I+" where "+stringBuilder+stringBuilder2;
+        QueryResult sqlResult1 = influxDbUtils.query(sql1);
+        InfluxDBResultMapper resultMapper1 = new InfluxDBResultMapper();
+        List<DataInHarmRateIPO> list1 = resultMapper1.toPOJO(sqlResult1, DataInHarmRateIPO.class);
+        //最大值
+        StringBuilder stringBuilder3 = new StringBuilder();
+        StringBuilder stringBuilder4 = new StringBuilder();
+        for (int i = 1; i <=50 ; i++) {
+            if (i==50){
+                stringBuilder3.append("max(i_").append(i).append(") AS i_").append(i);
+            } else {
+                stringBuilder3.append("max(i_").append(i).append(") AS i_").append(i).append(",");
+            }
+        }
+        stringBuilder4.append(InfluxDBPublicParam.TIME + " >= '").append(startTime).append("' and ").append(InfluxDBPublicParam.TIME).append(" <= '").append(endTime).append("' and value_type = 'MAX' group by line_id,phasic_type,value_type,quality_flag ").append(InfluxDBPublicParam.TIME_ZONE);
+        String sql2 = "select "+stringBuilder3+" from "+ InfluxDBPublicParam.DATA_IN_HARM_I+" where "+stringBuilder+stringBuilder4;
+        QueryResult sqlResult2 = influxDbUtils.query(sql2);
+        InfluxDBResultMapper resultMapper2 = new InfluxDBResultMapper();
+        List<DataInHarmRateIPO> list2 = resultMapper2.toPOJO(sqlResult2, DataInHarmRateIPO.class);
+        //平均值
+        StringBuilder stringBuilder5 = new StringBuilder();
+        StringBuilder stringBuilder6 = new StringBuilder();
+        for (int i = 1; i <=50 ; i++) {
+            if (i==50){
+                stringBuilder5.append("mean(i_").append(i).append(") AS i_").append(i);
+            } else {
+                stringBuilder5.append("mean(i_").append(i).append(") AS i_").append(i).append(",");
+            }
+        }
+        stringBuilder6.append(InfluxDBPublicParam.TIME + " >= '").append(startTime).append("' and ").append(InfluxDBPublicParam.TIME).append(" <= '").append(endTime).append("' and value_type = 'AVG' group by line_id,phasic_type,value_type,quality_flag ").append(InfluxDBPublicParam.TIME_ZONE);
+        String sql3 = "select "+stringBuilder5+" from "+ InfluxDBPublicParam.DATA_IN_HARM_I+" where "+stringBuilder+stringBuilder6;
+        QueryResult sqlResult3 = influxDbUtils.query(sql3);
+        InfluxDBResultMapper resultMapper3 = new InfluxDBResultMapper();
+        List<DataInHarmRateIPO> list3 = resultMapper3.toPOJO(sqlResult3, DataInHarmRateIPO.class);
+        //CP95值
+        StringBuilder stringBuilder7 = new StringBuilder();
+        StringBuilder stringBuilder8 = new StringBuilder();
+        for (int i = 1; i <=50 ; i++) {
+            if (i==50){
+                stringBuilder7.append("percentile(i_").append(i).append(",95) AS i_").append(i);
+            } else {
+                stringBuilder7.append("percentile(i_").append(i).append(",95) AS i_").append(i).append(",");
+            }
+        }
+        stringBuilder8.append(InfluxDBPublicParam.TIME + " >= '").append(startTime).append("' and ").append(InfluxDBPublicParam.TIME).append(" <= '").append(endTime).append("' and value_type = 'AVG' group by line_id,phasic_type,value_type,quality_flag ").append(InfluxDBPublicParam.TIME_ZONE);
+        String sql4 = "select "+stringBuilder7+" from "+ InfluxDBPublicParam.DATA_IN_HARM_I+" where "+stringBuilder+stringBuilder8;
+        QueryResult sqlResult4 = influxDbUtils.query(sql4);
+        InfluxDBResultMapper resultMapper4 = new InfluxDBResultMapper();
+        List<DataInHarmRateIPO> list4 = resultMapper4.toPOJO(sqlResult4, DataInHarmRateIPO.class);
+        list4.forEach(item->{
+            item.setValueType("CP95");
+        });
+        result.addAll(list1);
+        result.addAll(list2);
+        result.addAll(list3);
+        result.addAll(list4);
+        return result;
+    }
+
+    /**
+     * 功能描述:获取data_inharmrate_v数据
+     * @author xy
+     * @param startTime   起始时间
+     * @param endTime     结束时间
+     * @date 2022/5/10 14:56
+     * @return List<DataInHarmRateVPO>
+     */
+    public List<DataInHarmRateVPO> getDataInHarmRateV(String lineIndex, String startTime, String endTime){
+        List<DataInHarmRateVPO> result = new ArrayList<>();
+
+        StringBuilder stringBuilder = new StringBuilder();
+        stringBuilder.append ("line_id='").append (lineIndex).append ("' and ");
+        //最小值
+        StringBuilder stringBuilder1 = new StringBuilder();
+        StringBuilder stringBuilder2 = new StringBuilder();
+        for (int i = 1; i <=50 ; i++) {
+            if (i==50){
+                stringBuilder1.append("min(v_").append(i).append(") AS v_").append(i);
+            } else {
+                stringBuilder1.append("min(v_").append(i).append(") AS v_").append(i).append(",");
+            }
+        }
+        stringBuilder2.append(InfluxDBPublicParam.TIME + " >= '").append(startTime).append("' and ").append(InfluxDBPublicParam.TIME).append(" <= '").append(endTime).append("' and value_type = 'MIN' group by line_id,phasic_type,value_type,quality_flag ").append(InfluxDBPublicParam.TIME_ZONE);
+        String sql1 = "select "+stringBuilder1+" from "+ InfluxDBPublicParam.DATA_IN_HARM_V+" where "+stringBuilder+stringBuilder2;
+        QueryResult sqlResult1 = influxDbUtils.query(sql1);
+        InfluxDBResultMapper resultMapper1 = new InfluxDBResultMapper();
+        List<DataInHarmRateVPO> list1 = resultMapper1.toPOJO(sqlResult1, DataInHarmRateVPO.class);
+        //最大值
+        StringBuilder stringBuilder3 = new StringBuilder();
+        StringBuilder stringBuilder4 = new StringBuilder();
+        for (int i = 1; i <=50 ; i++) {
+            if (i==50){
+                stringBuilder3.append("max(v_").append(i).append(") AS v_").append(i);
+            } else {
+                stringBuilder3.append("max(v_").append(i).append(") AS v_").append(i).append(",");
+            }
+        }
+        stringBuilder4.append(InfluxDBPublicParam.TIME + " >= '").append(startTime).append("' and ").append(InfluxDBPublicParam.TIME).append(" <= '").append(endTime).append("' and value_type = 'MAX' group by line_id,phasic_type,value_type,quality_flag ").append(InfluxDBPublicParam.TIME_ZONE);
+        String sql2 = "select "+stringBuilder3+" from "+ InfluxDBPublicParam.DATA_IN_HARM_V+" where "+stringBuilder+stringBuilder4;
+        QueryResult sqlResult2 = influxDbUtils.query(sql2);
+        InfluxDBResultMapper resultMapper2 = new InfluxDBResultMapper();
+        List<DataInHarmRateVPO> list2 = resultMapper2.toPOJO(sqlResult2, DataInHarmRateVPO.class);
+        //平均值
+        StringBuilder stringBuilder5 = new StringBuilder();
+        StringBuilder stringBuilder6 = new StringBuilder();
+        for (int i = 1; i <=50 ; i++) {
+            if (i==50){
+                stringBuilder5.append("mean(v_").append(i).append(") AS v_").append(i);
+            } else {
+                stringBuilder5.append("mean(v_").append(i).append(") AS v_").append(i).append(",");
+            }
+        }
+        stringBuilder6.append(InfluxDBPublicParam.TIME + " >= '").append(startTime).append("' and ").append(InfluxDBPublicParam.TIME).append(" <= '").append(endTime).append("' and value_type = 'AVG' group by line_id,phasic_type,value_type,quality_flag ").append(InfluxDBPublicParam.TIME_ZONE);
+        String sql3 = "select "+stringBuilder5+" from "+ InfluxDBPublicParam.DATA_IN_HARM_V+" where "+stringBuilder+stringBuilder6;
+        QueryResult sqlResult3 = influxDbUtils.query(sql3);
+        InfluxDBResultMapper resultMapper3 = new InfluxDBResultMapper();
+        List<DataInHarmRateVPO> list3 = resultMapper3.toPOJO(sqlResult3, DataInHarmRateVPO.class);
+        //CP95值
+        StringBuilder stringBuilder7 = new StringBuilder();
+        StringBuilder stringBuilder8 = new StringBuilder();
+        for (int i = 1; i <=50 ; i++) {
+            if (i==50){
+                stringBuilder7.append("percentile(v_").append(i).append(",95) AS v_").append(i);
+            } else {
+                stringBuilder7.append("percentile(v_").append(i).append(",95) AS v_").append(i).append(",");
+            }
+        }
+        stringBuilder8.append(InfluxDBPublicParam.TIME + " >= '").append(startTime).append("' and ").append(InfluxDBPublicParam.TIME).append(" <= '").append(endTime).append("' and value_type = 'AVG' group by line_id,phasic_type,value_type,quality_flag ").append(InfluxDBPublicParam.TIME_ZONE);
+        String sql4 = "select "+stringBuilder7+" from "+ InfluxDBPublicParam.DATA_IN_HARM_V+" where "+stringBuilder+stringBuilder8;
+        QueryResult sqlResult4 = influxDbUtils.query(sql4);
+        InfluxDBResultMapper resultMapper4 = new InfluxDBResultMapper();
+        List<DataInHarmRateVPO> list4 = resultMapper4.toPOJO(sqlResult4, DataInHarmRateVPO.class);
+        list4.forEach(item->{
+            item.setValueType("CP95");
+        });
+        result.addAll(list1);
+        result.addAll(list2);
+        result.addAll(list3);
+        result.addAll(list4);
+        return result;
+    }
+
+    /**
+     * 功能描述:获取data_plt数据
+     * @author xy
+     * @param startTime   起始时间
+     * @param endTime     结束时间
+     * @date 2022/5/10 14:56
+     * @return List<DataPltPO>
+     */
+    public List<DataPltPO> getDataPlt(String lineIndex, String startTime, String endTime){
+        List<DataPltPO> result = new ArrayList<>();
+        StringBuilder stringBuilder = new StringBuilder();
+        stringBuilder.append ("line_id='").append (lineIndex).append ("' and ");
+        //最小值
+        String sql1 = "select min(plt) AS plt from "+ InfluxDBPublicParam.DATA_PLT+" where "+stringBuilder+" time >= '" + startTime + "' and time <= '" + endTime + "' group by line_id,phasic_type,quality_flag "+ InfluxDBPublicParam.TIME_ZONE;
+        QueryResult sqlResult1 = influxDbUtils.query(sql1);
+        InfluxDBResultMapper resultMapper1 = new InfluxDBResultMapper();
+        List<DataPltPO> list1 = resultMapper1.toPOJO(sqlResult1, DataPltPO.class);
+        list1.forEach(item->{
+            item.setValueType("MIN");
+        });
+        //最大值
+        String sql2 = "select max(plt) AS plt from "+ InfluxDBPublicParam.DATA_PLT+" where "+stringBuilder+" time >= '" + startTime + "' and time <= '" + endTime + "' group by line_id,phasic_type,quality_flag "+ InfluxDBPublicParam.TIME_ZONE;
+        QueryResult sqlResult2 = influxDbUtils.query(sql2);
+        InfluxDBResultMapper resultMapper2 = new InfluxDBResultMapper();
+        List<DataPltPO> list2 = resultMapper2.toPOJO(sqlResult2, DataPltPO.class);
+        list2.forEach(item->{
+            item.setValueType("MAX");
+        });
+        //平均值
+        String sql3 = "select mean(plt) AS plt from "+ InfluxDBPublicParam.DATA_PLT+" where "+stringBuilder+" time >= '" + startTime + "' and time <= '" + endTime + "' group by line_id,phasic_type,quality_flag "+ InfluxDBPublicParam.TIME_ZONE;
+        QueryResult sqlResult3 = influxDbUtils.query(sql3);
+        InfluxDBResultMapper resultMapper3= new InfluxDBResultMapper();
+        List<DataPltPO> list3 = resultMapper3.toPOJO(sqlResult3, DataPltPO.class);
+        list3.forEach(item->{
+            item.setValueType("AVG");
+        });
+        //CP95值
+        String sql4 = "select percentile(plt,95) AS plt from "+ InfluxDBPublicParam.DATA_PLT+" where "+stringBuilder+" time >= '" + startTime + "' and time <= '" + endTime + "' group by line_id,phasic_type,quality_flag "+ InfluxDBPublicParam.TIME_ZONE;
+        QueryResult sqlResult4 = influxDbUtils.query(sql4);
+        InfluxDBResultMapper resultMapper4= new InfluxDBResultMapper();
+        List<DataPltPO> list4 = resultMapper4.toPOJO(sqlResult4, DataPltPO.class);
+        list4.forEach(item->{
+            item.setValueType("CP95");
+        });
+        result.addAll(list1);
+        result.addAll(list2);
+        result.addAll(list3);
+        result.addAll(list4);
+        return result;
+    }
+
+    /**
+     * 功能描述:插入dayV表数据
+     * @author xy
+     * @param list dataV集合
+     * @param time 时间戳
+     * @date 2022/5/11 14:55
+     */
+    private void insertDayV(List<DataVPO> list, long time){
+        List<String> records = new ArrayList<>();
+        list.forEach(item->{
+            Map<String, String> tags = new HashMap ();
+            Map<String, Object> fields = new HashMap();
+            tags.put("line_id",item.getLineId());
+            tags.put("phasic_type",item.getPhaseType());
+            tags.put("quality_flag",item.getQualityFlag());
+            tags.put("value_type",item.getValueType());
+            fields.put("freq",item.getFreq());
+            fields.put("freq_dev",item.getFreqDev());
+            fields.put("rms",item.getRms());
+            fields.put("rms_lvr",item.getRmsLvr());
+            fields.put("v_neg",item.getVNeg());
+            fields.put("v_pos",item.getVPos());
+            fields.put("v_thd",item.getVThd());
+            fields.put("v_unbalance",item.getVUnbalance());
+            fields.put("v_zero",item.getVZero());
+            fields.put("vl_dev",item.getVlDev());
+            fields.put("vu_dev",item.getVuDev());
+            fields.put("v_1",item.getV1());
+            fields.put("v_2",item.getV2());
+            fields.put("v_3",item.getV3());
+            fields.put("v_4",item.getV4());
+            fields.put("v_5",item.getV5());
+            fields.put("v_6",item.getV6());
+            fields.put("v_7",item.getV7());
+            fields.put("v_8",item.getV8());
+            fields.put("v_9",item.getV9());
+            fields.put("v_10",item.getV10());
+            fields.put("v_11",item.getV11());
+            fields.put("v_12",item.getV12());
+            fields.put("v_13",item.getV13());
+            fields.put("v_14",item.getV14());
+            fields.put("v_15",item.getV15());
+            fields.put("v_16",item.getV16());
+            fields.put("v_17",item.getV17());
+            fields.put("v_18",item.getV18());
+            fields.put("v_19",item.getV19());
+            fields.put("v_20",item.getV20());
+            fields.put("v_21",item.getV21());
+            fields.put("v_22",item.getV22());
+            fields.put("v_23",item.getV23());
+            fields.put("v_24",item.getV24());
+            fields.put("v_25",item.getV25());
+            fields.put("v_26",item.getV26());
+            fields.put("v_27",item.getV27());
+            fields.put("v_28",item.getV28());
+            fields.put("v_29",item.getV29());
+            fields.put("v_30",item.getV30());
+            fields.put("v_31",item.getV31());
+            fields.put("v_32",item.getV32());
+            fields.put("v_33",item.getV33());
+            fields.put("v_34",item.getV34());
+            fields.put("v_35",item.getV35());
+            fields.put("v_36",item.getV36());
+            fields.put("v_37",item.getV37());
+            fields.put("v_38",item.getV38());
+            fields.put("v_39",item.getV39());
+            fields.put("v_40",item.getV40());
+            fields.put("v_41",item.getV41());
+            fields.put("v_42",item.getV42());
+            fields.put("v_43",item.getV43());
+            fields.put("v_44",item.getV44());
+            fields.put("v_45",item.getV45());
+            fields.put("v_46",item.getV46());
+            fields.put("v_47",item.getV47());
+            fields.put("v_48",item.getV48());
+            fields.put("v_49",item.getV49());
+            fields.put("v_50",item.getV50());
+            Point point = influxDbUtils.pointBuilder(InfluxDBPublicParam.DAY_V, time, TimeUnit.MILLISECONDS, tags, fields);
+            BatchPoints batchPoints = BatchPoints.database(influxDbUtils.getDbName ()).tag(InfluxDBPublicParam.LINE_ID, item.getLineId()).tag(InfluxDBPublicParam.PHASIC_TYPE,item.getPhaseType()).tag(InfluxDBPublicParam.QUALITY_FLAG,item.getQualityFlag()).tag(InfluxDBPublicParam.VALUE_TYPE,item.getValueType()).retentionPolicy("").consistency(InfluxDB.ConsistencyLevel.ALL).build();
+            batchPoints.point(point);
+            records.add(batchPoints.lineProtocol());
+        });
+        influxDbUtils.batchInsert(influxDbUtils.getDbName (),"", InfluxDB.ConsistencyLevel.ALL, records);
+    }
+    /**
+     * 功能描述:插入dayI表数据
+     * @author xy
+     * @param list dataI集合
+     * @param time 时间戳
+     * @date 2022/5/11 14:55
+     */
+    private void insertDayI(List<DataIPO> list, long time){
+        List<String> records = new ArrayList<>();
+        list.forEach(item->{
+            Map<String, String> tags = new HashMap<>();
+            Map<String, Object> fields = new HashMap<>();
+            tags.put("line_id",item.getLineId());
+            tags.put("phasic_type",item.getPhaseType());
+            tags.put("quality_flag",item.getQualityFlag());
+            tags.put("value_type",item.getValueType());
+            fields.put("rms",item.getRms());
+            fields.put("i_neg",item.getINeg());
+            fields.put("i_pos",item.getIPos());
+            fields.put("i_thd",item.getIThd());
+            fields.put("i_unbalance",item.getIUnbalance());
+            fields.put("i_zero",item.getIZero());
+            fields.put("i_1",item.getI1());
+            fields.put("i_2",item.getI2());
+            fields.put("i_3",item.getI3());
+            fields.put("i_4",item.getI4());
+            fields.put("i_5",item.getI5());
+            fields.put("i_6",item.getI6());
+            fields.put("i_7",item.getI7());
+            fields.put("i_8",item.getI8());
+            fields.put("i_9",item.getI9());
+            fields.put("i_10",item.getI10());
+            fields.put("i_11",item.getI11());
+            fields.put("i_12",item.getI12());
+            fields.put("i_13",item.getI13());
+            fields.put("i_14",item.getI14());
+            fields.put("i_15",item.getI15());
+            fields.put("i_16",item.getI16());
+            fields.put("i_17",item.getI17());
+            fields.put("i_18",item.getI18());
+            fields.put("i_19",item.getI19());
+            fields.put("i_20",item.getI20());
+            fields.put("i_21",item.getI21());
+            fields.put("i_22",item.getI22());
+            fields.put("i_23",item.getI23());
+            fields.put("i_24",item.getI24());
+            fields.put("i_25",item.getI25());
+            fields.put("i_26",item.getI26());
+            fields.put("i_27",item.getI27());
+            fields.put("i_28",item.getI28());
+            fields.put("i_29",item.getI29());
+            fields.put("i_30",item.getI30());
+            fields.put("i_31",item.getI31());
+            fields.put("i_32",item.getI32());
+            fields.put("i_33",item.getI33());
+            fields.put("i_34",item.getI34());
+            fields.put("i_35",item.getI35());
+            fields.put("i_36",item.getI36());
+            fields.put("i_37",item.getI37());
+            fields.put("i_38",item.getI38());
+            fields.put("i_39",item.getI39());
+            fields.put("i_40",item.getI40());
+            fields.put("i_41",item.getI41());
+            fields.put("i_42",item.getI42());
+            fields.put("i_43",item.getI43());
+            fields.put("i_44",item.getI44());
+            fields.put("i_45",item.getI45());
+            fields.put("i_46",item.getI46());
+            fields.put("i_47",item.getI47());
+            fields.put("i_48",item.getI48());
+            fields.put("i_49",item.getI49());
+            fields.put("i_50",item.getI50());
+            Point point = influxDbUtils.pointBuilder(InfluxDBPublicParam.DAY_I, time, TimeUnit.MILLISECONDS, tags, fields);
+            BatchPoints batchPoints = BatchPoints.database(influxDbUtils.getDbName ()).tag(InfluxDBPublicParam.LINE_ID, item.getLineId()).tag(InfluxDBPublicParam.PHASIC_TYPE,item.getPhaseType()).tag(InfluxDBPublicParam.QUALITY_FLAG,item.getQualityFlag()).tag(InfluxDBPublicParam.VALUE_TYPE,item.getValueType()).retentionPolicy("").consistency(InfluxDB.ConsistencyLevel.ALL).build();
+            batchPoints.point(point);
+            records.add(batchPoints.lineProtocol());
+        });
+        influxDbUtils.batchInsert(influxDbUtils.getDbName (),"", InfluxDB.ConsistencyLevel.ALL, records);
+    }
+
+    /**
+     * 功能描述:插入dayFlicker表数据
+     * @author xy
+     * @param list dataFlicker集合
+     * @param time 时间戳
+     * @date 2022/5/11 14:55
+     */
+    private void insertDayFlicker(List<DataFlickerPO> list, long time){
+        List<String> records = new ArrayList<>();
+        list.forEach(item->{
+            Map<String, String> tags = new HashMap<>();
+            Map<String, Object> fields = new HashMap<>();
+            tags.put("line_id",item.getLineId());
+            tags.put("phasic_type",item.getPhaseType());
+            tags.put("quality_flag",item.getQualityFlag());
+            tags.put("value_type",item.getValueType());
+            fields.put("fluc",item.getFluc());
+            fields.put("plt",item.getPlt());
+            fields.put("pst",item.getPst());
+            Point point = influxDbUtils.pointBuilder(InfluxDBPublicParam.DAY_FLICKER, time, TimeUnit.MILLISECONDS, tags, fields);
+            BatchPoints batchPoints = BatchPoints.database(influxDbUtils.getDbName ()).tag(InfluxDBPublicParam.LINE_ID, item.getLineId()).tag(InfluxDBPublicParam.PHASIC_TYPE,item.getPhaseType()).tag(InfluxDBPublicParam.QUALITY_FLAG,item.getQualityFlag()).tag(InfluxDBPublicParam.VALUE_TYPE,item.getValueType()).retentionPolicy("").consistency(InfluxDB.ConsistencyLevel.ALL).build();
+            batchPoints.point(point);
+            records.add(batchPoints.lineProtocol());
+        });
+        influxDbUtils.batchInsert(influxDbUtils.getDbName (),"", InfluxDB.ConsistencyLevel.ALL, records);
+    }
+
+
+    /**
+     * 功能描述:插入dayFluc表数据
+     * @author xy
+     * @param list dataFluc集合
+     * @param time 时间戳
+     * @date 2022/5/12 8:55
+     */
+    private void insertDayFluc(List<DataFlucPO> list, long time){
+        List<String> records = new ArrayList<>();
+        list.forEach(item->{
+            Map<String, String> tags = new HashMap<>();
+            Map<String, Object> fields = new HashMap<>();
+            tags.put("line_id",item.getLineId());
+            tags.put("phasic_type",item.getPhaseType());
+            tags.put("quality_flag",item.getQualityFlag());
+            tags.put("value_type",item.getValueType());
+            fields.put("fluc",item.getFluc());
+            fields.put("fluccf",item.getFluccf());
+            Point point = influxDbUtils.pointBuilder(InfluxDBPublicParam.DAY_FLUC, time, TimeUnit.MILLISECONDS, tags, fields);
+            BatchPoints batchPoints = BatchPoints.database(influxDbUtils.getDbName ()).tag(InfluxDBPublicParam.LINE_ID, item.getLineId()).tag(InfluxDBPublicParam.PHASIC_TYPE,item.getPhaseType()).tag(InfluxDBPublicParam.QUALITY_FLAG,item.getQualityFlag()).tag(InfluxDBPublicParam.VALUE_TYPE,item.getValueType()).retentionPolicy("").consistency(InfluxDB.ConsistencyLevel.ALL).build();
+            batchPoints.point(point);
+            records.add(batchPoints.lineProtocol());
+        });
+        influxDbUtils.batchInsert(influxDbUtils.getDbName (),"", InfluxDB.ConsistencyLevel.ALL, records);
+    }
+
+    /**
+     * 功能描述:插入day_harmphasic_i表数据
+     * @author xy
+     * @param list data_harmphasic_i表数据
+     * @param time 时间戳
+     * @date 2022/5/12 8:55
+     */
+    private void insertDayHarmphasicI(List<DataHarmPhasicIPO> list, long time){
+        List<String> records = new ArrayList<>();
+        list.forEach(item->{
+            Map<String, String> tags = new HashMap<>();
+            Map<String, Object> fields = new HashMap<>();
+            tags.put("line_id",item.getLineId());
+            tags.put("phasic_type",item.getPhaseType());
+            tags.put("quality_flag",item.getQualityFlag());
+            tags.put("value_type",item.getValueType());
+            fields.put("i_1",item.getI1());
+            fields.put("i_2",item.getI2());
+            fields.put("i_3",item.getI3());
+            fields.put("i_4",item.getI4());
+            fields.put("i_5",item.getI5());
+            fields.put("i_6",item.getI6());
+            fields.put("i_7",item.getI7());
+            fields.put("i_8",item.getI8());
+            fields.put("i_9",item.getI9());
+            fields.put("i_10",item.getI10());
+            fields.put("i_11",item.getI11());
+            fields.put("i_12",item.getI12());
+            fields.put("i_13",item.getI13());
+            fields.put("i_14",item.getI14());
+            fields.put("i_15",item.getI15());
+            fields.put("i_16",item.getI16());
+            fields.put("i_17",item.getI17());
+            fields.put("i_18",item.getI18());
+            fields.put("i_19",item.getI19());
+            fields.put("i_20",item.getI20());
+            fields.put("i_21",item.getI21());
+            fields.put("i_22",item.getI22());
+            fields.put("i_23",item.getI23());
+            fields.put("i_24",item.getI24());
+            fields.put("i_25",item.getI25());
+            fields.put("i_26",item.getI26());
+            fields.put("i_27",item.getI27());
+            fields.put("i_28",item.getI28());
+            fields.put("i_29",item.getI29());
+            fields.put("i_30",item.getI30());
+            fields.put("i_31",item.getI31());
+            fields.put("i_32",item.getI32());
+            fields.put("i_33",item.getI33());
+            fields.put("i_34",item.getI34());
+            fields.put("i_35",item.getI35());
+            fields.put("i_36",item.getI36());
+            fields.put("i_37",item.getI37());
+            fields.put("i_38",item.getI38());
+            fields.put("i_39",item.getI39());
+            fields.put("i_40",item.getI40());
+            fields.put("i_41",item.getI41());
+            fields.put("i_42",item.getI42());
+            fields.put("i_43",item.getI43());
+            fields.put("i_44",item.getI44());
+            fields.put("i_45",item.getI45());
+            fields.put("i_46",item.getI46());
+            fields.put("i_47",item.getI47());
+            fields.put("i_48",item.getI48());
+            fields.put("i_49",item.getI49());
+            fields.put("i_50",item.getI50());
+            Point point = influxDbUtils.pointBuilder(InfluxDBPublicParam.DAY_HARM_PHASIC_I, time, TimeUnit.MILLISECONDS, tags, fields);
+            BatchPoints batchPoints = BatchPoints.database(influxDbUtils.getDbName ()).tag(InfluxDBPublicParam.LINE_ID, item.getLineId()).tag(InfluxDBPublicParam.PHASIC_TYPE,item.getPhaseType()).tag(InfluxDBPublicParam.QUALITY_FLAG,item.getQualityFlag()).tag(InfluxDBPublicParam.VALUE_TYPE,item.getValueType()).retentionPolicy("").consistency(InfluxDB.ConsistencyLevel.ALL).build();
+            batchPoints.point(point);
+            records.add(batchPoints.lineProtocol());
+        });
+        influxDbUtils.batchInsert(influxDbUtils.getDbName (),"", InfluxDB.ConsistencyLevel.ALL, records);
+    }
+
+    /**
+     * 功能描述:插入day_harmphasic_V表数据
+     * @author xy
+     * @param list data_harmphasic_V表数据
+     * @param time 时间戳
+     * @date 2022/5/12 8:55
+     */
+    private void insertDayHarmphasicV(List<DataHarmPhasicVPO> list, long time){
+        List<String> records = new ArrayList<>();
+        list.forEach(item->{
+            Map<String, String> tags = new HashMap<>();
+            Map<String, Object> fields = new HashMap<>();
+            tags.put("line_id",item.getLineId());
+            tags.put("phasic_type",item.getPhaseType());
+            tags.put("quality_flag",item.getQualityFlag());
+            tags.put("value_type",item.getValueType());
+            fields.put("v_1",item.getV1());
+            fields.put("v_2",item.getV2());
+            fields.put("v_3",item.getV3());
+            fields.put("v_4",item.getV4());
+            fields.put("v_5",item.getV5());
+            fields.put("v_6",item.getV6());
+            fields.put("v_7",item.getV7());
+            fields.put("v_8",item.getV8());
+            fields.put("v_9",item.getV9());
+            fields.put("v_10",item.getV10());
+            fields.put("v_11",item.getV11());
+            fields.put("v_12",item.getV12());
+            fields.put("v_13",item.getV13());
+            fields.put("v_14",item.getV14());
+            fields.put("v_15",item.getV15());
+            fields.put("v_16",item.getV16());
+            fields.put("v_17",item.getV17());
+            fields.put("v_18",item.getV18());
+            fields.put("v_19",item.getV19());
+            fields.put("v_20",item.getV20());
+            fields.put("v_21",item.getV21());
+            fields.put("v_22",item.getV22());
+            fields.put("v_23",item.getV23());
+            fields.put("v_24",item.getV24());
+            fields.put("v_25",item.getV25());
+            fields.put("v_26",item.getV26());
+            fields.put("v_27",item.getV27());
+            fields.put("v_28",item.getV28());
+            fields.put("v_29",item.getV29());
+            fields.put("v_30",item.getV30());
+            fields.put("v_31",item.getV31());
+            fields.put("v_32",item.getV32());
+            fields.put("v_33",item.getV33());
+            fields.put("v_34",item.getV34());
+            fields.put("v_35",item.getV35());
+            fields.put("v_36",item.getV36());
+            fields.put("v_37",item.getV37());
+            fields.put("v_38",item.getV38());
+            fields.put("v_39",item.getV39());
+            fields.put("v_40",item.getV40());
+            fields.put("v_41",item.getV41());
+            fields.put("v_42",item.getV42());
+            fields.put("v_43",item.getV43());
+            fields.put("v_44",item.getV44());
+            fields.put("v_45",item.getV45());
+            fields.put("v_46",item.getV46());
+            fields.put("v_47",item.getV47());
+            fields.put("v_48",item.getV48());
+            fields.put("v_49",item.getV49());
+            fields.put("v_50",item.getV50());
+            Point point = influxDbUtils.pointBuilder(InfluxDBPublicParam.DAY_HARM_PHASIC_V, time, TimeUnit.MILLISECONDS, tags, fields);
+            BatchPoints batchPoints = BatchPoints.database(influxDbUtils.getDbName ()).tag(InfluxDBPublicParam.LINE_ID, item.getLineId()).tag(InfluxDBPublicParam.PHASIC_TYPE,item.getPhaseType()).tag(InfluxDBPublicParam.QUALITY_FLAG,item.getQualityFlag()).tag(InfluxDBPublicParam.VALUE_TYPE,item.getValueType()).retentionPolicy("").consistency(InfluxDB.ConsistencyLevel.ALL).build();
+            batchPoints.point(point);
+            records.add(batchPoints.lineProtocol());
+        });
+        influxDbUtils.batchInsert(influxDbUtils.getDbName (),"", InfluxDB.ConsistencyLevel.ALL, records);
+    }
+
+
+    /**
+     * 功能描述:插入day_harmpower_p表数据
+     * @author xy
+     * @param list data_harmpower_p表数据
+     * @param time 时间戳
+     * @date 2022/5/12 8:55
+     */
+    private void insertDayHarmPowerP(List<DataHarmPowerPPO> list, long time){
+        List<String> records = new ArrayList<>();
+        list.forEach(item->{
+            Map<String, String> tags = new HashMap<>();
+            Map<String, Object> fields = new HashMap<>();
+            tags.put("line_id",item.getLineId());
+            tags.put("phasic_type",item.getPhaseType());
+            tags.put("quality_flag",item.getQualityFlag());
+            tags.put("value_type",item.getValueType());
+            fields.put("df",item.getDf());
+            fields.put("pf",item.getPf());
+            fields.put("p",item.getP());
+            fields.put("p_1",item.getP1());
+            fields.put("p_2",item.getP2());
+            fields.put("p_3",item.getP3());
+            fields.put("p_4",item.getP4());
+            fields.put("p_5",item.getP5());
+            fields.put("p_6",item.getP6());
+            fields.put("p_7",item.getP7());
+            fields.put("p_8",item.getP8());
+            fields.put("p_9",item.getP9());
+            fields.put("p_10",item.getP10());
+            fields.put("p_11",item.getP11());
+            fields.put("p_12",item.getP12());
+            fields.put("p_13",item.getP13());
+            fields.put("p_14",item.getP14());
+            fields.put("p_15",item.getP15());
+            fields.put("p_16",item.getP16());
+            fields.put("p_17",item.getP17());
+            fields.put("p_18",item.getP18());
+            fields.put("p_19",item.getP19());
+            fields.put("p_20",item.getP20());
+            fields.put("p_21",item.getP21());
+            fields.put("p_22",item.getP22());
+            fields.put("p_23",item.getP23());
+            fields.put("p_24",item.getP24());
+            fields.put("p_25",item.getP25());
+            fields.put("p_26",item.getP26());
+            fields.put("p_27",item.getP27());
+            fields.put("p_28",item.getP28());
+            fields.put("p_29",item.getP29());
+            fields.put("p_30",item.getP30());
+            fields.put("p_31",item.getP31());
+            fields.put("p_32",item.getP32());
+            fields.put("p_33",item.getP33());
+            fields.put("p_34",item.getP34());
+            fields.put("p_35",item.getP35());
+            fields.put("p_36",item.getP36());
+            fields.put("p_37",item.getP37());
+            fields.put("p_38",item.getP38());
+            fields.put("p_39",item.getP39());
+            fields.put("p_40",item.getP40());
+            fields.put("p_41",item.getP41());
+            fields.put("p_42",item.getP42());
+            fields.put("p_43",item.getP43());
+            fields.put("p_44",item.getP44());
+            fields.put("p_45",item.getP45());
+            fields.put("p_46",item.getP46());
+            fields.put("p_47",item.getP47());
+            fields.put("p_48",item.getP48());
+            fields.put("p_49",item.getP49());
+            fields.put("p_50",item.getP50());
+            Point point = influxDbUtils.pointBuilder(InfluxDBPublicParam.DAY_HARM_POWER_P, time, TimeUnit.MILLISECONDS, tags, fields);
+            BatchPoints batchPoints = BatchPoints.database(influxDbUtils.getDbName ()).tag(InfluxDBPublicParam.LINE_ID, item.getLineId()).tag(InfluxDBPublicParam.PHASIC_TYPE,item.getPhaseType()).tag(InfluxDBPublicParam.QUALITY_FLAG,item.getQualityFlag()).tag(InfluxDBPublicParam.VALUE_TYPE,item.getValueType()).retentionPolicy("").consistency(InfluxDB.ConsistencyLevel.ALL).build();
+            batchPoints.point(point);
+            records.add(batchPoints.lineProtocol());
+        });
+        influxDbUtils.batchInsert(influxDbUtils.getDbName (),"", InfluxDB.ConsistencyLevel.ALL, records);
+    }
+
+    /**
+     * 功能描述:插入day_harmpower_q表数据
+     * @author xy
+     * @param list data_harmpower_q表数据
+     * @param time 时间戳
+     * @date 2022/5/12 8:55
+     */
+    private void insertDayHarmPowerQ(List<DataHarmPowerQPO> list, long time){
+        List<String> records = new ArrayList<>();
+        list.forEach(item->{
+            Map<String, String> tags = new HashMap<>();
+            Map<String, Object> fields = new HashMap<>();
+            tags.put("line_id",item.getLineId());
+            tags.put("phasic_type",item.getPhaseType());
+            tags.put("quality_flag",item.getQualityFlag());
+            tags.put("value_type",item.getValueType());
+            fields.put("q",item.getQ());
+            fields.put("q_1",item.getQ1());
+            fields.put("q_2",item.getQ2());
+            fields.put("q_3",item.getQ3());
+            fields.put("q_4",item.getQ4());
+            fields.put("q_5",item.getQ5());
+            fields.put("q_6",item.getQ6());
+            fields.put("q_7",item.getQ7());
+            fields.put("q_8",item.getQ8());
+            fields.put("q_9",item.getQ9());
+            fields.put("q_10",item.getQ10());
+            fields.put("q_11",item.getQ11());
+            fields.put("q_12",item.getQ12());
+            fields.put("q_13",item.getQ13());
+            fields.put("q_14",item.getQ14());
+            fields.put("q_15",item.getQ15());
+            fields.put("q_16",item.getQ16());
+            fields.put("q_17",item.getQ17());
+            fields.put("q_18",item.getQ18());
+            fields.put("q_19",item.getQ19());
+            fields.put("q_20",item.getQ20());
+            fields.put("q_21",item.getQ21());
+            fields.put("q_22",item.getQ22());
+            fields.put("q_23",item.getQ23());
+            fields.put("q_24",item.getQ24());
+            fields.put("q_25",item.getQ25());
+            fields.put("q_26",item.getQ26());
+            fields.put("q_27",item.getQ27());
+            fields.put("q_28",item.getQ28());
+            fields.put("q_29",item.getQ29());
+            fields.put("q_30",item.getQ30());
+            fields.put("q_31",item.getQ31());
+            fields.put("q_32",item.getQ32());
+            fields.put("q_33",item.getQ33());
+            fields.put("q_34",item.getQ34());
+            fields.put("q_35",item.getQ35());
+            fields.put("q_36",item.getQ36());
+            fields.put("q_37",item.getQ37());
+            fields.put("q_38",item.getQ38());
+            fields.put("q_39",item.getQ39());
+            fields.put("q_40",item.getQ40());
+            fields.put("q_41",item.getQ41());
+            fields.put("q_42",item.getQ42());
+            fields.put("q_43",item.getQ43());
+            fields.put("q_44",item.getQ44());
+            fields.put("q_45",item.getQ45());
+            fields.put("q_46",item.getQ46());
+            fields.put("q_47",item.getQ47());
+            fields.put("q_48",item.getQ48());
+            fields.put("q_49",item.getQ49());
+            fields.put("q_50",item.getQ50());
+            Point point = influxDbUtils.pointBuilder(InfluxDBPublicParam.DAY_HARM_POWER_Q, time, TimeUnit.MILLISECONDS, tags, fields);
+            BatchPoints batchPoints = BatchPoints.database(influxDbUtils.getDbName ()).tag(InfluxDBPublicParam.LINE_ID, item.getLineId()).tag(InfluxDBPublicParam.PHASIC_TYPE,item.getPhaseType()).tag(InfluxDBPublicParam.QUALITY_FLAG,item.getQualityFlag()).tag(InfluxDBPublicParam.VALUE_TYPE,item.getValueType()).retentionPolicy("").consistency(InfluxDB.ConsistencyLevel.ALL).build();
+            batchPoints.point(point);
+            records.add(batchPoints.lineProtocol());
+        });
+        influxDbUtils.batchInsert(influxDbUtils.getDbName (),"", InfluxDB.ConsistencyLevel.ALL, records);
+    }
+
+    /**
+     * 功能描述:插入day_harmpower_q表数据
+     * @author xy
+     * @param list data_harmpower_q表数据
+     * @param time 时间戳
+     * @date 2022/5/12 8:55
+     */
+    private void insertDayHarmPowerS(List<DataHarmPowerSPO> list, long time){
+        List<String> records = new ArrayList<>();
+        list.forEach(item->{
+            Map<String, String> tags = new HashMap<>();
+            Map<String, Object> fields = new HashMap<>();
+            tags.put("line_id",item.getLineId());
+            tags.put("phasic_type",item.getPhaseType());
+            tags.put("quality_flag",item.getQualityFlag());
+            tags.put("value_type",item.getValueType());
+            fields.put("s",item.getS());
+            fields.put("s_1",item.getS1());
+            fields.put("s_2",item.getS2());
+            fields.put("s_3",item.getS3());
+            fields.put("s_4",item.getS4());
+            fields.put("s_5",item.getS5());
+            fields.put("s_6",item.getS6());
+            fields.put("s_7",item.getS7());
+            fields.put("s_8",item.getS8());
+            fields.put("s_9",item.getS9());
+            fields.put("s_10",item.getS10());
+            fields.put("s_11",item.getS11());
+            fields.put("s_12",item.getS12());
+            fields.put("s_13",item.getS13());
+            fields.put("s_14",item.getS14());
+            fields.put("s_15",item.getS15());
+            fields.put("s_16",item.getS16());
+            fields.put("s_17",item.getS17());
+            fields.put("s_18",item.getS18());
+            fields.put("s_19",item.getS19());
+            fields.put("s_20",item.getS20());
+            fields.put("s_21",item.getS21());
+            fields.put("s_22",item.getS22());
+            fields.put("s_23",item.getS23());
+            fields.put("s_24",item.getS24());
+            fields.put("s_25",item.getS25());
+            fields.put("s_26",item.getS26());
+            fields.put("s_27",item.getS27());
+            fields.put("s_28",item.getS28());
+            fields.put("s_29",item.getS29());
+            fields.put("s_30",item.getS30());
+            fields.put("s_31",item.getS31());
+            fields.put("s_32",item.getS32());
+            fields.put("s_33",item.getS33());
+            fields.put("s_34",item.getS34());
+            fields.put("s_35",item.getS35());
+            fields.put("s_36",item.getS36());
+            fields.put("s_37",item.getS37());
+            fields.put("s_38",item.getS38());
+            fields.put("s_39",item.getS39());
+            fields.put("s_40",item.getS40());
+            fields.put("s_41",item.getS41());
+            fields.put("s_42",item.getS42());
+            fields.put("s_43",item.getS43());
+            fields.put("s_44",item.getS44());
+            fields.put("s_45",item.getS45());
+            fields.put("s_46",item.getS46());
+            fields.put("s_47",item.getS47());
+            fields.put("s_48",item.getS48());
+            fields.put("s_49",item.getS49());
+            fields.put("s_50",item.getS50());
+            Point point = influxDbUtils.pointBuilder(InfluxDBPublicParam.DAY_HARM_POWER_S, time, TimeUnit.MILLISECONDS, tags, fields);
+            BatchPoints batchPoints = BatchPoints.database(influxDbUtils.getDbName ()).tag(InfluxDBPublicParam.LINE_ID, item.getLineId()).tag(InfluxDBPublicParam.PHASIC_TYPE,item.getPhaseType()).tag(InfluxDBPublicParam.QUALITY_FLAG,item.getQualityFlag()).tag(InfluxDBPublicParam.VALUE_TYPE,item.getValueType()).retentionPolicy("").consistency(InfluxDB.ConsistencyLevel.ALL).build();
+            batchPoints.point(point);
+            records.add(batchPoints.lineProtocol());
+        });
+        influxDbUtils.batchInsert(influxDbUtils.getDbName (),"", InfluxDB.ConsistencyLevel.ALL, records);
+    }
+
+    /**
+     * 功能描述:插入day_harmrate_i表数据
+     * @author xy
+     * @param list data_harmrate_i表数据
+     * @param time 时间戳
+     * @date 2022/5/12 8:55
+     */
+    private void insertDayHarmRateI(List<DataHarmRateIPO> list, long time){
+        List<String> records = new ArrayList<>();
+        list.forEach(item->{
+            Map<String, String> tags = new HashMap<>();
+            Map<String, Object> fields = new HashMap<>();
+            tags.put("line_id",item.getLineId());
+            tags.put("phasic_type",item.getPhaseType());
+            tags.put("quality_flag",item.getQualityFlag());
+            tags.put("value_type",item.getValueType());
+            fields.put("i_1",item.getI1());
+            fields.put("i_2",item.getI2());
+            fields.put("i_3",item.getI3());
+            fields.put("i_4",item.getI4());
+            fields.put("i_5",item.getI5());
+            fields.put("i_6",item.getI6());
+            fields.put("i_7",item.getI7());
+            fields.put("i_8",item.getI8());
+            fields.put("i_9",item.getI9());
+            fields.put("i_10",item.getI10());
+            fields.put("i_11",item.getI11());
+            fields.put("i_12",item.getI12());
+            fields.put("i_13",item.getI13());
+            fields.put("i_14",item.getI14());
+            fields.put("i_15",item.getI15());
+            fields.put("i_16",item.getI16());
+            fields.put("i_17",item.getI17());
+            fields.put("i_18",item.getI18());
+            fields.put("i_19",item.getI19());
+            fields.put("i_20",item.getI20());
+            fields.put("i_21",item.getI21());
+            fields.put("i_22",item.getI22());
+            fields.put("i_23",item.getI23());
+            fields.put("i_24",item.getI24());
+            fields.put("i_25",item.getI25());
+            fields.put("i_26",item.getI26());
+            fields.put("i_27",item.getI27());
+            fields.put("i_28",item.getI28());
+            fields.put("i_29",item.getI29());
+            fields.put("i_30",item.getI30());
+            fields.put("i_31",item.getI31());
+            fields.put("i_32",item.getI32());
+            fields.put("i_33",item.getI33());
+            fields.put("i_34",item.getI34());
+            fields.put("i_35",item.getI35());
+            fields.put("i_36",item.getI36());
+            fields.put("i_37",item.getI37());
+            fields.put("i_38",item.getI38());
+            fields.put("i_39",item.getI39());
+            fields.put("i_40",item.getI40());
+            fields.put("i_41",item.getI41());
+            fields.put("i_42",item.getI42());
+            fields.put("i_43",item.getI43());
+            fields.put("i_44",item.getI44());
+            fields.put("i_45",item.getI45());
+            fields.put("i_46",item.getI46());
+            fields.put("i_47",item.getI47());
+            fields.put("i_48",item.getI48());
+            fields.put("i_49",item.getI49());
+            fields.put("i_50",item.getI50());
+            Point point = influxDbUtils.pointBuilder(InfluxDBPublicParam.DAY_HARM_RATE_I, time, TimeUnit.MILLISECONDS, tags, fields);
+            BatchPoints batchPoints = BatchPoints.database(influxDbUtils.getDbName ()).tag (InfluxDBPublicParam.LINE_ID, item.getLineId()).tag(InfluxDBPublicParam.PHASIC_TYPE,item.getPhaseType()).tag(InfluxDBPublicParam.QUALITY_FLAG,item.getQualityFlag()).tag(InfluxDBPublicParam.VALUE_TYPE,item.getValueType()).retentionPolicy("").consistency(InfluxDB.ConsistencyLevel.ALL).build();
+            batchPoints.point(point);
+            records.add(batchPoints.lineProtocol());
+        });
+        influxDbUtils.batchInsert(influxDbUtils.getDbName (),"", InfluxDB.ConsistencyLevel.ALL, records);
+    }
+
+    /**
+     * 功能描述:插入day_harmrate_v表数据
+     * @author xy
+     * @param list data_harmrate_v表数据
+     * @param time 时间戳
+     * @date 2022/5/12 8:55
+     */
+    private void insertDayHarmRateV(List<DataHarmRateVPO> list, long time){
+        List<String> records = new ArrayList<>();
+        list.forEach(item->{
+            Map<String, String> tags = new HashMap<>();
+            Map<String, Object> fields = new HashMap<>();
+            tags.put("line_id",item.getLineId());
+            tags.put("phasic_type",item.getPhaseType());
+            tags.put("quality_flag",item.getQualityFlag());
+            tags.put("value_type",item.getValueType());
+            fields.put("v_1",item.getV1());
+            fields.put("v_2",item.getV2());
+            fields.put("v_3",item.getV3());
+            fields.put("v_4",item.getV4());
+            fields.put("v_5",item.getV5());
+            fields.put("v_6",item.getV6());
+            fields.put("v_7",item.getV7());
+            fields.put("v_8",item.getV8());
+            fields.put("v_9",item.getV9());
+            fields.put("v_10",item.getV10());
+            fields.put("v_11",item.getV11());
+            fields.put("v_12",item.getV12());
+            fields.put("v_13",item.getV13());
+            fields.put("v_14",item.getV14());
+            fields.put("v_15",item.getV15());
+            fields.put("v_16",item.getV16());
+            fields.put("v_17",item.getV17());
+            fields.put("v_18",item.getV18());
+            fields.put("v_19",item.getV19());
+            fields.put("v_20",item.getV20());
+            fields.put("v_21",item.getV21());
+            fields.put("v_22",item.getV22());
+            fields.put("v_23",item.getV23());
+            fields.put("v_24",item.getV24());
+            fields.put("v_25",item.getV25());
+            fields.put("v_26",item.getV26());
+            fields.put("v_27",item.getV27());
+            fields.put("v_28",item.getV28());
+            fields.put("v_29",item.getV29());
+            fields.put("v_30",item.getV30());
+            fields.put("v_31",item.getV31());
+            fields.put("v_32",item.getV32());
+            fields.put("v_33",item.getV33());
+            fields.put("v_34",item.getV34());
+            fields.put("v_35",item.getV35());
+            fields.put("v_36",item.getV36());
+            fields.put("v_37",item.getV37());
+            fields.put("v_38",item.getV38());
+            fields.put("v_39",item.getV39());
+            fields.put("v_40",item.getV40());
+            fields.put("v_41",item.getV41());
+            fields.put("v_42",item.getV42());
+            fields.put("v_43",item.getV43());
+            fields.put("v_44",item.getV44());
+            fields.put("v_45",item.getV45());
+            fields.put("v_46",item.getV46());
+            fields.put("v_47",item.getV47());
+            fields.put("v_48",item.getV48());
+            fields.put("v_49",item.getV49());
+            fields.put("v_50",item.getV50());
+            Point point = influxDbUtils.pointBuilder(InfluxDBPublicParam.DAY_HARM_RATE_V, time, TimeUnit.MILLISECONDS, tags, fields);
+            BatchPoints batchPoints = BatchPoints.database(influxDbUtils.getDbName ()).tag(InfluxDBPublicParam.LINE_ID, item.getLineId()).tag(InfluxDBPublicParam.PHASIC_TYPE,item.getPhaseType()).tag(InfluxDBPublicParam.QUALITY_FLAG,item.getQualityFlag()).tag(InfluxDBPublicParam.VALUE_TYPE,item.getValueType()).retentionPolicy("").consistency(InfluxDB.ConsistencyLevel.ALL).build();
+            batchPoints.point(point);
+            records.add(batchPoints.lineProtocol());
+        });
+        influxDbUtils.batchInsert(influxDbUtils.getDbName (),"", InfluxDB.ConsistencyLevel.ALL, records);
+    }
+
+    /**
+     * 功能描述:插入day_inharm_i表数据
+     * @author xy
+     * @param list data_inharm_i表数据
+     * @param time 时间戳
+     * @date 2022/5/12 8:55
+     */
+    private void insertDayInHarmI(List<DataInHarmIPO> list, long time){
+        List<String> records = new ArrayList<>();
+        list.forEach(item->{
+            Map<String, String> tags = new HashMap<>();
+            Map<String, Object> fields = new HashMap<>();
+            tags.put("line_id",item.getLineId());
+            tags.put("phasic_type",item.getPhaseType());
+            tags.put("quality_flag",item.getQualityFlag());
+            tags.put("value_type",item.getValueType());
+            fields.put("i_1",item.getI1());
+            fields.put("i_2",item.getI2());
+            fields.put("i_3",item.getI3());
+            fields.put("i_4",item.getI4());
+            fields.put("i_5",item.getI5());
+            fields.put("i_6",item.getI6());
+            fields.put("i_7",item.getI7());
+            fields.put("i_8",item.getI8());
+            fields.put("i_9",item.getI9());
+            fields.put("i_10",item.getI10());
+            fields.put("i_11",item.getI11());
+            fields.put("i_12",item.getI12());
+            fields.put("i_13",item.getI13());
+            fields.put("i_14",item.getI14());
+            fields.put("i_15",item.getI15());
+            fields.put("i_16",item.getI16());
+            fields.put("i_17",item.getI17());
+            fields.put("i_18",item.getI18());
+            fields.put("i_19",item.getI19());
+            fields.put("i_20",item.getI20());
+            fields.put("i_21",item.getI21());
+            fields.put("i_22",item.getI22());
+            fields.put("i_23",item.getI23());
+            fields.put("i_24",item.getI24());
+            fields.put("i_25",item.getI25());
+            fields.put("i_26",item.getI26());
+            fields.put("i_27",item.getI27());
+            fields.put("i_28",item.getI28());
+            fields.put("i_29",item.getI29());
+            fields.put("i_30",item.getI30());
+            fields.put("i_31",item.getI31());
+            fields.put("i_32",item.getI32());
+            fields.put("i_33",item.getI33());
+            fields.put("i_34",item.getI34());
+            fields.put("i_35",item.getI35());
+            fields.put("i_36",item.getI36());
+            fields.put("i_37",item.getI37());
+            fields.put("i_38",item.getI38());
+            fields.put("i_39",item.getI39());
+            fields.put("i_40",item.getI40());
+            fields.put("i_41",item.getI41());
+            fields.put("i_42",item.getI42());
+            fields.put("i_43",item.getI43());
+            fields.put("i_44",item.getI44());
+            fields.put("i_45",item.getI45());
+            fields.put("i_46",item.getI46());
+            fields.put("i_47",item.getI47());
+            fields.put("i_48",item.getI48());
+            fields.put("i_49",item.getI49());
+            fields.put("i_50",item.getI50());
+            Point point = influxDbUtils.pointBuilder(InfluxDBPublicParam.DAY_IN_HARM_I, time, TimeUnit.MILLISECONDS, tags, fields);
+            BatchPoints batchPoints = BatchPoints.database(influxDbUtils.getDbName ()).tag(InfluxDBPublicParam.LINE_ID, item.getLineId()).tag(InfluxDBPublicParam.PHASIC_TYPE,item.getPhaseType()).tag(InfluxDBPublicParam.QUALITY_FLAG,item.getQualityFlag()).tag(InfluxDBPublicParam.VALUE_TYPE,item.getValueType()).retentionPolicy("").consistency(InfluxDB.ConsistencyLevel.ALL).build();
+            batchPoints.point(point);
+            records.add(batchPoints.lineProtocol());
+        });
+        influxDbUtils.batchInsert(influxDbUtils.getDbName (),"", InfluxDB.ConsistencyLevel.ALL, records);
+    }
+
+    /**
+     * 功能描述:插入day_inharm_v表数据
+     * @author xy
+     * @param list data_inharm_v表数据
+     * @param time 时间戳
+     * @date 2022/5/12 8:55
+     */
+    private void insertDayInHarmV(List<DataInHarmVPO> list, long time){
+        List<String> records = new ArrayList<>();
+        list.forEach(item->{
+            Map<String, String> tags = new HashMap<>();
+            Map<String, Object> fields = new HashMap<>();
+            tags.put("line_id",item.getLineId());
+            tags.put("phasic_type",item.getPhaseType());
+            tags.put("quality_flag",item.getQualityFlag());
+            tags.put("value_type",item.getValueType());
+            fields.put("v_1",item.getV1());
+            fields.put("v_2",item.getV2());
+            fields.put("v_3",item.getV3());
+            fields.put("v_4",item.getV4());
+            fields.put("v_5",item.getV5());
+            fields.put("v_6",item.getV6());
+            fields.put("v_7",item.getV7());
+            fields.put("v_8",item.getV8());
+            fields.put("v_9",item.getV9());
+            fields.put("v_10",item.getV10());
+            fields.put("v_11",item.getV11());
+            fields.put("v_12",item.getV12());
+            fields.put("v_13",item.getV13());
+            fields.put("v_14",item.getV14());
+            fields.put("v_15",item.getV15());
+            fields.put("v_16",item.getV16());
+            fields.put("v_17",item.getV17());
+            fields.put("v_18",item.getV18());
+            fields.put("v_19",item.getV19());
+            fields.put("v_20",item.getV20());
+            fields.put("v_21",item.getV21());
+            fields.put("v_22",item.getV22());
+            fields.put("v_23",item.getV23());
+            fields.put("v_24",item.getV24());
+            fields.put("v_25",item.getV25());
+            fields.put("v_26",item.getV26());
+            fields.put("v_27",item.getV27());
+            fields.put("v_28",item.getV28());
+            fields.put("v_29",item.getV29());
+            fields.put("v_30",item.getV30());
+            fields.put("v_31",item.getV31());
+            fields.put("v_32",item.getV32());
+            fields.put("v_33",item.getV33());
+            fields.put("v_34",item.getV34());
+            fields.put("v_35",item.getV35());
+            fields.put("v_36",item.getV36());
+            fields.put("v_37",item.getV37());
+            fields.put("v_38",item.getV38());
+            fields.put("v_39",item.getV39());
+            fields.put("v_40",item.getV40());
+            fields.put("v_41",item.getV41());
+            fields.put("v_42",item.getV42());
+            fields.put("v_43",item.getV43());
+            fields.put("v_44",item.getV44());
+            fields.put("v_45",item.getV45());
+            fields.put("v_46",item.getV46());
+            fields.put("v_47",item.getV47());
+            fields.put("v_48",item.getV48());
+            fields.put("v_49",item.getV49());
+            fields.put("v_50",item.getV50());
+            Point point = influxDbUtils.pointBuilder(InfluxDBPublicParam.DAY_IN_HARM_V, time, TimeUnit.MILLISECONDS, tags, fields);
+            BatchPoints batchPoints = BatchPoints.database(influxDbUtils.getDbName ()).tag(InfluxDBPublicParam.LINE_ID, item.getLineId()).tag(InfluxDBPublicParam.PHASIC_TYPE,item.getPhaseType()).tag(InfluxDBPublicParam.QUALITY_FLAG,item.getQualityFlag()).tag(InfluxDBPublicParam.VALUE_TYPE,item.getValueType()).retentionPolicy("").consistency(InfluxDB.ConsistencyLevel.ALL).build();
+            batchPoints.point(point);
+            records.add(batchPoints.lineProtocol());
+        });
+        influxDbUtils.batchInsert(influxDbUtils.getDbName (),"", InfluxDB.ConsistencyLevel.ALL, records);
+    }
+
+    /**
+     * 功能描述:插入day_inharmrate_i表数据
+     * @author xy
+     * @param list data_inharmrate_i表数据
+     * @param time 时间戳
+     * @date 2022/5/12 8:55
+     */
+    private void insertDayInHarmRateI(List<DataInHarmRateIPO> list, long time){
+        List<String> records = new ArrayList<>();
+        list.forEach(item->{
+            Map<String, String> tags = new HashMap<>();
+            Map<String, Object> fields = new HashMap<>();
+            tags.put("line_id",item.getLineId());
+            tags.put("phasic_type",item.getPhaseType());
+            tags.put("quality_flag",item.getQualityFlag());
+            tags.put("value_type",item.getValueType());
+            fields.put("i_1",item.getI1());
+            fields.put("i_2",item.getI2());
+            fields.put("i_3",item.getI3());
+            fields.put("i_4",item.getI4());
+            fields.put("i_5",item.getI5());
+            fields.put("i_6",item.getI6());
+            fields.put("i_7",item.getI7());
+            fields.put("i_8",item.getI8());
+            fields.put("i_9",item.getI9());
+            fields.put("i_10",item.getI10());
+            fields.put("i_11",item.getI11());
+            fields.put("i_12",item.getI12());
+            fields.put("i_13",item.getI13());
+            fields.put("i_14",item.getI14());
+            fields.put("i_15",item.getI15());
+            fields.put("i_16",item.getI16());
+            fields.put("i_17",item.getI17());
+            fields.put("i_18",item.getI18());
+            fields.put("i_19",item.getI19());
+            fields.put("i_20",item.getI20());
+            fields.put("i_21",item.getI21());
+            fields.put("i_22",item.getI22());
+            fields.put("i_23",item.getI23());
+            fields.put("i_24",item.getI24());
+            fields.put("i_25",item.getI25());
+            fields.put("i_26",item.getI26());
+            fields.put("i_27",item.getI27());
+            fields.put("i_28",item.getI28());
+            fields.put("i_29",item.getI29());
+            fields.put("i_30",item.getI30());
+            fields.put("i_31",item.getI31());
+            fields.put("i_32",item.getI32());
+            fields.put("i_33",item.getI33());
+            fields.put("i_34",item.getI34());
+            fields.put("i_35",item.getI35());
+            fields.put("i_36",item.getI36());
+            fields.put("i_37",item.getI37());
+            fields.put("i_38",item.getI38());
+            fields.put("i_39",item.getI39());
+            fields.put("i_40",item.getI40());
+            fields.put("i_41",item.getI41());
+            fields.put("i_42",item.getI42());
+            fields.put("i_43",item.getI43());
+            fields.put("i_44",item.getI44());
+            fields.put("i_45",item.getI45());
+            fields.put("i_46",item.getI46());
+            fields.put("i_47",item.getI47());
+            fields.put("i_48",item.getI48());
+            fields.put("i_49",item.getI49());
+            fields.put("i_50",item.getI50());
+            Point point = influxDbUtils.pointBuilder(InfluxDBPublicParam.DAY_IN_HARM_I, time, TimeUnit.MILLISECONDS, tags, fields);
+            BatchPoints batchPoints = BatchPoints.database(influxDbUtils.getDbName ()).tag(InfluxDBPublicParam.LINE_ID, item.getLineId()).tag(InfluxDBPublicParam.PHASIC_TYPE,item.getPhaseType()).tag(InfluxDBPublicParam.QUALITY_FLAG,item.getQualityFlag()).tag(InfluxDBPublicParam.VALUE_TYPE,item.getValueType()).retentionPolicy("").consistency(InfluxDB.ConsistencyLevel.ALL).build();
+            batchPoints.point(point);
+            records.add(batchPoints.lineProtocol());
+        });
+        influxDbUtils.batchInsert(influxDbUtils.getDbName (),"", InfluxDB.ConsistencyLevel.ALL, records);
+    }
+
+    /**
+     * 功能描述:插入day_inharmrate_v表数据
+     * @author xy
+     * @param list data_inharmrate_v表数据
+     * @param time 时间戳
+     * @date 2022/5/12 8:55
+     */
+    private void insertDayInHarmRateV(List<DataInHarmRateVPO> list, long time){
+        List<String> records = new ArrayList<>();
+        list.forEach(item->{
+            Map<String, String> tags = new HashMap<>();
+            Map<String, Object> fields = new HashMap<>();
+            tags.put("line_id",item.getLineId());
+            tags.put("phasic_type",item.getPhaseType());
+            tags.put("quality_flag",item.getQualityFlag());
+            tags.put("value_type",item.getValueType());
+            fields.put("v_1",item.getV1());
+            fields.put("v_2",item.getV2());
+            fields.put("v_3",item.getV3());
+            fields.put("v_4",item.getV4());
+            fields.put("v_5",item.getV5());
+            fields.put("v_6",item.getV6());
+            fields.put("v_7",item.getV7());
+            fields.put("v_8",item.getV8());
+            fields.put("v_9",item.getV9());
+            fields.put("v_10",item.getV10());
+            fields.put("v_11",item.getV11());
+            fields.put("v_12",item.getV12());
+            fields.put("v_13",item.getV13());
+            fields.put("v_14",item.getV14());
+            fields.put("v_15",item.getV15());
+            fields.put("v_16",item.getV16());
+            fields.put("v_17",item.getV17());
+            fields.put("v_18",item.getV18());
+            fields.put("v_19",item.getV19());
+            fields.put("v_20",item.getV20());
+            fields.put("v_21",item.getV21());
+            fields.put("v_22",item.getV22());
+            fields.put("v_23",item.getV23());
+            fields.put("v_24",item.getV24());
+            fields.put("v_25",item.getV25());
+            fields.put("v_26",item.getV26());
+            fields.put("v_27",item.getV27());
+            fields.put("v_28",item.getV28());
+            fields.put("v_29",item.getV29());
+            fields.put("v_30",item.getV30());
+            fields.put("v_31",item.getV31());
+            fields.put("v_32",item.getV32());
+            fields.put("v_33",item.getV33());
+            fields.put("v_34",item.getV34());
+            fields.put("v_35",item.getV35());
+            fields.put("v_36",item.getV36());
+            fields.put("v_37",item.getV37());
+            fields.put("v_38",item.getV38());
+            fields.put("v_39",item.getV39());
+            fields.put("v_40",item.getV40());
+            fields.put("v_41",item.getV41());
+            fields.put("v_42",item.getV42());
+            fields.put("v_43",item.getV43());
+            fields.put("v_44",item.getV44());
+            fields.put("v_45",item.getV45());
+            fields.put("v_46",item.getV46());
+            fields.put("v_47",item.getV47());
+            fields.put("v_48",item.getV48());
+            fields.put("v_49",item.getV49());
+            fields.put("v_50",item.getV50());
+            Point point = influxDbUtils.pointBuilder(InfluxDBPublicParam.DATA_IN_HARM_V, time, TimeUnit.MILLISECONDS, tags, fields);
+            BatchPoints batchPoints = BatchPoints.database(influxDbUtils.getDbName ()).tag(InfluxDBPublicParam.LINE_ID, item.getLineId()).tag(InfluxDBPublicParam.PHASIC_TYPE,item.getPhaseType()).tag(InfluxDBPublicParam.QUALITY_FLAG,item.getQualityFlag()).tag(InfluxDBPublicParam.VALUE_TYPE,item.getValueType()).retentionPolicy("").consistency(InfluxDB.ConsistencyLevel.ALL).build();
+            batchPoints.point(point);
+            records.add(batchPoints.lineProtocol());
+        });
+        influxDbUtils.batchInsert(influxDbUtils.getDbName (),"", InfluxDB.ConsistencyLevel.ALL, records);
+    }
+
+
+    /**
+     * 功能描述:插入day_plt表数据
+     * @author xy
+     * @param list data_plt集合
+     * @param time 时间戳
+     * @date 2022/5/12 8:55
+     */
+    private void insertDayPlt(List<DataPltPO> list, long time){
+        List<String> records = new ArrayList<>();
+        list.forEach(item->{
+            Map<String, String> tags = new HashMap<>();
+            Map<String, Object> fields = new HashMap<>();
+            tags.put("line_id",item.getLineId());
+            tags.put("phasic_type",item.getPhaseType());
+            tags.put("quality_flag",item.getQualityFlag());
+            tags.put("value_type",item.getValueType());
+            fields.put("plt",item.getPlt());
+            Point point = influxDbUtils.pointBuilder(InfluxDBPublicParam.DAY_PLT, time, TimeUnit.MILLISECONDS, tags, fields);
+            BatchPoints batchPoints = BatchPoints.database(influxDbUtils.getDbName ()).tag(InfluxDBPublicParam.LINE_ID, item.getLineId()).tag(InfluxDBPublicParam.PHASIC_TYPE,item.getPhaseType()).tag(InfluxDBPublicParam.QUALITY_FLAG,item.getQualityFlag()).tag(InfluxDBPublicParam.VALUE_TYPE,item.getValueType()).retentionPolicy("").consistency(InfluxDB.ConsistencyLevel.ALL).build();
+            batchPoints.point(point);
+            records.add(batchPoints.lineProtocol());
+        });
+        influxDbUtils.batchInsert(influxDbUtils.getDbName (),"", InfluxDB.ConsistencyLevel.ALL, records);
+    }
+
+    /**
+    * @Description: 组装 RMpHarmonicVRateReportDPO
+    * @Param: [dataV, dataHarmRateVPO,PhaseType] dataV：16条datav数据
+    * @return: com.njcn.prepare.harmonic.pojo.po.line.RMpHarmonicVRateReportDPO
+    * @Author: clam
+    * @Date: 2022/10/25
+    */
+    private RMpHarmonicVRateReportDPO  packageRMpHarmonicVRateReportDPO(List<DataVPO> dataV,List<DataHarmRateVPO> dataHarmRateVPOList,String PhaseType){
+
+        RMpHarmonicVRateReportDPO result = null;
+
+        List<DataVPO> a = dataV.stream ( ).
+                filter (dataVPO -> Objects.equals (dataVPO.getPhaseType ( ), PhaseType)).
+                collect (Collectors.toList ( ));
+        List<DataHarmRateVPO> b = dataHarmRateVPOList.stream ( ).
+                filter (temp -> Objects.equals (temp.getPhaseType ( ), PhaseType)).
+                collect (Collectors.toList ( ));
+        RMpHarmonicVRateReportDPO rMpHarmonicVRateReportDPO = new RMpHarmonicVRateReportDPO();
+        if(!CollectionUtils.isEmpty (a)&&!CollectionUtils.isEmpty (b)){
+            result = new RMpHarmonicVRateReportDPO();
+            result.setPhase (PhaseType);
+            result.setMeasurementPointId (dataV.get (0).getLineId ());
+            result.setDataDate (Date.from (dataV.get (0).getTime ()));
+
+            for (int i = 0; i <a.size () ; i++) {
+                DataVPO dataVPO = a.get (i);
+                if(Objects.equals (dataVPO.getValueType (), "MIN")){
+                    result.setVoltageHarmonicThdMin (dataVPO.getVThd ());
+                }
+                if(Objects.equals (dataVPO.getValueType (), "MAX")){
+                    result.setVoltageHarmonicThdMax (dataVPO.getVThd ());
+                }
+                if(Objects.equals (dataVPO.getValueType (), "AVG")){
+                    result.setVoltageHarmonicThdAvg (dataVPO.getVThd ());
+
+                }
+                if(Objects.equals (dataVPO.getValueType (), "CP95")){
+                    result.setVoltageHarmonicThd95 (dataVPO.getVThd ());
+                }
+
+            }
+
+            for (int j = 0; j < b.size (); j++) {
+                DataHarmRateVPO dataHarmRateVPO = b.get (j);
+                if(Objects.equals (dataHarmRateVPO.getValueType (), "MIN")){
+                    rMpHarmonicVRateReportDPO =  InfluxdbPOConverter.INFLUXDB_PO_CONVERTER.dataVPOTORMpHarmonicPReportDPOMin (dataHarmRateVPO);
+                    BeanUtils.copyProperties (rMpHarmonicVRateReportDPO, result,getNullPropertyNames(rMpHarmonicVRateReportDPO));
+                }
+                if(Objects.equals (dataHarmRateVPO.getValueType (), "MAX")){
+                    rMpHarmonicVRateReportDPO =  InfluxdbPOConverter.INFLUXDB_PO_CONVERTER.dataVPOTORMpHarmonicPReportDPOMax (dataHarmRateVPO);
+                    BeanUtils.copyProperties (rMpHarmonicVRateReportDPO, result,getNullPropertyNames(rMpHarmonicVRateReportDPO));
+                }
+                if(Objects.equals (dataHarmRateVPO.getValueType (), "AVG")){
+                    rMpHarmonicVRateReportDPO =  InfluxdbPOConverter.INFLUXDB_PO_CONVERTER.dataVPOTORMpHarmonicPReportDPOAvg (dataHarmRateVPO);
+                    BeanUtils.copyProperties (rMpHarmonicVRateReportDPO, result,getNullPropertyNames(rMpHarmonicVRateReportDPO));
+                }
+                if(Objects.equals (dataHarmRateVPO.getValueType (), "CP95")){
+                    rMpHarmonicVRateReportDPO =  InfluxdbPOConverter.INFLUXDB_PO_CONVERTER.dataVPOTORMpHarmonicPReportDPO95 (dataHarmRateVPO);
+                    BeanUtils.copyProperties (rMpHarmonicVRateReportDPO, result,getNullPropertyNames(rMpHarmonicVRateReportDPO));
+                }
+            }
+        }
+
+
+
+
+        return  result ;
+    }
+
+
+    /**
+     * @Description: 组装 RMpHarmonicIMagReportDPO
+     * @Param: [dataI, PhaseType] dataI：16条dataI数据
+     * @return: com.njcn.prepare.harmonic.pojo.po.line.RMpHarmonicVRateReportDPO
+     * @Author: clam
+     * @Date: 2022/10/25
+     */
+    private RMpHarmonicIMagReportDPO packageRMpHarmonicIMagReportDPO(List<DataIPO> dataI, String PhaseType){
+
+        RMpHarmonicIMagReportDPO result = null;
+
+        List<DataIPO> a = dataI.stream ( ).
+                filter (dataIPO -> Objects.equals (dataIPO.getPhaseType ( ), PhaseType)).
+                collect (Collectors.toList ( ));
+        RMpHarmonicIMagReportDPO rMpHarmonicIMagReportDPO = new RMpHarmonicIMagReportDPO();
+
+        if(!CollectionUtils.isEmpty (a)){
+            result = new RMpHarmonicIMagReportDPO();
+            result.setPhase (PhaseType);
+            result.setMeasurementPointId (dataI.get (0).getLineId ());
+            result.setDataDate (Date.from (dataI.get (0).getTime ()));
+        }
+        for (int j = 0; j < a.size (); j++) {
+            DataIPO dataIPO = a.get (j);
+            if(Objects.equals (dataIPO.getValueType (), "MIN")){
+                rMpHarmonicIMagReportDPO =  InfluxdbPOConverter.INFLUXDB_PO_CONVERTER.dataIPOTORMpHarmonicIMagReportDPOMin (dataIPO);
+                BeanUtils.copyProperties (rMpHarmonicIMagReportDPO, result,getNullPropertyNames(rMpHarmonicIMagReportDPO));
+            }
+            if(Objects.equals (dataIPO.getValueType (), "MAX")){
+                rMpHarmonicIMagReportDPO =  InfluxdbPOConverter.INFLUXDB_PO_CONVERTER.dataIPOTORMpHarmonicIMagReportDPOMax (dataIPO);
+                BeanUtils.copyProperties (rMpHarmonicIMagReportDPO, result,getNullPropertyNames(rMpHarmonicIMagReportDPO));
+            }
+            if(Objects.equals (dataIPO.getValueType (), "AVG")){
+                rMpHarmonicIMagReportDPO =  InfluxdbPOConverter.INFLUXDB_PO_CONVERTER.dataIPOTORMpHarmonicIMagReportDPOAvg (dataIPO);
+                BeanUtils.copyProperties (rMpHarmonicIMagReportDPO, result,getNullPropertyNames(rMpHarmonicIMagReportDPO));
+            }
+            if(Objects.equals (dataIPO.getValueType (), "CP95")){
+                rMpHarmonicIMagReportDPO =  InfluxdbPOConverter.INFLUXDB_PO_CONVERTER.dataIPOTORMpHarmonicIMagReportDPO95 (dataIPO);
+                BeanUtils.copyProperties (rMpHarmonicIMagReportDPO, result,getNullPropertyNames(rMpHarmonicIMagReportDPO));
+            }
+        }
+
+
+        return  result ;
+    }
+    /**
+    * @Description: packageRMpFlickerReportDPOPO
+    * @Param: [dataFlickerPO, PhaseType]
+    * @return: com.njcn.prepare.harmonic.pojo.po.line.RMpFlickerReportDPO
+    * @Author: clam
+    * @Date: 2022/10/26
+    */
+    private RMpFlickerReportDPO packageRMpFlickerReportDPOPO(List<DataFlickerPO> dataFlickerPO, String PhaseType) {
+
+        RMpFlickerReportDPO result = null;
+
+        List<DataFlickerPO> a = dataFlickerPO.stream ( ).
+                filter (dataFlicker -> Objects.equals (dataFlicker.getPhaseType ( ), PhaseType)).
+                collect (Collectors.toList ( ));
+        RMpFlickerReportDPO covertBean = new RMpFlickerReportDPO();
+
+        if(!CollectionUtils.isEmpty (a)){
+            result = new RMpFlickerReportDPO();
+            result.setPhase (PhaseType);
+            result.setMeasurementPointId (dataFlickerPO.get (0).getLineId ());
+            result.setDataDate (Date.from (dataFlickerPO.get (0).getTime ()));
+        }
+
+        for (int j = 0; j < a.size (); j++) {
+            DataFlickerPO temp = a.get (j);
+            if(Objects.equals (temp.getValueType (), "MIN")){
+                covertBean =  InfluxdbPOConverter.INFLUXDB_PO_CONVERTER.rMpFlickerReportDPOConverterMin (temp);
+                BeanUtils.copyProperties (covertBean, result,getNullPropertyNames(covertBean));
+            }
+            if(Objects.equals (temp.getValueType (), "MAX")){
+                covertBean =  InfluxdbPOConverter.INFLUXDB_PO_CONVERTER.rMpFlickerReportDPOConverterMax (temp);
+                BeanUtils.copyProperties (covertBean, result,getNullPropertyNames(covertBean));
+            }
+            if(Objects.equals (temp.getValueType (), "AVG")){
+                covertBean =  InfluxdbPOConverter.INFLUXDB_PO_CONVERTER.rMpFlickerReportDPOConverterAvg (temp);
+                BeanUtils.copyProperties (covertBean, result,getNullPropertyNames(covertBean));
+            }
+            if(Objects.equals (temp.getValueType (), "CP95")){
+                covertBean =  InfluxdbPOConverter.INFLUXDB_PO_CONVERTER.rMpFlickerReportDPOConverter95 (temp);
+                BeanUtils.copyProperties (covertBean, result,getNullPropertyNames(covertBean));
+            }
+        }
+
+
+        return  result ;
+    }
+    /**
+     * @Description: packageRMpPltReportDPO
+     * @Param: [dataFlickerPO, PhaseType]
+     * @return: com.njcn.prepare.harmonic.pojo.po.line.RMpFlickerReportDPO
+     * @Author: clam
+     * @Date: 2022/10/26
+     */
+    private RMpPltReportDPO packageRMpPltReportDPO(List<DataPltPO> dataPlt, String PhaseType) {
+
+        RMpPltReportDPO result = null;
+
+        List<DataPltPO> a = dataPlt.stream ( ).
+                filter (temp -> Objects.equals (temp.getPhaseType ( ), PhaseType)).
+                collect (Collectors.toList ( ));
+        RMpPltReportDPO covertBean = new RMpPltReportDPO();
+
+        if(!CollectionUtils.isEmpty (a)){
+            result = new RMpPltReportDPO();
+            result.setPhase (PhaseType);
+            result.setMeasurementPointId (dataPlt.get (0).getLineId ());
+            result.setDataDate (Date.from (dataPlt.get (0).getTime ()));
+        }
+
+        for (int j = 0; j < a.size (); j++) {
+            DataPltPO temp = a.get (j);
+            if(Objects.equals (temp.getValueType (), "MIN")){
+                result.setLongTimeFlashingMin (temp.getPlt ());
+            }
+            if(Objects.equals (temp.getValueType (), "MAX")){
+                result.setLongTimeFlashingMax (temp.getPlt ());
+
+            }
+            if(Objects.equals (temp.getValueType (), "AVG")){
+                result.setLongTimeFlashingAvg (temp.getPlt ());
+
+            }
+            if(Objects.equals (temp.getValueType (), "CP95")){
+                result.setLongTimeFlashing95 (temp.getPlt ());
+
+            }
+        }
+
+
+        return  result ;
+    }
+    /**
+    * @Description: packageRMpHarmonicIRateReportDPO
+    * @Param: [dataInHarmRateIPO, PhaseType]
+    * @return: com.njcn.prepare.harmonic.pojo.po.line.RMpHarmonicIRateReportDPO
+    * @Author: clam
+    * @Date: 2022/10/26
+    */
+    private RMpHarmonicIRateReportDPO packageRMpHarmonicIRateReportDPO(List<DataHarmRateIPO> dataHarmRateIPOList, String PhaseType) {
+
+        RMpHarmonicIRateReportDPO result =null;
+
+        List<DataHarmRateIPO> a = dataHarmRateIPOList.stream ( ).
+                filter (temp -> Objects.equals (temp.getPhaseType ( ), PhaseType)).
+                collect (Collectors.toList ( ));
+        RMpHarmonicIRateReportDPO covertBean = new RMpHarmonicIRateReportDPO();
+
+        if(!CollectionUtils.isEmpty (a)){
+            result = new RMpHarmonicIRateReportDPO();
+            result.setPhase (PhaseType);
+            result.setMeasurementPointId (dataHarmRateIPOList.get (0).getLineId ());
+            result.setDataDate (Date.from (dataHarmRateIPOList.get (0).getTime ()));
+        }
+
+        for (int j = 0; j < a.size (); j++) {
+            DataHarmRateIPO temp = a.get (j);
+            if(Objects.equals (temp.getValueType (), "MIN")){
+                covertBean =  InfluxdbPOConverter.INFLUXDB_PO_CONVERTER.RMpHarmonicIRateReportDPOConverterMin (temp);
+                BeanUtils.copyProperties (covertBean, result,getNullPropertyNames(covertBean));
+            }
+            if(Objects.equals (temp.getValueType (), "MAX")){
+                covertBean =  InfluxdbPOConverter.INFLUXDB_PO_CONVERTER.RMpHarmonicIRateReportDPOConverterMax (temp);
+                BeanUtils.copyProperties (covertBean, result,getNullPropertyNames(covertBean));
+            }
+            if(Objects.equals (temp.getValueType (), "AVG")){
+                covertBean =  InfluxdbPOConverter.INFLUXDB_PO_CONVERTER.RMpHarmonicIRateReportDPOConverterAvg (temp);
+                BeanUtils.copyProperties (covertBean, result,getNullPropertyNames(covertBean));
+            }
+            if(Objects.equals (temp.getValueType (), "CP95")){
+                covertBean =  InfluxdbPOConverter.INFLUXDB_PO_CONVERTER.RMpHarmonicIRateReportDPOConverter95 (temp);
+                BeanUtils.copyProperties (covertBean, result,getNullPropertyNames(covertBean));
+            }
+        }
+
+
+        return  result ;
+    }
+    /** 
+    * @Description: packageRMpInharmonicIRateReportDPO 
+    * @Param: [dataInHarmRateIPO, PhaseType] 
+    * @return: com.njcn.prepare.harmonic.pojo.po.line.RMpInharmonicIRateReportDPO 
+    * @Author: clam
+    * @Date: 2022/10/26 
+    */ 
+    private RMpInharmonicIRateReportDPO packageRMpInharmonicIRateReportDPO(List<DataInHarmRateIPO> dataInHarmRateIPO, String PhaseType) {
+        RMpInharmonicIRateReportDPO result = null;
+
+        List<DataInHarmRateIPO> a = dataInHarmRateIPO.stream ( ).
+                filter (temp -> Objects.equals (temp.getPhaseType ( ), PhaseType)).
+                collect (Collectors.toList ( ));
+        RMpInharmonicIRateReportDPO covertBean = new RMpInharmonicIRateReportDPO();
+
+        if(!CollectionUtils.isEmpty (a)){
+            result = new RMpInharmonicIRateReportDPO();
+            result.setPhase (PhaseType);
+            result.setMeasurementPointId (dataInHarmRateIPO.get (0).getLineId ());
+            result.setDataDate (Date.from (dataInHarmRateIPO.get (0).getTime ()));
+        }
+
+        for (int j = 0; j < a.size (); j++) {
+            DataInHarmRateIPO temp = a.get (j);
+            if(Objects.equals (temp.getValueType (), "MIN")){
+                covertBean =  InfluxdbPOConverter.INFLUXDB_PO_CONVERTER.RMpInharmonicIRateReportDPOConverterMin (temp);
+                BeanUtils.copyProperties (covertBean, result,getNullPropertyNames(covertBean));
+            }
+            if(Objects.equals (temp.getValueType (), "MAX")){
+                covertBean =  InfluxdbPOConverter.INFLUXDB_PO_CONVERTER.RMpInharmonicIRateReportDPOConverterMax (temp);
+                BeanUtils.copyProperties (covertBean, result,getNullPropertyNames(covertBean));
+            }
+            if(Objects.equals (temp.getValueType (), "AVG")){
+                covertBean =  InfluxdbPOConverter.INFLUXDB_PO_CONVERTER.RMpInharmonicIRateReportDPOConverterAvg (temp);
+                BeanUtils.copyProperties (covertBean, result,getNullPropertyNames(covertBean));
+            }
+            if(Objects.equals (temp.getValueType (), "CP95")){
+                covertBean =  InfluxdbPOConverter.INFLUXDB_PO_CONVERTER.RMpInharmonicIRateReportDPOConverter95 (temp);
+                BeanUtils.copyProperties (covertBean, result,getNullPropertyNames(covertBean));
+            }
+        }
+
+
+        return  result ;
+
+    }
+    /** 
+    * @Description: packageRMpInharmonicIMagReportDPO
+    * @Param: [dataInHarmIPO, PhaseType] 
+    * @return: com.njcn.prepare.harmonic.pojo.po.line.RMpInharmonicIMagReportDPO 
+    * @Author: clam
+    * @Date: 2022/10/27 
+    */ 
+    private RMpInharmonicIMagReportDPO packageRMpInharmonicIMagReportDPO(List<DataInHarmIPO> dataInHarmIPO, String PhaseType) {
+
+        RMpInharmonicIMagReportDPO result = null;
+
+        List<DataInHarmIPO> a = dataInHarmIPO.stream ( ).
+                filter (temp -> Objects.equals (temp.getPhaseType ( ), PhaseType)).
+                collect (Collectors.toList ( ));
+        RMpInharmonicIMagReportDPO covertBean = new RMpInharmonicIMagReportDPO();
+
+        if(!CollectionUtils.isEmpty (a)){
+            result = new RMpInharmonicIMagReportDPO();
+            result.setPhase (PhaseType);
+            result.setMeasurementPointId (dataInHarmIPO.get (0).getLineId ());
+            result.setDataDate (Date.from (dataInHarmIPO.get (0).getTime ()));
+        }
+
+        for (int j = 0; j < a.size (); j++) {
+            DataInHarmIPO temp = a.get (j);
+            if(Objects.equals (temp.getValueType (), "MIN")){
+                covertBean =  InfluxdbPOConverter.INFLUXDB_PO_CONVERTER.RMpInharmonicIMagReportDPOConverterMin (temp);
+                BeanUtils.copyProperties (covertBean, result,getNullPropertyNames(covertBean));
+            }
+            if(Objects.equals (temp.getValueType (), "MAX")){
+                covertBean =  InfluxdbPOConverter.INFLUXDB_PO_CONVERTER.RMpInharmonicIMagReportDPOConverterMax (temp);
+                BeanUtils.copyProperties (covertBean, result,getNullPropertyNames(covertBean));
+            }
+            if(Objects.equals (temp.getValueType (), "AVG")){
+                covertBean =  InfluxdbPOConverter.INFLUXDB_PO_CONVERTER.RMpInharmonicIMagReportDPOConverterAvg (temp);
+                BeanUtils.copyProperties (covertBean, result,getNullPropertyNames(covertBean));
+            }
+            if(Objects.equals (temp.getValueType (), "CP95")){
+                covertBean =  InfluxdbPOConverter.INFLUXDB_PO_CONVERTER.RMpInharmonicIMagReportDPOConverter95 (temp);
+                BeanUtils.copyProperties (covertBean, result,getNullPropertyNames(covertBean));
+            }
+        }
+
+
+        return  result ;
+
+    }
+    
+    /** 
+    * @Description: packageRMpInharmonicVRateReportDPO 
+    * @Param: [dataInHarmRateVPO, PhaseType] 
+    * @return: com.njcn.prepare.harmonic.pojo.po.line.RMpInharmonicVRateReportDPO 
+    * @Author: clam
+    * @Date: 2022/10/27 
+    */ 
+    private RMpInharmonicVRateReportDPO packageRMpInharmonicVRateReportDPO(List<DataInHarmRateVPO> dataInHarmRateVPO, String PhaseType) {
+
+        RMpInharmonicVRateReportDPO result = null ;
+
+        List<DataInHarmRateVPO> a = dataInHarmRateVPO.stream ( ).
+                filter (temp -> Objects.equals (temp.getPhaseType ( ), PhaseType)).
+                collect (Collectors.toList ( ));
+        RMpInharmonicVRateReportDPO covertBean = new RMpInharmonicVRateReportDPO();
+
+        if(!CollectionUtils.isEmpty (a)){
+            result = new RMpInharmonicVRateReportDPO();
+            result.setPhase (PhaseType);
+            result.setMeasurementPointId (dataInHarmRateVPO.get (0).getLineId ());
+            result.setDataDate (Date.from (dataInHarmRateVPO.get (0).getTime ()));
+        }
+
+        for (int j = 0; j < a.size (); j++) {
+            DataInHarmRateVPO temp = a.get (j);
+            if(Objects.equals (temp.getValueType (), "MIN")){
+                covertBean =  InfluxdbPOConverter.INFLUXDB_PO_CONVERTER.RMpInharmonicVRateReportDPOConverterMin (temp);
+                BeanUtils.copyProperties (covertBean, result,getNullPropertyNames(covertBean));
+            }
+            if(Objects.equals (temp.getValueType (), "MAX")){
+                covertBean =  InfluxdbPOConverter.INFLUXDB_PO_CONVERTER.RMpInharmonicVRateReportDPOConverterMax (temp);
+                BeanUtils.copyProperties (covertBean, result,getNullPropertyNames(covertBean));
+            }
+            if(Objects.equals (temp.getValueType (), "AVG")){
+                covertBean =  InfluxdbPOConverter.INFLUXDB_PO_CONVERTER.RMpInharmonicVRateReportDPOConverterAvg (temp);
+                BeanUtils.copyProperties (covertBean, result,getNullPropertyNames(covertBean));
+            }
+            if(Objects.equals (temp.getValueType (), "CP95")){
+                covertBean =  InfluxdbPOConverter.INFLUXDB_PO_CONVERTER.RMpInharmonicVRateReportDPOConverter95 (temp);
+                BeanUtils.copyProperties (covertBean, result,getNullPropertyNames(covertBean));
+            }
+        }
+
+
+        return  result ;
+
+    }
+    /** 
+    * @Description: packageRMpHarmonicPReportDPO 
+    * @Param: [dataHarmPowerPPO, dataHarmPowerQPO, PhaseType] 
+    * @return: com.njcn.prepare.harmonic.pojo.po.line.RMpHarmonicPReportDPO 
+    * @Author: clam
+    * @Date: 2022/10/28 
+    */ 
+    private RMpHarmonicPReportDPO packageRMpHarmonicPReportDPO(List<DataHarmPowerPPO> dataHarmPowerPPO, List<DataHarmPowerQPO> dataHarmPowerQPO, String PhaseType) {
+
+        RMpHarmonicPReportDPO result = null ;
+
+        List<DataHarmPowerPPO> a = dataHarmPowerPPO.stream ( ).
+                filter (temp -> Objects.equals (temp.getPhaseType ( ), PhaseType)).
+                collect (Collectors.toList ( ));
+
+        List<DataHarmPowerQPO> b = dataHarmPowerQPO.stream ( ).
+                filter (temp -> Objects.equals (temp.getPhaseType ( ), PhaseType)).
+                collect (Collectors.toList ( ));
+        RMpInharmonicVRateReportDPO covertBean = new RMpInharmonicVRateReportDPO();
+
+        if(!CollectionUtils.isEmpty (a)&&!CollectionUtils.isEmpty (b)){
+            result = new RMpHarmonicPReportDPO();
+            result.setPhase (PhaseType);
+            result.setMeasurementPointId (dataHarmPowerPPO.get (0).getLineId ());
+            result.setDataDate (Date.from (dataHarmPowerPPO.get (0).getTime ()));
+        }
+
+        for (int j = 0; j < b.size (); j++) {
+            DataHarmPowerQPO temp = b.get (j);
+            if(Objects.equals (temp.getValueType (), "MIN")){
+                result.setFundamentalRateofworkMin (temp.getQ1 ());
+            }
+            if(Objects.equals (temp.getValueType (), "MAX")){
+                result.setFundamentalRateofworkMax (temp.getQ1 ());
+
+            }
+            if(Objects.equals (temp.getValueType (), "AVG")){
+                result.setFundamentalRateofworkAvg (temp.getQ1 ());
+
+            }
+            if(Objects.equals (temp.getValueType (), "CP95")){
+                result.setFundamentalRateofwork95 (temp.getQ1 ());
+
+            }
+        }
+
+
+        for (int j = 0; j < a.size (); j++) {
+            DataHarmPowerPPO temp = a.get (j);
+            if(Objects.equals (temp.getValueType (), "MIN")){
+                covertBean =  InfluxdbPOConverter.INFLUXDB_PO_CONVERTER.RMpHarmonicPReportDPOConverterMin (temp);
+                BeanUtils.copyProperties (covertBean, result,getNullPropertyNames(covertBean));
+            }
+            if(Objects.equals (temp.getValueType (), "MAX")){
+                covertBean =  InfluxdbPOConverter.INFLUXDB_PO_CONVERTER.RMpHarmonicPReportDPOConverterMax (temp);
+                BeanUtils.copyProperties (covertBean, result,getNullPropertyNames(covertBean));
+            }
+            if(Objects.equals (temp.getValueType (), "AVG")){
+                covertBean =  InfluxdbPOConverter.INFLUXDB_PO_CONVERTER.RMpHarmonicPReportDPOConverterAvg (temp);
+                BeanUtils.copyProperties (covertBean, result,getNullPropertyNames(covertBean));
+            }
+            if(Objects.equals (temp.getValueType (), "CP95")){
+                covertBean =  InfluxdbPOConverter.INFLUXDB_PO_CONVERTER.RMpHarmonicPReportDPOConverter95 (temp);
+                BeanUtils.copyProperties (covertBean, result,getNullPropertyNames(covertBean));
+            }
+        }
+
+
+        return  result ;
+    }
+
+
+
+    private RMpMeasurePhaseReportDPO packageRMpMeasurePhaseReportDPO(List<DataVPO> dataV, List<DataIPO> dataI, List<DataHarmPowerPPO> dataHarmPowerPPO, List<DataHarmPowerSPO> dataHarmPowers, List<DataHarmPowerQPO> dataHarmPowerQPO, String PhaseType) {
+        RMpMeasurePhaseReportDPO result = null ;
+
+        List<DataVPO> a = dataV.stream ( ).
+                filter (temp -> Objects.equals (temp.getPhaseType ( ), PhaseType)).
+                collect (Collectors.toList ( ));
+
+        List<DataIPO> b = dataI.stream ( ).
+                filter (temp -> Objects.equals (temp.getPhaseType ( ), PhaseType)).
+                collect (Collectors.toList ( ));
+
+        List<DataHarmPowerPPO> c = dataHarmPowerPPO.stream ( ).
+                filter (temp -> Objects.equals (temp.getPhaseType ( ), PhaseType)).
+                collect (Collectors.toList ( ));
+
+        List<DataHarmPowerSPO> d = dataHarmPowers.stream ( ).
+                filter (temp -> Objects.equals (temp.getPhaseType ( ), PhaseType)).
+                collect (Collectors.toList ( ));
+
+        List<DataHarmPowerQPO> e = dataHarmPowerQPO.stream ( ).
+                filter (temp -> Objects.equals (temp.getPhaseType ( ), PhaseType)).
+                collect (Collectors.toList ( ));
+        RMpMeasurePhaseReportDPO covertBean = new RMpMeasurePhaseReportDPO();
+
+        if(!CollectionUtils.isEmpty (a)&&!CollectionUtils.isEmpty (b)){
+            result = new RMpMeasurePhaseReportDPO();
+            result.setPhase (PhaseType);
+            result.setMeasurementPointId (dataHarmPowerPPO.get (0).getLineId ());
+            result.setDataDate (Date.from (dataHarmPowerPPO.get (0).getTime ()));
+        }
+        //todo 非空判断
+        /*max*/
+        DataVPO max = a.stream ( ).filter (temp -> Objects.equals (temp.getValueType ( ), "Max")).
+                collect (Collectors.toList ( )).get (0);
+        DataIPO max1 = b.stream ( ).filter (temp -> Objects.equals (temp.getValueType ( ), "Max")).
+                collect (Collectors.toList ( )).get (0);
+        DataHarmPowerPPO max2 = c.stream ( ).filter (temp -> Objects.equals (temp.getValueType ( ), "Max")).
+                collect (Collectors.toList ( )).get (0);
+        DataHarmPowerSPO max3 = d.stream ( ).filter (temp -> Objects.equals (temp.getValueType ( ), "Max")).
+                collect (Collectors.toList ( )).get (0);
+        DataHarmPowerQPO max4 = e.stream ( ).filter (temp -> Objects.equals (temp.getValueType ( ), "Max")).
+                collect (Collectors.toList ( )).get (0);
+        covertBean =  InfluxdbPOConverter.INFLUXDB_PO_CONVERTER.RMpMeasurePhaseReportDPOConverterMax (max,max1,max2,max3,max4);
+        BeanUtils.copyProperties (covertBean, result,getNullPropertyNames(covertBean));
+
+        /*min*/
+        DataVPO min = a.stream ( ).filter (temp -> Objects.equals (temp.getValueType ( ), "Min")).
+                collect (Collectors.toList ( )).get (0);
+        DataIPO min1 = b.stream ( ).filter (temp -> Objects.equals (temp.getValueType ( ), "Min")).
+                collect (Collectors.toList ( )).get (0);
+        DataHarmPowerPPO min2 = c.stream ( ).filter (temp -> Objects.equals (temp.getValueType ( ), "Min")).
+                collect (Collectors.toList ( )).get (0);
+        DataHarmPowerSPO min3 = d.stream ( ).filter (temp -> Objects.equals (temp.getValueType ( ), "Min")).
+                collect (Collectors.toList ( )).get (0);
+        DataHarmPowerQPO min4 = e.stream ( ).filter (temp -> Objects.equals (temp.getValueType ( ), "Min")).
+                collect (Collectors.toList ( )).get (0);
+        covertBean =  InfluxdbPOConverter.INFLUXDB_PO_CONVERTER.RMpMeasurePhaseReportDPOConverterMin (min,min1,min2,min3,min4);
+        BeanUtils.copyProperties (covertBean, result,getNullPropertyNames(covertBean));
+
+        /*avg*/
+        DataVPO avg = a.stream ( ).filter (temp -> Objects.equals (temp.getValueType ( ), "Avg")).
+                collect (Collectors.toList ( )).get (0);
+        DataIPO avg1 = b.stream ( ).filter (temp -> Objects.equals (temp.getValueType ( ), "Avg")).
+                collect (Collectors.toList ( )).get (0);
+        DataHarmPowerPPO avg2 = c.stream ( ).filter (temp -> Objects.equals (temp.getValueType ( ), "Avg")).
+                collect (Collectors.toList ( )).get (0);
+        DataHarmPowerSPO avg3 = d.stream ( ).filter (temp -> Objects.equals (temp.getValueType ( ), "Avg")).
+                collect (Collectors.toList ( )).get (0);
+        DataHarmPowerQPO avg4 = e.stream ( ).filter (temp -> Objects.equals (temp.getValueType ( ), "Avg")).
+                collect (Collectors.toList ( )).get (0);
+        covertBean =  InfluxdbPOConverter.INFLUXDB_PO_CONVERTER.RMpMeasurePhaseReportDPOConverterAVg (avg,avg1,avg2,avg3,avg4);
+        BeanUtils.copyProperties (covertBean, result,getNullPropertyNames(covertBean));
+
+        /*cp95*/
+        DataVPO  cp95 = a.stream ( ).filter (temp -> Objects.equals (temp.getValueType ( ), "CP95")).
+                collect (Collectors.toList ( )).get (0);
+        DataIPO  cp951 = b.stream ( ).filter (temp -> Objects.equals (temp.getValueType ( ), "CP95")).
+                collect (Collectors.toList ( )).get (0);
+        DataHarmPowerPPO cp952 = c.stream ( ).filter (temp -> Objects.equals (temp.getValueType ( ), "CP95")).
+                collect (Collectors.toList ( )).get (0);
+        DataHarmPowerSPO  cp953 = d.stream ( ).filter (temp -> Objects.equals (temp.getValueType ( ), "CP95")).
+                collect (Collectors.toList ( )).get (0);
+        DataHarmPowerQPO  cp954 = e.stream ( ).filter (temp -> Objects.equals (temp.getValueType ( ), "CP95")).
+                collect (Collectors.toList ( )).get (0);
+        covertBean =  InfluxdbPOConverter.INFLUXDB_PO_CONVERTER.RMpMeasurePhaseReportDPOConverterCp95 (cp95,cp951,cp952,cp953,cp954);
+        BeanUtils.copyProperties (covertBean, result,getNullPropertyNames(covertBean));
+
+        return result;
+
+    }
+
+
+
+    /**
+     * 获取所有字段为null的属性名
+     * @param source
+     * @return
+     */
+    public  String[] getNullPropertyNames (Object source) {
+        final BeanWrapper src = new BeanWrapperImpl (source);
+        java.beans.PropertyDescriptor[] pds = src.getPropertyDescriptors ( );
+
+        Set<String> emptyNames = new HashSet<String> ( );
+        for (java.beans.PropertyDescriptor pd : pds) {
+            Object srcValue = src.getPropertyValue (pd.getName ( ));
+            if (srcValue == null) emptyNames.add (pd.getName ( ));
+        }
+        String[] result = new String[emptyNames.size ( )];
+        return emptyNames.toArray (result);
+
+    }
+
+
+
+}
diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/Impl/line/IntegrityServiceImpl.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/Impl/line/IntegrityServiceImpl.java
new file mode 100644
index 000000000..a05f2949f
--- /dev/null
+++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/Impl/line/IntegrityServiceImpl.java
@@ -0,0 +1,86 @@
+package com.njcn.prepare.harmonic.service.Impl.line;
+
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.date.DateUtil;
+import com.njcn.device.pq.api.LineFeignClient;
+import com.njcn.device.pq.pojo.po.LineDetail;
+import com.njcn.device.pq.pojo.po.Overlimit;
+import com.njcn.influxdb.utils.InfluxDbUtils;
+import com.njcn.prepare.harmonic.pojo.param.LineParam;
+import com.njcn.prepare.harmonic.pojo.po.DataVPO;
+import com.njcn.prepare.harmonic.service.line.IntegrityService;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.influxdb.InfluxDB;
+import org.influxdb.dto.BatchPoints;
+import org.influxdb.dto.Point;
+import org.influxdb.dto.QueryResult;
+import org.influxdb.impl.InfluxDBResultMapper;
+import org.springframework.stereotype.Service;
+
+import java.util.*;
+import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;
+
+import static com.njcn.influxdb.param.InfluxDBPublicParam.DAY_MINUTE;
+
+/**
+ * 数据完整性统计
+ *
+ * @author xiaoyao
+ * @version 1.0.0
+ * @createTime 2022/10/24 20:07
+ */
+
+@Slf4j
+@Service
+@AllArgsConstructor
+public class IntegrityServiceImpl implements IntegrityService {
+
+    private final InfluxDbUtils influxDbUtils;
+
+    private final LineFeignClient lineFeignClient;
+
+    @Override
+    public String computeDataIntegrity(LineParam lineParam) {
+        List<LineDetail> lineDetailList;
+        if (CollUtil.isEmpty(lineParam.getLineIds())){
+            List<Overlimit> overLimitList = getAllLinesLimitData();
+            List<String> lineList = overLimitList.stream().map(Overlimit::getId).collect(Collectors.toList());
+            lineDetailList = lineFeignClient.getLineDetail(lineList).getData();
+        }else {
+            lineDetailList = lineFeignClient.getLineDetail(lineParam.getLineIds()).getData();
+        }
+        if (CollUtil.isEmpty(lineDetailList)){
+            return "未查询到监测点详情！";
+        }
+        Date dateOut = DateUtil.parse(lineParam.getDataDate());
+        List<String> records = new ArrayList<>();
+        for (LineDetail lineDetail :lineDetailList){
+            Map<String, String> tags = new HashMap<>();
+            Map<String, Object> fields = new HashMap<>();
+            tags.put("line_id",lineDetail.getId());
+            fields.put("due",DAY_MINUTE/lineDetail.getTimeInterval());
+            int dataCount = getDataCount(lineDetail.getId(),lineParam.getDataDate());
+            fields.put("real",dataCount);
+            Point point = influxDbUtils.pointBuilder("pqs_integrity", dateOut.getTime(), TimeUnit.MILLISECONDS,tags, fields);
+            BatchPoints batchPoints = BatchPoints.database(influxDbUtils.getDbName()).tag("line_id", lineDetail.getId()).retentionPolicy("").consistency(InfluxDB.ConsistencyLevel.ALL).build();
+            batchPoints.point(point);
+            records.add(batchPoints.lineProtocol());
+        }
+        //InfluxDb入表pqs_integrity
+        influxDbUtils.batchInsert(influxDbUtils.getDbName(),"", InfluxDB.ConsistencyLevel.ALL, records);
+        return "成功！";
+    }
+
+    private int getDataCount(String lineId,String date){
+        QueryResult sqlResult = influxDbUtils.query("SELECT * FROM data_v WHERE time >= '" + date + " 00:00:00' and time <= '" + date + " 23:59:59' and line_id = '" + lineId + "' and phasic_type = 'T' tz('Asia/Shanghai')");
+        InfluxDBResultMapper resultMapper = new InfluxDBResultMapper();
+        List<DataVPO> list = resultMapper.toPOJO(sqlResult, DataVPO.class);
+        return list.size();
+    }
+
+    private List<Overlimit> getAllLinesLimitData() {
+        return lineFeignClient.getAllLineOverLimit("harmonic-boot","").getData();
+    }
+}
diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/Impl/line/LimitRateService.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/Impl/line/LimitRateService.java
new file mode 100644
index 000000000..33a05123c
--- /dev/null
+++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/Impl/line/LimitRateService.java
@@ -0,0 +1,1307 @@
+package com.njcn.prepare.harmonic.service.Impl.line;
+
+import com.github.jeffreyning.mybatisplus.service.MppServiceImpl;
+import com.njcn.common.utils.NjcnBeanUtil;
+import com.njcn.device.pq.api.LineFeignClient;
+import com.njcn.device.pq.pojo.po.Overlimit;
+import com.njcn.harmonic.pojo.po.LimitRate;
+import com.njcn.harmonic.pojo.po.LimitRatePO;
+import com.njcn.influxdb.param.InfluxDBPublicParam;
+import com.njcn.influxdb.utils.InfluxDbUtils;
+import com.njcn.prepare.harmonic.mapper.line.LimitRatePOMapper;
+import com.njcn.prepare.harmonic.pojo.po.*;
+import lombok.AllArgsConstructor;
+import lombok.SneakyThrows;
+import lombok.extern.slf4j.Slf4j;
+import org.influxdb.InfluxDB;
+import org.influxdb.dto.BatchPoints;
+import org.influxdb.dto.Point;
+import org.influxdb.dto.QueryResult;
+import org.influxdb.impl.InfluxDBResultMapper;
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
+
+import java.text.SimpleDateFormat;
+import java.time.Instant;
+import java.util.*;
+import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;
+
+/**
+ * Description:
+ * 接口文档访问地址：http://serverIP:port/swagger-ui.html
+ * Date: 2022/10/18  10:00【需求编号】
+ *
+ * @author clam
+ * @version V1.0.0
+ */
+
+@Slf4j
+@Component
+@AllArgsConstructor
+public class LimitRateService  extends MppServiceImpl<LimitRatePOMapper, LimitRatePO> {
+
+
+    private final InfluxDbUtils influxDbUtils;
+
+    private final LineFeignClient lineFeignClient;
+
+
+    private final LimitRatePOMapper limitRatePOMapper;
+
+
+
+    /**
+     * @Description: 处理 limitrate批处理逻辑
+     * @Param: [lineList：监测点index集合, startTime统计开始时间, endTime统计结束时间]
+     * @return: void
+     * @Author: clam
+     * @Date: 2022/10/18
+     */
+    @Transactional(
+            rollbackFor = {Exception.class}
+    )
+    @SneakyThrows
+    public List<LimitRatePO> limitRateJobHandler(List<String> lineList, String startTime, String endTime)  {
+        List<LimitRatePO> limitRates = new ArrayList<> ();
+        List<LimitRate> limitRateList = new ArrayList<> ();
+
+        Instant instant = new SimpleDateFormat ("yyyy-MM-dd").parse (startTime).toInstant ( );
+        Long time= instant.toEpochMilli();
+
+        for (int i = 0; i <lineList.size () ; i++) {
+
+            String lineIndex =lineList.get (i);
+            Overlimit overlimit = lineFeignClient.getOverLimitData(lineIndex).getData ();
+            if(!Optional.ofNullable (overlimit).isPresent ()){
+                continue;
+            }
+//            influxDbUtils.setDbName ("pqsbase");
+            List<DataVPO> map1 = getAllTime(lineIndex,startTime,endTime);
+            List<DataPltPO> map2 = getFlickerAllTime(lineIndex,startTime,endTime);
+            List<DataHarmRateVPO> map3 = getDataHarmRateV(lineIndex,startTime,endTime);
+            List<DataIPO> map4 = getDataI(lineIndex,startTime,endTime);
+            List<DataInHarmVPO> map5 = getDataInHarmV(lineIndex,startTime,endTime);
+            List<DataVPO> map6 = getDataV(lineIndex,startTime,endTime);
+            List<DataVPO> map7 = getDataVUnbalance(lineIndex,startTime,endTime);
+            List<DataIPO> map8 = getDataINeg(lineIndex,startTime,endTime);
+            List<DataVPO> map9 = getDataVFreq(lineIndex,startTime,endTime);
+            List<DataVPO> map10 = getDataVDev(lineIndex,startTime,endTime);
+            List<DataPltPO> map11 = getDataPlt(lineIndex,startTime,endTime);
+
+            List<LimitRate> result = getData(overlimit,map1,map2,map3,map4,map5,map6,map7,map8,map9,map10,map11);
+            limitRateList.addAll (result);
+            List<LimitRatePO> collect = result.stream ( ).map (t -> {
+                LimitRatePO limitRatePO = new LimitRatePO ( );
+                NjcnBeanUtil.copyPropertiesIgnoreCase (t,limitRatePO);
+
+                limitRatePO.setTime (instant);
+
+                return limitRatePO;
+            }).collect (Collectors.toList ( ));
+            limitRates.addAll (collect);
+        }
+        if (!CollectionUtils.isEmpty(limitRateList)){
+            /*插入influxdb*/
+            insert(limitRateList,time);
+            /*插入mysql*/
+            this.saveOrUpdateBatchByMultiId (limitRates,50);
+        }
+
+        return limitRates;
+
+    }
+
+
+
+    /**
+     * 功能描述:获取influxDB -> data_v -> 总计算次数(用data_v中phasic_type=A,quality_flag=0来参与统计)
+     *
+     * @param lineIndex 监测点index
+     * @param startTime 开始时间
+     * @param endTime   结束时间
+     * @return
+     * @date 2022/5/23 10:51
+     */
+    public List<DataVPO> getAllTime(String lineIndex, String startTime, String endTime) {
+        StringBuilder stringBuilder = new StringBuilder ( );
+        stringBuilder.append ("line_id='").append (lineIndex).append ("' and ").append (InfluxDBPublicParam.TIME + " >= '").append (startTime).
+                append ("' and ").append (InfluxDBPublicParam.TIME).
+                append (" <= '").append (endTime).
+                append ("' and phasic_type = 'A' and value_type = 'AVG' and quality_flag = '0' ").
+                append (InfluxDBPublicParam.TIME_ZONE);
+        String sql = "SELECT count(freq) AS all_time FROM " + InfluxDBPublicParam.DATA_V + " where " + stringBuilder;
+        QueryResult sqlResult = influxDbUtils.query (sql);
+        InfluxDBResultMapper resultMapper = new InfluxDBResultMapper ( );
+        List<DataVPO> list = resultMapper.toPOJO (sqlResult, DataVPO.class);
+
+        return list;
+    }
+
+
+    /**
+     * @Description: getFlickerAllTime
+     * @Param: [lineIndex, startTime, endTime]
+     * @return: java.util.Map<java.lang.String, java.util.List < com.njcn.prepare.harmonic.preprocessing.pojo.vo.DataPltPO>>
+     * @Author: clam
+     * @Date: 2022/10/18
+     */
+    public List<DataPltPO> getFlickerAllTime(String lineIndex, String startTime, String endTime) {
+        StringBuilder stringBuilder = new StringBuilder ( );
+
+        stringBuilder.append ("line_id='").append (lineIndex).append ("' and ").append (InfluxDBPublicParam.TIME + " >= '").
+                append (startTime).append ("' and ").append (InfluxDBPublicParam.TIME).
+                append (" <= '").append (endTime).
+                append ("' and phasic_type = 'A' and quality_flag = '0' ").
+                append (InfluxDBPublicParam.TIME_ZONE);
+        String sql = "SELECT count(plt) AS flicker_all_time FROM " + InfluxDBPublicParam.DATA_PLT + " where " + stringBuilder;
+        QueryResult sqlResult = influxDbUtils.query (sql);
+        InfluxDBResultMapper resultMapper = new InfluxDBResultMapper ( );
+        List<DataPltPO> list = resultMapper.toPOJO (sqlResult, DataPltPO.class);
+
+        return list;
+    }
+
+    /**
+     * 功能描述:获取influxDB -> data_harmrate_v -> 2-25次谐波电压含有率 -> 日95%概率值
+     *
+     * @param lineIndex 监测点index
+     * @param startTime 开始时间
+     * @param endTime   结束时间
+     * @return
+     * @date 2022/5/23 10:51
+     */
+    public List<DataHarmRateVPO> getDataHarmRateV(String lineIndex, String startTime, String endTime) {
+        StringBuilder stringBuilder = new StringBuilder ( );
+        stringBuilder.append ("line_id='").append (lineIndex).append ("' and ").append (InfluxDBPublicParam.TIME + " >= '").append (startTime).append ("' and ").
+                append (InfluxDBPublicParam.TIME).append (" <= '").
+                append (endTime).
+                append ("' and (phasic_type = 'A' or phasic_type = 'B' or phasic_type = 'C') and value_type = 'CP95' and quality_flag = '0' ").
+                append (InfluxDBPublicParam.TIME_ZONE);
+        String sql = "SELECT * FROM " + InfluxDBPublicParam.DATA_HARM_RATE_V + " WHERE " + stringBuilder;
+        QueryResult sqlResult = influxDbUtils.query (sql);
+        InfluxDBResultMapper resultMapper = new InfluxDBResultMapper ( );
+        List<DataHarmRateVPO> list = resultMapper.toPOJO (sqlResult, DataHarmRateVPO.class);
+
+        return list;
+    }
+
+    /**
+     * 功能描述:获取influxDB -> data_i -> 2-25次谐波电流 -> 日95%概率值
+     *
+     * @param lineIndex 监测点Index
+     * @param startTime 开始时间
+     * @param endTime   结束时间
+     * @Date: 2022/10/18
+     */
+    public List<DataIPO> getDataI(String lineIndex, String startTime, String endTime) {
+        StringBuilder stringBuilder = new StringBuilder ( );
+        stringBuilder.append ("line_id='").append (lineIndex).append ("' and ").append (InfluxDBPublicParam.TIME + " >= '").append (startTime).
+                append ("' and ").append (InfluxDBPublicParam.TIME).append (" <= '").
+                append (endTime).
+                append ("' and (phasic_type = 'A' or phasic_type = 'B' or phasic_type = 'C') and value_type = 'CP95' and quality_flag = '0' ").
+                append (InfluxDBPublicParam.TIME_ZONE);
+        String sql = "SELECT * FROM " + InfluxDBPublicParam.DATA_I + " WHERE " + stringBuilder;
+        QueryResult sqlResult = influxDbUtils.query (sql);
+        InfluxDBResultMapper resultMapper = new InfluxDBResultMapper ( );
+        List<DataIPO> list = resultMapper.toPOJO (sqlResult, DataIPO.class);
+
+        return list;
+    }
+
+    /**
+     * 功能描述:获取influxDB -> data_inharm_v -> 0.5-15.5次间谐波电压含有率 -> 日95%概率值
+     *
+     * @param lineIndex 监测点index
+     * @param startTime 开始时间
+     * @param endTime   结束时间
+     * @return
+     * @date 2022/5/23 10:51
+     */
+    public List<DataInHarmVPO> getDataInHarmV(String lineIndex, String startTime, String endTime) {
+        StringBuilder stringBuilder = new StringBuilder ( );
+        stringBuilder.append ("line_id='").append (lineIndex).append ("' and ").append (InfluxDBPublicParam.TIME + " >= '").append (startTime).
+                append ("' and ").append (InfluxDBPublicParam.TIME).append (" <= '").append (endTime).
+                append ("' and (phasic_type = 'A' or phasic_type = 'B' or phasic_type = 'C') and value_type = 'CP95' and quality_flag = '0' ").
+                append (InfluxDBPublicParam.TIME_ZONE);
+        String sql = "SELECT * FROM " + InfluxDBPublicParam.DATA_IN_HARM_V + " WHERE " + stringBuilder;
+        QueryResult sqlResult = influxDbUtils.query (sql);
+        InfluxDBResultMapper resultMapper = new InfluxDBResultMapper ( );
+        List<DataInHarmVPO> list = resultMapper.toPOJO (sqlResult, DataInHarmVPO.class);
+
+        return list;
+    }
+
+    /**
+     * 功能描述:获取influxDB -> data_v -> 电压总谐波畸变率 -> 日95%概率值
+     *
+     * @param lineIndex 监测点Index
+     * @param startTime 开始时间
+     * @param endTime   结束时间
+     * @return
+     * @date 2022/5/23 10:51
+     */
+    public List<DataVPO> getDataV(String lineIndex, String startTime, String endTime) {
+        StringBuilder stringBuilder = new StringBuilder ( );
+        stringBuilder.append ("line_id='").append (lineIndex).append ("' and ").append (InfluxDBPublicParam.TIME + " >= '").append (startTime).
+                append ("' and ").append (InfluxDBPublicParam.TIME).append (" <= '").append (endTime).
+                append ("' and (phasic_type = 'A' or phasic_type = 'B' or phasic_type = 'C') and value_type = 'CP95' and quality_flag = '0' ").
+                append (InfluxDBPublicParam.TIME_ZONE);
+        String sql = "SELECT * FROM " + InfluxDBPublicParam.DATA_V + " WHERE " + stringBuilder;
+        QueryResult sqlResult = influxDbUtils.query (sql);
+        InfluxDBResultMapper resultMapper = new InfluxDBResultMapper ( );
+        List<DataVPO> list = resultMapper.toPOJO (sqlResult, DataVPO.class);
+
+        return list;
+    }
+
+    /**
+     * 功能描述:获取influxDB -> data_v -> 负序电压不平衡度 -> 最大值 && 日95%概率值
+     *
+     * @param lineIndex 监测点lineIndex
+     * @param startTime 开始时间
+     * @param endTime   结束时间
+     * @return
+     * @date 2022/5/23 10:51
+     */
+    public List<DataVPO> getDataVUnbalance(String lineIndex, String startTime, String endTime) {
+
+        StringBuilder stringBuilder = new StringBuilder ( );
+        stringBuilder.append ("line_id='").append (lineIndex).append ("' and ").append (InfluxDBPublicParam.TIME + " >= '").append (startTime).
+                append ("' and ").append (InfluxDBPublicParam.TIME).append (" <= '").append (endTime).
+                append ("' and phasic_type = 'T' and (value_type = 'CP95' or value_type = 'MAX') and quality_flag = '0' ").
+                append (InfluxDBPublicParam.TIME_ZONE);
+        String sql = "SELECT * FROM " + InfluxDBPublicParam.DATA_V + " WHERE " + stringBuilder;
+        QueryResult sqlResult = influxDbUtils.query (sql);
+        InfluxDBResultMapper resultMapper = new InfluxDBResultMapper ( );
+        List<DataVPO> list = resultMapper.toPOJO (sqlResult, DataVPO.class);
+
+        return list;
+    }
+
+    /**
+     * 功能描述:获取influxDB -> data_i -> 负序电流 -> 最大值 && 日95%概率值
+     *
+     * @param lineIndex 监测点lineIndex
+     * @param startTime 开始时间
+     * @param endTime   结束时间
+     * @return
+     * @date 2022/5/23 10:51
+     */
+    public List<DataIPO> getDataINeg(String lineIndex, String startTime, String endTime) {
+        Map<String, List<DataIPO>> map = new HashMap<> ( );
+        StringBuilder stringBuilder = new StringBuilder ( );
+        stringBuilder.append ("line_id='").append (lineIndex).append ("' and ").append (InfluxDBPublicParam.TIME + " >= '").
+                append (startTime).append ("' and ").append (InfluxDBPublicParam.TIME).append (" <= '").append (endTime).
+                append ("' and phasic_type = 'T' and (value_type = 'CP95' or value_type = 'MAX') and quality_flag = '0' ").
+                append (InfluxDBPublicParam.TIME_ZONE);
+        String sql = "SELECT * FROM " + InfluxDBPublicParam.DATA_I + " WHERE " + stringBuilder;
+        QueryResult sqlResult = influxDbUtils.query (sql);
+        InfluxDBResultMapper resultMapper = new InfluxDBResultMapper ( );
+        List<DataIPO> list = resultMapper.toPOJO (sqlResult, DataIPO.class);
+
+        return list;
+    }
+
+    /**
+     * 功能描述:获取influxDB -> data_v -> 频率偏差 -> 最大值 && 最小值
+     *
+     * @param lineIndex 监测点lineIndex
+     * @param startTime 开始时间
+     * @param endTime   结束时间
+     * @return
+     * @date 2022/5/23 10:51
+     */
+    public List<DataVPO> getDataVFreq(String lineIndex, String startTime, String endTime) {
+        StringBuilder stringBuilder = new StringBuilder ( );
+        stringBuilder.append ("line_id='").append (lineIndex).append ("' and ").append (InfluxDBPublicParam.TIME + " >= '").append (startTime).append ("' and ").
+                append (InfluxDBPublicParam.TIME).append (" <= '").
+                append (endTime).
+                append ("' and phasic_type = 'T' and (value_type = 'MIN' or value_type = 'MAX') and quality_flag = '0' ").
+                append (InfluxDBPublicParam.TIME_ZONE);
+        String sql = "SELECT * FROM " + InfluxDBPublicParam.DATA_V + " WHERE " + stringBuilder;
+        QueryResult sqlResult = influxDbUtils.query (sql);
+        InfluxDBResultMapper resultMapper = new InfluxDBResultMapper ( );
+        List<DataVPO> list = resultMapper.toPOJO (sqlResult, DataVPO.class);
+
+        return list;
+    }
+
+    /**
+     * 功能描述:获取influxDB -> data_v -> 电压偏差 -> 最大值 && 最小值
+     *
+     * @param lineIndex 监测点lineIndex
+     * @param startTime 开始时间
+     * @param endTime   结束时间
+     * @return
+     * @date 2022/5/23 10:51
+     */
+    public List<DataVPO> getDataVDev(String lineIndex, String startTime, String endTime) {
+        StringBuilder stringBuilder = new StringBuilder ( );
+        stringBuilder.append ("line_id='").append (lineIndex).append ("' and ").append (InfluxDBPublicParam.TIME + " >= '").
+                append (startTime).append ("' and ").append (InfluxDBPublicParam.TIME).append (" <= '").append (endTime).
+                append ("' and (phasic_type = 'A' or phasic_type = 'B' or phasic_type = 'C') and (value_type = 'MIN' or value_type = 'MAX') and quality_flag = '0' ").
+                append (InfluxDBPublicParam.TIME_ZONE);
+        String sql = "SELECT * FROM " + InfluxDBPublicParam.DATA_V + " WHERE " + stringBuilder;
+        QueryResult sqlResult = influxDbUtils.query (sql);
+        InfluxDBResultMapper resultMapper = new InfluxDBResultMapper ( );
+        List<DataVPO> list = resultMapper.toPOJO (sqlResult, DataVPO.class);
+
+        return list;
+    }
+
+    /**
+     * 功能描述:获取influxDB -> data_plt -> 长时间闪变 -> 最大值
+     *
+     * @param lineIndex 监测点lineIndex
+     * @param startTime 开始时间
+     * @param endTime   结束时间
+     * @return
+     * @date 2022/5/23 10:51
+     */
+    public List<DataPltPO> getDataPlt(String lineIndex, String startTime, String endTime) {
+        StringBuilder stringBuilder = new StringBuilder ( );
+        stringBuilder.append ("line_id='").append (lineIndex).append ("' and ").append (InfluxDBPublicParam.TIME + " >= '").append (startTime).
+                append ("' and ").append (InfluxDBPublicParam.TIME).append (" <= '").append (endTime).
+                append ("' and (phasic_type = 'A' or phasic_type = 'B' or phasic_type = 'C') and quality_flag = '0' ").
+                append (InfluxDBPublicParam.TIME_ZONE);
+        String sql = "SELECT * FROM " + InfluxDBPublicParam.DATA_PLT + " WHERE " + stringBuilder;
+        QueryResult sqlResult = influxDbUtils.query (sql);
+        InfluxDBResultMapper resultMapper = new InfluxDBResultMapper ( );
+        List<DataPltPO> list = resultMapper.toPOJO (sqlResult, DataPltPO.class);
+
+        return list;
+    }
+
+    /**
+    * @Description: getData
+    * @Param: [overlimit, allTimeList, flickerAllTimeList, dataHarmRateVPOList, dataIPOList, dataInHarmVPOList, dataVPOList, dataVPOUnbalanceList, dataIPONegList, dataVPOFreqList, dataVPODevList, dataPltPOList]
+    * @return: java.util.List<com.njcn.harmonic.pojo.po.LimitRate>
+    * @Author: clam
+    * @Date: 2022/10/18
+    */
+    private List<LimitRate> getData(Overlimit overlimit, List<DataVPO> allTimeList,
+                                    List<DataPltPO> flickerAllTimeList, List<DataHarmRateVPO> dataHarmRateVPOList,
+                                    List<DataIPO> dataIPOList, List<DataInHarmVPO> dataInHarmVPOList,
+                                    List<DataVPO> dataVPOList, List<DataVPO> dataVPOUnbalanceList, List<DataIPO> dataIPONegList,
+                                    List<DataVPO> dataVPOFreqList, List<DataVPO> dataVPODevList, List<DataPltPO> dataPltPOList) {
+        List<LimitRate> result = new ArrayList<> ( );
+
+        Map<String, List<DataHarmRateVPO>> harmRateVByPhaseType = new HashMap<> ( );
+        Map<String, List<DataIPO>> dataIByPhaseType = new HashMap<> ( );
+        Map<String, List<DataInHarmVPO>> dataInHarmVPhaseType = new HashMap<> ( );
+        Map<String, List<DataVPO>> dataVPhaseType = new HashMap<> ( );
+        Map<String, List<DataVPO>> dataVDevPhaseType = new HashMap<> ( );
+        Map<String, List<DataPltPO>> dataPltPhaseType = new HashMap<> ( );
+        Map<Instant, List<DataHarmRateVPO>> harmRateVByTime = new HashMap<> ( );
+        Map<Instant, List<DataIPO>> dataIByTime = new HashMap<> ( );
+        Map<Instant, List<DataInHarmVPO>> dataInHarmVByTime = new HashMap<> ( );
+        Map<Instant, List<DataVPO>> dataVByTime = new HashMap<> ( );
+        Map<Instant, List<DataVPO>> dataVUnbalanceByTime = new HashMap<> ( );
+        Map<Instant, List<DataIPO>> dataINegByTime = new HashMap<> ( );
+        Map<Instant, List<DataVPO>> dataVFreqByTime = new HashMap<> ( );
+        Map<Instant, List<DataVPO>> dataVDevByTime = new HashMap<> ( );
+        Map<Instant, List<DataPltPO>> dataPltByTime = new HashMap<> ( );
+        Integer allTime = 0;
+        Integer flickerAllTime = 0;
+        if (!CollectionUtils.isEmpty (allTimeList)) {
+            allTime = allTimeList.get (0).getAllTime ( );
+        }
+        if (!CollectionUtils.isEmpty (flickerAllTimeList)) {
+            flickerAllTime = flickerAllTimeList.get (0).getFlickerAllTime ();        }
+
+
+
+        if (!CollectionUtils.isEmpty (dataHarmRateVPOList)) {
+            harmRateVByPhaseType = dataHarmRateVPOList.stream ( ).collect (Collectors.groupingBy (DataHarmRateVPO::getPhaseType));
+            harmRateVByTime = dataHarmRateVPOList.stream ( ).collect (Collectors.groupingBy (DataHarmRateVPO::getTime));
+        }
+        if (!CollectionUtils.isEmpty (dataIPOList)) {
+            dataIByPhaseType = dataIPOList.stream ( ).collect (Collectors.groupingBy (DataIPO::getPhaseType));
+            dataIByTime = dataIPOList.stream ( ).collect (Collectors.groupingBy (DataIPO::getTime));
+        }
+        if (!CollectionUtils.isEmpty (dataInHarmVPOList)) {
+            dataInHarmVPhaseType = dataInHarmVPOList.stream ( ).collect (Collectors.groupingBy (DataInHarmVPO::getPhaseType));
+            dataInHarmVByTime = dataInHarmVPOList.stream ( ).collect (Collectors.groupingBy (DataInHarmVPO::getTime));
+        }
+        if (!CollectionUtils.isEmpty (dataVPOList)) {
+            dataVPhaseType = dataVPOList.stream ( ).collect (Collectors.groupingBy (DataVPO::getPhaseType));
+            dataVByTime = dataVPOList.stream ( ).collect (Collectors.groupingBy (DataVPO::getTime));
+        }
+        if (!CollectionUtils.isEmpty (dataVPOUnbalanceList)) {
+            dataVUnbalanceByTime = dataVPOUnbalanceList.stream ( ).collect (Collectors.groupingBy (DataVPO::getTime));
+        }
+        if (!CollectionUtils.isEmpty (dataIPONegList)) {
+            dataINegByTime = dataIPONegList.stream ( ).collect (Collectors.groupingBy (DataIPO::getTime));
+        }
+        if (!CollectionUtils.isEmpty (dataVPOFreqList)) {
+            dataVFreqByTime = dataVPOFreqList.stream ( ).collect (Collectors.groupingBy (DataVPO::getTime));
+        }
+        if (!CollectionUtils.isEmpty (dataVPODevList)) {
+            dataVDevPhaseType = dataVPODevList.stream ( ).collect (Collectors.groupingBy (DataVPO::getPhaseType));
+            dataVDevByTime = dataVPODevList.stream ( ).collect (Collectors.groupingBy (DataVPO::getTime));
+        }
+        if (!CollectionUtils.isEmpty (dataPltPOList)) {
+            dataPltPhaseType = dataPltPOList.stream ( ).collect (Collectors.groupingBy (DataPltPO::getPhaseType));
+            dataPltByTime = dataPltPOList.stream ( ).collect (Collectors.groupingBy (DataPltPO::getTime));
+        }
+        LimitRate a = limitRateData (overlimit, allTime, flickerAllTime, "A", overlimit.getId (), harmRateVByPhaseType.get ("A"), dataIByPhaseType.get ("A"), dataInHarmVPhaseType.get ("A"), dataVPhaseType.get ("A"), dataVDevPhaseType.get ("A"), dataPltPhaseType.get ("A"));
+        LimitRate b = limitRateData (overlimit, allTime, flickerAllTime, "B", overlimit.getId (), harmRateVByPhaseType.get ("B"), dataIByPhaseType.get ("B"), dataInHarmVPhaseType.get ("B"), dataVPhaseType.get ("B"), dataVDevPhaseType.get ("B"), dataPltPhaseType.get ("B"));
+        LimitRate c = limitRateData (overlimit, allTime, flickerAllTime, "C", overlimit.getId (), harmRateVByPhaseType.get ("C"), dataIByPhaseType.get ("C"), dataInHarmVPhaseType.get ("C"), dataVPhaseType.get ("C"), dataVDevPhaseType.get ("C"), dataPltPhaseType.get ("C"));
+        LimitRate t = limitRateDataT (overlimit, allTime, flickerAllTime, overlimit.getId (), harmRateVByTime, dataIByTime, dataInHarmVByTime, dataVByTime, dataVUnbalanceByTime, dataINegByTime, dataVFreqByTime, dataVDevByTime, dataPltByTime);
+        result.add (a);
+        result.add (b);
+        result.add (c);
+        result.add (t);
+
+        return result;
+    }
+
+
+    /**
+    * @Description: limitRateData
+    * @Param: [overlimit, allTime, flickerAllTime, phasicType, lineId, dataHarmRateVPOList, dataIPOList, dataInHarmVPOList, dataVPOList, dataVUnbalanceList, dataINegList]
+    * @return: com.njcn.harmonic.pojo.po.LimitRate
+    * @Author: clam
+    * @Date: 2022/10/18
+    */
+    public LimitRate limitRateData(Overlimit overlimit, Integer allTime, Integer
+            flickerAllTime, String phasicType, String lineId,
+                                   List<DataHarmRateVPO> dataHarmRateVPOList,
+                                   List<DataIPO> dataIPOList, List<DataInHarmVPO> dataInHarmVPOList,
+                                   List<DataVPO> dataVPOList, List<DataVPO> dataVPODevList, List<DataPltPO> dataPltPOList) {
+        LimitRate limitRate = new LimitRate ( );
+        int v2 = 0, v3 = 0, v4 = 0, v5 = 0, v6 = 0, v7 = 0, v8 = 0, v9 = 0, v10 = 0, v11 = 0, v12 = 0, v13 = 0, v14 = 0, v15 = 0, v16 = 0, v17 = 0, v18 = 0, v19 = 0, v20 = 0, v21 = 0, v22 = 0, v23 = 0, v24 = 0, v25 = 0;
+        int i2 = 0, i3 = 0, i4 = 0, i5 = 0, i6 = 0, i7 = 0, i8 = 0, i9 = 0, i10 = 0, i11 = 0, i12 = 0, i13 = 0, i14 = 0, i15 = 0, i16 = 0, i17 = 0, i18 = 0, i19 = 0, i20 = 0, i21 = 0, i22 = 0, i23 = 0, i24 = 0, i25 = 0;
+        int uHarm1 = 0, uHarm2 = 0, uHarm3 = 0, uHarm4 = 0, uHarm5 = 0, uHarm6 = 0, uHarm7 = 0, uHarm8 = 0, uHarm9 = 0, uHarm10 = 0, uHarm11 = 0, uHarm12 = 0, uHarm13 = 0, uHarm14 = 0, uHarm15 = 0, uHarm16 = 0;
+        int thd = 0, uDev = 0, flicker = 0;
+        //2-25次谐波电压含有率
+
+        if (!CollectionUtils.isEmpty (dataHarmRateVPOList)) {
+            for (DataHarmRateVPO item : dataHarmRateVPOList) {
+                if (item.getV2 ( ) > overlimit.getUharm2 ( )) {
+                    v2++;
+                }
+                if (item.getV3 ( ) > overlimit.getUharm3 ( )) {
+                    v3++;
+                }
+                if (item.getV4 ( ) > overlimit.getUharm4 ( )) {
+                    v4++;
+                }
+                if (item.getV5 ( ) > overlimit.getUharm5 ( )) {
+                    v5++;
+                }
+                if (item.getV6 ( ) > overlimit.getUharm6 ( )) {
+                    v6++;
+                }
+                if (item.getV7 ( ) > overlimit.getUharm7 ( )) {
+                    v7++;
+                }
+                if (item.getV8 ( ) > overlimit.getUharm8 ( )) {
+                    v8++;
+                }
+                if (item.getV9 ( ) > overlimit.getUharm9 ( )) {
+                    v9++;
+                }
+                if (item.getV10 ( ) > overlimit.getUharm10 ( )) {
+                    v10++;
+                }
+                if (item.getV11 ( ) > overlimit.getUharm11 ( )) {
+                    v11++;
+                }
+                if (item.getV12 ( ) > overlimit.getUharm12 ( )) {
+                    v12++;
+                }
+                if (item.getV13 ( ) > overlimit.getUharm13 ( )) {
+                    v13++;
+                }
+                if (item.getV14 ( ) > overlimit.getUharm14 ( )) {
+                    v14++;
+                }
+                if (item.getV15 ( ) > overlimit.getUharm15 ( )) {
+                    v15++;
+                }
+                if (item.getV16 ( ) > overlimit.getUharm16 ( )) {
+                    v16++;
+                }
+                if (item.getV17 ( ) > overlimit.getUharm17 ( )) {
+                    v17++;
+                }
+                if (item.getV18 ( ) > overlimit.getUharm18 ( )) {
+                    v18++;
+                }
+                if (item.getV19 ( ) > overlimit.getUharm19 ( )) {
+                    v19++;
+                }
+                if (item.getV20 ( ) > overlimit.getUharm20 ( )) {
+                    v20++;
+                }
+                if (item.getV21 ( ) > overlimit.getUharm21 ( )) {
+                    v21++;
+                }
+                if (item.getV22 ( ) > overlimit.getUharm22 ( )) {
+                    v22++;
+                }
+                if (item.getV23 ( ) > overlimit.getUharm23 ( )) {
+                    v23++;
+                }
+                if (item.getV24 ( ) > overlimit.getUharm24 ( )) {
+                    v24++;
+                }
+                if (item.getV25 ( ) > overlimit.getUharm25 ( )) {
+                    v25++;
+                }
+            }
+        }
+        //2-25次谐波电流
+        if (!CollectionUtils.isEmpty (dataIPOList)) {
+            for (DataIPO item : dataIPOList) {
+                if (item.getI2 ( ) > overlimit.getIharm2 ( )) {
+                    i2++;
+                }
+                if (item.getI3 ( ) > overlimit.getIharm3 ( )) {
+                    i3++;
+                }
+                if (item.getI4 ( ) > overlimit.getIharm4 ( )) {
+                    i4++;
+                }
+                if (item.getI5 ( ) > overlimit.getIharm5 ( )) {
+                    i5++;
+                }
+                if (item.getI6 ( ) > overlimit.getIharm6 ( )) {
+                    i6++;
+                }
+                if (item.getI7 ( ) > overlimit.getIharm7 ( )) {
+                    i7++;
+                }
+                if (item.getI8 ( ) > overlimit.getIharm8 ( )) {
+                    i8++;
+                }
+                if (item.getI9 ( ) > overlimit.getIharm9 ( )) {
+                    i9++;
+                }
+                if (item.getI10 ( ) > overlimit.getIharm10 ( )) {
+                    i10++;
+                }
+                if (item.getI11 ( ) > overlimit.getIharm11 ( )) {
+                    i11++;
+                }
+                if (item.getI12 ( ) > overlimit.getIharm12 ( )) {
+                    i12++;
+                }
+                if (item.getI13 ( ) > overlimit.getIharm13 ( )) {
+                    i13++;
+                }
+                if (item.getI14 ( ) > overlimit.getIharm14 ( )) {
+                    i14++;
+                }
+                if (item.getI15 ( ) > overlimit.getIharm15 ( )) {
+                    i15++;
+                }
+                if (item.getI16 ( ) > overlimit.getIharm16 ( )) {
+                    i16++;
+                }
+                if (item.getI17 ( ) > overlimit.getIharm17 ( )) {
+                    i17++;
+                }
+                if (item.getI18 ( ) > overlimit.getIharm18 ( )) {
+                    i18++;
+                }
+                if (item.getI19 ( ) > overlimit.getIharm19 ( )) {
+                    i19++;
+                }
+                if (item.getI20 ( ) > overlimit.getIharm20 ( )) {
+                    i20++;
+                }
+                if (item.getI21 ( ) > overlimit.getIharm21 ( )) {
+                    i21++;
+                }
+                if (item.getI22 ( ) > overlimit.getIharm22 ( )) {
+                    i22++;
+                }
+                if (item.getI23 ( ) > overlimit.getIharm23 ( )) {
+                    i23++;
+                }
+                if (item.getI24 ( ) > overlimit.getIharm24 ( )) {
+                    i24++;
+                }
+                if (item.getI25 ( ) > overlimit.getIharm25 ( )) {
+                    i25++;
+                }
+            }
+        }
+        //0.5-15.5次间谐波电压含有率
+        if (!CollectionUtils.isEmpty (dataInHarmVPOList)) {
+            for (DataInHarmVPO item : dataInHarmVPOList) {
+                if (item.getV1 ( ) > overlimit.getInuharm1 ( )) {
+                    uHarm1++;
+                }
+                if (item.getV2 ( ) > overlimit.getInuharm2 ( )) {
+                    uHarm2++;
+                }
+                if (item.getV3 ( ) > overlimit.getInuharm3 ( )) {
+                    uHarm3++;
+                }
+                if (item.getV4 ( ) > overlimit.getInuharm4 ( )) {
+                    uHarm4++;
+                }
+                if (item.getV5 ( ) > overlimit.getInuharm5 ( )) {
+                    uHarm5++;
+                }
+                if (item.getV6 ( ) > overlimit.getInuharm6 ( )) {
+                    uHarm6++;
+                }
+                if (item.getV7 ( ) > overlimit.getInuharm7 ( )) {
+                    uHarm7++;
+                }
+                if (item.getV8 ( ) > overlimit.getInuharm8 ( )) {
+                    uHarm8++;
+                }
+                if (item.getV9 ( ) > overlimit.getInuharm9 ( )) {
+                    uHarm9++;
+                }
+                if (item.getV10 ( ) > overlimit.getInuharm10 ( )) {
+                    uHarm10++;
+                }
+                if (item.getV11 ( ) > overlimit.getInuharm11 ( )) {
+                    uHarm11++;
+                }
+                if (item.getV12 ( ) > overlimit.getInuharm12 ( )) {
+                    uHarm12++;
+                }
+                if (item.getV13 ( ) > overlimit.getInuharm13 ( )) {
+                    uHarm13++;
+                }
+                if (item.getV14 ( ) > overlimit.getInuharm14 ( )) {
+                    uHarm14++;
+                }
+                if (item.getV15 ( ) > overlimit.getInuharm15 ( )) {
+                    uHarm15++;
+                }
+                if (item.getV16 ( ) > overlimit.getInuharm16 ( )) {
+                    uHarm16++;
+                }
+            }
+        }
+        //电压总谐波畸变率
+        if (!CollectionUtils.isEmpty (dataVPOList)) {
+            for (DataVPO item : dataVPOList) {
+                if (item.getVThd ( ) > overlimit.getUaberrance ( )) {
+                    thd++;
+                }
+            }
+        }
+        //电压上偏差、电压下偏差
+        if (!CollectionUtils.isEmpty (dataVPODevList)) {
+            Map<String, List<DataVPO>> devMap = dataVPODevList.stream ( ).collect (Collectors.groupingBy (DataVPO::getValueType));
+            List<DataVPO> maxList = devMap.get ("MAX");
+            for (DataVPO item : maxList) {
+                if (item.getVuDev ( ) > overlimit.getVoltageDev ( )) {
+                    uDev++;
+                }
+            }
+            List<DataVPO> minList = devMap.get ("MIN");
+            for (DataVPO item : minList) {
+                if (item.getVlDev ( ) < overlimit.getUvoltageDev ( )) {
+                    uDev++;
+                }
+            }
+        }
+        //长时间闪变
+        if (!CollectionUtils.isEmpty (dataPltPOList)) {
+            for (DataPltPO item : dataPltPOList) {
+                if (item.getPlt ( ) > overlimit.getFlicker ( )) {
+                    flicker++;
+                }
+            }
+        }
+        limitRate.setLineId (lineId);
+        limitRate.setPhasicType (phasicType);
+        limitRate.setAllTime (allTime);
+        limitRate.setFlickerAllTime (flickerAllTime);
+        limitRate.setUAberranceOverTime (0);
+        limitRate.setINegOverTime (0);
+        limitRate.setFreqDevOverTime (0);
+        limitRate.setUHarm2OverTime (v2);
+        limitRate.setUHarm3OverTime (v3);
+        limitRate.setUHarm4OverTime (v4);
+        limitRate.setUHarm5OverTime (v5);
+        limitRate.setUHarm6OverTime (v6);
+        limitRate.setUHarm7OverTime (v7);
+        limitRate.setUHarm8OverTime (v8);
+        limitRate.setUHarm9OverTime (v9);
+        limitRate.setUHarm10OverTime (v10);
+        limitRate.setUHarm11OverTime (v11);
+        limitRate.setUHarm12OverTime (v12);
+        limitRate.setUHarm13OverTime (v13);
+        limitRate.setUHarm14OverTime (v14);
+        limitRate.setUHarm15OverTime (v15);
+        limitRate.setUHarm16OverTime (v16);
+        limitRate.setUHarm17OverTime (v17);
+        limitRate.setUHarm18OverTime (v18);
+        limitRate.setUHarm19OverTime (v19);
+        limitRate.setUHarm20OverTime (v20);
+        limitRate.setUHarm21OverTime (v21);
+        limitRate.setUHarm22OverTime (v22);
+        limitRate.setUHarm23OverTime (v23);
+        limitRate.setUHarm24OverTime (v24);
+        limitRate.setUHarm25OverTime (v25);
+        limitRate.setIHarm2OverTime (i2);
+        limitRate.setIHarm3OverTime (i3);
+        limitRate.setIHarm4OverTime (i4);
+        limitRate.setIHarm5OverTime (i5);
+        limitRate.setIHarm6OverTime (i6);
+        limitRate.setIHarm7OverTime (i7);
+        limitRate.setIHarm8OverTime (i8);
+        limitRate.setIHarm9OverTime (i9);
+        limitRate.setIHarm10OverTime (i10);
+        limitRate.setIHarm11OverTime (i11);
+        limitRate.setIHarm12OverTime (i12);
+        limitRate.setIHarm13OverTime (i13);
+        limitRate.setIHarm14OverTime (i14);
+        limitRate.setIHarm15OverTime (i15);
+        limitRate.setIHarm16OverTime (i16);
+        limitRate.setIHarm17OverTime (i17);
+        limitRate.setIHarm18OverTime (i18);
+        limitRate.setIHarm19OverTime (i19);
+        limitRate.setIHarm20OverTime (i20);
+        limitRate.setIHarm21OverTime (i21);
+        limitRate.setIHarm22OverTime (i22);
+        limitRate.setIHarm23OverTime (i23);
+        limitRate.setIHarm24OverTime (i24);
+        limitRate.setIHarm25OverTime (i25);
+        limitRate.setInuHarm1OverTime (uHarm1);
+        limitRate.setInuHarm2OverTime (uHarm2);
+        limitRate.setInuHarm3OverTime (uHarm3);
+        limitRate.setInuHarm4OverTime (uHarm4);
+        limitRate.setInuHarm5OverTime (uHarm5);
+        limitRate.setInuHarm6OverTime (uHarm6);
+        limitRate.setInuHarm7OverTime (uHarm7);
+        limitRate.setInuHarm8OverTime (uHarm8);
+        limitRate.setInuHarm9OverTime (uHarm9);
+        limitRate.setInuHarm10OverTime (uHarm10);
+        limitRate.setInuHarm11OverTime (uHarm11);
+        limitRate.setInuHarm12OverTime (uHarm12);
+        limitRate.setInuHarm13OverTime (uHarm13);
+        limitRate.setInuHarm14OverTime (uHarm14);
+        limitRate.setInuHarm15OverTime (uHarm15);
+        limitRate.setInuHarm16OverTime (uHarm16);
+        limitRate.setUBalanceOverTime (thd);
+        limitRate.setVoltageDevOverTime (uDev);
+        limitRate.setFlickerOverTime (flicker);
+        return limitRate;
+    }
+
+
+    public LimitRate limitRateDataT(Overlimit overlimit, Integer allTime, Integer flickerAllTime, String lineId, Map<Instant,List<DataHarmRateVPO>> map1, Map<Instant,List<DataIPO>> map2, Map<Instant,List<DataInHarmVPO>> map3, Map<Instant,List<DataVPO>> map4, Map<Instant,List<DataVPO>> map5, Map<Instant,List<DataIPO>> map6, Map<Instant,List<DataVPO>> map7, Map<Instant,List<DataVPO>> map8, Map<Instant,List<DataPltPO>> map9){
+        LimitRate limitRate = new LimitRate();
+        int v2 = 0,v3 = 0,v4 = 0,v5 = 0,v6 = 0,v7 = 0,v8 = 0,v9 = 0,v10 = 0,v11 = 0,v12 = 0,v13 = 0,v14 = 0,v15 = 0,v16 = 0,v17 = 0,v18 = 0,v19 = 0,v20 = 0,v21 = 0,v22 = 0,v23 = 0,v24 = 0,v25 = 0;
+        int i2 = 0,i3 = 0,i4 = 0,i5 = 0,i6 = 0,i7 = 0,i8 = 0,i9 = 0,i10 = 0,i11 = 0,i12 = 0,i13 = 0,i14 = 0,i15 = 0,i16 = 0,i17 = 0,i18 = 0,i19 = 0,i20 = 0,i21 = 0,i22 = 0,i23 = 0,i24 = 0,i25 = 0;
+        int uHarm1 = 0,uHarm2 = 0,uHarm3 = 0,uHarm4 = 0,uHarm5 = 0,uHarm6 = 0,uHarm7 = 0,uHarm8 = 0,uHarm9 = 0,uHarm10 = 0,uHarm11 = 0,uHarm12 = 0,uHarm13 = 0,uHarm14 = 0,uHarm15 = 0,uHarm16 = 0;
+        int thd = 0,uDev = 0,flicker = 0,freqDev = 0,uAberrance = 0,iNeg = 0;
+        //2-25次谐波电压含有率
+        for (Instant time:map1.keySet()) {
+            List<DataHarmRateVPO> list = map1.get(time);
+            List<DataHarmRateVPO> l2 = list.stream().filter(s->s.getV2()>overlimit.getUharm2()).collect(Collectors.toList());
+            if (!CollectionUtils.isEmpty(l2)){
+                v2++;
+            }
+            List<DataHarmRateVPO> l3 = list.stream().filter(s->s.getV3()>overlimit.getUharm3()).collect(Collectors.toList());
+            if (!CollectionUtils.isEmpty(l3)){
+                v3++;
+            }
+            List<DataHarmRateVPO> l4 = list.stream().filter(s->s.getV4()>overlimit.getUharm4()).collect(Collectors.toList());
+            if (!CollectionUtils.isEmpty(l4)){
+                v4++;
+            }
+            List<DataHarmRateVPO> l5 = list.stream().filter(s->s.getV5()>overlimit.getUharm5()).collect(Collectors.toList());
+            if (!CollectionUtils.isEmpty(l5)){
+                v5++;
+            }
+            List<DataHarmRateVPO> l6 = list.stream().filter(s->s.getV6()>overlimit.getUharm6()).collect(Collectors.toList());
+            if (!CollectionUtils.isEmpty(l6)){
+                v6++;
+            }
+            List<DataHarmRateVPO> l7 = list.stream().filter(s->s.getV7()>overlimit.getUharm7()).collect(Collectors.toList());
+            if (!CollectionUtils.isEmpty(l7)){
+                v7++;
+            }
+            List<DataHarmRateVPO> l8 = list.stream().filter(s->s.getV8()>overlimit.getUharm8()).collect(Collectors.toList());
+            if (!CollectionUtils.isEmpty(l8)){
+                v8++;
+            }
+            List<DataHarmRateVPO> l9 = list.stream().filter(s->s.getV9()>overlimit.getUharm9()).collect(Collectors.toList());
+            if (!CollectionUtils.isEmpty(l9)){
+                v9++;
+            }
+            List<DataHarmRateVPO> l10 = list.stream().filter(s->s.getV10()>overlimit.getUharm10()).collect(Collectors.toList());
+            if (!CollectionUtils.isEmpty(l10)){
+                v10++;
+            }
+            List<DataHarmRateVPO> l11 = list.stream().filter(s->s.getV11()>overlimit.getUharm11()).collect(Collectors.toList());
+            if (!CollectionUtils.isEmpty(l11)){
+                v11++;
+            }
+            List<DataHarmRateVPO> l12 = list.stream().filter(s->s.getV12()>overlimit.getUharm12()).collect(Collectors.toList());
+            if (!CollectionUtils.isEmpty(l12)){
+                v12++;
+            }
+            List<DataHarmRateVPO> l13 = list.stream().filter(s->s.getV13()>overlimit.getUharm13()).collect(Collectors.toList());
+            if (!CollectionUtils.isEmpty(l13)){
+                v13++;
+            }
+            List<DataHarmRateVPO> l14 = list.stream().filter(s->s.getV14()>overlimit.getUharm14()).collect(Collectors.toList());
+            if (!CollectionUtils.isEmpty(l14)){
+                v14++;
+            }
+            List<DataHarmRateVPO> l15 = list.stream().filter(s->s.getV15()>overlimit.getUharm15()).collect(Collectors.toList());
+            if (!CollectionUtils.isEmpty(l15)){
+                v15++;
+            }
+            List<DataHarmRateVPO> l16 = list.stream().filter(s->s.getV16()>overlimit.getUharm16()).collect(Collectors.toList());
+            if (!CollectionUtils.isEmpty(l16)){
+                v16++;
+            }
+            List<DataHarmRateVPO> l17 = list.stream().filter(s->s.getV17()>overlimit.getUharm17()).collect(Collectors.toList());
+            if (!CollectionUtils.isEmpty(l17)){
+                v17++;
+            }
+            List<DataHarmRateVPO> l18 = list.stream().filter(s->s.getV18()>overlimit.getUharm18()).collect(Collectors.toList());
+            if (!CollectionUtils.isEmpty(l18)){
+                v18++;
+            }
+            List<DataHarmRateVPO> l19 = list.stream().filter(s->s.getV19()>overlimit.getUharm19()).collect(Collectors.toList());
+            if (!CollectionUtils.isEmpty(l19)){
+                v19++;
+            }
+            List<DataHarmRateVPO> l20 = list.stream().filter(s->s.getV20()>overlimit.getUharm20()).collect(Collectors.toList());
+            if (!CollectionUtils.isEmpty(l20)){
+                v20++;
+            }
+            List<DataHarmRateVPO> l21 = list.stream().filter(s->s.getV21()>overlimit.getUharm21()).collect(Collectors.toList());
+            if (!CollectionUtils.isEmpty(l21)){
+                v21++;
+            }
+            List<DataHarmRateVPO> l22 = list.stream().filter(s->s.getV22()>overlimit.getUharm22()).collect(Collectors.toList());
+            if (!CollectionUtils.isEmpty(l22)){
+                v22++;
+            }
+            List<DataHarmRateVPO> l23 = list.stream().filter(s->s.getV23()>overlimit.getUharm23()).collect(Collectors.toList());
+            if (!CollectionUtils.isEmpty(l23)){
+                v23++;
+            }
+            List<DataHarmRateVPO> l24 = list.stream().filter(s->s.getV24()>overlimit.getUharm24()).collect(Collectors.toList());
+            if (!CollectionUtils.isEmpty(l24)){
+                v24++;
+            }
+            List<DataHarmRateVPO> l25 = list.stream().filter(s->s.getV25()>overlimit.getUharm25()).collect(Collectors.toList());
+            if (!CollectionUtils.isEmpty(l25)){
+                v25++;
+            }
+        }
+        //2-25次谐波电流
+        for (Instant time:map2.keySet()) {
+            List<DataIPO> list = map2.get(time);
+            List<DataIPO> l2 = list.stream().filter(s->s.getI2()>overlimit.getIharm2()).collect(Collectors.toList());
+            if (!CollectionUtils.isEmpty(l2)){
+                i2++;
+            }
+            List<DataIPO> l3 = list.stream().filter(s->s.getI3()>overlimit.getIharm3()).collect(Collectors.toList());
+            if (!CollectionUtils.isEmpty(l3)){
+                i3++;
+            }
+            List<DataIPO> l4 = list.stream().filter(s->s.getI4()>overlimit.getIharm4()).collect(Collectors.toList());
+            if (!CollectionUtils.isEmpty(l4)){
+                i4++;
+            }
+            List<DataIPO> l5 = list.stream().filter(s->s.getI5()>overlimit.getIharm5()).collect(Collectors.toList());
+            if (!CollectionUtils.isEmpty(l5)){
+                i5++;
+            }
+            List<DataIPO> l6 = list.stream().filter(s->s.getI6()>overlimit.getIharm6()).collect(Collectors.toList());
+            if (!CollectionUtils.isEmpty(l6)){
+                i6++;
+            }
+            List<DataIPO> l7 = list.stream().filter(s->s.getI7()>overlimit.getIharm7()).collect(Collectors.toList());
+            if (!CollectionUtils.isEmpty(l7)){
+                i7++;
+            }
+            List<DataIPO> l8 = list.stream().filter(s->s.getI8()>overlimit.getIharm8()).collect(Collectors.toList());
+            if (!CollectionUtils.isEmpty(l8)){
+                i8++;
+            }
+            List<DataIPO> l9 = list.stream().filter(s->s.getI9()>overlimit.getIharm9()).collect(Collectors.toList());
+            if (!CollectionUtils.isEmpty(l9)){
+                i9++;
+            }
+            List<DataIPO> l10 = list.stream().filter(s->s.getI10()>overlimit.getIharm10()).collect(Collectors.toList());
+            if (!CollectionUtils.isEmpty(l10)){
+                i10++;
+            }
+            List<DataIPO> l11 = list.stream().filter(s->s.getI11()>overlimit.getIharm11()).collect(Collectors.toList());
+            if (!CollectionUtils.isEmpty(l11)){
+                i11++;
+            }
+            List<DataIPO> l12 = list.stream().filter(s->s.getI12()>overlimit.getIharm12()).collect(Collectors.toList());
+            if (!CollectionUtils.isEmpty(l12)){
+                i12++;
+            }
+            List<DataIPO> l13 = list.stream().filter(s->s.getI13()>overlimit.getIharm13()).collect(Collectors.toList());
+            if (!CollectionUtils.isEmpty(l13)){
+                i13++;
+            }
+            List<DataIPO> l14 = list.stream().filter(s->s.getI14()>overlimit.getIharm14()).collect(Collectors.toList());
+            if (!CollectionUtils.isEmpty(l14)){
+                i14++;
+            }
+            List<DataIPO> l15 = list.stream().filter(s->s.getI15()>overlimit.getIharm15()).collect(Collectors.toList());
+            if (!CollectionUtils.isEmpty(l15)){
+                i15++;
+            }
+            List<DataIPO> l16 = list.stream().filter(s->s.getI16()>overlimit.getIharm16()).collect(Collectors.toList());
+            if (!CollectionUtils.isEmpty(l16)){
+                i16++;
+            }
+            List<DataIPO> l17 = list.stream().filter(s->s.getI17()>overlimit.getIharm17()).collect(Collectors.toList());
+            if (!CollectionUtils.isEmpty(l17)){
+                i17++;
+            }
+            List<DataIPO> l18 = list.stream().filter(s->s.getI18()>overlimit.getIharm18()).collect(Collectors.toList());
+            if (!CollectionUtils.isEmpty(l18)){
+                i18++;
+            }
+            List<DataIPO> l19 = list.stream().filter(s->s.getI19()>overlimit.getIharm19()).collect(Collectors.toList());
+            if (!CollectionUtils.isEmpty(l19)){
+                i19++;
+            }
+            List<DataIPO> l20 = list.stream().filter(s->s.getI20()>overlimit.getIharm20()).collect(Collectors.toList());
+            if (!CollectionUtils.isEmpty(l20)){
+                i20++;
+            }
+            List<DataIPO> l21 = list.stream().filter(s->s.getI21()>overlimit.getIharm21()).collect(Collectors.toList());
+            if (!CollectionUtils.isEmpty(l21)){
+                i21++;
+            }
+            List<DataIPO> l22 = list.stream().filter(s->s.getI22()>overlimit.getIharm22()).collect(Collectors.toList());
+            if (!CollectionUtils.isEmpty(l22)){
+                i22++;
+            }
+            List<DataIPO> l23 = list.stream().filter(s->s.getI23()>overlimit.getIharm23()).collect(Collectors.toList());
+            if (!CollectionUtils.isEmpty(l23)){
+                i23++;
+            }
+            List<DataIPO> l24 = list.stream().filter(s->s.getI24()>overlimit.getIharm24()).collect(Collectors.toList());
+            if (!CollectionUtils.isEmpty(l24)){
+                i24++;
+            }
+            List<DataIPO> l25 = list.stream().filter(s->s.getI25()>overlimit.getIharm25()).collect(Collectors.toList());
+            if (!CollectionUtils.isEmpty(l25)){
+                i25++;
+            }
+        }
+        //0.5-15.5次间谐波电压含有率
+        for (Instant time:map3.keySet()) {
+            List<DataInHarmVPO> list3 = map3.get(time);
+            List<DataInHarmVPO> l2 = list3.stream().filter(s->s.getV1()>overlimit.getInuharm1()).collect(Collectors.toList());
+            if (!CollectionUtils.isEmpty(l2)){
+                uHarm1++;
+            }
+            List<DataInHarmVPO> l3 = list3.stream().filter(s->s.getV2()>overlimit.getInuharm2()).collect(Collectors.toList());
+            if (!CollectionUtils.isEmpty(l3)){
+                uHarm2++;
+            }
+            List<DataInHarmVPO> l4 = list3.stream().filter(s->s.getV3()>overlimit.getInuharm3()).collect(Collectors.toList());
+            if (!CollectionUtils.isEmpty(l4)){
+                uHarm3++;
+            }
+            List<DataInHarmVPO> l5 = list3.stream().filter(s->s.getV4()>overlimit.getInuharm4()).collect(Collectors.toList());
+            if (!CollectionUtils.isEmpty(l5)){
+                uHarm4++;
+            }
+            List<DataInHarmVPO> l6 = list3.stream().filter(s->s.getV5()>overlimit.getInuharm5()).collect(Collectors.toList());
+            if (!CollectionUtils.isEmpty(l6)){
+                uHarm5++;
+            }
+            List<DataInHarmVPO> l7 = list3.stream().filter(s->s.getV6()>overlimit.getInuharm6()).collect(Collectors.toList());
+            if (!CollectionUtils.isEmpty(l7)){
+                uHarm6++;
+            }
+            List<DataInHarmVPO> l8 = list3.stream().filter(s->s.getV7()>overlimit.getInuharm7()).collect(Collectors.toList());
+            if (!CollectionUtils.isEmpty(l8)){
+                uHarm7++;
+            }
+            List<DataInHarmVPO> l9 = list3.stream().filter(s->s.getV8()>overlimit.getInuharm8()).collect(Collectors.toList());
+            if (!CollectionUtils.isEmpty(l9)){
+                uHarm8++;
+            }
+            List<DataInHarmVPO> l10 = list3.stream().filter(s->s.getV9()>overlimit.getInuharm9()).collect(Collectors.toList());
+            if (!CollectionUtils.isEmpty(l10)){
+                uHarm9++;
+            }
+            List<DataInHarmVPO> l11 = list3.stream().filter(s->s.getV10()>overlimit.getInuharm10()).collect(Collectors.toList());
+            if (!CollectionUtils.isEmpty(l11)){
+                uHarm10++;
+            }
+            List<DataInHarmVPO> l12 = list3.stream().filter(s->s.getV11()>overlimit.getInuharm11()).collect(Collectors.toList());
+            if (!CollectionUtils.isEmpty(l12)){
+                uHarm11++;
+            }
+            List<DataInHarmVPO> l13 = list3.stream().filter(s->s.getV12()>overlimit.getInuharm12()).collect(Collectors.toList());
+            if (!CollectionUtils.isEmpty(l13)){
+                uHarm12++;
+            }
+            List<DataInHarmVPO> l14 = list3.stream().filter(s->s.getV13()>overlimit.getInuharm13()).collect(Collectors.toList());
+            if (!CollectionUtils.isEmpty(l14)){
+                uHarm13++;
+            }
+            List<DataInHarmVPO> l15 = list3.stream().filter(s->s.getV14()>overlimit.getInuharm14()).collect(Collectors.toList());
+            if (!CollectionUtils.isEmpty(l15)){
+                uHarm14++;
+            }
+            List<DataInHarmVPO> l16 = list3.stream().filter(s->s.getV15()>overlimit.getInuharm15()).collect(Collectors.toList());
+            if (!CollectionUtils.isEmpty(l16)){
+                uHarm15++;
+            }
+            List<DataInHarmVPO> l17 = list3.stream().filter(s->s.getV16()>overlimit.getInuharm16()).collect(Collectors.toList());
+            if (!CollectionUtils.isEmpty(l17)){
+                uHarm16++;
+            }
+        }
+        //电压总谐波畸变率
+        for (Instant time:map4.keySet()) {
+            List<DataVPO> list = map4.get(time);
+            List<DataVPO> l = list.stream().filter(s->s.getVThd()>overlimit.getUaberrance()).collect(Collectors.toList());
+            if (!CollectionUtils.isEmpty(l)){
+                thd++;
+            }
+        }
+        //三相电压不平衡度
+        for (Instant time:map5.keySet()) {
+            List<DataVPO> list = map5.get(time);
+            List<DataVPO> l = list.stream().filter(s->s.getVUnbalance()>overlimit.getUbalance()).collect(Collectors.toList());
+            if (!CollectionUtils.isEmpty(l)){
+                uAberrance++;
+            }
+        }
+        //负序电流
+        for (Instant time:map6.keySet()) {
+            List<DataIPO> list = map6.get(time);
+            List<DataIPO> l = list.stream().filter(s->s.getINeg()>overlimit.getINeg()).collect(Collectors.toList());
+            if (!CollectionUtils.isEmpty(l)){
+                iNeg++;
+            }
+        }
+        //频率偏差
+        for (Instant time:map7.keySet()) {
+            List<DataVPO> list = map7.get(time);
+            List<DataVPO> l = list.stream().filter(s->s.getFreqDev()>overlimit.getFreqDev()).collect(Collectors.toList());
+            if (!CollectionUtils.isEmpty(l)){
+                freqDev++;
+            }
+        }
+        //电压上偏差、电压下偏差
+        for (Instant time:map8.keySet()) {
+            List<DataVPO> list = map8.get(time);
+            Map<String,List<DataVPO>> devMap = list.stream().collect(Collectors.groupingBy(DataVPO::getValueType));
+            List<DataVPO> maxList = devMap.get("MAX");
+            List<DataVPO> minList = devMap.get("MIN");
+            List<DataVPO> l1 = maxList.stream().filter(s->s.getVuDev()>overlimit.getVoltageDev()).collect(Collectors.toList());
+            List<DataVPO> l2 = minList.stream().filter(s->s.getVlDev()>overlimit.getUvoltageDev()).collect(Collectors.toList());
+            if (!CollectionUtils.isEmpty(l1) || !CollectionUtils.isEmpty(l2)){
+                uDev++;
+            }
+        }
+        //长时间闪变
+        for (Instant time:map9.keySet()) {
+            List<DataPltPO> list = map9.get(time);
+            List<DataPltPO> l = list.stream().filter(s->s.getPlt()>overlimit.getFlicker()).collect(Collectors.toList());
+            if (!CollectionUtils.isEmpty(l)){
+                flicker++;
+            }
+        }
+        limitRate.setLineId(lineId);
+        limitRate.setPhasicType("T");
+        limitRate.setAllTime(allTime);
+        limitRate.setFlickerAllTime(flickerAllTime);
+        limitRate.setUAberranceOverTime(uAberrance);
+        limitRate.setINegOverTime(iNeg);
+        limitRate.setFreqDevOverTime(freqDev);
+        limitRate.setUHarm2OverTime(v2);
+        limitRate.setUHarm3OverTime(v3);
+        limitRate.setUHarm4OverTime(v4);
+        limitRate.setUHarm5OverTime(v5);
+        limitRate.setUHarm6OverTime(v6);
+        limitRate.setUHarm7OverTime(v7);
+        limitRate.setUHarm8OverTime(v8);
+        limitRate.setUHarm9OverTime(v9);
+        limitRate.setUHarm10OverTime(v10);
+        limitRate.setUHarm11OverTime(v11);
+        limitRate.setUHarm12OverTime(v12);
+        limitRate.setUHarm13OverTime(v13);
+        limitRate.setUHarm14OverTime(v14);
+        limitRate.setUHarm15OverTime(v15);
+        limitRate.setUHarm16OverTime(v16);
+        limitRate.setUHarm17OverTime(v17);
+        limitRate.setUHarm18OverTime(v18);
+        limitRate.setUHarm19OverTime(v19);
+        limitRate.setUHarm20OverTime(v20);
+        limitRate.setUHarm21OverTime(v21);
+        limitRate.setUHarm22OverTime(v22);
+        limitRate.setUHarm23OverTime(v23);
+        limitRate.setUHarm24OverTime(v24);
+        limitRate.setUHarm25OverTime(v25);
+        limitRate.setIHarm2OverTime(i2);
+        limitRate.setIHarm3OverTime(i3);
+        limitRate.setIHarm4OverTime(i4);
+        limitRate.setIHarm5OverTime(i5);
+        limitRate.setIHarm6OverTime(i6);
+        limitRate.setIHarm7OverTime(i7);
+        limitRate.setIHarm8OverTime(i8);
+        limitRate.setIHarm9OverTime(i9);
+        limitRate.setIHarm10OverTime(i10);
+        limitRate.setIHarm11OverTime(i11);
+        limitRate.setIHarm12OverTime(i12);
+        limitRate.setIHarm13OverTime(i13);
+        limitRate.setIHarm14OverTime(i14);
+        limitRate.setIHarm15OverTime(i15);
+        limitRate.setIHarm16OverTime(i16);
+        limitRate.setIHarm17OverTime(i17);
+        limitRate.setIHarm18OverTime(i18);
+        limitRate.setIHarm19OverTime(i19);
+        limitRate.setIHarm20OverTime(i20);
+        limitRate.setIHarm21OverTime(i21);
+        limitRate.setIHarm22OverTime(i22);
+        limitRate.setIHarm23OverTime(i23);
+        limitRate.setIHarm24OverTime(i24);
+        limitRate.setIHarm25OverTime(i25);
+        limitRate.setInuHarm1OverTime(uHarm1);
+        limitRate.setInuHarm2OverTime(uHarm2);
+        limitRate.setInuHarm3OverTime(uHarm3);
+        limitRate.setInuHarm4OverTime(uHarm4);
+        limitRate.setInuHarm5OverTime(uHarm5);
+        limitRate.setInuHarm6OverTime(uHarm6);
+        limitRate.setInuHarm7OverTime(uHarm7);
+        limitRate.setInuHarm8OverTime(uHarm8);
+        limitRate.setInuHarm9OverTime(uHarm9);
+        limitRate.setInuHarm10OverTime(uHarm10);
+        limitRate.setInuHarm11OverTime(uHarm11);
+        limitRate.setInuHarm12OverTime(uHarm12);
+        limitRate.setInuHarm13OverTime(uHarm13);
+        limitRate.setInuHarm14OverTime(uHarm14);
+        limitRate.setInuHarm15OverTime(uHarm15);
+        limitRate.setInuHarm16OverTime(uHarm16);
+        limitRate.setUBalanceOverTime(thd);
+        limitRate.setVoltageDevOverTime(uDev);
+        limitRate.setFlickerOverTime(flicker);
+        return limitRate;
+    }
+
+
+    /** 
+    * @Description: 插入influxdb
+    * @Param: [list, time] 
+    * @return: void 
+    * @Author: clam
+    * @Date: 2022/10/21 
+    */ 
+    private void insert(List<LimitRate> list, long time){
+        List<String> records = new ArrayList<>();
+        list.forEach(item->{
+            Map<String, String> tags = new HashMap<>();
+            Map<String, Object> fields = new HashMap<>();
+            tags.put("line_id",item.getLineId());
+            tags.put("phasic_type",item.getPhasicType());
+            fields.put("all_time",item.getAllTime());
+            fields.put("flicker_all_time",item.getFlickerAllTime());
+            fields.put("flicker_overtime",item.getFlickerOverTime());
+            fields.put("freq_dev_overtime",item.getFreqDevOverTime());
+            fields.put("ubalance_overtime",item.getUBalanceOverTime());
+            fields.put("uaberrance_overtime",item.getUAberranceOverTime());
+            fields.put("i_neg_overtime",item.getINegOverTime());
+            fields.put("voltage_dev_overtime",item.getVoltageDevOverTime());
+            fields.put("uharm_2_overtime",item.getUHarm2OverTime());
+            fields.put("uharm_3_overtime",item.getUHarm3OverTime());
+            fields.put("uharm_4_overtime",item.getUHarm4OverTime());
+            fields.put("uharm_5_overtime",item.getUHarm5OverTime());
+            fields.put("uharm_6_overtime",item.getUHarm6OverTime());
+            fields.put("uharm_7_overtime",item.getUHarm7OverTime());
+            fields.put("uharm_8_overtime",item.getUHarm8OverTime());
+            fields.put("uharm_9_overtime",item.getUHarm9OverTime());
+            fields.put("uharm_10_overtime",item.getUHarm10OverTime());
+            fields.put("uharm_11_overtime",item.getUHarm11OverTime());
+            fields.put("uharm_12_overtime",item.getUHarm12OverTime());
+            fields.put("uharm_13_overtime",item.getUHarm13OverTime());
+            fields.put("uharm_14_overtime",item.getUHarm14OverTime());
+            fields.put("uharm_15_overtime",item.getUHarm15OverTime());
+            fields.put("uharm_16_overtime",item.getUHarm16OverTime());
+            fields.put("uharm_17_overtime",item.getUHarm17OverTime());
+            fields.put("uharm_18_overtime",item.getUHarm18OverTime());
+            fields.put("uharm_19_overtime",item.getUHarm19OverTime());
+            fields.put("uharm_20_overtime",item.getUHarm20OverTime());
+            fields.put("uharm_21_overtime",item.getUHarm21OverTime());
+            fields.put("uharm_22_overtime",item.getUHarm22OverTime());
+            fields.put("uharm_23_overtime",item.getUHarm23OverTime());
+            fields.put("uharm_24_overtime",item.getUHarm24OverTime());
+            fields.put("uharm_25_overtime",item.getUHarm25OverTime());
+            fields.put("iharm_2_overtime",item.getIHarm2OverTime());
+            fields.put("iharm_3_overtime",item.getIHarm3OverTime());
+            fields.put("iharm_4_overtime",item.getIHarm4OverTime());
+            fields.put("iharm_5_overtime",item.getIHarm5OverTime());
+            fields.put("iharm_6_overtime",item.getIHarm6OverTime());
+            fields.put("iharm_7_overtime",item.getIHarm7OverTime());
+            fields.put("iharm_8_overtime",item.getIHarm8OverTime());
+            fields.put("iharm_9_overtime",item.getIHarm9OverTime());
+            fields.put("iharm_10_overtime",item.getIHarm10OverTime());
+            fields.put("iharm_11_overtime",item.getIHarm11OverTime());
+            fields.put("iharm_12_overtime",item.getIHarm12OverTime());
+            fields.put("iharm_13_overtime",item.getIHarm13OverTime());
+            fields.put("iharm_14_overtime",item.getIHarm14OverTime());
+            fields.put("iharm_15_overtime",item.getIHarm15OverTime());
+            fields.put("iharm_16_overtime",item.getIHarm16OverTime());
+            fields.put("iharm_17_overtime",item.getIHarm17OverTime());
+            fields.put("iharm_18_overtime",item.getIHarm18OverTime());
+            fields.put("iharm_19_overtime",item.getIHarm19OverTime());
+            fields.put("iharm_20_overtime",item.getIHarm20OverTime());
+            fields.put("iharm_21_overtime",item.getIHarm21OverTime());
+            fields.put("iharm_22_overtime",item.getIHarm22OverTime());
+            fields.put("iharm_23_overtime",item.getIHarm23OverTime());
+            fields.put("iharm_24_overtime",item.getIHarm24OverTime());
+            fields.put("iharm_25_overtime",item.getIHarm25OverTime());
+            fields.put("inuharm_1_overtime",item.getInuHarm1OverTime());
+            fields.put("inuharm_2_overtime",item.getInuHarm2OverTime());
+            fields.put("inuharm_3_overtime",item.getInuHarm3OverTime());
+            fields.put("inuharm_4_overtime",item.getInuHarm4OverTime());
+            fields.put("inuharm_5_overtime",item.getInuHarm5OverTime());
+            fields.put("inuharm_6_overtime",item.getInuHarm6OverTime());
+            fields.put("inuharm_7_overtime",item.getInuHarm7OverTime());
+            fields.put("inuharm_8_overtime",item.getInuHarm8OverTime());
+            fields.put("inuharm_9_overtime",item.getInuHarm9OverTime());
+            fields.put("inuharm_10_overtime",item.getInuHarm10OverTime());
+            fields.put("inuharm_11_overtime",item.getInuHarm11OverTime());
+            fields.put("inuharm_12_overtime",item.getInuHarm12OverTime());
+            fields.put("inuharm_13_overtime",item.getInuHarm13OverTime());
+            fields.put("inuharm_14_overtime",item.getInuHarm14OverTime());
+            fields.put("inuharm_15_overtime",item.getInuHarm15OverTime());
+            fields.put("inuharm_16_overtime",item.getInuHarm16OverTime());
+            Point point = influxDbUtils.pointBuilder(InfluxDBPublicParam.LIMIT_RATE, time, TimeUnit.MILLISECONDS, tags, fields);
+            BatchPoints batchPoints = BatchPoints.database(influxDbUtils.getDbName ()).tag(InfluxDBPublicParam.LINE_ID, item.getLineId()).tag(InfluxDBPublicParam.PHASIC_TYPE,item.getPhasicType()).retentionPolicy("").consistency(InfluxDB.ConsistencyLevel.ALL).build();
+            batchPoints.point(point);
+            records.add(batchPoints.lineProtocol());
+        });
+        influxDbUtils.batchInsert(influxDbUtils.getDbName (),"", InfluxDB.ConsistencyLevel.ALL, records);
+    }
+
+    public static void main(String[] args) {
+        LimitRate limitRate = new LimitRate();
+        limitRate.setAllTime (0);
+        limitRate.setFlickerAllTime (0);
+        LimitRatePO limitRatePO = new LimitRatePO ();
+        BeanUtils.copyProperties (limitRate, limitRatePO);
+        System.out.println ("limitRatePO:"+ limitRatePO.getAllTime ());
+    }
+
+
+
+}
diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/Impl/line/LimitTargetServiceImpl.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/Impl/line/LimitTargetServiceImpl.java
new file mode 100644
index 000000000..9584c6d7a
--- /dev/null
+++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/Impl/line/LimitTargetServiceImpl.java
@@ -0,0 +1,163 @@
+package com.njcn.prepare.harmonic.service.Impl.line;
+
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.StrUtil;
+import com.njcn.harmonic.pojo.po.LimitRate;
+import com.njcn.influxdb.utils.InfluxDbUtils;
+import com.njcn.prepare.harmonic.pojo.param.LineParam;
+import com.njcn.prepare.harmonic.service.line.LimitTargetService;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.influxdb.InfluxDB;
+import org.influxdb.dto.BatchPoints;
+import org.influxdb.dto.Point;
+import org.influxdb.dto.QueryResult;
+import org.influxdb.impl.InfluxDBResultMapper;
+import org.springframework.stereotype.Service;
+
+import java.util.*;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * 生成limit_target表
+ *
+ * @author xiaoyao
+ * @version 1.0.0
+ * @createTime 2022/10/26 13:41
+ */
+@Slf4j
+@Service
+@AllArgsConstructor
+public class LimitTargetServiceImpl implements LimitTargetService {
+
+    private final InfluxDbUtils influxDbUtils;
+
+    @Override
+    public void getLimitTargetData(LineParam lineParam) {
+        List<String> records;
+        Date dateOut = DateUtil.parse(lineParam.getDataDate());
+        if (CollUtil.isEmpty(lineParam.getLineIds())){
+            List<LimitRate> limitRateData = getLimitRateData(null,lineParam.getDataDate());
+            records = processOutData(limitRateData,dateOut);
+        }else {
+            List<LimitRate> limitRateData = new ArrayList<>();
+            for (String lineId : lineParam.getLineIds()){
+                List<LimitRate> limitRateOut = getLimitRateData(lineId,lineParam.getDataDate());
+                limitRateData.addAll(limitRateOut);
+            }
+            records = processOutData(limitRateData,dateOut);
+        }
+        influxDbUtils.batchInsert(influxDbUtils.getDbName(),"", InfluxDB.ConsistencyLevel.ALL, records);
+    }
+
+    private List<LimitRate> getLimitRateData(String lineId,String date){
+        StringBuilder sql = new StringBuilder();
+        sql.append("SELECT * FROM limit_rate WHERE time >= '").append(date).append(" 00:00:00' and time <= '")
+                .append(date).append(" 23:59:59' ").append(" and phasic_type = 'T'");
+        if (StrUtil.isNotBlank(lineId)) {
+            sql.append(" and line_id = '").append(lineId).append("'");
+        }
+        sql.append(" tz('Asia/Shanghai')");
+        QueryResult sqlResult = influxDbUtils.query(sql.toString());
+        InfluxDBResultMapper resultMapper = new InfluxDBResultMapper();
+        return resultMapper.toPOJO(sqlResult, LimitRate.class);
+    }
+
+    private List<String> processOutData(List<LimitRate> limitRateData,Date dateOut){
+        List<String> records = new ArrayList<>();
+        for (LimitRate limitRate : limitRateData){
+            Map<String, String> tags = processTagDate(limitRate);
+            Map<String, Object> fields = processFieldsDate(limitRate);
+            Point point = influxDbUtils.pointBuilder("limit_target", dateOut.getTime(), TimeUnit.MILLISECONDS,tags, fields);
+            BatchPoints batchPoints = BatchPoints.database(influxDbUtils.getDbName()).tag("line_id", limitRate.getLineId()).retentionPolicy("").consistency(InfluxDB.ConsistencyLevel.ALL).build();
+            batchPoints.point(point);
+            records.add(batchPoints.lineProtocol());
+        }
+        return records;
+    }
+
+    private Map<String, String> processTagDate(LimitRate limitRate){
+        Map<String, String> tags = new HashMap<>();
+        tags.put("line_id",limitRate.getLineId());
+        tags.put("phasic_type",limitRate.getPhasicType());
+        return tags;
+    }
+
+    private Map<String, Object> processFieldsDate(LimitRate limitRate){
+        Map<String, Object> fields = new HashMap<>();
+        fields.put("alltime",limitRate.getAllTime());
+        fields.put("flicker_alltime",limitRate.getFlickerAllTime());
+        fields.put("freq_dev_overtime",(limitRate.getFreqDevOverTime()>1)?1:0);
+        fields.put("voltage_dev_overtime",(limitRate.getVoltageDevOverTime()>1)?1:0);
+        fields.put("ubalance_overtime",(limitRate.getUBalanceOverTime()>1)?1:0);
+        fields.put("flicker_overtime",(limitRate.getFlickerOverTime()>1)?1:0);
+        fields.put("uaberrance_overtime",(limitRate.getUAberranceOverTime()>1)?1:0);
+        fields.put("i_neg_overtime",(limitRate.getINegOverTime()>1)?1:0);
+        fields.put("uharm_2_overtime",(limitRate.getUHarm2OverTime()>1)?1:0);
+        fields.put("uharm_3_overtime",(limitRate.getUHarm3OverTime()>1)?1:0);
+        fields.put("uharm_4_overtime",(limitRate.getUHarm4OverTime()>1)?1:0);
+        fields.put("uharm_5_overtime",(limitRate.getUHarm5OverTime()>1)?1:0);
+        fields.put("uharm_6_overtime",(limitRate.getUHarm6OverTime()>1)?1:0);
+        fields.put("uharm_7_overtime",(limitRate.getUHarm7OverTime()>1)?1:0);
+        fields.put("uharm_8_overtime",(limitRate.getUHarm8OverTime()>1)?1:0);
+        fields.put("uharm_9_overtime",(limitRate.getUHarm9OverTime()>1)?1:0);
+        fields.put("uharm_10_overtime",(limitRate.getUHarm10OverTime()>1)?1:0);
+        fields.put("uharm_11_overtime",(limitRate.getUHarm11OverTime()>1)?1:0);
+        fields.put("uharm_12_overtime",(limitRate.getUHarm12OverTime()>1)?1:0);
+        fields.put("uharm_13_overtime",(limitRate.getUHarm13OverTime()>1)?1:0);
+        fields.put("uharm_14_overtime",(limitRate.getUHarm14OverTime()>1)?1:0);
+        fields.put("uharm_15_overtime",(limitRate.getUHarm15OverTime()>1)?1:0);
+        fields.put("uharm_16_overtime",(limitRate.getUHarm16OverTime()>1)?1:0);
+        fields.put("uharm_17_overtime",(limitRate.getUHarm17OverTime()>1)?1:0);
+        fields.put("uharm_18_overtime",(limitRate.getUHarm18OverTime()>1)?1:0);
+        fields.put("uharm_19_overtime",(limitRate.getUHarm19OverTime()>1)?1:0);
+        fields.put("uharm_20_overtime",(limitRate.getUHarm20OverTime()>1)?1:0);
+        fields.put("uharm_21_overtime",(limitRate.getUHarm21OverTime()>1)?1:0);
+        fields.put("uharm_22_overtime",(limitRate.getUHarm22OverTime()>1)?1:0);
+        fields.put("uharm_23_overtime",(limitRate.getUHarm23OverTime()>1)?1:0);
+        fields.put("uharm_24_overtime",(limitRate.getUHarm24OverTime()>1)?1:0);
+        fields.put("uharm_25_overtime",(limitRate.getUHarm25OverTime()>1)?1:0);
+        fields.put("iharm_2_overtime",(limitRate.getIHarm2OverTime()>1)?1:0);
+        fields.put("iharm_3_overtime",(limitRate.getIHarm3OverTime()>1)?1:0);
+        fields.put("iharm_4_overtime",(limitRate.getIHarm4OverTime()>1)?1:0);
+        fields.put("iharm_5_overtime",(limitRate.getIHarm5OverTime()>1)?1:0);
+        fields.put("iharm_6_overtime",(limitRate.getIHarm6OverTime()>1)?1:0);
+        fields.put("iharm_7_overtime",(limitRate.getIHarm7OverTime()>1)?1:0);
+        fields.put("iharm_8_overtime",(limitRate.getIHarm8OverTime()>1)?1:0);
+        fields.put("iharm_9_overtime",(limitRate.getIHarm9OverTime()>1)?1:0);
+        fields.put("iharm_10_overtime",(limitRate.getIHarm10OverTime()>1)?1:0);
+        fields.put("iharm_11_overtime",(limitRate.getIHarm11OverTime()>1)?1:0);
+        fields.put("iharm_12_overtime",(limitRate.getIHarm12OverTime()>1)?1:0);
+        fields.put("iharm_13_overtime",(limitRate.getIHarm13OverTime()>1)?1:0);
+        fields.put("iharm_14_overtime",(limitRate.getIHarm14OverTime()>1)?1:0);
+        fields.put("iharm_15_overtime",(limitRate.getIHarm15OverTime()>1)?1:0);
+        fields.put("iharm_16_overtime",(limitRate.getIHarm16OverTime()>1)?1:0);
+        fields.put("iharm_17_overtime",(limitRate.getIHarm17OverTime()>1)?1:0);
+        fields.put("iharm_18_overtime",(limitRate.getIHarm18OverTime()>1)?1:0);
+        fields.put("iharm_19_overtime",(limitRate.getIHarm19OverTime()>1)?1:0);
+        fields.put("iharm_20_overtime",(limitRate.getIHarm20OverTime()>1)?1:0);
+        fields.put("iharm_21_overtime",(limitRate.getIHarm21OverTime()>1)?1:0);
+        fields.put("iharm_22_overtime",(limitRate.getIHarm22OverTime()>1)?1:0);
+        fields.put("iharm_23_overtime",(limitRate.getIHarm23OverTime()>1)?1:0);
+        fields.put("iharm_24_overtime",(limitRate.getIHarm24OverTime()>1)?1:0);
+        fields.put("iharm_25_overtime",(limitRate.getIHarm25OverTime()>1)?1:0);
+        fields.put("inuharm_1_overtime",(limitRate.getInuHarm1OverTime()>1)?1:0);
+        fields.put("inuharm_2_overtime",(limitRate.getInuHarm2OverTime()>1)?1:0);
+        fields.put("inuharm_3_overtime",(limitRate.getInuHarm3OverTime()>1)?1:0);
+        fields.put("inuharm_4_overtime",(limitRate.getInuHarm4OverTime()>1)?1:0);
+        fields.put("inuharm_5_overtime",(limitRate.getInuHarm5OverTime()>1)?1:0);
+        fields.put("inuharm_6_overtime",(limitRate.getInuHarm6OverTime()>1)?1:0);
+        fields.put("inuharm_7_overtime",(limitRate.getInuHarm7OverTime()>1)?1:0);
+        fields.put("inuharm_8_overtime",(limitRate.getInuHarm8OverTime()>1)?1:0);
+        fields.put("inuharm_9_overtime",(limitRate.getInuHarm9OverTime()>1)?1:0);
+        fields.put("inuharm_10_overtime",(limitRate.getInuHarm10OverTime()>1)?1:0);
+        fields.put("inuharm_11_overtime",(limitRate.getInuHarm11OverTime()>1)?1:0);
+        fields.put("inuharm_12_overtime",(limitRate.getInuHarm12OverTime()>1)?1:0);
+        fields.put("inuharm_13_overtime",(limitRate.getInuHarm13OverTime()>1)?1:0);
+        fields.put("inuharm_14_overtime",(limitRate.getInuHarm14OverTime()>1)?1:0);
+        fields.put("inuharm_15_overtime",(limitRate.getInuHarm15OverTime()>1)?1:0);
+        fields.put("inuharm_16_overtime",(limitRate.getInuHarm16OverTime()>1)?1:0);
+        return fields;
+    }
+}
diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/Impl/line/NormalLimitServiceImpl.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/Impl/line/NormalLimitServiceImpl.java
new file mode 100644
index 000000000..582842f6c
--- /dev/null
+++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/Impl/line/NormalLimitServiceImpl.java
@@ -0,0 +1,755 @@
+package com.njcn.prepare.harmonic.service.Impl.line;
+
+import cn.hutool.core.date.DateTime;
+import cn.hutool.core.date.DateUtil;
+import com.njcn.common.pojo.dto.SimpleDTO;
+import com.njcn.common.pojo.enums.common.ServerEnum;
+import com.njcn.device.pq.api.GeneralDeviceInfoClient;
+import com.njcn.device.pq.api.LineFeignClient;
+import com.njcn.device.pq.pojo.dto.GeneralDeviceDTO;
+import com.njcn.device.pq.pojo.param.DeviceInfoParam;
+import com.njcn.device.pq.pojo.po.Overlimit;
+import com.njcn.influxdb.param.InfluxDBPublicParam;
+import com.njcn.influxdb.utils.InfluxDbUtils;
+import com.njcn.prepare.harmonic.mapper.line.AbnormalMapper;
+import com.njcn.prepare.harmonic.pojo.po.AbnormalPO;
+import com.njcn.prepare.harmonic.pojo.vo.AbnormalVO;
+import com.njcn.prepare.harmonic.service.line.NormalLimitService;
+import com.njcn.web.utils.RequestUtil;
+import lombok.AllArgsConstructor;
+import org.influxdb.dto.QueryResult;
+import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
+
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author denghuajun
+ * @version 1.0.0
+ * @date 2022年10月17日 19:59
+ */
+
+@Service
+@AllArgsConstructor
+public class NormalLimitServiceImpl implements NormalLimitService {
+
+    private final GeneralDeviceInfoClient generalDeviceInfoClient;
+
+    private final LineFeignClient lineFeignClient;
+
+    private final InfluxDbUtils influxDbUtils;
+
+    private final AbnormalMapper abnormalMapper;
+
+    @Override
+    public String getNormLimitData() {
+
+        List<String> lineIds = new ArrayList<>();
+        DeviceInfoParam deviceInfoParam = new DeviceInfoParam();
+        deviceInfoParam.setDeptIndex(RequestUtil.getDeptIndex());
+        deviceInfoParam.setPowerFlag(2);
+        deviceInfoParam.setMonitorFlag(2);
+        deviceInfoParam.setServerName(ServerEnum.HARMONIC.getName());
+        SimpleDTO simpleDTO = new SimpleDTO();
+        simpleDTO.setName("电网拓扑");
+        simpleDTO.setSort(0);
+        simpleDTO.setCode("Power_Network");
+        deviceInfoParam.setStatisticalType(simpleDTO);
+        //处理监测点
+        List<GeneralDeviceDTO> deviceDataList = generalDeviceInfoClient.getPracticalAllDeviceInfo(deviceInfoParam).getData();
+        for (GeneralDeviceDTO generalDeviceDTO : deviceDataList) {
+            lineIds.addAll(generalDeviceDTO.getLineIndexes());
+        }
+        if (!lineIds.isEmpty()) {
+            for (String lineIndex : lineIds) {
+                //获取当前监测点的限值详情
+                Overlimit overlimit = lineFeignClient.getOverLimitData(lineIndex).getData();
+                for (int i = 1; i < 5; i++) {
+                    for (int j = 1; j < 5; j++) {
+                        //电压上偏差
+                        List<AbnormalVO> voDev = getConntion(i, j, DateUtil.beginOfDay(DateUtil.yesterday()), DateUtil.endOfDay(DateUtil.yesterday()), lineIndex, 1);
+                        //电压下偏差
+                        List<AbnormalVO> uoDev = getConntion(i, j, DateUtil.beginOfDay(DateUtil.yesterday()), DateUtil.endOfDay(DateUtil.yesterday()), lineIndex, 2);
+                        //三相电压不平衡度
+                        List<AbnormalVO> uba = getConntion(i, j, DateUtil.beginOfDay(DateUtil.yesterday()), DateUtil.endOfDay(DateUtil.yesterday()), lineIndex, 3);
+                        //电压总畸变率
+                        List<AbnormalVO> uab = getConntion(i, j, DateUtil.beginOfDay(DateUtil.yesterday()), DateUtil.endOfDay(DateUtil.yesterday()), lineIndex, 4);
+                        //负序电流
+                        List<AbnormalVO> ing = getConntion(i, j, DateUtil.beginOfDay(DateUtil.yesterday()), DateUtil.endOfDay(DateUtil.yesterday()), lineIndex, 5);
+                        //频率
+                        List<AbnormalVO> freq = getConntion(i, j, DateUtil.beginOfDay(DateUtil.yesterday()), DateUtil.endOfDay(DateUtil.yesterday()), lineIndex, 6);
+                        //2-25次谐波含有率
+                        //谐波电压含有率
+                        List<AbnormalVO> uharm2 = getConntion(i, j, DateUtil.beginOfDay(DateUtil.yesterday()), DateUtil.endOfDay(DateUtil.yesterday()), lineIndex, 7);
+                        List<AbnormalVO> uharm3 = getConntion(i, j, DateUtil.beginOfDay(DateUtil.yesterday()), DateUtil.endOfDay(DateUtil.yesterday()), lineIndex, 8);
+                        List<AbnormalVO> uharm4 = getConntion(i, j, DateUtil.beginOfDay(DateUtil.yesterday()), DateUtil.endOfDay(DateUtil.yesterday()), lineIndex, 9);
+                        List<AbnormalVO> uharm5 = getConntion(i, j, DateUtil.beginOfDay(DateUtil.yesterday()), DateUtil.endOfDay(DateUtil.yesterday()), lineIndex, 10);
+                        List<AbnormalVO> uharm6 = getConntion(i, j, DateUtil.beginOfDay(DateUtil.yesterday()), DateUtil.endOfDay(DateUtil.yesterday()), lineIndex, 11);
+                        List<AbnormalVO> uharm7 = getConntion(i, j, DateUtil.beginOfDay(DateUtil.yesterday()), DateUtil.endOfDay(DateUtil.yesterday()), lineIndex, 12);
+                        List<AbnormalVO> uharm8 = getConntion(i, j, DateUtil.beginOfDay(DateUtil.yesterday()), DateUtil.endOfDay(DateUtil.yesterday()), lineIndex, 13);
+                        List<AbnormalVO> uharm9 = getConntion(i, j, DateUtil.beginOfDay(DateUtil.yesterday()), DateUtil.endOfDay(DateUtil.yesterday()), lineIndex, 14);
+                        List<AbnormalVO> uharm10 = getConntion(i, j, DateUtil.beginOfDay(DateUtil.yesterday()), DateUtil.endOfDay(DateUtil.yesterday()), lineIndex, 15);
+                        List<AbnormalVO> uharm11 = getConntion(i, j, DateUtil.beginOfDay(DateUtil.yesterday()), DateUtil.endOfDay(DateUtil.yesterday()), lineIndex, 16);
+                        List<AbnormalVO> uharm12 = getConntion(i, j, DateUtil.beginOfDay(DateUtil.yesterday()), DateUtil.endOfDay(DateUtil.yesterday()), lineIndex, 17);
+                        List<AbnormalVO> uharm13 = getConntion(i, j, DateUtil.beginOfDay(DateUtil.yesterday()), DateUtil.endOfDay(DateUtil.yesterday()), lineIndex, 18);
+                        List<AbnormalVO> uharm14 = getConntion(i, j, DateUtil.beginOfDay(DateUtil.yesterday()), DateUtil.endOfDay(DateUtil.yesterday()), lineIndex, 19);
+                        List<AbnormalVO> uharm15 = getConntion(i, j, DateUtil.beginOfDay(DateUtil.yesterday()), DateUtil.endOfDay(DateUtil.yesterday()), lineIndex, 20);
+                        List<AbnormalVO> uharm16 = getConntion(i, j, DateUtil.beginOfDay(DateUtil.yesterday()), DateUtil.endOfDay(DateUtil.yesterday()), lineIndex, 21);
+                        List<AbnormalVO> uharm17 = getConntion(i, j, DateUtil.beginOfDay(DateUtil.yesterday()), DateUtil.endOfDay(DateUtil.yesterday()), lineIndex, 22);
+                        List<AbnormalVO> uharm18 = getConntion(i, j, DateUtil.beginOfDay(DateUtil.yesterday()), DateUtil.endOfDay(DateUtil.yesterday()), lineIndex, 23);
+                        List<AbnormalVO> uharm19 = getConntion(i, j, DateUtil.beginOfDay(DateUtil.yesterday()), DateUtil.endOfDay(DateUtil.yesterday()), lineIndex, 24);
+                        List<AbnormalVO> uharm20 = getConntion(i, j, DateUtil.beginOfDay(DateUtil.yesterday()), DateUtil.endOfDay(DateUtil.yesterday()), lineIndex, 25);
+                        List<AbnormalVO> uharm21 = getConntion(i, j, DateUtil.beginOfDay(DateUtil.yesterday()), DateUtil.endOfDay(DateUtil.yesterday()), lineIndex, 26);
+                        List<AbnormalVO> uharm22 = getConntion(i, j, DateUtil.beginOfDay(DateUtil.yesterday()), DateUtil.endOfDay(DateUtil.yesterday()), lineIndex, 27);
+                        List<AbnormalVO> uharm23 = getConntion(i, j, DateUtil.beginOfDay(DateUtil.yesterday()), DateUtil.endOfDay(DateUtil.yesterday()), lineIndex, 28);
+                        List<AbnormalVO> uharm24 = getConntion(i, j, DateUtil.beginOfDay(DateUtil.yesterday()), DateUtil.endOfDay(DateUtil.yesterday()), lineIndex, 29);
+                        List<AbnormalVO> uharm25 = getConntion(i, j, DateUtil.beginOfDay(DateUtil.yesterday()), DateUtil.endOfDay(DateUtil.yesterday()), lineIndex, 30);
+
+
+                        //2-25次谐波电流幅值
+                        List<AbnormalVO> iharm2 = getConntion(i, j, DateUtil.beginOfDay(DateUtil.yesterday()), DateUtil.endOfDay(DateUtil.yesterday()), lineIndex, 31);
+                        List<AbnormalVO> iharm3 = getConntion(i, j, DateUtil.beginOfDay(DateUtil.yesterday()), DateUtil.endOfDay(DateUtil.yesterday()), lineIndex, 32);
+                        List<AbnormalVO> iharm4 = getConntion(i, j, DateUtil.beginOfDay(DateUtil.yesterday()), DateUtil.endOfDay(DateUtil.yesterday()), lineIndex, 33);
+                        List<AbnormalVO> iharm5 = getConntion(i, j, DateUtil.beginOfDay(DateUtil.yesterday()), DateUtil.endOfDay(DateUtil.yesterday()), lineIndex, 34);
+                        List<AbnormalVO> iharm6 = getConntion(i, j, DateUtil.beginOfDay(DateUtil.yesterday()), DateUtil.endOfDay(DateUtil.yesterday()), lineIndex, 35);
+                        List<AbnormalVO> iharm7 = getConntion(i, j, DateUtil.beginOfDay(DateUtil.yesterday()), DateUtil.endOfDay(DateUtil.yesterday()), lineIndex, 36);
+                        List<AbnormalVO> iharm8 = getConntion(i, j, DateUtil.beginOfDay(DateUtil.yesterday()), DateUtil.endOfDay(DateUtil.yesterday()), lineIndex, 37);
+                        List<AbnormalVO> iharm9 = getConntion(i, j, DateUtil.beginOfDay(DateUtil.yesterday()), DateUtil.endOfDay(DateUtil.yesterday()), lineIndex, 38);
+                        List<AbnormalVO> iharm10 = getConntion(i, j, DateUtil.beginOfDay(DateUtil.yesterday()), DateUtil.endOfDay(DateUtil.yesterday()), lineIndex, 39);
+                        List<AbnormalVO> iharm11 = getConntion(i, j, DateUtil.beginOfDay(DateUtil.yesterday()), DateUtil.endOfDay(DateUtil.yesterday()), lineIndex, 40);
+                        List<AbnormalVO> iharm12 = getConntion(i, j, DateUtil.beginOfDay(DateUtil.yesterday()), DateUtil.endOfDay(DateUtil.yesterday()), lineIndex, 41);
+                        List<AbnormalVO> iharm13 = getConntion(i, j, DateUtil.beginOfDay(DateUtil.yesterday()), DateUtil.endOfDay(DateUtil.yesterday()), lineIndex, 42);
+                        List<AbnormalVO> iharm14 = getConntion(i, j, DateUtil.beginOfDay(DateUtil.yesterday()), DateUtil.endOfDay(DateUtil.yesterday()), lineIndex, 43);
+                        List<AbnormalVO> iharm15 = getConntion(i, j, DateUtil.beginOfDay(DateUtil.yesterday()), DateUtil.endOfDay(DateUtil.yesterday()), lineIndex, 44);
+                        List<AbnormalVO> iharm16 = getConntion(i, j, DateUtil.beginOfDay(DateUtil.yesterday()), DateUtil.endOfDay(DateUtil.yesterday()), lineIndex, 45);
+                        List<AbnormalVO> iharm17 = getConntion(i, j, DateUtil.beginOfDay(DateUtil.yesterday()), DateUtil.endOfDay(DateUtil.yesterday()), lineIndex, 46);
+                        List<AbnormalVO> iharm18 = getConntion(i, j, DateUtil.beginOfDay(DateUtil.yesterday()), DateUtil.endOfDay(DateUtil.yesterday()), lineIndex, 47);
+                        List<AbnormalVO> iharm19 = getConntion(i, j, DateUtil.beginOfDay(DateUtil.yesterday()), DateUtil.endOfDay(DateUtil.yesterday()), lineIndex, 48);
+                        List<AbnormalVO> iharm20 = getConntion(i, j, DateUtil.beginOfDay(DateUtil.yesterday()), DateUtil.endOfDay(DateUtil.yesterday()), lineIndex, 49);
+                        List<AbnormalVO> iharm21 = getConntion(i, j, DateUtil.beginOfDay(DateUtil.yesterday()), DateUtil.endOfDay(DateUtil.yesterday()), lineIndex, 50);
+                        List<AbnormalVO> iharm22 = getConntion(i, j, DateUtil.beginOfDay(DateUtil.yesterday()), DateUtil.endOfDay(DateUtil.yesterday()), lineIndex, 51);
+                        List<AbnormalVO> iharm23 = getConntion(i, j, DateUtil.beginOfDay(DateUtil.yesterday()), DateUtil.endOfDay(DateUtil.yesterday()), lineIndex, 52);
+                        List<AbnormalVO> iharm24 = getConntion(i, j, DateUtil.beginOfDay(DateUtil.yesterday()), DateUtil.endOfDay(DateUtil.yesterday()), lineIndex, 53);
+                        List<AbnormalVO> iharm25 = getConntion(i, j, DateUtil.beginOfDay(DateUtil.yesterday()), DateUtil.endOfDay(DateUtil.yesterday()), lineIndex, 54);
+
+
+                        //0.5-15.5次间谐波电压含有率
+                        List<AbnormalVO> inharm = getConntion(i, j, DateUtil.beginOfDay(DateUtil.yesterday()), DateUtil.endOfDay(DateUtil.yesterday()), lineIndex, 55);
+                        List<AbnormalVO> inharm1 = getConntion(i, j, DateUtil.beginOfDay(DateUtil.yesterday()), DateUtil.endOfDay(DateUtil.yesterday()), lineIndex, 56);
+                        List<AbnormalVO> inharm2 = getConntion(i, j, DateUtil.beginOfDay(DateUtil.yesterday()), DateUtil.endOfDay(DateUtil.yesterday()), lineIndex, 57);
+                        List<AbnormalVO> inharm3 = getConntion(i, j, DateUtil.beginOfDay(DateUtil.yesterday()), DateUtil.endOfDay(DateUtil.yesterday()), lineIndex, 58);
+                        List<AbnormalVO> inharm4 = getConntion(i, j, DateUtil.beginOfDay(DateUtil.yesterday()), DateUtil.endOfDay(DateUtil.yesterday()), lineIndex, 59);
+                        List<AbnormalVO> inharm5 = getConntion(i, j, DateUtil.beginOfDay(DateUtil.yesterday()), DateUtil.endOfDay(DateUtil.yesterday()), lineIndex, 60);
+                        List<AbnormalVO> inharm6 = getConntion(i, j, DateUtil.beginOfDay(DateUtil.yesterday()), DateUtil.endOfDay(DateUtil.yesterday()), lineIndex, 61);
+                        List<AbnormalVO> inharm7 = getConntion(i, j, DateUtil.beginOfDay(DateUtil.yesterday()), DateUtil.endOfDay(DateUtil.yesterday()), lineIndex, 62);
+                        List<AbnormalVO> inharm8 = getConntion(i, j, DateUtil.beginOfDay(DateUtil.yesterday()), DateUtil.endOfDay(DateUtil.yesterday()), lineIndex, 63);
+                        List<AbnormalVO> inharm9 = getConntion(i, j, DateUtil.beginOfDay(DateUtil.yesterday()), DateUtil.endOfDay(DateUtil.yesterday()), lineIndex, 64);
+                        List<AbnormalVO> inharm10 = getConntion(i, j, DateUtil.beginOfDay(DateUtil.yesterday()), DateUtil.endOfDay(DateUtil.yesterday()), lineIndex, 65);
+                        List<AbnormalVO> inharm11 = getConntion(i, j, DateUtil.beginOfDay(DateUtil.yesterday()), DateUtil.endOfDay(DateUtil.yesterday()), lineIndex, 66);
+                        List<AbnormalVO> inharm12 = getConntion(i, j, DateUtil.beginOfDay(DateUtil.yesterday()), DateUtil.endOfDay(DateUtil.yesterday()), lineIndex, 67);
+                        List<AbnormalVO> inharm13 = getConntion(i, j, DateUtil.beginOfDay(DateUtil.yesterday()), DateUtil.endOfDay(DateUtil.yesterday()), lineIndex, 68);
+                        List<AbnormalVO> inharm14 = getConntion(i, j, DateUtil.beginOfDay(DateUtil.yesterday()), DateUtil.endOfDay(DateUtil.yesterday()), lineIndex, 69);
+                        List<AbnormalVO> inharm15 = getConntion(i, j, DateUtil.beginOfDay(DateUtil.yesterday()), DateUtil.endOfDay(DateUtil.yesterday()), lineIndex, 70);
+                        //长时闪变
+                        List<AbnormalVO> flicker = getConntion(i, j, DateUtil.beginOfDay(DateUtil.yesterday()), DateUtil.endOfDay(DateUtil.yesterday()), lineIndex, 71);
+                        //只需要判断一个指标即可
+                        if (!voDev.isEmpty()) {
+                            AbnormalPO abnormalPO = new AbnormalPO();
+                            abnormalPO.setTimeId(DateUtil.beginOfDay(DateUtil.parse("2022-05-10")));
+                            abnormalPO.setId(lineIndex);
+                            if (i == 1) {
+                                abnormalPO.setPhasicType("A");
+                            } else if (i == 2) {
+                                abnormalPO.setPhasicType("B");
+                            } else if (i == 3) {
+                                abnormalPO.setPhasicType("C");
+                            } else {
+                                abnormalPO.setPhasicType("T");
+                            }
+                            if (j == 1) {
+                                abnormalPO.setFreqDev(freq.get(j).getNormValue());
+                                abnormalPO.setValueType("AVG");
+                                abnormalPO.setVoltageDev(voDev.get(j).getNormValue());
+                                abnormalPO.setUvoltageDev(uoDev.get(j).getNormValue());
+                                abnormalPO.setFlickerAllTime(flicker.get(j).getNormValue());
+                                abnormalPO.setUAberrance(uab.get(j).getNormValue());
+                                abnormalPO.setUBalance(uba.get(j).getNormValue());
+                                abnormalPO.setINeg(ing.get(j).getNormValue());
+                                abnormalPO.setUHarm2(uharm2.get(j).getNormValue());
+                                abnormalPO.setUHarm3(uharm3.get(j).getNormValue());
+                                abnormalPO.setUHarm4(uharm4.get(j).getNormValue());
+                                abnormalPO.setUHarm5(uharm5.get(j).getNormValue());
+                                abnormalPO.setUHarm6(uharm6.get(j).getNormValue());
+                                abnormalPO.setUHarm7(uharm7.get(j).getNormValue());
+                                abnormalPO.setUHarm8(uharm8.get(j).getNormValue());
+                                abnormalPO.setUHarm9(uharm9.get(j).getNormValue());
+                                abnormalPO.setUHarm10(uharm10.get(j).getNormValue());
+                                abnormalPO.setUHarm11(uharm11.get(j).getNormValue());
+                                abnormalPO.setUHarm12(uharm12.get(j).getNormValue());
+                                abnormalPO.setUHarm13(uharm13.get(j).getNormValue());
+                                abnormalPO.setUHarm14(uharm14.get(j).getNormValue());
+                                abnormalPO.setUHarm15(uharm15.get(j).getNormValue());
+                                abnormalPO.setUHarm16(uharm16.get(j).getNormValue());
+                                abnormalPO.setUHarm17(uharm17.get(j).getNormValue());
+                                abnormalPO.setUHarm18(uharm18.get(j).getNormValue());
+                                abnormalPO.setUHarm19(uharm19.get(j).getNormValue());
+                                abnormalPO.setUHarm20(uharm20.get(j).getNormValue());
+                                abnormalPO.setUHarm21(uharm21.get(j).getNormValue());
+                                abnormalPO.setUHarm22(uharm22.get(j).getNormValue());
+                                abnormalPO.setUHarm23(uharm23.get(j).getNormValue());
+                                abnormalPO.setUHarm24(uharm24.get(j).getNormValue());
+                                abnormalPO.setUHarm25(uharm25.get(j).getNormValue());
+                                abnormalPO.setIHarm2(iharm2.get(j).getNormValue());
+                                abnormalPO.setIHarm3(iharm3.get(j).getNormValue());
+                                abnormalPO.setIHarm4(iharm4.get(j).getNormValue());
+                                abnormalPO.setIHarm5(iharm5.get(j).getNormValue());
+                                abnormalPO.setIHarm6(iharm6.get(j).getNormValue());
+                                abnormalPO.setIHarm7(iharm7.get(j).getNormValue());
+                                abnormalPO.setIHarm8(iharm8.get(j).getNormValue());
+                                abnormalPO.setIHarm9(iharm9.get(j).getNormValue());
+                                abnormalPO.setIHarm10(iharm10.get(j).getNormValue());
+                                abnormalPO.setIHarm11(iharm11.get(j).getNormValue());
+                                abnormalPO.setIHarm12(iharm12.get(j).getNormValue());
+                                abnormalPO.setIHarm13(iharm13.get(j).getNormValue());
+                                abnormalPO.setIHarm14(iharm14.get(j).getNormValue());
+                                abnormalPO.setIHarm15(iharm15.get(j).getNormValue());
+                                abnormalPO.setIHarm16(iharm16.get(j).getNormValue());
+                                abnormalPO.setIHarm17(iharm17.get(j).getNormValue());
+                                abnormalPO.setIHarm18(iharm18.get(j).getNormValue());
+                                abnormalPO.setIHarm19(iharm19.get(j).getNormValue());
+                                abnormalPO.setIHarm20(iharm20.get(j).getNormValue());
+                                abnormalPO.setIHarm21(iharm21.get(j).getNormValue());
+                                abnormalPO.setIHarm22(iharm22.get(j).getNormValue());
+                                abnormalPO.setIHarm23(iharm23.get(j).getNormValue());
+                                abnormalPO.setIHarm24(iharm24.get(j).getNormValue());
+                                abnormalPO.setIHarm25(iharm25.get(j).getNormValue());
+                                abnormalPO.setInuHarm1(inharm.get(j).getNormValue());
+                                abnormalPO.setInuHarm2(inharm1.get(j).getNormValue());
+                                abnormalPO.setInuHarm3(inharm2.get(j).getNormValue());
+                                abnormalPO.setInuHarm4(inharm3.get(j).getNormValue());
+                                abnormalPO.setInuHarm5(inharm4.get(j).getNormValue());
+                                abnormalPO.setInuHarm6(inharm5.get(j).getNormValue());
+                                abnormalPO.setInuHarm7(inharm6.get(j).getNormValue());
+                                abnormalPO.setInuHarm8(inharm7.get(j).getNormValue());
+                                abnormalPO.setInuHarm9(inharm8.get(j).getNormValue());
+                                abnormalPO.setInuHarm10(inharm9.get(j).getNormValue());
+                                abnormalPO.setInuHarm11(inharm10.get(j).getNormValue());
+                                abnormalPO.setInuHarm12(inharm11.get(j).getNormValue());
+                                abnormalPO.setInuHarm13(inharm12.get(j).getNormValue());
+                                abnormalPO.setInuHarm14(inharm13.get(j).getNormValue());
+                                abnormalPO.setInuHarm15(inharm14.get(j).getNormValue());
+                                abnormalPO.setInuHarm16(inharm15.get(j).getNormValue());
+                            } else if (j == 2) {
+                                abnormalPO.setFreqDev(freq.get(j).getNormValue() > 50 + overlimit.getFreqDev() ? freq.get(j).getNormValue() : -3.14159f);
+                                abnormalPO.setValueType("MAX");
+                                abnormalPO.setVoltageDev(voDev.get(j).getNormValue() > overlimit.getVoltageDev() ? voDev.get(j).getNormValue() : -3.14159f);
+                                abnormalPO.setUvoltageDev(uoDev.get(j).getNormValue() > Math.abs(overlimit.getUvoltageDev()) ? uoDev.get(j).getNormValue() : -3.14159f);
+                                abnormalPO.setFlickerAllTime(flicker.get(j).getNormValue() > overlimit.getFlicker() ? flicker.get(j).getNormValue() : -3.14159f);
+                                abnormalPO.setUAberrance(uab.get(j).getNormValue() > overlimit.getUaberrance() ? uab.get(j).getNormValue() : -3.14159f);
+                                abnormalPO.setUBalance(uba.get(j).getNormValue() > overlimit.getUbalance() ? uba.get(j).getNormValue() : -3.14159f);
+                                abnormalPO.setINeg(ing.get(j).getNormValue() > overlimit.getINeg() ? ing.get(j).getNormValue() : -3.14159f);
+                                abnormalPO.setUHarm2(uharm2.get(j).getNormValue() > overlimit.getUharm2() ? uharm2.get(j).getNormValue() : -3.14159f);
+                                abnormalPO.setUHarm3(uharm3.get(j).getNormValue() > overlimit.getUharm3() ? uharm3.get(j).getNormValue() : -3.14159f);
+                                abnormalPO.setUHarm4(uharm4.get(j).getNormValue() > overlimit.getUharm4() ? uharm4.get(j).getNormValue() : -3.14159f);
+                                abnormalPO.setUHarm5(uharm5.get(j).getNormValue() > overlimit.getUharm5() ? uharm5.get(j).getNormValue() : -3.14159f);
+                                abnormalPO.setUHarm6(uharm6.get(j).getNormValue() > overlimit.getUharm6() ? uharm6.get(j).getNormValue() : -3.14159f);
+                                abnormalPO.setUHarm7(uharm7.get(j).getNormValue() > overlimit.getUharm7() ? uharm7.get(j).getNormValue() : -3.14159f);
+                                abnormalPO.setUHarm8(uharm8.get(j).getNormValue() > overlimit.getUharm8() ? uharm8.get(j).getNormValue() : -3.14159f);
+                                abnormalPO.setUHarm9(uharm9.get(j).getNormValue() > overlimit.getUharm9() ? uharm9.get(j).getNormValue() : -3.14159f);
+                                abnormalPO.setUHarm10(uharm10.get(j).getNormValue() > overlimit.getUharm10() ? uharm10.get(j).getNormValue() : -3.14159f);
+                                abnormalPO.setUHarm11(uharm11.get(j).getNormValue() > overlimit.getUharm11() ? uharm11.get(j).getNormValue() : -3.14159f);
+                                abnormalPO.setUHarm12(uharm12.get(j).getNormValue() > overlimit.getUharm12() ? uharm12.get(j).getNormValue() : -3.14159f);
+                                abnormalPO.setUHarm13(uharm13.get(j).getNormValue() > overlimit.getUharm13() ? uharm13.get(j).getNormValue() : -3.14159f);
+                                abnormalPO.setUHarm14(uharm14.get(j).getNormValue() > overlimit.getUharm14() ? uharm14.get(j).getNormValue() : -3.14159f);
+                                abnormalPO.setUHarm15(uharm15.get(j).getNormValue() > overlimit.getUharm15() ? uharm15.get(j).getNormValue() : -3.14159f);
+                                abnormalPO.setUHarm16(uharm16.get(j).getNormValue() > overlimit.getUharm16() ? uharm16.get(j).getNormValue() : -3.14159f);
+                                abnormalPO.setUHarm17(uharm17.get(j).getNormValue() > overlimit.getUharm17() ? uharm17.get(j).getNormValue() : -3.14159f);
+                                abnormalPO.setUHarm18(uharm18.get(j).getNormValue() > overlimit.getUharm18() ? uharm18.get(j).getNormValue() : -3.14159f);
+                                abnormalPO.setUHarm19(uharm19.get(j).getNormValue() > overlimit.getUharm19() ? uharm19.get(j).getNormValue() : -3.14159f);
+                                abnormalPO.setUHarm20(uharm20.get(j).getNormValue() > overlimit.getUharm20() ? uharm20.get(j).getNormValue() : -3.14159f);
+                                abnormalPO.setUHarm21(uharm21.get(j).getNormValue() > overlimit.getUharm21() ? uharm21.get(j).getNormValue() : -3.14159f);
+                                abnormalPO.setUHarm22(uharm22.get(j).getNormValue() > overlimit.getUharm22() ? uharm22.get(j).getNormValue() : -3.14159f);
+                                abnormalPO.setUHarm23(uharm23.get(j).getNormValue() > overlimit.getUharm23() ? uharm23.get(j).getNormValue() : -3.14159f);
+                                abnormalPO.setUHarm24(uharm24.get(j).getNormValue() > overlimit.getUharm24() ? uharm24.get(j).getNormValue() : -3.14159f);
+                                abnormalPO.setUHarm25(uharm25.get(j).getNormValue() > overlimit.getUharm25() ? uharm25.get(j).getNormValue() : -3.14159f);
+                                abnormalPO.setIHarm2(iharm2.get(j).getNormValue() > overlimit.getIharm2() ? iharm2.get(j).getNormValue() : -3.14159f);
+                                abnormalPO.setIHarm3(iharm3.get(j).getNormValue() > overlimit.getIharm3() ? iharm3.get(j).getNormValue() : -3.14159f);
+                                abnormalPO.setIHarm4(iharm4.get(j).getNormValue() > overlimit.getIharm4() ? iharm4.get(j).getNormValue() : -3.14159f);
+                                abnormalPO.setIHarm5(iharm5.get(j).getNormValue() > overlimit.getIharm5() ? iharm5.get(j).getNormValue() : -3.14159f);
+                                abnormalPO.setIHarm6(iharm6.get(j).getNormValue() > overlimit.getIharm6() ? iharm6.get(j).getNormValue() : -3.14159f);
+                                abnormalPO.setIHarm7(iharm7.get(j).getNormValue() > overlimit.getIharm7() ? iharm7.get(j).getNormValue() : -3.14159f);
+                                abnormalPO.setIHarm8(iharm8.get(j).getNormValue() > overlimit.getIharm8() ? iharm8.get(j).getNormValue() : -3.14159f);
+                                abnormalPO.setIHarm9(iharm9.get(j).getNormValue() > overlimit.getIharm9() ? iharm9.get(j).getNormValue() : -3.14159f);
+                                abnormalPO.setIHarm10(iharm10.get(j).getNormValue() > overlimit.getIharm10() ? iharm10.get(j).getNormValue() : -3.14159f);
+                                abnormalPO.setIHarm11(iharm11.get(j).getNormValue() > overlimit.getIharm11() ? iharm11.get(j).getNormValue() : -3.14159f);
+                                abnormalPO.setIHarm12(iharm12.get(j).getNormValue() > overlimit.getIharm12() ? iharm12.get(j).getNormValue() : -3.14159f);
+                                abnormalPO.setIHarm13(iharm13.get(j).getNormValue() > overlimit.getIharm13() ? iharm13.get(j).getNormValue() : -3.14159f);
+                                abnormalPO.setIHarm14(iharm14.get(j).getNormValue() > overlimit.getIharm14() ? iharm14.get(j).getNormValue() : -3.14159f);
+                                abnormalPO.setIHarm15(iharm15.get(j).getNormValue() > overlimit.getIharm15() ? iharm15.get(j).getNormValue() : -3.14159f);
+                                abnormalPO.setIHarm16(iharm16.get(j).getNormValue() > overlimit.getIharm16() ? iharm16.get(j).getNormValue() : -3.14159f);
+                                abnormalPO.setIHarm17(iharm17.get(j).getNormValue() > overlimit.getIharm17() ? iharm17.get(j).getNormValue() : -3.14159f);
+                                abnormalPO.setIHarm18(iharm18.get(j).getNormValue() > overlimit.getIharm18() ? iharm18.get(j).getNormValue() : -3.14159f);
+                                abnormalPO.setIHarm19(iharm19.get(j).getNormValue() > overlimit.getIharm19() ? iharm19.get(j).getNormValue() : -3.14159f);
+                                abnormalPO.setIHarm20(iharm20.get(j).getNormValue() > overlimit.getIharm20() ? iharm20.get(j).getNormValue() : -3.14159f);
+                                abnormalPO.setIHarm21(iharm21.get(j).getNormValue() > overlimit.getIharm21() ? iharm21.get(j).getNormValue() : -3.14159f);
+                                abnormalPO.setIHarm22(iharm22.get(j).getNormValue() > overlimit.getIharm22() ? iharm22.get(j).getNormValue() : -3.14159f);
+                                abnormalPO.setIHarm23(iharm23.get(j).getNormValue() > overlimit.getIharm23() ? iharm23.get(j).getNormValue() : -3.14159f);
+                                abnormalPO.setIHarm24(iharm24.get(j).getNormValue() > overlimit.getIharm24() ? iharm24.get(j).getNormValue() : -3.14159f);
+                                abnormalPO.setIHarm25(iharm25.get(j).getNormValue() > overlimit.getIharm25() ? iharm25.get(j).getNormValue() : -3.14159f);
+                                abnormalPO.setInuHarm1(inharm.get(j).getNormValue() > overlimit.getInuharm1() ? inharm.get(j).getNormValue() : -3.14159f);
+                                abnormalPO.setInuHarm2(inharm1.get(j).getNormValue() > overlimit.getInuharm2() ? inharm1.get(j).getNormValue() : -3.14159f);
+                                abnormalPO.setInuHarm3(inharm2.get(j).getNormValue() > overlimit.getInuharm3() ? inharm2.get(j).getNormValue() : -3.14159f);
+                                abnormalPO.setInuHarm4(inharm3.get(j).getNormValue() > overlimit.getInuharm4() ? inharm3.get(j).getNormValue() : -3.14159f);
+                                abnormalPO.setInuHarm5(inharm4.get(j).getNormValue() > overlimit.getInuharm5() ? inharm4.get(j).getNormValue() : -3.14159f);
+                                abnormalPO.setInuHarm6(inharm5.get(j).getNormValue() > overlimit.getInuharm6() ? inharm5.get(j).getNormValue() : -3.14159f);
+                                abnormalPO.setInuHarm7(inharm6.get(j).getNormValue() > overlimit.getInuharm7() ? inharm6.get(j).getNormValue() : -3.14159f);
+                                abnormalPO.setInuHarm8(inharm7.get(j).getNormValue() > overlimit.getInuharm8() ? inharm7.get(j).getNormValue() : -3.14159f);
+                                abnormalPO.setInuHarm9(inharm8.get(j).getNormValue() > overlimit.getInuharm9() ? inharm8.get(j).getNormValue() : -3.14159f);
+                                abnormalPO.setInuHarm10(inharm9.get(j).getNormValue() > overlimit.getInuharm10() ? inharm9.get(j).getNormValue() : -3.14159f);
+                                abnormalPO.setInuHarm11(inharm10.get(j).getNormValue() > overlimit.getInuharm11() ? inharm10.get(j).getNormValue() : -3.14159f);
+                                abnormalPO.setInuHarm12(inharm11.get(j).getNormValue() > overlimit.getInuharm12() ? inharm11.get(j).getNormValue() : -3.14159f);
+                                abnormalPO.setInuHarm13(inharm12.get(j).getNormValue() > overlimit.getInuharm13() ? inharm12.get(j).getNormValue() : -3.14159f);
+                                abnormalPO.setInuHarm14(inharm13.get(j).getNormValue() > overlimit.getInuharm14() ? inharm13.get(j).getNormValue() : -3.14159f);
+                                abnormalPO.setInuHarm15(inharm14.get(j).getNormValue() > overlimit.getInuharm15() ? inharm14.get(j).getNormValue() : -3.14159f);
+                                abnormalPO.setInuHarm16(inharm15.get(j).getNormValue() > overlimit.getInuharm16() ? inharm15.get(j).getNormValue() : -3.14159f);
+                            } else if (j == 3) {
+                                abnormalPO.setFreqDev(freq.get(j).getNormValue());
+                                abnormalPO.setValueType("MIN");
+                                abnormalPO.setVoltageDev(voDev.get(j).getNormValue());
+                                abnormalPO.setUvoltageDev(uoDev.get(j).getNormValue());
+                                abnormalPO.setFlickerAllTime(flicker.get(j).getNormValue());
+                                abnormalPO.setUAberrance(uab.get(j).getNormValue());
+                                abnormalPO.setUBalance(uba.get(j).getNormValue());
+                                abnormalPO.setINeg(ing.get(j).getNormValue());
+                                abnormalPO.setUHarm2(uharm2.get(j).getNormValue());
+                                abnormalPO.setUHarm3(uharm3.get(j).getNormValue());
+                                abnormalPO.setUHarm4(uharm4.get(j).getNormValue());
+                                abnormalPO.setUHarm5(uharm5.get(j).getNormValue());
+                                abnormalPO.setUHarm6(uharm6.get(j).getNormValue());
+                                abnormalPO.setUHarm7(uharm7.get(j).getNormValue());
+                                abnormalPO.setUHarm8(uharm8.get(j).getNormValue());
+                                abnormalPO.setUHarm9(uharm9.get(j).getNormValue());
+                                abnormalPO.setUHarm10(uharm10.get(j).getNormValue());
+                                abnormalPO.setUHarm11(uharm11.get(j).getNormValue());
+                                abnormalPO.setUHarm12(uharm12.get(j).getNormValue());
+                                abnormalPO.setUHarm13(uharm13.get(j).getNormValue());
+                                abnormalPO.setUHarm14(uharm14.get(j).getNormValue());
+                                abnormalPO.setUHarm15(uharm15.get(j).getNormValue());
+                                abnormalPO.setUHarm16(uharm16.get(j).getNormValue());
+                                abnormalPO.setUHarm17(uharm17.get(j).getNormValue());
+                                abnormalPO.setUHarm18(uharm18.get(j).getNormValue());
+                                abnormalPO.setUHarm19(uharm19.get(j).getNormValue());
+                                abnormalPO.setUHarm20(uharm20.get(j).getNormValue());
+                                abnormalPO.setUHarm21(uharm21.get(j).getNormValue());
+                                abnormalPO.setUHarm22(uharm22.get(j).getNormValue());
+                                abnormalPO.setUHarm23(uharm23.get(j).getNormValue());
+                                abnormalPO.setUHarm24(uharm24.get(j).getNormValue());
+                                abnormalPO.setUHarm25(uharm25.get(j).getNormValue());
+                                abnormalPO.setIHarm2(iharm2.get(j).getNormValue());
+                                abnormalPO.setIHarm3(iharm3.get(j).getNormValue());
+                                abnormalPO.setIHarm4(iharm4.get(j).getNormValue());
+                                abnormalPO.setIHarm5(iharm5.get(j).getNormValue());
+                                abnormalPO.setIHarm6(iharm6.get(j).getNormValue());
+                                abnormalPO.setIHarm7(iharm7.get(j).getNormValue());
+                                abnormalPO.setIHarm8(iharm8.get(j).getNormValue());
+                                abnormalPO.setIHarm9(iharm9.get(j).getNormValue());
+                                abnormalPO.setIHarm10(iharm10.get(j).getNormValue());
+                                abnormalPO.setIHarm11(iharm11.get(j).getNormValue());
+                                abnormalPO.setIHarm12(iharm12.get(j).getNormValue());
+                                abnormalPO.setIHarm13(iharm13.get(j).getNormValue());
+                                abnormalPO.setIHarm14(iharm14.get(j).getNormValue());
+                                abnormalPO.setIHarm15(iharm15.get(j).getNormValue());
+                                abnormalPO.setIHarm16(iharm16.get(j).getNormValue());
+                                abnormalPO.setIHarm17(iharm17.get(j).getNormValue());
+                                abnormalPO.setIHarm18(iharm18.get(j).getNormValue());
+                                abnormalPO.setIHarm19(iharm19.get(j).getNormValue());
+                                abnormalPO.setIHarm20(iharm20.get(j).getNormValue());
+                                abnormalPO.setIHarm21(iharm21.get(j).getNormValue());
+                                abnormalPO.setIHarm22(iharm22.get(j).getNormValue());
+                                abnormalPO.setIHarm23(iharm23.get(j).getNormValue());
+                                abnormalPO.setIHarm24(iharm24.get(j).getNormValue());
+                                abnormalPO.setIHarm25(iharm25.get(j).getNormValue());
+                                abnormalPO.setInuHarm1(inharm.get(j).getNormValue());
+                                abnormalPO.setInuHarm2(inharm1.get(j).getNormValue());
+                                abnormalPO.setInuHarm3(inharm2.get(j).getNormValue());
+                                abnormalPO.setInuHarm4(inharm3.get(j).getNormValue());
+                                abnormalPO.setInuHarm5(inharm4.get(j).getNormValue());
+                                abnormalPO.setInuHarm6(inharm5.get(j).getNormValue());
+                                abnormalPO.setInuHarm7(inharm6.get(j).getNormValue());
+                                abnormalPO.setInuHarm8(inharm7.get(j).getNormValue());
+                                abnormalPO.setInuHarm9(inharm8.get(j).getNormValue());
+                                abnormalPO.setInuHarm10(inharm9.get(j).getNormValue());
+                                abnormalPO.setInuHarm11(inharm10.get(j).getNormValue());
+                                abnormalPO.setInuHarm12(inharm11.get(j).getNormValue());
+                                abnormalPO.setInuHarm13(inharm12.get(j).getNormValue());
+                                abnormalPO.setInuHarm14(inharm13.get(j).getNormValue());
+                                abnormalPO.setInuHarm15(inharm14.get(j).getNormValue());
+                                abnormalPO.setInuHarm16(inharm15.get(j).getNormValue());
+                            } else {
+                                abnormalPO.setFreqDev(freq.get(j).getNormValue());
+                                abnormalPO.setValueType("CP95");
+                                abnormalPO.setVoltageDev(voDev.get(j).getNormValue());
+                                abnormalPO.setUvoltageDev(uoDev.get(j).getNormValue());
+                                abnormalPO.setFlickerAllTime(flicker.get(j).getNormValue());
+                                abnormalPO.setUAberrance(uab.get(j).getNormValue());
+                                abnormalPO.setUBalance(uba.get(j).getNormValue());
+                                abnormalPO.setINeg(ing.get(j).getNormValue());
+                                abnormalPO.setUHarm2(uharm2.get(j).getNormValue());
+                                abnormalPO.setUHarm3(uharm3.get(j).getNormValue());
+                                abnormalPO.setUHarm4(uharm4.get(j).getNormValue());
+                                abnormalPO.setUHarm5(uharm5.get(j).getNormValue());
+                                abnormalPO.setUHarm6(uharm6.get(j).getNormValue());
+                                abnormalPO.setUHarm7(uharm7.get(j).getNormValue());
+                                abnormalPO.setUHarm8(uharm8.get(j).getNormValue());
+                                abnormalPO.setUHarm9(uharm9.get(j).getNormValue());
+                                abnormalPO.setUHarm10(uharm10.get(j).getNormValue());
+                                abnormalPO.setUHarm11(uharm11.get(j).getNormValue());
+                                abnormalPO.setUHarm12(uharm12.get(j).getNormValue());
+                                abnormalPO.setUHarm13(uharm13.get(j).getNormValue());
+                                abnormalPO.setUHarm14(uharm14.get(j).getNormValue());
+                                abnormalPO.setUHarm15(uharm15.get(j).getNormValue());
+                                abnormalPO.setUHarm16(uharm16.get(j).getNormValue());
+                                abnormalPO.setUHarm17(uharm17.get(j).getNormValue());
+                                abnormalPO.setUHarm18(uharm18.get(j).getNormValue());
+                                abnormalPO.setUHarm19(uharm19.get(j).getNormValue());
+                                abnormalPO.setUHarm20(uharm20.get(j).getNormValue());
+                                abnormalPO.setUHarm21(uharm21.get(j).getNormValue());
+                                abnormalPO.setUHarm22(uharm22.get(j).getNormValue());
+                                abnormalPO.setUHarm23(uharm23.get(j).getNormValue());
+                                abnormalPO.setUHarm24(uharm24.get(j).getNormValue());
+                                abnormalPO.setUHarm25(uharm25.get(j).getNormValue());
+                                abnormalPO.setIHarm2(iharm2.get(j).getNormValue());
+                                abnormalPO.setIHarm3(iharm3.get(j).getNormValue());
+                                abnormalPO.setIHarm4(iharm4.get(j).getNormValue());
+                                abnormalPO.setIHarm5(iharm5.get(j).getNormValue());
+                                abnormalPO.setIHarm6(iharm6.get(j).getNormValue());
+                                abnormalPO.setIHarm7(iharm7.get(j).getNormValue());
+                                abnormalPO.setIHarm8(iharm8.get(j).getNormValue());
+                                abnormalPO.setIHarm9(iharm9.get(j).getNormValue());
+                                abnormalPO.setIHarm10(iharm10.get(j).getNormValue());
+                                abnormalPO.setIHarm11(iharm11.get(j).getNormValue());
+                                abnormalPO.setIHarm12(iharm12.get(j).getNormValue());
+                                abnormalPO.setIHarm13(iharm13.get(j).getNormValue());
+                                abnormalPO.setIHarm14(iharm14.get(j).getNormValue());
+                                abnormalPO.setIHarm15(iharm15.get(j).getNormValue());
+                                abnormalPO.setIHarm16(iharm16.get(j).getNormValue());
+                                abnormalPO.setIHarm17(iharm17.get(j).getNormValue());
+                                abnormalPO.setIHarm18(iharm18.get(j).getNormValue());
+                                abnormalPO.setIHarm19(iharm19.get(j).getNormValue());
+                                abnormalPO.setIHarm20(iharm20.get(j).getNormValue());
+                                abnormalPO.setIHarm21(iharm21.get(j).getNormValue());
+                                abnormalPO.setIHarm22(iharm22.get(j).getNormValue());
+                                abnormalPO.setIHarm23(iharm23.get(j).getNormValue());
+                                abnormalPO.setIHarm24(iharm24.get(j).getNormValue());
+                                abnormalPO.setIHarm25(iharm25.get(j).getNormValue());
+                                abnormalPO.setInuHarm1(inharm.get(j).getNormValue());
+                                abnormalPO.setInuHarm2(inharm1.get(j).getNormValue());
+                                abnormalPO.setInuHarm3(inharm2.get(j).getNormValue());
+                                abnormalPO.setInuHarm4(inharm3.get(j).getNormValue());
+                                abnormalPO.setInuHarm5(inharm4.get(j).getNormValue());
+                                abnormalPO.setInuHarm6(inharm5.get(j).getNormValue());
+                                abnormalPO.setInuHarm7(inharm6.get(j).getNormValue());
+                                abnormalPO.setInuHarm8(inharm7.get(j).getNormValue());
+                                abnormalPO.setInuHarm9(inharm8.get(j).getNormValue());
+                                abnormalPO.setInuHarm10(inharm9.get(j).getNormValue());
+                                abnormalPO.setInuHarm11(inharm10.get(j).getNormValue());
+                                abnormalPO.setInuHarm12(inharm11.get(j).getNormValue());
+                                abnormalPO.setInuHarm13(inharm12.get(j).getNormValue());
+                                abnormalPO.setInuHarm14(inharm13.get(j).getNormValue());
+                                abnormalPO.setInuHarm15(inharm14.get(j).getNormValue());
+                                abnormalPO.setInuHarm16(inharm15.get(j).getNormValue());
+                            }
+                            abnormalMapper.insert(abnormalPO);
+                            return "预处理成功！";
+                        }else {
+                            return "预处理失败！";
+                        }
+                    }
+                }
+            }
+        } else {
+            return "预处理失败,未获取到监测点";
+        }
+        return "预处理成功！";
+    }
+
+    public List<AbnormalVO> getConntion(int i, int j, DateTime startTime, DateTime endTime, String lineIndex, int conntion) {
+        List<AbnormalVO> abnormalVOList = new ArrayList<>();
+        String sql = "";
+        String phasic = "";
+        String valueType = "";
+        StringBuilder stringBuilder = new StringBuilder();
+        stringBuilder.append(InfluxDBPublicParam.TIME + " >= '").append(startTime).append("' and ").append(InfluxDBPublicParam.TIME + " <= '").append(endTime).append("'");
+        stringBuilder.append(" and ").append(InfluxDBPublicParam.LINE_ID + "='").append(lineIndex).append("'");
+        switch (i) {
+            case 1:
+                phasic = "A";
+                break;
+            case 2:
+                phasic = "B";
+                break;
+            case 3:
+                phasic = "C";
+                break;
+            case 4:
+                phasic = "T";
+                break;
+        }
+        switch (j) {
+            case 1:
+                valueType = "AVG";
+                break;
+            case 2:
+                valueType = "MAX";
+                break;
+            case 3:
+                valueType = "MIN";
+                break;
+            case 4:
+                valueType = "CP95";
+                break;
+        }
+        stringBuilder.append(" and value_type ='").append(valueType).append("'");
+        stringBuilder.append(" and ").append("phasic_type ='").append(phasic).append("'").append("order by time asc ").append(InfluxDBPublicParam.TIME_ZONE);
+        switch (conntion) {
+            case 1:
+                sql = "SELECT vl_dev as normValue,value_type as valueType FROM day_v WHERE " + stringBuilder.toString();
+                break;
+            case 2:
+                sql = "SELECT vu_dev as normValue,value_type as valueType FROM day_v WHERE " + stringBuilder.toString();
+                break;
+            case 3:
+                sql = "SELECT v_unbalance as normValue,value_type as valueType FROM day_v WHERE " + stringBuilder.toString();
+                break;
+            case 4:
+                sql = "SELECT v_thd as normValue,value_type as valueType FROM day_v WHERE " + stringBuilder.toString();
+                break;
+            case 5:
+                sql = "SELECT i_neg as normValue,value_type as valueType FROM day_v WHERE " + stringBuilder.toString();
+                break;
+            case 6:
+                sql = "SELECT freq as normValue,value_type as valueType FROM day_v WHERE " + stringBuilder.toString();
+                break;
+            case 7:
+                sql = "SELECT v_2 as normValue,value_type as valueType FROM day_harmrate_v WHERE " + stringBuilder.toString();
+                break;
+            case 8:
+                sql = "SELECT v_3 as normValue,value_type as valueType FROM day_harmrate_v WHERE " + stringBuilder.toString();
+                break;
+            case 9:
+                sql = "SELECT v_4 as normValue,value_type as valueType FROM day_harmrate_v WHERE " + stringBuilder.toString();
+                break;
+            case 10:
+                sql = "SELECT v_5 as normValue,value_type as valueType FROM day_harmrate_v WHERE " + stringBuilder.toString();
+                break;
+            case 11:
+                sql = "SELECT v_6 as normValue,value_type as valueType FROM day_harmrate_v WHERE " + stringBuilder.toString();
+                break;
+            case 12:
+                sql = "SELECT v_7 as normValue,value_type as valueType FROM day_harmrate_v WHERE " + stringBuilder.toString();
+                break;
+            case 13:
+                sql = "SELECT v_8 as normValue,value_type as valueType FROM day_harmrate_v WHERE " + stringBuilder.toString();
+                break;
+            case 14:
+                sql = "SELECT v_9 as normValue,value_type as valueType FROM day_harmrate_v WHERE " + stringBuilder.toString();
+                break;
+            case 15:
+                sql = "SELECT v_10 as normValue,value_type as valueType FROM day_harmrate_v WHERE " + stringBuilder.toString();
+                break;
+            case 16:
+                sql = "SELECT v_11 as normValue,value_type as valueType FROM day_harmrate_v WHERE " + stringBuilder.toString();
+                break;
+            case 17:
+                sql = "SELECT v_12 as normValue,value_type as valueType FROM day_harmrate_v WHERE " + stringBuilder.toString();
+                break;
+            case 18:
+                sql = "SELECT v_13 as normValue,value_type as valueType FROM day_harmrate_v WHERE " + stringBuilder.toString();
+                break;
+            case 19:
+                sql = "SELECT v_14 as normValue,value_type as valueType FROM day_harmrate_v WHERE " + stringBuilder.toString();
+                break;
+            case 20:
+                sql = "SELECT v_15 as normValue,value_type as valueType FROM day_harmrate_v WHERE " + stringBuilder.toString();
+                break;
+            case 21:
+                sql = "SELECT v_16 as normValue,value_type as valueType FROM day_harmrate_v WHERE " + stringBuilder.toString();
+                break;
+            case 22:
+                sql = "SELECT v_17 as normValue,value_type as valueType FROM day_harmrate_v WHERE " + stringBuilder.toString();
+                break;
+            case 23:
+                sql = "SELECT v_18 as normValue,value_type as valueType FROM day_harmrate_v WHERE " + stringBuilder.toString();
+                break;
+            case 24:
+                sql = "SELECT v_19 as normValue,value_type as valueType FROM day_harmrate_v WHERE " + stringBuilder.toString();
+                break;
+            case 25:
+                sql = "SELECT v_20 as normValue,value_type as valueType FROM day_harmrate_v WHERE " + stringBuilder.toString();
+                break;
+            case 26:
+                sql = "SELECT v_21 as normValue,value_type as valueType FROM day_harmrate_v WHERE " + stringBuilder.toString();
+                break;
+            case 27:
+                sql = "SELECT v_22 as normValue,value_type as valueType FROM day_harmrate_v WHERE " + stringBuilder.toString();
+                break;
+            case 28:
+                sql = "SELECT v_23 as normValue,value_type as valueType FROM day_harmrate_v WHERE " + stringBuilder.toString();
+                break;
+            case 29:
+                sql = "SELECT v_24 as normValue,value_type as valueType FROM day_harmrate_v WHERE " + stringBuilder.toString();
+                break;
+            case 30:
+                sql = "SELECT v_25 as normValue,value_type as valueType FROM day_harmrate_v WHERE " + stringBuilder.toString();
+                break;
+            case 31:
+                sql = "SELECT i_2 as normValue,value_type as valueType FROM day_harmrate_v WHERE " + stringBuilder.toString();
+                break;
+            case 32:
+                sql = "SELECT i_3 as normValue,value_type as valueType FROM day_i WHERE " + stringBuilder.toString();
+                break;
+            case 33:
+                sql = "SELECT i_4 as normValue,value_type as valueType FROM day_i WHERE " + stringBuilder.toString();
+                break;
+            case 34:
+                sql = "SELECT i_5 as normValue,value_type as valueType FROM day_i WHERE " + stringBuilder.toString();
+                break;
+            case 35:
+                sql = "SELECT i_6 as normValue,value_type as valueType FROM day_i WHERE " + stringBuilder.toString();
+                break;
+            case 36:
+                sql = "SELECT i_7 as normValue,value_type as valueType FROM day_i WHERE " + stringBuilder.toString();
+                break;
+            case 37:
+                sql = "SELECT i_8 as normValue,value_type as valueType FROM day_i WHERE " + stringBuilder.toString();
+                break;
+            case 38:
+                sql = "SELECT i_9 as normValue,value_type as valueType FROM day_i WHERE " + stringBuilder.toString();
+                break;
+            case 39:
+                sql = "SELECT i_10 as normValue,value_type as valueType FROM day_i WHERE " + stringBuilder.toString();
+                break;
+            case 40:
+                sql = "SELECT i_11 as normValue,value_type as valueType FROM day_i WHERE " + stringBuilder.toString();
+                break;
+            case 41:
+                sql = "SELECT i_12 as normValue,value_type as valueType FROM day_i WHERE " + stringBuilder.toString();
+                break;
+            case 42:
+                sql = "SELECT i_13 as normValue,value_type as valueType FROM day_i WHERE " + stringBuilder.toString();
+                break;
+            case 43:
+                sql = "SELECT i_14 as normValue,value_type as valueType FROM day_i WHERE " + stringBuilder.toString();
+                break;
+            case 44:
+                sql = "SELECT i_15 as normValue,value_type as valueType FROM day_i WHERE " + stringBuilder.toString();
+                break;
+            case 45:
+                sql = "SELECT i_16 as normValue,value_type as valueType FROM day_i WHERE " + stringBuilder.toString();
+                break;
+            case 46:
+                sql = "SELECT i_17 as normValue,value_type as valueType FROM day_i WHERE " + stringBuilder.toString();
+                break;
+            case 47:
+                sql = "SELECT i_18 as normValue,value_type as valueType FROM day_i WHERE " + stringBuilder.toString();
+                break;
+            case 48:
+                sql = "SELECT i_19 as normValue,value_type as valueType FROM day_i WHERE " + stringBuilder.toString();
+                break;
+            case 49:
+                sql = "SELECT i_20 as normValue,value_type as valueType FROM day_i WHERE " + stringBuilder.toString();
+                break;
+            case 50:
+                sql = "SELECT i_21 as normValue,value_type as valueType FROM day_i WHERE " + stringBuilder.toString();
+                break;
+            case 51:
+                sql = "SELECT i_22 as normValue,value_type as valueType FROM day_i WHERE " + stringBuilder.toString();
+                break;
+            case 52:
+                sql = "SELECT i_23 as normValue,value_type as valueType FROM day_i WHERE " + stringBuilder.toString();
+                break;
+            case 53:
+                sql = "SELECT i_24 as normValue,value_type as valueType FROM day_i WHERE " + stringBuilder.toString();
+                break;
+            case 54:
+                sql = "SELECT i_25 as normValue,value_type as valueType FROM day_i WHERE " + stringBuilder.toString();
+                break;
+            case 55:
+                sql = "SELECT v_1 as normValue,value_type as valueType FROM day_inharmrate_v WHERE " + stringBuilder.toString();
+                break;
+            case 56:
+                sql = "SELECT v_2 as normValue,value_type as valueType FROM day_inharmrate_v WHERE " + stringBuilder.toString();
+                break;
+            case 57:
+                sql = "SELECT v_3 as normValue,value_type as valueType FROM day_inharmrate_v WHERE " + stringBuilder.toString();
+                break;
+            case 58:
+                sql = "SELECT v_4 as normValue,value_type as valueType FROM day_inharmrate_v WHERE " + stringBuilder.toString();
+                break;
+            case 59:
+                sql = "SELECT v_5 as normValue,value_type as valueType FROM day_inharmrate_v WHERE " + stringBuilder.toString();
+                break;
+            case 60:
+                sql = "SELECT v_6 as normValue,value_type as valueType FROM day_inharmrate_v WHERE " + stringBuilder.toString();
+                break;
+            case 61:
+                sql = "SELECT v_7 as normValue,value_type as valueType FROM day_inharmrate_v WHERE " + stringBuilder.toString();
+                break;
+            case 62:
+                sql = "SELECT v_8 as normValue,value_type as valueType FROM day_inharmrate_v WHERE " + stringBuilder.toString();
+                break;
+            case 63:
+                sql = "SELECT v_9 as normValue,value_type as valueType FROM day_inharmrate_v WHERE " + stringBuilder.toString();
+                break;
+            case 64:
+                sql = "SELECT v_10 as normValue,value_type as valueType FROM day_inharmrate_v WHERE " + stringBuilder.toString();
+                break;
+            case 65:
+                sql = "SELECT v_11 as normValue,value_type as valueType FROM day_inharmrate_v WHERE " + stringBuilder.toString();
+                break;
+            case 66:
+                sql = "SELECT v_12 as normValue,value_type as valueType FROM day_inharmrate_v WHERE " + stringBuilder.toString();
+                break;
+            case 67:
+                sql = "SELECT v_13 as normValue,value_type as valueType FROM day_inharmrate_v WHERE " + stringBuilder.toString();
+                break;
+            case 68:
+                sql = "SELECT v_14 as normValue,value_type as valueType FROM day_inharmrate_v WHERE " + stringBuilder.toString();
+                break;
+            case 69:
+                sql = "SELECT v_15 as normValue,value_type as valueType FROM day_inharmrate_v WHERE " + stringBuilder.toString();
+                break;
+            case 70:
+                sql = "SELECT v_16 as normValue,value_type as valueType FROM day_inharmrate_v WHERE " + stringBuilder.toString();
+                break;
+            case 71:
+                sql = "SELECT plt as normValue,value_type as valueType FROM day_plt WHERE " + stringBuilder.toString();
+                break;
+
+
+        }
+        //进行查询数据
+        QueryResult result = influxDbUtils.query(sql);
+        List<QueryResult.Series> list = result.getResults().get(0).getSeries();
+        if (!CollectionUtils.isEmpty(list)) {
+            list.forEach(po -> {
+                List<List<Object>> valueList = po.getValues();
+                if (!CollectionUtils.isEmpty(valueList)) {
+                    for (List<Object> value : valueList) {
+                        AbnormalVO abnormalVO = new AbnormalVO();
+                        //谐波畸变率 保留两位小数
+                        Double distortion = value.get(1) == null ? null : BigDecimal.valueOf(Double.parseDouble(value.get(1).toString())).setScale(4, BigDecimal.ROUND_HALF_UP).doubleValue();
+                        abnormalVO.setValueType(value.get(2).toString());
+                        abnormalVO.setNormValue(distortion.floatValue());
+                        abnormalVOList.add(abnormalVO);
+                    }
+                }
+            });
+            return abnormalVOList;
+        } else {
+            return abnormalVOList;
+        }
+    }
+}
diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/Impl/line/OnlineRateServiceImpl.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/Impl/line/OnlineRateServiceImpl.java
new file mode 100644
index 000000000..6c8be660e
--- /dev/null
+++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/Impl/line/OnlineRateServiceImpl.java
@@ -0,0 +1,162 @@
+package com.njcn.prepare.harmonic.service.Impl.line;
+
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.date.DateUnit;
+import cn.hutool.core.date.DateUtil;
+import com.njcn.device.pq.api.LineFeignClient;
+import com.njcn.energy.pojo.constant.ModelState;
+import com.njcn.influxdb.utils.InfluxDbUtils;
+import com.njcn.prepare.harmonic.pojo.dto.OnLineRateDTO;
+import com.njcn.prepare.harmonic.pojo.param.LineParam;
+
+import com.njcn.prepare.harmonic.pojo.po.PqsCommunicatePO;
+import com.njcn.prepare.harmonic.service.line.OnlineRateService;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.influxdb.InfluxDB;
+import org.influxdb.dto.BatchPoints;
+import org.influxdb.dto.Point;
+import org.influxdb.dto.QueryResult;
+import org.influxdb.impl.InfluxDBResultMapper;
+import org.springframework.stereotype.Service;
+
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+import java.util.*;
+import java.util.concurrent.TimeUnit;
+
+import static com.njcn.influxdb.param.InfluxDBPublicParam.DAY_MINUTE;
+
+/**
+ * 生成在线率数据
+ *
+ * @author xiaoyao
+ * @version 1.0.0
+ * @createTime 2022/10/27 9:23
+ */
+@Slf4j
+@Service
+@AllArgsConstructor
+public class OnlineRateServiceImpl implements OnlineRateService {
+
+    private final InfluxDbUtils influxDbUtils;
+
+    private final LineFeignClient lineFeignClient;
+
+    @Override
+    public void getOnlineRateData(LineParam lineParam) {
+        List<String> lineIdList = lineParam.getLineIds();
+        if (CollUtil.isEmpty(lineParam.getLineIds())){
+            lineIdList = lineFeignClient.getDeviceList().getData();
+        }
+        List<PqsCommunicatePO> outCommunicateData = new ArrayList<>();
+        for (String lineId : lineIdList){
+            List<PqsCommunicatePO> communicateData = getCommunicateData(lineId);
+            outCommunicateData.addAll(communicateData);
+        }
+        List<String> records = new ArrayList<>();
+        Date dateOut = DateUtil.parse(lineParam.getDataDate());
+        for (PqsCommunicatePO pqsCommunicate : outCommunicateData){
+            Map<String, String> tags = new HashMap<>();
+            Map<String, Object> fields = new HashMap<>();
+            Date newDate = Date.from(pqsCommunicate.getTime());
+            OnLineRateDTO onLineRate = onLineMinute(newDate,dateOut,pqsCommunicate.getType(),pqsCommunicate.getLineId(),lineParam.getDataDate());
+            tags.put("dev_id",pqsCommunicate.getLineId());
+            fields.put("online_min",onLineRate.getOnLineMinute());
+            fields.put("offline_min",onLineRate.getOffLineMinute());
+            fields.put("online_rate",onLineRate.getRate());
+            Point point = influxDbUtils.pointBuilder("pqs_onlinerate", dateOut.getTime(), TimeUnit.MILLISECONDS,tags, fields);
+            BatchPoints batchPoints = BatchPoints.database(influxDbUtils.getDbName()).tag("dev_id", pqsCommunicate.getLineId()).retentionPolicy("").consistency(InfluxDB.ConsistencyLevel.ALL).build();
+            batchPoints.point(point);
+            records.add(batchPoints.lineProtocol());
+        }
+        influxDbUtils.batchInsert(influxDbUtils.getDbName(),"", InfluxDB.ConsistencyLevel.ALL, records);
+    }
+
+    /**
+     * 获取pqs_communicate数据
+     */
+    private List<PqsCommunicatePO> getCommunicateData(String lineId){
+        QueryResult sqlResult = influxDbUtils.query("SELECT * FROM pqs_communicate where line_id = '" + lineId +"' order by time desc limit 1 tz('Asia/Shanghai')");
+        InfluxDBResultMapper resultMapper = new InfluxDBResultMapper();
+        return resultMapper.toPOJO(sqlResult, PqsCommunicatePO.class);
+    }
+
+    /**
+     * 获取范围时间内的pqs_communicate数据
+     */
+    private List<PqsCommunicatePO> getCommunicateData(String lineId, String date){
+        QueryResult sqlResult = influxDbUtils.query("SELECT * FROM pqs_communicate where time >= '" + date + " 00:00:00' and time <= '" + date + " 23:59:59' and line_id = '" + lineId +"' order by time asc tz('Asia/Shanghai')");
+        InfluxDBResultMapper resultMapper = new InfluxDBResultMapper();
+        return resultMapper.toPOJO(sqlResult, PqsCommunicatePO.class);
+    }
+
+    /**
+     * new的时间和当前统计时间 不是/是 同一天
+     */
+    private OnLineRateDTO onLineMinute(Date newDate, Date date, Integer type,String lineId,String dateStr){
+        OnLineRateDTO onLineRate = new OnLineRateDTO();
+        Integer minute = 0;
+        /*new的时间和当前统计时间是同一天*/
+        if (DateUtil.isSameDay(newDate,date)){
+            minute = processData(newDate, date, type, lineId, dateStr);
+        }else {
+            /*new的时间和当前统计时间不是同一天*/
+            Date nowDate = new Date();
+            /*数据补招的情况下*/
+            if (DateUtil.between(date,nowDate,DateUnit.DAY) > DateUtil.between(newDate,nowDate,DateUnit.DAY)){
+                minute = processData(newDate, date, type, lineId, dateStr);
+            }else {
+                if (ModelState.online.equals(type)){
+                    minute = DAY_MINUTE;
+                }
+            }
+        }
+        onLineRate.setOnLineMinute(minute);
+        onLineRate.setOffLineMinute(DAY_MINUTE - minute);
+        BigDecimal onLine = BigDecimal.valueOf(onLineRate.getOnLineMinute());
+        BigDecimal offLine = BigDecimal.valueOf(onLineRate.getOffLineMinute());
+        double rate = onLine.divide(onLine.add(offLine),4, RoundingMode.HALF_UP).doubleValue();
+        onLineRate.setRate(rate*100);
+        return onLineRate;
+    }
+
+    private Integer processData(Date newDate, Date date, Integer type,String lineId,String dateStr){
+        int minute = 0;
+        List<PqsCommunicatePO> communicateData = getCommunicateData(lineId,dateStr);
+        /*当前统计时间内存在多条数据*/
+        if (communicateData.size() > 1){
+            Date lastTime = null;
+            long onlineTime = 0;
+            long offlineTime = 0;
+            for (int i=0; i<communicateData.size(); i++){
+                long differ;
+                if (i==0){
+                    /*首次比较取统计时间*/
+                    differ = DateUtil.between(date,Date.from(communicateData.get(i).getTime()),DateUnit.MINUTE);
+                }else {
+                    /*后续取上一次数据时间*/
+                    differ = DateUtil.between(lastTime,Date.from(communicateData.get(i).getTime()),DateUnit.MINUTE);
+                }
+                if (ModelState.online.equals(communicateData.get(i).getType())){
+                    offlineTime = offlineTime + differ;
+                }else {
+                    onlineTime = onlineTime + differ;
+                }
+                lastTime = Date.from(communicateData.get(i).getTime());
+            }
+            if (ModelState.online.equals(communicateData.get(communicateData.size()-1).getType())){
+                minute = DAY_MINUTE - (int)offlineTime;
+            }else {
+                minute = (int)onlineTime;
+            }
+        }else {
+            /*当前统计时间内仅有一条数据*/
+            long differ = DateUtil.between(date,newDate,DateUnit.MINUTE);
+            if (ModelState.online.equals(type)){
+                minute = DAY_MINUTE - (int)differ;
+            }
+        }
+        return minute;
+    }
+}
diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/Impl/line/PollutionServiceImpl.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/Impl/line/PollutionServiceImpl.java
new file mode 100644
index 000000000..1ab4a4052
--- /dev/null
+++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/Impl/line/PollutionServiceImpl.java
@@ -0,0 +1,745 @@
+package com.njcn.prepare.harmonic.service.Impl.line;
+
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.date.LocalDateTimeUtil;
+import cn.hutool.core.date.TimeInterval;
+import cn.hutool.core.util.StrUtil;
+import com.njcn.common.pojo.constant.BizParamConstant;
+import com.njcn.common.pojo.response.HttpResult;
+import com.njcn.common.utils.LogUtil;
+import com.njcn.device.pq.api.DeptLineFeignClient;
+import com.njcn.device.pq.api.LineFeignClient;
+import com.njcn.device.pq.pojo.po.Overlimit;
+import com.njcn.harmonic.pojo.dto.PublicDTO;
+import com.njcn.influxdb.utils.InfluxDbUtils;
+import com.njcn.prepare.harmonic.mapper.line.*;
+import com.njcn.prepare.harmonic.pojo.dto.PollutionDTO;
+import com.njcn.prepare.harmonic.pojo.param.LineParam;
+import com.njcn.prepare.harmonic.pojo.po.*;
+import com.njcn.prepare.harmonic.service.line.PollutionService;
+import com.njcn.system.api.DicDataFeignClient;
+import com.njcn.system.enums.DicDataTypeEnum;
+import com.njcn.system.pojo.po.DictData;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.influxdb.InfluxDB;
+import org.influxdb.dto.BatchPoints;
+import org.influxdb.dto.Point;
+import org.influxdb.dto.QueryResult;
+import org.influxdb.impl.InfluxDBResultMapper;
+import org.springframework.stereotype.Service;
+
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+import java.time.LocalDateTime;
+import java.util.*;
+import java.util.concurrent.TimeUnit;
+import java.util.function.BinaryOperator;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+/**
+ * 监测点污染指标
+ *
+ * @author xiaoyao
+ * @version 1.0.0
+ * @createTime 2022/10/18 9:16
+ */
+
+@Slf4j
+@Service
+@AllArgsConstructor
+public class PollutionServiceImpl implements PollutionService {
+
+    private final InfluxDbUtils influxDbUtils;
+
+    private final LineFeignClient lineFeignClient;
+
+    private final DeptLineFeignClient deptLineFeignClient;
+
+    private final DicDataFeignClient dicDataFeignClient;
+
+    private final RStatPollutionOrgDMapper rStatPollutionOrgDMapper;
+
+    private final RStatPollutionOrgMMapper rStatPollutionOrgMMapper;
+
+    private final RStatPollutionOrgQMapper rStatPollutionOrgQMapper;
+
+    private final RStatPollutionOrgYMapper rStatPollutionOrgYMapper;
+
+    private final RStatPollutionSubstationDMapper rStatPollutionSubstationDMapper;
+
+    private final RStatPollutionSubstationMMapper rStatPollutionSubstationMMapper;
+
+    private final RStatPollutionSubstationQMapper rStatPollutionSubstationQMapper;
+
+    private final RStatPollutionSubstationYMapper rStatPollutionSubstationYMapper;
+
+    private final RMpPollutionDMapper rMpPollutionDMapper;
+
+    @Override
+    public void processPollutionData(LineParam lineParam) {
+        TimeInterval timer = new TimeInterval();
+        List<PollutionDTO> pollutionList;
+        //Line_id集合不存在以及时间类型为日的情况下执行influxdb计算
+        if (CollUtil.isEmpty(lineParam.getLineIds()) && Integer.valueOf(BizParamConstant.STAT_BIZ_DAY).equals(lineParam.getType())){
+            List<Overlimit> overLimitList = getAllLinesLimitData();
+            List<String> lineList = overLimitList.stream().map(Overlimit::getId).collect(Collectors.toList());
+            //指标数据获取
+            List<PublicDTO> harmonicVoltageList = getHarmonicVoltage(overLimitList,lineParam.getDataDate());
+            List<PublicDTO> harmonicCurrentList = getHarmonicCurrent(overLimitList,lineParam.getDataDate());
+            List<PublicDTO> frequencyDeviationList = getFrequencyDeviation(overLimitList,lineParam.getDataDate());
+            List<PublicDTO> voltageDeviationList = getVoltageDeviation(overLimitList,lineParam.getDataDate());
+            List<PublicDTO> threePhaseVoltageList = getThreePhaseVoltageUnbalance(overLimitList,lineParam.getDataDate());
+            List<PublicDTO> negativeSequenceList = getNegativeSequenceCurrent(overLimitList,lineParam.getDataDate());
+            List<PublicDTO> interharmonicVoltageList = getInterharmonicVoltage(overLimitList,lineParam.getDataDate());
+            List<PublicDTO> voltageFlickerList = getVoltageFlicker(overLimitList,lineParam.getDataDate());
+            LogUtil.njcnDebug(log, "监测点污染指标数据查询耗时：{}", timer.intervalRestart());
+
+            List<PollutionDTO> lineIdList = new ArrayList<>();
+            lineList.forEach(item->{
+                PollutionDTO pollutionDTO = new PollutionDTO();
+                pollutionDTO.setLineId(item);
+                lineIdList.add(pollutionDTO);
+            });
+            pollutionList = processPollutionList(lineIdList,harmonicVoltageList,harmonicCurrentList,frequencyDeviationList,voltageDeviationList,threePhaseVoltageList,negativeSequenceList,interharmonicVoltageList,voltageFlickerList);
+
+            Date dateOut = new Date();
+            //入表data_polluction
+            if (StrUtil.isNotBlank(lineParam.getDataDate())){
+                dateOut = DateUtil.parse(lineParam.getDataDate());
+            }
+            insertPolluction(pollutionList,dateOut.getTime());
+            LogUtil.njcnDebug(log, "监测点污染指标数据data_polluction插入耗时：{}", timer.intervalRestart());
+        }else {
+            //获取data_polluction数据
+            pollutionList = getDataPolluction(lineParam);
+        }
+        //MySql入表污区图表等
+        LocalDateTime local = LocalDateTimeUtil.now();
+        if (StrUtil.isNotBlank(lineParam.getDataDate())){
+            local = LocalDateTimeUtil.parse(lineParam.getDataDate() + "T00:00:00");
+        }
+        if (Integer.valueOf(BizParamConstant.STAT_BIZ_DAY).equals(lineParam.getType())){
+            insertLinePollution(pollutionList,local);
+        }
+        insertPolluctionMySql(pollutionList, local, lineParam.getType());
+        LogUtil.njcnDebug(log, "监测点污染指标数据完成耗时：{}", timer.intervalRestart());
+    }
+
+    /**
+     * MySql入表
+     */
+    private void insertPolluctionMySql(List<PollutionDTO> pollutionList, LocalDateTime local, Integer type){
+        HttpResult<Map<String, List<String>>> substationOut = lineFeignClient.getLineBySubstationRelation(1);
+        HttpResult<Map<String, List<String>>> unitOut = deptLineFeignClient.getLineByDeptRelation(1);
+        Map<String, List<String>> substationMap = substationOut.getData();
+        Map<String, List<String>> unitMap = unitOut.getData();
+        List<DictData> polluctionList = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.POLLUTION_STATIS.getCode()).getData();
+
+        insertSubstation(polluctionList,substationMap,pollutionList,local,type);
+        insertUnit(polluctionList,unitMap,pollutionList,local,type);
+    }
+
+    private List<PollutionDTO> getDataPolluction(LineParam lineParam){
+        List<String> lineList;
+        if (CollUtil.isEmpty(lineParam.getLineIds())){
+            List<Overlimit> overLimitList = getAllLinesLimitData();
+            lineList = overLimitList.stream().map(Overlimit::getId).collect(Collectors.toList());
+        }else {
+            lineList = new ArrayList<>(lineParam.getLineIds());
+        }
+        List<PollutionDTO> pollutionDTOList = new ArrayList<>();
+        InfluxDBResultMapper resultMapper = new InfluxDBResultMapper();
+        for (String lineId : lineList){
+            String sql="SELECT * FROM data_polluction where line_id = '" + lineId +"' "+processDate(lineParam.getDataDate(),lineParam.getType());
+            QueryResult dataPolluctionResult = influxDbUtils.query(sql);
+            List<DataPolluctionPO> threePhaseList = resultMapper.toPOJO(dataPolluctionResult, DataPolluctionPO.class);
+            for (DataPolluctionPO dataPolluction : threePhaseList){
+                PollutionDTO pollutionDTO = new PollutionDTO();
+                pollutionDTO.setLineId(dataPolluction.getLineId());
+                pollutionDTO.setFreqDev(dataPolluction.getFreqDev());
+                pollutionDTO.setVDev(dataPolluction.getVDev());
+                pollutionDTO.setVUnbalance(dataPolluction.getVUnbalance());
+                pollutionDTO.setVAll(dataPolluction.getVAll());
+                pollutionDTO.setPlt(dataPolluction.getPlt());
+                pollutionDTO.setIAll(dataPolluction.getIAll());
+                pollutionDTO.setINeg(dataPolluction.getINeg());
+                pollutionDTO.setVInharm(dataPolluction.getVInharm());
+                pollutionDTOList.add(pollutionDTO);
+            }
+        }
+        return pollutionDTOList;
+    }
+
+    /*MySql入表 r_mp_pollution_d*/
+    private void insertLinePollution(List<PollutionDTO> pollutionList, LocalDateTime local){
+        for (PollutionDTO pollution : pollutionList){
+            RMpPollutionD rMpPollution = new RMpPollutionD();
+            rMpPollution.setLineId(pollution.getLineId());
+            rMpPollution.setFreqDev(pollution.getFreqDev().floatValue());
+            rMpPollution.setvDev(pollution.getVDev().floatValue());
+            rMpPollution.setvUnbalance(pollution.getVUnbalance().floatValue());
+            rMpPollution.setvAll(pollution.getVAll().floatValue());
+            rMpPollution.setPlt(pollution.getPlt().floatValue());
+            rMpPollution.setiAll(pollution.getIAll().floatValue());
+            rMpPollution.setiNeg(pollution.getINeg().floatValue());
+            rMpPollution.setvInharm(pollution.getVInharm().floatValue());
+            rMpPollution.setDataDate(local);
+            rMpPollutionDMapper.insertPollution(rMpPollution);
+        }
+    }
+
+    /*MySql入表 r_stat_pollution_substation*/
+    private void insertSubstation(List<DictData> polluctionList,Map<String, List<String>> substationMap,List<PollutionDTO> pollutionList,LocalDateTime local, Integer type){
+        for (String key : substationMap.keySet()){
+            List<PollutionDTO> processList = new ArrayList<>();
+            List<String> substationList = substationMap.get(key);
+            for(String lineid : substationList){
+                for (PollutionDTO pollution : pollutionList){
+                    if (lineid.equals(pollution.getLineId())){
+                        processList.add(pollution);
+                    }
+                }
+            }
+            Map<String, Object> inMap = new HashMap<>();
+            inMap.put("orgId",key);
+            inMap.put("dataDate",local);
+            for (DictData dictData : polluctionList){
+                inMap = processData(dictData,processList,inMap);
+                if (Integer.valueOf(BizParamConstant.STAT_BIZ_DAY).equals(type)){
+                    rStatPollutionOrgDMapper.insertPollution(inMap);
+                }else if (Integer.valueOf(BizParamConstant.STAT_BIZ_MONTH).equals(type)){
+                    rStatPollutionOrgMMapper.insertPollution(inMap);
+                }else if (Integer.valueOf(BizParamConstant.STAT_BIZ_QUARTER).equals(type)){
+                    rStatPollutionOrgQMapper.insertPollution(inMap);
+                }else if (Integer.valueOf(BizParamConstant.STAT_BIZ_YEAR).equals(type)){
+                    rStatPollutionOrgYMapper.insertPollution(inMap);
+                }
+            }
+        }
+    }
+
+    /*MySql入表 r_stat_pollution_org*/
+    private void insertUnit(List<DictData> polluctionList,Map<String, List<String>> unitMap,List<PollutionDTO> pollutionList,LocalDateTime local, Integer type){
+        for (String key : unitMap.keySet()){
+            List<PollutionDTO> processList = new ArrayList<>();
+            List<String> unitList = unitMap.get(key);
+            for(String lineid : unitList){
+                for (PollutionDTO pollution : pollutionList){
+                    if (lineid.equals(pollution.getLineId())){
+                        processList.add(pollution);
+                    }
+                }
+            }
+            Map<String, Object> inMap = new HashMap<>();
+            inMap.put("substationId",key);
+            inMap.put("dataDate",local);
+            for (DictData dictData : polluctionList){
+                inMap = processData(dictData,processList,inMap);
+                if (Integer.valueOf(BizParamConstant.STAT_BIZ_DAY).equals(type)){
+                    rStatPollutionSubstationDMapper.insertPollution(inMap);
+                }else if (Integer.valueOf(BizParamConstant.STAT_BIZ_MONTH).equals(type)){
+                    rStatPollutionSubstationMMapper.insertPollution(inMap);
+                }else if (Integer.valueOf(BizParamConstant.STAT_BIZ_QUARTER).equals(type)){
+                    rStatPollutionSubstationQMapper.insertPollution(inMap);
+                }else if (Integer.valueOf(BizParamConstant.STAT_BIZ_YEAR).equals(type)){
+                    rStatPollutionSubstationYMapper.insertPollution(inMap);
+                }
+            }
+        }
+    }
+
+    private Map<String, Object> processData(DictData dictData,List<PollutionDTO> processList,Map<String, Object> map){
+        if ("Freq_Dev".equals(dictData.getCode())){
+            map.put("pollutionType",dictData.getId());
+            map.put("value",processList.stream().max(Comparator.comparing(PollutionDTO::getFreqDev)).get().getFreqDev());
+        }
+        if ("V_Dev".equals(dictData.getCode())){
+            map.put("pollutionType",dictData.getId());
+            map.put("value",processList.stream().max(Comparator.comparing(PollutionDTO::getVDev)).get().getVDev());
+        }
+        if ("V_Unbalance".equals(dictData.getCode())){
+            map.put("pollutionType",dictData.getId());
+            map.put("value",processList.stream().max(Comparator.comparing(PollutionDTO::getVUnbalance)).get().getVUnbalance());
+        }
+        if ("V_All".equals(dictData.getCode())){
+            map.put("pollutionType",dictData.getId());
+            map.put("value",processList.stream().max(Comparator.comparing(PollutionDTO::getVAll)).get().getVAll());
+        }
+        if ("Plt".equals(dictData.getCode())){
+            map.put("pollutionType",dictData.getId());
+            map.put("value",processList.stream().max(Comparator.comparing(PollutionDTO::getPlt)).get().getPlt());
+        }
+        if ("I_All".equals(dictData.getCode())){
+            map.put("pollutionType",dictData.getId());
+            map.put("value",processList.stream().max(Comparator.comparing(PollutionDTO::getIAll)).get().getIAll());
+        }
+        if ("I_Neg".equals(dictData.getCode())){
+            map.put("pollutionType",dictData.getId());
+            map.put("value",processList.stream().max(Comparator.comparing(PollutionDTO::getINeg)).get().getINeg());
+        }
+        if ("V_Inharm".equals(dictData.getCode())){
+            map.put("pollutionType",dictData.getId());
+            map.put("value",processList.stream().max(Comparator.comparing(PollutionDTO::getVInharm)).get().getVInharm());
+        }
+        return map;
+    }
+
+    /**
+     * 谐波电压：取监测点最新的A、B、C三相数据，再取电压总谐波畸变率、各次谐波电压含有率（2~25次）中的最大值，作为结果
+     */
+    private List<PublicDTO> getHarmonicVoltage(List<Overlimit> overLimitList,String dataDate){
+        List<PublicDTO> list = new ArrayList<>();
+        Map<String, Optional<PublicDTO>> threePhase = getThreePhaseData(overLimitList,dataDate);
+        Map<String, Optional<PublicDTO>> distortionRate = getDistortionRateData(overLimitList,dataDate);
+        for (String key : threePhase.keySet()) {
+            list.add(threePhase.get(key).get());
+        }
+        for (String key : distortionRate.keySet()) {
+            list.add(distortionRate.get(key).get());
+        }
+        Comparator<PublicDTO> comparator = Comparator.comparing(PublicDTO::getData);
+        Map<String, Optional<PublicDTO>> outMap = list.stream().collect(Collectors.groupingBy(PublicDTO::getId,Collectors.reducing(BinaryOperator.maxBy(comparator))));
+        return process(outMap);
+    }
+
+    private Map<String, Optional<PublicDTO>> getThreePhaseData(List<Overlimit> overLimitList,String dataDate){
+        String sql = "SELECT * FROM day_v where value_type = 'CP95' and (phasic_type = 'A' or phasic_type = 'B' or phasic_type = 'C') " + processDate(dataDate,Integer.valueOf(BizParamConstant.STAT_BIZ_DAY)) +" group by line_id order by time desc limit 3 tz('Asia/Shanghai')";
+        InfluxDBResultMapper resultMapper = new InfluxDBResultMapper();
+        List<Double> data;
+        PublicDTO publicDTO;
+        List<PublicDTO> lineData = new ArrayList<>();
+        QueryResult threePhaseSqlResult = influxDbUtils.query(sql);
+        List<DayVPO> threePhaseList = resultMapper.toPOJO(threePhaseSqlResult, DayVPO.class);
+        for (DayVPO item1 : threePhaseList) {
+            for (Overlimit item2 : overLimitList) {
+                if (Objects.equals(item1.getLineId(),item2.getId())){
+                    double vUnbalance = item1.getVUnbalance()/item2.getUaberrance();
+                    data = Stream.of(vUnbalance).collect(Collectors.toList());
+                    double result = data.stream().max(Comparator.comparing(Double::doubleValue)).get();
+                    publicDTO = new PublicDTO();
+                    publicDTO.setId(item1.getLineId());
+                    publicDTO.setData(result);
+                    lineData.add(publicDTO);
+                }
+            }
+        }
+        Comparator<PublicDTO> comparator = Comparator.comparing(PublicDTO::getData);
+        return lineData.stream().collect(Collectors.groupingBy(PublicDTO::getId,Collectors.reducing(BinaryOperator.maxBy(comparator))));
+    }
+
+    private Map<String, Optional<PublicDTO>> getDistortionRateData(List<Overlimit> overLimitList,String dataDate){
+        String sql = "SELECT * FROM day_harmrate_v where value_type = 'CP95' and (phasic_type = 'A' or phasic_type = 'B' or phasic_type = 'C') "+ processDate(dataDate,Integer.valueOf(BizParamConstant.STAT_BIZ_DAY)) +"group by line_id order by time desc limit 3 tz('Asia/Shanghai')";
+        InfluxDBResultMapper resultMapper = new InfluxDBResultMapper();
+        List<Double> data;
+        PublicDTO publicDTO;
+        List<PublicDTO> lineData = new ArrayList<>();
+        QueryResult distortionRateSqlResult = influxDbUtils.query(sql);
+        List<DayHarmrateVPO> distortionRateList = resultMapper.toPOJO(distortionRateSqlResult, DayHarmrateVPO.class);
+        for (DayHarmrateVPO dayHarmrateV : distortionRateList) {
+            for (Overlimit overlimit : overLimitList) {
+                if (Objects.equals(dayHarmrateV.getLineId(),overlimit.getId())){
+                    double v2 = dayHarmrateV.getV2()/overlimit.getUharm2();
+                    double v3 = dayHarmrateV.getV3()/overlimit.getUharm3();
+                    double v4 = dayHarmrateV.getV4()/overlimit.getUharm4();
+                    double v5 = dayHarmrateV.getV5()/overlimit.getUharm5();
+                    double v6 = dayHarmrateV.getV6()/overlimit.getUharm6();
+                    double v7 = dayHarmrateV.getV7()/overlimit.getUharm7();
+                    double v8 = dayHarmrateV.getV8()/overlimit.getUharm8();
+                    double v9 = dayHarmrateV.getV9()/overlimit.getUharm9();
+                    double v10 = dayHarmrateV.getV10()/overlimit.getUharm10();
+                    double v11 = dayHarmrateV.getV11()/overlimit.getUharm11();
+                    double v12 = dayHarmrateV.getV12()/overlimit.getUharm12();
+                    double v13 = dayHarmrateV.getV13()/overlimit.getUharm13();
+                    double v14 = dayHarmrateV.getV14()/overlimit.getUharm14();
+                    double v15 = dayHarmrateV.getV15()/overlimit.getUharm15();
+                    double v16 = dayHarmrateV.getV16()/overlimit.getUharm16();
+                    double v17 = dayHarmrateV.getV17()/overlimit.getUharm17();
+                    double v18 = dayHarmrateV.getV18()/overlimit.getUharm18();
+                    double v19 = dayHarmrateV.getV19()/overlimit.getUharm19();
+                    double v20 = dayHarmrateV.getV20()/overlimit.getUharm20();
+                    double v21 = dayHarmrateV.getV21()/overlimit.getUharm21();
+                    double v22 = dayHarmrateV.getV22()/overlimit.getUharm22();
+                    double v23 = dayHarmrateV.getV23()/overlimit.getUharm23();
+                    double v24 = dayHarmrateV.getV24()/overlimit.getUharm24();
+                    double v25 = dayHarmrateV.getV25()/overlimit.getUharm25();
+                    data = Stream.of(v2,v3,v4,v5,v6,v7,v8,v9,v10,v11,v12,v13,v14,v15,v16,v17,v18,v19,v20,v21,v22,v23,v24,v25).collect(Collectors.toList());
+                    double result = data.stream().max(Comparator.comparing(Double::doubleValue)).get();
+                    publicDTO = new PublicDTO();
+                    publicDTO.setId(dayHarmrateV.getLineId());
+                    publicDTO.setData(result);
+                    lineData.add(publicDTO);
+                }
+            }
+        }
+        Comparator<PublicDTO> comparator = Comparator.comparing(PublicDTO::getData);
+        return lineData.stream().collect(Collectors.groupingBy(PublicDTO::getId,Collectors.reducing(BinaryOperator.maxBy(comparator))));
+    }
+
+    /**
+     * 谐波电流：各次谐波电流（2~25次），取各监测点最新的A、B、C三相数据。
+     */
+    private List<PublicDTO> getHarmonicCurrent(List<Overlimit> overLimitList,String dataDate){
+        String sql = "SELECT * FROM day_i where value_type = 'CP95' and (phasic_type = 'A' or phasic_type = 'B' or phasic_type = 'C')"+ processDate(dataDate,Integer.valueOf(BizParamConstant.STAT_BIZ_DAY)) +" group by line_id order by time desc limit 3 tz('Asia/Shanghai')";
+        InfluxDBResultMapper resultMapper = new InfluxDBResultMapper();
+        List<Double> data;
+        PublicDTO publicDTO;
+        List<PublicDTO> lineData = new ArrayList<>();
+        QueryResult sqlResult = influxDbUtils.query(sql);
+        List<DayIPO> list = resultMapper.toPOJO(sqlResult, DayIPO.class);
+        for (DayIPO dayI : list) {
+            for (Overlimit overlimit : overLimitList) {
+                if (Objects.equals(dayI.getLineId(),overlimit.getId())){
+                    double v2 = dayI.getI2()/overlimit.getIharm2();
+                    double v3 = dayI.getI3()/overlimit.getIharm3();
+                    double v4 = dayI.getI4()/overlimit.getIharm4();
+                    double v5 = dayI.getI5()/overlimit.getIharm5();
+                    double v6 = dayI.getI6()/overlimit.getIharm6();
+                    double v7 = dayI.getI7()/overlimit.getIharm7();
+                    double v8 = dayI.getI8()/overlimit.getIharm8();
+                    double v9 = dayI.getI9()/overlimit.getIharm9();
+                    double v10 = dayI.getI10()/overlimit.getIharm10();
+                    double v11 = dayI.getI11()/overlimit.getIharm11();
+                    double v12 = dayI.getI12()/overlimit.getIharm12();
+                    double v13 = dayI.getI13()/overlimit.getIharm13();
+                    double v14 = dayI.getI14()/overlimit.getIharm14();
+                    double v15 = dayI.getI15()/overlimit.getIharm15();
+                    double v16 = dayI.getI16()/overlimit.getIharm16();
+                    double v17 = dayI.getI17()/overlimit.getIharm17();
+                    double v18 = dayI.getI18()/overlimit.getIharm18();
+                    double v19 = dayI.getI19()/overlimit.getIharm19();
+                    double v20 = dayI.getI20()/overlimit.getIharm20();
+                    double v21 = dayI.getI21()/overlimit.getIharm21();
+                    double v22 = dayI.getI22()/overlimit.getIharm22();
+                    double v23 = dayI.getI23()/overlimit.getIharm23();
+                    double v24 = dayI.getI24()/overlimit.getIharm24();
+                    double v25 = dayI.getI25()/overlimit.getIharm25();
+                    data = Stream.of(v2,v3,v4,v5,v6,v7,v8,v9,v10,v11,v12,v13,v14,v15,v16,v17,v18,v19,v20,v21,v22,v23,v24,v25).collect(Collectors.toList());
+                    double result = data.stream().max(Comparator.comparing(Double::doubleValue)).get();
+                    publicDTO = new PublicDTO();
+                    publicDTO.setId(dayI.getLineId());
+                    publicDTO.setData(result);
+                    lineData.add(publicDTO);
+                }
+            }
+        }
+        Comparator<PublicDTO> comparator = Comparator.comparing(PublicDTO::getData);
+        Map<String, Optional<PublicDTO>> outMap = lineData.stream().collect(Collectors.groupingBy(PublicDTO::getId,Collectors.reducing(BinaryOperator.maxBy(comparator))));
+        return process(outMap);
+    }
+
+    /**
+     * 频率偏差：各监测点最新的T相数据，取频率上下偏差的绝对值中的最大值。
+     */
+    private List<PublicDTO> getFrequencyDeviation(List<Overlimit> overLimitList,String dataDate){
+        String sql = "SELECT line_id,abs(freq_dev) AS freq_dev FROM day_v where phasic_type = 'T' and (value_type = 'MIN' or value_type = 'MAX') "+ processDate(dataDate,Integer.valueOf(BizParamConstant.STAT_BIZ_DAY)) +"group by line_id order by time desc limit 2 tz('Asia/Shanghai')";
+        InfluxDBResultMapper resultMapper = new InfluxDBResultMapper();
+        List<Double> data;
+        PublicDTO publicDTO;
+        List<PublicDTO> lineData = new ArrayList<>();
+        QueryResult sqlResult = influxDbUtils.query(sql);
+        List<DayVPO> list = resultMapper.toPOJO(sqlResult, DayVPO.class);
+        for (DayVPO dayV : list) {
+            for (Overlimit overlimit : overLimitList) {
+                if (Objects.equals(dayV.getLineId(),overlimit.getId())){
+                    double freqDev = dayV.getFreqDev()/overlimit.getFreqDev();
+                    data = Stream.of(freqDev).collect(Collectors.toList());
+                    double result = data.stream().max(Comparator.comparing(Double::doubleValue)).get();
+                    publicDTO = new PublicDTO();
+                    publicDTO.setId(dayV.getLineId());
+                    publicDTO.setData(result);
+                    lineData.add(publicDTO);
+                }
+            }
+        }
+        Comparator<PublicDTO> comparator = Comparator.comparing(PublicDTO::getData);
+        Map<String, Optional<PublicDTO>> outMap = lineData.stream().collect(Collectors.groupingBy(PublicDTO::getId,Collectors.reducing(BinaryOperator.maxBy(comparator))));
+        return process(outMap);
+    }
+
+    /**
+     * 电压偏差：各监测点最新的A、B、C三相数据，取电压上下偏差的绝对值中的最大值。
+     */
+    private List<PublicDTO> getVoltageDeviation(List<Overlimit> overLimitList,String dataDate){
+        String sql = "SELECT line_id,vu_dev,vl_dev,value_type FROM day_v where (phasic_type = 'A' or phasic_type = 'B' or phasic_type = 'C') and (value_type = 'MIN' or value_type = 'MAX') "+ processDate(dataDate,Integer.valueOf(BizParamConstant.STAT_BIZ_DAY)) +" group by line_id order by time desc limit 6 tz('Asia/Shanghai')";
+        QueryResult sqlResult = influxDbUtils.query(sql);
+        InfluxDBResultMapper resultMapper = new InfluxDBResultMapper();
+        List<Double> data;
+        PublicDTO publicDTO;
+        List<PublicDTO> lineData = new ArrayList<>();
+        List<DayVPO> list = resultMapper.toPOJO(sqlResult, DayVPO.class);
+        for (DayVPO dayV : list) {
+            for (Overlimit overlimit : overLimitList) {
+                if (Objects.equals(dayV.getLineId(),overlimit.getId())){
+                    double vlDev = Math.abs(dayV.getVlDev()/overlimit.getUvoltageDev());
+                    double vuDev = Math.abs(dayV.getVuDev()/overlimit.getVoltageDev());
+                    data = Stream.of(vuDev,vlDev).collect(Collectors.toList());
+                    double result = data.stream().max(Comparator.comparing(Double::doubleValue)).get();
+                    publicDTO = new PublicDTO();
+                    publicDTO.setId(dayV.getLineId());
+                    publicDTO.setData(result);
+                    lineData.add(publicDTO);
+                }
+            }
+        }
+        Comparator<PublicDTO> comparator = Comparator.comparing(PublicDTO::getData);
+        Map<String, Optional<PublicDTO>> outMap = lineData.stream().collect(Collectors.groupingBy(PublicDTO::getId,Collectors.reducing(BinaryOperator.maxBy(comparator))));
+        return process(outMap);
+    }
+
+    /**
+     * 三相电压不平衡度：各监测点最新的T相数据。
+     */
+    private List<PublicDTO> getThreePhaseVoltageUnbalance(List<Overlimit> overLimitList,String dataDate){
+        String sql = "SELECT line_id,v_unbalance,value_type FROM day_v where phasic_type = 'T' and (value_type = 'CP95' or value_type = 'MAX') "+ processDate(dataDate,Integer.valueOf(BizParamConstant.STAT_BIZ_DAY)) +" group by line_id order by time desc limit 2 tz('Asia/Shanghai')";
+        InfluxDBResultMapper resultMapper = new InfluxDBResultMapper();
+        List<Double> data;
+        PublicDTO publicDTO;
+        List<PublicDTO> lineData = new ArrayList<>();
+        QueryResult sqlResult = influxDbUtils.query(sql);
+        List<DayVPO> list = resultMapper.toPOJO(sqlResult, DayVPO.class);
+        for (DayVPO dayV : list) {
+            for (Overlimit overlimit : overLimitList) {
+                if (Objects.equals(dayV.getLineId(),overlimit.getId())){
+                    double vUnbalance = Math.abs(dayV.getVUnbalance()/overlimit.getUbalance());
+                    data = Stream.of(vUnbalance).collect(Collectors.toList());
+                    double result = data.stream().max(Comparator.comparing(Double::doubleValue)).get();
+                    publicDTO = new PublicDTO();
+                    publicDTO.setId(dayV.getLineId());
+                    publicDTO.setData(result);
+                    lineData.add(publicDTO);
+                }
+            }
+        }
+        Comparator<PublicDTO> comparator = Comparator.comparing(PublicDTO::getData);
+        Map<String, Optional<PublicDTO>> outMap = lineData.stream().collect(Collectors.groupingBy(PublicDTO::getId,Collectors.reducing(BinaryOperator.maxBy(comparator))));
+        return process(outMap);
+    }
+
+    /**
+     * 负序电流：各监测点最新的T相数据。
+     */
+    private List<PublicDTO> getNegativeSequenceCurrent(List<Overlimit> overLimitList,String dataDate){
+        String sql = "SELECT line_id,i_neg,value_type FROM day_i where phasic_type = 'T' and (value_type = 'CP95' or value_type = 'MAX') "+ processDate(dataDate,Integer.valueOf(BizParamConstant.STAT_BIZ_DAY)) +" group by line_id order by time desc limit 2 tz('Asia/Shanghai')";
+        InfluxDBResultMapper resultMapper = new InfluxDBResultMapper();
+        List<Double> data;
+        PublicDTO publicDTO;
+        List<PublicDTO> lineData = new ArrayList<>();
+        QueryResult sqlResult = influxDbUtils.query(sql);
+        List<DayIPO> list = resultMapper.toPOJO(sqlResult, DayIPO.class);
+        for (DayIPO dayI : list) {
+            for (Overlimit overlimit : overLimitList) {
+                if (Objects.equals(dayI.getLineId(),overlimit.getId()) && overlimit.getINeg() != 0){
+                    BigDecimal dayiNeg = BigDecimal.valueOf(dayI.getINeg());
+                    BigDecimal overNeg = BigDecimal.valueOf(overlimit.getINeg());
+                    double outNeg = dayiNeg.divide(overNeg,9,RoundingMode.HALF_UP).doubleValue();
+                    double iNeg = Math.abs(outNeg);
+                    data = Stream.of(iNeg).collect(Collectors.toList());
+                    double result = data.stream().max(Comparator.comparing(Double::doubleValue)).get();
+                    publicDTO = new PublicDTO();
+                    publicDTO.setId(dayI.getLineId());
+                    publicDTO.setData(result);
+                    lineData.add(publicDTO);
+                }
+            }
+        }
+        Comparator<PublicDTO> comparator = Comparator.comparing(PublicDTO::getData);
+        Map<String, Optional<PublicDTO>> outMap = lineData.stream().collect(Collectors.groupingBy(PublicDTO::getId,Collectors.reducing(BinaryOperator.maxBy(comparator))));
+        return process(outMap);
+    }
+
+    /**
+     * 间谐波电压含有率：各监测点最新的A、B、C三相数据。
+     */
+    private List<PublicDTO> getInterharmonicVoltage(List<Overlimit> overLimitList,String dataDate){
+        String sql = "SELECT * FROM day_inharm_v where (phasic_type = 'A' or phasic_type = 'B' or phasic_type = 'C') and value_type = 'CP95' "+ processDate(dataDate,Integer.valueOf(BizParamConstant.STAT_BIZ_DAY)) +" group by line_id order by time desc limit 3 tz('Asia/Shanghai')";
+        InfluxDBResultMapper resultMapper = new InfluxDBResultMapper();
+        List<Double> data;
+        PublicDTO publicDTO;
+        List<PublicDTO> lineData = new ArrayList<>();
+        QueryResult sqlResult = influxDbUtils.query(sql);
+        List<DayInharmVPO> list = resultMapper.toPOJO(sqlResult, DayInharmVPO.class);
+        for (DayInharmVPO dayInharmV : list) {
+            for (Overlimit overlimit : overLimitList) {
+                if (Objects.equals(dayInharmV.getLineId(),overlimit.getId())){
+                    double v1 = Math.abs(dayInharmV.getV1()/overlimit.getInuharm1());
+                    double v2 = Math.abs(dayInharmV.getV2()/overlimit.getInuharm2());
+                    double v3 = Math.abs(dayInharmV.getV3()/overlimit.getInuharm3());
+                    double v4 = Math.abs(dayInharmV.getV4()/overlimit.getInuharm4());
+                    double v5 = Math.abs(dayInharmV.getV5()/overlimit.getInuharm5());
+                    double v6 = Math.abs(dayInharmV.getV6()/overlimit.getInuharm6());
+                    double v7 = Math.abs(dayInharmV.getV7()/overlimit.getInuharm7());
+                    double v8 = Math.abs(dayInharmV.getV8()/overlimit.getInuharm8());
+                    double v9 = Math.abs(dayInharmV.getV9()/overlimit.getInuharm9());
+                    double v10 = Math.abs(dayInharmV.getV10()/overlimit.getInuharm10());
+                    double v11 = Math.abs(dayInharmV.getV11()/overlimit.getInuharm11());
+                    double v12 = Math.abs(dayInharmV.getV12()/overlimit.getInuharm12());
+                    double v13 = Math.abs(dayInharmV.getV13()/overlimit.getInuharm13());
+                    double v14 = Math.abs(dayInharmV.getV14()/overlimit.getInuharm14());
+                    double v15 = Math.abs(dayInharmV.getV15()/overlimit.getInuharm15());
+                    double v16 = Math.abs(dayInharmV.getV16()/overlimit.getInuharm16());
+                    data = Stream.of(v1,v2,v3,v4,v5,v6,v7,v8,v9,v10,v11,v12,v13,v14,v15,v16).collect(Collectors.toList());
+                    double result = data.stream().max(Comparator.comparing(Double::doubleValue)).get();
+                    publicDTO = new PublicDTO();
+                    publicDTO.setId(dayInharmV.getLineId());
+                    publicDTO.setData(result);
+                    lineData.add(publicDTO);
+                }
+            }
+        }
+        Comparator<PublicDTO> comparator = Comparator.comparing(PublicDTO::getData);
+        Map<String, Optional<PublicDTO>> outMap = lineData.stream().collect(Collectors.groupingBy(PublicDTO::getId,Collectors.reducing(BinaryOperator.maxBy(comparator))));
+        return process(outMap);
+    }
+
+    /**
+     * 长时电压闪变：各监测点最新的A、B、C三相数据。
+     */
+    private List<PublicDTO> getVoltageFlicker(List<Overlimit> overLimitList,String dataDate){
+        String sql = "SELECT * FROM day_plt where (phasic_type = 'A' or phasic_type = 'B' or phasic_type = 'C') and value_type = 'CP95' "+ processDate(dataDate,Integer.valueOf(BizParamConstant.STAT_BIZ_DAY)) +" group by line_id order by time desc limit 3 tz('Asia/Shanghai')";
+        InfluxDBResultMapper resultMapper = new InfluxDBResultMapper();
+        List<Double> data;
+        PublicDTO publicDTO;
+        List<PublicDTO> lineData = new ArrayList<>();
+        QueryResult sqlResult = influxDbUtils.query(sql);
+        List<DayPltPO> list = resultMapper.toPOJO(sqlResult, DayPltPO.class);
+        for (DayPltPO dayPlt : list) {
+            for (Overlimit overlimit : overLimitList) {
+                if (Objects.equals(dayPlt.getLineId(),overlimit.getId())){
+                    double plt = Math.abs(dayPlt.getPlt()/overlimit.getFlicker());
+                    data = Stream.of(plt).collect(Collectors.toList());
+                    double result = data.stream().max(Comparator.comparing(Double::doubleValue)).get();
+                    publicDTO = new PublicDTO();
+                    publicDTO.setId(dayPlt.getLineId());
+                    publicDTO.setData(result);
+                    lineData.add(publicDTO);
+                }
+            }
+        }
+        Comparator<PublicDTO> comparator = Comparator.comparing(PublicDTO::getData);
+        Map<String, Optional<PublicDTO>> outMap = lineData.stream().collect(Collectors.groupingBy(PublicDTO::getId,Collectors.reducing(BinaryOperator.maxBy(comparator))));
+        return process(outMap);
+    }
+
+    /**
+     * 监测点污染指标数据入表 data_polluction
+     */
+    private void insertPolluction(List<PollutionDTO> list, long time){
+        List<String> records = new ArrayList<String>();
+        list.forEach(item->{
+            Map<String, String> tags = new HashMap<>();
+            Map<String, Object> fields = new HashMap<>();
+            tags.put("line_id",item.getLineId());
+            fields.put("freq_dev",item.getFreqDev());
+            fields.put("v_dev",item.getVDev());
+            fields.put("v_unbalance",item.getVUnbalance());
+            fields.put("i_neg",item.getINeg());
+            fields.put("v_all",item.getVAll());
+            fields.put("i_all",item.getIAll());
+            fields.put("v_inharm",item.getVInharm());
+            fields.put("plt",item.getPlt());
+            Point point = influxDbUtils.pointBuilder("data_polluction", time, TimeUnit.MILLISECONDS,tags, fields);
+            BatchPoints batchPoints = BatchPoints.database(influxDbUtils.getDbName()).tag("line_id", item.getLineId()).retentionPolicy("").consistency(InfluxDB.ConsistencyLevel.ALL).build();
+            batchPoints.point(point);
+            records.add(batchPoints.lineProtocol());
+        });
+        influxDbUtils.batchInsert(influxDbUtils.getDbName(),"", InfluxDB.ConsistencyLevel.ALL, records);
+    }
+
+    /**
+     * 参数拼装处理
+     */
+    private List<PollutionDTO> processPollutionList(List<PollutionDTO> pollutionList,List<PublicDTO> harmonicVoltageList,List<PublicDTO> harmonicCurrentList,List<PublicDTO> frequencyDeviationList,List<PublicDTO> voltageDeviationList,List<PublicDTO> threePhaseVoltageList,List<PublicDTO> negativeSequenceList,List<PublicDTO> interharmonicVoltageList,List<PublicDTO> voltageFlickerList){
+        for (PollutionDTO pollution : pollutionList) {
+            for (PublicDTO item : harmonicVoltageList) {
+                if (Objects.equals(pollution.getLineId(),item.getId())){
+                    pollution.setVAll(BigDecimal.valueOf(item.getData()).setScale(4, RoundingMode.HALF_UP).doubleValue());
+                }
+            }
+            for (PublicDTO item : harmonicCurrentList) {
+                if (Objects.equals(pollution.getLineId(),item.getId())){
+                    pollution.setIAll(BigDecimal.valueOf(item.getData()).setScale(4, RoundingMode.HALF_UP).doubleValue());
+                }
+            }
+            for (PublicDTO item : frequencyDeviationList) {
+                if (Objects.equals(pollution.getLineId(),item.getId())){
+                    pollution.setFreqDev(BigDecimal.valueOf(item.getData()).setScale(4, RoundingMode.HALF_UP).doubleValue());
+                }
+            }
+            for (PublicDTO item : voltageDeviationList) {
+                if (Objects.equals(pollution.getLineId(),item.getId())){
+                    pollution.setVDev(BigDecimal.valueOf(item.getData()).setScale(4, RoundingMode.HALF_UP).doubleValue());
+                }
+            }
+            for (PublicDTO item : threePhaseVoltageList) {
+                if (Objects.equals(pollution.getLineId(),item.getId())){
+                    pollution.setVUnbalance(BigDecimal.valueOf(item.getData()).setScale(4, RoundingMode.HALF_UP).doubleValue());
+                }
+            }
+            for (PublicDTO item : negativeSequenceList) {
+                if (Objects.equals(pollution.getLineId(),item.getId())){
+                    pollution.setINeg(BigDecimal.valueOf(item.getData()).setScale(4, RoundingMode.HALF_UP).doubleValue());
+                }
+            }
+            for (PublicDTO item : interharmonicVoltageList) {
+                if (Objects.equals(pollution.getLineId(),item.getId())){
+                    pollution.setVInharm(BigDecimal.valueOf(item.getData()).setScale(4, RoundingMode.HALF_UP).doubleValue());
+                }
+            }
+            for (PublicDTO item : voltageFlickerList) {
+                if (Objects.equals(pollution.getLineId(),item.getId())){
+                    pollution.setPlt(BigDecimal.valueOf(item.getData()).setScale(4, RoundingMode.HALF_UP).doubleValue());
+                }
+            }
+        }
+        return pollutionList;
+    }
+
+    /**
+     * 出参处理
+     */
+    private List<PublicDTO> process(Map<String, Optional<PublicDTO>> outMap){
+        List<PublicDTO> outList = new ArrayList<>();
+        for (String key : outMap.keySet()) {
+            outList.add(outMap.get(key).get());
+        }
+        return outList;
+    }
+
+    /**
+     * influxDb时间条件处理
+     */
+    private String processDate(String date,Integer type){
+        String processSql = "";
+        if (StrUtil.isNotBlank(date)){
+            if (Integer.valueOf(BizParamConstant.STAT_BIZ_DAY).equals(type)){
+                processSql = " and time >= '"+date+" 00:00:00' and time <= '"+date+" 23:59:59' ";
+            }else if (Integer.valueOf(BizParamConstant.STAT_BIZ_MONTH).equals(type)){
+                Date dateOut = DateUtil.parse(date);
+                Date dateOutb = DateUtil.beginOfMonth(dateOut);
+                Date dateOute = DateUtil.endOfMonth(dateOut);
+                processSql =" and time >= '"+DateUtil.formatDate(dateOutb)+" 00:00:00' and time <= '"+DateUtil.formatDate(dateOute)+" 23:59:59' ";
+            }else if (Integer.valueOf(BizParamConstant.STAT_BIZ_QUARTER).equals(type)){
+                Date dateOut = DateUtil.parse(date);
+                Date dateOutb = DateUtil.beginOfQuarter(dateOut);
+                Date dateOute = DateUtil.endOfQuarter(dateOut);
+                processSql =" and time >= '"+DateUtil.formatDate(dateOutb)+" 00:00:00' and time <= '"+DateUtil.formatDate(dateOute)+" 23:59:59' ";
+            }else if (Integer.valueOf(BizParamConstant.STAT_BIZ_YEAR).equals(type)){
+                Date dateOut = DateUtil.parse(date);
+                Date dateOutb = DateUtil.beginOfYear(dateOut);
+                Date dateOute = DateUtil.endOfYear(dateOut);
+                processSql =" and time >= '"+DateUtil.formatDate(dateOutb)+" 00:00:00' and time <= '"+DateUtil.formatDate(dateOute)+" 23:59:59' ";
+            }
+        }
+        return processSql;
+    }
+
+    /**
+     * 获取限值表中的所有监测点信息
+     */
+    private List<Overlimit> getAllLinesLimitData() {
+        return lineFeignClient.getAllLineOverLimit("harmonic-boot","").getData();
+    }
+}
diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/Impl/line/RMpFlickerReportDPOServiceImpl.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/Impl/line/RMpFlickerReportDPOServiceImpl.java
new file mode 100644
index 000000000..168073b88
--- /dev/null
+++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/Impl/line/RMpFlickerReportDPOServiceImpl.java
@@ -0,0 +1,20 @@
+package com.njcn.prepare.harmonic.service.Impl.line;
+
+import com.github.jeffreyning.mybatisplus.service.MppServiceImpl;
+import com.njcn.prepare.harmonic.mapper.line.RMpFlickerReportDPOMapper;
+import com.njcn.prepare.harmonic.pojo.po.line.RMpFlickerReportDPO;
+import com.njcn.prepare.harmonic.service.RMpFlickerReportDPOService;
+import org.springframework.stereotype.Service;
+/**
+ * 
+ * Description:
+ * 接口文档访问地址：http://serverIP:port/swagger-ui.html
+ * Date: 2022/10/26  14:15【需求编号】
+ *
+ * @author clam
+ * @version V1.0.0
+ */
+@Service
+public class RMpFlickerReportDPOServiceImpl extends MppServiceImpl<RMpFlickerReportDPOMapper, RMpFlickerReportDPO> implements RMpFlickerReportDPOService{
+
+}
diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/Impl/line/RMpHarmonicIMagReportDPOServiceImpl.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/Impl/line/RMpHarmonicIMagReportDPOServiceImpl.java
new file mode 100644
index 000000000..6eb304511
--- /dev/null
+++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/Impl/line/RMpHarmonicIMagReportDPOServiceImpl.java
@@ -0,0 +1,20 @@
+package com.njcn.prepare.harmonic.service.Impl.line;
+
+import com.github.jeffreyning.mybatisplus.service.MppServiceImpl;
+import com.njcn.prepare.harmonic.mapper.line.RMpHarmonicIMagReportDPOMapper;
+import com.njcn.prepare.harmonic.pojo.po.line.RMpHarmonicIMagReportDPO;
+import com.njcn.prepare.harmonic.service.RMpHarmonicIMagReportDPOService;
+import org.springframework.stereotype.Service;
+/**
+ * 
+ * Description:
+ * 接口文档访问地址：http://serverIP:port/swagger-ui.html
+ * Date: 2022/10/26  9:50【需求编号】
+ *
+ * @author clam
+ * @version V1.0.0
+ */
+@Service
+public class RMpHarmonicIMagReportDPOServiceImpl extends MppServiceImpl<RMpHarmonicIMagReportDPOMapper, RMpHarmonicIMagReportDPO> implements RMpHarmonicIMagReportDPOService{
+
+}
diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/Impl/line/RMpHarmonicIRateReportDPOServiceImpl.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/Impl/line/RMpHarmonicIRateReportDPOServiceImpl.java
new file mode 100644
index 000000000..8c6f3a4c0
--- /dev/null
+++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/Impl/line/RMpHarmonicIRateReportDPOServiceImpl.java
@@ -0,0 +1,20 @@
+package com.njcn.prepare.harmonic.service.Impl.line;
+
+import com.github.jeffreyning.mybatisplus.service.MppServiceImpl;
+import com.njcn.prepare.harmonic.mapper.line.RMpHarmonicIRateReportDPOMapper;
+import com.njcn.prepare.harmonic.pojo.po.line.RMpHarmonicIRateReportDPO;
+import com.njcn.prepare.harmonic.service.RMpHarmonicIRateReportDPOService;
+import org.springframework.stereotype.Service;
+/**
+ * 
+ * Description:
+ * 接口文档访问地址：http://serverIP:port/swagger-ui.html
+ * Date: 2022/10/26  18:33【需求编号】
+ *
+ * @author clam
+ * @version V1.0.0
+ */
+@Service
+public class RMpHarmonicIRateReportDPOServiceImpl extends MppServiceImpl<RMpHarmonicIRateReportDPOMapper, RMpHarmonicIRateReportDPO> implements RMpHarmonicIRateReportDPOService{
+
+}
diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/Impl/line/RMpHarmonicPReportDPOServiceImpl.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/Impl/line/RMpHarmonicPReportDPOServiceImpl.java
new file mode 100644
index 000000000..13c1a676b
--- /dev/null
+++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/Impl/line/RMpHarmonicPReportDPOServiceImpl.java
@@ -0,0 +1,25 @@
+package com.njcn.prepare.harmonic.service.Impl.line;
+
+import com.github.jeffreyning.mybatisplus.service.MppServiceImpl;
+import com.njcn.prepare.harmonic.mapper.line.RMpHarmonicPReportDPOMapper;
+import com.njcn.prepare.harmonic.pojo.po.line.RMpHarmonicPReportDPO;
+import com.njcn.prepare.harmonic.service.line.RMpHarmonicPReportDPOService;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+
+/**
+ * Description:
+ * 接口文档访问地址：http://serverIP:port/swagger-ui.html
+ * Date: 2022/10/25  10:33【需求编号】
+ *
+ * @author clam
+ * @version V1.0.0
+ */
+@Slf4j
+@Component
+@RequiredArgsConstructor
+public class RMpHarmonicPReportDPOServiceImpl extends MppServiceImpl<RMpHarmonicPReportDPOMapper, RMpHarmonicPReportDPO> implements RMpHarmonicPReportDPOService {
+
+}
+
diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/Impl/line/RMpHarmonicVRateReportDPOServiceImpl.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/Impl/line/RMpHarmonicVRateReportDPOServiceImpl.java
new file mode 100644
index 000000000..c30ed3261
--- /dev/null
+++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/Impl/line/RMpHarmonicVRateReportDPOServiceImpl.java
@@ -0,0 +1,25 @@
+package com.njcn.prepare.harmonic.service.Impl.line;
+
+import com.github.jeffreyning.mybatisplus.service.MppServiceImpl;
+import com.njcn.prepare.harmonic.mapper.line.RMpHarmonicVRateReportDPOMapper;
+import com.njcn.prepare.harmonic.pojo.po.line.RMpHarmonicVRateReportDPO;
+import com.njcn.prepare.harmonic.service.line.RMpHarmonicVRateReportDPOService;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+
+/**
+ * 
+ * Description:
+ * 接口文档访问地址：http://serverIP:port/swagger-ui.html
+ * Date: 2022/10/25  11:11【需求编号】
+ *
+ * @author clam
+ * @version V1.0.0
+ */
+@Slf4j
+@Component
+@RequiredArgsConstructor
+public class RMpHarmonicVRateReportDPOServiceImpl extends MppServiceImpl<RMpHarmonicVRateReportDPOMapper, RMpHarmonicVRateReportDPO> implements RMpHarmonicVRateReportDPOService {
+
+}
diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/Impl/line/RMpInharmonicIMagReportDPOServiceImpl.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/Impl/line/RMpInharmonicIMagReportDPOServiceImpl.java
new file mode 100644
index 000000000..ad5a5cda5
--- /dev/null
+++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/Impl/line/RMpInharmonicIMagReportDPOServiceImpl.java
@@ -0,0 +1,21 @@
+package com.njcn.prepare.harmonic.service.Impl.line;
+
+import com.github.jeffreyning.mybatisplus.service.MppServiceImpl;
+import com.njcn.prepare.harmonic.mapper.line.RMpInharmonicIMagReportDPOMapper;
+import com.njcn.prepare.harmonic.pojo.po.line.RMpInharmonicIMagReportDPO;
+import com.njcn.prepare.harmonic.service.RMpInharmonicIMagReportDPOService;
+import org.springframework.stereotype.Service;
+
+/**
+ * Description:
+ * 接口文档访问地址：http://serverIP:port/swagger-ui.html
+ * Date: 2022/10/27  9:05【需求编号】
+ *
+ * @author clam
+ * @version V1.0.0
+ */
+@Service
+public class RMpInharmonicIMagReportDPOServiceImpl extends MppServiceImpl<RMpInharmonicIMagReportDPOMapper, RMpInharmonicIMagReportDPO> implements RMpInharmonicIMagReportDPOService {
+
+}
+
diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/Impl/line/RMpInharmonicIRateReportDPOServiceImpl.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/Impl/line/RMpInharmonicIRateReportDPOServiceImpl.java
new file mode 100644
index 000000000..e10365ffd
--- /dev/null
+++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/Impl/line/RMpInharmonicIRateReportDPOServiceImpl.java
@@ -0,0 +1,20 @@
+package com.njcn.prepare.harmonic.service.Impl.line;
+
+import com.github.jeffreyning.mybatisplus.service.MppServiceImpl;
+import com.njcn.prepare.harmonic.mapper.line.RMpInharmonicIRateReportDPOMapper;
+import com.njcn.prepare.harmonic.pojo.po.line.RMpInharmonicIRateReportDPO;
+import com.njcn.prepare.harmonic.service.RMpInharmonicIRateReportDPOService;
+import org.springframework.stereotype.Service;
+/**
+ * 
+ * Description:
+ * 接口文档访问地址：http://serverIP:port/swagger-ui.html
+ * Date: 2022/10/26  19:36【需求编号】
+ *
+ * @author clam
+ * @version V1.0.0
+ */
+@Service
+public class RMpInharmonicIRateReportDPOServiceImpl extends MppServiceImpl<RMpInharmonicIRateReportDPOMapper, RMpInharmonicIRateReportDPO> implements RMpInharmonicIRateReportDPOService{
+
+}
diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/Impl/line/RMpInharmonicVRateReportDPOServiceImpl.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/Impl/line/RMpInharmonicVRateReportDPOServiceImpl.java
new file mode 100644
index 000000000..63c019eba
--- /dev/null
+++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/Impl/line/RMpInharmonicVRateReportDPOServiceImpl.java
@@ -0,0 +1,21 @@
+package com.njcn.prepare.harmonic.service.Impl.line;
+
+import com.github.jeffreyning.mybatisplus.service.MppServiceImpl;
+import com.njcn.prepare.harmonic.mapper.line.RMpInharmonicVRateReportDPOMapper;
+import com.njcn.prepare.harmonic.pojo.po.line.RMpInharmonicVRateReportDPO;
+import com.njcn.prepare.harmonic.service.RMpInharmonicVRateReportDPOService;
+import org.springframework.stereotype.Service;
+
+/**
+ * Description:
+ * 接口文档访问地址：http://serverIP:port/swagger-ui.html
+ * Date: 2022/10/27  9:42【需求编号】
+ *
+ * @author clam
+ * @version V1.0.0
+ */
+@Service
+public class RMpInharmonicVRateReportDPOServiceImpl extends MppServiceImpl<RMpInharmonicVRateReportDPOMapper, RMpInharmonicVRateReportDPO> implements RMpInharmonicVRateReportDPOService {
+
+}
+
diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/Impl/line/RMpMeasurePhaseReportDPOServiceImpl.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/Impl/line/RMpMeasurePhaseReportDPOServiceImpl.java
new file mode 100644
index 000000000..3585889a0
--- /dev/null
+++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/Impl/line/RMpMeasurePhaseReportDPOServiceImpl.java
@@ -0,0 +1,20 @@
+package com.njcn.prepare.harmonic.service.Impl.line;
+
+import com.github.jeffreyning.mybatisplus.service.MppServiceImpl;
+import com.njcn.prepare.harmonic.mapper.line.RMpMeasurePhaseReportDPOMapper;
+import com.njcn.prepare.harmonic.pojo.po.line.RMpMeasurePhaseReportDPO;
+import com.njcn.prepare.harmonic.service.RMpMeasurePhaseReportDPOService;
+import org.springframework.stereotype.Service;
+/**
+ * 
+ * Description:
+ * 接口文档访问地址：http://serverIP:port/swagger-ui.html
+ * Date: 2022/10/28  10:53【需求编号】
+ *
+ * @author clam
+ * @version V1.0.0
+ */
+@Service
+public class RMpMeasurePhaseReportDPOServiceImpl extends MppServiceImpl<RMpMeasurePhaseReportDPOMapper, RMpMeasurePhaseReportDPO> implements RMpMeasurePhaseReportDPOService{
+
+}
diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/Impl/line/RMpMeasureReportDPOServiceImpl.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/Impl/line/RMpMeasureReportDPOServiceImpl.java
new file mode 100644
index 000000000..7e0d8af05
--- /dev/null
+++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/Impl/line/RMpMeasureReportDPOServiceImpl.java
@@ -0,0 +1,20 @@
+package com.njcn.prepare.harmonic.service.Impl.line;
+
+import com.github.jeffreyning.mybatisplus.service.MppServiceImpl;
+import com.njcn.prepare.harmonic.mapper.line.RMpMeasureReportDPOMapper;
+import com.njcn.prepare.harmonic.pojo.po.line.RMpMeasureReportDPO;
+import com.njcn.prepare.harmonic.service.RMpMeasureReportDPOService;
+import org.springframework.stereotype.Service;
+/**
+ * 
+ * Description:
+ * 接口文档访问地址：http://serverIP:port/swagger-ui.html
+ * Date: 2022/10/28  10:54【需求编号】
+ *
+ * @author clam
+ * @version V1.0.0
+ */
+@Service
+public class RMpMeasureReportDPOServiceImpl extends MppServiceImpl<RMpMeasureReportDPOMapper, RMpMeasureReportDPO> implements RMpMeasureReportDPOService{
+
+}
diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/Impl/line/RMpPltReportDPOServiceImpl.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/Impl/line/RMpPltReportDPOServiceImpl.java
new file mode 100644
index 000000000..81a8d2b95
--- /dev/null
+++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/Impl/line/RMpPltReportDPOServiceImpl.java
@@ -0,0 +1,20 @@
+package com.njcn.prepare.harmonic.service.Impl.line;
+
+import com.github.jeffreyning.mybatisplus.service.MppServiceImpl;
+import com.njcn.prepare.harmonic.mapper.line.RMpPltReportDPOMapper;
+import com.njcn.prepare.harmonic.pojo.po.line.RMpPltReportDPO;
+import com.njcn.prepare.harmonic.service.RMpPltReportDPOService;
+import org.springframework.stereotype.Service;
+/**
+ * 
+ * Description:
+ * 接口文档访问地址：http://serverIP:port/swagger-ui.html
+ * Date: 2022/10/26  15:26【需求编号】
+ *
+ * @author clam
+ * @version V1.0.0
+ */
+@Service
+public class RMpPltReportDPOServiceImpl extends MppServiceImpl<RMpPltReportDPOMapper, RMpPltReportDPO> implements RMpPltReportDPOService{
+
+}
diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/Impl/line/ReportServiceImpl.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/Impl/line/ReportServiceImpl.java
new file mode 100644
index 000000000..dcf768672
--- /dev/null
+++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/Impl/line/ReportServiceImpl.java
@@ -0,0 +1,302 @@
+package com.njcn.prepare.harmonic.service.Impl.line;
+
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.json.JSONArray;
+import cn.hutool.json.JSONObject;
+import cn.hutool.json.JSONUtil;
+import com.alibaba.cloud.commons.lang.StringUtils;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.njcn.common.pojo.constant.BizParamConstant;
+import com.njcn.common.pojo.enums.common.DataStateEnum;
+import com.njcn.common.pojo.exception.BusinessException;
+import com.njcn.device.pq.api.DeptLineFeignClient;
+import com.njcn.harmonic.enums.HarmonicResponseEnum;
+import com.njcn.harmonic.pojo.dto.ReportTemplateDTO;
+import com.njcn.influxdb.param.InfluxDBSqlConstant;
+import com.njcn.influxdb.param.InfluxDBTableConstant;
+import com.njcn.influxdb.utils.InfluxDbUtils;
+import com.njcn.prepare.harmonic.constant.Param;
+import com.njcn.prepare.harmonic.mapper.line.ExcelRptMapper;
+import com.njcn.prepare.harmonic.mapper.line.ExcelRptTempMapper;
+import com.njcn.prepare.harmonic.pojo.param.LineParam;
+import com.njcn.prepare.harmonic.pojo.po.ExcelRpt;
+import com.njcn.prepare.harmonic.pojo.po.ExcelRptTemp;
+import com.njcn.prepare.harmonic.service.line.ReportService;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.influxdb.dto.QueryResult;
+import org.springframework.stereotype.Service;
+
+import java.util.*;
+import java.util.stream.Collectors;
+
+/**
+ * 自定义报表
+ * @author qijian
+ * @date 2022/10/20
+ */
+@Service
+@RequiredArgsConstructor
+@Slf4j
+public class ReportServiceImpl implements ReportService {
+
+    private final DeptLineFeignClient deptLineFeignClient;
+
+    private final InfluxDbUtils influxDbUtils;
+
+    private final ExcelRptTempMapper excelRptTempMapper;
+
+    private final ExcelRptMapper excelRptMapper;
+
+
+    @Override
+    public boolean batchReport(LineParam reportParam) {
+
+        //查询所有已激活模板
+        List<ExcelRptTemp> reportTemplateList = excelRptTempMapper.getActiveTempList();
+        if (CollUtil.isEmpty(reportTemplateList)) {
+            throw new BusinessException(HarmonicResponseEnum.CUSTOM_REPORT_ACTIVE);
+        }
+
+        //有监测点，匹配监测点的数据进行处理
+        //无监测点，查询稳态所有监测点
+        List<String> list = reportParam.getLineIds();
+        if (CollUtil.isEmpty(list)){
+            list = new ArrayList<>();
+            Map<String, List<String>> map = deptLineFeignClient.getLineByDeptRelation(Param.STEADY_STATE).getData();
+            Collection<List<String>> values = map.values();
+            for (List<String> value : values) {
+                list.addAll(value);
+            }
+        }
+
+        //根据content进行处理
+        List<ReportTemplateDTO> dataList = new ArrayList<>();
+        JSONArray jsonArray = null;
+        for (ExcelRptTemp excelRptTemp : reportTemplateList) {
+            try {
+                //获取content解析数据
+                jsonArray = JSONUtil.parseArray(excelRptTemp.getContent());
+                dataList = getDataList(jsonArray);
+            } catch (Exception e) {
+                throw new BusinessException(HarmonicResponseEnum.CUSTOM_REPORT_JSON);
+            }
+
+            //查询influxDB数据
+            List<ReportTemplateDTO> endList = new ArrayList<>();
+            for (String lineId : list) {
+                if (CollUtil.isNotEmpty(dataList)) {
+                    //开始组织sql
+                    dataList.stream().forEach(data -> {
+                        StringBuilder sql = new StringBuilder(InfluxDBSqlConstant.SELECT);
+                        switch (data.getStatMethod()) {
+                            case InfluxDBTableConstant.MAX:
+                                assSql(data, sql, endList, InfluxDBSqlConstant.MAX, lineId);
+                                break;
+                            case InfluxDBTableConstant.MIN:
+                                assSql(data, sql, endList, InfluxDBSqlConstant.MIN, lineId);
+                                break;
+                            case InfluxDBTableConstant.AVG:
+                                assSql(data, sql, endList, InfluxDBSqlConstant.AVG, lineId);
+                                break;
+                            case InfluxDBTableConstant.CP95:
+                                assSql(data, sql, endList, InfluxDBSqlConstant.CP95, lineId);
+                                break;
+                            default:
+                                break;
+                        }
+                    });
+                }
+
+                //根据数据填充content
+                if (CollUtil.isNotEmpty(endList)) {
+                    contentChange(jsonArray, endList);
+                }
+
+                //存入报表库
+                //年：例如2022年，传入2022-01-01进行匹配，有则更新无则插入
+                //季：例如2022第二季度，传入2022-04-01进行匹配，有则更新无则插入
+                //月：例如2022十月份，传入2022-10-01进行匹配，有则更新无则插入
+                //周：例如2022年第五周，传入2022-01-23（周一）进行匹配，有则更新无则插入
+                //日：直接插入，无需配对
+                String afterContent = jsonArray.toString();
+                if (BizParamConstant.STAT_BIZ_DAY.equals(reportParam.getType().toString())){
+                    rptInsert(reportParam, lineId, excelRptTemp, afterContent);
+                }else{
+                    rptBiz(reportParam, lineId, excelRptTemp, afterContent);
+                }
+            }
+        }
+
+        return true;
+    }
+
+    /**
+     * rpt业务方法
+     * @param reportParam,lineId,excelRptTemp,afterContent 参数
+     * @return 结果
+     */
+    private void rptBiz(LineParam reportParam, String lineId, ExcelRptTemp excelRptTemp, String afterContent) {
+        LambdaQueryWrapper<ExcelRpt> lambdaQuery = new LambdaQueryWrapper<>();
+        lambdaQuery.eq(ExcelRpt::getLineId, lineId).eq(ExcelRpt::getTempId, excelRptTemp.getId()).eq(ExcelRpt::getType, reportParam.getType()).eq(ExcelRpt::getDataDate,reportParam.getDataDate());
+        ExcelRpt excelRpt = excelRptMapper.selectOne(lambdaQuery);
+        if (excelRpt != null){
+            excelRpt.setContent(afterContent);
+            excelRptMapper.updateById(excelRpt);
+        } else {
+            rptInsert(reportParam, lineId, excelRptTemp, afterContent);
+        }
+    }
+
+    /**
+     * 新增rpt方法
+     * @param reportParam,lineId,excelRptTemp,afterContent 参数
+     * @return 结果
+     */
+    private void rptInsert(LineParam reportParam, String lineId, ExcelRptTemp excelRptTemp, String afterContent) {
+        ExcelRpt excelRpt = new ExcelRpt();
+        excelRpt.setName(excelRptTemp.getName());
+        excelRpt.setLineId(lineId);
+        excelRpt.setDataDate(DateUtil.parse(reportParam.getDataDate()));
+        excelRpt.setTempId(excelRptTemp.getId());
+        excelRpt.setContent(afterContent);
+        excelRpt.setType(reportParam.getType());
+        excelRpt.setState(DataStateEnum.ENABLE.getCode());
+        excelRptMapper.insert(excelRpt);
+    }
+
+    /**
+     * 根据数据填充content
+     * @param jsonArray 参数
+     * @return 结果
+     */
+    private void contentChange(JSONArray jsonArray, List<ReportTemplateDTO> endList) {
+        //进行反向赋值到模板
+        //1、根据itemName分组
+        Map<String, List<ReportTemplateDTO>> assMap = endList.stream().collect(Collectors.groupingBy(ReportTemplateDTO::getItemName));
+        //2、把itemName的value赋给v和m
+        jsonArray.forEach(item -> {
+            JSONObject jsonObject = (JSONObject) item;
+            JSONArray itemArr = (JSONArray) jsonObject.get("celldata");
+            itemArr.forEach((it) -> {
+                if (Objects.nonNull(it) && !"null".equals(it.toString())) {
+                    //获取到1列
+                    JSONObject data = (JSONObject) it;
+                    JSONObject son = (JSONObject) data.get("v");
+                    if (son.containsKey("v")) {
+                        String v = son.getStr("v");
+                        //数据格式：$HA[_25]#B#max#classId$ 或 $HA[_25]#max#classId$
+                        if (v.charAt(0) == '$' && v.contains("#")) {
+                            String str = assMap.get(v.replace("$", "")).get(0).getValue();
+                            //没有值，赋"/"
+                            if (StringUtils.isBlank(str)) {
+                                str = "/";
+                            }
+                            son.set("v", str);
+                        }
+                    }
+                }
+            });
+        });
+    }
+
+    /**
+     * 获取content解析数据
+     * @param jsonArray 参数
+     * @return 结果
+     */
+    private List<ReportTemplateDTO> getDataList(JSONArray jsonArray) {
+        List<ReportTemplateDTO> reportTemplateDTOList = new ArrayList<>();
+        jsonArray.forEach(item -> {
+            JSONObject jsonObject = (JSONObject) item;
+            JSONArray itemArr = (JSONArray) jsonObject.get("celldata");
+            itemArr.forEach((it) -> {
+                if (Objects.nonNull(it) && !"null".equals(it.toString())) {
+                    //获取到1列
+                    JSONObject data = (JSONObject) it;
+                    JSONObject son = (JSONObject) data.get("v");
+                    if (son.containsKey("v")) {
+                        String v = son.getStr("v");
+                        //数据格式：$HA[_25]#B#max#classId$ 或 $HA[_25]#max#classId$
+                        if (v.charAt(0) == '$' && v.contains("#")) {
+                            //剔除前后$
+                            v = v.replace("$", "");
+                            //封装ReportTemplateDTO
+                            ReportTemplateDTO reportTemplateDTO = new ReportTemplateDTO();
+                            reportTemplateDTO.setItemName(v);
+                            //根据#分割数据
+                            String[] vItem = v.split("#");
+                            if (vItem.length == 4) {
+                                //$HA[_25]#B#max#classId$
+                                reportTemplateDTO.setTemplateName(vItem[0]);
+                                reportTemplateDTO.setPhase(vItem[1]);
+                                reportTemplateDTO.setStatMethod(vItem[2].toUpperCase());
+                                reportTemplateDTO.setClassId(vItem[3]);
+                            } else if (vItem.length == 3) {
+                                //$HA[_25]#max#classId$
+                                reportTemplateDTO.setTemplateName(vItem[0]);
+                                reportTemplateDTO.setPhase("M");
+                                reportTemplateDTO.setStatMethod(vItem[1].toUpperCase());
+                                reportTemplateDTO.setClassId(vItem[2]);
+                            }
+                            reportTemplateDTOList.add(reportTemplateDTO);
+                        }
+                    }
+                }
+            });
+        });
+
+        return reportTemplateDTOList;
+    }
+
+    /**
+     * 组装influxDB查询sql，查询value并封装endlist
+     * @param data,sql,endList,method,reportSearchParam 参数
+     * @return 结果
+     */
+    private void assSql(ReportTemplateDTO data, StringBuilder sql, List<ReportTemplateDTO> endList, String method, String lineId) {
+        //sql拼接示例：select MAX(IHA2) as IHA2 from power_quality_data where Phase = 'A' and LineId='1324564568' and Stat_Method='max' tz('Asia/Shanghai')
+        if (InfluxDBTableConstant.NO_PHASE.equals(data.getPhase())) {
+            sql.append(method).append(InfluxDBSqlConstant.LBK).append(data.getTemplateName()).append(InfluxDBSqlConstant.RBK).append(InfluxDBSqlConstant.AS_VALUE)
+                    .append(InfluxDBSqlConstant.FROM).append(data.getClassId())
+                    .append(InfluxDBSqlConstant.WHERE).append(InfluxDBTableConstant.LINE_ID).append(InfluxDBSqlConstant.EQ).append(InfluxDBSqlConstant.QM).append(lineId).append(InfluxDBSqlConstant.QM)
+                    .append(InfluxDBSqlConstant.AND).append(InfluxDBTableConstant.VALUE_TYPE).append(InfluxDBSqlConstant.EQ).append(InfluxDBSqlConstant.QM).append(data.getStatMethod()).append(InfluxDBSqlConstant.QM)
+                    .append(InfluxDBSqlConstant.TZ);
+        } else {
+            sql.append(method).append(InfluxDBSqlConstant.LBK).append(data.getTemplateName()).append(InfluxDBSqlConstant.RBK).append(InfluxDBSqlConstant.AS_VALUE)
+                    .append(InfluxDBSqlConstant.FROM).append(data.getClassId())
+                    .append(InfluxDBSqlConstant.WHERE).append(InfluxDBTableConstant.LINE_ID).append(InfluxDBSqlConstant.EQ).append(InfluxDBSqlConstant.QM).append(lineId).append(InfluxDBSqlConstant.QM)
+                    .append(InfluxDBSqlConstant.AND).append(InfluxDBTableConstant.VALUE_TYPE).append(InfluxDBSqlConstant.EQ).append(InfluxDBSqlConstant.QM).append(data.getStatMethod()).append(InfluxDBSqlConstant.QM)
+                    .append(InfluxDBSqlConstant.AND).append(InfluxDBTableConstant.PHASIC_TYPE).append(InfluxDBSqlConstant.EQ).append(InfluxDBSqlConstant.QM).append(data.getPhase()).append(InfluxDBSqlConstant.QM)
+                    .append(InfluxDBSqlConstant.TZ);
+        }
+
+        //根据不同的库表赋值
+        QueryResult queryResult = influxDbUtils.query(String.valueOf(sql));
+
+        //剖析influx数据，填入value
+        List<QueryResult.Result> results = queryResult.getResults();
+        if (results.size() != 0) {
+            QueryResult.Result result = results.get(0);
+            if (result.getSeries() != null){
+                List<QueryResult.Series> seriess = result.getSeries();
+                if (seriess.size() != 0) {
+                    QueryResult.Series series = seriess.get(0);
+                    List<String> columns = series.getColumns();
+                    List<List<Object>> values = series.getValues();
+                    for (List<Object> columnValue : values) {
+                        for (int i = 0; i < columnValue.size(); i++) {
+                            if (columns.get(i).equals("value")) {
+                                data.setValue(columnValue.get(i).toString());
+                            }
+                        }
+                    }
+                }
+            }
+        }
+        endList.add(data);
+    }
+
+
+}
diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/Impl/substion/SubstionServiceImpl.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/Impl/substion/SubstionServiceImpl.java
new file mode 100644
index 000000000..c523e9e7e
--- /dev/null
+++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/Impl/substion/SubstionServiceImpl.java
@@ -0,0 +1,9 @@
+package com.njcn.prepare.harmonic.service.Impl.substion;
+
+/**
+ * @author denghuajun
+ * @version 1.0.0
+ * @date 2022年10月17日 20:19
+ */
+public class SubstionServiceImpl {
+}
diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/Impl/voltage/VoltageServiceImpl.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/Impl/voltage/VoltageServiceImpl.java
new file mode 100644
index 000000000..455850364
--- /dev/null
+++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/Impl/voltage/VoltageServiceImpl.java
@@ -0,0 +1,9 @@
+package com.njcn.prepare.harmonic.service.Impl.voltage;
+
+/**
+ * @author denghuajun
+ * @version 1.0.0
+ * @date 2022年10月17日 20:19
+ */
+public class VoltageServiceImpl {
+}
diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/RMpFlickerReportDPOService.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/RMpFlickerReportDPOService.java
new file mode 100644
index 000000000..e07aa3e12
--- /dev/null
+++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/RMpFlickerReportDPOService.java
@@ -0,0 +1,17 @@
+package com.njcn.prepare.harmonic.service;
+
+import com.github.jeffreyning.mybatisplus.service.IMppService;
+import com.njcn.prepare.harmonic.pojo.po.line.RMpFlickerReportDPO;
+    /**
+ * 
+ * Description:
+ * 接口文档访问地址：http://serverIP:port/swagger-ui.html
+ * Date: 2022/10/26  14:15【需求编号】
+ *
+ * @author clam
+ * @version V1.0.0
+ */
+public interface RMpFlickerReportDPOService extends IMppService<RMpFlickerReportDPO>{
+
+
+}
diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/RMpHarmonicIMagReportDPOService.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/RMpHarmonicIMagReportDPOService.java
new file mode 100644
index 000000000..106f2c5a5
--- /dev/null
+++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/RMpHarmonicIMagReportDPOService.java
@@ -0,0 +1,17 @@
+package com.njcn.prepare.harmonic.service;
+
+import com.github.jeffreyning.mybatisplus.service.IMppService;
+import com.njcn.prepare.harmonic.pojo.po.line.RMpHarmonicIMagReportDPO;
+    /**
+ * 
+ * Description:
+ * 接口文档访问地址：http://serverIP:port/swagger-ui.html
+ * Date: 2022/10/26  9:50【需求编号】
+ *
+ * @author clam
+ * @version V1.0.0
+ */
+public interface RMpHarmonicIMagReportDPOService extends IMppService<RMpHarmonicIMagReportDPO> {
+
+
+}
diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/RMpHarmonicIRateReportDPOService.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/RMpHarmonicIRateReportDPOService.java
new file mode 100644
index 000000000..3a18912b6
--- /dev/null
+++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/RMpHarmonicIRateReportDPOService.java
@@ -0,0 +1,17 @@
+package com.njcn.prepare.harmonic.service;
+
+import com.github.jeffreyning.mybatisplus.service.IMppService;
+import com.njcn.prepare.harmonic.pojo.po.line.RMpHarmonicIRateReportDPO;
+    /**
+ * 
+ * Description:
+ * 接口文档访问地址：http://serverIP:port/swagger-ui.html
+ * Date: 2022/10/26  18:33【需求编号】
+ *
+ * @author clam
+ * @version V1.0.0
+ */
+public interface RMpHarmonicIRateReportDPOService extends IMppService<RMpHarmonicIRateReportDPO> {
+
+
+}
diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/RMpInharmonicIMagReportDPOService.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/RMpInharmonicIMagReportDPOService.java
new file mode 100644
index 000000000..5bcf8cde5
--- /dev/null
+++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/RMpInharmonicIMagReportDPOService.java
@@ -0,0 +1,18 @@
+package com.njcn.prepare.harmonic.service;
+
+import com.github.jeffreyning.mybatisplus.service.IMppService;
+import com.njcn.prepare.harmonic.pojo.po.line.RMpInharmonicIMagReportDPO;
+
+/**
+ * Description:
+ * 接口文档访问地址：http://serverIP:port/swagger-ui.html
+ * Date: 2022/10/27  9:05【需求编号】
+ *
+ * @author clam
+ * @version V1.0.0
+ */
+public interface RMpInharmonicIMagReportDPOService extends IMppService<RMpInharmonicIMagReportDPO> {
+
+
+}
+
diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/RMpInharmonicIRateReportDPOService.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/RMpInharmonicIRateReportDPOService.java
new file mode 100644
index 000000000..61e95cf90
--- /dev/null
+++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/RMpInharmonicIRateReportDPOService.java
@@ -0,0 +1,17 @@
+package com.njcn.prepare.harmonic.service;
+
+import com.github.jeffreyning.mybatisplus.service.IMppService;
+import com.njcn.prepare.harmonic.pojo.po.line.RMpInharmonicIRateReportDPO;
+    /**
+ * 
+ * Description:
+ * 接口文档访问地址：http://serverIP:port/swagger-ui.html
+ * Date: 2022/10/26  19:36【需求编号】
+ *
+ * @author clam
+ * @version V1.0.0
+ */
+public interface RMpInharmonicIRateReportDPOService extends IMppService<RMpInharmonicIRateReportDPO> {
+
+
+}
diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/RMpInharmonicVRateReportDPOService.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/RMpInharmonicVRateReportDPOService.java
new file mode 100644
index 000000000..b7e89a87a
--- /dev/null
+++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/RMpInharmonicVRateReportDPOService.java
@@ -0,0 +1,18 @@
+package com.njcn.prepare.harmonic.service;
+
+import com.github.jeffreyning.mybatisplus.service.IMppService;
+import com.njcn.prepare.harmonic.pojo.po.line.RMpInharmonicVRateReportDPO;
+
+/**
+ * Description:
+ * 接口文档访问地址：http://serverIP:port/swagger-ui.html
+ * Date: 2022/10/27  9:42【需求编号】
+ *
+ * @author clam
+ * @version V1.0.0
+ */
+public interface RMpInharmonicVRateReportDPOService extends IMppService<RMpInharmonicVRateReportDPO> {
+
+
+}
+
diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/RMpMeasurePhaseReportDPOService.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/RMpMeasurePhaseReportDPOService.java
new file mode 100644
index 000000000..b95ce9215
--- /dev/null
+++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/RMpMeasurePhaseReportDPOService.java
@@ -0,0 +1,17 @@
+package com.njcn.prepare.harmonic.service;
+
+import com.github.jeffreyning.mybatisplus.service.IMppService;
+import com.njcn.prepare.harmonic.pojo.po.line.RMpMeasurePhaseReportDPO;
+    /**
+ * 
+ * Description:
+ * 接口文档访问地址：http://serverIP:port/swagger-ui.html
+ * Date: 2022/10/28  10:53【需求编号】
+ *
+ * @author clam
+ * @version V1.0.0
+ */
+public interface RMpMeasurePhaseReportDPOService extends IMppService<RMpMeasurePhaseReportDPO> {
+
+
+}
diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/RMpMeasureReportDPOService.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/RMpMeasureReportDPOService.java
new file mode 100644
index 000000000..3df990a61
--- /dev/null
+++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/RMpMeasureReportDPOService.java
@@ -0,0 +1,17 @@
+package com.njcn.prepare.harmonic.service;
+
+import com.github.jeffreyning.mybatisplus.service.IMppService;
+import com.njcn.prepare.harmonic.pojo.po.line.RMpMeasureReportDPO;
+    /**
+ * 
+ * Description:
+ * 接口文档访问地址：http://serverIP:port/swagger-ui.html
+ * Date: 2022/10/28  10:54【需求编号】
+ *
+ * @author clam
+ * @version V1.0.0
+ */
+public interface RMpMeasureReportDPOService extends IMppService<RMpMeasureReportDPO> {
+
+
+}
diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/RMpPltReportDPOService.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/RMpPltReportDPOService.java
new file mode 100644
index 000000000..82614b308
--- /dev/null
+++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/RMpPltReportDPOService.java
@@ -0,0 +1,17 @@
+package com.njcn.prepare.harmonic.service;
+
+import com.github.jeffreyning.mybatisplus.service.IMppService;
+import com.njcn.prepare.harmonic.pojo.po.line.RMpPltReportDPO;
+    /**
+ * 
+ * Description:
+ * 接口文档访问地址：http://serverIP:port/swagger-ui.html
+ * Date: 2022/10/26  15:26【需求编号】
+ *
+ * @author clam
+ * @version V1.0.0
+ */
+public interface RMpPltReportDPOService extends IMppService<RMpPltReportDPO> {
+
+
+}
diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/area/AreaService.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/area/AreaService.java
new file mode 100644
index 000000000..3efae5d14
--- /dev/null
+++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/area/AreaService.java
@@ -0,0 +1,9 @@
+package com.njcn.prepare.harmonic.service.area;
+
+/**
+ * @author denghuajun
+ * @version 1.0.0
+ * @date 2022年10月17日 20:18
+ */
+public interface AreaService {
+}
diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/device/DeviceService.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/device/DeviceService.java
new file mode 100644
index 000000000..d5de31439
--- /dev/null
+++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/device/DeviceService.java
@@ -0,0 +1,9 @@
+package com.njcn.prepare.harmonic.service.device;
+
+/**
+ * @author denghuajun
+ * @version 1.0.0
+ * @date 2022年10月17日 20:18
+ */
+public interface DeviceService {
+}
diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/line/DayDataService.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/line/DayDataService.java
new file mode 100644
index 000000000..96e4ee7cd
--- /dev/null
+++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/line/DayDataService.java
@@ -0,0 +1,22 @@
+package com.njcn.prepare.harmonic.service.line;
+
+import java.util.List;
+
+/**
+ * Description:
+ * 接口文档访问地址：http://serverIP:port/swagger-ui.html
+ * Date: 2022/10/24  9:45【需求编号】
+ *
+ * @author clam
+ * @version V1.0.0
+ */
+public interface DayDataService {
+    /** 
+    * @Description: 生成day表相关数据 
+    * @Param: [indexLists, startTime, endTime] 
+    * @return: void 
+    * @Author: clam
+    * @Date: 2022/10/24 
+    */ 
+    void dayDataJobHandler(List<String> indexLists, String startTime, String endTime);
+}
diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/line/IntegrityService.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/line/IntegrityService.java
new file mode 100644
index 000000000..2bcc24695
--- /dev/null
+++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/line/IntegrityService.java
@@ -0,0 +1,13 @@
+package com.njcn.prepare.harmonic.service.line;
+
+import com.njcn.prepare.harmonic.pojo.param.LineParam;
+
+/**
+ * @author xiaoyao
+ * @version 1.0.0
+ * @createTime 2022/10/24 20:06
+ */
+public interface IntegrityService {
+
+    String computeDataIntegrity(LineParam lineParam);
+}
diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/line/LimitTargetService.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/line/LimitTargetService.java
new file mode 100644
index 000000000..1221a203b
--- /dev/null
+++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/line/LimitTargetService.java
@@ -0,0 +1,13 @@
+package com.njcn.prepare.harmonic.service.line;
+
+import com.njcn.prepare.harmonic.pojo.param.LineParam;
+
+/**
+ * @author xiaoyao
+ * @version 1.0.0
+ * @createTime 2022/10/26 13:37
+ */
+public interface LimitTargetService {
+
+    void getLimitTargetData(LineParam lineParam);
+}
diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/line/NormalLimitService.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/line/NormalLimitService.java
new file mode 100644
index 000000000..3fe6b32a4
--- /dev/null
+++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/line/NormalLimitService.java
@@ -0,0 +1,11 @@
+package com.njcn.prepare.harmonic.service.line;
+
+/**
+ * @author denghuajun
+ * @version 1.0.0
+ * @date 2022年10月17日 19:58
+ */
+public interface NormalLimitService {
+
+    String getNormLimitData();
+}
diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/line/OnlineRateService.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/line/OnlineRateService.java
new file mode 100644
index 000000000..df771bcb4
--- /dev/null
+++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/line/OnlineRateService.java
@@ -0,0 +1,13 @@
+package com.njcn.prepare.harmonic.service.line;
+
+import com.njcn.prepare.harmonic.pojo.param.LineParam;
+
+/**
+ * @author xiaoyao
+ * @version 1.0.0
+ * @createTime 2022/10/27 9:23
+ */
+public interface OnlineRateService {
+
+    void getOnlineRateData(LineParam lineParam);
+}
diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/line/PollutionService.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/line/PollutionService.java
new file mode 100644
index 000000000..7098efa96
--- /dev/null
+++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/line/PollutionService.java
@@ -0,0 +1,19 @@
+package com.njcn.prepare.harmonic.service.line;
+
+import com.njcn.prepare.harmonic.pojo.dto.PollutionDTO;
+import com.njcn.prepare.harmonic.pojo.param.LineParam;
+
+import java.util.List;
+
+/**
+ * 监测点污染指标
+ *
+ * @author xiaoyao
+ * @version 1.0.0
+ * @createTime 2022/10/18 8:54
+ */
+public interface PollutionService {
+
+    void processPollutionData(LineParam lineParam);
+
+}
diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/line/RMpHarmonicPReportDPOService.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/line/RMpHarmonicPReportDPOService.java
new file mode 100644
index 000000000..47a828fca
--- /dev/null
+++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/line/RMpHarmonicPReportDPOService.java
@@ -0,0 +1,18 @@
+package com.njcn.prepare.harmonic.service.line;
+
+import com.github.jeffreyning.mybatisplus.service.IMppService;
+import com.njcn.prepare.harmonic.pojo.po.line.RMpHarmonicPReportDPO;
+
+/**
+ * Description:
+ * 接口文档访问地址：http://serverIP:port/swagger-ui.html
+ * Date: 2022/10/25  10:33【需求编号】
+ *
+ * @author clam
+ * @version V1.0.0
+ */
+public interface RMpHarmonicPReportDPOService extends IMppService<RMpHarmonicPReportDPO> {
+
+
+}
+
diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/line/RMpHarmonicVRateReportDPOService.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/line/RMpHarmonicVRateReportDPOService.java
new file mode 100644
index 000000000..d0da7a427
--- /dev/null
+++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/line/RMpHarmonicVRateReportDPOService.java
@@ -0,0 +1,18 @@
+package com.njcn.prepare.harmonic.service.line;
+
+import com.github.jeffreyning.mybatisplus.service.IMppService;
+import com.njcn.prepare.harmonic.pojo.po.line.RMpHarmonicVRateReportDPO;
+
+/**
+*
+* Description:
+* 接口文档访问地址：http://serverIP:port/swagger-ui.html
+* Date: 2022/10/25  11:11【需求编号】
+*
+* @author clam
+* @version V1.0.0
+*/
+public interface RMpHarmonicVRateReportDPOService extends IMppService<RMpHarmonicVRateReportDPO> {
+
+
+}
diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/line/ReportService.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/line/ReportService.java
new file mode 100644
index 000000000..b39d8019e
--- /dev/null
+++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/line/ReportService.java
@@ -0,0 +1,17 @@
+package com.njcn.prepare.harmonic.service.line;
+
+import com.njcn.prepare.harmonic.pojo.param.LineParam;
+
+/**
+ * @author qijian
+ * @version 1.0.0
+ * @createTime 2022/10/20 - 11:17
+ */
+public interface ReportService {
+    /**
+     * 批量处理报表
+     * @param reportParam 参数
+     * @return 返回值
+     */
+    boolean batchReport(LineParam reportParam);
+}
diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/substion/SubstionService.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/substion/SubstionService.java
new file mode 100644
index 000000000..50f14a699
--- /dev/null
+++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/substion/SubstionService.java
@@ -0,0 +1,9 @@
+package com.njcn.prepare.harmonic.service.substion;
+
+/**
+ * @author denghuajun
+ * @version 1.0.0
+ * @date 2022年10月17日 19:58
+ */
+public interface SubstionService {
+}
diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/voltage/VoltageService.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/voltage/VoltageService.java
new file mode 100644
index 000000000..055b4d172
--- /dev/null
+++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/voltage/VoltageService.java
@@ -0,0 +1,9 @@
+package com.njcn.prepare.harmonic.service.voltage;
+
+/**
+ * @author denghuajun
+ * @version 1.0.0
+ * @date 2022年10月17日 19:58
+ */
+public interface VoltageService {
+}
diff --git a/pqs.ipr b/pqs.ipr
index 814ca2211..317fff00c 100644
--- a/pqs.ipr
+++ b/pqs.ipr
@@ -1,3858 +1,3871 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="CodeStyleManager">
-    <option name="USE_DEFAULT_CODE_STYLE_SCHEME" value="true" />
-    <option name="CODE_STYLE_SCHEME" value="" />
-  </component>
-  <component name="CompilerConfiguration">
+
+<project version="4"> 
+  <component name="CodeStyleManager"> 
+    <option name="USE_DEFAULT_CODE_STYLE_SCHEME" value="true"/>  
+    <option name="CODE_STYLE_SCHEME" value=""/> 
+  </component>  
+  <component name="CompilerConfiguration"> 
+    <annotationProcessing> 
+      <profile default="true" name="Default" enabled="true"/>  
+      <profile name="Maven default annotation processors profile" enabled="true"> 
+        <sourceOutputDir name="target/generated-sources/annotations"/>  
+        <sourceTestOutputDir name="target/generated-test-sources/test-annotations"/>  
+        <outputRelativeToContentRoot value="true"/>  
+        <module name="common-autocode"/>  
+        <module name="common-core"/>  
+        <module name="common-db"/>  
+        <module name="common-echarts"/>  
+        <module name="common-influxDB"/>  
+        <module name="common-microservice"/>  
+        <module name="common-poi"/>  
+        <module name="common-redis"/>  
+        <module name="common-swagger"/>  
+        <module name="common-web"/>  
+        <module name="device-api"/>  
+        <module name="device-boot"/>  
+        <module name="energy-api"/>  
+        <module name="energy-boot"/>  
+        <module name="event-api"/>  
+        <module name="event-boot"/>  
+        <module name="harmonic-api"/>  
+        <module name="harmonic-boot"/>  
+        <module name="job-admin"/>  
+        <module name="job-api"/>  
+        <module name="job-executor"/>  
+        <module name="pqs-auth"/>  
+        <module name="pqs-gateway"/>  
+        <module name="quality-api"/>  
+        <module name="quality-boot"/>  
+        <module name="system-api"/>  
+        <module name="system-boot"/>  
+        <module name="user-api"/>  
+        <module name="user-boot"/> 
+      </profile> 
+    </annotationProcessing>  
+    <bytecodeTargetLevel> 
+      <module name="common-autocode" target="1.8"/>  
+      <module name="common-core" target="1.8"/>  
+      <module name="common-db" target="1.8"/>  
+      <module name="common-echarts" target="1.8"/>  
+      <module name="common-influxDB" target="1.8"/>  
+      <module name="common-microservice" target="1.8"/>  
+      <module name="common-poi" target="1.8"/>  
+      <module name="common-redis" target="1.8"/>  
+      <module name="common-swagger" target="1.8"/>  
+      <module name="common-web" target="1.8"/>  
+      <module name="device-api" target="1.8"/>  
+      <module name="device-boot" target="1.8"/>  
+      <module name="energy-api" target="1.8"/>  
+      <module name="energy-boot" target="1.8"/>  
+      <module name="event-api" target="1.8"/>  
+      <module name="event-boot" target="1.8"/>  
+      <module name="harmonic-api" target="1.8"/>  
+      <module name="harmonic-boot" target="1.8"/>  
+      <module name="job-admin" target="1.8"/>  
+      <module name="job-api" target="1.8"/>  
+      <module name="job-executor" target="1.8"/>  
+      <module name="pqs" target="1.8"/>  
+      <module name="pqs-auth" target="1.8"/>  
+      <module name="pqs-common" target="1.8"/>  
+      <module name="pqs-device" target="1.8"/>  
+      <module name="pqs-energy" target="1.8"/>  
+      <module name="pqs-event" target="1.8"/>  
+      <module name="pqs-gateway" target="1.8"/>  
+      <module name="pqs-harmonic" target="1.8"/>  
+      <module name="pqs-job" target="1.8"/>  
+      <module name="pqs-quality" target="1.8"/>  
+      <module name="pqs-system" target="1.8"/>  
+      <module name="pqs-user" target="1.8"/>  
+      <module name="quality-api" target="1.8"/>  
+      <module name="quality-boot" target="1.8"/>  
+      <module name="system-api" target="1.8"/>  
+      <module name="system-boot" target="1.8"/>  
+      <module name="user-api" target="1.8"/>  
+      <module name="user-boot" target="1.8"/> 
+    </bytecodeTargetLevel>  
     <wildcardResourcePatterns>
-      <entry name="!?*.java" />
+      <entry name="!?*.java"/>
     </wildcardResourcePatterns>
-    <annotationProcessing>
-      <profile default="true" name="Default" enabled="true" />
-      <profile name="Maven default annotation processors profile" enabled="true">
-        <sourceOutputDir name="target/generated-sources/annotations" />
-        <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
-        <outputRelativeToContentRoot value="true" />
-        <module name="common-autocode" />
-        <module name="common-core" />
-        <module name="common-db" />
-        <module name="common-echarts" />
-        <module name="common-influxDB" />
-        <module name="common-microservice" />
-        <module name="common-poi" />
-        <module name="common-redis" />
-        <module name="common-swagger" />
-        <module name="common-web" />
-        <module name="device-api" />
-        <module name="device-boot" />
-        <module name="energy-api" />
-        <module name="energy-boot" />
-        <module name="event-api" />
-        <module name="event-boot" />
-        <module name="harmonic-api" />
-        <module name="harmonic-boot" />
-        <module name="job-admin" />
-        <module name="job-api" />
-        <module name="job-executor" />
-        <module name="pqs-auth" />
-        <module name="pqs-gateway" />
-        <module name="quality-api" />
-        <module name="quality-boot" />
-        <module name="system-api" />
-        <module name="system-boot" />
-        <module name="user-api" />
-        <module name="user-boot" />
-      </profile>
-    </annotationProcessing>
-    <bytecodeTargetLevel>
-      <module name="common-autocode" target="1.8" />
-      <module name="common-core" target="1.8" />
-      <module name="common-db" target="1.8" />
-      <module name="common-echarts" target="1.8" />
-      <module name="common-influxDB" target="1.8" />
-      <module name="common-microservice" target="1.8" />
-      <module name="common-poi" target="1.8" />
-      <module name="common-redis" target="1.8" />
-      <module name="common-swagger" target="1.8" />
-      <module name="common-web" target="1.8" />
-      <module name="device-api" target="1.8" />
-      <module name="device-boot" target="1.8" />
-      <module name="energy-api" target="1.8" />
-      <module name="energy-boot" target="1.8" />
-      <module name="event-api" target="1.8" />
-      <module name="event-boot" target="1.8" />
-      <module name="harmonic-api" target="1.8" />
-      <module name="harmonic-boot" target="1.8" />
-      <module name="job-admin" target="1.8" />
-      <module name="job-api" target="1.8" />
-      <module name="job-executor" target="1.8" />
-      <module name="pqs" target="1.8" />
-      <module name="pqs-auth" target="1.8" />
-      <module name="pqs-common" target="1.8" />
-      <module name="pqs-device" target="1.8" />
-      <module name="pqs-energy" target="1.8" />
-      <module name="pqs-event" target="1.8" />
-      <module name="pqs-gateway" target="1.8" />
-      <module name="pqs-harmonic" target="1.8" />
-      <module name="pqs-job" target="1.8" />
-      <module name="pqs-quality" target="1.8" />
-      <module name="pqs-system" target="1.8" />
-      <module name="pqs-user" target="1.8" />
-      <module name="quality-api" target="1.8" />
-      <module name="quality-boot" target="1.8" />
-      <module name="system-api" target="1.8" />
-      <module name="system-boot" target="1.8" />
-      <module name="user-api" target="1.8" />
-      <module name="user-boot" target="1.8" />
-    </bytecodeTargetLevel>
-  </component>
-  <component name="Encoding">
-    <file url="file://$PROJECT_DIR$/pqs-job/job-admin" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/pqs-user/user-boot" charset="UTF-8" />
-  </component>
-  <component name="ExportToHTMLSettings">
-    <option name="PRINT_LINE_NUMBERS" value="false" />
-    <option name="OPEN_IN_BROWSER" value="false" />
-    <option name="OUTPUT_DIRECTORY" />
-  </component>
-  <component name="ImportConfiguration">
-    <option name="VENDOR" />
-    <option name="RELEASE_TAG" />
-    <option name="LOG_MESSAGE" />
-    <option name="CHECKOUT_AFTER_IMPORT" value="true" />
-  </component>
-  <component name="InspectionProjectProfileManager">
-    <profile version="1.0">
-      <option name="myName" value="Project Default" />
-    </profile>
-    <version value="1.0" />
-  </component>
-  <component name="JUnitProjectSettings">
-    <option name="TEST_RUNNER" value="UI" />
-  </component>
-  <component name="JavadocGenerationManager">
-    <option name="OUTPUT_DIRECTORY" />
-    <option name="OPTION_SCOPE" value="protected" />
-    <option name="OPTION_HIERARCHY" value="false" />
-    <option name="OPTION_NAVIGATOR" value="false" />
-    <option name="OPTION_INDEX" value="false" />
-    <option name="OPTION_SEPARATE_INDEX" value="false" />
-    <option name="OPTION_USE_1_1" value="false" />
-    <option name="OPTION_DOCUMENT_TAG_USE" value="false" />
-    <option name="OPTION_DOCUMENT_TAG_AUTHOR" value="false" />
-    <option name="OPTION_DOCUMENT_TAG_VERSION" value="false" />
-    <option name="OPTION_DOCUMENT_TAG_DEPRECATED" value="false" />
-    <option name="OPTION_DEPRECATED_LIST" value="false" />
-    <option name="OTHER_OPTIONS" />
-    <option name="HEAP_SIZE" />
-    <option name="OPEN_IN_BROWSER" value="false" />
-  </component>
-  <component name="JikesSettings">
-    <option name="DEBUGGING_INFO" value="true" />
-    <option name="DEPRECATION" value="true" />
-    <option name="GENERATE_NO_WARNINGS" value="false" />
-    <option name="GENERATE_MAKE_FILE_DEPENDENCIES" value="false" />
-    <option name="DO_FULL_DEPENDENCE_CHECK" value="false" />
-    <option name="IS_INCREMENTAL_MODE" value="false" />
-    <option name="IS_EMACS_ERRORS_MODE" value="true" />
-    <option name="ADDITIONAL_OPTIONS_STRING" value="" />
-    <option name="MAXIMUM_HEAP_SIZE" value="128" />
-  </component>
-  <component name="MavenProjectsManager">
-    <option name="originalFiles">
-      <list>
-        <option value="$PROJECT_DIR$/pom.xml" />
-      </list>
-    </option>
-  </component>
-  <component name="Palette2">
-    <group name="Swing">
-      <item class="com.intellij.uiDesigner.HSpacer" tooltip-text="Horizontal Spacer" icon="/com/intellij/uiDesigner/icons/hspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="1" hsize-policy="6" anchor="0" fill="1" />
-      </item>
-      <item class="com.intellij.uiDesigner.VSpacer" tooltip-text="Vertical Spacer" icon="/com/intellij/uiDesigner/icons/vspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="1" anchor="0" fill="2" />
-      </item>
-      <item class="javax.swing.JPanel" icon="/com/intellij/uiDesigner/icons/panel.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3" />
-      </item>
-      <item class="javax.swing.JScrollPane" icon="/com/intellij/uiDesigner/icons/scrollPane.png" removable="false" auto-create-binding="false" can-attach-label="true">
-        <default-constraints vsize-policy="7" hsize-policy="7" anchor="0" fill="3" />
-      </item>
-      <item class="javax.swing.JButton" icon="/com/intellij/uiDesigner/icons/button.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="3" anchor="0" fill="1" />
-        <initial-values>
-          <property name="text" value="Button" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JRadioButton" icon="/com/intellij/uiDesigner/icons/radioButton.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
-        <initial-values>
-          <property name="text" value="RadioButton" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JCheckBox" icon="/com/intellij/uiDesigner/icons/checkBox.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
-        <initial-values>
-          <property name="text" value="CheckBox" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JLabel" icon="/com/intellij/uiDesigner/icons/label.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="0" anchor="8" fill="0" />
-        <initial-values>
-          <property name="text" value="Label" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JTextField" icon="/com/intellij/uiDesigner/icons/textField.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
-          <preferred-size width="150" height="-1" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JPasswordField" icon="/com/intellij/uiDesigner/icons/passwordField.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
-          <preferred-size width="150" height="-1" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JFormattedTextField" icon="/com/intellij/uiDesigner/icons/formattedTextField.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
-          <preferred-size width="150" height="-1" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTextArea" icon="/com/intellij/uiDesigner/icons/textArea.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTextPane" icon="/com/intellij/uiDesigner/icons/textPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JEditorPane" icon="/com/intellij/uiDesigner/icons/editorPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JComboBox" icon="/com/intellij/uiDesigner/icons/comboBox.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="2" anchor="8" fill="1" />
-      </item>
-      <item class="javax.swing.JTable" icon="/com/intellij/uiDesigner/icons/table.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JList" icon="/com/intellij/uiDesigner/icons/list.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="2" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTree" icon="/com/intellij/uiDesigner/icons/tree.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTabbedPane" icon="/com/intellij/uiDesigner/icons/tabbedPane.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
-          <preferred-size width="200" height="200" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JSplitPane" icon="/com/intellij/uiDesigner/icons/splitPane.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
-          <preferred-size width="200" height="200" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JSpinner" icon="/com/intellij/uiDesigner/icons/spinner.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
-      </item>
-      <item class="javax.swing.JSlider" icon="/com/intellij/uiDesigner/icons/slider.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
-      </item>
-      <item class="javax.swing.JSeparator" icon="/com/intellij/uiDesigner/icons/separator.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3" />
-      </item>
-      <item class="javax.swing.JProgressBar" icon="/com/intellij/uiDesigner/icons/progressbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1" />
-      </item>
-      <item class="javax.swing.JToolBar" icon="/com/intellij/uiDesigner/icons/toolbar.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1">
-          <preferred-size width="-1" height="20" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JToolBar$Separator" icon="/com/intellij/uiDesigner/icons/toolbarSeparator.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="0" anchor="0" fill="1" />
-      </item>
-      <item class="javax.swing.JScrollBar" icon="/com/intellij/uiDesigner/icons/scrollbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="0" anchor="0" fill="2" />
-      </item>
-    </group>
-  </component>
-  <component name="ProjectDictionaryState">
-    <dictionary name="hanyong">
-      <words>
-        <w>eventreport</w>
-        <w>pids</w>
-      </words>
-    </dictionary>
-  </component>
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/pqs-common/common-autocode/common-autocode.iml" filepath="$PROJECT_DIR$/pqs-common/common-autocode/common-autocode.iml" />
-      <module fileurl="file://$PROJECT_DIR$/pqs-common/common-core/common-core.iml" filepath="$PROJECT_DIR$/pqs-common/common-core/common-core.iml" />
-      <module fileurl="file://$PROJECT_DIR$/pqs-common/common-db/common-db.iml" filepath="$PROJECT_DIR$/pqs-common/common-db/common-db.iml" />
-      <module fileurl="file://$PROJECT_DIR$/pqs-common/common-echarts/common-echarts.iml" filepath="$PROJECT_DIR$/pqs-common/common-echarts/common-echarts.iml" />
-      <module fileurl="file://$PROJECT_DIR$/pqs-common/common-influxdb/common-influxDB.iml" filepath="$PROJECT_DIR$/pqs-common/common-influxdb/common-influxDB.iml" />
-      <module fileurl="file://$PROJECT_DIR$/pqs-common/common-microservice/common-microservice.iml" filepath="$PROJECT_DIR$/pqs-common/common-microservice/common-microservice.iml" />
-      <module fileurl="file://$PROJECT_DIR$/pqs-common/common-poi/common-poi.iml" filepath="$PROJECT_DIR$/pqs-common/common-poi/common-poi.iml" />
-      <module fileurl="file://$PROJECT_DIR$/pqs-common/common-redis/common-redis.iml" filepath="$PROJECT_DIR$/pqs-common/common-redis/common-redis.iml" />
-      <module fileurl="file://$PROJECT_DIR$/pqs-common/common-swagger/common-swagger.iml" filepath="$PROJECT_DIR$/pqs-common/common-swagger/common-swagger.iml" />
-      <module fileurl="file://$PROJECT_DIR$/pqs-common/common-web/common-web.iml" filepath="$PROJECT_DIR$/pqs-common/common-web/common-web.iml" />
-      <module fileurl="file://$PROJECT_DIR$/pqs-device/device-api/device-api.iml" filepath="$PROJECT_DIR$/pqs-device/device-api/device-api.iml" />
-      <module fileurl="file://$PROJECT_DIR$/pqs-device/device-boot/device-boot.iml" filepath="$PROJECT_DIR$/pqs-device/device-boot/device-boot.iml" />
-      <module fileurl="file://$PROJECT_DIR$/pqs-energy/energy-api/energy-api.iml" filepath="$PROJECT_DIR$/pqs-energy/energy-api/energy-api.iml" />
-      <module fileurl="file://$PROJECT_DIR$/pqs-energy/energy-boot/energy-boot.iml" filepath="$PROJECT_DIR$/pqs-energy/energy-boot/energy-boot.iml" />
-      <module fileurl="file://$PROJECT_DIR$/pqs-event/event-api/event-api.iml" filepath="$PROJECT_DIR$/pqs-event/event-api/event-api.iml" />
-      <module fileurl="file://$PROJECT_DIR$/pqs-event/event-boot/event-boot.iml" filepath="$PROJECT_DIR$/pqs-event/event-boot/event-boot.iml" />
-      <module fileurl="file://$PROJECT_DIR$/pqs-harmonic/harmonic-api/harmonic-api.iml" filepath="$PROJECT_DIR$/pqs-harmonic/harmonic-api/harmonic-api.iml" />
-      <module fileurl="file://$PROJECT_DIR$/pqs-harmonic/harmonic-boot/harmonic-boot.iml" filepath="$PROJECT_DIR$/pqs-harmonic/harmonic-boot/harmonic-boot.iml" />
-      <module fileurl="file://$PROJECT_DIR$/pqs-job/job-admin/job-admin.iml" filepath="$PROJECT_DIR$/pqs-job/job-admin/job-admin.iml" />
-      <module fileurl="file://$PROJECT_DIR$/pqs-job/job-api/job-api.iml" filepath="$PROJECT_DIR$/pqs-job/job-api/job-api.iml" />
-      <module fileurl="file://$PROJECT_DIR$/pqs-job/job-executor/job-executor.iml" filepath="$PROJECT_DIR$/pqs-job/job-executor/job-executor.iml" />
-      <module fileurl="file://$PROJECT_DIR$/pqs.iml" filepath="$PROJECT_DIR$/pqs.iml" />
-      <module fileurl="file://$PROJECT_DIR$/pqs-auth/pqs-auth.iml" filepath="$PROJECT_DIR$/pqs-auth/pqs-auth.iml" />
-      <module fileurl="file://$PROJECT_DIR$/pqs-common/pqs-common.iml" filepath="$PROJECT_DIR$/pqs-common/pqs-common.iml" />
-      <module fileurl="file://$PROJECT_DIR$/pqs-device/pqs-device.iml" filepath="$PROJECT_DIR$/pqs-device/pqs-device.iml" />
-      <module fileurl="file://$PROJECT_DIR$/pqs-energy/pqs-energy.iml" filepath="$PROJECT_DIR$/pqs-energy/pqs-energy.iml" />
-      <module fileurl="file://$PROJECT_DIR$/pqs-event/pqs-event.iml" filepath="$PROJECT_DIR$/pqs-event/pqs-event.iml" />
-      <module fileurl="file://$PROJECT_DIR$/pqs-gateway/pqs-gateway.iml" filepath="$PROJECT_DIR$/pqs-gateway/pqs-gateway.iml" />
-      <module fileurl="file://$PROJECT_DIR$/pqs-harmonic/pqs-harmonic.iml" filepath="$PROJECT_DIR$/pqs-harmonic/pqs-harmonic.iml" />
-      <module fileurl="file://$PROJECT_DIR$/pqs-job/pqs-job.iml" filepath="$PROJECT_DIR$/pqs-job/pqs-job.iml" />
-      <module fileurl="file://$PROJECT_DIR$/pqs-quality/pqs-quality.iml" filepath="$PROJECT_DIR$/pqs-quality/pqs-quality.iml" />
-      <module fileurl="file://$PROJECT_DIR$/pqs-system/pqs-system.iml" filepath="$PROJECT_DIR$/pqs-system/pqs-system.iml" />
-      <module fileurl="file://$PROJECT_DIR$/pqs-user/pqs-user.iml" filepath="$PROJECT_DIR$/pqs-user/pqs-user.iml" />
-      <module fileurl="file://$PROJECT_DIR$/pqs-quality/quality-api/quality-api.iml" filepath="$PROJECT_DIR$/pqs-quality/quality-api/quality-api.iml" />
-      <module fileurl="file://$PROJECT_DIR$/pqs-quality/quality-boot/quality-boot.iml" filepath="$PROJECT_DIR$/pqs-quality/quality-boot/quality-boot.iml" />
-      <module fileurl="file://$PROJECT_DIR$/pqs-system/system-api/system-api.iml" filepath="$PROJECT_DIR$/pqs-system/system-api/system-api.iml" />
-      <module fileurl="file://$PROJECT_DIR$/pqs-system/system-boot/system-boot.iml" filepath="$PROJECT_DIR$/pqs-system/system-boot/system-boot.iml" />
-      <module fileurl="file://$PROJECT_DIR$/pqs-user/user-api/user-api.iml" filepath="$PROJECT_DIR$/pqs-user/user-api/user-api.iml" />
-      <module fileurl="file://$PROJECT_DIR$/pqs-user/user-boot/user-boot.iml" filepath="$PROJECT_DIR$/pqs-user/user-boot/user-boot.iml" />
-    </modules>
-  </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_9" default="false" project-jdk-name="1.8" project-jdk-type="JavaSDK" />
-  <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$" vcs="Git" />
-  </component>
-  <component name="libraryTable">
-    <library name="Maven: ch.qos.logback:logback-classic:1.2.3">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/ch/qos/logback/logback-classic/1.2.3/logback-classic-1.2.3.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/ch/qos/logback/logback-classic/1.2.3/logback-classic-1.2.3-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/ch/qos/logback/logback-classic/1.2.3/logback-classic-1.2.3-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: ch.qos.logback:logback-core:1.2.3">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/ch/qos/logback/logback-core/1.2.3/logback-core-1.2.3.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/ch/qos/logback/logback-core/1.2.3/logback-core-1.2.3-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/ch/qos/logback/logback-core/1.2.3/logback-core-1.2.3-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: cn.afterturn:easypoi-annotation:4.4.0">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/cn/afterturn/easypoi-annotation/4.4.0/easypoi-annotation-4.4.0.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/cn/afterturn/easypoi-annotation/4.4.0/easypoi-annotation-4.4.0-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/cn/afterturn/easypoi-annotation/4.4.0/easypoi-annotation-4.4.0-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: cn.afterturn:easypoi-base:4.4.0">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/cn/afterturn/easypoi-base/4.4.0/easypoi-base-4.4.0.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/cn/afterturn/easypoi-base/4.4.0/easypoi-base-4.4.0-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/cn/afterturn/easypoi-base/4.4.0/easypoi-base-4.4.0-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: cn.afterturn:easypoi-spring-boot-starter:4.4.0">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/cn/afterturn/easypoi-spring-boot-starter/4.4.0/easypoi-spring-boot-starter-4.4.0.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/cn/afterturn/easypoi-spring-boot-starter/4.4.0/easypoi-spring-boot-starter-4.4.0-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/cn/afterturn/easypoi-spring-boot-starter/4.4.0/easypoi-spring-boot-starter-4.4.0-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: cn.afterturn:easypoi-web:4.4.0">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/cn/afterturn/easypoi-web/4.4.0/easypoi-web-4.4.0.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/cn/afterturn/easypoi-web/4.4.0/easypoi-web-4.4.0-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/cn/afterturn/easypoi-web/4.4.0/easypoi-web-4.4.0-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: cn.afterturn:easypoi-wps:4.4.0">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/cn/afterturn/easypoi-wps/4.4.0/easypoi-wps-4.4.0.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/cn/afterturn/easypoi-wps/4.4.0/easypoi-wps-4.4.0-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/cn/afterturn/easypoi-wps/4.4.0/easypoi-wps-4.4.0-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: cn.hutool:hutool-all:5.7.9">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/cn/hutool/hutool-all/5.7.9/hutool-all-5.7.9.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/cn/hutool/hutool-all/5.7.9/hutool-all-5.7.9-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/cn/hutool/hutool-all/5.7.9/hutool-all-5.7.9-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: com.alibaba.cloud:spring-cloud-alibaba-commons:2.2.7.RELEASE">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/com/alibaba/cloud/spring-cloud-alibaba-commons/2.2.7.RELEASE/spring-cloud-alibaba-commons-2.2.7.RELEASE.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/com/alibaba/cloud/spring-cloud-alibaba-commons/2.2.7.RELEASE/spring-cloud-alibaba-commons-2.2.7.RELEASE-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/com/alibaba/cloud/spring-cloud-alibaba-commons/2.2.7.RELEASE/spring-cloud-alibaba-commons-2.2.7.RELEASE-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: com.alibaba.cloud:spring-cloud-alibaba-sentinel-datasource:2.2.7.RELEASE">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/com/alibaba/cloud/spring-cloud-alibaba-sentinel-datasource/2.2.7.RELEASE/spring-cloud-alibaba-sentinel-datasource-2.2.7.RELEASE.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/com/alibaba/cloud/spring-cloud-alibaba-sentinel-datasource/2.2.7.RELEASE/spring-cloud-alibaba-sentinel-datasource-2.2.7.RELEASE-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/com/alibaba/cloud/spring-cloud-alibaba-sentinel-datasource/2.2.7.RELEASE/spring-cloud-alibaba-sentinel-datasource-2.2.7.RELEASE-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: com.alibaba.cloud:spring-cloud-alibaba-sentinel-gateway:2.2.7.RELEASE">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/com/alibaba/cloud/spring-cloud-alibaba-sentinel-gateway/2.2.7.RELEASE/spring-cloud-alibaba-sentinel-gateway-2.2.7.RELEASE.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/com/alibaba/cloud/spring-cloud-alibaba-sentinel-gateway/2.2.7.RELEASE/spring-cloud-alibaba-sentinel-gateway-2.2.7.RELEASE-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/com/alibaba/cloud/spring-cloud-alibaba-sentinel-gateway/2.2.7.RELEASE/spring-cloud-alibaba-sentinel-gateway-2.2.7.RELEASE-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: com.alibaba.cloud:spring-cloud-circuitbreaker-sentinel:2.2.7.RELEASE">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/com/alibaba/cloud/spring-cloud-circuitbreaker-sentinel/2.2.7.RELEASE/spring-cloud-circuitbreaker-sentinel-2.2.7.RELEASE.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/com/alibaba/cloud/spring-cloud-circuitbreaker-sentinel/2.2.7.RELEASE/spring-cloud-circuitbreaker-sentinel-2.2.7.RELEASE-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/com/alibaba/cloud/spring-cloud-circuitbreaker-sentinel/2.2.7.RELEASE/spring-cloud-circuitbreaker-sentinel-2.2.7.RELEASE-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: com.alibaba.cloud:spring-cloud-starter-alibaba-nacos-config:2.2.7.RELEASE">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/com/alibaba/cloud/spring-cloud-starter-alibaba-nacos-config/2.2.7.RELEASE/spring-cloud-starter-alibaba-nacos-config-2.2.7.RELEASE.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/com/alibaba/cloud/spring-cloud-starter-alibaba-nacos-config/2.2.7.RELEASE/spring-cloud-starter-alibaba-nacos-config-2.2.7.RELEASE-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/com/alibaba/cloud/spring-cloud-starter-alibaba-nacos-config/2.2.7.RELEASE/spring-cloud-starter-alibaba-nacos-config-2.2.7.RELEASE-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: com.alibaba.cloud:spring-cloud-starter-alibaba-nacos-discovery:2.2.7.RELEASE">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/com/alibaba/cloud/spring-cloud-starter-alibaba-nacos-discovery/2.2.7.RELEASE/spring-cloud-starter-alibaba-nacos-discovery-2.2.7.RELEASE.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/com/alibaba/cloud/spring-cloud-starter-alibaba-nacos-discovery/2.2.7.RELEASE/spring-cloud-starter-alibaba-nacos-discovery-2.2.7.RELEASE-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/com/alibaba/cloud/spring-cloud-starter-alibaba-nacos-discovery/2.2.7.RELEASE/spring-cloud-starter-alibaba-nacos-discovery-2.2.7.RELEASE-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: com.alibaba.cloud:spring-cloud-starter-alibaba-sentinel:2.2.7.RELEASE">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/com/alibaba/cloud/spring-cloud-starter-alibaba-sentinel/2.2.7.RELEASE/spring-cloud-starter-alibaba-sentinel-2.2.7.RELEASE.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/com/alibaba/cloud/spring-cloud-starter-alibaba-sentinel/2.2.7.RELEASE/spring-cloud-starter-alibaba-sentinel-2.2.7.RELEASE-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/com/alibaba/cloud/spring-cloud-starter-alibaba-sentinel/2.2.7.RELEASE/spring-cloud-starter-alibaba-sentinel-2.2.7.RELEASE-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: com.alibaba.csp:sentinel-annotation-aspectj:1.8.1">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/com/alibaba/csp/sentinel-annotation-aspectj/1.8.1/sentinel-annotation-aspectj-1.8.1.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/com/alibaba/csp/sentinel-annotation-aspectj/1.8.1/sentinel-annotation-aspectj-1.8.1-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/com/alibaba/csp/sentinel-annotation-aspectj/1.8.1/sentinel-annotation-aspectj-1.8.1-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: com.alibaba.csp:sentinel-api-gateway-adapter-common:1.8.1">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/com/alibaba/csp/sentinel-api-gateway-adapter-common/1.8.1/sentinel-api-gateway-adapter-common-1.8.1.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/com/alibaba/csp/sentinel-api-gateway-adapter-common/1.8.1/sentinel-api-gateway-adapter-common-1.8.1-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/com/alibaba/csp/sentinel-api-gateway-adapter-common/1.8.1/sentinel-api-gateway-adapter-common-1.8.1-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: com.alibaba.csp:sentinel-cluster-client-default:1.8.1">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/com/alibaba/csp/sentinel-cluster-client-default/1.8.1/sentinel-cluster-client-default-1.8.1.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/com/alibaba/csp/sentinel-cluster-client-default/1.8.1/sentinel-cluster-client-default-1.8.1-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/com/alibaba/csp/sentinel-cluster-client-default/1.8.1/sentinel-cluster-client-default-1.8.1-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: com.alibaba.csp:sentinel-cluster-common-default:1.8.1">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/com/alibaba/csp/sentinel-cluster-common-default/1.8.1/sentinel-cluster-common-default-1.8.1.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/com/alibaba/csp/sentinel-cluster-common-default/1.8.1/sentinel-cluster-common-default-1.8.1-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/com/alibaba/csp/sentinel-cluster-common-default/1.8.1/sentinel-cluster-common-default-1.8.1-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: com.alibaba.csp:sentinel-cluster-server-default:1.8.1">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/com/alibaba/csp/sentinel-cluster-server-default/1.8.1/sentinel-cluster-server-default-1.8.1.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/com/alibaba/csp/sentinel-cluster-server-default/1.8.1/sentinel-cluster-server-default-1.8.1-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/com/alibaba/csp/sentinel-cluster-server-default/1.8.1/sentinel-cluster-server-default-1.8.1-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: com.alibaba.csp:sentinel-core:1.8.1">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/com/alibaba/csp/sentinel-core/1.8.1/sentinel-core-1.8.1.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/com/alibaba/csp/sentinel-core/1.8.1/sentinel-core-1.8.1-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/com/alibaba/csp/sentinel-core/1.8.1/sentinel-core-1.8.1-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: com.alibaba.csp:sentinel-datasource-extension:1.8.1">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/com/alibaba/csp/sentinel-datasource-extension/1.8.1/sentinel-datasource-extension-1.8.1.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/com/alibaba/csp/sentinel-datasource-extension/1.8.1/sentinel-datasource-extension-1.8.1-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/com/alibaba/csp/sentinel-datasource-extension/1.8.1/sentinel-datasource-extension-1.8.1-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: com.alibaba.csp:sentinel-datasource-nacos:1.8.1">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/com/alibaba/csp/sentinel-datasource-nacos/1.8.1/sentinel-datasource-nacos-1.8.1.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/com/alibaba/csp/sentinel-datasource-nacos/1.8.1/sentinel-datasource-nacos-1.8.1-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/com/alibaba/csp/sentinel-datasource-nacos/1.8.1/sentinel-datasource-nacos-1.8.1-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: com.alibaba.csp:sentinel-parameter-flow-control:1.8.1">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/com/alibaba/csp/sentinel-parameter-flow-control/1.8.1/sentinel-parameter-flow-control-1.8.1.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/com/alibaba/csp/sentinel-parameter-flow-control/1.8.1/sentinel-parameter-flow-control-1.8.1-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/com/alibaba/csp/sentinel-parameter-flow-control/1.8.1/sentinel-parameter-flow-control-1.8.1-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: com.alibaba.csp:sentinel-reactor-adapter:1.8.1">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/com/alibaba/csp/sentinel-reactor-adapter/1.8.1/sentinel-reactor-adapter-1.8.1.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/com/alibaba/csp/sentinel-reactor-adapter/1.8.1/sentinel-reactor-adapter-1.8.1-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/com/alibaba/csp/sentinel-reactor-adapter/1.8.1/sentinel-reactor-adapter-1.8.1-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: com.alibaba.csp:sentinel-spring-cloud-gateway-adapter:1.8.1">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/com/alibaba/csp/sentinel-spring-cloud-gateway-adapter/1.8.1/sentinel-spring-cloud-gateway-adapter-1.8.1.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/com/alibaba/csp/sentinel-spring-cloud-gateway-adapter/1.8.1/sentinel-spring-cloud-gateway-adapter-1.8.1-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/com/alibaba/csp/sentinel-spring-cloud-gateway-adapter/1.8.1/sentinel-spring-cloud-gateway-adapter-1.8.1-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: com.alibaba.csp:sentinel-spring-webflux-adapter:1.8.1">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/com/alibaba/csp/sentinel-spring-webflux-adapter/1.8.1/sentinel-spring-webflux-adapter-1.8.1.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/com/alibaba/csp/sentinel-spring-webflux-adapter/1.8.1/sentinel-spring-webflux-adapter-1.8.1-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/com/alibaba/csp/sentinel-spring-webflux-adapter/1.8.1/sentinel-spring-webflux-adapter-1.8.1-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: com.alibaba.csp:sentinel-spring-webmvc-adapter:1.8.1">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/com/alibaba/csp/sentinel-spring-webmvc-adapter/1.8.1/sentinel-spring-webmvc-adapter-1.8.1.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/com/alibaba/csp/sentinel-spring-webmvc-adapter/1.8.1/sentinel-spring-webmvc-adapter-1.8.1-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/com/alibaba/csp/sentinel-spring-webmvc-adapter/1.8.1/sentinel-spring-webmvc-adapter-1.8.1-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: com.alibaba.csp:sentinel-transport-common:1.8.1">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/com/alibaba/csp/sentinel-transport-common/1.8.1/sentinel-transport-common-1.8.1.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/com/alibaba/csp/sentinel-transport-common/1.8.1/sentinel-transport-common-1.8.1-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/com/alibaba/csp/sentinel-transport-common/1.8.1/sentinel-transport-common-1.8.1-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: com.alibaba.csp:sentinel-transport-simple-http:1.8.1">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/com/alibaba/csp/sentinel-transport-simple-http/1.8.1/sentinel-transport-simple-http-1.8.1.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/com/alibaba/csp/sentinel-transport-simple-http/1.8.1/sentinel-transport-simple-http-1.8.1-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/com/alibaba/csp/sentinel-transport-simple-http/1.8.1/sentinel-transport-simple-http-1.8.1-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: com.alibaba.csp:sentinel-zuul-adapter:1.8.1">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/com/alibaba/csp/sentinel-zuul-adapter/1.8.1/sentinel-zuul-adapter-1.8.1.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/com/alibaba/csp/sentinel-zuul-adapter/1.8.1/sentinel-zuul-adapter-1.8.1-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/com/alibaba/csp/sentinel-zuul-adapter/1.8.1/sentinel-zuul-adapter-1.8.1-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: com.alibaba.nacos:nacos-client:2.0.3">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/com/alibaba/nacos/nacos-client/2.0.3/nacos-client-2.0.3.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/com/alibaba/nacos/nacos-client/2.0.3/nacos-client-2.0.3-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/com/alibaba/nacos/nacos-client/2.0.3/nacos-client-2.0.3-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: com.alibaba.spring:spring-context-support:1.0.10">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/com/alibaba/spring/spring-context-support/1.0.10/spring-context-support-1.0.10.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/com/alibaba/spring/spring-context-support/1.0.10/spring-context-support-1.0.10-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/com/alibaba/spring/spring-context-support/1.0.10/spring-context-support-1.0.10-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: com.alibaba:druid-spring-boot-starter:1.2.5">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/com/alibaba/druid-spring-boot-starter/1.2.5/druid-spring-boot-starter-1.2.5.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/com/alibaba/druid-spring-boot-starter/1.2.5/druid-spring-boot-starter-1.2.5-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/com/alibaba/druid-spring-boot-starter/1.2.5/druid-spring-boot-starter-1.2.5-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: com.alibaba:druid:1.2.5">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/com/alibaba/druid/1.2.5/druid-1.2.5.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/com/alibaba/druid/1.2.5/druid-1.2.5-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/com/alibaba/druid/1.2.5/druid-1.2.5-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: com.alibaba:fastjson:1.2.75">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/com/alibaba/fastjson/1.2.75/fastjson-1.2.75.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/com/alibaba/fastjson/1.2.75/fastjson-1.2.75-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/com/alibaba/fastjson/1.2.75/fastjson-1.2.75-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: com.baomidou:mybatis-plus-annotation:3.4.2">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/com/baomidou/mybatis-plus-annotation/3.4.2/mybatis-plus-annotation-3.4.2.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/com/baomidou/mybatis-plus-annotation/3.4.2/mybatis-plus-annotation-3.4.2-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/com/baomidou/mybatis-plus-annotation/3.4.2/mybatis-plus-annotation-3.4.2-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: com.baomidou:mybatis-plus-boot-starter:3.4.2">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/com/baomidou/mybatis-plus-boot-starter/3.4.2/mybatis-plus-boot-starter-3.4.2.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/com/baomidou/mybatis-plus-boot-starter/3.4.2/mybatis-plus-boot-starter-3.4.2-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/com/baomidou/mybatis-plus-boot-starter/3.4.2/mybatis-plus-boot-starter-3.4.2-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: com.baomidou:mybatis-plus-core:3.4.2">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/com/baomidou/mybatis-plus-core/3.4.2/mybatis-plus-core-3.4.2.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/com/baomidou/mybatis-plus-core/3.4.2/mybatis-plus-core-3.4.2-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/com/baomidou/mybatis-plus-core/3.4.2/mybatis-plus-core-3.4.2-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: com.baomidou:mybatis-plus-extension:3.4.2">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/com/baomidou/mybatis-plus-extension/3.4.2/mybatis-plus-extension-3.4.2.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/com/baomidou/mybatis-plus-extension/3.4.2/mybatis-plus-extension-3.4.2-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/com/baomidou/mybatis-plus-extension/3.4.2/mybatis-plus-extension-3.4.2-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: com.baomidou:mybatis-plus-generator:3.5.1">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/com/baomidou/mybatis-plus-generator/3.5.1/mybatis-plus-generator-3.5.1.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/com/baomidou/mybatis-plus-generator/3.5.1/mybatis-plus-generator-3.5.1-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/com/baomidou/mybatis-plus-generator/3.5.1/mybatis-plus-generator-3.5.1-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: com.baomidou:mybatis-plus:3.4.2">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/com/baomidou/mybatis-plus/3.4.2/mybatis-plus-3.4.2.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/com/baomidou/mybatis-plus/3.4.2/mybatis-plus-3.4.2-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/com/baomidou/mybatis-plus/3.4.2/mybatis-plus-3.4.2-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.12.4">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/com/fasterxml/jackson/core/jackson-annotations/2.12.4/jackson-annotations-2.12.4.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/com/fasterxml/jackson/core/jackson-annotations/2.12.4/jackson-annotations-2.12.4-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/com/fasterxml/jackson/core/jackson-annotations/2.12.4/jackson-annotations-2.12.4-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: com.fasterxml.jackson.core:jackson-core:2.12.4">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/com/fasterxml/jackson/core/jackson-core/2.12.4/jackson-core-2.12.4.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/com/fasterxml/jackson/core/jackson-core/2.12.4/jackson-core-2.12.4-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/com/fasterxml/jackson/core/jackson-core/2.12.4/jackson-core-2.12.4-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: com.fasterxml.jackson.core:jackson-databind:2.12.4">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/com/fasterxml/jackson/core/jackson-databind/2.12.4/jackson-databind-2.12.4.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/com/fasterxml/jackson/core/jackson-databind/2.12.4/jackson-databind-2.12.4-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/com/fasterxml/jackson/core/jackson-databind/2.12.4/jackson-databind-2.12.4-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.11.4">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/com/fasterxml/jackson/dataformat/jackson-dataformat-yaml/2.11.4/jackson-dataformat-yaml-2.11.4.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/com/fasterxml/jackson/dataformat/jackson-dataformat-yaml/2.11.4/jackson-dataformat-yaml-2.11.4-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/com/fasterxml/jackson/dataformat/jackson-dataformat-yaml/2.11.4/jackson-dataformat-yaml-2.11.4-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.11.4">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/com/fasterxml/jackson/datatype/jackson-datatype-jdk8/2.11.4/jackson-datatype-jdk8-2.11.4.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/com/fasterxml/jackson/datatype/jackson-datatype-jdk8/2.11.4/jackson-datatype-jdk8-2.11.4-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/com/fasterxml/jackson/datatype/jackson-datatype-jdk8/2.11.4/jackson-datatype-jdk8-2.11.4-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.11.4">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/com/fasterxml/jackson/datatype/jackson-datatype-jsr310/2.11.4/jackson-datatype-jsr310-2.11.4.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/com/fasterxml/jackson/datatype/jackson-datatype-jsr310/2.11.4/jackson-datatype-jsr310-2.11.4-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/com/fasterxml/jackson/datatype/jackson-datatype-jsr310/2.11.4/jackson-datatype-jsr310-2.11.4-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: com.fasterxml.jackson.module:jackson-module-parameter-names:2.11.4">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/com/fasterxml/jackson/module/jackson-module-parameter-names/2.11.4/jackson-module-parameter-names-2.11.4.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/com/fasterxml/jackson/module/jackson-module-parameter-names/2.11.4/jackson-module-parameter-names-2.11.4-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/com/fasterxml/jackson/module/jackson-module-parameter-names/2.11.4/jackson-module-parameter-names-2.11.4-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: com.fasterxml:classmate:1.5.1">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/com/fasterxml/classmate/1.5.1/classmate-1.5.1.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/com/fasterxml/classmate/1.5.1/classmate-1.5.1-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/com/fasterxml/classmate/1.5.1/classmate-1.5.1-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: com.github.abel533:ECharts:3.0.0.6">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/com/github/abel533/ECharts/3.0.0.6/ECharts-3.0.0.6.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/com/github/abel533/ECharts/3.0.0.6/ECharts-3.0.0.6-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/com/github/abel533/ECharts/3.0.0.6/ECharts-3.0.0.6-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: com.github.jsqlparser:jsqlparser:4.0">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/com/github/jsqlparser/jsqlparser/4.0/jsqlparser-4.0.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/com/github/jsqlparser/jsqlparser/4.0/jsqlparser-4.0-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/com/github/jsqlparser/jsqlparser/4.0/jsqlparser-4.0-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: com.github.penggle:kaptcha:2.3.2">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/com/github/penggle/kaptcha/2.3.2/kaptcha-2.3.2.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/com/github/penggle/kaptcha/2.3.2/kaptcha-2.3.2-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/com/github/penggle/kaptcha/2.3.2/kaptcha-2.3.2-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: com.github.stephenc.jcip:jcip-annotations:1.0-1">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/com/github/stephenc/jcip/jcip-annotations/1.0-1/jcip-annotations-1.0-1.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/com/github/stephenc/jcip/jcip-annotations/1.0-1/jcip-annotations-1.0-1-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/com/github/stephenc/jcip/jcip-annotations/1.0-1/jcip-annotations-1.0-1-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: com.github.tocrhz:mqtt-spring-boot-starter:1.2.7">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/com/github/tocrhz/mqtt-spring-boot-starter/1.2.7/mqtt-spring-boot-starter-1.2.7.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/com/github/tocrhz/mqtt-spring-boot-starter/1.2.7/mqtt-spring-boot-starter-1.2.7-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/com/github/tocrhz/mqtt-spring-boot-starter/1.2.7/mqtt-spring-boot-starter-1.2.7-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: com.github.virtuald:curvesapi:1.06">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/com/github/virtuald/curvesapi/1.06/curvesapi-1.06.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/com/github/virtuald/curvesapi/1.06/curvesapi-1.06-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/com/github/virtuald/curvesapi/1.06/curvesapi-1.06-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: com.github.xiaoymin:knife4j-annotations:3.0.2">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/com/github/xiaoymin/knife4j-annotations/3.0.2/knife4j-annotations-3.0.2.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/com/github/xiaoymin/knife4j-annotations/3.0.2/knife4j-annotations-3.0.2-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/com/github/xiaoymin/knife4j-annotations/3.0.2/knife4j-annotations-3.0.2-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: com.github.xiaoymin:knife4j-core:3.0.2">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/com/github/xiaoymin/knife4j-core/3.0.2/knife4j-core-3.0.2.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/com/github/xiaoymin/knife4j-core/3.0.2/knife4j-core-3.0.2-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/com/github/xiaoymin/knife4j-core/3.0.2/knife4j-core-3.0.2-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: com.github.xiaoymin:knife4j-spring-boot-autoconfigure:3.0.2">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/com/github/xiaoymin/knife4j-spring-boot-autoconfigure/3.0.2/knife4j-spring-boot-autoconfigure-3.0.2.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/com/github/xiaoymin/knife4j-spring-boot-autoconfigure/3.0.2/knife4j-spring-boot-autoconfigure-3.0.2-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/com/github/xiaoymin/knife4j-spring-boot-autoconfigure/3.0.2/knife4j-spring-boot-autoconfigure-3.0.2-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: com.github.xiaoymin:knife4j-spring-boot-starter:3.0.2">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/com/github/xiaoymin/knife4j-spring-boot-starter/3.0.2/knife4j-spring-boot-starter-3.0.2.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/com/github/xiaoymin/knife4j-spring-boot-starter/3.0.2/knife4j-spring-boot-starter-3.0.2-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/com/github/xiaoymin/knife4j-spring-boot-starter/3.0.2/knife4j-spring-boot-starter-3.0.2-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: com.github.xiaoymin:knife4j-spring-ui:3.0.2">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/com/github/xiaoymin/knife4j-spring-ui/3.0.2/knife4j-spring-ui-3.0.2.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/com/github/xiaoymin/knife4j-spring-ui/3.0.2/knife4j-spring-ui-3.0.2-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/com/github/xiaoymin/knife4j-spring-ui/3.0.2/knife4j-spring-ui-3.0.2-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: com.github.xiaoymin:knife4j-spring:3.0.2">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/com/github/xiaoymin/knife4j-spring/3.0.2/knife4j-spring-3.0.2.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/com/github/xiaoymin/knife4j-spring/3.0.2/knife4j-spring-3.0.2-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/com/github/xiaoymin/knife4j-spring/3.0.2/knife4j-spring-3.0.2-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: com.google.code.findbugs:jsr305:3.0.1">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/com/google/code/findbugs/jsr305/3.0.1/jsr305-3.0.1.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/com/google/code/findbugs/jsr305/3.0.1/jsr305-3.0.1-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/com/google/code/findbugs/jsr305/3.0.1/jsr305-3.0.1-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: com.google.code.findbugs:jsr305:3.0.2">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/com/google/code/findbugs/jsr305/3.0.2/jsr305-3.0.2.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/com/google/code/findbugs/jsr305/3.0.2/jsr305-3.0.2-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/com/google/code/findbugs/jsr305/3.0.2/jsr305-3.0.2-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: com.google.code.gson:gson:2.8.9">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/com/google/code/gson/gson/2.8.9/gson-2.8.9.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/com/google/code/gson/gson/2.8.9/gson-2.8.9-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/com/google/code/gson/gson/2.8.9/gson-2.8.9-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: com.google.errorprone:error_prone_annotations:2.3.4">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/com/google/errorprone/error_prone_annotations/2.3.4/error_prone_annotations-2.3.4.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/com/google/errorprone/error_prone_annotations/2.3.4/error_prone_annotations-2.3.4-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/com/google/errorprone/error_prone_annotations/2.3.4/error_prone_annotations-2.3.4-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: com.google.guava:failureaccess:1.0.1">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/com/google/guava/failureaccess/1.0.1/failureaccess-1.0.1.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/com/google/guava/failureaccess/1.0.1/failureaccess-1.0.1-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/com/google/guava/failureaccess/1.0.1/failureaccess-1.0.1-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: com.google.guava:guava:30.0-jre">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/com/google/guava/guava/30.0-jre/guava-30.0-jre.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/com/google/guava/guava/30.0-jre/guava-30.0-jre-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/com/google/guava/guava/30.0-jre/guava-30.0-jre-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/com/google/guava/listenablefuture/9999.0-empty-to-avoid-conflict-with-guava/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/com/google/guava/listenablefuture/9999.0-empty-to-avoid-conflict-with-guava/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/com/google/guava/listenablefuture/9999.0-empty-to-avoid-conflict-with-guava/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: com.google.j2objc:j2objc-annotations:1.3">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/com/google/j2objc/j2objc-annotations/1.3/j2objc-annotations-1.3.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/com/google/j2objc/j2objc-annotations/1.3/j2objc-annotations-1.3-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/com/google/j2objc/j2objc-annotations/1.3/j2objc-annotations-1.3-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: com.google.protobuf:protobuf-java:3.14.0">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/com/google/protobuf/protobuf-java/3.14.0/protobuf-java-3.14.0.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/com/google/protobuf/protobuf-java/3.14.0/protobuf-java-3.14.0-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/com/google/protobuf/protobuf-java/3.14.0/protobuf-java-3.14.0-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: com.googlecode.concurrentlinkedhashmap:concurrentlinkedhashmap-lru:1.4.2">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/com/googlecode/concurrentlinkedhashmap/concurrentlinkedhashmap-lru/1.4.2/concurrentlinkedhashmap-lru-1.4.2.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/com/googlecode/concurrentlinkedhashmap/concurrentlinkedhashmap-lru/1.4.2/concurrentlinkedhashmap-lru-1.4.2-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/com/googlecode/concurrentlinkedhashmap/concurrentlinkedhashmap-lru/1.4.2/concurrentlinkedhashmap-lru-1.4.2-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: com.jayway.jsonpath:json-path:2.4.0">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/com/jayway/jsonpath/json-path/2.4.0/json-path-2.4.0.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/com/jayway/jsonpath/json-path/2.4.0/json-path-2.4.0-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/com/jayway/jsonpath/json-path/2.4.0/json-path-2.4.0-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: com.jhlabs:filters:2.0.235-1">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/com/jhlabs/filters/2.0.235-1/filters-2.0.235-1.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/com/jhlabs/filters/2.0.235-1/filters-2.0.235-1-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/com/jhlabs/filters/2.0.235-1/filters-2.0.235-1-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: com.netflix.archaius:archaius-core:0.7.7">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/com/netflix/archaius/archaius-core/0.7.7/archaius-core-0.7.7.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/com/netflix/archaius/archaius-core/0.7.7/archaius-core-0.7.7-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/com/netflix/archaius/archaius-core/0.7.7/archaius-core-0.7.7-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: com.netflix.hystrix:hystrix-core:1.5.18">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/com/netflix/hystrix/hystrix-core/1.5.18/hystrix-core-1.5.18.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/com/netflix/hystrix/hystrix-core/1.5.18/hystrix-core-1.5.18-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/com/netflix/hystrix/hystrix-core/1.5.18/hystrix-core-1.5.18-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: com.netflix.netflix-commons:netflix-commons-util:0.3.0">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/com/netflix/netflix-commons/netflix-commons-util/0.3.0/netflix-commons-util-0.3.0.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/com/netflix/netflix-commons/netflix-commons-util/0.3.0/netflix-commons-util-0.3.0-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/com/netflix/netflix-commons/netflix-commons-util/0.3.0/netflix-commons-util-0.3.0-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: com.netflix.netflix-commons:netflix-statistics:0.1.1">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/com/netflix/netflix-commons/netflix-statistics/0.1.1/netflix-statistics-0.1.1.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/com/netflix/netflix-commons/netflix-statistics/0.1.1/netflix-statistics-0.1.1-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/com/netflix/netflix-commons/netflix-statistics/0.1.1/netflix-statistics-0.1.1-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: com.netflix.ribbon:ribbon-core:2.3.0">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/com/netflix/ribbon/ribbon-core/2.3.0/ribbon-core-2.3.0.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/com/netflix/ribbon/ribbon-core/2.3.0/ribbon-core-2.3.0-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/com/netflix/ribbon/ribbon-core/2.3.0/ribbon-core-2.3.0-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: com.netflix.ribbon:ribbon-httpclient:2.3.0">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/com/netflix/ribbon/ribbon-httpclient/2.3.0/ribbon-httpclient-2.3.0.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/com/netflix/ribbon/ribbon-httpclient/2.3.0/ribbon-httpclient-2.3.0-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/com/netflix/ribbon/ribbon-httpclient/2.3.0/ribbon-httpclient-2.3.0-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: com.netflix.ribbon:ribbon-loadbalancer:2.3.0">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/com/netflix/ribbon/ribbon-loadbalancer/2.3.0/ribbon-loadbalancer-2.3.0.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/com/netflix/ribbon/ribbon-loadbalancer/2.3.0/ribbon-loadbalancer-2.3.0-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/com/netflix/ribbon/ribbon-loadbalancer/2.3.0/ribbon-loadbalancer-2.3.0-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: com.netflix.ribbon:ribbon-transport:2.3.0">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/com/netflix/ribbon/ribbon-transport/2.3.0/ribbon-transport-2.3.0.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/com/netflix/ribbon/ribbon-transport/2.3.0/ribbon-transport-2.3.0-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/com/netflix/ribbon/ribbon-transport/2.3.0/ribbon-transport-2.3.0-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: com.netflix.ribbon:ribbon:2.3.0">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/com/netflix/ribbon/ribbon/2.3.0/ribbon-2.3.0.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/com/netflix/ribbon/ribbon/2.3.0/ribbon-2.3.0-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/com/netflix/ribbon/ribbon/2.3.0/ribbon-2.3.0-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: com.netflix.servo:servo-core:0.12.21">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/com/netflix/servo/servo-core/0.12.21/servo-core-0.12.21.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/com/netflix/servo/servo-core/0.12.21/servo-core-0.12.21-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/com/netflix/servo/servo-core/0.12.21/servo-core-0.12.21-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: com.nimbusds:nimbus-jose-jwt:8.19">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/com/nimbusds/nimbus-jose-jwt/8.19/nimbus-jose-jwt-8.19.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/com/nimbusds/nimbus-jose-jwt/8.19/nimbus-jose-jwt-8.19-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/com/nimbusds/nimbus-jose-jwt/8.19/nimbus-jose-jwt-8.19-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: com.squareup.moshi:moshi:1.8.0">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/com/squareup/moshi/moshi/1.8.0/moshi-1.8.0.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/com/squareup/moshi/moshi/1.8.0/moshi-1.8.0-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/com/squareup/moshi/moshi/1.8.0/moshi-1.8.0-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: com.squareup.okhttp3:logging-interceptor:3.14.9">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/com/squareup/okhttp3/logging-interceptor/3.14.9/logging-interceptor-3.14.9.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/com/squareup/okhttp3/logging-interceptor/3.14.9/logging-interceptor-3.14.9-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/com/squareup/okhttp3/logging-interceptor/3.14.9/logging-interceptor-3.14.9-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: com.squareup.okhttp3:okhttp:3.14.9">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/com/squareup/okhttp3/okhttp/3.14.9/okhttp-3.14.9.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/com/squareup/okhttp3/okhttp/3.14.9/okhttp-3.14.9-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/com/squareup/okhttp3/okhttp/3.14.9/okhttp-3.14.9-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: com.squareup.okio:okio:1.17.2">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/com/squareup/okio/okio/1.17.2/okio-1.17.2.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/com/squareup/okio/okio/1.17.2/okio-1.17.2-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/com/squareup/okio/okio/1.17.2/okio-1.17.2-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: com.squareup.retrofit2:converter-moshi:2.8.1">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/com/squareup/retrofit2/converter-moshi/2.8.1/converter-moshi-2.8.1.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/com/squareup/retrofit2/converter-moshi/2.8.1/converter-moshi-2.8.1-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/com/squareup/retrofit2/converter-moshi/2.8.1/converter-moshi-2.8.1-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: com.squareup.retrofit2:retrofit:2.8.1">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/com/squareup/retrofit2/retrofit/2.8.1/retrofit-2.8.1.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/com/squareup/retrofit2/retrofit/2.8.1/retrofit-2.8.1-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/com/squareup/retrofit2/retrofit/2.8.1/retrofit-2.8.1-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: com.sun.activation:jakarta.activation:1.2.2">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/com/sun/activation/jakarta.activation/1.2.2/jakarta.activation-1.2.2.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/com/sun/activation/jakarta.activation/1.2.2/jakarta.activation-1.2.2-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/com/sun/activation/jakarta.activation/1.2.2/jakarta.activation-1.2.2-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: com.sun.jersey.contribs:jersey-apache-client4:1.19.1">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/com/sun/jersey/contribs/jersey-apache-client4/1.19.1/jersey-apache-client4-1.19.1.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/com/sun/jersey/contribs/jersey-apache-client4/1.19.1/jersey-apache-client4-1.19.1-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/com/sun/jersey/contribs/jersey-apache-client4/1.19.1/jersey-apache-client4-1.19.1-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: com.sun.jersey:jersey-client:1.19.1">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/com/sun/jersey/jersey-client/1.19.1/jersey-client-1.19.1.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/com/sun/jersey/jersey-client/1.19.1/jersey-client-1.19.1-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/com/sun/jersey/jersey-client/1.19.1/jersey-client-1.19.1-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: com.sun.jersey:jersey-core:1.19.1">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/com/sun/jersey/jersey-core/1.19.1/jersey-core-1.19.1.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/com/sun/jersey/jersey-core/1.19.1/jersey-core-1.19.1-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/com/sun/jersey/jersey-core/1.19.1/jersey-core-1.19.1-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: com.sun.jna:jna:3.0.9">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/com/sun/jna/jna/3.0.9/jna-3.0.9.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/com/sun/jna/jna/3.0.9/jna-3.0.9-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/com/sun/jna/jna/3.0.9/jna-3.0.9-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: com.sun.mail:jakarta.mail:1.6.7">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/com/sun/mail/jakarta.mail/1.6.7/jakarta.mail-1.6.7.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/com/sun/mail/jakarta.mail/1.6.7/jakarta.mail-1.6.7-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/com/sun/mail/jakarta.mail/1.6.7/jakarta.mail-1.6.7-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: com.sun.xml.bind:jaxb-core:2.3.0.1">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/com/sun/xml/bind/jaxb-core/2.3.0.1/jaxb-core-2.3.0.1.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/com/sun/xml/bind/jaxb-core/2.3.0.1/jaxb-core-2.3.0.1-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/com/sun/xml/bind/jaxb-core/2.3.0.1/jaxb-core-2.3.0.1-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: com.sun.xml.bind:jaxb-impl:2.3.0.1">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/com/sun/xml/bind/jaxb-impl/2.3.0.1/jaxb-impl-2.3.0.1.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/com/sun/xml/bind/jaxb-impl/2.3.0.1/jaxb-impl-2.3.0.1-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/com/sun/xml/bind/jaxb-impl/2.3.0.1/jaxb-impl-2.3.0.1-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: com.vaadin.external.google:android-json:0.0.20131108.vaadin1">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/com/vaadin/external/google/android-json/0.0.20131108.vaadin1/android-json-0.0.20131108.vaadin1.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/com/vaadin/external/google/android-json/0.0.20131108.vaadin1/android-json-0.0.20131108.vaadin1-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/com/vaadin/external/google/android-json/0.0.20131108.vaadin1/android-json-0.0.20131108.vaadin1-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: com.xuxueli:xxl-job-core:2.3.0">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/com/xuxueli/xxl-job-core/2.3.0/xxl-job-core-2.3.0.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/com/xuxueli/xxl-job-core/2.3.0/xxl-job-core-2.3.0-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/com/xuxueli/xxl-job-core/2.3.0/xxl-job-core-2.3.0-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: commons-beanutils:commons-beanutils:1.8.0">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/commons-beanutils/commons-beanutils/1.8.0/commons-beanutils-1.8.0.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/commons-beanutils/commons-beanutils/1.8.0/commons-beanutils-1.8.0-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/commons-beanutils/commons-beanutils/1.8.0/commons-beanutils-1.8.0-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: commons-codec:commons-codec:1.15">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/commons-codec/commons-codec/1.15/commons-codec-1.15.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/commons-codec/commons-codec/1.15/commons-codec-1.15-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/commons-codec/commons-codec/1.15/commons-codec-1.15-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: commons-collections:commons-collections:3.2.1">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/commons-collections/commons-collections/3.2.1/commons-collections-3.2.1.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/commons-collections/commons-collections/3.2.1/commons-collections-3.2.1-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/commons-collections/commons-collections/3.2.1/commons-collections-3.2.1-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: commons-collections:commons-collections:3.2.2">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/commons-collections/commons-collections/3.2.2/commons-collections-3.2.2.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/commons-collections/commons-collections/3.2.2/commons-collections-3.2.2-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/commons-collections/commons-collections/3.2.2/commons-collections-3.2.2-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: commons-configuration:commons-configuration:1.8">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/commons-configuration/commons-configuration/1.8/commons-configuration-1.8.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/commons-configuration/commons-configuration/1.8/commons-configuration-1.8-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/commons-configuration/commons-configuration/1.8/commons-configuration-1.8-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: commons-fileupload:commons-fileupload:1.4">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/commons-fileupload/commons-fileupload/1.4/commons-fileupload-1.4.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/commons-fileupload/commons-fileupload/1.4/commons-fileupload-1.4-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/commons-fileupload/commons-fileupload/1.4/commons-fileupload-1.4-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: commons-io:commons-io:2.8.0">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/commons-io/commons-io/2.8.0/commons-io-2.8.0.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/commons-io/commons-io/2.8.0/commons-io-2.8.0-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/commons-io/commons-io/2.8.0/commons-io-2.8.0-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: commons-lang:commons-lang:2.5">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/commons-lang/commons-lang/2.5/commons-lang-2.5.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/commons-lang/commons-lang/2.5/commons-lang-2.5-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/commons-lang/commons-lang/2.5/commons-lang-2.5-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: commons-lang:commons-lang:2.6">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/commons-lang/commons-lang/2.6/commons-lang-2.6.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/commons-lang/commons-lang/2.6/commons-lang-2.6-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/commons-lang/commons-lang/2.6/commons-lang-2.6-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: commons-logging:commons-logging:1.1.1">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: io.github.classgraph:classgraph:4.8.83">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/io/github/classgraph/classgraph/4.8.83/classgraph-4.8.83.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/io/github/classgraph/classgraph/4.8.83/classgraph-4.8.83-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/io/github/classgraph/classgraph/4.8.83/classgraph-4.8.83-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: io.github.openfeign.form:feign-form-spring:3.8.0">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/io/github/openfeign/form/feign-form-spring/3.8.0/feign-form-spring-3.8.0.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/io/github/openfeign/form/feign-form-spring/3.8.0/feign-form-spring-3.8.0-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/io/github/openfeign/form/feign-form-spring/3.8.0/feign-form-spring-3.8.0-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: io.github.openfeign.form:feign-form:3.8.0">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/io/github/openfeign/form/feign-form/3.8.0/feign-form-3.8.0.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/io/github/openfeign/form/feign-form/3.8.0/feign-form-3.8.0-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/io/github/openfeign/form/feign-form/3.8.0/feign-form-3.8.0-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: io.github.openfeign:feign-core:10.12">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/io/github/openfeign/feign-core/10.12/feign-core-10.12.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/io/github/openfeign/feign-core/10.12/feign-core-10.12-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/io/github/openfeign/feign-core/10.12/feign-core-10.12-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: io.github.openfeign:feign-hystrix:10.12">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/io/github/openfeign/feign-hystrix/10.12/feign-hystrix-10.12.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/io/github/openfeign/feign-hystrix/10.12/feign-hystrix-10.12-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/io/github/openfeign/feign-hystrix/10.12/feign-hystrix-10.12-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: io.github.openfeign:feign-okhttp:11.2">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/io/github/openfeign/feign-okhttp/11.2/feign-okhttp-11.2.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/io/github/openfeign/feign-okhttp/11.2/feign-okhttp-11.2-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/io/github/openfeign/feign-okhttp/11.2/feign-okhttp-11.2-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: io.github.openfeign:feign-slf4j:10.12">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/io/github/openfeign/feign-slf4j/10.12/feign-slf4j-10.12.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/io/github/openfeign/feign-slf4j/10.12/feign-slf4j-10.12-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/io/github/openfeign/feign-slf4j/10.12/feign-slf4j-10.12-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: io.lettuce:lettuce-core:5.3.7.RELEASE">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/io/lettuce/lettuce-core/5.3.7.RELEASE/lettuce-core-5.3.7.RELEASE.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/io/lettuce/lettuce-core/5.3.7.RELEASE/lettuce-core-5.3.7.RELEASE-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/io/lettuce/lettuce-core/5.3.7.RELEASE/lettuce-core-5.3.7.RELEASE-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: io.micrometer:micrometer-core:1.5.14">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/io/micrometer/micrometer-core/1.5.14/micrometer-core-1.5.14.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/io/micrometer/micrometer-core/1.5.14/micrometer-core-1.5.14-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/io/micrometer/micrometer-core/1.5.14/micrometer-core-1.5.14-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: io.netty:netty-all:4.1.65.Final">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/io/netty/netty-all/4.1.65.Final/netty-all-4.1.65.Final.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/io/netty/netty-all/4.1.65.Final/netty-all-4.1.65.Final-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/io/netty/netty-all/4.1.65.Final/netty-all-4.1.65.Final-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: io.netty:netty-buffer:4.1.65.Final">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/io/netty/netty-buffer/4.1.65.Final/netty-buffer-4.1.65.Final.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/io/netty/netty-buffer/4.1.65.Final/netty-buffer-4.1.65.Final-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/io/netty/netty-buffer/4.1.65.Final/netty-buffer-4.1.65.Final-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: io.netty:netty-codec-http2:4.1.65.Final">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/io/netty/netty-codec-http2/4.1.65.Final/netty-codec-http2-4.1.65.Final.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/io/netty/netty-codec-http2/4.1.65.Final/netty-codec-http2-4.1.65.Final-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/io/netty/netty-codec-http2/4.1.65.Final/netty-codec-http2-4.1.65.Final-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: io.netty:netty-codec-http:4.1.65.Final">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/io/netty/netty-codec-http/4.1.65.Final/netty-codec-http-4.1.65.Final.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/io/netty/netty-codec-http/4.1.65.Final/netty-codec-http-4.1.65.Final-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/io/netty/netty-codec-http/4.1.65.Final/netty-codec-http-4.1.65.Final-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: io.netty:netty-codec-socks:4.1.65.Final">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/io/netty/netty-codec-socks/4.1.65.Final/netty-codec-socks-4.1.65.Final.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/io/netty/netty-codec-socks/4.1.65.Final/netty-codec-socks-4.1.65.Final-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/io/netty/netty-codec-socks/4.1.65.Final/netty-codec-socks-4.1.65.Final-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: io.netty:netty-codec:4.1.65.Final">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/io/netty/netty-codec/4.1.65.Final/netty-codec-4.1.65.Final.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/io/netty/netty-codec/4.1.65.Final/netty-codec-4.1.65.Final-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/io/netty/netty-codec/4.1.65.Final/netty-codec-4.1.65.Final-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: io.netty:netty-common:4.1.65.Final">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/io/netty/netty-common/4.1.65.Final/netty-common-4.1.65.Final.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/io/netty/netty-common/4.1.65.Final/netty-common-4.1.65.Final-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/io/netty/netty-common/4.1.65.Final/netty-common-4.1.65.Final-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: io.netty:netty-handler-proxy:4.1.65.Final">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/io/netty/netty-handler-proxy/4.1.65.Final/netty-handler-proxy-4.1.65.Final.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/io/netty/netty-handler-proxy/4.1.65.Final/netty-handler-proxy-4.1.65.Final-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/io/netty/netty-handler-proxy/4.1.65.Final/netty-handler-proxy-4.1.65.Final-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: io.netty:netty-handler:4.1.65.Final">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/io/netty/netty-handler/4.1.65.Final/netty-handler-4.1.65.Final.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/io/netty/netty-handler/4.1.65.Final/netty-handler-4.1.65.Final-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/io/netty/netty-handler/4.1.65.Final/netty-handler-4.1.65.Final-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: io.netty:netty-resolver:4.1.65.Final">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/io/netty/netty-resolver/4.1.65.Final/netty-resolver-4.1.65.Final.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/io/netty/netty-resolver/4.1.65.Final/netty-resolver-4.1.65.Final-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/io/netty/netty-resolver/4.1.65.Final/netty-resolver-4.1.65.Final-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: io.netty:netty-transport-native-epoll:linux-x86_64:4.1.65.Final">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/io/netty/netty-transport-native-epoll/4.1.65.Final/netty-transport-native-epoll-4.1.65.Final-linux-x86_64.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/io/netty/netty-transport-native-epoll/4.1.65.Final/netty-transport-native-epoll-4.1.65.Final-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/io/netty/netty-transport-native-epoll/4.1.65.Final/netty-transport-native-epoll-4.1.65.Final-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: io.netty:netty-transport-native-unix-common:4.1.65.Final">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/io/netty/netty-transport-native-unix-common/4.1.65.Final/netty-transport-native-unix-common-4.1.65.Final.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/io/netty/netty-transport-native-unix-common/4.1.65.Final/netty-transport-native-unix-common-4.1.65.Final-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/io/netty/netty-transport-native-unix-common/4.1.65.Final/netty-transport-native-unix-common-4.1.65.Final-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: io.netty:netty-transport:4.1.65.Final">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/io/netty/netty-transport/4.1.65.Final/netty-transport-4.1.65.Final.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/io/netty/netty-transport/4.1.65.Final/netty-transport-4.1.65.Final-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/io/netty/netty-transport/4.1.65.Final/netty-transport-4.1.65.Final-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: io.projectreactor.addons:reactor-extra:3.3.6.RELEASE">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/io/projectreactor/addons/reactor-extra/3.3.6.RELEASE/reactor-extra-3.3.6.RELEASE.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/io/projectreactor/addons/reactor-extra/3.3.6.RELEASE/reactor-extra-3.3.6.RELEASE-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/io/projectreactor/addons/reactor-extra/3.3.6.RELEASE/reactor-extra-3.3.6.RELEASE-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: io.projectreactor.netty:reactor-netty:0.9.20.RELEASE">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/io/projectreactor/netty/reactor-netty/0.9.20.RELEASE/reactor-netty-0.9.20.RELEASE.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/io/projectreactor/netty/reactor-netty/0.9.20.RELEASE/reactor-netty-0.9.20.RELEASE-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/io/projectreactor/netty/reactor-netty/0.9.20.RELEASE/reactor-netty-0.9.20.RELEASE-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: io.projectreactor:reactor-core:3.3.17.RELEASE">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/io/projectreactor/reactor-core/3.3.17.RELEASE/reactor-core-3.3.17.RELEASE.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/io/projectreactor/reactor-core/3.3.17.RELEASE/reactor-core-3.3.17.RELEASE-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/io/projectreactor/reactor-core/3.3.17.RELEASE/reactor-core-3.3.17.RELEASE-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: io.prometheus:simpleclient:0.5.0">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/io/prometheus/simpleclient/0.5.0/simpleclient-0.5.0.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/io/prometheus/simpleclient/0.5.0/simpleclient-0.5.0-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/io/prometheus/simpleclient/0.5.0/simpleclient-0.5.0-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: io.reactivex:rxjava:1.3.8">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/io/reactivex/rxjava/1.3.8/rxjava-1.3.8.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/io/reactivex/rxjava/1.3.8/rxjava-1.3.8-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/io/reactivex/rxjava/1.3.8/rxjava-1.3.8-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: io.reactivex:rxnetty-contexts:0.4.9">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/io/reactivex/rxnetty-contexts/0.4.9/rxnetty-contexts-0.4.9.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/io/reactivex/rxnetty-contexts/0.4.9/rxnetty-contexts-0.4.9-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/io/reactivex/rxnetty-contexts/0.4.9/rxnetty-contexts-0.4.9-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: io.reactivex:rxnetty-servo:0.4.9">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/io/reactivex/rxnetty-servo/0.4.9/rxnetty-servo-0.4.9.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/io/reactivex/rxnetty-servo/0.4.9/rxnetty-servo-0.4.9-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/io/reactivex/rxnetty-servo/0.4.9/rxnetty-servo-0.4.9-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: io.reactivex:rxnetty:0.4.9">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/io/reactivex/rxnetty/0.4.9/rxnetty-0.4.9.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/io/reactivex/rxnetty/0.4.9/rxnetty-0.4.9-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/io/reactivex/rxnetty/0.4.9/rxnetty-0.4.9-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: io.springfox:springfox-bean-validators:3.0.0">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/io/springfox/springfox-bean-validators/3.0.0/springfox-bean-validators-3.0.0.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/io/springfox/springfox-bean-validators/3.0.0/springfox-bean-validators-3.0.0-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/io/springfox/springfox-bean-validators/3.0.0/springfox-bean-validators-3.0.0-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: io.springfox:springfox-boot-starter:3.0.0">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/io/springfox/springfox-boot-starter/3.0.0/springfox-boot-starter-3.0.0.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/io/springfox/springfox-boot-starter/3.0.0/springfox-boot-starter-3.0.0-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/io/springfox/springfox-boot-starter/3.0.0/springfox-boot-starter-3.0.0-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: io.springfox:springfox-core:3.0.0">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/io/springfox/springfox-core/3.0.0/springfox-core-3.0.0.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/io/springfox/springfox-core/3.0.0/springfox-core-3.0.0-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/io/springfox/springfox-core/3.0.0/springfox-core-3.0.0-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: io.springfox:springfox-data-rest:3.0.0">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/io/springfox/springfox-data-rest/3.0.0/springfox-data-rest-3.0.0.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/io/springfox/springfox-data-rest/3.0.0/springfox-data-rest-3.0.0-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/io/springfox/springfox-data-rest/3.0.0/springfox-data-rest-3.0.0-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: io.springfox:springfox-oas:3.0.0">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/io/springfox/springfox-oas/3.0.0/springfox-oas-3.0.0.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/io/springfox/springfox-oas/3.0.0/springfox-oas-3.0.0-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/io/springfox/springfox-oas/3.0.0/springfox-oas-3.0.0-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: io.springfox:springfox-schema:3.0.0">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/io/springfox/springfox-schema/3.0.0/springfox-schema-3.0.0.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/io/springfox/springfox-schema/3.0.0/springfox-schema-3.0.0-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/io/springfox/springfox-schema/3.0.0/springfox-schema-3.0.0-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: io.springfox:springfox-spi:3.0.0">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/io/springfox/springfox-spi/3.0.0/springfox-spi-3.0.0.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/io/springfox/springfox-spi/3.0.0/springfox-spi-3.0.0-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/io/springfox/springfox-spi/3.0.0/springfox-spi-3.0.0-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: io.springfox:springfox-spring-web:3.0.0">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/io/springfox/springfox-spring-web/3.0.0/springfox-spring-web-3.0.0.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/io/springfox/springfox-spring-web/3.0.0/springfox-spring-web-3.0.0-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/io/springfox/springfox-spring-web/3.0.0/springfox-spring-web-3.0.0-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: io.springfox:springfox-spring-webflux:3.0.0">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/io/springfox/springfox-spring-webflux/3.0.0/springfox-spring-webflux-3.0.0.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/io/springfox/springfox-spring-webflux/3.0.0/springfox-spring-webflux-3.0.0-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/io/springfox/springfox-spring-webflux/3.0.0/springfox-spring-webflux-3.0.0-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: io.springfox:springfox-spring-webmvc:3.0.0">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/io/springfox/springfox-spring-webmvc/3.0.0/springfox-spring-webmvc-3.0.0.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/io/springfox/springfox-spring-webmvc/3.0.0/springfox-spring-webmvc-3.0.0-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/io/springfox/springfox-spring-webmvc/3.0.0/springfox-spring-webmvc-3.0.0-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: io.springfox:springfox-swagger-common:3.0.0">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/io/springfox/springfox-swagger-common/3.0.0/springfox-swagger-common-3.0.0.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/io/springfox/springfox-swagger-common/3.0.0/springfox-swagger-common-3.0.0-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/io/springfox/springfox-swagger-common/3.0.0/springfox-swagger-common-3.0.0-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: io.springfox:springfox-swagger2:3.0.0">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/io/springfox/springfox-swagger2/3.0.0/springfox-swagger2-3.0.0.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/io/springfox/springfox-swagger2/3.0.0/springfox-swagger2-3.0.0-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/io/springfox/springfox-swagger2/3.0.0/springfox-swagger2-3.0.0-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: io.swagger.core.v3:swagger-annotations:2.1.2">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/io/swagger/core/v3/swagger-annotations/2.1.2/swagger-annotations-2.1.2.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/io/swagger/core/v3/swagger-annotations/2.1.2/swagger-annotations-2.1.2-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/io/swagger/core/v3/swagger-annotations/2.1.2/swagger-annotations-2.1.2-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: io.swagger.core.v3:swagger-models:2.1.2">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/io/swagger/core/v3/swagger-models/2.1.2/swagger-models-2.1.2.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/io/swagger/core/v3/swagger-models/2.1.2/swagger-models-2.1.2-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/io/swagger/core/v3/swagger-models/2.1.2/swagger-models-2.1.2-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: io.swagger:swagger-annotations:1.5.22">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/io/swagger/swagger-annotations/1.5.22/swagger-annotations-1.5.22.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/io/swagger/swagger-annotations/1.5.22/swagger-annotations-1.5.22-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/io/swagger/swagger-annotations/1.5.22/swagger-annotations-1.5.22-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: io.swagger:swagger-core:1.5.22">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/io/swagger/swagger-core/1.5.22/swagger-core-1.5.22.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/io/swagger/swagger-core/1.5.22/swagger-core-1.5.22-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/io/swagger/swagger-core/1.5.22/swagger-core-1.5.22-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: io.swagger:swagger-models:1.5.22">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/io/swagger/swagger-models/1.5.22/swagger-models-1.5.22.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/io/swagger/swagger-models/1.5.22/swagger-models-1.5.22-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/io/swagger/swagger-models/1.5.22/swagger-models-1.5.22-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: jakarta.activation:jakarta.activation-api:1.2.2">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/jakarta/activation/jakarta.activation-api/1.2.2/jakarta.activation-api-1.2.2.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/jakarta/activation/jakarta.activation-api/1.2.2/jakarta.activation-api-1.2.2-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/jakarta/activation/jakarta.activation-api/1.2.2/jakarta.activation-api-1.2.2-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: jakarta.annotation:jakarta.annotation-api:1.3.5">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/jakarta/annotation/jakarta.annotation-api/1.3.5/jakarta.annotation-api-1.3.5.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/jakarta/annotation/jakarta.annotation-api/1.3.5/jakarta.annotation-api-1.3.5-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/jakarta/annotation/jakarta.annotation-api/1.3.5/jakarta.annotation-api-1.3.5-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: jakarta.validation:jakarta.validation-api:2.0.2">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/jakarta/validation/jakarta.validation-api/2.0.2/jakarta.validation-api-2.0.2.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/jakarta/validation/jakarta.validation-api/2.0.2/jakarta.validation-api-2.0.2-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/jakarta/validation/jakarta.validation-api/2.0.2/jakarta.validation-api-2.0.2-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: jakarta.xml.bind:jakarta.xml.bind-api:2.3.3">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/jakarta/xml/bind/jakarta.xml.bind-api/2.3.3/jakarta.xml.bind-api-2.3.3.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/jakarta/xml/bind/jakarta.xml.bind-api/2.3.3/jakarta.xml.bind-api-2.3.3-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/jakarta/xml/bind/jakarta.xml.bind-api/2.3.3/jakarta.xml.bind-api-2.3.3-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: javax.activation:javax.activation-api:1.2.0">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/javax/activation/javax.activation-api/1.2.0/javax.activation-api-1.2.0.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/javax/activation/javax.activation-api/1.2.0/javax.activation-api-1.2.0-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/javax/activation/javax.activation-api/1.2.0/javax.activation-api-1.2.0-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: javax.inject:javax.inject:1">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/javax/inject/javax.inject/1/javax.inject-1.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/javax/inject/javax.inject/1/javax.inject-1-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/javax/inject/javax.inject/1/javax.inject-1-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: javax.servlet:javax.servlet-api:4.0.1">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/javax/servlet/javax.servlet-api/4.0.1/javax.servlet-api-4.0.1.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/javax/servlet/javax.servlet-api/4.0.1/javax.servlet-api-4.0.1-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/javax/servlet/javax.servlet-api/4.0.1/javax.servlet-api-4.0.1-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: javax.validation:validation-api:2.0.1.Final">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/javax/validation/validation-api/2.0.1.Final/validation-api-2.0.1.Final.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/javax/validation/validation-api/2.0.1.Final/validation-api-2.0.1.Final-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/javax/validation/validation-api/2.0.1.Final/validation-api-2.0.1.Final-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: javax.ws.rs:jsr311-api:1.1.1">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/javax/ws/rs/jsr311-api/1.1.1/jsr311-api-1.1.1.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/javax/ws/rs/jsr311-api/1.1.1/jsr311-api-1.1.1-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/javax/ws/rs/jsr311-api/1.1.1/jsr311-api-1.1.1-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: javax.xml.bind:jaxb-api:2.3.1">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/javax/xml/bind/jaxb-api/2.3.1/jaxb-api-2.3.1.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/javax/xml/bind/jaxb-api/2.3.1/jaxb-api-2.3.1-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/javax/xml/bind/jaxb-api/2.3.1/jaxb-api-2.3.1-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: junit:junit:4.13.2">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/junit/junit/4.13.2/junit-4.13.2.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/junit/junit/4.13.2/junit-4.13.2-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/junit/junit/4.13.2/junit-4.13.2-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: mysql:mysql-connector-java:8.0.19">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/mysql/mysql-connector-java/8.0.19/mysql-connector-java-8.0.19.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/mysql/mysql-connector-java/8.0.19/mysql-connector-java-8.0.19-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/mysql/mysql-connector-java/8.0.19/mysql-connector-java-8.0.19-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: net.bytebuddy:byte-buddy-agent:1.10.22">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/net/bytebuddy/byte-buddy-agent/1.10.22/byte-buddy-agent-1.10.22.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/net/bytebuddy/byte-buddy-agent/1.10.22/byte-buddy-agent-1.10.22-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/net/bytebuddy/byte-buddy-agent/1.10.22/byte-buddy-agent-1.10.22-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: net.bytebuddy:byte-buddy:1.10.22">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/net/bytebuddy/byte-buddy/1.10.22/byte-buddy-1.10.22.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/net/bytebuddy/byte-buddy/1.10.22/byte-buddy-1.10.22-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/net/bytebuddy/byte-buddy/1.10.22/byte-buddy-1.10.22-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: net.minidev:accessors-smart:2.3.1">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/net/minidev/accessors-smart/2.3.1/accessors-smart-2.3.1.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/net/minidev/accessors-smart/2.3.1/accessors-smart-2.3.1-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/net/minidev/accessors-smart/2.3.1/accessors-smart-2.3.1-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: net.minidev:json-smart:2.3.1">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/net/minidev/json-smart/2.3.1/json-smart-2.3.1.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/net/minidev/json-smart/2.3.1/json-smart-2.3.1-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/net/minidev/json-smart/2.3.1/json-smart-2.3.1-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: net.sf.ezmorph:ezmorph:1.0.6">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/net/sf/ezmorph/ezmorph/1.0.6/ezmorph-1.0.6.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/net/sf/ezmorph/ezmorph/1.0.6/ezmorph-1.0.6-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/net/sf/ezmorph/ezmorph/1.0.6/ezmorph-1.0.6-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: net.sf.json-lib:json-lib:jdk15:2.4">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/net/sf/json-lib/json-lib/2.4/json-lib-2.4-jdk15.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/net/sf/json-lib/json-lib/2.4/json-lib-2.4-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/net/sf/json-lib/json-lib/2.4/json-lib-2.4-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: net.sourceforge.nekohtml:nekohtml:1.9.22">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/net/sourceforge/nekohtml/nekohtml/1.9.22/nekohtml-1.9.22.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/net/sourceforge/nekohtml/nekohtml/1.9.22/nekohtml-1.9.22-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/net/sourceforge/nekohtml/nekohtml/1.9.22/nekohtml-1.9.22-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: ognl:ognl:3.2.6">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/ognl/ognl/3.2.6/ognl-3.2.6.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/ognl/ognl/3.2.6/ognl-3.2.6-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/ognl/ognl/3.2.6/ognl-3.2.6-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: org.apache.commons:commons-collections4:4.4">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/org/apache/commons/commons-collections4/4.4/commons-collections4-4.4.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/org/apache/commons/commons-collections4/4.4/commons-collections4-4.4-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/org/apache/commons/commons-collections4/4.4/commons-collections4-4.4-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: org.apache.commons:commons-compress:1.19">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/org/apache/commons/commons-compress/1.19/commons-compress-1.19.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/org/apache/commons/commons-compress/1.19/commons-compress-1.19-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/org/apache/commons/commons-compress/1.19/commons-compress-1.19-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: org.apache.commons:commons-lang3:3.12.0">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/org/apache/commons/commons-lang3/3.12.0/commons-lang3-3.12.0.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/org/apache/commons/commons-lang3/3.12.0/commons-lang3-3.12.0-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/org/apache/commons/commons-lang3/3.12.0/commons-lang3-3.12.0-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: org.apache.commons:commons-math3:3.6.1">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/org/apache/commons/commons-math3/3.6.1/commons-math3-3.6.1.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/org/apache/commons/commons-math3/3.6.1/commons-math3-3.6.1-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/org/apache/commons/commons-math3/3.6.1/commons-math3-3.6.1-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: org.apache.commons:commons-pool2:2.8.1">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/org/apache/commons/commons-pool2/2.8.1/commons-pool2-2.8.1.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/org/apache/commons/commons-pool2/2.8.1/commons-pool2-2.8.1-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/org/apache/commons/commons-pool2/2.8.1/commons-pool2-2.8.1-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: org.apache.httpcomponents:httpasyncclient:4.1.4">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/org/apache/httpcomponents/httpasyncclient/4.1.4/httpasyncclient-4.1.4.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/org/apache/httpcomponents/httpasyncclient/4.1.4/httpasyncclient-4.1.4-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/org/apache/httpcomponents/httpasyncclient/4.1.4/httpasyncclient-4.1.4-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: org.apache.httpcomponents:httpclient:4.5.13">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/org/apache/httpcomponents/httpclient/4.5.13/httpclient-4.5.13.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/org/apache/httpcomponents/httpclient/4.5.13/httpclient-4.5.13-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/org/apache/httpcomponents/httpclient/4.5.13/httpclient-4.5.13-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: org.apache.httpcomponents:httpcore-nio:4.4.14">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/org/apache/httpcomponents/httpcore-nio/4.4.14/httpcore-nio-4.4.14.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/org/apache/httpcomponents/httpcore-nio/4.4.14/httpcore-nio-4.4.14-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/org/apache/httpcomponents/httpcore-nio/4.4.14/httpcore-nio-4.4.14-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: org.apache.httpcomponents:httpcore:4.4.14">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/org/apache/httpcomponents/httpcore/4.4.14/httpcore-4.4.14.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/org/apache/httpcomponents/httpcore/4.4.14/httpcore-4.4.14-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/org/apache/httpcomponents/httpcore/4.4.14/httpcore-4.4.14-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: org.apache.logging.log4j:log4j-api:2.13.3">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/org/apache/logging/log4j/log4j-api/2.13.3/log4j-api-2.13.3.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/org/apache/logging/log4j/log4j-api/2.13.3/log4j-api-2.13.3-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/org/apache/logging/log4j/log4j-api/2.13.3/log4j-api-2.13.3-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: org.apache.logging.log4j:log4j-to-slf4j:2.13.3">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/org/apache/logging/log4j/log4j-to-slf4j/2.13.3/log4j-to-slf4j-2.13.3.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/org/apache/logging/log4j/log4j-to-slf4j/2.13.3/log4j-to-slf4j-2.13.3-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/org/apache/logging/log4j/log4j-to-slf4j/2.13.3/log4j-to-slf4j-2.13.3-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: org.apache.poi:poi-ooxml-schemas:4.1.1">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/org/apache/poi/poi-ooxml-schemas/4.1.1/poi-ooxml-schemas-4.1.1.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/org/apache/poi/poi-ooxml-schemas/4.1.1/poi-ooxml-schemas-4.1.1-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/org/apache/poi/poi-ooxml-schemas/4.1.1/poi-ooxml-schemas-4.1.1-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: org.apache.poi:poi-ooxml:4.1.1">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/org/apache/poi/poi-ooxml/4.1.1/poi-ooxml-4.1.1.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/org/apache/poi/poi-ooxml/4.1.1/poi-ooxml-4.1.1-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/org/apache/poi/poi-ooxml/4.1.1/poi-ooxml-4.1.1-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: org.apache.poi:poi:4.1.1">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/org/apache/poi/poi/4.1.1/poi-4.1.1.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/org/apache/poi/poi/4.1.1/poi-4.1.1-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/org/apache/poi/poi/4.1.1/poi-4.1.1-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: org.apache.tomcat.embed:tomcat-embed-core:9.0.46">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/org/apache/tomcat/embed/tomcat-embed-core/9.0.46/tomcat-embed-core-9.0.46.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/org/apache/tomcat/embed/tomcat-embed-core/9.0.46/tomcat-embed-core-9.0.46-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/org/apache/tomcat/embed/tomcat-embed-core/9.0.46/tomcat-embed-core-9.0.46-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: org.apache.tomcat.embed:tomcat-embed-websocket:9.0.46">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/org/apache/tomcat/embed/tomcat-embed-websocket/9.0.46/tomcat-embed-websocket-9.0.46.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/org/apache/tomcat/embed/tomcat-embed-websocket/9.0.46/tomcat-embed-websocket-9.0.46-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/org/apache/tomcat/embed/tomcat-embed-websocket/9.0.46/tomcat-embed-websocket-9.0.46-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: org.apache.velocity:velocity-engine-core:2.3">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/org/apache/velocity/velocity-engine-core/2.3/velocity-engine-core-2.3.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/org/apache/velocity/velocity-engine-core/2.3/velocity-engine-core-2.3-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/org/apache/velocity/velocity-engine-core/2.3/velocity-engine-core-2.3-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: org.apache.xmlbeans:xmlbeans:3.1.0">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/org/apache/xmlbeans/xmlbeans/3.1.0/xmlbeans-3.1.0.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/org/apache/xmlbeans/xmlbeans/3.1.0/xmlbeans-3.1.0-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/org/apache/xmlbeans/xmlbeans/3.1.0/xmlbeans-3.1.0-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: org.apache.xmlgraphics:batik-constants:1.14">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/org/apache/xmlgraphics/batik-constants/1.14/batik-constants-1.14.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/org/apache/xmlgraphics/batik-constants/1.14/batik-constants-1.14-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/org/apache/xmlgraphics/batik-constants/1.14/batik-constants-1.14-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: org.apache.xmlgraphics:batik-css:1.14">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/org/apache/xmlgraphics/batik-css/1.14/batik-css-1.14.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/org/apache/xmlgraphics/batik-css/1.14/batik-css-1.14-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/org/apache/xmlgraphics/batik-css/1.14/batik-css-1.14-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: org.apache.xmlgraphics:batik-i18n:1.14">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/org/apache/xmlgraphics/batik-i18n/1.14/batik-i18n-1.14.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/org/apache/xmlgraphics/batik-i18n/1.14/batik-i18n-1.14-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/org/apache/xmlgraphics/batik-i18n/1.14/batik-i18n-1.14-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: org.apache.xmlgraphics:batik-shared-resources:1.14">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/org/apache/xmlgraphics/batik-shared-resources/1.14/batik-shared-resources-1.14.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/org/apache/xmlgraphics/batik-shared-resources/1.14/batik-shared-resources-1.14-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/org/apache/xmlgraphics/batik-shared-resources/1.14/batik-shared-resources-1.14-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: org.apache.xmlgraphics:batik-util:1.14">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/org/apache/xmlgraphics/batik-util/1.14/batik-util-1.14.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/org/apache/xmlgraphics/batik-util/1.14/batik-util-1.14-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/org/apache/xmlgraphics/batik-util/1.14/batik-util-1.14-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: org.apache.xmlgraphics:xmlgraphics-commons:2.6">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/org/apache/xmlgraphics/xmlgraphics-commons/2.6/xmlgraphics-commons-2.6.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/org/apache/xmlgraphics/xmlgraphics-commons/2.6/xmlgraphics-commons-2.6-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/org/apache/xmlgraphics/xmlgraphics-commons/2.6/xmlgraphics-commons-2.6-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: org.apiguardian:apiguardian-api:1.1.0">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/org/apiguardian/apiguardian-api/1.1.0/apiguardian-api-1.1.0.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/org/apiguardian/apiguardian-api/1.1.0/apiguardian-api-1.1.0-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/org/apiguardian/apiguardian-api/1.1.0/apiguardian-api-1.1.0-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: org.aspectj:aspectjrt:1.9.6">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/org/aspectj/aspectjrt/1.9.6/aspectjrt-1.9.6.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/org/aspectj/aspectjrt/1.9.6/aspectjrt-1.9.6-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/org/aspectj/aspectjrt/1.9.6/aspectjrt-1.9.6-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: org.aspectj:aspectjweaver:1.9.6">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/org/aspectj/aspectjweaver/1.9.6/aspectjweaver-1.9.6.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/org/aspectj/aspectjweaver/1.9.6/aspectjweaver-1.9.6-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/org/aspectj/aspectjweaver/1.9.6/aspectjweaver-1.9.6-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: org.assertj:assertj-core:3.16.1">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/org/assertj/assertj-core/3.16.1/assertj-core-3.16.1.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/org/assertj/assertj-core/3.16.1/assertj-core-3.16.1-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/org/assertj/assertj-core/3.16.1/assertj-core-3.16.1-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: org.bouncycastle:bcpkix-jdk15on:1.56">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/org/bouncycastle/bcpkix-jdk15on/1.56/bcpkix-jdk15on-1.56.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/org/bouncycastle/bcpkix-jdk15on/1.56/bcpkix-jdk15on-1.56-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/org/bouncycastle/bcpkix-jdk15on/1.56/bcpkix-jdk15on-1.56-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: org.bouncycastle:bcpkix-jdk15on:1.64">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/org/bouncycastle/bcpkix-jdk15on/1.64/bcpkix-jdk15on-1.64.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/org/bouncycastle/bcpkix-jdk15on/1.64/bcpkix-jdk15on-1.64-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/org/bouncycastle/bcpkix-jdk15on/1.64/bcpkix-jdk15on-1.64-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: org.bouncycastle:bcprov-jdk15on:1.68">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/org/bouncycastle/bcprov-jdk15on/1.68/bcprov-jdk15on-1.68.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/org/bouncycastle/bcprov-jdk15on/1.68/bcprov-jdk15on-1.68-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/org/bouncycastle/bcprov-jdk15on/1.68/bcprov-jdk15on-1.68-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: org.checkerframework:checker-qual:3.5.0">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/org/checkerframework/checker-qual/3.5.0/checker-qual-3.5.0.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/org/checkerframework/checker-qual/3.5.0/checker-qual-3.5.0-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/org/checkerframework/checker-qual/3.5.0/checker-qual-3.5.0-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: org.codehaus.groovy:groovy:2.5.14">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/org/codehaus/groovy/groovy/2.5.14/groovy-2.5.14.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/org/codehaus/groovy/groovy/2.5.14/groovy-2.5.14-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/org/codehaus/groovy/groovy/2.5.14/groovy-2.5.14-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: org.codehaus.jackson:jackson-core-asl:1.9.13">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/org/codehaus/jackson/jackson-core-asl/1.9.13/jackson-core-asl-1.9.13.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/org/codehaus/jackson/jackson-core-asl/1.9.13/jackson-core-asl-1.9.13-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/org/codehaus/jackson/jackson-core-asl/1.9.13/jackson-core-asl-1.9.13-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: org.codehaus.jackson:jackson-mapper-asl:1.9.13">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/org/codehaus/jackson/jackson-mapper-asl/1.9.13/jackson-mapper-asl-1.9.13.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/org/codehaus/jackson/jackson-mapper-asl/1.9.13/jackson-mapper-asl-1.9.13-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/org/codehaus/jackson/jackson-mapper-asl/1.9.13/jackson-mapper-asl-1.9.13-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: org.eclipse.paho:org.eclipse.paho.client.mqttv3:1.2.5">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/org/eclipse/paho/org.eclipse.paho.client.mqttv3/1.2.5/org.eclipse.paho.client.mqttv3-1.2.5.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/org/eclipse/paho/org.eclipse.paho.client.mqttv3/1.2.5/org.eclipse.paho.client.mqttv3-1.2.5-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/org/eclipse/paho/org.eclipse.paho.client.mqttv3/1.2.5/org.eclipse.paho.client.mqttv3-1.2.5-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: org.freemarker:freemarker:2.3.31">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/org/freemarker/freemarker/2.3.31/freemarker-2.3.31.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/org/freemarker/freemarker/2.3.31/freemarker-2.3.31-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/org/freemarker/freemarker/2.3.31/freemarker-2.3.31-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: org.glassfish:jakarta.el:3.0.3">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/org/glassfish/jakarta.el/3.0.3/jakarta.el-3.0.3.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/org/glassfish/jakarta.el/3.0.3/jakarta.el-3.0.3-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/org/glassfish/jakarta.el/3.0.3/jakarta.el-3.0.3-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: org.hamcrest:hamcrest:2.2">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/org/hamcrest/hamcrest/2.2/hamcrest-2.2.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/org/hamcrest/hamcrest/2.2/hamcrest-2.2-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/org/hamcrest/hamcrest/2.2/hamcrest-2.2-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: org.hdrhistogram:HdrHistogram:2.1.12">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/org/hdrhistogram/HdrHistogram/2.1.12/HdrHistogram-2.1.12.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/org/hdrhistogram/HdrHistogram/2.1.12/HdrHistogram-2.1.12-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/org/hdrhistogram/HdrHistogram/2.1.12/HdrHistogram-2.1.12-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: org.hibernate.validator:hibernate-validator:6.1.7.Final">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/org/hibernate/validator/hibernate-validator/6.1.7.Final/hibernate-validator-6.1.7.Final.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/org/hibernate/validator/hibernate-validator/6.1.7.Final/hibernate-validator-6.1.7.Final-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/org/hibernate/validator/hibernate-validator/6.1.7.Final/hibernate-validator-6.1.7.Final-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: org.influxdb:influxdb-java:2.18">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/org/influxdb/influxdb-java/2.18/influxdb-java-2.18.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/org/influxdb/influxdb-java/2.18/influxdb-java-2.18-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/org/influxdb/influxdb-java/2.18/influxdb-java-2.18-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: org.javassist:javassist:3.21.0-GA">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/org/javassist/javassist/3.21.0-GA/javassist-3.21.0-GA.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/org/javassist/javassist/3.21.0-GA/javassist-3.21.0-GA-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/org/javassist/javassist/3.21.0-GA/javassist-3.21.0-GA-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: org.javassist:javassist:3.25.0-GA">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/org/javassist/javassist/3.25.0-GA/javassist-3.25.0-GA.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/org/javassist/javassist/3.25.0-GA/javassist-3.25.0-GA-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/org/javassist/javassist/3.25.0-GA/javassist-3.25.0-GA-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: org.jboss.logging:jboss-logging:3.4.2.Final">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/org/jboss/logging/jboss-logging/3.4.2.Final/jboss-logging-3.4.2.Final.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/org/jboss/logging/jboss-logging/3.4.2.Final/jboss-logging-3.4.2.Final-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/org/jboss/logging/jboss-logging/3.4.2.Final/jboss-logging-3.4.2.Final-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: org.jetbrains:annotations:13.0">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/org/jetbrains/annotations/13.0/annotations-13.0.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/org/jetbrains/annotations/13.0/annotations-13.0-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/org/jetbrains/annotations/13.0/annotations-13.0-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: org.junit.jupiter:junit-jupiter-api:5.6.3">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/org/junit/jupiter/junit-jupiter-api/5.6.3/junit-jupiter-api-5.6.3.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/org/junit/jupiter/junit-jupiter-api/5.6.3/junit-jupiter-api-5.6.3-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/org/junit/jupiter/junit-jupiter-api/5.6.3/junit-jupiter-api-5.6.3-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: org.junit.jupiter:junit-jupiter-engine:5.6.3">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/org/junit/jupiter/junit-jupiter-engine/5.6.3/junit-jupiter-engine-5.6.3.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/org/junit/jupiter/junit-jupiter-engine/5.6.3/junit-jupiter-engine-5.6.3-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/org/junit/jupiter/junit-jupiter-engine/5.6.3/junit-jupiter-engine-5.6.3-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: org.junit.jupiter:junit-jupiter-params:5.6.3">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/org/junit/jupiter/junit-jupiter-params/5.6.3/junit-jupiter-params-5.6.3.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/org/junit/jupiter/junit-jupiter-params/5.6.3/junit-jupiter-params-5.6.3-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/org/junit/jupiter/junit-jupiter-params/5.6.3/junit-jupiter-params-5.6.3-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: org.junit.jupiter:junit-jupiter:5.6.3">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/org/junit/jupiter/junit-jupiter/5.6.3/junit-jupiter-5.6.3.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/org/junit/jupiter/junit-jupiter/5.6.3/junit-jupiter-5.6.3-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/org/junit/jupiter/junit-jupiter/5.6.3/junit-jupiter-5.6.3-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: org.junit.platform:junit-platform-commons:1.6.3">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/org/junit/platform/junit-platform-commons/1.6.3/junit-platform-commons-1.6.3.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/org/junit/platform/junit-platform-commons/1.6.3/junit-platform-commons-1.6.3-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/org/junit/platform/junit-platform-commons/1.6.3/junit-platform-commons-1.6.3-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: org.junit.platform:junit-platform-engine:1.6.3">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/org/junit/platform/junit-platform-engine/1.6.3/junit-platform-engine-1.6.3.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/org/junit/platform/junit-platform-engine/1.6.3/junit-platform-engine-1.6.3-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/org/junit/platform/junit-platform-engine/1.6.3/junit-platform-engine-1.6.3-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: org.junit.vintage:junit-vintage-engine:5.6.3">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/org/junit/vintage/junit-vintage-engine/5.6.3/junit-vintage-engine-5.6.3.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/org/junit/vintage/junit-vintage-engine/5.6.3/junit-vintage-engine-5.6.3-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/org/junit/vintage/junit-vintage-engine/5.6.3/junit-vintage-engine-5.6.3-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: org.latencyutils:LatencyUtils:2.0.3">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/org/latencyutils/LatencyUtils/2.0.3/LatencyUtils-2.0.3.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/org/latencyutils/LatencyUtils/2.0.3/LatencyUtils-2.0.3-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/org/latencyutils/LatencyUtils/2.0.3/LatencyUtils-2.0.3-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: org.mapstruct:mapstruct:1.3.1.Final">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/org/mapstruct/mapstruct/1.3.1.Final/mapstruct-1.3.1.Final.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/org/mapstruct/mapstruct/1.3.1.Final/mapstruct-1.3.1.Final-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/org/mapstruct/mapstruct/1.3.1.Final/mapstruct-1.3.1.Final-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: org.mockito:mockito-core:3.3.3">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/org/mockito/mockito-core/3.3.3/mockito-core-3.3.3.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/org/mockito/mockito-core/3.3.3/mockito-core-3.3.3-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/org/mockito/mockito-core/3.3.3/mockito-core-3.3.3-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: org.mockito:mockito-junit-jupiter:3.3.3">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/org/mockito/mockito-junit-jupiter/3.3.3/mockito-junit-jupiter-3.3.3.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/org/mockito/mockito-junit-jupiter/3.3.3/mockito-junit-jupiter-3.3.3-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/org/mockito/mockito-junit-jupiter/3.3.3/mockito-junit-jupiter-3.3.3-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: org.msgpack:msgpack-core:0.8.20">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/org/msgpack/msgpack-core/0.8.20/msgpack-core-0.8.20.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/org/msgpack/msgpack-core/0.8.20/msgpack-core-0.8.20-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/org/msgpack/msgpack-core/0.8.20/msgpack-core-0.8.20-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-autoconfigure:2.1.3">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/org/mybatis/spring/boot/mybatis-spring-boot-autoconfigure/2.1.3/mybatis-spring-boot-autoconfigure-2.1.3.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/org/mybatis/spring/boot/mybatis-spring-boot-autoconfigure/2.1.3/mybatis-spring-boot-autoconfigure-2.1.3-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/org/mybatis/spring/boot/mybatis-spring-boot-autoconfigure/2.1.3/mybatis-spring-boot-autoconfigure-2.1.3-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-starter:2.1.3">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/org/mybatis/spring/boot/mybatis-spring-boot-starter/2.1.3/mybatis-spring-boot-starter-2.1.3.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/org/mybatis/spring/boot/mybatis-spring-boot-starter/2.1.3/mybatis-spring-boot-starter-2.1.3-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/org/mybatis/spring/boot/mybatis-spring-boot-starter/2.1.3/mybatis-spring-boot-starter-2.1.3-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: org.mybatis:mybatis-spring:2.0.5">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/org/mybatis/mybatis-spring/2.0.5/mybatis-spring-2.0.5.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/org/mybatis/mybatis-spring/2.0.5/mybatis-spring-2.0.5-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/org/mybatis/mybatis-spring/2.0.5/mybatis-spring-2.0.5-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: org.mybatis:mybatis:3.5.5">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/org/mybatis/mybatis/3.5.5/mybatis-3.5.5.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/org/mybatis/mybatis/3.5.5/mybatis-3.5.5-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/org/mybatis/mybatis/3.5.5/mybatis-3.5.5-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: org.objenesis:objenesis:2.6">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/org/objenesis/objenesis/2.6/objenesis-2.6.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/org/objenesis/objenesis/2.6/objenesis-2.6-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/org/objenesis/objenesis/2.6/objenesis-2.6-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: org.opentest4j:opentest4j:1.2.0">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/org/opentest4j/opentest4j/1.2.0/opentest4j-1.2.0.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/org/opentest4j/opentest4j/1.2.0/opentest4j-1.2.0-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/org/opentest4j/opentest4j/1.2.0/opentest4j-1.2.0-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: org.ow2.asm:asm:5.0.4">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/org/ow2/asm/asm/5.0.4/asm-5.0.4.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/org/ow2/asm/asm/5.0.4/asm-5.0.4-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/org/ow2/asm/asm/5.0.4/asm-5.0.4-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: org.owasp.antisamy:antisamy:1.6.4">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/org/owasp/antisamy/antisamy/1.6.4/antisamy-1.6.4.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/org/owasp/antisamy/antisamy/1.6.4/antisamy-1.6.4-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/org/owasp/antisamy/antisamy/1.6.4/antisamy-1.6.4-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: org.projectlombok:lombok:1.18.18">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/org/projectlombok/lombok/1.18.18/lombok-1.18.18.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/org/projectlombok/lombok/1.18.18/lombok-1.18.18-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/org/projectlombok/lombok/1.18.18/lombok-1.18.18-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: org.reactivestreams:reactive-streams:1.0.3">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/org/reactivestreams/reactive-streams/1.0.3/reactive-streams-1.0.3.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/org/reactivestreams/reactive-streams/1.0.3/reactive-streams-1.0.3-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/org/reactivestreams/reactive-streams/1.0.3/reactive-streams-1.0.3-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: org.reflections:reflections:0.9.11">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/org/reflections/reflections/0.9.11/reflections-0.9.11.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/org/reflections/reflections/0.9.11/reflections-0.9.11-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/org/reflections/reflections/0.9.11/reflections-0.9.11-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: org.skyscreamer:jsonassert:1.5.0">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/org/skyscreamer/jsonassert/1.5.0/jsonassert-1.5.0.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/org/skyscreamer/jsonassert/1.5.0/jsonassert-1.5.0-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/org/skyscreamer/jsonassert/1.5.0/jsonassert-1.5.0-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: org.slf4j:jul-to-slf4j:1.7.30">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/org/slf4j/jul-to-slf4j/1.7.30/jul-to-slf4j-1.7.30.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/org/slf4j/jul-to-slf4j/1.7.30/jul-to-slf4j-1.7.30-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/org/slf4j/jul-to-slf4j/1.7.30/jul-to-slf4j-1.7.30-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: org.slf4j:slf4j-api:1.7.30">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/org/slf4j/slf4j-api/1.7.30/slf4j-api-1.7.30.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/org/slf4j/slf4j-api/1.7.30/slf4j-api-1.7.30-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/org/slf4j/slf4j-api/1.7.30/slf4j-api-1.7.30-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: org.slf4j:slf4j-simple:1.7.30">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/org/slf4j/slf4j-simple/1.7.30/slf4j-simple-1.7.30.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/org/slf4j/slf4j-simple/1.7.30/slf4j-simple-1.7.30-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/org/slf4j/slf4j-simple/1.7.30/slf4j-simple-1.7.30-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: org.springframework.boot:spring-boot-actuator-autoconfigure:2.3.12.RELEASE">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/org/springframework/boot/spring-boot-actuator-autoconfigure/2.3.12.RELEASE/spring-boot-actuator-autoconfigure-2.3.12.RELEASE.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/org/springframework/boot/spring-boot-actuator-autoconfigure/2.3.12.RELEASE/spring-boot-actuator-autoconfigure-2.3.12.RELEASE-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/org/springframework/boot/spring-boot-actuator-autoconfigure/2.3.12.RELEASE/spring-boot-actuator-autoconfigure-2.3.12.RELEASE-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: org.springframework.boot:spring-boot-actuator:2.3.12.RELEASE">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/org/springframework/boot/spring-boot-actuator/2.3.12.RELEASE/spring-boot-actuator-2.3.12.RELEASE.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/org/springframework/boot/spring-boot-actuator/2.3.12.RELEASE/spring-boot-actuator-2.3.12.RELEASE-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/org/springframework/boot/spring-boot-actuator/2.3.12.RELEASE/spring-boot-actuator-2.3.12.RELEASE-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: org.springframework.boot:spring-boot-autoconfigure:2.3.12.RELEASE">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/org/springframework/boot/spring-boot-autoconfigure/2.3.12.RELEASE/spring-boot-autoconfigure-2.3.12.RELEASE.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/org/springframework/boot/spring-boot-autoconfigure/2.3.12.RELEASE/spring-boot-autoconfigure-2.3.12.RELEASE-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/org/springframework/boot/spring-boot-autoconfigure/2.3.12.RELEASE/spring-boot-autoconfigure-2.3.12.RELEASE-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: org.springframework.boot:spring-boot-configuration-processor:2.3.12.RELEASE">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/org/springframework/boot/spring-boot-configuration-processor/2.3.12.RELEASE/spring-boot-configuration-processor-2.3.12.RELEASE.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/org/springframework/boot/spring-boot-configuration-processor/2.3.12.RELEASE/spring-boot-configuration-processor-2.3.12.RELEASE-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/org/springframework/boot/spring-boot-configuration-processor/2.3.12.RELEASE/spring-boot-configuration-processor-2.3.12.RELEASE-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: org.springframework.boot:spring-boot-starter-actuator:2.3.12.RELEASE">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/org/springframework/boot/spring-boot-starter-actuator/2.3.12.RELEASE/spring-boot-starter-actuator-2.3.12.RELEASE.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/org/springframework/boot/spring-boot-starter-actuator/2.3.12.RELEASE/spring-boot-starter-actuator-2.3.12.RELEASE-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/org/springframework/boot/spring-boot-starter-actuator/2.3.12.RELEASE/spring-boot-starter-actuator-2.3.12.RELEASE-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: org.springframework.boot:spring-boot-starter-aop:2.3.12.RELEASE">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/org/springframework/boot/spring-boot-starter-aop/2.3.12.RELEASE/spring-boot-starter-aop-2.3.12.RELEASE.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/org/springframework/boot/spring-boot-starter-aop/2.3.12.RELEASE/spring-boot-starter-aop-2.3.12.RELEASE-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/org/springframework/boot/spring-boot-starter-aop/2.3.12.RELEASE/spring-boot-starter-aop-2.3.12.RELEASE-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: org.springframework.boot:spring-boot-starter-data-redis:2.3.12.RELEASE">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/org/springframework/boot/spring-boot-starter-data-redis/2.3.12.RELEASE/spring-boot-starter-data-redis-2.3.12.RELEASE.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/org/springframework/boot/spring-boot-starter-data-redis/2.3.12.RELEASE/spring-boot-starter-data-redis-2.3.12.RELEASE-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/org/springframework/boot/spring-boot-starter-data-redis/2.3.12.RELEASE/spring-boot-starter-data-redis-2.3.12.RELEASE-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: org.springframework.boot:spring-boot-starter-freemarker:2.3.12.RELEASE">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/org/springframework/boot/spring-boot-starter-freemarker/2.3.12.RELEASE/spring-boot-starter-freemarker-2.3.12.RELEASE.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/org/springframework/boot/spring-boot-starter-freemarker/2.3.12.RELEASE/spring-boot-starter-freemarker-2.3.12.RELEASE-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/org/springframework/boot/spring-boot-starter-freemarker/2.3.12.RELEASE/spring-boot-starter-freemarker-2.3.12.RELEASE-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: org.springframework.boot:spring-boot-starter-jdbc:2.3.12.RELEASE">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/org/springframework/boot/spring-boot-starter-jdbc/2.3.12.RELEASE/spring-boot-starter-jdbc-2.3.12.RELEASE.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/org/springframework/boot/spring-boot-starter-jdbc/2.3.12.RELEASE/spring-boot-starter-jdbc-2.3.12.RELEASE-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/org/springframework/boot/spring-boot-starter-jdbc/2.3.12.RELEASE/spring-boot-starter-jdbc-2.3.12.RELEASE-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: org.springframework.boot:spring-boot-starter-json:2.3.12.RELEASE">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/org/springframework/boot/spring-boot-starter-json/2.3.12.RELEASE/spring-boot-starter-json-2.3.12.RELEASE.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/org/springframework/boot/spring-boot-starter-json/2.3.12.RELEASE/spring-boot-starter-json-2.3.12.RELEASE-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/org/springframework/boot/spring-boot-starter-json/2.3.12.RELEASE/spring-boot-starter-json-2.3.12.RELEASE-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: org.springframework.boot:spring-boot-starter-logging:2.3.12.RELEASE">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/org/springframework/boot/spring-boot-starter-logging/2.3.12.RELEASE/spring-boot-starter-logging-2.3.12.RELEASE.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/org/springframework/boot/spring-boot-starter-logging/2.3.12.RELEASE/spring-boot-starter-logging-2.3.12.RELEASE-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/org/springframework/boot/spring-boot-starter-logging/2.3.12.RELEASE/spring-boot-starter-logging-2.3.12.RELEASE-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: org.springframework.boot:spring-boot-starter-mail:2.3.12.RELEASE">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/org/springframework/boot/spring-boot-starter-mail/2.3.12.RELEASE/spring-boot-starter-mail-2.3.12.RELEASE.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/org/springframework/boot/spring-boot-starter-mail/2.3.12.RELEASE/spring-boot-starter-mail-2.3.12.RELEASE-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/org/springframework/boot/spring-boot-starter-mail/2.3.12.RELEASE/spring-boot-starter-mail-2.3.12.RELEASE-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: org.springframework.boot:spring-boot-starter-reactor-netty:2.3.12.RELEASE">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/org/springframework/boot/spring-boot-starter-reactor-netty/2.3.12.RELEASE/spring-boot-starter-reactor-netty-2.3.12.RELEASE.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/org/springframework/boot/spring-boot-starter-reactor-netty/2.3.12.RELEASE/spring-boot-starter-reactor-netty-2.3.12.RELEASE-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/org/springframework/boot/spring-boot-starter-reactor-netty/2.3.12.RELEASE/spring-boot-starter-reactor-netty-2.3.12.RELEASE-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: org.springframework.boot:spring-boot-starter-test:2.3.12.RELEASE">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/org/springframework/boot/spring-boot-starter-test/2.3.12.RELEASE/spring-boot-starter-test-2.3.12.RELEASE.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/org/springframework/boot/spring-boot-starter-test/2.3.12.RELEASE/spring-boot-starter-test-2.3.12.RELEASE-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/org/springframework/boot/spring-boot-starter-test/2.3.12.RELEASE/spring-boot-starter-test-2.3.12.RELEASE-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: org.springframework.boot:spring-boot-starter-tomcat:2.3.12.RELEASE">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/org/springframework/boot/spring-boot-starter-tomcat/2.3.12.RELEASE/spring-boot-starter-tomcat-2.3.12.RELEASE.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/org/springframework/boot/spring-boot-starter-tomcat/2.3.12.RELEASE/spring-boot-starter-tomcat-2.3.12.RELEASE-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/org/springframework/boot/spring-boot-starter-tomcat/2.3.12.RELEASE/spring-boot-starter-tomcat-2.3.12.RELEASE-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: org.springframework.boot:spring-boot-starter-validation:2.3.12.RELEASE">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/org/springframework/boot/spring-boot-starter-validation/2.3.12.RELEASE/spring-boot-starter-validation-2.3.12.RELEASE.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/org/springframework/boot/spring-boot-starter-validation/2.3.12.RELEASE/spring-boot-starter-validation-2.3.12.RELEASE-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/org/springframework/boot/spring-boot-starter-validation/2.3.12.RELEASE/spring-boot-starter-validation-2.3.12.RELEASE-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: org.springframework.boot:spring-boot-starter-web:2.3.12.RELEASE">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/org/springframework/boot/spring-boot-starter-web/2.3.12.RELEASE/spring-boot-starter-web-2.3.12.RELEASE.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/org/springframework/boot/spring-boot-starter-web/2.3.12.RELEASE/spring-boot-starter-web-2.3.12.RELEASE-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/org/springframework/boot/spring-boot-starter-web/2.3.12.RELEASE/spring-boot-starter-web-2.3.12.RELEASE-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: org.springframework.boot:spring-boot-starter-webflux:2.3.12.RELEASE">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/org/springframework/boot/spring-boot-starter-webflux/2.3.12.RELEASE/spring-boot-starter-webflux-2.3.12.RELEASE.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/org/springframework/boot/spring-boot-starter-webflux/2.3.12.RELEASE/spring-boot-starter-webflux-2.3.12.RELEASE-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/org/springframework/boot/spring-boot-starter-webflux/2.3.12.RELEASE/spring-boot-starter-webflux-2.3.12.RELEASE-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: org.springframework.boot:spring-boot-starter:2.3.12.RELEASE">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/org/springframework/boot/spring-boot-starter/2.3.12.RELEASE/spring-boot-starter-2.3.12.RELEASE.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/org/springframework/boot/spring-boot-starter/2.3.12.RELEASE/spring-boot-starter-2.3.12.RELEASE-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/org/springframework/boot/spring-boot-starter/2.3.12.RELEASE/spring-boot-starter-2.3.12.RELEASE-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: org.springframework.boot:spring-boot-test-autoconfigure:2.3.12.RELEASE">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/org/springframework/boot/spring-boot-test-autoconfigure/2.3.12.RELEASE/spring-boot-test-autoconfigure-2.3.12.RELEASE.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/org/springframework/boot/spring-boot-test-autoconfigure/2.3.12.RELEASE/spring-boot-test-autoconfigure-2.3.12.RELEASE-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/org/springframework/boot/spring-boot-test-autoconfigure/2.3.12.RELEASE/spring-boot-test-autoconfigure-2.3.12.RELEASE-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: org.springframework.boot:spring-boot-test:2.3.12.RELEASE">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/org/springframework/boot/spring-boot-test/2.3.12.RELEASE/spring-boot-test-2.3.12.RELEASE.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/org/springframework/boot/spring-boot-test/2.3.12.RELEASE/spring-boot-test-2.3.12.RELEASE-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/org/springframework/boot/spring-boot-test/2.3.12.RELEASE/spring-boot-test-2.3.12.RELEASE-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: org.springframework.boot:spring-boot:2.3.12.RELEASE">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/org/springframework/boot/spring-boot/2.3.12.RELEASE/spring-boot-2.3.12.RELEASE.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/org/springframework/boot/spring-boot/2.3.12.RELEASE/spring-boot-2.3.12.RELEASE-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/org/springframework/boot/spring-boot/2.3.12.RELEASE/spring-boot-2.3.12.RELEASE-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: org.springframework.cloud:spring-cloud-commons:2.2.9.RELEASE">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/org/springframework/cloud/spring-cloud-commons/2.2.9.RELEASE/spring-cloud-commons-2.2.9.RELEASE.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/org/springframework/cloud/spring-cloud-commons/2.2.9.RELEASE/spring-cloud-commons-2.2.9.RELEASE-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/org/springframework/cloud/spring-cloud-commons/2.2.9.RELEASE/spring-cloud-commons-2.2.9.RELEASE-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: org.springframework.cloud:spring-cloud-context:2.2.9.RELEASE">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/org/springframework/cloud/spring-cloud-context/2.2.9.RELEASE/spring-cloud-context-2.2.9.RELEASE.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/org/springframework/cloud/spring-cloud-context/2.2.9.RELEASE/spring-cloud-context-2.2.9.RELEASE-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/org/springframework/cloud/spring-cloud-context/2.2.9.RELEASE/spring-cloud-context-2.2.9.RELEASE-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: org.springframework.cloud:spring-cloud-gateway-server:2.2.9.RELEASE">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/org/springframework/cloud/spring-cloud-gateway-server/2.2.9.RELEASE/spring-cloud-gateway-server-2.2.9.RELEASE.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/org/springframework/cloud/spring-cloud-gateway-server/2.2.9.RELEASE/spring-cloud-gateway-server-2.2.9.RELEASE-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/org/springframework/cloud/spring-cloud-gateway-server/2.2.9.RELEASE/spring-cloud-gateway-server-2.2.9.RELEASE-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: org.springframework.cloud:spring-cloud-netflix-archaius:2.2.9.RELEASE">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/org/springframework/cloud/spring-cloud-netflix-archaius/2.2.9.RELEASE/spring-cloud-netflix-archaius-2.2.9.RELEASE.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/org/springframework/cloud/spring-cloud-netflix-archaius/2.2.9.RELEASE/spring-cloud-netflix-archaius-2.2.9.RELEASE-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/org/springframework/cloud/spring-cloud-netflix-archaius/2.2.9.RELEASE/spring-cloud-netflix-archaius-2.2.9.RELEASE-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: org.springframework.cloud:spring-cloud-netflix-ribbon:2.2.9.RELEASE">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/org/springframework/cloud/spring-cloud-netflix-ribbon/2.2.9.RELEASE/spring-cloud-netflix-ribbon-2.2.9.RELEASE.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/org/springframework/cloud/spring-cloud-netflix-ribbon/2.2.9.RELEASE/spring-cloud-netflix-ribbon-2.2.9.RELEASE-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/org/springframework/cloud/spring-cloud-netflix-ribbon/2.2.9.RELEASE/spring-cloud-netflix-ribbon-2.2.9.RELEASE-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: org.springframework.cloud:spring-cloud-openfeign-core:2.2.9.RELEASE">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/org/springframework/cloud/spring-cloud-openfeign-core/2.2.9.RELEASE/spring-cloud-openfeign-core-2.2.9.RELEASE.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/org/springframework/cloud/spring-cloud-openfeign-core/2.2.9.RELEASE/spring-cloud-openfeign-core-2.2.9.RELEASE-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/org/springframework/cloud/spring-cloud-openfeign-core/2.2.9.RELEASE/spring-cloud-openfeign-core-2.2.9.RELEASE-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: org.springframework.cloud:spring-cloud-starter-gateway:2.2.9.RELEASE">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/org/springframework/cloud/spring-cloud-starter-gateway/2.2.9.RELEASE/spring-cloud-starter-gateway-2.2.9.RELEASE.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/org/springframework/cloud/spring-cloud-starter-gateway/2.2.9.RELEASE/spring-cloud-starter-gateway-2.2.9.RELEASE-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/org/springframework/cloud/spring-cloud-starter-gateway/2.2.9.RELEASE/spring-cloud-starter-gateway-2.2.9.RELEASE-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: org.springframework.cloud:spring-cloud-starter-netflix-archaius:2.2.9.RELEASE">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/org/springframework/cloud/spring-cloud-starter-netflix-archaius/2.2.9.RELEASE/spring-cloud-starter-netflix-archaius-2.2.9.RELEASE.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/org/springframework/cloud/spring-cloud-starter-netflix-archaius/2.2.9.RELEASE/spring-cloud-starter-netflix-archaius-2.2.9.RELEASE-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/org/springframework/cloud/spring-cloud-starter-netflix-archaius/2.2.9.RELEASE/spring-cloud-starter-netflix-archaius-2.2.9.RELEASE-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: org.springframework.cloud:spring-cloud-starter-netflix-ribbon:2.2.9.RELEASE">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/org/springframework/cloud/spring-cloud-starter-netflix-ribbon/2.2.9.RELEASE/spring-cloud-starter-netflix-ribbon-2.2.9.RELEASE.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/org/springframework/cloud/spring-cloud-starter-netflix-ribbon/2.2.9.RELEASE/spring-cloud-starter-netflix-ribbon-2.2.9.RELEASE-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/org/springframework/cloud/spring-cloud-starter-netflix-ribbon/2.2.9.RELEASE/spring-cloud-starter-netflix-ribbon-2.2.9.RELEASE-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: org.springframework.cloud:spring-cloud-starter-openfeign:2.2.9.RELEASE">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/org/springframework/cloud/spring-cloud-starter-openfeign/2.2.9.RELEASE/spring-cloud-starter-openfeign-2.2.9.RELEASE.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/org/springframework/cloud/spring-cloud-starter-openfeign/2.2.9.RELEASE/spring-cloud-starter-openfeign-2.2.9.RELEASE-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/org/springframework/cloud/spring-cloud-starter-openfeign/2.2.9.RELEASE/spring-cloud-starter-openfeign-2.2.9.RELEASE-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: org.springframework.cloud:spring-cloud-starter:2.2.9.RELEASE">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/org/springframework/cloud/spring-cloud-starter/2.2.9.RELEASE/spring-cloud-starter-2.2.9.RELEASE.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/org/springframework/cloud/spring-cloud-starter/2.2.9.RELEASE/spring-cloud-starter-2.2.9.RELEASE-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/org/springframework/cloud/spring-cloud-starter/2.2.9.RELEASE/spring-cloud-starter-2.2.9.RELEASE-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: org.springframework.data:spring-data-commons:2.3.9.RELEASE">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/org/springframework/data/spring-data-commons/2.3.9.RELEASE/spring-data-commons-2.3.9.RELEASE.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/org/springframework/data/spring-data-commons/2.3.9.RELEASE/spring-data-commons-2.3.9.RELEASE-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/org/springframework/data/spring-data-commons/2.3.9.RELEASE/spring-data-commons-2.3.9.RELEASE-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: org.springframework.data:spring-data-keyvalue:2.3.9.RELEASE">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/org/springframework/data/spring-data-keyvalue/2.3.9.RELEASE/spring-data-keyvalue-2.3.9.RELEASE.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/org/springframework/data/spring-data-keyvalue/2.3.9.RELEASE/spring-data-keyvalue-2.3.9.RELEASE-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/org/springframework/data/spring-data-keyvalue/2.3.9.RELEASE/spring-data-keyvalue-2.3.9.RELEASE-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: org.springframework.data:spring-data-redis:2.3.9.RELEASE">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/org/springframework/data/spring-data-redis/2.3.9.RELEASE/spring-data-redis-2.3.9.RELEASE.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/org/springframework/data/spring-data-redis/2.3.9.RELEASE/spring-data-redis-2.3.9.RELEASE-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/org/springframework/data/spring-data-redis/2.3.9.RELEASE/spring-data-redis-2.3.9.RELEASE-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: org.springframework.plugin:spring-plugin-core:2.0.0.RELEASE">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/org/springframework/plugin/spring-plugin-core/2.0.0.RELEASE/spring-plugin-core-2.0.0.RELEASE.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/org/springframework/plugin/spring-plugin-core/2.0.0.RELEASE/spring-plugin-core-2.0.0.RELEASE-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/org/springframework/plugin/spring-plugin-core/2.0.0.RELEASE/spring-plugin-core-2.0.0.RELEASE-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: org.springframework.plugin:spring-plugin-metadata:2.0.0.RELEASE">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/org/springframework/plugin/spring-plugin-metadata/2.0.0.RELEASE/spring-plugin-metadata-2.0.0.RELEASE.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/org/springframework/plugin/spring-plugin-metadata/2.0.0.RELEASE/spring-plugin-metadata-2.0.0.RELEASE-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/org/springframework/plugin/spring-plugin-metadata/2.0.0.RELEASE/spring-plugin-metadata-2.0.0.RELEASE-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: org.springframework.security.oauth.boot:spring-security-oauth2-autoconfigure:2.1.2.RELEASE">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/org/springframework/security/oauth/boot/spring-security-oauth2-autoconfigure/2.1.2.RELEASE/spring-security-oauth2-autoconfigure-2.1.2.RELEASE.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/org/springframework/security/oauth/boot/spring-security-oauth2-autoconfigure/2.1.2.RELEASE/spring-security-oauth2-autoconfigure-2.1.2.RELEASE-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/org/springframework/security/oauth/boot/spring-security-oauth2-autoconfigure/2.1.2.RELEASE/spring-security-oauth2-autoconfigure-2.1.2.RELEASE-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: org.springframework.security.oauth:spring-security-oauth2:2.3.4.RELEASE">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/org/springframework/security/oauth/spring-security-oauth2/2.3.4.RELEASE/spring-security-oauth2-2.3.4.RELEASE.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/org/springframework/security/oauth/spring-security-oauth2/2.3.4.RELEASE/spring-security-oauth2-2.3.4.RELEASE-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/org/springframework/security/oauth/spring-security-oauth2/2.3.4.RELEASE/spring-security-oauth2-2.3.4.RELEASE-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: org.springframework.security:spring-security-config:5.3.9.RELEASE">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/org/springframework/security/spring-security-config/5.3.9.RELEASE/spring-security-config-5.3.9.RELEASE.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/org/springframework/security/spring-security-config/5.3.9.RELEASE/spring-security-config-5.3.9.RELEASE-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/org/springframework/security/spring-security-config/5.3.9.RELEASE/spring-security-config-5.3.9.RELEASE-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: org.springframework.security:spring-security-core:5.3.9.RELEASE">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/org/springframework/security/spring-security-core/5.3.9.RELEASE/spring-security-core-5.3.9.RELEASE.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/org/springframework/security/spring-security-core/5.3.9.RELEASE/spring-security-core-5.3.9.RELEASE-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/org/springframework/security/spring-security-core/5.3.9.RELEASE/spring-security-core-5.3.9.RELEASE-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: org.springframework.security:spring-security-crypto:5.3.9.RELEASE">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/org/springframework/security/spring-security-crypto/5.3.9.RELEASE/spring-security-crypto-5.3.9.RELEASE.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/org/springframework/security/spring-security-crypto/5.3.9.RELEASE/spring-security-crypto-5.3.9.RELEASE-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/org/springframework/security/spring-security-crypto/5.3.9.RELEASE/spring-security-crypto-5.3.9.RELEASE-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: org.springframework.security:spring-security-jwt:1.0.9.RELEASE">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/org/springframework/security/spring-security-jwt/1.0.9.RELEASE/spring-security-jwt-1.0.9.RELEASE.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/org/springframework/security/spring-security-jwt/1.0.9.RELEASE/spring-security-jwt-1.0.9.RELEASE-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/org/springframework/security/spring-security-jwt/1.0.9.RELEASE/spring-security-jwt-1.0.9.RELEASE-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: org.springframework.security:spring-security-oauth2-core:5.3.9.RELEASE">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/org/springframework/security/spring-security-oauth2-core/5.3.9.RELEASE/spring-security-oauth2-core-5.3.9.RELEASE.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/org/springframework/security/spring-security-oauth2-core/5.3.9.RELEASE/spring-security-oauth2-core-5.3.9.RELEASE-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/org/springframework/security/spring-security-oauth2-core/5.3.9.RELEASE/spring-security-oauth2-core-5.3.9.RELEASE-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: org.springframework.security:spring-security-oauth2-jose:5.3.9.RELEASE">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/org/springframework/security/spring-security-oauth2-jose/5.3.9.RELEASE/spring-security-oauth2-jose-5.3.9.RELEASE.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/org/springframework/security/spring-security-oauth2-jose/5.3.9.RELEASE/spring-security-oauth2-jose-5.3.9.RELEASE-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/org/springframework/security/spring-security-oauth2-jose/5.3.9.RELEASE/spring-security-oauth2-jose-5.3.9.RELEASE-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: org.springframework.security:spring-security-oauth2-resource-server:5.3.9.RELEASE">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/org/springframework/security/spring-security-oauth2-resource-server/5.3.9.RELEASE/spring-security-oauth2-resource-server-5.3.9.RELEASE.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/org/springframework/security/spring-security-oauth2-resource-server/5.3.9.RELEASE/spring-security-oauth2-resource-server-5.3.9.RELEASE-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/org/springframework/security/spring-security-oauth2-resource-server/5.3.9.RELEASE/spring-security-oauth2-resource-server-5.3.9.RELEASE-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: org.springframework.security:spring-security-rsa:1.0.9.RELEASE">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/org/springframework/security/spring-security-rsa/1.0.9.RELEASE/spring-security-rsa-1.0.9.RELEASE.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/org/springframework/security/spring-security-rsa/1.0.9.RELEASE/spring-security-rsa-1.0.9.RELEASE-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/org/springframework/security/spring-security-rsa/1.0.9.RELEASE/spring-security-rsa-1.0.9.RELEASE-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: org.springframework.security:spring-security-web:5.3.9.RELEASE">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/org/springframework/security/spring-security-web/5.3.9.RELEASE/spring-security-web-5.3.9.RELEASE.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/org/springframework/security/spring-security-web/5.3.9.RELEASE/spring-security-web-5.3.9.RELEASE-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/org/springframework/security/spring-security-web/5.3.9.RELEASE/spring-security-web-5.3.9.RELEASE-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: org.springframework:spring-aop:5.2.15.RELEASE">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/org/springframework/spring-aop/5.2.15.RELEASE/spring-aop-5.2.15.RELEASE.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/org/springframework/spring-aop/5.2.15.RELEASE/spring-aop-5.2.15.RELEASE-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/org/springframework/spring-aop/5.2.15.RELEASE/spring-aop-5.2.15.RELEASE-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: org.springframework:spring-beans:5.2.15.RELEASE">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/org/springframework/spring-beans/5.2.15.RELEASE/spring-beans-5.2.15.RELEASE.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/org/springframework/spring-beans/5.2.15.RELEASE/spring-beans-5.2.15.RELEASE-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/org/springframework/spring-beans/5.2.15.RELEASE/spring-beans-5.2.15.RELEASE-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: org.springframework:spring-context-support:5.2.15.RELEASE">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/org/springframework/spring-context-support/5.2.15.RELEASE/spring-context-support-5.2.15.RELEASE.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/org/springframework/spring-context-support/5.2.15.RELEASE/spring-context-support-5.2.15.RELEASE-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/org/springframework/spring-context-support/5.2.15.RELEASE/spring-context-support-5.2.15.RELEASE-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: org.springframework:spring-context:5.2.15.RELEASE">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/org/springframework/spring-context/5.2.15.RELEASE/spring-context-5.2.15.RELEASE.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/org/springframework/spring-context/5.2.15.RELEASE/spring-context-5.2.15.RELEASE-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/org/springframework/spring-context/5.2.15.RELEASE/spring-context-5.2.15.RELEASE-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: org.springframework:spring-core:5.2.15.RELEASE">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/org/springframework/spring-core/5.2.15.RELEASE/spring-core-5.2.15.RELEASE.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/org/springframework/spring-core/5.2.15.RELEASE/spring-core-5.2.15.RELEASE-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/org/springframework/spring-core/5.2.15.RELEASE/spring-core-5.2.15.RELEASE-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: org.springframework:spring-expression:5.2.15.RELEASE">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/org/springframework/spring-expression/5.2.15.RELEASE/spring-expression-5.2.15.RELEASE.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/org/springframework/spring-expression/5.2.15.RELEASE/spring-expression-5.2.15.RELEASE-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/org/springframework/spring-expression/5.2.15.RELEASE/spring-expression-5.2.15.RELEASE-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: org.springframework:spring-jcl:5.2.15.RELEASE">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/org/springframework/spring-jcl/5.2.15.RELEASE/spring-jcl-5.2.15.RELEASE.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/org/springframework/spring-jcl/5.2.15.RELEASE/spring-jcl-5.2.15.RELEASE-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/org/springframework/spring-jcl/5.2.15.RELEASE/spring-jcl-5.2.15.RELEASE-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: org.springframework:spring-jdbc:5.2.15.RELEASE">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/org/springframework/spring-jdbc/5.2.15.RELEASE/spring-jdbc-5.2.15.RELEASE.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/org/springframework/spring-jdbc/5.2.15.RELEASE/spring-jdbc-5.2.15.RELEASE-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/org/springframework/spring-jdbc/5.2.15.RELEASE/spring-jdbc-5.2.15.RELEASE-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: org.springframework:spring-oxm:5.2.15.RELEASE">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/org/springframework/spring-oxm/5.2.15.RELEASE/spring-oxm-5.2.15.RELEASE.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/org/springframework/spring-oxm/5.2.15.RELEASE/spring-oxm-5.2.15.RELEASE-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/org/springframework/spring-oxm/5.2.15.RELEASE/spring-oxm-5.2.15.RELEASE-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: org.springframework:spring-test:5.2.15.RELEASE">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/org/springframework/spring-test/5.2.15.RELEASE/spring-test-5.2.15.RELEASE.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/org/springframework/spring-test/5.2.15.RELEASE/spring-test-5.2.15.RELEASE-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/org/springframework/spring-test/5.2.15.RELEASE/spring-test-5.2.15.RELEASE-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: org.springframework:spring-tx:5.2.15.RELEASE">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/org/springframework/spring-tx/5.2.15.RELEASE/spring-tx-5.2.15.RELEASE.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/org/springframework/spring-tx/5.2.15.RELEASE/spring-tx-5.2.15.RELEASE-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/org/springframework/spring-tx/5.2.15.RELEASE/spring-tx-5.2.15.RELEASE-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: org.springframework:spring-web:5.2.15.RELEASE">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/org/springframework/spring-web/5.2.15.RELEASE/spring-web-5.2.15.RELEASE.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/org/springframework/spring-web/5.2.15.RELEASE/spring-web-5.2.15.RELEASE-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/org/springframework/spring-web/5.2.15.RELEASE/spring-web-5.2.15.RELEASE-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: org.springframework:spring-webflux:5.2.15.RELEASE">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/org/springframework/spring-webflux/5.2.15.RELEASE/spring-webflux-5.2.15.RELEASE.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/org/springframework/spring-webflux/5.2.15.RELEASE/spring-webflux-5.2.15.RELEASE-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/org/springframework/spring-webflux/5.2.15.RELEASE/spring-webflux-5.2.15.RELEASE-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: org.springframework:spring-webmvc:5.2.15.RELEASE">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/org/springframework/spring-webmvc/5.2.15.RELEASE/spring-webmvc-5.2.15.RELEASE.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/org/springframework/spring-webmvc/5.2.15.RELEASE/spring-webmvc-5.2.15.RELEASE-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/org/springframework/spring-webmvc/5.2.15.RELEASE/spring-webmvc-5.2.15.RELEASE-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: org.synchronoss.cloud:nio-multipart-parser:1.1.0">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/org/synchronoss/cloud/nio-multipart-parser/1.1.0/nio-multipart-parser-1.1.0.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/org/synchronoss/cloud/nio-multipart-parser/1.1.0/nio-multipart-parser-1.1.0-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/org/synchronoss/cloud/nio-multipart-parser/1.1.0/nio-multipart-parser-1.1.0-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: org.synchronoss.cloud:nio-stream-storage:1.1.3">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/org/synchronoss/cloud/nio-stream-storage/1.1.3/nio-stream-storage-1.1.3.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/org/synchronoss/cloud/nio-stream-storage/1.1.3/nio-stream-storage-1.1.3-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/org/synchronoss/cloud/nio-stream-storage/1.1.3/nio-stream-storage-1.1.3-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: org.xmlunit:xmlunit-core:2.7.0">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/org/xmlunit/xmlunit-core/2.7.0/xmlunit-core-2.7.0.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/org/xmlunit/xmlunit-core/2.7.0/xmlunit-core-2.7.0-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/org/xmlunit/xmlunit-core/2.7.0/xmlunit-core-2.7.0-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: org.yaml:snakeyaml:1.26">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/org/yaml/snakeyaml/1.26/snakeyaml-1.26.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/org/yaml/snakeyaml/1.26/snakeyaml-1.26-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/org/yaml/snakeyaml/1.26/snakeyaml-1.26-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: xerces:xercesImpl:2.12.1">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/xerces/xercesImpl/2.12.1/xercesImpl-2.12.1.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/xerces/xercesImpl/2.12.1/xercesImpl-2.12.1-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/xerces/xercesImpl/2.12.1/xercesImpl-2.12.1-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: xml-apis:xml-apis-ext:1.3.04">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/xml-apis/xml-apis-ext/1.3.04/xml-apis-ext-1.3.04.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/xml-apis/xml-apis-ext/1.3.04/xml-apis-ext-1.3.04-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/xml-apis/xml-apis-ext/1.3.04/xml-apis-ext-1.3.04-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: xml-apis:xml-apis:1.4.01">
-      <CLASSES>
-        <root url="jar://E:/AJava/maven/repository/xml-apis/xml-apis/1.4.01/xml-apis-1.4.01.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://E:/AJava/maven/repository/xml-apis/xml-apis/1.4.01/xml-apis-1.4.01-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://E:/AJava/maven/repository/xml-apis/xml-apis/1.4.01/xml-apis-1.4.01-sources.jar!/" />
-      </SOURCES>
-    </library>
-  </component>
-</project>
\ No newline at end of file
+  </component>  
+  <component name="Encoding"> 
+    <file url="file://$PROJECT_DIR$/pqs-job/job-admin" charset="UTF-8"/>  
+    <file url="file://$PROJECT_DIR$/pqs-user/user-boot" charset="UTF-8"/> 
+  </component>  
+  <component name="ExportToHTMLSettings"> 
+    <option name="PRINT_LINE_NUMBERS" value="false"/>  
+    <option name="OPEN_IN_BROWSER" value="false"/>  
+    <option name="OUTPUT_DIRECTORY"/> 
+  </component>  
+  <component name="ImportConfiguration"> 
+    <option name="VENDOR"/>  
+    <option name="RELEASE_TAG"/>  
+    <option name="LOG_MESSAGE"/>  
+    <option name="CHECKOUT_AFTER_IMPORT" value="true"/> 
+  </component>  
+  <component name="InspectionProjectProfileManager"> 
+    <profile version="1.0"> 
+      <option name="myName" value="Project Default"/> 
+    </profile>  
+    <version value="1.0"/> 
+  </component>  
+  <component name="JUnitProjectSettings"> 
+    <option name="TEST_RUNNER" value="UI"/> 
+  </component>  
+  <component name="JavadocGenerationManager"> 
+    <option name="OUTPUT_DIRECTORY"/>  
+    <option name="OPTION_SCOPE" value="protected"/>  
+    <option name="OPTION_HIERARCHY" value="false"/>  
+    <option name="OPTION_NAVIGATOR" value="false"/>  
+    <option name="OPTION_INDEX" value="false"/>  
+    <option name="OPTION_SEPARATE_INDEX" value="false"/>  
+    <option name="OPTION_USE_1_1" value="false"/>  
+    <option name="OPTION_DOCUMENT_TAG_USE" value="false"/>  
+    <option name="OPTION_DOCUMENT_TAG_AUTHOR" value="false"/>  
+    <option name="OPTION_DOCUMENT_TAG_VERSION" value="false"/>  
+    <option name="OPTION_DOCUMENT_TAG_DEPRECATED" value="false"/>  
+    <option name="OPTION_DEPRECATED_LIST" value="false"/>  
+    <option name="OTHER_OPTIONS"/>  
+    <option name="HEAP_SIZE"/>  
+    <option name="OPEN_IN_BROWSER" value="false"/> 
+  </component>  
+  <component name="JikesSettings"> 
+    <option name="DEBUGGING_INFO" value="true"/>  
+    <option name="DEPRECATION" value="true"/>  
+    <option name="GENERATE_NO_WARNINGS" value="false"/>  
+    <option name="GENERATE_MAKE_FILE_DEPENDENCIES" value="false"/>  
+    <option name="DO_FULL_DEPENDENCE_CHECK" value="false"/>  
+    <option name="IS_INCREMENTAL_MODE" value="false"/>  
+    <option name="IS_EMACS_ERRORS_MODE" value="true"/>  
+    <option name="ADDITIONAL_OPTIONS_STRING" value=""/>  
+    <option name="MAXIMUM_HEAP_SIZE" value="128"/> 
+  </component>  
+  <component name="MavenProjectsManager"> 
+    <option name="originalFiles"> 
+      <list> 
+        <option value="$PROJECT_DIR$/pom.xml"/> 
+      </list> 
+    </option> 
+  </component>  
+  <component name="Palette2"> 
+    <group name="Swing"> 
+      <item class="com.intellij.uiDesigner.HSpacer" tooltip-text="Horizontal Spacer" icon="/com/intellij/uiDesigner/icons/hspacer.png" removable="false" auto-create-binding="false" can-attach-label="false"> 
+        <default-constraints vsize-policy="1" hsize-policy="6" anchor="0" fill="1"/> 
+      </item>  
+      <item class="com.intellij.uiDesigner.VSpacer" tooltip-text="Vertical Spacer" icon="/com/intellij/uiDesigner/icons/vspacer.png" removable="false" auto-create-binding="false" can-attach-label="false"> 
+        <default-constraints vsize-policy="6" hsize-policy="1" anchor="0" fill="2"/> 
+      </item>  
+      <item class="javax.swing.JPanel" icon="/com/intellij/uiDesigner/icons/panel.png" removable="false" auto-create-binding="false" can-attach-label="false"> 
+        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3"/> 
+      </item>  
+      <item class="javax.swing.JScrollPane" icon="/com/intellij/uiDesigner/icons/scrollPane.png" removable="false" auto-create-binding="false" can-attach-label="true"> 
+        <default-constraints vsize-policy="7" hsize-policy="7" anchor="0" fill="3"/> 
+      </item>  
+      <item class="javax.swing.JButton" icon="/com/intellij/uiDesigner/icons/button.png" removable="false" auto-create-binding="true" can-attach-label="false"> 
+        <default-constraints vsize-policy="0" hsize-policy="3" anchor="0" fill="1"/>  
+        <initial-values> 
+          <property name="text" value="Button"/> 
+        </initial-values> 
+      </item>  
+      <item class="javax.swing.JRadioButton" icon="/com/intellij/uiDesigner/icons/radioButton.png" removable="false" auto-create-binding="true" can-attach-label="false"> 
+        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0"/>  
+        <initial-values> 
+          <property name="text" value="RadioButton"/> 
+        </initial-values> 
+      </item>  
+      <item class="javax.swing.JCheckBox" icon="/com/intellij/uiDesigner/icons/checkBox.png" removable="false" auto-create-binding="true" can-attach-label="false"> 
+        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0"/>  
+        <initial-values> 
+          <property name="text" value="CheckBox"/> 
+        </initial-values> 
+      </item>  
+      <item class="javax.swing.JLabel" icon="/com/intellij/uiDesigner/icons/label.png" removable="false" auto-create-binding="false" can-attach-label="false"> 
+        <default-constraints vsize-policy="0" hsize-policy="0" anchor="8" fill="0"/>  
+        <initial-values> 
+          <property name="text" value="Label"/> 
+        </initial-values> 
+      </item>  
+      <item class="javax.swing.JTextField" icon="/com/intellij/uiDesigner/icons/textField.png" removable="false" auto-create-binding="true" can-attach-label="true"> 
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1"> 
+          <preferred-size width="150" height="-1"/> 
+        </default-constraints> 
+      </item>  
+      <item class="javax.swing.JPasswordField" icon="/com/intellij/uiDesigner/icons/passwordField.png" removable="false" auto-create-binding="true" can-attach-label="true"> 
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1"> 
+          <preferred-size width="150" height="-1"/> 
+        </default-constraints> 
+      </item>  
+      <item class="javax.swing.JFormattedTextField" icon="/com/intellij/uiDesigner/icons/formattedTextField.png" removable="false" auto-create-binding="true" can-attach-label="true"> 
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1"> 
+          <preferred-size width="150" height="-1"/> 
+        </default-constraints> 
+      </item>  
+      <item class="javax.swing.JTextArea" icon="/com/intellij/uiDesigner/icons/textArea.png" removable="false" auto-create-binding="true" can-attach-label="true"> 
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3"> 
+          <preferred-size width="150" height="50"/> 
+        </default-constraints> 
+      </item>  
+      <item class="javax.swing.JTextPane" icon="/com/intellij/uiDesigner/icons/textPane.png" removable="false" auto-create-binding="true" can-attach-label="true"> 
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3"> 
+          <preferred-size width="150" height="50"/> 
+        </default-constraints> 
+      </item>  
+      <item class="javax.swing.JEditorPane" icon="/com/intellij/uiDesigner/icons/editorPane.png" removable="false" auto-create-binding="true" can-attach-label="true"> 
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3"> 
+          <preferred-size width="150" height="50"/> 
+        </default-constraints> 
+      </item>  
+      <item class="javax.swing.JComboBox" icon="/com/intellij/uiDesigner/icons/comboBox.png" removable="false" auto-create-binding="true" can-attach-label="true"> 
+        <default-constraints vsize-policy="0" hsize-policy="2" anchor="8" fill="1"/> 
+      </item>  
+      <item class="javax.swing.JTable" icon="/com/intellij/uiDesigner/icons/table.png" removable="false" auto-create-binding="true" can-attach-label="false"> 
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3"> 
+          <preferred-size width="150" height="50"/> 
+        </default-constraints> 
+      </item>  
+      <item class="javax.swing.JList" icon="/com/intellij/uiDesigner/icons/list.png" removable="false" auto-create-binding="true" can-attach-label="false"> 
+        <default-constraints vsize-policy="6" hsize-policy="2" anchor="0" fill="3"> 
+          <preferred-size width="150" height="50"/> 
+        </default-constraints> 
+      </item>  
+      <item class="javax.swing.JTree" icon="/com/intellij/uiDesigner/icons/tree.png" removable="false" auto-create-binding="true" can-attach-label="false"> 
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3"> 
+          <preferred-size width="150" height="50"/> 
+        </default-constraints> 
+      </item>  
+      <item class="javax.swing.JTabbedPane" icon="/com/intellij/uiDesigner/icons/tabbedPane.png" removable="false" auto-create-binding="true" can-attach-label="false"> 
+        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3"> 
+          <preferred-size width="200" height="200"/> 
+        </default-constraints> 
+      </item>  
+      <item class="javax.swing.JSplitPane" icon="/com/intellij/uiDesigner/icons/splitPane.png" removable="false" auto-create-binding="false" can-attach-label="false"> 
+        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3"> 
+          <preferred-size width="200" height="200"/> 
+        </default-constraints> 
+      </item>  
+      <item class="javax.swing.JSpinner" icon="/com/intellij/uiDesigner/icons/spinner.png" removable="false" auto-create-binding="true" can-attach-label="true"> 
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1"/> 
+      </item>  
+      <item class="javax.swing.JSlider" icon="/com/intellij/uiDesigner/icons/slider.png" removable="false" auto-create-binding="true" can-attach-label="false"> 
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1"/> 
+      </item>  
+      <item class="javax.swing.JSeparator" icon="/com/intellij/uiDesigner/icons/separator.png" removable="false" auto-create-binding="false" can-attach-label="false"> 
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3"/> 
+      </item>  
+      <item class="javax.swing.JProgressBar" icon="/com/intellij/uiDesigner/icons/progressbar.png" removable="false" auto-create-binding="true" can-attach-label="false"> 
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1"/> 
+      </item>  
+      <item class="javax.swing.JToolBar" icon="/com/intellij/uiDesigner/icons/toolbar.png" removable="false" auto-create-binding="false" can-attach-label="false"> 
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1"> 
+          <preferred-size width="-1" height="20"/> 
+        </default-constraints> 
+      </item>  
+      <item class="javax.swing.JToolBar$Separator" icon="/com/intellij/uiDesigner/icons/toolbarSeparator.png" removable="false" auto-create-binding="false" can-attach-label="false"> 
+        <default-constraints vsize-policy="0" hsize-policy="0" anchor="0" fill="1"/> 
+      </item>  
+      <item class="javax.swing.JScrollBar" icon="/com/intellij/uiDesigner/icons/scrollbar.png" removable="false" auto-create-binding="true" can-attach-label="false"> 
+        <default-constraints vsize-policy="6" hsize-policy="0" anchor="0" fill="2"/> 
+      </item> 
+    </group> 
+  </component>  
+  <component name="ProjectDictionaryState"> 
+    <dictionary name="hanyong"> 
+      <words> 
+        <w>eventreport</w>  
+        <w>pids</w> 
+      </words> 
+    </dictionary> 
+  </component>  
+  <component name="ProjectModuleManager"> 
+    <modules> 
+      <module filepath="$PROJECT_DIR$/pqs.iml"/>
+      <module filepath="$PROJECT_DIR$/pqs-common/common-core/common-core.iml"/>
+      <module filepath="$PROJECT_DIR$/pqs-common/common-db/common-db.iml"/>
+      <module filepath="$PROJECT_DIR$/pqs-common/common-microservice/common-microservice.iml"/>
+      <module filepath="$PROJECT_DIR$/pqs-common/common-redis/common-redis.iml"/>
+      <module filepath="$PROJECT_DIR$/pqs-common/common-swagger/common-swagger.iml"/>
+      <module filepath="$PROJECT_DIR$/pqs-common/common-web/common-web.iml"/>
+      <module filepath="$PROJECT_DIR$/pqs-common/common-autocode/common-autocode.iml"/>
+      <module filepath="$PROJECT_DIR$/pqs-common/common-influxdb/common-influxDB.iml"/>
+      <module filepath="$PROJECT_DIR$/pqs-common/common-poi/common-poi.iml"/>
+      <module filepath="$PROJECT_DIR$/pqs-common/common-echarts/common-echarts.iml"/>
+      <module filepath="$PROJECT_DIR$/pqs-common/pqs-common.iml"/>
+      <module filepath="$PROJECT_DIR$/pqs-gateway/pqs-gateway.iml"/>
+      <module filepath="$PROJECT_DIR$/pqs-user/user-api/user-api.iml"/>
+      <module filepath="$PROJECT_DIR$/pqs-user/user-boot/user-boot.iml"/>
+      <module filepath="$PROJECT_DIR$/pqs-user/pqs-user.iml"/>
+      <module filepath="$PROJECT_DIR$/pqs-auth/pqs-auth.iml"/>
+      <module filepath="$PROJECT_DIR$/pqs-system/system-boot/system-boot.iml"/>
+      <module filepath="$PROJECT_DIR$/pqs-system/system-api/system-api.iml"/>
+      <module filepath="$PROJECT_DIR$/pqs-system/pqs-system.iml"/>
+      <module filepath="$PROJECT_DIR$/pqs-harmonic/harmonic-api/harmonic-api.iml"/>
+      <module filepath="$PROJECT_DIR$/pqs-harmonic/harmonic-boot/harmonic-boot.iml"/>
+      <module filepath="$PROJECT_DIR$/pqs-harmonic/pqs-harmonic.iml"/>
+      <module filepath="$PROJECT_DIR$/pqs-device/device-boot/device-boot.iml"/>
+      <module filepath="$PROJECT_DIR$/pqs-device/pq-device/pq-device-api/pq-device-api.iml"/>
+      <module filepath="$PROJECT_DIR$/pqs-device/pq-device/pq-device-boot/pq-device-boot.iml"/>
+      <module filepath="$PROJECT_DIR$/pqs-device/pq-device/pq-device.iml"/>
+      <module filepath="$PROJECT_DIR$/pqs-device/pms-device/pms-device-api/pms-device-api.iml"/>
+      <module filepath="$PROJECT_DIR$/pqs-device/pms-device/pms-device-boot/pms-device-boot.iml"/>
+      <module filepath="$PROJECT_DIR$/pqs-device/pms-device/pms-device.iml"/>
+      <module filepath="$PROJECT_DIR$/pqs-device/common-device-biz/common-device-biz.iml"/>
+      <module filepath="$PROJECT_DIR$/pqs-device/pqs-device.iml"/>
+      <module filepath="$PROJECT_DIR$/pqs-energy/energy-api/energy-api.iml"/>
+      <module filepath="$PROJECT_DIR$/pqs-energy/energy-boot/energy-boot.iml"/>
+      <module filepath="$PROJECT_DIR$/pqs-energy/pqs-energy.iml"/>
+      <module filepath="$PROJECT_DIR$/pqs-event/event-api/event-api.iml"/>
+      <module filepath="$PROJECT_DIR$/pqs-event/event-boot/event-boot.iml"/>
+      <module filepath="$PROJECT_DIR$/pqs-event/pqs-event.iml"/>
+      <module filepath="$PROJECT_DIR$/pqs-job/job-admin/job-admin.iml"/>
+      <module filepath="$PROJECT_DIR$/pqs-job/job-executor/job-executor.iml"/>
+      <module filepath="$PROJECT_DIR$/pqs-job/pqs-job.iml"/>
+      <module filepath="$PROJECT_DIR$/pqs-job/job-api/job-api.iml"/>
+      <module filepath="$PROJECT_DIR$/pqs-quality/quality-api/quality-api.iml"/>
+      <module filepath="$PROJECT_DIR$/pqs-quality/quality-boot/quality-boot.iml"/>
+      <module filepath="$PROJECT_DIR$/pqs-quality/pqs-quality.iml"/>
+      <module filepath="$PROJECT_DIR$/pqs-advance/advance-api/advance-api.iml"/>
+      <module filepath="$PROJECT_DIR$/pqs-advance/advance-boot/advance-boot.iml"/>
+      <module filepath="$PROJECT_DIR$/pqs-advance/pqs-advance.iml"/>
+      <module filepath="$PROJECT_DIR$/pqs-prepare/event-prepare/event-prepare.iml"/>
+      <module filepath="$PROJECT_DIR$/pqs-prepare/harmonic-prepare/harmonic-prepare.iml"/>
+      <module filepath="$PROJECT_DIR$/pqs-prepare/pqs-prepare.iml"/>
+    </modules> 
+  </component>  
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="false" project-jdk-name="1.8" project-jdk-type="JavaSDK" assert-keyword="true" jdk-15="true"/>  
+  <component name="VcsDirectoryMappings"> 
+    <mapping directory="$PROJECT_DIR$" vcs="Git"/> 
+  </component>  
+  <component name="libraryTable"> 
+    <library name="Maven: ch.qos.logback:logback-classic:1.2.3"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/ch/qos/logback/logback-classic/1.2.3/logback-classic-1.2.3.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/ch/qos/logback/logback-classic/1.2.3/logback-classic-1.2.3-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/ch/qos/logback/logback-classic/1.2.3/logback-classic-1.2.3-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: ch.qos.logback:logback-core:1.2.3"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/ch/qos/logback/logback-core/1.2.3/logback-core-1.2.3.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/ch/qos/logback/logback-core/1.2.3/logback-core-1.2.3-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/ch/qos/logback/logback-core/1.2.3/logback-core-1.2.3-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: cn.afterturn:easypoi-annotation:4.4.0"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/cn/afterturn/easypoi-annotation/4.4.0/easypoi-annotation-4.4.0.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/cn/afterturn/easypoi-annotation/4.4.0/easypoi-annotation-4.4.0-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/cn/afterturn/easypoi-annotation/4.4.0/easypoi-annotation-4.4.0-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: cn.afterturn:easypoi-base:4.4.0"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/cn/afterturn/easypoi-base/4.4.0/easypoi-base-4.4.0.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/cn/afterturn/easypoi-base/4.4.0/easypoi-base-4.4.0-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/cn/afterturn/easypoi-base/4.4.0/easypoi-base-4.4.0-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: cn.afterturn:easypoi-spring-boot-starter:4.4.0"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/cn/afterturn/easypoi-spring-boot-starter/4.4.0/easypoi-spring-boot-starter-4.4.0.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/cn/afterturn/easypoi-spring-boot-starter/4.4.0/easypoi-spring-boot-starter-4.4.0-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/cn/afterturn/easypoi-spring-boot-starter/4.4.0/easypoi-spring-boot-starter-4.4.0-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: cn.afterturn:easypoi-web:4.4.0"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/cn/afterturn/easypoi-web/4.4.0/easypoi-web-4.4.0.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/cn/afterturn/easypoi-web/4.4.0/easypoi-web-4.4.0-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/cn/afterturn/easypoi-web/4.4.0/easypoi-web-4.4.0-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: cn.afterturn:easypoi-wps:4.4.0"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/cn/afterturn/easypoi-wps/4.4.0/easypoi-wps-4.4.0.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/cn/afterturn/easypoi-wps/4.4.0/easypoi-wps-4.4.0-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/cn/afterturn/easypoi-wps/4.4.0/easypoi-wps-4.4.0-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: cn.hutool:hutool-all:5.7.9"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/cn/hutool/hutool-all/5.7.9/hutool-all-5.7.9.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/cn/hutool/hutool-all/5.7.9/hutool-all-5.7.9-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/cn/hutool/hutool-all/5.7.9/hutool-all-5.7.9-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: com.alibaba.cloud:spring-cloud-alibaba-commons:2.2.7.RELEASE"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/com/alibaba/cloud/spring-cloud-alibaba-commons/2.2.7.RELEASE/spring-cloud-alibaba-commons-2.2.7.RELEASE.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/com/alibaba/cloud/spring-cloud-alibaba-commons/2.2.7.RELEASE/spring-cloud-alibaba-commons-2.2.7.RELEASE-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/com/alibaba/cloud/spring-cloud-alibaba-commons/2.2.7.RELEASE/spring-cloud-alibaba-commons-2.2.7.RELEASE-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: com.alibaba.cloud:spring-cloud-alibaba-sentinel-datasource:2.2.7.RELEASE"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/com/alibaba/cloud/spring-cloud-alibaba-sentinel-datasource/2.2.7.RELEASE/spring-cloud-alibaba-sentinel-datasource-2.2.7.RELEASE.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/com/alibaba/cloud/spring-cloud-alibaba-sentinel-datasource/2.2.7.RELEASE/spring-cloud-alibaba-sentinel-datasource-2.2.7.RELEASE-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/com/alibaba/cloud/spring-cloud-alibaba-sentinel-datasource/2.2.7.RELEASE/spring-cloud-alibaba-sentinel-datasource-2.2.7.RELEASE-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: com.alibaba.cloud:spring-cloud-alibaba-sentinel-gateway:2.2.7.RELEASE"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/com/alibaba/cloud/spring-cloud-alibaba-sentinel-gateway/2.2.7.RELEASE/spring-cloud-alibaba-sentinel-gateway-2.2.7.RELEASE.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/com/alibaba/cloud/spring-cloud-alibaba-sentinel-gateway/2.2.7.RELEASE/spring-cloud-alibaba-sentinel-gateway-2.2.7.RELEASE-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/com/alibaba/cloud/spring-cloud-alibaba-sentinel-gateway/2.2.7.RELEASE/spring-cloud-alibaba-sentinel-gateway-2.2.7.RELEASE-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: com.alibaba.cloud:spring-cloud-circuitbreaker-sentinel:2.2.7.RELEASE"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/com/alibaba/cloud/spring-cloud-circuitbreaker-sentinel/2.2.7.RELEASE/spring-cloud-circuitbreaker-sentinel-2.2.7.RELEASE.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/com/alibaba/cloud/spring-cloud-circuitbreaker-sentinel/2.2.7.RELEASE/spring-cloud-circuitbreaker-sentinel-2.2.7.RELEASE-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/com/alibaba/cloud/spring-cloud-circuitbreaker-sentinel/2.2.7.RELEASE/spring-cloud-circuitbreaker-sentinel-2.2.7.RELEASE-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: com.alibaba.cloud:spring-cloud-starter-alibaba-nacos-config:2.2.7.RELEASE"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/com/alibaba/cloud/spring-cloud-starter-alibaba-nacos-config/2.2.7.RELEASE/spring-cloud-starter-alibaba-nacos-config-2.2.7.RELEASE.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/com/alibaba/cloud/spring-cloud-starter-alibaba-nacos-config/2.2.7.RELEASE/spring-cloud-starter-alibaba-nacos-config-2.2.7.RELEASE-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/com/alibaba/cloud/spring-cloud-starter-alibaba-nacos-config/2.2.7.RELEASE/spring-cloud-starter-alibaba-nacos-config-2.2.7.RELEASE-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: com.alibaba.cloud:spring-cloud-starter-alibaba-nacos-discovery:2.2.7.RELEASE"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/com/alibaba/cloud/spring-cloud-starter-alibaba-nacos-discovery/2.2.7.RELEASE/spring-cloud-starter-alibaba-nacos-discovery-2.2.7.RELEASE.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/com/alibaba/cloud/spring-cloud-starter-alibaba-nacos-discovery/2.2.7.RELEASE/spring-cloud-starter-alibaba-nacos-discovery-2.2.7.RELEASE-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/com/alibaba/cloud/spring-cloud-starter-alibaba-nacos-discovery/2.2.7.RELEASE/spring-cloud-starter-alibaba-nacos-discovery-2.2.7.RELEASE-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: com.alibaba.cloud:spring-cloud-starter-alibaba-sentinel:2.2.7.RELEASE"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/com/alibaba/cloud/spring-cloud-starter-alibaba-sentinel/2.2.7.RELEASE/spring-cloud-starter-alibaba-sentinel-2.2.7.RELEASE.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/com/alibaba/cloud/spring-cloud-starter-alibaba-sentinel/2.2.7.RELEASE/spring-cloud-starter-alibaba-sentinel-2.2.7.RELEASE-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/com/alibaba/cloud/spring-cloud-starter-alibaba-sentinel/2.2.7.RELEASE/spring-cloud-starter-alibaba-sentinel-2.2.7.RELEASE-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: com.alibaba.csp:sentinel-annotation-aspectj:1.8.1"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/com/alibaba/csp/sentinel-annotation-aspectj/1.8.1/sentinel-annotation-aspectj-1.8.1.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/com/alibaba/csp/sentinel-annotation-aspectj/1.8.1/sentinel-annotation-aspectj-1.8.1-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/com/alibaba/csp/sentinel-annotation-aspectj/1.8.1/sentinel-annotation-aspectj-1.8.1-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: com.alibaba.csp:sentinel-api-gateway-adapter-common:1.8.1"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/com/alibaba/csp/sentinel-api-gateway-adapter-common/1.8.1/sentinel-api-gateway-adapter-common-1.8.1.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/com/alibaba/csp/sentinel-api-gateway-adapter-common/1.8.1/sentinel-api-gateway-adapter-common-1.8.1-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/com/alibaba/csp/sentinel-api-gateway-adapter-common/1.8.1/sentinel-api-gateway-adapter-common-1.8.1-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: com.alibaba.csp:sentinel-cluster-client-default:1.8.1"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/com/alibaba/csp/sentinel-cluster-client-default/1.8.1/sentinel-cluster-client-default-1.8.1.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/com/alibaba/csp/sentinel-cluster-client-default/1.8.1/sentinel-cluster-client-default-1.8.1-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/com/alibaba/csp/sentinel-cluster-client-default/1.8.1/sentinel-cluster-client-default-1.8.1-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: com.alibaba.csp:sentinel-cluster-common-default:1.8.1"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/com/alibaba/csp/sentinel-cluster-common-default/1.8.1/sentinel-cluster-common-default-1.8.1.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/com/alibaba/csp/sentinel-cluster-common-default/1.8.1/sentinel-cluster-common-default-1.8.1-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/com/alibaba/csp/sentinel-cluster-common-default/1.8.1/sentinel-cluster-common-default-1.8.1-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: com.alibaba.csp:sentinel-cluster-server-default:1.8.1"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/com/alibaba/csp/sentinel-cluster-server-default/1.8.1/sentinel-cluster-server-default-1.8.1.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/com/alibaba/csp/sentinel-cluster-server-default/1.8.1/sentinel-cluster-server-default-1.8.1-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/com/alibaba/csp/sentinel-cluster-server-default/1.8.1/sentinel-cluster-server-default-1.8.1-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: com.alibaba.csp:sentinel-core:1.8.1"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/com/alibaba/csp/sentinel-core/1.8.1/sentinel-core-1.8.1.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/com/alibaba/csp/sentinel-core/1.8.1/sentinel-core-1.8.1-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/com/alibaba/csp/sentinel-core/1.8.1/sentinel-core-1.8.1-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: com.alibaba.csp:sentinel-datasource-extension:1.8.1"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/com/alibaba/csp/sentinel-datasource-extension/1.8.1/sentinel-datasource-extension-1.8.1.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/com/alibaba/csp/sentinel-datasource-extension/1.8.1/sentinel-datasource-extension-1.8.1-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/com/alibaba/csp/sentinel-datasource-extension/1.8.1/sentinel-datasource-extension-1.8.1-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: com.alibaba.csp:sentinel-datasource-nacos:1.8.1"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/com/alibaba/csp/sentinel-datasource-nacos/1.8.1/sentinel-datasource-nacos-1.8.1.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/com/alibaba/csp/sentinel-datasource-nacos/1.8.1/sentinel-datasource-nacos-1.8.1-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/com/alibaba/csp/sentinel-datasource-nacos/1.8.1/sentinel-datasource-nacos-1.8.1-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: com.alibaba.csp:sentinel-parameter-flow-control:1.8.1"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/com/alibaba/csp/sentinel-parameter-flow-control/1.8.1/sentinel-parameter-flow-control-1.8.1.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/com/alibaba/csp/sentinel-parameter-flow-control/1.8.1/sentinel-parameter-flow-control-1.8.1-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/com/alibaba/csp/sentinel-parameter-flow-control/1.8.1/sentinel-parameter-flow-control-1.8.1-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: com.alibaba.csp:sentinel-reactor-adapter:1.8.1"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/com/alibaba/csp/sentinel-reactor-adapter/1.8.1/sentinel-reactor-adapter-1.8.1.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/com/alibaba/csp/sentinel-reactor-adapter/1.8.1/sentinel-reactor-adapter-1.8.1-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/com/alibaba/csp/sentinel-reactor-adapter/1.8.1/sentinel-reactor-adapter-1.8.1-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: com.alibaba.csp:sentinel-spring-cloud-gateway-adapter:1.8.1"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/com/alibaba/csp/sentinel-spring-cloud-gateway-adapter/1.8.1/sentinel-spring-cloud-gateway-adapter-1.8.1.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/com/alibaba/csp/sentinel-spring-cloud-gateway-adapter/1.8.1/sentinel-spring-cloud-gateway-adapter-1.8.1-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/com/alibaba/csp/sentinel-spring-cloud-gateway-adapter/1.8.1/sentinel-spring-cloud-gateway-adapter-1.8.1-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: com.alibaba.csp:sentinel-spring-webflux-adapter:1.8.1"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/com/alibaba/csp/sentinel-spring-webflux-adapter/1.8.1/sentinel-spring-webflux-adapter-1.8.1.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/com/alibaba/csp/sentinel-spring-webflux-adapter/1.8.1/sentinel-spring-webflux-adapter-1.8.1-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/com/alibaba/csp/sentinel-spring-webflux-adapter/1.8.1/sentinel-spring-webflux-adapter-1.8.1-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: com.alibaba.csp:sentinel-spring-webmvc-adapter:1.8.1"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/com/alibaba/csp/sentinel-spring-webmvc-adapter/1.8.1/sentinel-spring-webmvc-adapter-1.8.1.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/com/alibaba/csp/sentinel-spring-webmvc-adapter/1.8.1/sentinel-spring-webmvc-adapter-1.8.1-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/com/alibaba/csp/sentinel-spring-webmvc-adapter/1.8.1/sentinel-spring-webmvc-adapter-1.8.1-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: com.alibaba.csp:sentinel-transport-common:1.8.1"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/com/alibaba/csp/sentinel-transport-common/1.8.1/sentinel-transport-common-1.8.1.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/com/alibaba/csp/sentinel-transport-common/1.8.1/sentinel-transport-common-1.8.1-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/com/alibaba/csp/sentinel-transport-common/1.8.1/sentinel-transport-common-1.8.1-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: com.alibaba.csp:sentinel-transport-simple-http:1.8.1"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/com/alibaba/csp/sentinel-transport-simple-http/1.8.1/sentinel-transport-simple-http-1.8.1.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/com/alibaba/csp/sentinel-transport-simple-http/1.8.1/sentinel-transport-simple-http-1.8.1-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/com/alibaba/csp/sentinel-transport-simple-http/1.8.1/sentinel-transport-simple-http-1.8.1-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: com.alibaba.csp:sentinel-zuul-adapter:1.8.1"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/com/alibaba/csp/sentinel-zuul-adapter/1.8.1/sentinel-zuul-adapter-1.8.1.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/com/alibaba/csp/sentinel-zuul-adapter/1.8.1/sentinel-zuul-adapter-1.8.1-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/com/alibaba/csp/sentinel-zuul-adapter/1.8.1/sentinel-zuul-adapter-1.8.1-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: com.alibaba.nacos:nacos-client:2.0.3"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/com/alibaba/nacos/nacos-client/2.0.3/nacos-client-2.0.3.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/com/alibaba/nacos/nacos-client/2.0.3/nacos-client-2.0.3-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/com/alibaba/nacos/nacos-client/2.0.3/nacos-client-2.0.3-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: com.alibaba.spring:spring-context-support:1.0.10"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/com/alibaba/spring/spring-context-support/1.0.10/spring-context-support-1.0.10.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/com/alibaba/spring/spring-context-support/1.0.10/spring-context-support-1.0.10-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/com/alibaba/spring/spring-context-support/1.0.10/spring-context-support-1.0.10-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: com.alibaba:druid-spring-boot-starter:1.2.5"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/com/alibaba/druid-spring-boot-starter/1.2.5/druid-spring-boot-starter-1.2.5.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/com/alibaba/druid-spring-boot-starter/1.2.5/druid-spring-boot-starter-1.2.5-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/com/alibaba/druid-spring-boot-starter/1.2.5/druid-spring-boot-starter-1.2.5-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: com.alibaba:druid:1.2.5"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/com/alibaba/druid/1.2.5/druid-1.2.5.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/com/alibaba/druid/1.2.5/druid-1.2.5-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/com/alibaba/druid/1.2.5/druid-1.2.5-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: com.alibaba:fastjson:1.2.75"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/com/alibaba/fastjson/1.2.75/fastjson-1.2.75.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/com/alibaba/fastjson/1.2.75/fastjson-1.2.75-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/com/alibaba/fastjson/1.2.75/fastjson-1.2.75-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: com.baomidou:mybatis-plus-annotation:3.4.2"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/com/baomidou/mybatis-plus-annotation/3.4.2/mybatis-plus-annotation-3.4.2.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/com/baomidou/mybatis-plus-annotation/3.4.2/mybatis-plus-annotation-3.4.2-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/com/baomidou/mybatis-plus-annotation/3.4.2/mybatis-plus-annotation-3.4.2-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: com.baomidou:mybatis-plus-boot-starter:3.4.2"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/com/baomidou/mybatis-plus-boot-starter/3.4.2/mybatis-plus-boot-starter-3.4.2.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/com/baomidou/mybatis-plus-boot-starter/3.4.2/mybatis-plus-boot-starter-3.4.2-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/com/baomidou/mybatis-plus-boot-starter/3.4.2/mybatis-plus-boot-starter-3.4.2-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: com.baomidou:mybatis-plus-core:3.4.2"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/com/baomidou/mybatis-plus-core/3.4.2/mybatis-plus-core-3.4.2.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/com/baomidou/mybatis-plus-core/3.4.2/mybatis-plus-core-3.4.2-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/com/baomidou/mybatis-plus-core/3.4.2/mybatis-plus-core-3.4.2-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: com.baomidou:mybatis-plus-extension:3.4.2"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/com/baomidou/mybatis-plus-extension/3.4.2/mybatis-plus-extension-3.4.2.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/com/baomidou/mybatis-plus-extension/3.4.2/mybatis-plus-extension-3.4.2-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/com/baomidou/mybatis-plus-extension/3.4.2/mybatis-plus-extension-3.4.2-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: com.baomidou:mybatis-plus-generator:3.5.1"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/com/baomidou/mybatis-plus-generator/3.5.1/mybatis-plus-generator-3.5.1.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/com/baomidou/mybatis-plus-generator/3.5.1/mybatis-plus-generator-3.5.1-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/com/baomidou/mybatis-plus-generator/3.5.1/mybatis-plus-generator-3.5.1-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: com.baomidou:mybatis-plus:3.4.2"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/com/baomidou/mybatis-plus/3.4.2/mybatis-plus-3.4.2.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/com/baomidou/mybatis-plus/3.4.2/mybatis-plus-3.4.2-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/com/baomidou/mybatis-plus/3.4.2/mybatis-plus-3.4.2-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.12.4"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/com/fasterxml/jackson/core/jackson-annotations/2.12.4/jackson-annotations-2.12.4.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/com/fasterxml/jackson/core/jackson-annotations/2.12.4/jackson-annotations-2.12.4-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/com/fasterxml/jackson/core/jackson-annotations/2.12.4/jackson-annotations-2.12.4-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: com.fasterxml.jackson.core:jackson-core:2.12.4"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/com/fasterxml/jackson/core/jackson-core/2.12.4/jackson-core-2.12.4.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/com/fasterxml/jackson/core/jackson-core/2.12.4/jackson-core-2.12.4-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/com/fasterxml/jackson/core/jackson-core/2.12.4/jackson-core-2.12.4-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: com.fasterxml.jackson.core:jackson-databind:2.12.4"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/com/fasterxml/jackson/core/jackson-databind/2.12.4/jackson-databind-2.12.4.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/com/fasterxml/jackson/core/jackson-databind/2.12.4/jackson-databind-2.12.4-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/com/fasterxml/jackson/core/jackson-databind/2.12.4/jackson-databind-2.12.4-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.11.4"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/com/fasterxml/jackson/dataformat/jackson-dataformat-yaml/2.11.4/jackson-dataformat-yaml-2.11.4.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/com/fasterxml/jackson/dataformat/jackson-dataformat-yaml/2.11.4/jackson-dataformat-yaml-2.11.4-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/com/fasterxml/jackson/dataformat/jackson-dataformat-yaml/2.11.4/jackson-dataformat-yaml-2.11.4-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.11.4"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/com/fasterxml/jackson/datatype/jackson-datatype-jdk8/2.11.4/jackson-datatype-jdk8-2.11.4.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/com/fasterxml/jackson/datatype/jackson-datatype-jdk8/2.11.4/jackson-datatype-jdk8-2.11.4-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/com/fasterxml/jackson/datatype/jackson-datatype-jdk8/2.11.4/jackson-datatype-jdk8-2.11.4-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.11.4"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/com/fasterxml/jackson/datatype/jackson-datatype-jsr310/2.11.4/jackson-datatype-jsr310-2.11.4.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/com/fasterxml/jackson/datatype/jackson-datatype-jsr310/2.11.4/jackson-datatype-jsr310-2.11.4-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/com/fasterxml/jackson/datatype/jackson-datatype-jsr310/2.11.4/jackson-datatype-jsr310-2.11.4-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: com.fasterxml.jackson.module:jackson-module-parameter-names:2.11.4"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/com/fasterxml/jackson/module/jackson-module-parameter-names/2.11.4/jackson-module-parameter-names-2.11.4.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/com/fasterxml/jackson/module/jackson-module-parameter-names/2.11.4/jackson-module-parameter-names-2.11.4-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/com/fasterxml/jackson/module/jackson-module-parameter-names/2.11.4/jackson-module-parameter-names-2.11.4-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: com.fasterxml:classmate:1.5.1"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/com/fasterxml/classmate/1.5.1/classmate-1.5.1.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/com/fasterxml/classmate/1.5.1/classmate-1.5.1-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/com/fasterxml/classmate/1.5.1/classmate-1.5.1-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: com.github.abel533:ECharts:3.0.0.6"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/com/github/abel533/ECharts/3.0.0.6/ECharts-3.0.0.6.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/com/github/abel533/ECharts/3.0.0.6/ECharts-3.0.0.6-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/com/github/abel533/ECharts/3.0.0.6/ECharts-3.0.0.6-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: com.github.jsqlparser:jsqlparser:4.0"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/com/github/jsqlparser/jsqlparser/4.0/jsqlparser-4.0.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/com/github/jsqlparser/jsqlparser/4.0/jsqlparser-4.0-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/com/github/jsqlparser/jsqlparser/4.0/jsqlparser-4.0-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: com.github.penggle:kaptcha:2.3.2"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/com/github/penggle/kaptcha/2.3.2/kaptcha-2.3.2.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/com/github/penggle/kaptcha/2.3.2/kaptcha-2.3.2-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/com/github/penggle/kaptcha/2.3.2/kaptcha-2.3.2-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: com.github.stephenc.jcip:jcip-annotations:1.0-1"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/com/github/stephenc/jcip/jcip-annotations/1.0-1/jcip-annotations-1.0-1.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/com/github/stephenc/jcip/jcip-annotations/1.0-1/jcip-annotations-1.0-1-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/com/github/stephenc/jcip/jcip-annotations/1.0-1/jcip-annotations-1.0-1-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: com.github.tocrhz:mqtt-spring-boot-starter:1.2.7"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/com/github/tocrhz/mqtt-spring-boot-starter/1.2.7/mqtt-spring-boot-starter-1.2.7.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/com/github/tocrhz/mqtt-spring-boot-starter/1.2.7/mqtt-spring-boot-starter-1.2.7-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/com/github/tocrhz/mqtt-spring-boot-starter/1.2.7/mqtt-spring-boot-starter-1.2.7-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: com.github.virtuald:curvesapi:1.06"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/com/github/virtuald/curvesapi/1.06/curvesapi-1.06.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/com/github/virtuald/curvesapi/1.06/curvesapi-1.06-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/com/github/virtuald/curvesapi/1.06/curvesapi-1.06-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: com.github.xiaoymin:knife4j-annotations:3.0.2"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/com/github/xiaoymin/knife4j-annotations/3.0.2/knife4j-annotations-3.0.2.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/com/github/xiaoymin/knife4j-annotations/3.0.2/knife4j-annotations-3.0.2-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/com/github/xiaoymin/knife4j-annotations/3.0.2/knife4j-annotations-3.0.2-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: com.github.xiaoymin:knife4j-core:3.0.2"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/com/github/xiaoymin/knife4j-core/3.0.2/knife4j-core-3.0.2.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/com/github/xiaoymin/knife4j-core/3.0.2/knife4j-core-3.0.2-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/com/github/xiaoymin/knife4j-core/3.0.2/knife4j-core-3.0.2-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: com.github.xiaoymin:knife4j-spring-boot-autoconfigure:3.0.2"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/com/github/xiaoymin/knife4j-spring-boot-autoconfigure/3.0.2/knife4j-spring-boot-autoconfigure-3.0.2.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/com/github/xiaoymin/knife4j-spring-boot-autoconfigure/3.0.2/knife4j-spring-boot-autoconfigure-3.0.2-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/com/github/xiaoymin/knife4j-spring-boot-autoconfigure/3.0.2/knife4j-spring-boot-autoconfigure-3.0.2-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: com.github.xiaoymin:knife4j-spring-boot-starter:3.0.2"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/com/github/xiaoymin/knife4j-spring-boot-starter/3.0.2/knife4j-spring-boot-starter-3.0.2.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/com/github/xiaoymin/knife4j-spring-boot-starter/3.0.2/knife4j-spring-boot-starter-3.0.2-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/com/github/xiaoymin/knife4j-spring-boot-starter/3.0.2/knife4j-spring-boot-starter-3.0.2-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: com.github.xiaoymin:knife4j-spring-ui:3.0.2"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/com/github/xiaoymin/knife4j-spring-ui/3.0.2/knife4j-spring-ui-3.0.2.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/com/github/xiaoymin/knife4j-spring-ui/3.0.2/knife4j-spring-ui-3.0.2-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/com/github/xiaoymin/knife4j-spring-ui/3.0.2/knife4j-spring-ui-3.0.2-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: com.github.xiaoymin:knife4j-spring:3.0.2"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/com/github/xiaoymin/knife4j-spring/3.0.2/knife4j-spring-3.0.2.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/com/github/xiaoymin/knife4j-spring/3.0.2/knife4j-spring-3.0.2-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/com/github/xiaoymin/knife4j-spring/3.0.2/knife4j-spring-3.0.2-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: com.google.code.findbugs:jsr305:3.0.1"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/com/google/code/findbugs/jsr305/3.0.1/jsr305-3.0.1.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/com/google/code/findbugs/jsr305/3.0.1/jsr305-3.0.1-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/com/google/code/findbugs/jsr305/3.0.1/jsr305-3.0.1-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: com.google.code.findbugs:jsr305:3.0.2"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/com/google/code/findbugs/jsr305/3.0.2/jsr305-3.0.2.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/com/google/code/findbugs/jsr305/3.0.2/jsr305-3.0.2-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/com/google/code/findbugs/jsr305/3.0.2/jsr305-3.0.2-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: com.google.code.gson:gson:2.8.9"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/com/google/code/gson/gson/2.8.9/gson-2.8.9.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/com/google/code/gson/gson/2.8.9/gson-2.8.9-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/com/google/code/gson/gson/2.8.9/gson-2.8.9-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: com.google.errorprone:error_prone_annotations:2.3.4"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/com/google/errorprone/error_prone_annotations/2.3.4/error_prone_annotations-2.3.4.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/com/google/errorprone/error_prone_annotations/2.3.4/error_prone_annotations-2.3.4-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/com/google/errorprone/error_prone_annotations/2.3.4/error_prone_annotations-2.3.4-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: com.google.guava:failureaccess:1.0.1"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/com/google/guava/failureaccess/1.0.1/failureaccess-1.0.1.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/com/google/guava/failureaccess/1.0.1/failureaccess-1.0.1-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/com/google/guava/failureaccess/1.0.1/failureaccess-1.0.1-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: com.google.guava:guava:30.0-jre"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/com/google/guava/guava/30.0-jre/guava-30.0-jre.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/com/google/guava/guava/30.0-jre/guava-30.0-jre-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/com/google/guava/guava/30.0-jre/guava-30.0-jre-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/com/google/guava/listenablefuture/9999.0-empty-to-avoid-conflict-with-guava/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/com/google/guava/listenablefuture/9999.0-empty-to-avoid-conflict-with-guava/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/com/google/guava/listenablefuture/9999.0-empty-to-avoid-conflict-with-guava/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: com.google.j2objc:j2objc-annotations:1.3"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/com/google/j2objc/j2objc-annotations/1.3/j2objc-annotations-1.3.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/com/google/j2objc/j2objc-annotations/1.3/j2objc-annotations-1.3-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/com/google/j2objc/j2objc-annotations/1.3/j2objc-annotations-1.3-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: com.google.protobuf:protobuf-java:3.14.0"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/com/google/protobuf/protobuf-java/3.14.0/protobuf-java-3.14.0.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/com/google/protobuf/protobuf-java/3.14.0/protobuf-java-3.14.0-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/com/google/protobuf/protobuf-java/3.14.0/protobuf-java-3.14.0-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: com.googlecode.concurrentlinkedhashmap:concurrentlinkedhashmap-lru:1.4.2"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/com/googlecode/concurrentlinkedhashmap/concurrentlinkedhashmap-lru/1.4.2/concurrentlinkedhashmap-lru-1.4.2.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/com/googlecode/concurrentlinkedhashmap/concurrentlinkedhashmap-lru/1.4.2/concurrentlinkedhashmap-lru-1.4.2-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/com/googlecode/concurrentlinkedhashmap/concurrentlinkedhashmap-lru/1.4.2/concurrentlinkedhashmap-lru-1.4.2-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: com.jayway.jsonpath:json-path:2.4.0"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/com/jayway/jsonpath/json-path/2.4.0/json-path-2.4.0.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/com/jayway/jsonpath/json-path/2.4.0/json-path-2.4.0-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/com/jayway/jsonpath/json-path/2.4.0/json-path-2.4.0-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: com.jhlabs:filters:2.0.235-1"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/com/jhlabs/filters/2.0.235-1/filters-2.0.235-1.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/com/jhlabs/filters/2.0.235-1/filters-2.0.235-1-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/com/jhlabs/filters/2.0.235-1/filters-2.0.235-1-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: com.netflix.archaius:archaius-core:0.7.7"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/com/netflix/archaius/archaius-core/0.7.7/archaius-core-0.7.7.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/com/netflix/archaius/archaius-core/0.7.7/archaius-core-0.7.7-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/com/netflix/archaius/archaius-core/0.7.7/archaius-core-0.7.7-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: com.netflix.hystrix:hystrix-core:1.5.18"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/com/netflix/hystrix/hystrix-core/1.5.18/hystrix-core-1.5.18.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/com/netflix/hystrix/hystrix-core/1.5.18/hystrix-core-1.5.18-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/com/netflix/hystrix/hystrix-core/1.5.18/hystrix-core-1.5.18-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: com.netflix.netflix-commons:netflix-commons-util:0.3.0"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/com/netflix/netflix-commons/netflix-commons-util/0.3.0/netflix-commons-util-0.3.0.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/com/netflix/netflix-commons/netflix-commons-util/0.3.0/netflix-commons-util-0.3.0-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/com/netflix/netflix-commons/netflix-commons-util/0.3.0/netflix-commons-util-0.3.0-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: com.netflix.netflix-commons:netflix-statistics:0.1.1"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/com/netflix/netflix-commons/netflix-statistics/0.1.1/netflix-statistics-0.1.1.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/com/netflix/netflix-commons/netflix-statistics/0.1.1/netflix-statistics-0.1.1-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/com/netflix/netflix-commons/netflix-statistics/0.1.1/netflix-statistics-0.1.1-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: com.netflix.ribbon:ribbon-core:2.3.0"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/com/netflix/ribbon/ribbon-core/2.3.0/ribbon-core-2.3.0.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/com/netflix/ribbon/ribbon-core/2.3.0/ribbon-core-2.3.0-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/com/netflix/ribbon/ribbon-core/2.3.0/ribbon-core-2.3.0-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: com.netflix.ribbon:ribbon-httpclient:2.3.0"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/com/netflix/ribbon/ribbon-httpclient/2.3.0/ribbon-httpclient-2.3.0.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/com/netflix/ribbon/ribbon-httpclient/2.3.0/ribbon-httpclient-2.3.0-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/com/netflix/ribbon/ribbon-httpclient/2.3.0/ribbon-httpclient-2.3.0-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: com.netflix.ribbon:ribbon-loadbalancer:2.3.0"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/com/netflix/ribbon/ribbon-loadbalancer/2.3.0/ribbon-loadbalancer-2.3.0.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/com/netflix/ribbon/ribbon-loadbalancer/2.3.0/ribbon-loadbalancer-2.3.0-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/com/netflix/ribbon/ribbon-loadbalancer/2.3.0/ribbon-loadbalancer-2.3.0-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: com.netflix.ribbon:ribbon-transport:2.3.0"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/com/netflix/ribbon/ribbon-transport/2.3.0/ribbon-transport-2.3.0.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/com/netflix/ribbon/ribbon-transport/2.3.0/ribbon-transport-2.3.0-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/com/netflix/ribbon/ribbon-transport/2.3.0/ribbon-transport-2.3.0-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: com.netflix.ribbon:ribbon:2.3.0"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/com/netflix/ribbon/ribbon/2.3.0/ribbon-2.3.0.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/com/netflix/ribbon/ribbon/2.3.0/ribbon-2.3.0-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/com/netflix/ribbon/ribbon/2.3.0/ribbon-2.3.0-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: com.netflix.servo:servo-core:0.12.21"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/com/netflix/servo/servo-core/0.12.21/servo-core-0.12.21.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/com/netflix/servo/servo-core/0.12.21/servo-core-0.12.21-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/com/netflix/servo/servo-core/0.12.21/servo-core-0.12.21-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: com.nimbusds:nimbus-jose-jwt:8.19"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/com/nimbusds/nimbus-jose-jwt/8.19/nimbus-jose-jwt-8.19.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/com/nimbusds/nimbus-jose-jwt/8.19/nimbus-jose-jwt-8.19-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/com/nimbusds/nimbus-jose-jwt/8.19/nimbus-jose-jwt-8.19-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: com.squareup.moshi:moshi:1.8.0"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/com/squareup/moshi/moshi/1.8.0/moshi-1.8.0.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/com/squareup/moshi/moshi/1.8.0/moshi-1.8.0-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/com/squareup/moshi/moshi/1.8.0/moshi-1.8.0-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: com.squareup.okhttp3:logging-interceptor:3.14.9"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/com/squareup/okhttp3/logging-interceptor/3.14.9/logging-interceptor-3.14.9.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/com/squareup/okhttp3/logging-interceptor/3.14.9/logging-interceptor-3.14.9-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/com/squareup/okhttp3/logging-interceptor/3.14.9/logging-interceptor-3.14.9-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: com.squareup.okhttp3:okhttp:3.14.9"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/com/squareup/okhttp3/okhttp/3.14.9/okhttp-3.14.9.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/com/squareup/okhttp3/okhttp/3.14.9/okhttp-3.14.9-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/com/squareup/okhttp3/okhttp/3.14.9/okhttp-3.14.9-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: com.squareup.okio:okio:1.17.2"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/com/squareup/okio/okio/1.17.2/okio-1.17.2.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/com/squareup/okio/okio/1.17.2/okio-1.17.2-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/com/squareup/okio/okio/1.17.2/okio-1.17.2-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: com.squareup.retrofit2:converter-moshi:2.8.1"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/com/squareup/retrofit2/converter-moshi/2.8.1/converter-moshi-2.8.1.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/com/squareup/retrofit2/converter-moshi/2.8.1/converter-moshi-2.8.1-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/com/squareup/retrofit2/converter-moshi/2.8.1/converter-moshi-2.8.1-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: com.squareup.retrofit2:retrofit:2.8.1"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/com/squareup/retrofit2/retrofit/2.8.1/retrofit-2.8.1.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/com/squareup/retrofit2/retrofit/2.8.1/retrofit-2.8.1-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/com/squareup/retrofit2/retrofit/2.8.1/retrofit-2.8.1-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: com.sun.activation:jakarta.activation:1.2.2"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/com/sun/activation/jakarta.activation/1.2.2/jakarta.activation-1.2.2.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/com/sun/activation/jakarta.activation/1.2.2/jakarta.activation-1.2.2-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/com/sun/activation/jakarta.activation/1.2.2/jakarta.activation-1.2.2-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: com.sun.jersey.contribs:jersey-apache-client4:1.19.1"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/com/sun/jersey/contribs/jersey-apache-client4/1.19.1/jersey-apache-client4-1.19.1.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/com/sun/jersey/contribs/jersey-apache-client4/1.19.1/jersey-apache-client4-1.19.1-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/com/sun/jersey/contribs/jersey-apache-client4/1.19.1/jersey-apache-client4-1.19.1-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: com.sun.jersey:jersey-client:1.19.1"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/com/sun/jersey/jersey-client/1.19.1/jersey-client-1.19.1.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/com/sun/jersey/jersey-client/1.19.1/jersey-client-1.19.1-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/com/sun/jersey/jersey-client/1.19.1/jersey-client-1.19.1-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: com.sun.jersey:jersey-core:1.19.1"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/com/sun/jersey/jersey-core/1.19.1/jersey-core-1.19.1.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/com/sun/jersey/jersey-core/1.19.1/jersey-core-1.19.1-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/com/sun/jersey/jersey-core/1.19.1/jersey-core-1.19.1-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: com.sun.jna:jna:3.0.9"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/com/sun/jna/jna/3.0.9/jna-3.0.9.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/com/sun/jna/jna/3.0.9/jna-3.0.9-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/com/sun/jna/jna/3.0.9/jna-3.0.9-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: com.sun.mail:jakarta.mail:1.6.7"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/com/sun/mail/jakarta.mail/1.6.7/jakarta.mail-1.6.7.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/com/sun/mail/jakarta.mail/1.6.7/jakarta.mail-1.6.7-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/com/sun/mail/jakarta.mail/1.6.7/jakarta.mail-1.6.7-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: com.sun.xml.bind:jaxb-core:2.3.0.1"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/com/sun/xml/bind/jaxb-core/2.3.0.1/jaxb-core-2.3.0.1.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/com/sun/xml/bind/jaxb-core/2.3.0.1/jaxb-core-2.3.0.1-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/com/sun/xml/bind/jaxb-core/2.3.0.1/jaxb-core-2.3.0.1-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: com.sun.xml.bind:jaxb-impl:2.3.0.1"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/com/sun/xml/bind/jaxb-impl/2.3.0.1/jaxb-impl-2.3.0.1.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/com/sun/xml/bind/jaxb-impl/2.3.0.1/jaxb-impl-2.3.0.1-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/com/sun/xml/bind/jaxb-impl/2.3.0.1/jaxb-impl-2.3.0.1-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: com.vaadin.external.google:android-json:0.0.20131108.vaadin1"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/com/vaadin/external/google/android-json/0.0.20131108.vaadin1/android-json-0.0.20131108.vaadin1.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/com/vaadin/external/google/android-json/0.0.20131108.vaadin1/android-json-0.0.20131108.vaadin1-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/com/vaadin/external/google/android-json/0.0.20131108.vaadin1/android-json-0.0.20131108.vaadin1-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: com.xuxueli:xxl-job-core:2.3.0"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/com/xuxueli/xxl-job-core/2.3.0/xxl-job-core-2.3.0.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/com/xuxueli/xxl-job-core/2.3.0/xxl-job-core-2.3.0-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/com/xuxueli/xxl-job-core/2.3.0/xxl-job-core-2.3.0-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: commons-beanutils:commons-beanutils:1.8.0"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/commons-beanutils/commons-beanutils/1.8.0/commons-beanutils-1.8.0.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/commons-beanutils/commons-beanutils/1.8.0/commons-beanutils-1.8.0-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/commons-beanutils/commons-beanutils/1.8.0/commons-beanutils-1.8.0-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: commons-codec:commons-codec:1.15"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/commons-codec/commons-codec/1.15/commons-codec-1.15.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/commons-codec/commons-codec/1.15/commons-codec-1.15-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/commons-codec/commons-codec/1.15/commons-codec-1.15-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: commons-collections:commons-collections:3.2.1"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/commons-collections/commons-collections/3.2.1/commons-collections-3.2.1.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/commons-collections/commons-collections/3.2.1/commons-collections-3.2.1-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/commons-collections/commons-collections/3.2.1/commons-collections-3.2.1-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: commons-collections:commons-collections:3.2.2"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/commons-collections/commons-collections/3.2.2/commons-collections-3.2.2.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/commons-collections/commons-collections/3.2.2/commons-collections-3.2.2-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/commons-collections/commons-collections/3.2.2/commons-collections-3.2.2-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: commons-configuration:commons-configuration:1.8"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/commons-configuration/commons-configuration/1.8/commons-configuration-1.8.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/commons-configuration/commons-configuration/1.8/commons-configuration-1.8-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/commons-configuration/commons-configuration/1.8/commons-configuration-1.8-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: commons-fileupload:commons-fileupload:1.4"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/commons-fileupload/commons-fileupload/1.4/commons-fileupload-1.4.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/commons-fileupload/commons-fileupload/1.4/commons-fileupload-1.4-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/commons-fileupload/commons-fileupload/1.4/commons-fileupload-1.4-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: commons-io:commons-io:2.8.0"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/commons-io/commons-io/2.8.0/commons-io-2.8.0.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/commons-io/commons-io/2.8.0/commons-io-2.8.0-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/commons-io/commons-io/2.8.0/commons-io-2.8.0-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: commons-lang:commons-lang:2.5"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/commons-lang/commons-lang/2.5/commons-lang-2.5.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/commons-lang/commons-lang/2.5/commons-lang-2.5-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/commons-lang/commons-lang/2.5/commons-lang-2.5-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: commons-lang:commons-lang:2.6"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/commons-lang/commons-lang/2.6/commons-lang-2.6.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/commons-lang/commons-lang/2.6/commons-lang-2.6-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/commons-lang/commons-lang/2.6/commons-lang-2.6-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: commons-logging:commons-logging:1.1.1"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: io.github.classgraph:classgraph:4.8.83"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/io/github/classgraph/classgraph/4.8.83/classgraph-4.8.83.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/io/github/classgraph/classgraph/4.8.83/classgraph-4.8.83-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/io/github/classgraph/classgraph/4.8.83/classgraph-4.8.83-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: io.github.openfeign.form:feign-form-spring:3.8.0"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/io/github/openfeign/form/feign-form-spring/3.8.0/feign-form-spring-3.8.0.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/io/github/openfeign/form/feign-form-spring/3.8.0/feign-form-spring-3.8.0-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/io/github/openfeign/form/feign-form-spring/3.8.0/feign-form-spring-3.8.0-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: io.github.openfeign.form:feign-form:3.8.0"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/io/github/openfeign/form/feign-form/3.8.0/feign-form-3.8.0.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/io/github/openfeign/form/feign-form/3.8.0/feign-form-3.8.0-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/io/github/openfeign/form/feign-form/3.8.0/feign-form-3.8.0-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: io.github.openfeign:feign-core:10.12"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/io/github/openfeign/feign-core/10.12/feign-core-10.12.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/io/github/openfeign/feign-core/10.12/feign-core-10.12-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/io/github/openfeign/feign-core/10.12/feign-core-10.12-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: io.github.openfeign:feign-hystrix:10.12"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/io/github/openfeign/feign-hystrix/10.12/feign-hystrix-10.12.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/io/github/openfeign/feign-hystrix/10.12/feign-hystrix-10.12-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/io/github/openfeign/feign-hystrix/10.12/feign-hystrix-10.12-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: io.github.openfeign:feign-okhttp:11.2"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/io/github/openfeign/feign-okhttp/11.2/feign-okhttp-11.2.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/io/github/openfeign/feign-okhttp/11.2/feign-okhttp-11.2-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/io/github/openfeign/feign-okhttp/11.2/feign-okhttp-11.2-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: io.github.openfeign:feign-slf4j:10.12"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/io/github/openfeign/feign-slf4j/10.12/feign-slf4j-10.12.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/io/github/openfeign/feign-slf4j/10.12/feign-slf4j-10.12-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/io/github/openfeign/feign-slf4j/10.12/feign-slf4j-10.12-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: io.lettuce:lettuce-core:5.3.7.RELEASE"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/io/lettuce/lettuce-core/5.3.7.RELEASE/lettuce-core-5.3.7.RELEASE.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/io/lettuce/lettuce-core/5.3.7.RELEASE/lettuce-core-5.3.7.RELEASE-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/io/lettuce/lettuce-core/5.3.7.RELEASE/lettuce-core-5.3.7.RELEASE-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: io.micrometer:micrometer-core:1.5.14"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/io/micrometer/micrometer-core/1.5.14/micrometer-core-1.5.14.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/io/micrometer/micrometer-core/1.5.14/micrometer-core-1.5.14-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/io/micrometer/micrometer-core/1.5.14/micrometer-core-1.5.14-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: io.netty:netty-all:4.1.65.Final"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/io/netty/netty-all/4.1.65.Final/netty-all-4.1.65.Final.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/io/netty/netty-all/4.1.65.Final/netty-all-4.1.65.Final-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/io/netty/netty-all/4.1.65.Final/netty-all-4.1.65.Final-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: io.netty:netty-buffer:4.1.65.Final"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/io/netty/netty-buffer/4.1.65.Final/netty-buffer-4.1.65.Final.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/io/netty/netty-buffer/4.1.65.Final/netty-buffer-4.1.65.Final-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/io/netty/netty-buffer/4.1.65.Final/netty-buffer-4.1.65.Final-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: io.netty:netty-codec-http2:4.1.65.Final"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/io/netty/netty-codec-http2/4.1.65.Final/netty-codec-http2-4.1.65.Final.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/io/netty/netty-codec-http2/4.1.65.Final/netty-codec-http2-4.1.65.Final-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/io/netty/netty-codec-http2/4.1.65.Final/netty-codec-http2-4.1.65.Final-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: io.netty:netty-codec-http:4.1.65.Final"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/io/netty/netty-codec-http/4.1.65.Final/netty-codec-http-4.1.65.Final.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/io/netty/netty-codec-http/4.1.65.Final/netty-codec-http-4.1.65.Final-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/io/netty/netty-codec-http/4.1.65.Final/netty-codec-http-4.1.65.Final-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: io.netty:netty-codec-socks:4.1.65.Final"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/io/netty/netty-codec-socks/4.1.65.Final/netty-codec-socks-4.1.65.Final.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/io/netty/netty-codec-socks/4.1.65.Final/netty-codec-socks-4.1.65.Final-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/io/netty/netty-codec-socks/4.1.65.Final/netty-codec-socks-4.1.65.Final-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: io.netty:netty-codec:4.1.65.Final"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/io/netty/netty-codec/4.1.65.Final/netty-codec-4.1.65.Final.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/io/netty/netty-codec/4.1.65.Final/netty-codec-4.1.65.Final-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/io/netty/netty-codec/4.1.65.Final/netty-codec-4.1.65.Final-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: io.netty:netty-common:4.1.65.Final"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/io/netty/netty-common/4.1.65.Final/netty-common-4.1.65.Final.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/io/netty/netty-common/4.1.65.Final/netty-common-4.1.65.Final-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/io/netty/netty-common/4.1.65.Final/netty-common-4.1.65.Final-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: io.netty:netty-handler-proxy:4.1.65.Final"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/io/netty/netty-handler-proxy/4.1.65.Final/netty-handler-proxy-4.1.65.Final.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/io/netty/netty-handler-proxy/4.1.65.Final/netty-handler-proxy-4.1.65.Final-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/io/netty/netty-handler-proxy/4.1.65.Final/netty-handler-proxy-4.1.65.Final-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: io.netty:netty-handler:4.1.65.Final"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/io/netty/netty-handler/4.1.65.Final/netty-handler-4.1.65.Final.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/io/netty/netty-handler/4.1.65.Final/netty-handler-4.1.65.Final-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/io/netty/netty-handler/4.1.65.Final/netty-handler-4.1.65.Final-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: io.netty:netty-resolver:4.1.65.Final"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/io/netty/netty-resolver/4.1.65.Final/netty-resolver-4.1.65.Final.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/io/netty/netty-resolver/4.1.65.Final/netty-resolver-4.1.65.Final-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/io/netty/netty-resolver/4.1.65.Final/netty-resolver-4.1.65.Final-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: io.netty:netty-transport-native-epoll:linux-x86_64:4.1.65.Final"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/io/netty/netty-transport-native-epoll/4.1.65.Final/netty-transport-native-epoll-4.1.65.Final-linux-x86_64.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/io/netty/netty-transport-native-epoll/4.1.65.Final/netty-transport-native-epoll-4.1.65.Final-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/io/netty/netty-transport-native-epoll/4.1.65.Final/netty-transport-native-epoll-4.1.65.Final-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: io.netty:netty-transport-native-unix-common:4.1.65.Final"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/io/netty/netty-transport-native-unix-common/4.1.65.Final/netty-transport-native-unix-common-4.1.65.Final.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/io/netty/netty-transport-native-unix-common/4.1.65.Final/netty-transport-native-unix-common-4.1.65.Final-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/io/netty/netty-transport-native-unix-common/4.1.65.Final/netty-transport-native-unix-common-4.1.65.Final-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: io.netty:netty-transport:4.1.65.Final"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/io/netty/netty-transport/4.1.65.Final/netty-transport-4.1.65.Final.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/io/netty/netty-transport/4.1.65.Final/netty-transport-4.1.65.Final-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/io/netty/netty-transport/4.1.65.Final/netty-transport-4.1.65.Final-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: io.projectreactor.addons:reactor-extra:3.3.6.RELEASE"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/io/projectreactor/addons/reactor-extra/3.3.6.RELEASE/reactor-extra-3.3.6.RELEASE.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/io/projectreactor/addons/reactor-extra/3.3.6.RELEASE/reactor-extra-3.3.6.RELEASE-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/io/projectreactor/addons/reactor-extra/3.3.6.RELEASE/reactor-extra-3.3.6.RELEASE-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: io.projectreactor.netty:reactor-netty:0.9.20.RELEASE"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/io/projectreactor/netty/reactor-netty/0.9.20.RELEASE/reactor-netty-0.9.20.RELEASE.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/io/projectreactor/netty/reactor-netty/0.9.20.RELEASE/reactor-netty-0.9.20.RELEASE-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/io/projectreactor/netty/reactor-netty/0.9.20.RELEASE/reactor-netty-0.9.20.RELEASE-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: io.projectreactor:reactor-core:3.3.17.RELEASE"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/io/projectreactor/reactor-core/3.3.17.RELEASE/reactor-core-3.3.17.RELEASE.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/io/projectreactor/reactor-core/3.3.17.RELEASE/reactor-core-3.3.17.RELEASE-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/io/projectreactor/reactor-core/3.3.17.RELEASE/reactor-core-3.3.17.RELEASE-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: io.prometheus:simpleclient:0.5.0"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/io/prometheus/simpleclient/0.5.0/simpleclient-0.5.0.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/io/prometheus/simpleclient/0.5.0/simpleclient-0.5.0-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/io/prometheus/simpleclient/0.5.0/simpleclient-0.5.0-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: io.reactivex:rxjava:1.3.8"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/io/reactivex/rxjava/1.3.8/rxjava-1.3.8.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/io/reactivex/rxjava/1.3.8/rxjava-1.3.8-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/io/reactivex/rxjava/1.3.8/rxjava-1.3.8-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: io.reactivex:rxnetty-contexts:0.4.9"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/io/reactivex/rxnetty-contexts/0.4.9/rxnetty-contexts-0.4.9.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/io/reactivex/rxnetty-contexts/0.4.9/rxnetty-contexts-0.4.9-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/io/reactivex/rxnetty-contexts/0.4.9/rxnetty-contexts-0.4.9-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: io.reactivex:rxnetty-servo:0.4.9"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/io/reactivex/rxnetty-servo/0.4.9/rxnetty-servo-0.4.9.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/io/reactivex/rxnetty-servo/0.4.9/rxnetty-servo-0.4.9-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/io/reactivex/rxnetty-servo/0.4.9/rxnetty-servo-0.4.9-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: io.reactivex:rxnetty:0.4.9"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/io/reactivex/rxnetty/0.4.9/rxnetty-0.4.9.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/io/reactivex/rxnetty/0.4.9/rxnetty-0.4.9-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/io/reactivex/rxnetty/0.4.9/rxnetty-0.4.9-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: io.springfox:springfox-bean-validators:3.0.0"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/io/springfox/springfox-bean-validators/3.0.0/springfox-bean-validators-3.0.0.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/io/springfox/springfox-bean-validators/3.0.0/springfox-bean-validators-3.0.0-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/io/springfox/springfox-bean-validators/3.0.0/springfox-bean-validators-3.0.0-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: io.springfox:springfox-boot-starter:3.0.0"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/io/springfox/springfox-boot-starter/3.0.0/springfox-boot-starter-3.0.0.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/io/springfox/springfox-boot-starter/3.0.0/springfox-boot-starter-3.0.0-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/io/springfox/springfox-boot-starter/3.0.0/springfox-boot-starter-3.0.0-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: io.springfox:springfox-core:3.0.0"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/io/springfox/springfox-core/3.0.0/springfox-core-3.0.0.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/io/springfox/springfox-core/3.0.0/springfox-core-3.0.0-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/io/springfox/springfox-core/3.0.0/springfox-core-3.0.0-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: io.springfox:springfox-data-rest:3.0.0"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/io/springfox/springfox-data-rest/3.0.0/springfox-data-rest-3.0.0.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/io/springfox/springfox-data-rest/3.0.0/springfox-data-rest-3.0.0-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/io/springfox/springfox-data-rest/3.0.0/springfox-data-rest-3.0.0-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: io.springfox:springfox-oas:3.0.0"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/io/springfox/springfox-oas/3.0.0/springfox-oas-3.0.0.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/io/springfox/springfox-oas/3.0.0/springfox-oas-3.0.0-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/io/springfox/springfox-oas/3.0.0/springfox-oas-3.0.0-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: io.springfox:springfox-schema:3.0.0"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/io/springfox/springfox-schema/3.0.0/springfox-schema-3.0.0.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/io/springfox/springfox-schema/3.0.0/springfox-schema-3.0.0-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/io/springfox/springfox-schema/3.0.0/springfox-schema-3.0.0-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: io.springfox:springfox-spi:3.0.0"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/io/springfox/springfox-spi/3.0.0/springfox-spi-3.0.0.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/io/springfox/springfox-spi/3.0.0/springfox-spi-3.0.0-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/io/springfox/springfox-spi/3.0.0/springfox-spi-3.0.0-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: io.springfox:springfox-spring-web:3.0.0"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/io/springfox/springfox-spring-web/3.0.0/springfox-spring-web-3.0.0.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/io/springfox/springfox-spring-web/3.0.0/springfox-spring-web-3.0.0-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/io/springfox/springfox-spring-web/3.0.0/springfox-spring-web-3.0.0-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: io.springfox:springfox-spring-webflux:3.0.0"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/io/springfox/springfox-spring-webflux/3.0.0/springfox-spring-webflux-3.0.0.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/io/springfox/springfox-spring-webflux/3.0.0/springfox-spring-webflux-3.0.0-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/io/springfox/springfox-spring-webflux/3.0.0/springfox-spring-webflux-3.0.0-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: io.springfox:springfox-spring-webmvc:3.0.0"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/io/springfox/springfox-spring-webmvc/3.0.0/springfox-spring-webmvc-3.0.0.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/io/springfox/springfox-spring-webmvc/3.0.0/springfox-spring-webmvc-3.0.0-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/io/springfox/springfox-spring-webmvc/3.0.0/springfox-spring-webmvc-3.0.0-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: io.springfox:springfox-swagger-common:3.0.0"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/io/springfox/springfox-swagger-common/3.0.0/springfox-swagger-common-3.0.0.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/io/springfox/springfox-swagger-common/3.0.0/springfox-swagger-common-3.0.0-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/io/springfox/springfox-swagger-common/3.0.0/springfox-swagger-common-3.0.0-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: io.springfox:springfox-swagger2:3.0.0"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/io/springfox/springfox-swagger2/3.0.0/springfox-swagger2-3.0.0.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/io/springfox/springfox-swagger2/3.0.0/springfox-swagger2-3.0.0-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/io/springfox/springfox-swagger2/3.0.0/springfox-swagger2-3.0.0-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: io.swagger.core.v3:swagger-annotations:2.1.2"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/io/swagger/core/v3/swagger-annotations/2.1.2/swagger-annotations-2.1.2.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/io/swagger/core/v3/swagger-annotations/2.1.2/swagger-annotations-2.1.2-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/io/swagger/core/v3/swagger-annotations/2.1.2/swagger-annotations-2.1.2-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: io.swagger.core.v3:swagger-models:2.1.2"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/io/swagger/core/v3/swagger-models/2.1.2/swagger-models-2.1.2.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/io/swagger/core/v3/swagger-models/2.1.2/swagger-models-2.1.2-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/io/swagger/core/v3/swagger-models/2.1.2/swagger-models-2.1.2-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: io.swagger:swagger-annotations:1.5.22"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/io/swagger/swagger-annotations/1.5.22/swagger-annotations-1.5.22.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/io/swagger/swagger-annotations/1.5.22/swagger-annotations-1.5.22-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/io/swagger/swagger-annotations/1.5.22/swagger-annotations-1.5.22-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: io.swagger:swagger-core:1.5.22"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/io/swagger/swagger-core/1.5.22/swagger-core-1.5.22.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/io/swagger/swagger-core/1.5.22/swagger-core-1.5.22-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/io/swagger/swagger-core/1.5.22/swagger-core-1.5.22-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: io.swagger:swagger-models:1.5.22"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/io/swagger/swagger-models/1.5.22/swagger-models-1.5.22.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/io/swagger/swagger-models/1.5.22/swagger-models-1.5.22-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/io/swagger/swagger-models/1.5.22/swagger-models-1.5.22-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: jakarta.activation:jakarta.activation-api:1.2.2"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/jakarta/activation/jakarta.activation-api/1.2.2/jakarta.activation-api-1.2.2.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/jakarta/activation/jakarta.activation-api/1.2.2/jakarta.activation-api-1.2.2-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/jakarta/activation/jakarta.activation-api/1.2.2/jakarta.activation-api-1.2.2-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: jakarta.annotation:jakarta.annotation-api:1.3.5"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/jakarta/annotation/jakarta.annotation-api/1.3.5/jakarta.annotation-api-1.3.5.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/jakarta/annotation/jakarta.annotation-api/1.3.5/jakarta.annotation-api-1.3.5-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/jakarta/annotation/jakarta.annotation-api/1.3.5/jakarta.annotation-api-1.3.5-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: jakarta.validation:jakarta.validation-api:2.0.2"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/jakarta/validation/jakarta.validation-api/2.0.2/jakarta.validation-api-2.0.2.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/jakarta/validation/jakarta.validation-api/2.0.2/jakarta.validation-api-2.0.2-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/jakarta/validation/jakarta.validation-api/2.0.2/jakarta.validation-api-2.0.2-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: jakarta.xml.bind:jakarta.xml.bind-api:2.3.3"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/jakarta/xml/bind/jakarta.xml.bind-api/2.3.3/jakarta.xml.bind-api-2.3.3.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/jakarta/xml/bind/jakarta.xml.bind-api/2.3.3/jakarta.xml.bind-api-2.3.3-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/jakarta/xml/bind/jakarta.xml.bind-api/2.3.3/jakarta.xml.bind-api-2.3.3-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: javax.activation:javax.activation-api:1.2.0"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/javax/activation/javax.activation-api/1.2.0/javax.activation-api-1.2.0.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/javax/activation/javax.activation-api/1.2.0/javax.activation-api-1.2.0-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/javax/activation/javax.activation-api/1.2.0/javax.activation-api-1.2.0-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: javax.inject:javax.inject:1"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/javax/inject/javax.inject/1/javax.inject-1.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/javax/inject/javax.inject/1/javax.inject-1-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/javax/inject/javax.inject/1/javax.inject-1-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: javax.servlet:javax.servlet-api:4.0.1"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/javax/servlet/javax.servlet-api/4.0.1/javax.servlet-api-4.0.1.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/javax/servlet/javax.servlet-api/4.0.1/javax.servlet-api-4.0.1-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/javax/servlet/javax.servlet-api/4.0.1/javax.servlet-api-4.0.1-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: javax.validation:validation-api:2.0.1.Final"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/javax/validation/validation-api/2.0.1.Final/validation-api-2.0.1.Final.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/javax/validation/validation-api/2.0.1.Final/validation-api-2.0.1.Final-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/javax/validation/validation-api/2.0.1.Final/validation-api-2.0.1.Final-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: javax.ws.rs:jsr311-api:1.1.1"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/javax/ws/rs/jsr311-api/1.1.1/jsr311-api-1.1.1.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/javax/ws/rs/jsr311-api/1.1.1/jsr311-api-1.1.1-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/javax/ws/rs/jsr311-api/1.1.1/jsr311-api-1.1.1-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: javax.xml.bind:jaxb-api:2.3.1"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/javax/xml/bind/jaxb-api/2.3.1/jaxb-api-2.3.1.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/javax/xml/bind/jaxb-api/2.3.1/jaxb-api-2.3.1-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/javax/xml/bind/jaxb-api/2.3.1/jaxb-api-2.3.1-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: junit:junit:4.13.2"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/junit/junit/4.13.2/junit-4.13.2.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/junit/junit/4.13.2/junit-4.13.2-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/junit/junit/4.13.2/junit-4.13.2-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: mysql:mysql-connector-java:8.0.19"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/mysql/mysql-connector-java/8.0.19/mysql-connector-java-8.0.19.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/mysql/mysql-connector-java/8.0.19/mysql-connector-java-8.0.19-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/mysql/mysql-connector-java/8.0.19/mysql-connector-java-8.0.19-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: net.bytebuddy:byte-buddy-agent:1.10.22"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/net/bytebuddy/byte-buddy-agent/1.10.22/byte-buddy-agent-1.10.22.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/net/bytebuddy/byte-buddy-agent/1.10.22/byte-buddy-agent-1.10.22-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/net/bytebuddy/byte-buddy-agent/1.10.22/byte-buddy-agent-1.10.22-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: net.bytebuddy:byte-buddy:1.10.22"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/net/bytebuddy/byte-buddy/1.10.22/byte-buddy-1.10.22.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/net/bytebuddy/byte-buddy/1.10.22/byte-buddy-1.10.22-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/net/bytebuddy/byte-buddy/1.10.22/byte-buddy-1.10.22-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: net.minidev:accessors-smart:2.3.1"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/net/minidev/accessors-smart/2.3.1/accessors-smart-2.3.1.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/net/minidev/accessors-smart/2.3.1/accessors-smart-2.3.1-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/net/minidev/accessors-smart/2.3.1/accessors-smart-2.3.1-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: net.minidev:json-smart:2.3.1"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/net/minidev/json-smart/2.3.1/json-smart-2.3.1.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/net/minidev/json-smart/2.3.1/json-smart-2.3.1-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/net/minidev/json-smart/2.3.1/json-smart-2.3.1-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: net.sf.ezmorph:ezmorph:1.0.6"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/net/sf/ezmorph/ezmorph/1.0.6/ezmorph-1.0.6.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/net/sf/ezmorph/ezmorph/1.0.6/ezmorph-1.0.6-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/net/sf/ezmorph/ezmorph/1.0.6/ezmorph-1.0.6-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: net.sf.json-lib:json-lib:jdk15:2.4"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/net/sf/json-lib/json-lib/2.4/json-lib-2.4-jdk15.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/net/sf/json-lib/json-lib/2.4/json-lib-2.4-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/net/sf/json-lib/json-lib/2.4/json-lib-2.4-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: net.sourceforge.nekohtml:nekohtml:1.9.22"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/net/sourceforge/nekohtml/nekohtml/1.9.22/nekohtml-1.9.22.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/net/sourceforge/nekohtml/nekohtml/1.9.22/nekohtml-1.9.22-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/net/sourceforge/nekohtml/nekohtml/1.9.22/nekohtml-1.9.22-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: ognl:ognl:3.2.6"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/ognl/ognl/3.2.6/ognl-3.2.6.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/ognl/ognl/3.2.6/ognl-3.2.6-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/ognl/ognl/3.2.6/ognl-3.2.6-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: org.apache.commons:commons-collections4:4.4"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/org/apache/commons/commons-collections4/4.4/commons-collections4-4.4.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/org/apache/commons/commons-collections4/4.4/commons-collections4-4.4-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/org/apache/commons/commons-collections4/4.4/commons-collections4-4.4-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: org.apache.commons:commons-compress:1.19"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/org/apache/commons/commons-compress/1.19/commons-compress-1.19.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/org/apache/commons/commons-compress/1.19/commons-compress-1.19-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/org/apache/commons/commons-compress/1.19/commons-compress-1.19-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: org.apache.commons:commons-lang3:3.12.0"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/org/apache/commons/commons-lang3/3.12.0/commons-lang3-3.12.0.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/org/apache/commons/commons-lang3/3.12.0/commons-lang3-3.12.0-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/org/apache/commons/commons-lang3/3.12.0/commons-lang3-3.12.0-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: org.apache.commons:commons-math3:3.6.1"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/org/apache/commons/commons-math3/3.6.1/commons-math3-3.6.1.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/org/apache/commons/commons-math3/3.6.1/commons-math3-3.6.1-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/org/apache/commons/commons-math3/3.6.1/commons-math3-3.6.1-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: org.apache.commons:commons-pool2:2.8.1"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/org/apache/commons/commons-pool2/2.8.1/commons-pool2-2.8.1.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/org/apache/commons/commons-pool2/2.8.1/commons-pool2-2.8.1-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/org/apache/commons/commons-pool2/2.8.1/commons-pool2-2.8.1-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: org.apache.httpcomponents:httpasyncclient:4.1.4"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/org/apache/httpcomponents/httpasyncclient/4.1.4/httpasyncclient-4.1.4.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/org/apache/httpcomponents/httpasyncclient/4.1.4/httpasyncclient-4.1.4-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/org/apache/httpcomponents/httpasyncclient/4.1.4/httpasyncclient-4.1.4-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: org.apache.httpcomponents:httpclient:4.5.13"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/org/apache/httpcomponents/httpclient/4.5.13/httpclient-4.5.13.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/org/apache/httpcomponents/httpclient/4.5.13/httpclient-4.5.13-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/org/apache/httpcomponents/httpclient/4.5.13/httpclient-4.5.13-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: org.apache.httpcomponents:httpcore-nio:4.4.14"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/org/apache/httpcomponents/httpcore-nio/4.4.14/httpcore-nio-4.4.14.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/org/apache/httpcomponents/httpcore-nio/4.4.14/httpcore-nio-4.4.14-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/org/apache/httpcomponents/httpcore-nio/4.4.14/httpcore-nio-4.4.14-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: org.apache.httpcomponents:httpcore:4.4.14"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/org/apache/httpcomponents/httpcore/4.4.14/httpcore-4.4.14.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/org/apache/httpcomponents/httpcore/4.4.14/httpcore-4.4.14-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/org/apache/httpcomponents/httpcore/4.4.14/httpcore-4.4.14-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: org.apache.logging.log4j:log4j-api:2.13.3"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/org/apache/logging/log4j/log4j-api/2.13.3/log4j-api-2.13.3.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/org/apache/logging/log4j/log4j-api/2.13.3/log4j-api-2.13.3-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/org/apache/logging/log4j/log4j-api/2.13.3/log4j-api-2.13.3-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: org.apache.logging.log4j:log4j-to-slf4j:2.13.3"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/org/apache/logging/log4j/log4j-to-slf4j/2.13.3/log4j-to-slf4j-2.13.3.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/org/apache/logging/log4j/log4j-to-slf4j/2.13.3/log4j-to-slf4j-2.13.3-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/org/apache/logging/log4j/log4j-to-slf4j/2.13.3/log4j-to-slf4j-2.13.3-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: org.apache.poi:poi-ooxml-schemas:4.1.1"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/org/apache/poi/poi-ooxml-schemas/4.1.1/poi-ooxml-schemas-4.1.1.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/org/apache/poi/poi-ooxml-schemas/4.1.1/poi-ooxml-schemas-4.1.1-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/org/apache/poi/poi-ooxml-schemas/4.1.1/poi-ooxml-schemas-4.1.1-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: org.apache.poi:poi-ooxml:4.1.1"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/org/apache/poi/poi-ooxml/4.1.1/poi-ooxml-4.1.1.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/org/apache/poi/poi-ooxml/4.1.1/poi-ooxml-4.1.1-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/org/apache/poi/poi-ooxml/4.1.1/poi-ooxml-4.1.1-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: org.apache.poi:poi:4.1.1"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/org/apache/poi/poi/4.1.1/poi-4.1.1.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/org/apache/poi/poi/4.1.1/poi-4.1.1-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/org/apache/poi/poi/4.1.1/poi-4.1.1-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: org.apache.tomcat.embed:tomcat-embed-core:9.0.46"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/org/apache/tomcat/embed/tomcat-embed-core/9.0.46/tomcat-embed-core-9.0.46.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/org/apache/tomcat/embed/tomcat-embed-core/9.0.46/tomcat-embed-core-9.0.46-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/org/apache/tomcat/embed/tomcat-embed-core/9.0.46/tomcat-embed-core-9.0.46-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: org.apache.tomcat.embed:tomcat-embed-websocket:9.0.46"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/org/apache/tomcat/embed/tomcat-embed-websocket/9.0.46/tomcat-embed-websocket-9.0.46.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/org/apache/tomcat/embed/tomcat-embed-websocket/9.0.46/tomcat-embed-websocket-9.0.46-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/org/apache/tomcat/embed/tomcat-embed-websocket/9.0.46/tomcat-embed-websocket-9.0.46-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: org.apache.velocity:velocity-engine-core:2.3"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/org/apache/velocity/velocity-engine-core/2.3/velocity-engine-core-2.3.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/org/apache/velocity/velocity-engine-core/2.3/velocity-engine-core-2.3-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/org/apache/velocity/velocity-engine-core/2.3/velocity-engine-core-2.3-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: org.apache.xmlbeans:xmlbeans:3.1.0"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/org/apache/xmlbeans/xmlbeans/3.1.0/xmlbeans-3.1.0.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/org/apache/xmlbeans/xmlbeans/3.1.0/xmlbeans-3.1.0-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/org/apache/xmlbeans/xmlbeans/3.1.0/xmlbeans-3.1.0-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: org.apache.xmlgraphics:batik-constants:1.14"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/org/apache/xmlgraphics/batik-constants/1.14/batik-constants-1.14.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/org/apache/xmlgraphics/batik-constants/1.14/batik-constants-1.14-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/org/apache/xmlgraphics/batik-constants/1.14/batik-constants-1.14-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: org.apache.xmlgraphics:batik-css:1.14"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/org/apache/xmlgraphics/batik-css/1.14/batik-css-1.14.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/org/apache/xmlgraphics/batik-css/1.14/batik-css-1.14-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/org/apache/xmlgraphics/batik-css/1.14/batik-css-1.14-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: org.apache.xmlgraphics:batik-i18n:1.14"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/org/apache/xmlgraphics/batik-i18n/1.14/batik-i18n-1.14.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/org/apache/xmlgraphics/batik-i18n/1.14/batik-i18n-1.14-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/org/apache/xmlgraphics/batik-i18n/1.14/batik-i18n-1.14-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: org.apache.xmlgraphics:batik-shared-resources:1.14"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/org/apache/xmlgraphics/batik-shared-resources/1.14/batik-shared-resources-1.14.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/org/apache/xmlgraphics/batik-shared-resources/1.14/batik-shared-resources-1.14-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/org/apache/xmlgraphics/batik-shared-resources/1.14/batik-shared-resources-1.14-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: org.apache.xmlgraphics:batik-util:1.14"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/org/apache/xmlgraphics/batik-util/1.14/batik-util-1.14.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/org/apache/xmlgraphics/batik-util/1.14/batik-util-1.14-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/org/apache/xmlgraphics/batik-util/1.14/batik-util-1.14-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: org.apache.xmlgraphics:xmlgraphics-commons:2.6"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/org/apache/xmlgraphics/xmlgraphics-commons/2.6/xmlgraphics-commons-2.6.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/org/apache/xmlgraphics/xmlgraphics-commons/2.6/xmlgraphics-commons-2.6-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/org/apache/xmlgraphics/xmlgraphics-commons/2.6/xmlgraphics-commons-2.6-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: org.apiguardian:apiguardian-api:1.1.0"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/org/apiguardian/apiguardian-api/1.1.0/apiguardian-api-1.1.0.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/org/apiguardian/apiguardian-api/1.1.0/apiguardian-api-1.1.0-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/org/apiguardian/apiguardian-api/1.1.0/apiguardian-api-1.1.0-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: org.aspectj:aspectjrt:1.9.6"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/org/aspectj/aspectjrt/1.9.6/aspectjrt-1.9.6.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/org/aspectj/aspectjrt/1.9.6/aspectjrt-1.9.6-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/org/aspectj/aspectjrt/1.9.6/aspectjrt-1.9.6-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: org.aspectj:aspectjweaver:1.9.6"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/org/aspectj/aspectjweaver/1.9.6/aspectjweaver-1.9.6.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/org/aspectj/aspectjweaver/1.9.6/aspectjweaver-1.9.6-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/org/aspectj/aspectjweaver/1.9.6/aspectjweaver-1.9.6-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: org.assertj:assertj-core:3.16.1"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/org/assertj/assertj-core/3.16.1/assertj-core-3.16.1.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/org/assertj/assertj-core/3.16.1/assertj-core-3.16.1-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/org/assertj/assertj-core/3.16.1/assertj-core-3.16.1-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: org.bouncycastle:bcpkix-jdk15on:1.56"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/org/bouncycastle/bcpkix-jdk15on/1.56/bcpkix-jdk15on-1.56.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/org/bouncycastle/bcpkix-jdk15on/1.56/bcpkix-jdk15on-1.56-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/org/bouncycastle/bcpkix-jdk15on/1.56/bcpkix-jdk15on-1.56-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: org.bouncycastle:bcpkix-jdk15on:1.64"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/org/bouncycastle/bcpkix-jdk15on/1.64/bcpkix-jdk15on-1.64.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/org/bouncycastle/bcpkix-jdk15on/1.64/bcpkix-jdk15on-1.64-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/org/bouncycastle/bcpkix-jdk15on/1.64/bcpkix-jdk15on-1.64-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: org.bouncycastle:bcprov-jdk15on:1.68"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/org/bouncycastle/bcprov-jdk15on/1.68/bcprov-jdk15on-1.68.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/org/bouncycastle/bcprov-jdk15on/1.68/bcprov-jdk15on-1.68-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/org/bouncycastle/bcprov-jdk15on/1.68/bcprov-jdk15on-1.68-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: org.checkerframework:checker-qual:3.5.0"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/org/checkerframework/checker-qual/3.5.0/checker-qual-3.5.0.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/org/checkerframework/checker-qual/3.5.0/checker-qual-3.5.0-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/org/checkerframework/checker-qual/3.5.0/checker-qual-3.5.0-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: org.codehaus.groovy:groovy:2.5.14"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/org/codehaus/groovy/groovy/2.5.14/groovy-2.5.14.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/org/codehaus/groovy/groovy/2.5.14/groovy-2.5.14-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/org/codehaus/groovy/groovy/2.5.14/groovy-2.5.14-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: org.codehaus.jackson:jackson-core-asl:1.9.13"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/org/codehaus/jackson/jackson-core-asl/1.9.13/jackson-core-asl-1.9.13.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/org/codehaus/jackson/jackson-core-asl/1.9.13/jackson-core-asl-1.9.13-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/org/codehaus/jackson/jackson-core-asl/1.9.13/jackson-core-asl-1.9.13-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: org.codehaus.jackson:jackson-mapper-asl:1.9.13"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/org/codehaus/jackson/jackson-mapper-asl/1.9.13/jackson-mapper-asl-1.9.13.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/org/codehaus/jackson/jackson-mapper-asl/1.9.13/jackson-mapper-asl-1.9.13-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/org/codehaus/jackson/jackson-mapper-asl/1.9.13/jackson-mapper-asl-1.9.13-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: org.eclipse.paho:org.eclipse.paho.client.mqttv3:1.2.5"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/org/eclipse/paho/org.eclipse.paho.client.mqttv3/1.2.5/org.eclipse.paho.client.mqttv3-1.2.5.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/org/eclipse/paho/org.eclipse.paho.client.mqttv3/1.2.5/org.eclipse.paho.client.mqttv3-1.2.5-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/org/eclipse/paho/org.eclipse.paho.client.mqttv3/1.2.5/org.eclipse.paho.client.mqttv3-1.2.5-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: org.freemarker:freemarker:2.3.31"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/org/freemarker/freemarker/2.3.31/freemarker-2.3.31.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/org/freemarker/freemarker/2.3.31/freemarker-2.3.31-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/org/freemarker/freemarker/2.3.31/freemarker-2.3.31-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: org.glassfish:jakarta.el:3.0.3"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/org/glassfish/jakarta.el/3.0.3/jakarta.el-3.0.3.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/org/glassfish/jakarta.el/3.0.3/jakarta.el-3.0.3-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/org/glassfish/jakarta.el/3.0.3/jakarta.el-3.0.3-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: org.hamcrest:hamcrest:2.2"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/org/hamcrest/hamcrest/2.2/hamcrest-2.2.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/org/hamcrest/hamcrest/2.2/hamcrest-2.2-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/org/hamcrest/hamcrest/2.2/hamcrest-2.2-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: org.hdrhistogram:HdrHistogram:2.1.12"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/org/hdrhistogram/HdrHistogram/2.1.12/HdrHistogram-2.1.12.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/org/hdrhistogram/HdrHistogram/2.1.12/HdrHistogram-2.1.12-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/org/hdrhistogram/HdrHistogram/2.1.12/HdrHistogram-2.1.12-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: org.hibernate.validator:hibernate-validator:6.1.7.Final"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/org/hibernate/validator/hibernate-validator/6.1.7.Final/hibernate-validator-6.1.7.Final.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/org/hibernate/validator/hibernate-validator/6.1.7.Final/hibernate-validator-6.1.7.Final-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/org/hibernate/validator/hibernate-validator/6.1.7.Final/hibernate-validator-6.1.7.Final-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: org.influxdb:influxdb-java:2.18"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/org/influxdb/influxdb-java/2.18/influxdb-java-2.18.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/org/influxdb/influxdb-java/2.18/influxdb-java-2.18-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/org/influxdb/influxdb-java/2.18/influxdb-java-2.18-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: org.javassist:javassist:3.21.0-GA"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/org/javassist/javassist/3.21.0-GA/javassist-3.21.0-GA.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/org/javassist/javassist/3.21.0-GA/javassist-3.21.0-GA-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/org/javassist/javassist/3.21.0-GA/javassist-3.21.0-GA-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: org.javassist:javassist:3.25.0-GA"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/org/javassist/javassist/3.25.0-GA/javassist-3.25.0-GA.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/org/javassist/javassist/3.25.0-GA/javassist-3.25.0-GA-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/org/javassist/javassist/3.25.0-GA/javassist-3.25.0-GA-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: org.jboss.logging:jboss-logging:3.4.2.Final"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/org/jboss/logging/jboss-logging/3.4.2.Final/jboss-logging-3.4.2.Final.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/org/jboss/logging/jboss-logging/3.4.2.Final/jboss-logging-3.4.2.Final-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/org/jboss/logging/jboss-logging/3.4.2.Final/jboss-logging-3.4.2.Final-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: org.jetbrains:annotations:13.0"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/org/jetbrains/annotations/13.0/annotations-13.0.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/org/jetbrains/annotations/13.0/annotations-13.0-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/org/jetbrains/annotations/13.0/annotations-13.0-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: org.junit.jupiter:junit-jupiter-api:5.6.3"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/org/junit/jupiter/junit-jupiter-api/5.6.3/junit-jupiter-api-5.6.3.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/org/junit/jupiter/junit-jupiter-api/5.6.3/junit-jupiter-api-5.6.3-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/org/junit/jupiter/junit-jupiter-api/5.6.3/junit-jupiter-api-5.6.3-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: org.junit.jupiter:junit-jupiter-engine:5.6.3"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/org/junit/jupiter/junit-jupiter-engine/5.6.3/junit-jupiter-engine-5.6.3.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/org/junit/jupiter/junit-jupiter-engine/5.6.3/junit-jupiter-engine-5.6.3-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/org/junit/jupiter/junit-jupiter-engine/5.6.3/junit-jupiter-engine-5.6.3-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: org.junit.jupiter:junit-jupiter-params:5.6.3"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/org/junit/jupiter/junit-jupiter-params/5.6.3/junit-jupiter-params-5.6.3.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/org/junit/jupiter/junit-jupiter-params/5.6.3/junit-jupiter-params-5.6.3-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/org/junit/jupiter/junit-jupiter-params/5.6.3/junit-jupiter-params-5.6.3-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: org.junit.jupiter:junit-jupiter:5.6.3"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/org/junit/jupiter/junit-jupiter/5.6.3/junit-jupiter-5.6.3.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/org/junit/jupiter/junit-jupiter/5.6.3/junit-jupiter-5.6.3-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/org/junit/jupiter/junit-jupiter/5.6.3/junit-jupiter-5.6.3-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: org.junit.platform:junit-platform-commons:1.6.3"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/org/junit/platform/junit-platform-commons/1.6.3/junit-platform-commons-1.6.3.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/org/junit/platform/junit-platform-commons/1.6.3/junit-platform-commons-1.6.3-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/org/junit/platform/junit-platform-commons/1.6.3/junit-platform-commons-1.6.3-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: org.junit.platform:junit-platform-engine:1.6.3"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/org/junit/platform/junit-platform-engine/1.6.3/junit-platform-engine-1.6.3.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/org/junit/platform/junit-platform-engine/1.6.3/junit-platform-engine-1.6.3-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/org/junit/platform/junit-platform-engine/1.6.3/junit-platform-engine-1.6.3-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: org.junit.vintage:junit-vintage-engine:5.6.3"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/org/junit/vintage/junit-vintage-engine/5.6.3/junit-vintage-engine-5.6.3.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/org/junit/vintage/junit-vintage-engine/5.6.3/junit-vintage-engine-5.6.3-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/org/junit/vintage/junit-vintage-engine/5.6.3/junit-vintage-engine-5.6.3-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: org.latencyutils:LatencyUtils:2.0.3"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/org/latencyutils/LatencyUtils/2.0.3/LatencyUtils-2.0.3.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/org/latencyutils/LatencyUtils/2.0.3/LatencyUtils-2.0.3-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/org/latencyutils/LatencyUtils/2.0.3/LatencyUtils-2.0.3-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: org.mapstruct:mapstruct:1.3.1.Final"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/org/mapstruct/mapstruct/1.3.1.Final/mapstruct-1.3.1.Final.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/org/mapstruct/mapstruct/1.3.1.Final/mapstruct-1.3.1.Final-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/org/mapstruct/mapstruct/1.3.1.Final/mapstruct-1.3.1.Final-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: org.mockito:mockito-core:3.3.3"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/org/mockito/mockito-core/3.3.3/mockito-core-3.3.3.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/org/mockito/mockito-core/3.3.3/mockito-core-3.3.3-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/org/mockito/mockito-core/3.3.3/mockito-core-3.3.3-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: org.mockito:mockito-junit-jupiter:3.3.3"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/org/mockito/mockito-junit-jupiter/3.3.3/mockito-junit-jupiter-3.3.3.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/org/mockito/mockito-junit-jupiter/3.3.3/mockito-junit-jupiter-3.3.3-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/org/mockito/mockito-junit-jupiter/3.3.3/mockito-junit-jupiter-3.3.3-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: org.msgpack:msgpack-core:0.8.20"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/org/msgpack/msgpack-core/0.8.20/msgpack-core-0.8.20.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/org/msgpack/msgpack-core/0.8.20/msgpack-core-0.8.20-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/org/msgpack/msgpack-core/0.8.20/msgpack-core-0.8.20-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-autoconfigure:2.1.3"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/org/mybatis/spring/boot/mybatis-spring-boot-autoconfigure/2.1.3/mybatis-spring-boot-autoconfigure-2.1.3.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/org/mybatis/spring/boot/mybatis-spring-boot-autoconfigure/2.1.3/mybatis-spring-boot-autoconfigure-2.1.3-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/org/mybatis/spring/boot/mybatis-spring-boot-autoconfigure/2.1.3/mybatis-spring-boot-autoconfigure-2.1.3-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-starter:2.1.3"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/org/mybatis/spring/boot/mybatis-spring-boot-starter/2.1.3/mybatis-spring-boot-starter-2.1.3.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/org/mybatis/spring/boot/mybatis-spring-boot-starter/2.1.3/mybatis-spring-boot-starter-2.1.3-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/org/mybatis/spring/boot/mybatis-spring-boot-starter/2.1.3/mybatis-spring-boot-starter-2.1.3-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: org.mybatis:mybatis-spring:2.0.5"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/org/mybatis/mybatis-spring/2.0.5/mybatis-spring-2.0.5.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/org/mybatis/mybatis-spring/2.0.5/mybatis-spring-2.0.5-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/org/mybatis/mybatis-spring/2.0.5/mybatis-spring-2.0.5-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: org.mybatis:mybatis:3.5.5"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/org/mybatis/mybatis/3.5.5/mybatis-3.5.5.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/org/mybatis/mybatis/3.5.5/mybatis-3.5.5-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/org/mybatis/mybatis/3.5.5/mybatis-3.5.5-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: org.objenesis:objenesis:2.6"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/org/objenesis/objenesis/2.6/objenesis-2.6.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/org/objenesis/objenesis/2.6/objenesis-2.6-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/org/objenesis/objenesis/2.6/objenesis-2.6-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: org.opentest4j:opentest4j:1.2.0"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/org/opentest4j/opentest4j/1.2.0/opentest4j-1.2.0.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/org/opentest4j/opentest4j/1.2.0/opentest4j-1.2.0-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/org/opentest4j/opentest4j/1.2.0/opentest4j-1.2.0-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: org.ow2.asm:asm:5.0.4"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/org/ow2/asm/asm/5.0.4/asm-5.0.4.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/org/ow2/asm/asm/5.0.4/asm-5.0.4-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/org/ow2/asm/asm/5.0.4/asm-5.0.4-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: org.owasp.antisamy:antisamy:1.6.4"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/org/owasp/antisamy/antisamy/1.6.4/antisamy-1.6.4.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/org/owasp/antisamy/antisamy/1.6.4/antisamy-1.6.4-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/org/owasp/antisamy/antisamy/1.6.4/antisamy-1.6.4-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: org.projectlombok:lombok:1.18.18"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/org/projectlombok/lombok/1.18.18/lombok-1.18.18.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/org/projectlombok/lombok/1.18.18/lombok-1.18.18-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/org/projectlombok/lombok/1.18.18/lombok-1.18.18-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: org.reactivestreams:reactive-streams:1.0.3"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/org/reactivestreams/reactive-streams/1.0.3/reactive-streams-1.0.3.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/org/reactivestreams/reactive-streams/1.0.3/reactive-streams-1.0.3-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/org/reactivestreams/reactive-streams/1.0.3/reactive-streams-1.0.3-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: org.reflections:reflections:0.9.11"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/org/reflections/reflections/0.9.11/reflections-0.9.11.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/org/reflections/reflections/0.9.11/reflections-0.9.11-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/org/reflections/reflections/0.9.11/reflections-0.9.11-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: org.skyscreamer:jsonassert:1.5.0"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/org/skyscreamer/jsonassert/1.5.0/jsonassert-1.5.0.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/org/skyscreamer/jsonassert/1.5.0/jsonassert-1.5.0-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/org/skyscreamer/jsonassert/1.5.0/jsonassert-1.5.0-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: org.slf4j:jul-to-slf4j:1.7.30"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/org/slf4j/jul-to-slf4j/1.7.30/jul-to-slf4j-1.7.30.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/org/slf4j/jul-to-slf4j/1.7.30/jul-to-slf4j-1.7.30-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/org/slf4j/jul-to-slf4j/1.7.30/jul-to-slf4j-1.7.30-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: org.slf4j:slf4j-api:1.7.30"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/org/slf4j/slf4j-api/1.7.30/slf4j-api-1.7.30.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/org/slf4j/slf4j-api/1.7.30/slf4j-api-1.7.30-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/org/slf4j/slf4j-api/1.7.30/slf4j-api-1.7.30-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: org.slf4j:slf4j-simple:1.7.30"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/org/slf4j/slf4j-simple/1.7.30/slf4j-simple-1.7.30.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/org/slf4j/slf4j-simple/1.7.30/slf4j-simple-1.7.30-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/org/slf4j/slf4j-simple/1.7.30/slf4j-simple-1.7.30-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: org.springframework.boot:spring-boot-actuator-autoconfigure:2.3.12.RELEASE"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/org/springframework/boot/spring-boot-actuator-autoconfigure/2.3.12.RELEASE/spring-boot-actuator-autoconfigure-2.3.12.RELEASE.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/org/springframework/boot/spring-boot-actuator-autoconfigure/2.3.12.RELEASE/spring-boot-actuator-autoconfigure-2.3.12.RELEASE-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/org/springframework/boot/spring-boot-actuator-autoconfigure/2.3.12.RELEASE/spring-boot-actuator-autoconfigure-2.3.12.RELEASE-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: org.springframework.boot:spring-boot-actuator:2.3.12.RELEASE"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/org/springframework/boot/spring-boot-actuator/2.3.12.RELEASE/spring-boot-actuator-2.3.12.RELEASE.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/org/springframework/boot/spring-boot-actuator/2.3.12.RELEASE/spring-boot-actuator-2.3.12.RELEASE-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/org/springframework/boot/spring-boot-actuator/2.3.12.RELEASE/spring-boot-actuator-2.3.12.RELEASE-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: org.springframework.boot:spring-boot-autoconfigure:2.3.12.RELEASE"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/org/springframework/boot/spring-boot-autoconfigure/2.3.12.RELEASE/spring-boot-autoconfigure-2.3.12.RELEASE.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/org/springframework/boot/spring-boot-autoconfigure/2.3.12.RELEASE/spring-boot-autoconfigure-2.3.12.RELEASE-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/org/springframework/boot/spring-boot-autoconfigure/2.3.12.RELEASE/spring-boot-autoconfigure-2.3.12.RELEASE-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: org.springframework.boot:spring-boot-configuration-processor:2.3.12.RELEASE"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/org/springframework/boot/spring-boot-configuration-processor/2.3.12.RELEASE/spring-boot-configuration-processor-2.3.12.RELEASE.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/org/springframework/boot/spring-boot-configuration-processor/2.3.12.RELEASE/spring-boot-configuration-processor-2.3.12.RELEASE-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/org/springframework/boot/spring-boot-configuration-processor/2.3.12.RELEASE/spring-boot-configuration-processor-2.3.12.RELEASE-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: org.springframework.boot:spring-boot-starter-actuator:2.3.12.RELEASE"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/org/springframework/boot/spring-boot-starter-actuator/2.3.12.RELEASE/spring-boot-starter-actuator-2.3.12.RELEASE.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/org/springframework/boot/spring-boot-starter-actuator/2.3.12.RELEASE/spring-boot-starter-actuator-2.3.12.RELEASE-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/org/springframework/boot/spring-boot-starter-actuator/2.3.12.RELEASE/spring-boot-starter-actuator-2.3.12.RELEASE-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: org.springframework.boot:spring-boot-starter-aop:2.3.12.RELEASE"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/org/springframework/boot/spring-boot-starter-aop/2.3.12.RELEASE/spring-boot-starter-aop-2.3.12.RELEASE.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/org/springframework/boot/spring-boot-starter-aop/2.3.12.RELEASE/spring-boot-starter-aop-2.3.12.RELEASE-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/org/springframework/boot/spring-boot-starter-aop/2.3.12.RELEASE/spring-boot-starter-aop-2.3.12.RELEASE-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: org.springframework.boot:spring-boot-starter-data-redis:2.3.12.RELEASE"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/org/springframework/boot/spring-boot-starter-data-redis/2.3.12.RELEASE/spring-boot-starter-data-redis-2.3.12.RELEASE.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/org/springframework/boot/spring-boot-starter-data-redis/2.3.12.RELEASE/spring-boot-starter-data-redis-2.3.12.RELEASE-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/org/springframework/boot/spring-boot-starter-data-redis/2.3.12.RELEASE/spring-boot-starter-data-redis-2.3.12.RELEASE-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: org.springframework.boot:spring-boot-starter-freemarker:2.3.12.RELEASE"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/org/springframework/boot/spring-boot-starter-freemarker/2.3.12.RELEASE/spring-boot-starter-freemarker-2.3.12.RELEASE.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/org/springframework/boot/spring-boot-starter-freemarker/2.3.12.RELEASE/spring-boot-starter-freemarker-2.3.12.RELEASE-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/org/springframework/boot/spring-boot-starter-freemarker/2.3.12.RELEASE/spring-boot-starter-freemarker-2.3.12.RELEASE-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: org.springframework.boot:spring-boot-starter-jdbc:2.3.12.RELEASE"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/org/springframework/boot/spring-boot-starter-jdbc/2.3.12.RELEASE/spring-boot-starter-jdbc-2.3.12.RELEASE.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/org/springframework/boot/spring-boot-starter-jdbc/2.3.12.RELEASE/spring-boot-starter-jdbc-2.3.12.RELEASE-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/org/springframework/boot/spring-boot-starter-jdbc/2.3.12.RELEASE/spring-boot-starter-jdbc-2.3.12.RELEASE-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: org.springframework.boot:spring-boot-starter-json:2.3.12.RELEASE"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/org/springframework/boot/spring-boot-starter-json/2.3.12.RELEASE/spring-boot-starter-json-2.3.12.RELEASE.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/org/springframework/boot/spring-boot-starter-json/2.3.12.RELEASE/spring-boot-starter-json-2.3.12.RELEASE-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/org/springframework/boot/spring-boot-starter-json/2.3.12.RELEASE/spring-boot-starter-json-2.3.12.RELEASE-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: org.springframework.boot:spring-boot-starter-logging:2.3.12.RELEASE"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/org/springframework/boot/spring-boot-starter-logging/2.3.12.RELEASE/spring-boot-starter-logging-2.3.12.RELEASE.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/org/springframework/boot/spring-boot-starter-logging/2.3.12.RELEASE/spring-boot-starter-logging-2.3.12.RELEASE-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/org/springframework/boot/spring-boot-starter-logging/2.3.12.RELEASE/spring-boot-starter-logging-2.3.12.RELEASE-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: org.springframework.boot:spring-boot-starter-mail:2.3.12.RELEASE"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/org/springframework/boot/spring-boot-starter-mail/2.3.12.RELEASE/spring-boot-starter-mail-2.3.12.RELEASE.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/org/springframework/boot/spring-boot-starter-mail/2.3.12.RELEASE/spring-boot-starter-mail-2.3.12.RELEASE-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/org/springframework/boot/spring-boot-starter-mail/2.3.12.RELEASE/spring-boot-starter-mail-2.3.12.RELEASE-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: org.springframework.boot:spring-boot-starter-reactor-netty:2.3.12.RELEASE"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/org/springframework/boot/spring-boot-starter-reactor-netty/2.3.12.RELEASE/spring-boot-starter-reactor-netty-2.3.12.RELEASE.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/org/springframework/boot/spring-boot-starter-reactor-netty/2.3.12.RELEASE/spring-boot-starter-reactor-netty-2.3.12.RELEASE-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/org/springframework/boot/spring-boot-starter-reactor-netty/2.3.12.RELEASE/spring-boot-starter-reactor-netty-2.3.12.RELEASE-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: org.springframework.boot:spring-boot-starter-test:2.3.12.RELEASE"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/org/springframework/boot/spring-boot-starter-test/2.3.12.RELEASE/spring-boot-starter-test-2.3.12.RELEASE.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/org/springframework/boot/spring-boot-starter-test/2.3.12.RELEASE/spring-boot-starter-test-2.3.12.RELEASE-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/org/springframework/boot/spring-boot-starter-test/2.3.12.RELEASE/spring-boot-starter-test-2.3.12.RELEASE-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: org.springframework.boot:spring-boot-starter-tomcat:2.3.12.RELEASE"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/org/springframework/boot/spring-boot-starter-tomcat/2.3.12.RELEASE/spring-boot-starter-tomcat-2.3.12.RELEASE.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/org/springframework/boot/spring-boot-starter-tomcat/2.3.12.RELEASE/spring-boot-starter-tomcat-2.3.12.RELEASE-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/org/springframework/boot/spring-boot-starter-tomcat/2.3.12.RELEASE/spring-boot-starter-tomcat-2.3.12.RELEASE-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: org.springframework.boot:spring-boot-starter-validation:2.3.12.RELEASE"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/org/springframework/boot/spring-boot-starter-validation/2.3.12.RELEASE/spring-boot-starter-validation-2.3.12.RELEASE.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/org/springframework/boot/spring-boot-starter-validation/2.3.12.RELEASE/spring-boot-starter-validation-2.3.12.RELEASE-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/org/springframework/boot/spring-boot-starter-validation/2.3.12.RELEASE/spring-boot-starter-validation-2.3.12.RELEASE-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: org.springframework.boot:spring-boot-starter-web:2.3.12.RELEASE"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/org/springframework/boot/spring-boot-starter-web/2.3.12.RELEASE/spring-boot-starter-web-2.3.12.RELEASE.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/org/springframework/boot/spring-boot-starter-web/2.3.12.RELEASE/spring-boot-starter-web-2.3.12.RELEASE-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/org/springframework/boot/spring-boot-starter-web/2.3.12.RELEASE/spring-boot-starter-web-2.3.12.RELEASE-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: org.springframework.boot:spring-boot-starter-webflux:2.3.12.RELEASE"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/org/springframework/boot/spring-boot-starter-webflux/2.3.12.RELEASE/spring-boot-starter-webflux-2.3.12.RELEASE.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/org/springframework/boot/spring-boot-starter-webflux/2.3.12.RELEASE/spring-boot-starter-webflux-2.3.12.RELEASE-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/org/springframework/boot/spring-boot-starter-webflux/2.3.12.RELEASE/spring-boot-starter-webflux-2.3.12.RELEASE-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: org.springframework.boot:spring-boot-starter:2.3.12.RELEASE"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/org/springframework/boot/spring-boot-starter/2.3.12.RELEASE/spring-boot-starter-2.3.12.RELEASE.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/org/springframework/boot/spring-boot-starter/2.3.12.RELEASE/spring-boot-starter-2.3.12.RELEASE-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/org/springframework/boot/spring-boot-starter/2.3.12.RELEASE/spring-boot-starter-2.3.12.RELEASE-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: org.springframework.boot:spring-boot-test-autoconfigure:2.3.12.RELEASE"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/org/springframework/boot/spring-boot-test-autoconfigure/2.3.12.RELEASE/spring-boot-test-autoconfigure-2.3.12.RELEASE.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/org/springframework/boot/spring-boot-test-autoconfigure/2.3.12.RELEASE/spring-boot-test-autoconfigure-2.3.12.RELEASE-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/org/springframework/boot/spring-boot-test-autoconfigure/2.3.12.RELEASE/spring-boot-test-autoconfigure-2.3.12.RELEASE-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: org.springframework.boot:spring-boot-test:2.3.12.RELEASE"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/org/springframework/boot/spring-boot-test/2.3.12.RELEASE/spring-boot-test-2.3.12.RELEASE.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/org/springframework/boot/spring-boot-test/2.3.12.RELEASE/spring-boot-test-2.3.12.RELEASE-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/org/springframework/boot/spring-boot-test/2.3.12.RELEASE/spring-boot-test-2.3.12.RELEASE-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: org.springframework.boot:spring-boot:2.3.12.RELEASE"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/org/springframework/boot/spring-boot/2.3.12.RELEASE/spring-boot-2.3.12.RELEASE.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/org/springframework/boot/spring-boot/2.3.12.RELEASE/spring-boot-2.3.12.RELEASE-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/org/springframework/boot/spring-boot/2.3.12.RELEASE/spring-boot-2.3.12.RELEASE-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: org.springframework.cloud:spring-cloud-commons:2.2.9.RELEASE"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/org/springframework/cloud/spring-cloud-commons/2.2.9.RELEASE/spring-cloud-commons-2.2.9.RELEASE.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/org/springframework/cloud/spring-cloud-commons/2.2.9.RELEASE/spring-cloud-commons-2.2.9.RELEASE-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/org/springframework/cloud/spring-cloud-commons/2.2.9.RELEASE/spring-cloud-commons-2.2.9.RELEASE-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: org.springframework.cloud:spring-cloud-context:2.2.9.RELEASE"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/org/springframework/cloud/spring-cloud-context/2.2.9.RELEASE/spring-cloud-context-2.2.9.RELEASE.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/org/springframework/cloud/spring-cloud-context/2.2.9.RELEASE/spring-cloud-context-2.2.9.RELEASE-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/org/springframework/cloud/spring-cloud-context/2.2.9.RELEASE/spring-cloud-context-2.2.9.RELEASE-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: org.springframework.cloud:spring-cloud-gateway-server:2.2.9.RELEASE"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/org/springframework/cloud/spring-cloud-gateway-server/2.2.9.RELEASE/spring-cloud-gateway-server-2.2.9.RELEASE.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/org/springframework/cloud/spring-cloud-gateway-server/2.2.9.RELEASE/spring-cloud-gateway-server-2.2.9.RELEASE-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/org/springframework/cloud/spring-cloud-gateway-server/2.2.9.RELEASE/spring-cloud-gateway-server-2.2.9.RELEASE-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: org.springframework.cloud:spring-cloud-netflix-archaius:2.2.9.RELEASE"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/org/springframework/cloud/spring-cloud-netflix-archaius/2.2.9.RELEASE/spring-cloud-netflix-archaius-2.2.9.RELEASE.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/org/springframework/cloud/spring-cloud-netflix-archaius/2.2.9.RELEASE/spring-cloud-netflix-archaius-2.2.9.RELEASE-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/org/springframework/cloud/spring-cloud-netflix-archaius/2.2.9.RELEASE/spring-cloud-netflix-archaius-2.2.9.RELEASE-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: org.springframework.cloud:spring-cloud-netflix-ribbon:2.2.9.RELEASE"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/org/springframework/cloud/spring-cloud-netflix-ribbon/2.2.9.RELEASE/spring-cloud-netflix-ribbon-2.2.9.RELEASE.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/org/springframework/cloud/spring-cloud-netflix-ribbon/2.2.9.RELEASE/spring-cloud-netflix-ribbon-2.2.9.RELEASE-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/org/springframework/cloud/spring-cloud-netflix-ribbon/2.2.9.RELEASE/spring-cloud-netflix-ribbon-2.2.9.RELEASE-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: org.springframework.cloud:spring-cloud-openfeign-core:2.2.9.RELEASE"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/org/springframework/cloud/spring-cloud-openfeign-core/2.2.9.RELEASE/spring-cloud-openfeign-core-2.2.9.RELEASE.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/org/springframework/cloud/spring-cloud-openfeign-core/2.2.9.RELEASE/spring-cloud-openfeign-core-2.2.9.RELEASE-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/org/springframework/cloud/spring-cloud-openfeign-core/2.2.9.RELEASE/spring-cloud-openfeign-core-2.2.9.RELEASE-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: org.springframework.cloud:spring-cloud-starter-gateway:2.2.9.RELEASE"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/org/springframework/cloud/spring-cloud-starter-gateway/2.2.9.RELEASE/spring-cloud-starter-gateway-2.2.9.RELEASE.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/org/springframework/cloud/spring-cloud-starter-gateway/2.2.9.RELEASE/spring-cloud-starter-gateway-2.2.9.RELEASE-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/org/springframework/cloud/spring-cloud-starter-gateway/2.2.9.RELEASE/spring-cloud-starter-gateway-2.2.9.RELEASE-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: org.springframework.cloud:spring-cloud-starter-netflix-archaius:2.2.9.RELEASE"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/org/springframework/cloud/spring-cloud-starter-netflix-archaius/2.2.9.RELEASE/spring-cloud-starter-netflix-archaius-2.2.9.RELEASE.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/org/springframework/cloud/spring-cloud-starter-netflix-archaius/2.2.9.RELEASE/spring-cloud-starter-netflix-archaius-2.2.9.RELEASE-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/org/springframework/cloud/spring-cloud-starter-netflix-archaius/2.2.9.RELEASE/spring-cloud-starter-netflix-archaius-2.2.9.RELEASE-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: org.springframework.cloud:spring-cloud-starter-netflix-ribbon:2.2.9.RELEASE"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/org/springframework/cloud/spring-cloud-starter-netflix-ribbon/2.2.9.RELEASE/spring-cloud-starter-netflix-ribbon-2.2.9.RELEASE.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/org/springframework/cloud/spring-cloud-starter-netflix-ribbon/2.2.9.RELEASE/spring-cloud-starter-netflix-ribbon-2.2.9.RELEASE-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/org/springframework/cloud/spring-cloud-starter-netflix-ribbon/2.2.9.RELEASE/spring-cloud-starter-netflix-ribbon-2.2.9.RELEASE-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: org.springframework.cloud:spring-cloud-starter-openfeign:2.2.9.RELEASE"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/org/springframework/cloud/spring-cloud-starter-openfeign/2.2.9.RELEASE/spring-cloud-starter-openfeign-2.2.9.RELEASE.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/org/springframework/cloud/spring-cloud-starter-openfeign/2.2.9.RELEASE/spring-cloud-starter-openfeign-2.2.9.RELEASE-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/org/springframework/cloud/spring-cloud-starter-openfeign/2.2.9.RELEASE/spring-cloud-starter-openfeign-2.2.9.RELEASE-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: org.springframework.cloud:spring-cloud-starter:2.2.9.RELEASE"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/org/springframework/cloud/spring-cloud-starter/2.2.9.RELEASE/spring-cloud-starter-2.2.9.RELEASE.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/org/springframework/cloud/spring-cloud-starter/2.2.9.RELEASE/spring-cloud-starter-2.2.9.RELEASE-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/org/springframework/cloud/spring-cloud-starter/2.2.9.RELEASE/spring-cloud-starter-2.2.9.RELEASE-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: org.springframework.data:spring-data-commons:2.3.9.RELEASE"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/org/springframework/data/spring-data-commons/2.3.9.RELEASE/spring-data-commons-2.3.9.RELEASE.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/org/springframework/data/spring-data-commons/2.3.9.RELEASE/spring-data-commons-2.3.9.RELEASE-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/org/springframework/data/spring-data-commons/2.3.9.RELEASE/spring-data-commons-2.3.9.RELEASE-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: org.springframework.data:spring-data-keyvalue:2.3.9.RELEASE"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/org/springframework/data/spring-data-keyvalue/2.3.9.RELEASE/spring-data-keyvalue-2.3.9.RELEASE.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/org/springframework/data/spring-data-keyvalue/2.3.9.RELEASE/spring-data-keyvalue-2.3.9.RELEASE-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/org/springframework/data/spring-data-keyvalue/2.3.9.RELEASE/spring-data-keyvalue-2.3.9.RELEASE-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: org.springframework.data:spring-data-redis:2.3.9.RELEASE"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/org/springframework/data/spring-data-redis/2.3.9.RELEASE/spring-data-redis-2.3.9.RELEASE.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/org/springframework/data/spring-data-redis/2.3.9.RELEASE/spring-data-redis-2.3.9.RELEASE-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/org/springframework/data/spring-data-redis/2.3.9.RELEASE/spring-data-redis-2.3.9.RELEASE-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: org.springframework.plugin:spring-plugin-core:2.0.0.RELEASE"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/org/springframework/plugin/spring-plugin-core/2.0.0.RELEASE/spring-plugin-core-2.0.0.RELEASE.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/org/springframework/plugin/spring-plugin-core/2.0.0.RELEASE/spring-plugin-core-2.0.0.RELEASE-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/org/springframework/plugin/spring-plugin-core/2.0.0.RELEASE/spring-plugin-core-2.0.0.RELEASE-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: org.springframework.plugin:spring-plugin-metadata:2.0.0.RELEASE"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/org/springframework/plugin/spring-plugin-metadata/2.0.0.RELEASE/spring-plugin-metadata-2.0.0.RELEASE.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/org/springframework/plugin/spring-plugin-metadata/2.0.0.RELEASE/spring-plugin-metadata-2.0.0.RELEASE-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/org/springframework/plugin/spring-plugin-metadata/2.0.0.RELEASE/spring-plugin-metadata-2.0.0.RELEASE-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: org.springframework.security.oauth.boot:spring-security-oauth2-autoconfigure:2.1.2.RELEASE"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/org/springframework/security/oauth/boot/spring-security-oauth2-autoconfigure/2.1.2.RELEASE/spring-security-oauth2-autoconfigure-2.1.2.RELEASE.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/org/springframework/security/oauth/boot/spring-security-oauth2-autoconfigure/2.1.2.RELEASE/spring-security-oauth2-autoconfigure-2.1.2.RELEASE-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/org/springframework/security/oauth/boot/spring-security-oauth2-autoconfigure/2.1.2.RELEASE/spring-security-oauth2-autoconfigure-2.1.2.RELEASE-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: org.springframework.security.oauth:spring-security-oauth2:2.3.4.RELEASE"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/org/springframework/security/oauth/spring-security-oauth2/2.3.4.RELEASE/spring-security-oauth2-2.3.4.RELEASE.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/org/springframework/security/oauth/spring-security-oauth2/2.3.4.RELEASE/spring-security-oauth2-2.3.4.RELEASE-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/org/springframework/security/oauth/spring-security-oauth2/2.3.4.RELEASE/spring-security-oauth2-2.3.4.RELEASE-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: org.springframework.security:spring-security-config:5.3.9.RELEASE"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/org/springframework/security/spring-security-config/5.3.9.RELEASE/spring-security-config-5.3.9.RELEASE.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/org/springframework/security/spring-security-config/5.3.9.RELEASE/spring-security-config-5.3.9.RELEASE-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/org/springframework/security/spring-security-config/5.3.9.RELEASE/spring-security-config-5.3.9.RELEASE-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: org.springframework.security:spring-security-core:5.3.9.RELEASE"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/org/springframework/security/spring-security-core/5.3.9.RELEASE/spring-security-core-5.3.9.RELEASE.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/org/springframework/security/spring-security-core/5.3.9.RELEASE/spring-security-core-5.3.9.RELEASE-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/org/springframework/security/spring-security-core/5.3.9.RELEASE/spring-security-core-5.3.9.RELEASE-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: org.springframework.security:spring-security-crypto:5.3.9.RELEASE"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/org/springframework/security/spring-security-crypto/5.3.9.RELEASE/spring-security-crypto-5.3.9.RELEASE.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/org/springframework/security/spring-security-crypto/5.3.9.RELEASE/spring-security-crypto-5.3.9.RELEASE-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/org/springframework/security/spring-security-crypto/5.3.9.RELEASE/spring-security-crypto-5.3.9.RELEASE-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: org.springframework.security:spring-security-jwt:1.0.9.RELEASE"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/org/springframework/security/spring-security-jwt/1.0.9.RELEASE/spring-security-jwt-1.0.9.RELEASE.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/org/springframework/security/spring-security-jwt/1.0.9.RELEASE/spring-security-jwt-1.0.9.RELEASE-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/org/springframework/security/spring-security-jwt/1.0.9.RELEASE/spring-security-jwt-1.0.9.RELEASE-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: org.springframework.security:spring-security-oauth2-core:5.3.9.RELEASE"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/org/springframework/security/spring-security-oauth2-core/5.3.9.RELEASE/spring-security-oauth2-core-5.3.9.RELEASE.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/org/springframework/security/spring-security-oauth2-core/5.3.9.RELEASE/spring-security-oauth2-core-5.3.9.RELEASE-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/org/springframework/security/spring-security-oauth2-core/5.3.9.RELEASE/spring-security-oauth2-core-5.3.9.RELEASE-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: org.springframework.security:spring-security-oauth2-jose:5.3.9.RELEASE"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/org/springframework/security/spring-security-oauth2-jose/5.3.9.RELEASE/spring-security-oauth2-jose-5.3.9.RELEASE.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/org/springframework/security/spring-security-oauth2-jose/5.3.9.RELEASE/spring-security-oauth2-jose-5.3.9.RELEASE-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/org/springframework/security/spring-security-oauth2-jose/5.3.9.RELEASE/spring-security-oauth2-jose-5.3.9.RELEASE-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: org.springframework.security:spring-security-oauth2-resource-server:5.3.9.RELEASE"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/org/springframework/security/spring-security-oauth2-resource-server/5.3.9.RELEASE/spring-security-oauth2-resource-server-5.3.9.RELEASE.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/org/springframework/security/spring-security-oauth2-resource-server/5.3.9.RELEASE/spring-security-oauth2-resource-server-5.3.9.RELEASE-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/org/springframework/security/spring-security-oauth2-resource-server/5.3.9.RELEASE/spring-security-oauth2-resource-server-5.3.9.RELEASE-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: org.springframework.security:spring-security-rsa:1.0.9.RELEASE"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/org/springframework/security/spring-security-rsa/1.0.9.RELEASE/spring-security-rsa-1.0.9.RELEASE.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/org/springframework/security/spring-security-rsa/1.0.9.RELEASE/spring-security-rsa-1.0.9.RELEASE-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/org/springframework/security/spring-security-rsa/1.0.9.RELEASE/spring-security-rsa-1.0.9.RELEASE-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: org.springframework.security:spring-security-web:5.3.9.RELEASE"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/org/springframework/security/spring-security-web/5.3.9.RELEASE/spring-security-web-5.3.9.RELEASE.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/org/springframework/security/spring-security-web/5.3.9.RELEASE/spring-security-web-5.3.9.RELEASE-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/org/springframework/security/spring-security-web/5.3.9.RELEASE/spring-security-web-5.3.9.RELEASE-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: org.springframework:spring-aop:5.2.15.RELEASE"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/org/springframework/spring-aop/5.2.15.RELEASE/spring-aop-5.2.15.RELEASE.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/org/springframework/spring-aop/5.2.15.RELEASE/spring-aop-5.2.15.RELEASE-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/org/springframework/spring-aop/5.2.15.RELEASE/spring-aop-5.2.15.RELEASE-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: org.springframework:spring-beans:5.2.15.RELEASE"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/org/springframework/spring-beans/5.2.15.RELEASE/spring-beans-5.2.15.RELEASE.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/org/springframework/spring-beans/5.2.15.RELEASE/spring-beans-5.2.15.RELEASE-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/org/springframework/spring-beans/5.2.15.RELEASE/spring-beans-5.2.15.RELEASE-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: org.springframework:spring-context-support:5.2.15.RELEASE"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/org/springframework/spring-context-support/5.2.15.RELEASE/spring-context-support-5.2.15.RELEASE.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/org/springframework/spring-context-support/5.2.15.RELEASE/spring-context-support-5.2.15.RELEASE-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/org/springframework/spring-context-support/5.2.15.RELEASE/spring-context-support-5.2.15.RELEASE-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: org.springframework:spring-context:5.2.15.RELEASE"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/org/springframework/spring-context/5.2.15.RELEASE/spring-context-5.2.15.RELEASE.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/org/springframework/spring-context/5.2.15.RELEASE/spring-context-5.2.15.RELEASE-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/org/springframework/spring-context/5.2.15.RELEASE/spring-context-5.2.15.RELEASE-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: org.springframework:spring-core:5.2.15.RELEASE"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/org/springframework/spring-core/5.2.15.RELEASE/spring-core-5.2.15.RELEASE.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/org/springframework/spring-core/5.2.15.RELEASE/spring-core-5.2.15.RELEASE-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/org/springframework/spring-core/5.2.15.RELEASE/spring-core-5.2.15.RELEASE-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: org.springframework:spring-expression:5.2.15.RELEASE"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/org/springframework/spring-expression/5.2.15.RELEASE/spring-expression-5.2.15.RELEASE.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/org/springframework/spring-expression/5.2.15.RELEASE/spring-expression-5.2.15.RELEASE-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/org/springframework/spring-expression/5.2.15.RELEASE/spring-expression-5.2.15.RELEASE-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: org.springframework:spring-jcl:5.2.15.RELEASE"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/org/springframework/spring-jcl/5.2.15.RELEASE/spring-jcl-5.2.15.RELEASE.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/org/springframework/spring-jcl/5.2.15.RELEASE/spring-jcl-5.2.15.RELEASE-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/org/springframework/spring-jcl/5.2.15.RELEASE/spring-jcl-5.2.15.RELEASE-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: org.springframework:spring-jdbc:5.2.15.RELEASE"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/org/springframework/spring-jdbc/5.2.15.RELEASE/spring-jdbc-5.2.15.RELEASE.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/org/springframework/spring-jdbc/5.2.15.RELEASE/spring-jdbc-5.2.15.RELEASE-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/org/springframework/spring-jdbc/5.2.15.RELEASE/spring-jdbc-5.2.15.RELEASE-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: org.springframework:spring-oxm:5.2.15.RELEASE"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/org/springframework/spring-oxm/5.2.15.RELEASE/spring-oxm-5.2.15.RELEASE.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/org/springframework/spring-oxm/5.2.15.RELEASE/spring-oxm-5.2.15.RELEASE-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/org/springframework/spring-oxm/5.2.15.RELEASE/spring-oxm-5.2.15.RELEASE-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: org.springframework:spring-test:5.2.15.RELEASE"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/org/springframework/spring-test/5.2.15.RELEASE/spring-test-5.2.15.RELEASE.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/org/springframework/spring-test/5.2.15.RELEASE/spring-test-5.2.15.RELEASE-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/org/springframework/spring-test/5.2.15.RELEASE/spring-test-5.2.15.RELEASE-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: org.springframework:spring-tx:5.2.15.RELEASE"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/org/springframework/spring-tx/5.2.15.RELEASE/spring-tx-5.2.15.RELEASE.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/org/springframework/spring-tx/5.2.15.RELEASE/spring-tx-5.2.15.RELEASE-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/org/springframework/spring-tx/5.2.15.RELEASE/spring-tx-5.2.15.RELEASE-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: org.springframework:spring-web:5.2.15.RELEASE"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/org/springframework/spring-web/5.2.15.RELEASE/spring-web-5.2.15.RELEASE.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/org/springframework/spring-web/5.2.15.RELEASE/spring-web-5.2.15.RELEASE-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/org/springframework/spring-web/5.2.15.RELEASE/spring-web-5.2.15.RELEASE-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: org.springframework:spring-webflux:5.2.15.RELEASE"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/org/springframework/spring-webflux/5.2.15.RELEASE/spring-webflux-5.2.15.RELEASE.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/org/springframework/spring-webflux/5.2.15.RELEASE/spring-webflux-5.2.15.RELEASE-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/org/springframework/spring-webflux/5.2.15.RELEASE/spring-webflux-5.2.15.RELEASE-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: org.springframework:spring-webmvc:5.2.15.RELEASE"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/org/springframework/spring-webmvc/5.2.15.RELEASE/spring-webmvc-5.2.15.RELEASE.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/org/springframework/spring-webmvc/5.2.15.RELEASE/spring-webmvc-5.2.15.RELEASE-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/org/springframework/spring-webmvc/5.2.15.RELEASE/spring-webmvc-5.2.15.RELEASE-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: org.synchronoss.cloud:nio-multipart-parser:1.1.0"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/org/synchronoss/cloud/nio-multipart-parser/1.1.0/nio-multipart-parser-1.1.0.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/org/synchronoss/cloud/nio-multipart-parser/1.1.0/nio-multipart-parser-1.1.0-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/org/synchronoss/cloud/nio-multipart-parser/1.1.0/nio-multipart-parser-1.1.0-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: org.synchronoss.cloud:nio-stream-storage:1.1.3"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/org/synchronoss/cloud/nio-stream-storage/1.1.3/nio-stream-storage-1.1.3.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/org/synchronoss/cloud/nio-stream-storage/1.1.3/nio-stream-storage-1.1.3-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/org/synchronoss/cloud/nio-stream-storage/1.1.3/nio-stream-storage-1.1.3-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: org.xmlunit:xmlunit-core:2.7.0"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/org/xmlunit/xmlunit-core/2.7.0/xmlunit-core-2.7.0.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/org/xmlunit/xmlunit-core/2.7.0/xmlunit-core-2.7.0-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/org/xmlunit/xmlunit-core/2.7.0/xmlunit-core-2.7.0-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: org.yaml:snakeyaml:1.26"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/org/yaml/snakeyaml/1.26/snakeyaml-1.26.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/org/yaml/snakeyaml/1.26/snakeyaml-1.26-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/org/yaml/snakeyaml/1.26/snakeyaml-1.26-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: xerces:xercesImpl:2.12.1"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/xerces/xercesImpl/2.12.1/xercesImpl-2.12.1.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/xerces/xercesImpl/2.12.1/xercesImpl-2.12.1-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/xerces/xercesImpl/2.12.1/xercesImpl-2.12.1-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: xml-apis:xml-apis-ext:1.3.04"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/xml-apis/xml-apis-ext/1.3.04/xml-apis-ext-1.3.04.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/xml-apis/xml-apis-ext/1.3.04/xml-apis-ext-1.3.04-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/xml-apis/xml-apis-ext/1.3.04/xml-apis-ext-1.3.04-sources.jar!/"/> 
+      </SOURCES> 
+    </library>  
+    <library name="Maven: xml-apis:xml-apis:1.4.01"> 
+      <CLASSES> 
+        <root url="jar://E:/AJava/maven/repository/xml-apis/xml-apis/1.4.01/xml-apis-1.4.01.jar!/"/> 
+      </CLASSES>  
+      <JAVADOC> 
+        <root url="jar://E:/AJava/maven/repository/xml-apis/xml-apis/1.4.01/xml-apis-1.4.01-javadoc.jar!/"/> 
+      </JAVADOC>  
+      <SOURCES> 
+        <root url="jar://E:/AJava/maven/repository/xml-apis/xml-apis/1.4.01/xml-apis-1.4.01-sources.jar!/"/> 
+      </SOURCES> 
+    </library> 
+  </component> 
+</project>