From ab8e86f25754a473aa73e265a071dde1bec6f5cd Mon Sep 17 00:00:00 2001 From: hongawen <83944980@qq.com> Date: Thu, 29 Sep 2022 19:43:14 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B0=86=E7=BB=88=E7=AB=AF=E5=8F=B0=E8=B4=A6?= =?UTF-8?q?=E6=8B=86=E5=88=86=E4=B8=BApq&pms=E4=B8=A4=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 13 +- pqs-advance/advance-boot/pom.xml | 2 +- pqs-common/common-core/pom.xml | 4 + pqs-common/common-influxdb/pom.xml | 1 - .../InfluxDbOkHttpClientBuilderProvider.java | 25 ++ .../influxdb/param/InfluxDBPublicParam.java | 2 +- .../njcn/influxdb/utils/InfluxDbUtils.java | 9 +- .../src/test/java/DataTest.java | 32 +- .../swagger/config/Knife4jSwaggerConfig.java | 4 +- .../{device-api => common-device-biz}/pom.xml | 14 +- .../njcn/device/biz}/enums/LineFlagEnum.java | 2 +- pqs-device/device-boot/pom.xml | 32 +- .../{device => }/DeviceBootApplication.java | 3 +- .../mapper/mapping/FlowStrategyMapper.xml | 5 - .../mapper/mapping/PvDispatchMapper.xml | 5 - .../src/main/resources/bootstrap.yml | 2 +- .../src/test/java/com/njcn/BaseJunitTest.java | 1 - .../src/test/java/com/njcn/DeviceTest.java | 10 +- pqs-device/pms-device/pms-device-api/pom.xml | 26 ++ .../device/pms/pojo/bo/DeviceRunExBO.java | 47 +++ .../device/pms/pojo/dto/DeviceRunExDTO.java | 46 +++ .../pms/pojo/param}/DeviceQueryParam.java | 2 +- .../pojo/param}/DistributedQueryParam.java | 2 +- .../pms/pojo/param}/LineDetailQueryParam.java | 2 +- .../pms/pojo/param}/LvUserQueryParam.java | 2 +- .../device/pms/pojo/param}/PvDeviceParam.java | 4 +- .../pms/pojo/param}/PvDispatchParam.java | 3 +- .../pms/pojo/param}/PvDistributedParam.java | 7 +- .../pms/pojo/param}/PvLineDetailParam.java | 6 +- .../device/pms/pojo/param}/PvLvUserParam.java | 4 +- .../pms/pojo/param}/PvSubAreaParam.java | 5 +- .../pms/pojo/param}/PvSubstationParam.java | 3 +- .../pms/pojo/param}/PvTenVoltageParam.java | 5 +- .../pms/pojo/param}/PvTerminalBaseQuery.java | 4 +- .../device/pms/pojo/param}/PvUnitParam.java | 5 +- .../pms/pojo/param}/PvVoltageParam.java | 6 +- .../pms/pojo/param}/SubAreaQueryParam.java | 2 +- .../pms/pojo/param}/SubstationQueryParam.java | 3 +- .../pms/pojo/param}/TenVoltageQueryParam.java | 3 +- .../pms/pojo/param}/VoltageQueryParam.java | 2 +- .../njcn/device/pms/pojo/po}/PvDevice.java | 10 +- .../njcn/device/pms/pojo/po}/PvDispatch.java | 3 +- .../device/pms/pojo/po}/PvDistributed.java | 11 +- .../device/pms/pojo/po}/PvLineDetail.java | 11 +- .../njcn/device/pms/pojo/po}/PvLvUser.java | 7 +- .../njcn/device/pms/pojo/po}/PvSubArea.java | 7 +- .../device/pms/pojo/po}/PvSubstation.java | 7 +- .../device/pms/pojo/po}/PvTenVoltage.java | 9 +- .../com/njcn/device/pms/pojo/po}/PvUnit.java | 6 +- .../njcn/device/pms/pojo/po}/PvVoltage.java | 7 +- .../device/pms/pojo/vo/DeviceRunExVO.java | 71 ++++ .../njcn/device/pms/pojo/vo}/DisOrLvVO.java | 2 +- .../njcn/device/pms/pojo/vo}/PvDeviceVO.java | 4 +- .../device/pms/pojo/vo}/PvDistributedVO.java | 4 +- .../pms/pojo/vo}/PvLineAllDetailVO.java | 3 +- .../njcn/device/pms/pojo/vo}/PvLvUserVO.java | 4 +- .../njcn/device/pms/pojo/vo}/PvSubAreaVO.java | 4 +- .../device/pms/pojo/vo}/PvSubstationVO.java | 2 +- .../device/pms/pojo/vo}/PvTenVoltageVO.java | 7 +- .../njcn/device/pms/pojo/vo}/UnitTreeVO.java | 2 +- pqs-device/pms-device/pms-device-boot/pom.xml | 55 +++ .../pms}/controller/PvDeviceController.java | 15 +- .../controller/PvDeviceRunExController.java | 48 +++ .../pms}/controller/PvDispatchController.java | 5 +- .../controller/PvDistributedController.java | 15 +- .../controller/PvLineDetailController.java | 13 +- .../pms}/controller/PvLvUserController.java | 15 +- .../pms}/controller/PvSubAreaController.java | 16 +- .../controller/PvSubstationController.java | 16 +- .../controller/PvTenVoltageController.java | 15 +- .../controller/PvTerminalBaseController.java | 10 +- .../pms}/controller/PvUnitController.java | 27 +- .../pms}/controller/PvVoltageController.java | 15 +- .../device/pms}/mapper/PvDeviceMapper.java | 8 +- .../pms/mapper/PvDeviceRunExMapper.java | 22 + .../device/pms}/mapper/PvDispatchMapper.java | 4 +- .../pms}/mapper/PvDistributedMapper.java | 8 +- .../pms}/mapper/PvLineDetailMapper.java | 6 +- .../device/pms}/mapper/PvLvUserMapper.java | 8 +- .../device/pms}/mapper/PvSubAreaMapper.java | 10 +- .../pms}/mapper/PvSubstationMapper.java | 8 +- .../pms}/mapper/PvTenVoltageMapper.java | 8 +- .../njcn/device/pms}/mapper/PvUnitMapper.java | 6 +- .../device/pms}/mapper/PvVoltageMapper.java | 4 +- .../pms}/mapper/mapping/PvDeviceMapper.xml | 2 +- .../mapper/mapping/PvDeviceRunExMapper.xml | 32 ++ .../pms/mapper/mapping/PvDispatchMapper.xml} | 2 +- .../mapper/mapping/PvDistributedMapper.xml | 2 +- .../mapper/mapping/PvLineDetailMapper.xml | 2 +- .../pms}/mapper/mapping/PvLvUserMapper.xml | 2 +- .../pms}/mapper/mapping/PvSubAreaMapper.xml | 2 +- .../mapper/mapping/PvSubstationMapper.xml | 2 +- .../mapper/mapping/PvTenVoltageMapper.xml | 2 +- .../pms}/mapper/mapping/PvUnitMapper.xml | 2 +- .../pms}/mapper/mapping/PvVoltageMapper.xml | 2 +- .../pms/service/IPvDeviceRunExService.java | 24 ++ .../device/pms}/service/IPvDeviceService.java | 11 +- .../pms}/service/IPvDispatchService.java | 4 +- .../pms}/service/IPvDistributedService.java | 11 +- .../pms}/service/IPvLineDetailService.java | 11 +- .../device/pms}/service/IPvLvUserService.java | 11 +- .../pms}/service/IPvSubAreaService.java | 11 +- .../pms}/service/IPvSubstationService.java | 12 +- .../pms}/service/IPvTenVoltageService.java | 11 +- .../device/pms}/service/IPvUnitService.java | 9 +- .../pms}/service/IPvVoltageService.java | 10 +- .../pms}/service/PvTerminalBaseService.java | 8 +- .../impl/PvDeviceRunExServiceImpl.java | 106 +++++ .../service/impl/PvDeviceServiceImpl.java | 19 +- .../service/impl/PvDispatchServiceImpl.java | 8 +- .../impl/PvDistributedServiceImpl.java | 19 +- .../service/impl/PvLineDetailServiceImpl.java | 23 +- .../service/impl/PvLvUserServiceImpl.java | 22 +- .../service/impl/PvSubAreaServiceImpl.java | 25 +- .../service/impl/PvSubstationServiceImpl.java | 30 +- .../service/impl/PvTenVoltageServiceImpl.java | 19 +- .../impl/PvTerminalBaseServiceImpl.java | 33 +- .../pms}/service/impl/PvUnitServiceImpl.java | 16 +- .../service/impl/PvVoltageServiceImpl.java | 19 +- pqs-device/pms-device/pom.xml | 23 ++ pqs-device/pom.xml | 5 +- pqs-device/pq-device/pom.xml | 24 ++ pqs-device/pq-device/pq-device-api/pom.xml | 26 ++ .../com/njcn/device/pq/api/AlarmClient.java | 26 ++ .../device/pq}/api/DeptLineFeignClient.java | 6 +- .../njcn/device/pq}/api/DeviceTreeClient.java | 7 +- .../pq}/api/GeneralDeviceInfoClient.java | 10 +- .../njcn/device/pq}/api/LineFeignClient.java | 21 +- .../device/pq}/api/TerminalBaseClient.java | 12 +- .../fallback/AlarmClientFallbackFactory.java | 42 ++ .../DeptLineFeignClientFallbackFactory.java | 7 +- .../DeviceTreeClientFallbackFactory.java | 10 +- ...eneralDeviceInfoClientFallbackFactory.java | 13 +- .../LineFeignClientFallbackFactory.java | 20 +- .../TerminalBaseClientFallbackFactory.java | 13 +- .../device/pq}/enums/DeviceResponseEnum.java | 11 +- .../njcn/device/pq}/enums/LineBaseEnum.java | 3 +- .../pq}/enums/PvDeviceResponseEnum.java | 2 +- .../njcn/device/pq}/pojo/bo/BaseLineInfo.java | 2 +- .../njcn/device/pq}/pojo/bo/DeviceType.java | 2 +- .../device/pq}/pojo/bo/excel/LineMark.java | 2 +- .../device/pq}/pojo/bo/excel/NodeExcel.java | 2 +- .../pojo/bo/excel/OracleTerminalExcel.java | 4 +- .../pq}/pojo/bo/excel/OverLimitExcel.java | 2 +- .../pq}/pojo/bo/excel/TerminalBaseExcel.java | 6 +- .../pq}/pojo/constant/DeviceValidMessage.java | 2 +- .../device/pq}/pojo/dto/DeviceLineDTO.java | 2 +- .../pq}/pojo/dto/DeviceOnlineDataDTO.java | 2 +- .../device/pq}/pojo/dto/GeneralDeviceDTO.java | 25 +- .../device/pq}/pojo/dto/OnlineLineDTO.java | 2 +- .../device/pq}/pojo/dto/OverLimitLineDTO.java | 2 +- .../device/pq}/pojo/dto/PollutionLineDTO.java | 2 +- .../pq}/pojo/dto/PollutionParamDTO.java | 2 +- .../pq}/pojo/dto/PollutionSubstationDTO.java | 2 +- .../pq}/pojo/dto/WarningSubstationDTO.java | 2 +- .../pq}/pojo/param/AddTerminalParam.java | 2 +- .../device/pq}/pojo/param/AlarmParam.java | 5 +- .../pq}/pojo/param/AlarmStrategyParam.java | 4 +- .../pq}/pojo/param/AreaCensusParam.java | 2 +- .../pq/pojo/param/AreaIntegrityDataParam.java | 19 + .../pq}/pojo/param/DeviceInfoParam.java | 4 +- .../device/pq}/pojo/param/DeviceLogParam.java | 2 +- .../device/pq}/pojo/param/DeviceParam.java | 6 +- .../pojo/param/DeviceRunExceptionParam.java | 54 +++ .../device/pq}/pojo/param/EventLogParam.java | 2 +- .../device/pq}/pojo/param/FlowMealParam.java | 2 +- .../pq}/pojo/param/FlowStrategyParam.java | 2 +- .../pq}/pojo/param/GdInformationParam.java | 2 +- .../pq}/pojo/param/LineBaseQueryParam.java | 3 +- .../pq/pojo/param/LineIntegrityDataParam.java | 31 ++ .../njcn/device/pq}/pojo/param/LineParam.java | 2 +- .../pq}/pojo/param/NodeInformationParam.java | 2 +- .../njcn/device/pq}/pojo/param/NodeParam.java | 3 +- .../device/pq}/pojo/param/ProjectParam.java | 6 +- .../device/pq}/pojo/param/ProvinceParam.java | 4 +- .../device/pq}/pojo/param/PulicTimeParam.java | 4 +- .../pq}/pojo/param/PulicTimeStatisParam.java | 2 +- .../device/pq}/pojo/param/RunManageParam.java | 4 +- .../pq}/pojo/param/SubStationParam.java | 2 +- .../pq}/pojo/param/SubVoltageParam.java | 4 +- .../device/pq}/pojo/param/TabCensusParam.java | 2 +- .../pq}/pojo/param/TerminalLedgerParam.java | 2 +- .../pojo/param/TerminalMainQueryParam.java | 2 +- .../param/TerminalOnlineRateDataParam.java | 32 ++ .../device/pq}/pojo/param/TerminalParam.java | 14 +- .../pq}/pojo/param/UpdateTerminalParam.java | 2 +- .../device/pq}/pojo/param/VersionParam.java | 2 +- .../com/njcn/device/pq}/pojo/po/Alarm.java | 9 +- .../device/pq}/pojo/po/AlarmStrategy.java | 2 +- .../njcn/device/pq}/pojo/po/Communicate.java | 12 +- .../com/njcn/device/pq}/pojo/po/DeptLine.java | 8 +- .../njcn/device/pq}/pojo/po/DevFuction.java | 8 +- .../com/njcn/device/pq}/pojo/po/DevMeal.java | 8 +- .../com/njcn/device/pq}/pojo/po/DevState.java | 9 +- .../njcn/device/pq}/pojo/po/DevStrategy.java | 8 +- .../njcn/device/pq}/pojo/po/DevVersion.java | 9 +- .../com/njcn/device/pq}/pojo/po/Device.java | 6 +- .../njcn/device/pq}/pojo/po/DeviceBak.java | 2 +- .../device/pq/pojo/po/DeviceRunException.java | 78 ++++ .../device/pq}/pojo/po/EventPushLogs.java | 2 +- .../com/njcn/device/pq}/pojo/po/FlowMeal.java | 2 +- .../njcn/device/pq}/pojo/po/FlowStrategy.java | 2 +- .../device/pq}/pojo/po/FlowStrategyDic.java | 2 +- .../com/njcn/device/pq}/pojo/po/Line.java | 7 +- .../com/njcn/device/pq}/pojo/po/LineBak.java | 4 +- .../device/pq/pojo/po/LineDataIntegrity.java | 48 +++ .../njcn/device/pq}/pojo/po/LineDetail.java | 3 +- .../njcn/device/pq}/pojo/po/MonthFlow.java | 6 +- .../com/njcn/device/pq}/pojo/po/Node.java | 7 +- .../njcn/device/pq}/pojo/po/Overlimit.java | 11 +- .../njcn/device/pq}/pojo/po/ProtectValue.java | 6 +- .../njcn/device/pq}/pojo/po/ProtectWord.java | 6 +- .../com/njcn/device/pq}/pojo/po/Push.java | 6 +- .../njcn/device/pq}/pojo/po/StatisFlow.java | 9 +- .../device/pq}/pojo/po/StrategydicFun.java | 2 +- .../njcn/device/pq}/pojo/po/Substation.java | 11 +- .../njcn/device/pq}/pojo/po/TerminalLogs.java | 2 +- .../pq/pojo/po/TerminalOnlineRateData.java | 38 ++ .../com/njcn/device/pq}/pojo/po/TopMsg.java | 2 +- .../com/njcn/device/pq}/pojo/po/Version.java | 2 +- .../com/njcn/device/pq}/pojo/po/Voltage.java | 8 +- .../pq}/pojo/vo/AbnomalCommuncateVO.java | 2 +- .../device/pq}/pojo/vo/AlarmStrategyVO.java | 2 +- .../pq}/pojo/vo/AreaDeviceOnlineVO.java | 2 +- .../pq/pojo/vo/AreaIntegrityDataVO.java | 31 ++ .../device/pq}/pojo/vo/AreaIntegrityVO.java | 2 +- .../device/pq}/pojo/vo/AreaLineInfoVO.java | 6 +- .../pq}/pojo/vo/CommunicateStatisticsVO.java | 2 +- .../device/pq}/pojo/vo/CommunicateVO.java | 2 +- .../device/pq}/pojo/vo/DeptLineTreeVO.java | 2 +- .../device/pq}/pojo/vo/DeviceAbnormalVO.java | 6 +- .../njcn/device/pq}/pojo/vo/DeviceLogVO.java | 2 +- .../pq}/pojo/vo/DeviceOnlineDataVO.java | 2 +- .../device/pq}/pojo/vo/DeviceOnlineTabVO.java | 2 +- .../pq/pojo/vo/DeviceRunExceptionVO.java | 51 +++ .../com/njcn/device/pq}/pojo/vo/DeviceVO.java | 4 +- .../njcn/device/pq}/pojo/vo/EventLogVO.java | 2 +- .../device/pq}/pojo/vo/FlowStrategyVO.java | 2 +- .../device/pq}/pojo/vo/GdInformationVO.java | 9 +- .../device/pq}/pojo/vo/LineDetailDataVO.java | 4 +- .../njcn/device/pq}/pojo/vo/LineDetailVO.java | 2 +- .../device/pq}/pojo/vo/LineDeviceStateVO.java | 2 +- .../pq}/pojo/vo/LineDistributionVO.java | 2 +- .../pq}/pojo/vo/LineFlowMealDetailVO.java | 2 +- .../pq}/pojo/vo/LineInfluxDbInegrityVO.java | 3 +- .../pq}/pojo/vo/LineInfluxDbOnlineVO.java | 2 +- .../pq/pojo/vo/LineIntegrityDataVO.java | 136 +++++++ .../njcn/device/pq}/pojo/vo/LineMarkVO.java | 3 +- .../device/pq}/pojo/vo/LineOverLimitVO.java | 4 +- .../njcn/device/pq}/pojo/vo/LineStateVO.java | 2 +- .../pq}/pojo/vo/LineStaticsValueVO.java | 6 +- .../device/pq}/pojo/vo/LineStaticsViewVO.java | 2 +- .../pq}/pojo/vo/LineStatisticsDetailVO.java | 2 +- .../pq}/pojo/vo/LineStatisticsTableVO.java | 2 +- .../com/njcn/device/pq}/pojo/vo/LineVO.java | 4 +- .../njcn/device/pq}/pojo/vo/ProjectVO.java | 3 +- .../njcn/device/pq}/pojo/vo/ProvinceVO.java | 8 +- .../njcn/device/pq}/pojo/vo/RateOfFlowVO.java | 2 +- .../njcn/device/pq}/pojo/vo/RunManageVO.java | 2 +- .../njcn/device/pq}/pojo/vo/RunTimeVO.java | 2 +- .../pq}/pojo/vo/ShowFlowStrategyVO.java | 2 +- .../device/pq}/pojo/vo/ShowVersionVO.java | 2 +- .../njcn/device/pq}/pojo/vo/SubStationVO.java | 2 +- .../njcn/device/pq}/pojo/vo/SubVoltageVO.java | 2 +- .../pq}/pojo/vo/SubstationDetailVO.java | 2 +- .../device/pq}/pojo/vo/TerminalAlarmVO.java | 2 +- .../device/pq}/pojo/vo/TerminalBaseVO.java | 2 +- .../device/pq}/pojo/vo/TerminalLedgerVO.java | 2 +- .../pq}/pojo/vo/TerminalMaintainVO.java | 2 +- .../pq/pojo/vo/TerminalOnlineRateDataVO.java | 122 ++++++ .../njcn/device/pq}/pojo/vo/TerminalTree.java | 6 +- .../njcn/device/pq}/pojo/vo/TerminalVO.java | 3 +- .../device/pq}/pojo/vo/TerminalVersionVO.java | 2 +- .../njcn/device/pq}/pojo/vo/VersionVO.java | 2 +- .../com/njcn/device/pq}/utils/COverlimit.java | 10 +- .../njcn/device/pq}/utils/DeviceEnumUtil.java | 5 +- .../njcn/device/pq}/utils/PublicDateUtil.java | 2 +- pqs-device/pq-device/pq-device-boot/pom.xml | 54 +++ .../pq}/controller/AlarmController.java | 8 +- .../pq}/controller/AreaCensusController.java | 12 +- .../AreaIntegrityDataController.java | 59 +++ .../pq}/controller/CommunicateController.java | 20 +- .../pq}/controller/DeptLineController.java | 4 +- .../DeviceRunExceptionController.java | 61 +++ .../GeneralDeviceInfoController.java | 12 +- .../device/pq}/controller/LineController.java | 49 +-- .../LineIntegrityDataController.java | 53 +++ .../pq}/controller/LineMarkController.java | 13 +- .../pq}/controller/LogManageController.java | 12 +- .../device/pq}/controller/NodeController.java | 12 +- .../controller/OperationContrController.java | 8 +- .../controller/ProgramVersionController.java | 6 +- .../pq}/controller/RateOfFlowController.java | 16 +- .../pq}/controller/RunManageController.java | 28 +- .../pq}/controller/TabCensusController.java | 8 +- .../controller/TerminalAlarmController.java | 12 +- .../controller/TerminalBaseController.java | 26 +- .../TerminalMaintainController.java | 29 +- .../TerminalOnlineRateDataController.java | 51 +++ .../controller/TerminalTreeController.java | 15 +- .../controller/TerminalVersionController.java | 11 +- .../njcn/device/pq}/mapper/AlarmMapper.java | 6 +- .../pq}/mapper/AlarmStrategyMapper.java | 6 +- .../pq}/mapper/AreaDeviceOnlineMapper.java | 2 +- .../pq/mapper/AreaIntegrityDataMapper.java | 15 + .../device/pq}/mapper/CommunicateMapper.java | 4 +- .../device/pq}/mapper/DeptLineMapper.java | 4 +- .../device/pq}/mapper/DevFuctionMapper.java | 4 +- .../njcn/device/pq}/mapper/DevMealMapper.java | 4 +- .../device/pq}/mapper/DevStateMapper.java | 4 +- .../device/pq}/mapper/DevStrategyMapper.java | 4 +- .../device/pq}/mapper/DevVersionMapper.java | 4 +- .../device/pq}/mapper/DeviceBakMapper.java | 4 +- .../njcn/device/pq}/mapper/DeviceMapper.java | 9 +- .../pq}/mapper/DeviceOnlineDataMapper.java | 6 +- .../pq/mapper/DeviceRunExceptionMapper.java | 24 ++ .../device/pq}/mapper/FlowMealMapper.java | 4 +- .../pq}/mapper/FlowStrategyDicMapper.java | 4 +- .../device/pq}/mapper/FlowStrategyMapper.java | 4 +- .../njcn/device/pq}/mapper/LineBakMapper.java | 4 +- .../device/pq}/mapper/LineDetailMapper.java | 4 +- .../pq/mapper/LineIntegrityDataMapper.java | 57 +++ .../njcn/device/pq}/mapper/LineMapper.java | 36 +- .../device/pq}/mapper/LineMarkMapper.java | 6 +- .../device/pq}/mapper/LogManageMapper.java | 6 +- .../device/pq}/mapper/MonthFlowMapper.java | 4 +- .../njcn/device/pq}/mapper/NodeMapper.java | 4 +- .../device/pq}/mapper/OverlimitMapper.java | 4 +- .../pq}/mapper/ProgramVersionMapper.java | 6 +- .../device/pq}/mapper/ProtectValueMapper.java | 4 +- .../device/pq}/mapper/ProtectWordMapper.java | 4 +- .../device/pq}/mapper/RateOfFlowMapper.java | 8 +- .../device/pq}/mapper/StatisFlowMapper.java | 4 +- .../pq}/mapper/StrategydicFunMapper.java | 4 +- .../device/pq}/mapper/SubstationMapper.java | 6 +- .../pq}/mapper/TerminalMaintainMapper.java | 4 +- .../mapper/TerminalOnlineRateDataMapper.java | 70 ++++ .../pq}/mapper/TerminalVersionMapper.java | 8 +- .../njcn/device/pq}/mapper/TreeMapper.java | 4 +- .../njcn/device/pq}/mapper/VersionMapper.java | 4 +- .../njcn/device/pq}/mapper/VoltageMapper.java | 4 +- .../device/pq}/mapper/mapping/AlarmMapper.xml | 2 +- .../mapper/mapping/AlarmStrategyMapper.xml | 2 +- .../mapper/mapping/AreaDeviceOnlineMapper.xml | 2 +- .../mapping/AreaIntegrityDataMapper.xml | 5 + .../pq}/mapper/mapping/CommunicateMapper.xml | 2 +- .../pq}/mapper/mapping/DeptLineMapper.xml | 2 +- .../pq}/mapper/mapping/DevFuctionMapper.xml | 2 +- .../pq}/mapper/mapping/DevMealMapper.xml | 2 +- .../pq}/mapper/mapping/DevStateMapper.xml | 2 +- .../pq}/mapper/mapping/DevStrategyMapper.xml | 2 +- .../pq}/mapper/mapping/DevVersionMapper.xml | 2 +- .../pq}/mapper/mapping/DeviceBakMapper.xml | 2 +- .../pq}/mapper/mapping/DeviceMapper.xml | 6 +- .../mapper/mapping/DeviceOnlineDataMapper.xml | 2 +- .../mapping/DeviceRunExceptionMapper.xml | 31 ++ .../pq}/mapper/mapping/FlowMealMapper.xml | 2 +- .../mapper/mapping/FlowStrategyDicMapper.xml | 5 + .../pq/mapper/mapping/FlowStrategyMapper.xml} | 2 +- .../pq}/mapper/mapping/LineBakMapper.xml | 2 +- .../pq}/mapper/mapping/LineDetailMapper.xml | 2 +- .../mapping/LineIntegrityDataMapper.xml | 126 ++++++ .../device/pq}/mapper/mapping/LineMapper.xml | 32 +- .../pq}/mapper/mapping/LineMarkMapper.xml | 2 +- .../pq}/mapper/mapping/LogManageMapper.xml | 2 +- .../pq}/mapper/mapping/MonthFlowMapper.xml | 2 +- .../device/pq}/mapper/mapping/NodeMapper.xml | 2 +- .../pq}/mapper/mapping/OverlimitMapper.xml | 2 +- .../mapper/mapping/ProgramVersionMapper.xml | 2 +- .../pq}/mapper/mapping/ProtectValueMapper.xml | 2 +- .../pq}/mapper/mapping/ProtectWordMapper.xml | 2 +- .../pq}/mapper/mapping/RateOfFlowMapper.xml | 2 +- .../pq}/mapper/mapping/StatisFlowMapper.xml | 2 +- .../mapper/mapping/StrategydicFunMapper.xml | 5 + .../pq}/mapper/mapping/SubstationMapper.xml | 4 +- .../mapper/mapping/TerminalMaintainMapper.xml | 2 +- .../mapping/TerminalOnlineRateDataMapper.xml | 188 +++++++++ .../mapper/mapping/TerminalVersionMapper.xml | 2 +- .../device/pq}/mapper/mapping/TreeMapper.xml | 18 +- .../pq}/mapper/mapping/VersionMapper.xml | 2 +- .../pq}/mapper/mapping/VoltageMapper.xml | 2 +- .../pq}/service/AlarmStrategyService.java | 6 +- .../pq}/service/AreaDeviceOnlineService.java | 6 +- .../pq/service/AreaIntegrityDataService.java | 23 ++ .../pq}/service/AreaIntegrityService.java | 6 +- .../pq}/service/CommunicateService.java | 12 +- .../device/pq}/service/DeptLineService.java | 4 +- .../device/pq}/service/DeviceBakService.java | 4 +- .../pq}/service/DeviceOnlineDataService.java | 6 +- .../pq}/service/DeviceOnlineService.java | 2 +- .../pq/service/DeviceRunExceptionService.java | 23 ++ .../device/pq}/service/FlowMealService.java | 8 +- .../pq}/service/FlowStrategyService.java | 10 +- .../device/pq}/service/IDevMealService.java | 4 +- .../pq}/service/IDevStrategyService.java | 4 +- .../device/pq}/service/IDeviceService.java | 4 +- .../njcn/device/pq}/service/INodeService.java | 11 +- .../device/pq}/service/LineBakService.java | 4 +- .../pq/service/LineIntegrityDataService.java | 21 + .../device/pq}/service/LineMarkService.java | 10 +- .../njcn/device/pq}/service/LineService.java | 16 +- .../device/pq}/service/LogManageService.java | 10 +- .../pq}/service/ProgramVersionService.java | 4 +- .../device/pq}/service/RunManageService.java | 14 +- .../pq}/service/TerminalAlarmService.java | 9 +- .../pq}/service/TerminalBaseService.java | 24 +- .../pq}/service/TerminalMaintainService.java | 14 +- .../TerminalOnlineRateDataService.java | 22 + .../pq}/service/TerminalTreeService.java | 8 +- .../pq}/service/TerminalVersionService.java | 9 +- .../impl/AlarmStrategyServiceImpl.java | 16 +- .../impl/AreaDeviceOnlineServiceImpl.java | 20 +- .../impl/AreaIntegrityDataServiceImpl.java | 55 +++ .../impl/AreaIntegrityServiceImpl.java | 18 +- .../service/impl/CommunicateServiceImpl.java | 23 +- .../pq}/service/impl/DeptLineServiceImpl.java | 9 +- .../pq}/service/impl/DevMealServiceImpl.java | 8 +- .../service/impl/DevStrategyServiceImpl.java | 8 +- .../service/impl/DeviceBakServiceImpl.java | 8 +- .../impl/DeviceOnlineDataServiceImpl.java | 18 +- .../impl/DeviceRunExceptionServiceImpl.java | 331 +++++++++++++++ .../pq}/service/impl/DeviceServiceImpl.java | 8 +- .../pq}/service/impl/FlowMealServiceImpl.java | 16 +- .../service/impl/FlowStrategyServiceImpl.java | 26 +- .../service/impl/GeneralDeviceService.java | 21 +- .../pq}/service/impl/LineBakServiceImpl.java | 8 +- .../impl/LineIntegrityDataServiceImpl.java | 244 ++++++++++++ .../pq}/service/impl/LineMarkServiceImpl.java | 22 +- .../pq}/service/impl/LineServiceImpl.java | 53 ++- .../service/impl/LogManageServiceImpl.java | 20 +- .../pq}/service/impl/NodeServiceImpl.java | 17 +- .../impl/ProgramVersionServiceImpl.java | 16 +- .../service/impl/RunManageServiceImpl.java | 52 +-- .../impl/TerminalAlarmServiceImpl.java | 12 +- .../service/impl/TerminalBaseServiceImpl.java | 40 +- .../impl/TerminalMaintainServiceImpl.java | 41 +- .../TerminalOnlineRateDataServiceImpl.java | 233 +++++++++++ .../service/impl/TerminalTreeServiceImpl.java | 57 +-- .../impl/TerminalVersionServiceImpl.java | 21 +- .../device/pq/utils/DataStatisticsUtil.java | 199 +++++++++ .../com/njcn/device/pq}/utils/DeviceUtil.java | 2 +- .../njcn/device/pq}/utils/ExcelStyleUtil.java | 3 +- .../njcn/device/pq/utils/SpiltDateUtil.java | 377 ++++++++++++++++++ pqs-event/event-api/pom.xml | 2 +- .../event/pojo/param/AreaReportParam.java | 2 +- .../njcn/event/pojo/param/ExportParam.java | 1 - .../njcn/event/pojo/param/TransientParam.java | 2 +- .../njcn/event/pojo/param/WaveTypeParam.java | 2 +- .../com/njcn/event/pojo/po/EventDetail.java | 6 +- .../com/njcn/event/pojo/vo/AreaLineVO.java | 2 +- .../com/njcn/event/pojo/vo/AreaSubLineVO.java | 2 +- .../java/com/njcn/event/pojo/vo/DetailVO.java | 2 +- .../com/njcn/event/pojo/vo/WaveTypeVO.java | 4 - pqs-event/event-boot/pom.xml | 2 +- .../controller/AreaAnalysisController.java | 2 +- .../njcn/event/controller/AreaController.java | 2 +- .../controller/AreaStatisticalController.java | 2 +- .../event/controller/ReportController.java | 4 +- .../controller/area/AreaInfoController.java | 4 +- .../event/service/AreaAnalysisService.java | 2 +- .../njcn/event/service/AreaInfoService.java | 4 +- .../njcn/event/service/AreaLineService.java | 2 +- .../event/service/AreaStatisticalService.java | 2 +- .../service/Impl/AreaAnalysisServiceImpl.java | 10 +- .../service/Impl/AreaInfoServiceImpl.java | 16 +- .../service/Impl/AreaLineServiceImpl.java | 16 +- .../Impl/AreaStatisticalServiceImpl.java | 6 +- .../Impl/EventAnalysisServiceImpl.java | 6 +- .../event/service/Impl/ReportServiceImpl.java | 14 +- .../service/Impl/TransientServiceImpl.java | 10 +- .../com/njcn/event/service/ReportService.java | 2 +- pqs-harmonic/harmonic-api/pom.xml | 2 +- .../harmonic/pojo/param/HarmInHarmParam.java | 2 +- .../pojo/param/HarmonicPublicParam.java | 2 +- .../pojo/param/ReportTemplateParam.java | 1 - .../com/njcn/harmonic/pojo/vo/OverAreaVO.java | 3 +- pqs-harmonic/harmonic-boot/pom.xml | 2 +- .../controller/AnalyzeController.java | 4 +- .../harmonic/controller/AssesController.java | 2 +- .../controller/ComAssessController.java | 2 +- .../controller/IntegrityController.java | 2 +- .../controller/OnlineRateDataController.java | 2 +- .../controller/PhotovoltaicController.java | 2 +- .../controller/PollutionController.java | 4 +- .../controller/SteadyDataController.java | 2 +- .../SteadyExceedRateController.java | 2 +- .../controller/SteadyQualifyController.java | 2 +- .../harmonic/controller/THDController.java | 2 +- .../controller/TerminalController.java | 2 +- .../njcn/harmonic/service/AssesService.java | 2 +- .../harmonic/service/ComAssessService.java | 2 +- .../harmonic/service/IPollutionService.java | 4 +- .../harmonic/service/IntegrityService.java | 2 +- .../service/OnlineRateDataService.java | 2 +- .../harmonic/service/SteadyDataService.java | 2 +- .../service/SteadyExceedRateService.java | 2 +- .../service/SteadyQualifyService.java | 2 +- .../harmonic/service/THDistortionService.java | 2 +- .../harmonic/service/TerminalService.java | 2 +- .../service/impl/AnalyzeServiceImpl.java | 12 +- .../service/impl/AssesServiceImpl.java | 2 +- .../service/impl/ComAssessServiceImpl.java | 6 +- .../service/impl/HarmInHarmServiceImpl.java | 4 +- .../service/impl/HarmonicServiceImpl.java | 12 +- .../impl/HistoryResultServiceImpl.java | 6 +- .../service/impl/IntegrityServiceImpl.java | 8 +- .../service/impl/NormLimitServiceImpl.java | 4 +- .../impl/OnlineRateDataServiceImpl.java | 6 +- .../service/impl/PhotovoltaicServiceImpl.java | 12 +- .../service/impl/PollutionServiceImpl.java | 12 +- .../service/impl/SteadyDataServiceImpl.java | 2 +- .../impl/SteadyExceedRateServiceImpl.java | 8 +- .../impl/SteadyQualifyServiceImpl.java | 8 +- .../service/impl/THDistortionServiceImpl.java | 8 +- .../service/impl/TerminalServiceImpl.java | 6 +- pqs-job/job-executor/pom.xml | 8 +- .../handler/ClonePqsOnlineRateJob.java | 5 +- .../com/njcn/executor/handler/DayJob.java | 2 +- .../executor/handler/EleIntegrityJob.java | 2 +- .../executor/handler/EleOnlineRateJob.java | 2 +- .../njcn/executor/handler/ElectricCalJob.java | 2 +- .../njcn/executor/handler/LimitRateJob.java | 6 +- .../njcn/executor/handler/LimitTargetJob.java | 6 +- .../njcn/executor/handler/PollutionJob.java | 6 +- .../executor/handler/PqsIntegrityJob.java | 4 +- .../executor/handler/PqsOnlineRateJob.java | 2 +- .../src/main/resources/bootstrap.yml | 4 +- pqs-job/job-executor/src/test/java/Test1.java | 4 +- pqs-user/user-boot/pom.xml | 2 +- .../user/service/impl/DeptServiceImpl.java | 2 +- 530 files changed, 5060 insertions(+), 1863 deletions(-) create mode 100644 pqs-common/common-influxdb/src/main/java/com/njcn/influxdb/config/InfluxDbOkHttpClientBuilderProvider.java rename pqs-device/{device-api => common-device-biz}/pom.xml (92%) rename pqs-device/{device-api/src/main/java/com/njcn/device => common-device-biz/src/main/java/com/njcn/device/biz}/enums/LineFlagEnum.java (94%) rename pqs-device/device-boot/src/main/java/com/njcn/{device => }/DeviceBootApplication.java (86%) delete mode 100644 pqs-device/device-boot/src/main/java/com/njcn/device/mapper/mapping/FlowStrategyMapper.xml delete mode 100644 pqs-device/device-boot/src/main/java/com/njcn/pvdevice/mapper/mapping/PvDispatchMapper.xml create mode 100644 pqs-device/pms-device/pms-device-api/pom.xml create 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/dto/DeviceRunExDTO.java rename pqs-device/{device-api/src/main/java/com/njcn/device/pojo/param/pv => pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param}/DeviceQueryParam.java (92%) rename pqs-device/{device-api/src/main/java/com/njcn/device/pojo/param/pv => pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param}/DistributedQueryParam.java (92%) rename pqs-device/{device-api/src/main/java/com/njcn/device/pojo/param/pv => pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param}/LineDetailQueryParam.java (92%) rename pqs-device/{device-api/src/main/java/com/njcn/device/pojo/param/pv => pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param}/LvUserQueryParam.java (93%) rename pqs-device/{device-api/src/main/java/com/njcn/device/pojo/param/pv => pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param}/PvDeviceParam.java (97%) rename pqs-device/{device-api/src/main/java/com/njcn/device/pojo/param/pv => pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param}/PvDispatchParam.java (86%) rename pqs-device/{device-api/src/main/java/com/njcn/device/pojo/param/pv => pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param}/PvDistributedParam.java (93%) rename pqs-device/{device-api/src/main/java/com/njcn/device/pojo/param/pv => pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param}/PvLineDetailParam.java (97%) rename pqs-device/{device-api/src/main/java/com/njcn/device/pojo/param/pv => pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param}/PvLvUserParam.java (95%) rename pqs-device/{device-api/src/main/java/com/njcn/device/pojo/param/pv => pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param}/PvSubAreaParam.java (95%) rename pqs-device/{device-api/src/main/java/com/njcn/device/pojo/param/pv => pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param}/PvSubstationParam.java (95%) rename pqs-device/{device-api/src/main/java/com/njcn/device/pojo/param/pv => pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param}/PvTenVoltageParam.java (96%) rename pqs-device/{device-api/src/main/java/com/njcn/device/pojo/param/pv => pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param}/PvTerminalBaseQuery.java (90%) rename pqs-device/{device-api/src/main/java/com/njcn/device/pojo/param/pv => pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param}/PvUnitParam.java (91%) rename pqs-device/{device-api/src/main/java/com/njcn/device/pojo/param/pv => pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param}/PvVoltageParam.java (90%) rename pqs-device/{device-api/src/main/java/com/njcn/device/pojo/param/pv => pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param}/SubAreaQueryParam.java (93%) rename pqs-device/{device-api/src/main/java/com/njcn/device/pojo/param/pv => pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param}/SubstationQueryParam.java (85%) rename pqs-device/{device-api/src/main/java/com/njcn/device/pojo/param/pv => pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param}/TenVoltageQueryParam.java (87%) rename pqs-device/{device-api/src/main/java/com/njcn/device/pojo/param/pv => pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param}/VoltageQueryParam.java (92%) rename pqs-device/{device-api/src/main/java/com/njcn/device/pojo/po/pv => pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po}/PvDevice.java (92%) rename pqs-device/{device-api/src/main/java/com/njcn/device/pojo/po/pv => pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po}/PvDispatch.java (87%) rename pqs-device/{device-api/src/main/java/com/njcn/device/pojo/po/pv => pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po}/PvDistributed.java (88%) rename pqs-device/{device-api/src/main/java/com/njcn/device/pojo/po/pv => pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po}/PvLineDetail.java (94%) rename pqs-device/{device-api/src/main/java/com/njcn/device/pojo/po/pv => pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po}/PvLvUser.java (89%) rename pqs-device/{device-api/src/main/java/com/njcn/device/pojo/po/pv => pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po}/PvSubArea.java (92%) rename pqs-device/{device-api/src/main/java/com/njcn/device/pojo/po/pv => pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po}/PvSubstation.java (84%) rename pqs-device/{device-api/src/main/java/com/njcn/device/pojo/po/pv => pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po}/PvTenVoltage.java (94%) rename pqs-device/{device-api/src/main/java/com/njcn/device/pojo/po/pv => pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po}/PvUnit.java (89%) rename pqs-device/{device-api/src/main/java/com/njcn/device/pojo/po/pv => pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po}/PvVoltage.java (79%) create mode 100644 pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/DeviceRunExVO.java rename pqs-device/{device-api/src/main/java/com/njcn/device/pojo/vo/pv => pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo}/DisOrLvVO.java (97%) rename pqs-device/{device-api/src/main/java/com/njcn/device/pojo/vo/pv => pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo}/PvDeviceVO.java (83%) rename pqs-device/{device-api/src/main/java/com/njcn/device/pojo/vo/pv => pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo}/PvDistributedVO.java (72%) rename pqs-device/{device-api/src/main/java/com/njcn/device/pojo/vo/pv => pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo}/PvLineAllDetailVO.java (98%) rename pqs-device/{device-api/src/main/java/com/njcn/device/pojo/vo/pv => pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo}/PvLvUserVO.java (73%) rename pqs-device/{device-api/src/main/java/com/njcn/device/pojo/vo/pv => pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo}/PvSubAreaVO.java (86%) rename pqs-device/{device-api/src/main/java/com/njcn/device/pojo/vo/pv => pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo}/PvSubstationVO.java (95%) rename pqs-device/{device-api/src/main/java/com/njcn/device/pojo/vo/pv => pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo}/PvTenVoltageVO.java (60%) rename pqs-device/{device-api/src/main/java/com/njcn/device/pojo/vo/pv => pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo}/UnitTreeVO.java (88%) create mode 100644 pqs-device/pms-device/pms-device-boot/pom.xml rename pqs-device/{device-boot/src/main/java/com/njcn/pvdevice => pms-device/pms-device-boot/src/main/java/com/njcn/device/pms}/controller/PvDeviceController.java (95%) create mode 100644 pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/PvDeviceRunExController.java rename pqs-device/{device-boot/src/main/java/com/njcn/pvdevice => pms-device/pms-device-boot/src/main/java/com/njcn/device/pms}/controller/PvDispatchController.java (92%) rename pqs-device/{device-boot/src/main/java/com/njcn/pvdevice => pms-device/pms-device-boot/src/main/java/com/njcn/device/pms}/controller/PvDistributedController.java (95%) rename pqs-device/{device-boot/src/main/java/com/njcn/pvdevice => pms-device/pms-device-boot/src/main/java/com/njcn/device/pms}/controller/PvLineDetailController.java (95%) rename pqs-device/{device-boot/src/main/java/com/njcn/pvdevice => pms-device/pms-device-boot/src/main/java/com/njcn/device/pms}/controller/PvLvUserController.java (95%) rename pqs-device/{device-boot/src/main/java/com/njcn/pvdevice => pms-device/pms-device-boot/src/main/java/com/njcn/device/pms}/controller/PvSubAreaController.java (94%) rename pqs-device/{device-boot/src/main/java/com/njcn/pvdevice => pms-device/pms-device-boot/src/main/java/com/njcn/device/pms}/controller/PvSubstationController.java (93%) rename pqs-device/{device-boot/src/main/java/com/njcn/pvdevice => pms-device/pms-device-boot/src/main/java/com/njcn/device/pms}/controller/PvTenVoltageController.java (94%) rename pqs-device/{device-boot/src/main/java/com/njcn/pvdevice => pms-device/pms-device-boot/src/main/java/com/njcn/device/pms}/controller/PvTerminalBaseController.java (92%) rename pqs-device/{device-boot/src/main/java/com/njcn/pvdevice => pms-device/pms-device-boot/src/main/java/com/njcn/device/pms}/controller/PvUnitController.java (82%) rename pqs-device/{device-boot/src/main/java/com/njcn/pvdevice => pms-device/pms-device-boot/src/main/java/com/njcn/device/pms}/controller/PvVoltageController.java (93%) rename pqs-device/{device-boot/src/main/java/com/njcn/pvdevice => pms-device/pms-device-boot/src/main/java/com/njcn/device/pms}/mapper/PvDeviceMapper.java (76%) create mode 100644 pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/PvDeviceRunExMapper.java rename pqs-device/{device-boot/src/main/java/com/njcn/pvdevice => pms-device/pms-device-boot/src/main/java/com/njcn/device/pms}/mapper/PvDispatchMapper.java (71%) rename pqs-device/{device-boot/src/main/java/com/njcn/pvdevice => pms-device/pms-device-boot/src/main/java/com/njcn/device/pms}/mapper/PvDistributedMapper.java (74%) rename pqs-device/{device-boot/src/main/java/com/njcn/pvdevice => pms-device/pms-device-boot/src/main/java/com/njcn/device/pms}/mapper/PvLineDetailMapper.java (84%) rename pqs-device/{device-boot/src/main/java/com/njcn/pvdevice => pms-device/pms-device-boot/src/main/java/com/njcn/device/pms}/mapper/PvLvUserMapper.java (74%) rename pqs-device/{device-boot/src/main/java/com/njcn/pvdevice => pms-device/pms-device-boot/src/main/java/com/njcn/device/pms}/mapper/PvSubAreaMapper.java (77%) rename pqs-device/{device-boot/src/main/java/com/njcn/pvdevice => pms-device/pms-device-boot/src/main/java/com/njcn/device/pms}/mapper/PvSubstationMapper.java (77%) rename pqs-device/{device-boot/src/main/java/com/njcn/pvdevice => pms-device/pms-device-boot/src/main/java/com/njcn/device/pms}/mapper/PvTenVoltageMapper.java (74%) rename pqs-device/{device-boot/src/main/java/com/njcn/pvdevice => pms-device/pms-device-boot/src/main/java/com/njcn/device/pms}/mapper/PvUnitMapper.java (80%) rename pqs-device/{device-boot/src/main/java/com/njcn/pvdevice => pms-device/pms-device-boot/src/main/java/com/njcn/device/pms}/mapper/PvVoltageMapper.java (71%) rename pqs-device/{device-boot/src/main/java/com/njcn/pvdevice => pms-device/pms-device-boot/src/main/java/com/njcn/device/pms}/mapper/mapping/PvDeviceMapper.xml (97%) create mode 100644 pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/PvDeviceRunExMapper.xml rename pqs-device/{device-boot/src/main/java/com/njcn/device/mapper/mapping/StrategydicFunMapper.xml => pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/PvDispatchMapper.xml} (71%) rename pqs-device/{device-boot/src/main/java/com/njcn/pvdevice => pms-device/pms-device-boot/src/main/java/com/njcn/device/pms}/mapper/mapping/PvDistributedMapper.xml (95%) rename pqs-device/{device-boot/src/main/java/com/njcn/pvdevice => pms-device/pms-device-boot/src/main/java/com/njcn/device/pms}/mapper/mapping/PvLineDetailMapper.xml (98%) rename pqs-device/{device-boot/src/main/java/com/njcn/pvdevice => pms-device/pms-device-boot/src/main/java/com/njcn/device/pms}/mapper/mapping/PvLvUserMapper.xml (95%) rename pqs-device/{device-boot/src/main/java/com/njcn/pvdevice => pms-device/pms-device-boot/src/main/java/com/njcn/device/pms}/mapper/mapping/PvSubAreaMapper.xml (96%) rename pqs-device/{device-boot/src/main/java/com/njcn/pvdevice => pms-device/pms-device-boot/src/main/java/com/njcn/device/pms}/mapper/mapping/PvSubstationMapper.xml (96%) rename pqs-device/{device-boot/src/main/java/com/njcn/pvdevice => pms-device/pms-device-boot/src/main/java/com/njcn/device/pms}/mapper/mapping/PvTenVoltageMapper.xml (96%) rename pqs-device/{device-boot/src/main/java/com/njcn/pvdevice => pms-device/pms-device-boot/src/main/java/com/njcn/device/pms}/mapper/mapping/PvUnitMapper.xml (87%) rename pqs-device/{device-boot/src/main/java/com/njcn/pvdevice => pms-device/pms-device-boot/src/main/java/com/njcn/device/pms}/mapper/mapping/PvVoltageMapper.xml (71%) create mode 100644 pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/IPvDeviceRunExService.java rename pqs-device/{device-boot/src/main/java/com/njcn/pvdevice => pms-device/pms-device-boot/src/main/java/com/njcn/device/pms}/service/IPvDeviceService.java (84%) rename pqs-device/{device-boot/src/main/java/com/njcn/pvdevice => pms-device/pms-device-boot/src/main/java/com/njcn/device/pms}/service/IPvDispatchService.java (71%) rename pqs-device/{device-boot/src/main/java/com/njcn/pvdevice => pms-device/pms-device-boot/src/main/java/com/njcn/device/pms}/service/IPvDistributedService.java (83%) rename pqs-device/{device-boot/src/main/java/com/njcn/pvdevice => pms-device/pms-device-boot/src/main/java/com/njcn/device/pms}/service/IPvLineDetailService.java (85%) rename pqs-device/{device-boot/src/main/java/com/njcn/pvdevice => pms-device/pms-device-boot/src/main/java/com/njcn/device/pms}/service/IPvLvUserService.java (84%) rename pqs-device/{device-boot/src/main/java/com/njcn/pvdevice => pms-device/pms-device-boot/src/main/java/com/njcn/device/pms}/service/IPvSubAreaService.java (82%) rename pqs-device/{device-boot/src/main/java/com/njcn/pvdevice => pms-device/pms-device-boot/src/main/java/com/njcn/device/pms}/service/IPvSubstationService.java (81%) rename pqs-device/{device-boot/src/main/java/com/njcn/pvdevice => pms-device/pms-device-boot/src/main/java/com/njcn/device/pms}/service/IPvTenVoltageService.java (84%) rename pqs-device/{device-boot/src/main/java/com/njcn/pvdevice => pms-device/pms-device-boot/src/main/java/com/njcn/device/pms}/service/IPvUnitService.java (84%) rename pqs-device/{device-boot/src/main/java/com/njcn/pvdevice => pms-device/pms-device-boot/src/main/java/com/njcn/device/pms}/service/IPvVoltageService.java (83%) rename pqs-device/{device-boot/src/main/java/com/njcn/pvdevice => pms-device/pms-device-boot/src/main/java/com/njcn/device/pms}/service/PvTerminalBaseService.java (77%) create mode 100644 pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/impl/PvDeviceRunExServiceImpl.java rename pqs-device/{device-boot/src/main/java/com/njcn/pvdevice => pms-device/pms-device-boot/src/main/java/com/njcn/device/pms}/service/impl/PvDeviceServiceImpl.java (91%) rename pqs-device/{device-boot/src/main/java/com/njcn/pvdevice => pms-device/pms-device-boot/src/main/java/com/njcn/device/pms}/service/impl/PvDispatchServiceImpl.java (62%) rename pqs-device/{device-boot/src/main/java/com/njcn/pvdevice => pms-device/pms-device-boot/src/main/java/com/njcn/device/pms}/service/impl/PvDistributedServiceImpl.java (88%) rename pqs-device/{device-boot/src/main/java/com/njcn/pvdevice => pms-device/pms-device-boot/src/main/java/com/njcn/device/pms}/service/impl/PvLineDetailServiceImpl.java (94%) rename pqs-device/{device-boot/src/main/java/com/njcn/pvdevice => pms-device/pms-device-boot/src/main/java/com/njcn/device/pms}/service/impl/PvLvUserServiceImpl.java (86%) rename pqs-device/{device-boot/src/main/java/com/njcn/pvdevice => pms-device/pms-device-boot/src/main/java/com/njcn/device/pms}/service/impl/PvSubAreaServiceImpl.java (84%) rename pqs-device/{device-boot/src/main/java/com/njcn/pvdevice => pms-device/pms-device-boot/src/main/java/com/njcn/device/pms}/service/impl/PvSubstationServiceImpl.java (83%) rename pqs-device/{device-boot/src/main/java/com/njcn/pvdevice => pms-device/pms-device-boot/src/main/java/com/njcn/device/pms}/service/impl/PvTenVoltageServiceImpl.java (89%) rename pqs-device/{device-boot/src/main/java/com/njcn/pvdevice => pms-device/pms-device-boot/src/main/java/com/njcn/device/pms}/service/impl/PvTerminalBaseServiceImpl.java (86%) rename pqs-device/{device-boot/src/main/java/com/njcn/pvdevice => pms-device/pms-device-boot/src/main/java/com/njcn/device/pms}/service/impl/PvUnitServiceImpl.java (90%) rename pqs-device/{device-boot/src/main/java/com/njcn/pvdevice => pms-device/pms-device-boot/src/main/java/com/njcn/device/pms}/service/impl/PvVoltageServiceImpl.java (89%) create mode 100644 pqs-device/pms-device/pom.xml create mode 100644 pqs-device/pq-device/pom.xml create mode 100644 pqs-device/pq-device/pq-device-api/pom.xml create mode 100644 pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/api/AlarmClient.java rename pqs-device/{device-api/src/main/java/com/njcn/device => pq-device/pq-device-api/src/main/java/com/njcn/device/pq}/api/DeptLineFeignClient.java (79%) rename pqs-device/{device-api/src/main/java/com/njcn/device => pq-device/pq-device-api/src/main/java/com/njcn/device/pq}/api/DeviceTreeClient.java (73%) rename pqs-device/{device-api/src/main/java/com/njcn/device => pq-device/pq-device-api/src/main/java/com/njcn/device/pq}/api/GeneralDeviceInfoClient.java (92%) rename pqs-device/{device-api/src/main/java/com/njcn/device => pq-device/pq-device-api/src/main/java/com/njcn/device/pq}/api/LineFeignClient.java (93%) rename pqs-device/{device-api/src/main/java/com/njcn/device => pq-device/pq-device-api/src/main/java/com/njcn/device/pq}/api/TerminalBaseClient.java (75%) create mode 100644 pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/api/fallback/AlarmClientFallbackFactory.java rename pqs-device/{device-api/src/main/java/com/njcn/device => pq-device/pq-device-api/src/main/java/com/njcn/device/pq}/api/fallback/DeptLineFeignClientFallbackFactory.java (91%) rename pqs-device/{device-api/src/main/java/com/njcn/device => pq-device/pq-device-api/src/main/java/com/njcn/device/pq}/api/fallback/DeviceTreeClientFallbackFactory.java (86%) rename pqs-device/{device-api/src/main/java/com/njcn/device => pq-device/pq-device-api/src/main/java/com/njcn/device/pq}/api/fallback/GeneralDeviceInfoClientFallbackFactory.java (92%) rename pqs-device/{device-api/src/main/java/com/njcn/device => pq-device/pq-device-api/src/main/java/com/njcn/device/pq}/api/fallback/LineFeignClientFallbackFactory.java (95%) rename pqs-device/{device-api/src/main/java/com/njcn/device => pq-device/pq-device-api/src/main/java/com/njcn/device/pq}/api/fallback/TerminalBaseClientFallbackFactory.java (83%) rename pqs-device/{device-api/src/main/java/com/njcn/device => pq-device/pq-device-api/src/main/java/com/njcn/device/pq}/enums/DeviceResponseEnum.java (81%) rename pqs-device/{device-api/src/main/java/com/njcn/device => pq-device/pq-device-api/src/main/java/com/njcn/device/pq}/enums/LineBaseEnum.java (94%) rename pqs-device/{device-api/src/main/java/com/njcn/device => pq-device/pq-device-api/src/main/java/com/njcn/device/pq}/enums/PvDeviceResponseEnum.java (98%) rename pqs-device/{device-api/src/main/java/com/njcn/device => pq-device/pq-device-api/src/main/java/com/njcn/device/pq}/pojo/bo/BaseLineInfo.java (94%) rename pqs-device/{device-api/src/main/java/com/njcn/device => pq-device/pq-device-api/src/main/java/com/njcn/device/pq}/pojo/bo/DeviceType.java (95%) rename pqs-device/{device-api/src/main/java/com/njcn/device => pq-device/pq-device-api/src/main/java/com/njcn/device/pq}/pojo/bo/excel/LineMark.java (97%) rename pqs-device/{device-api/src/main/java/com/njcn/device => pq-device/pq-device-api/src/main/java/com/njcn/device/pq}/pojo/bo/excel/NodeExcel.java (94%) rename pqs-device/{device-api/src/main/java/com/njcn/device => pq-device/pq-device-api/src/main/java/com/njcn/device/pq}/pojo/bo/excel/OracleTerminalExcel.java (98%) rename pqs-device/{device-api/src/main/java/com/njcn/device => pq-device/pq-device-api/src/main/java/com/njcn/device/pq}/pojo/bo/excel/OverLimitExcel.java (99%) rename pqs-device/{device-api/src/main/java/com/njcn/device => pq-device/pq-device-api/src/main/java/com/njcn/device/pq}/pojo/bo/excel/TerminalBaseExcel.java (97%) rename pqs-device/{device-api/src/main/java/com/njcn/device => pq-device/pq-device-api/src/main/java/com/njcn/device/pq}/pojo/constant/DeviceValidMessage.java (91%) rename pqs-device/{device-api/src/main/java/com/njcn/device => pq-device/pq-device-api/src/main/java/com/njcn/device/pq}/pojo/dto/DeviceLineDTO.java (94%) rename pqs-device/{device-api/src/main/java/com/njcn/device => pq-device/pq-device-api/src/main/java/com/njcn/device/pq}/pojo/dto/DeviceOnlineDataDTO.java (86%) rename pqs-device/{device-api/src/main/java/com/njcn/device => pq-device/pq-device-api/src/main/java/com/njcn/device/pq}/pojo/dto/GeneralDeviceDTO.java (65%) rename pqs-device/{device-api/src/main/java/com/njcn/device => pq-device/pq-device-api/src/main/java/com/njcn/device/pq}/pojo/dto/OnlineLineDTO.java (81%) rename pqs-device/{device-api/src/main/java/com/njcn/device => pq-device/pq-device-api/src/main/java/com/njcn/device/pq}/pojo/dto/OverLimitLineDTO.java (92%) rename pqs-device/{device-api/src/main/java/com/njcn/device => pq-device/pq-device-api/src/main/java/com/njcn/device/pq}/pojo/dto/PollutionLineDTO.java (95%) rename pqs-device/{device-api/src/main/java/com/njcn/device => pq-device/pq-device-api/src/main/java/com/njcn/device/pq}/pojo/dto/PollutionParamDTO.java (90%) rename pqs-device/{device-api/src/main/java/com/njcn/device => pq-device/pq-device-api/src/main/java/com/njcn/device/pq}/pojo/dto/PollutionSubstationDTO.java (93%) rename pqs-device/{device-api/src/main/java/com/njcn/device => pq-device/pq-device-api/src/main/java/com/njcn/device/pq}/pojo/dto/WarningSubstationDTO.java (88%) rename pqs-device/{device-api/src/main/java/com/njcn/device => pq-device/pq-device-api/src/main/java/com/njcn/device/pq}/pojo/param/AddTerminalParam.java (97%) rename pqs-device/{device-api/src/main/java/com/njcn/device => pq-device/pq-device-api/src/main/java/com/njcn/device/pq}/pojo/param/AlarmParam.java (87%) rename pqs-device/{device-api/src/main/java/com/njcn/device => pq-device/pq-device-api/src/main/java/com/njcn/device/pq}/pojo/param/AlarmStrategyParam.java (91%) rename pqs-device/{device-api/src/main/java/com/njcn/device => pq-device/pq-device-api/src/main/java/com/njcn/device/pq}/pojo/param/AreaCensusParam.java (94%) create mode 100644 pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/param/AreaIntegrityDataParam.java rename pqs-device/{device-api/src/main/java/com/njcn/device => pq-device/pq-device-api/src/main/java/com/njcn/device/pq}/pojo/param/DeviceInfoParam.java (98%) rename pqs-device/{device-api/src/main/java/com/njcn/device => pq-device/pq-device-api/src/main/java/com/njcn/device/pq}/pojo/param/DeviceLogParam.java (97%) rename pqs-device/{device-api/src/main/java/com/njcn/device => pq-device/pq-device-api/src/main/java/com/njcn/device/pq}/pojo/param/DeviceParam.java (95%) create mode 100644 pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/param/DeviceRunExceptionParam.java rename pqs-device/{device-api/src/main/java/com/njcn/device => pq-device/pq-device-api/src/main/java/com/njcn/device/pq}/pojo/param/EventLogParam.java (96%) rename pqs-device/{device-api/src/main/java/com/njcn/device => pq-device/pq-device-api/src/main/java/com/njcn/device/pq}/pojo/param/FlowMealParam.java (97%) rename pqs-device/{device-api/src/main/java/com/njcn/device => pq-device/pq-device-api/src/main/java/com/njcn/device/pq}/pojo/param/FlowStrategyParam.java (98%) rename pqs-device/{device-api/src/main/java/com/njcn/device => pq-device/pq-device-api/src/main/java/com/njcn/device/pq}/pojo/param/GdInformationParam.java (97%) rename pqs-device/{device-api/src/main/java/com/njcn/device => pq-device/pq-device-api/src/main/java/com/njcn/device/pq}/pojo/param/LineBaseQueryParam.java (88%) create mode 100644 pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/param/LineIntegrityDataParam.java rename pqs-device/{device-api/src/main/java/com/njcn/device => pq-device/pq-device-api/src/main/java/com/njcn/device/pq}/pojo/param/LineParam.java (99%) rename pqs-device/{device-api/src/main/java/com/njcn/device => pq-device/pq-device-api/src/main/java/com/njcn/device/pq}/pojo/param/NodeInformationParam.java (95%) rename pqs-device/{device-api/src/main/java/com/njcn/device => pq-device/pq-device-api/src/main/java/com/njcn/device/pq}/pojo/param/NodeParam.java (97%) rename pqs-device/{device-api/src/main/java/com/njcn/device => pq-device/pq-device-api/src/main/java/com/njcn/device/pq}/pojo/param/ProjectParam.java (89%) rename pqs-device/{device-api/src/main/java/com/njcn/device => pq-device/pq-device-api/src/main/java/com/njcn/device/pq}/pojo/param/ProvinceParam.java (92%) rename pqs-device/{device-api/src/main/java/com/njcn/device => pq-device/pq-device-api/src/main/java/com/njcn/device/pq}/pojo/param/PulicTimeParam.java (83%) rename pqs-device/{device-api/src/main/java/com/njcn/device => pq-device/pq-device-api/src/main/java/com/njcn/device/pq}/pojo/param/PulicTimeStatisParam.java (93%) rename pqs-device/{device-api/src/main/java/com/njcn/device => pq-device/pq-device-api/src/main/java/com/njcn/device/pq}/pojo/param/RunManageParam.java (96%) rename pqs-device/{device-api/src/main/java/com/njcn/device => pq-device/pq-device-api/src/main/java/com/njcn/device/pq}/pojo/param/SubStationParam.java (98%) rename pqs-device/{device-api/src/main/java/com/njcn/device => pq-device/pq-device-api/src/main/java/com/njcn/device/pq}/pojo/param/SubVoltageParam.java (94%) rename pqs-device/{device-api/src/main/java/com/njcn/device => pq-device/pq-device-api/src/main/java/com/njcn/device/pq}/pojo/param/TabCensusParam.java (97%) rename pqs-device/{device-api/src/main/java/com/njcn/device => pq-device/pq-device-api/src/main/java/com/njcn/device/pq}/pojo/param/TerminalLedgerParam.java (90%) rename pqs-device/{device-api/src/main/java/com/njcn/device => pq-device/pq-device-api/src/main/java/com/njcn/device/pq}/pojo/param/TerminalMainQueryParam.java (94%) create mode 100644 pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/param/TerminalOnlineRateDataParam.java rename pqs-device/{device-api/src/main/java/com/njcn/device => pq-device/pq-device-api/src/main/java/com/njcn/device/pq}/pojo/param/TerminalParam.java (65%) rename pqs-device/{device-api/src/main/java/com/njcn/device => pq-device/pq-device-api/src/main/java/com/njcn/device/pq}/pojo/param/UpdateTerminalParam.java (96%) rename pqs-device/{device-api/src/main/java/com/njcn/device => pq-device/pq-device-api/src/main/java/com/njcn/device/pq}/pojo/param/VersionParam.java (97%) rename pqs-device/{device-api/src/main/java/com/njcn/device => pq-device/pq-device-api/src/main/java/com/njcn/device/pq}/pojo/po/Alarm.java (90%) rename pqs-device/{device-api/src/main/java/com/njcn/device => pq-device/pq-device-api/src/main/java/com/njcn/device/pq}/pojo/po/AlarmStrategy.java (94%) rename pqs-device/{device-api/src/main/java/com/njcn/device => pq-device/pq-device-api/src/main/java/com/njcn/device/pq}/pojo/po/Communicate.java (76%) rename pqs-device/{device-api/src/main/java/com/njcn/device => pq-device/pq-device-api/src/main/java/com/njcn/device/pq}/pojo/po/DeptLine.java (68%) rename pqs-device/{device-api/src/main/java/com/njcn/device => pq-device/pq-device-api/src/main/java/com/njcn/device/pq}/pojo/po/DevFuction.java (72%) rename pqs-device/{device-api/src/main/java/com/njcn/device => pq-device/pq-device-api/src/main/java/com/njcn/device/pq}/pojo/po/DevMeal.java (73%) rename pqs-device/{device-api/src/main/java/com/njcn/device => pq-device/pq-device-api/src/main/java/com/njcn/device/pq}/pojo/po/DevState.java (93%) rename pqs-device/{device-api/src/main/java/com/njcn/device => pq-device/pq-device-api/src/main/java/com/njcn/device/pq}/pojo/po/DevStrategy.java (70%) rename pqs-device/{device-api/src/main/java/com/njcn/device => pq-device/pq-device-api/src/main/java/com/njcn/device/pq}/pojo/po/DevVersion.java (91%) rename pqs-device/{device-api/src/main/java/com/njcn/device => pq-device/pq-device-api/src/main/java/com/njcn/device/pq}/pojo/po/Device.java (98%) rename pqs-device/{device-api/src/main/java/com/njcn/device => pq-device/pq-device-api/src/main/java/com/njcn/device/pq}/pojo/po/DeviceBak.java (90%) create mode 100644 pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/po/DeviceRunException.java rename pqs-device/{device-api/src/main/java/com/njcn/device => pq-device/pq-device-api/src/main/java/com/njcn/device/pq}/pojo/po/EventPushLogs.java (94%) rename pqs-device/{device-api/src/main/java/com/njcn/device => pq-device/pq-device-api/src/main/java/com/njcn/device/pq}/pojo/po/FlowMeal.java (96%) rename pqs-device/{device-api/src/main/java/com/njcn/device => pq-device/pq-device-api/src/main/java/com/njcn/device/pq}/pojo/po/FlowStrategy.java (96%) rename pqs-device/{device-api/src/main/java/com/njcn/device => pq-device/pq-device-api/src/main/java/com/njcn/device/pq}/pojo/po/FlowStrategyDic.java (93%) rename pqs-device/{device-api/src/main/java/com/njcn/device => pq-device/pq-device-api/src/main/java/com/njcn/device/pq}/pojo/po/Line.java (88%) rename pqs-device/{device-api/src/main/java/com/njcn/device => pq-device/pq-device-api/src/main/java/com/njcn/device/pq}/pojo/po/LineBak.java (79%) create mode 100644 pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/po/LineDataIntegrity.java rename pqs-device/{device-api/src/main/java/com/njcn/device => pq-device/pq-device-api/src/main/java/com/njcn/device/pq}/pojo/po/LineDetail.java (98%) rename pqs-device/{device-api/src/main/java/com/njcn/device => pq-device/pq-device-api/src/main/java/com/njcn/device/pq}/pojo/po/MonthFlow.java (91%) rename pqs-device/{device-api/src/main/java/com/njcn/device => pq-device/pq-device-api/src/main/java/com/njcn/device/pq}/pojo/po/Node.java (86%) rename pqs-device/{device-api/src/main/java/com/njcn/device => pq-device/pq-device-api/src/main/java/com/njcn/device/pq}/pojo/po/Overlimit.java (97%) rename pqs-device/{device-api/src/main/java/com/njcn/device => pq-device/pq-device-api/src/main/java/com/njcn/device/pq}/pojo/po/ProtectValue.java (92%) rename pqs-device/{device-api/src/main/java/com/njcn/device => pq-device/pq-device-api/src/main/java/com/njcn/device/pq}/pojo/po/ProtectWord.java (88%) rename pqs-device/{device-api/src/main/java/com/njcn/device => pq-device/pq-device-api/src/main/java/com/njcn/device/pq}/pojo/po/Push.java (95%) rename pqs-device/{device-api/src/main/java/com/njcn/device => pq-device/pq-device-api/src/main/java/com/njcn/device/pq}/pojo/po/StatisFlow.java (85%) rename pqs-device/{device-api/src/main/java/com/njcn/device => pq-device/pq-device-api/src/main/java/com/njcn/device/pq}/pojo/po/StrategydicFun.java (90%) rename pqs-device/{device-api/src/main/java/com/njcn/device => pq-device/pq-device-api/src/main/java/com/njcn/device/pq}/pojo/po/Substation.java (75%) rename pqs-device/{device-api/src/main/java/com/njcn/device => pq-device/pq-device-api/src/main/java/com/njcn/device/pq}/pojo/po/TerminalLogs.java (94%) create mode 100644 pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/po/TerminalOnlineRateData.java rename pqs-device/{device-api/src/main/java/com/njcn/device => pq-device/pq-device-api/src/main/java/com/njcn/device/pq}/pojo/po/TopMsg.java (96%) rename pqs-device/{device-api/src/main/java/com/njcn/device => pq-device/pq-device-api/src/main/java/com/njcn/device/pq}/pojo/po/Version.java (97%) rename pqs-device/{device-api/src/main/java/com/njcn/device => pq-device/pq-device-api/src/main/java/com/njcn/device/pq}/pojo/po/Voltage.java (78%) rename pqs-device/{device-api/src/main/java/com/njcn/device => pq-device/pq-device-api/src/main/java/com/njcn/device/pq}/pojo/vo/AbnomalCommuncateVO.java (93%) rename pqs-device/{device-api/src/main/java/com/njcn/device => pq-device/pq-device-api/src/main/java/com/njcn/device/pq}/pojo/vo/AlarmStrategyVO.java (97%) rename pqs-device/{device-api/src/main/java/com/njcn/device => pq-device/pq-device-api/src/main/java/com/njcn/device/pq}/pojo/vo/AreaDeviceOnlineVO.java (96%) create mode 100644 pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/vo/AreaIntegrityDataVO.java rename pqs-device/{device-api/src/main/java/com/njcn/device => pq-device/pq-device-api/src/main/java/com/njcn/device/pq}/pojo/vo/AreaIntegrityVO.java (93%) rename pqs-device/{device-api/src/main/java/com/njcn/device => pq-device/pq-device-api/src/main/java/com/njcn/device/pq}/pojo/vo/AreaLineInfoVO.java (94%) rename pqs-device/{device-api/src/main/java/com/njcn/device => pq-device/pq-device-api/src/main/java/com/njcn/device/pq}/pojo/vo/CommunicateStatisticsVO.java (90%) rename pqs-device/{device-api/src/main/java/com/njcn/device => pq-device/pq-device-api/src/main/java/com/njcn/device/pq}/pojo/vo/CommunicateVO.java (92%) rename pqs-device/{device-api/src/main/java/com/njcn/device => pq-device/pq-device-api/src/main/java/com/njcn/device/pq}/pojo/vo/DeptLineTreeVO.java (92%) rename pqs-device/{device-api/src/main/java/com/njcn/device => pq-device/pq-device-api/src/main/java/com/njcn/device/pq}/pojo/vo/DeviceAbnormalVO.java (64%) rename pqs-device/{device-api/src/main/java/com/njcn/device => pq-device/pq-device-api/src/main/java/com/njcn/device/pq}/pojo/vo/DeviceLogVO.java (95%) rename pqs-device/{device-api/src/main/java/com/njcn/device => pq-device/pq-device-api/src/main/java/com/njcn/device/pq}/pojo/vo/DeviceOnlineDataVO.java (93%) rename pqs-device/{device-api/src/main/java/com/njcn/device => pq-device/pq-device-api/src/main/java/com/njcn/device/pq}/pojo/vo/DeviceOnlineTabVO.java (95%) create mode 100644 pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/vo/DeviceRunExceptionVO.java rename pqs-device/{device-api/src/main/java/com/njcn/device => pq-device/pq-device-api/src/main/java/com/njcn/device/pq}/pojo/vo/DeviceVO.java (96%) rename pqs-device/{device-api/src/main/java/com/njcn/device => pq-device/pq-device-api/src/main/java/com/njcn/device/pq}/pojo/vo/EventLogVO.java (97%) rename pqs-device/{device-api/src/main/java/com/njcn/device => pq-device/pq-device-api/src/main/java/com/njcn/device/pq}/pojo/vo/FlowStrategyVO.java (96%) rename pqs-device/{device-api/src/main/java/com/njcn/device => pq-device/pq-device-api/src/main/java/com/njcn/device/pq}/pojo/vo/GdInformationVO.java (62%) rename pqs-device/{device-api/src/main/java/com/njcn/device => pq-device/pq-device-api/src/main/java/com/njcn/device/pq}/pojo/vo/LineDetailDataVO.java (97%) rename pqs-device/{device-api/src/main/java/com/njcn/device => pq-device/pq-device-api/src/main/java/com/njcn/device/pq}/pojo/vo/LineDetailVO.java (92%) rename pqs-device/{device-api/src/main/java/com/njcn/device => pq-device/pq-device-api/src/main/java/com/njcn/device/pq}/pojo/vo/LineDeviceStateVO.java (94%) rename pqs-device/{device-api/src/main/java/com/njcn/device => pq-device/pq-device-api/src/main/java/com/njcn/device/pq}/pojo/vo/LineDistributionVO.java (93%) rename pqs-device/{device-api/src/main/java/com/njcn/device => pq-device/pq-device-api/src/main/java/com/njcn/device/pq}/pojo/vo/LineFlowMealDetailVO.java (97%) rename pqs-device/{device-api/src/main/java/com/njcn/device => pq-device/pq-device-api/src/main/java/com/njcn/device/pq}/pojo/vo/LineInfluxDbInegrityVO.java (87%) rename pqs-device/{device-api/src/main/java/com/njcn/device => pq-device/pq-device-api/src/main/java/com/njcn/device/pq}/pojo/vo/LineInfluxDbOnlineVO.java (92%) create mode 100644 pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/vo/LineIntegrityDataVO.java rename pqs-device/{device-api/src/main/java/com/njcn/device => pq-device/pq-device-api/src/main/java/com/njcn/device/pq}/pojo/vo/LineMarkVO.java (94%) rename pqs-device/{device-api/src/main/java/com/njcn/device => pq-device/pq-device-api/src/main/java/com/njcn/device/pq}/pojo/vo/LineOverLimitVO.java (98%) rename pqs-device/{device-api/src/main/java/com/njcn/device => pq-device/pq-device-api/src/main/java/com/njcn/device/pq}/pojo/vo/LineStateVO.java (93%) rename pqs-device/{device-api/src/main/java/com/njcn/device => pq-device/pq-device-api/src/main/java/com/njcn/device/pq}/pojo/vo/LineStaticsValueVO.java (68%) rename pqs-device/{device-api/src/main/java/com/njcn/device => pq-device/pq-device-api/src/main/java/com/njcn/device/pq}/pojo/vo/LineStaticsViewVO.java (93%) rename pqs-device/{device-api/src/main/java/com/njcn/device => pq-device/pq-device-api/src/main/java/com/njcn/device/pq}/pojo/vo/LineStatisticsDetailVO.java (96%) rename pqs-device/{device-api/src/main/java/com/njcn/device => pq-device/pq-device-api/src/main/java/com/njcn/device/pq}/pojo/vo/LineStatisticsTableVO.java (95%) rename pqs-device/{device-api/src/main/java/com/njcn/device => pq-device/pq-device-api/src/main/java/com/njcn/device/pq}/pojo/vo/LineVO.java (97%) rename pqs-device/{device-api/src/main/java/com/njcn/device => pq-device/pq-device-api/src/main/java/com/njcn/device/pq}/pojo/vo/ProjectVO.java (89%) rename pqs-device/{device-api/src/main/java/com/njcn/device => pq-device/pq-device-api/src/main/java/com/njcn/device/pq}/pojo/vo/ProvinceVO.java (67%) rename pqs-device/{device-api/src/main/java/com/njcn/device => pq-device/pq-device-api/src/main/java/com/njcn/device/pq}/pojo/vo/RateOfFlowVO.java (96%) rename pqs-device/{device-api/src/main/java/com/njcn/device => pq-device/pq-device-api/src/main/java/com/njcn/device/pq}/pojo/vo/RunManageVO.java (99%) rename pqs-device/{device-api/src/main/java/com/njcn/device => pq-device/pq-device-api/src/main/java/com/njcn/device/pq}/pojo/vo/RunTimeVO.java (97%) rename pqs-device/{device-api/src/main/java/com/njcn/device => pq-device/pq-device-api/src/main/java/com/njcn/device/pq}/pojo/vo/ShowFlowStrategyVO.java (95%) rename pqs-device/{device-api/src/main/java/com/njcn/device => pq-device/pq-device-api/src/main/java/com/njcn/device/pq}/pojo/vo/ShowVersionVO.java (92%) rename pqs-device/{device-api/src/main/java/com/njcn/device => pq-device/pq-device-api/src/main/java/com/njcn/device/pq}/pojo/vo/SubStationVO.java (96%) rename pqs-device/{device-api/src/main/java/com/njcn/device => pq-device/pq-device-api/src/main/java/com/njcn/device/pq}/pojo/vo/SubVoltageVO.java (97%) rename pqs-device/{device-api/src/main/java/com/njcn/device => pq-device/pq-device-api/src/main/java/com/njcn/device/pq}/pojo/vo/SubstationDetailVO.java (91%) rename pqs-device/{device-api/src/main/java/com/njcn/device => pq-device/pq-device-api/src/main/java/com/njcn/device/pq}/pojo/vo/TerminalAlarmVO.java (98%) rename pqs-device/{device-api/src/main/java/com/njcn/device => pq-device/pq-device-api/src/main/java/com/njcn/device/pq}/pojo/vo/TerminalBaseVO.java (96%) rename pqs-device/{device-api/src/main/java/com/njcn/device => pq-device/pq-device-api/src/main/java/com/njcn/device/pq}/pojo/vo/TerminalLedgerVO.java (97%) rename pqs-device/{device-api/src/main/java/com/njcn/device => pq-device/pq-device-api/src/main/java/com/njcn/device/pq}/pojo/vo/TerminalMaintainVO.java (97%) create mode 100644 pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/vo/TerminalOnlineRateDataVO.java rename pqs-device/{device-api/src/main/java/com/njcn/device => pq-device/pq-device-api/src/main/java/com/njcn/device/pq}/pojo/vo/TerminalTree.java (89%) rename pqs-device/{device-api/src/main/java/com/njcn/device => pq-device/pq-device-api/src/main/java/com/njcn/device/pq}/pojo/vo/TerminalVO.java (92%) rename pqs-device/{device-api/src/main/java/com/njcn/device => pq-device/pq-device-api/src/main/java/com/njcn/device/pq}/pojo/vo/TerminalVersionVO.java (97%) rename pqs-device/{device-api/src/main/java/com/njcn/device => pq-device/pq-device-api/src/main/java/com/njcn/device/pq}/pojo/vo/VersionVO.java (97%) rename pqs-device/{device-api/src/main/java/com/njcn/device => pq-device/pq-device-api/src/main/java/com/njcn/device/pq}/utils/COverlimit.java (97%) rename pqs-device/{device-api/src/main/java/com/njcn/device => pq-device/pq-device-api/src/main/java/com/njcn/device/pq}/utils/DeviceEnumUtil.java (95%) rename pqs-device/{device-api/src/main/java/com/njcn/device => pq-device/pq-device-api/src/main/java/com/njcn/device/pq}/utils/PublicDateUtil.java (97%) create mode 100644 pqs-device/pq-device/pq-device-boot/pom.xml rename pqs-device/{device-boot/src/main/java/com/njcn/device => pq-device/pq-device-boot/src/main/java/com/njcn/device/pq}/controller/AlarmController.java (94%) rename pqs-device/{device-boot/src/main/java/com/njcn/device => pq-device/pq-device-boot/src/main/java/com/njcn/device/pq}/controller/AreaCensusController.java (90%) create mode 100644 pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/AreaIntegrityDataController.java rename pqs-device/{device-boot/src/main/java/com/njcn/device => pq-device/pq-device-boot/src/main/java/com/njcn/device/pq}/controller/CommunicateController.java (82%) rename pqs-device/{device-boot/src/main/java/com/njcn/device => pq-device/pq-device-boot/src/main/java/com/njcn/device/pq}/controller/DeptLineController.java (98%) create mode 100644 pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/DeviceRunExceptionController.java rename pqs-device/{device-boot/src/main/java/com/njcn/device => pq-device/pq-device-boot/src/main/java/com/njcn/device/pq}/controller/GeneralDeviceInfoController.java (97%) rename pqs-device/{device-boot/src/main/java/com/njcn/device => pq-device/pq-device-boot/src/main/java/com/njcn/device/pq}/controller/LineController.java (90%) create mode 100644 pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/LineIntegrityDataController.java rename pqs-device/{device-boot/src/main/java/com/njcn/device => pq-device/pq-device-boot/src/main/java/com/njcn/device/pq}/controller/LineMarkController.java (94%) rename pqs-device/{device-boot/src/main/java/com/njcn/device => pq-device/pq-device-boot/src/main/java/com/njcn/device/pq}/controller/LogManageController.java (89%) rename pqs-device/{device-boot/src/main/java/com/njcn/device => pq-device/pq-device-boot/src/main/java/com/njcn/device/pq}/controller/NodeController.java (96%) rename pqs-device/{device-boot/src/main/java/com/njcn/device => pq-device/pq-device-boot/src/main/java/com/njcn/device/pq}/controller/OperationContrController.java (97%) rename pqs-device/{device-boot/src/main/java/com/njcn/device => pq-device/pq-device-boot/src/main/java/com/njcn/device/pq}/controller/ProgramVersionController.java (97%) rename pqs-device/{device-boot/src/main/java/com/njcn/device => pq-device/pq-device-boot/src/main/java/com/njcn/device/pq}/controller/RateOfFlowController.java (94%) rename pqs-device/{device-boot/src/main/java/com/njcn/device => pq-device/pq-device-boot/src/main/java/com/njcn/device/pq}/controller/RunManageController.java (78%) rename pqs-device/{device-boot/src/main/java/com/njcn/device => pq-device/pq-device-boot/src/main/java/com/njcn/device/pq}/controller/TabCensusController.java (91%) rename pqs-device/{device-boot/src/main/java/com/njcn/device => pq-device/pq-device-boot/src/main/java/com/njcn/device/pq}/controller/TerminalAlarmController.java (90%) rename pqs-device/{device-boot/src/main/java/com/njcn/device => pq-device/pq-device-boot/src/main/java/com/njcn/device/pq}/controller/TerminalBaseController.java (94%) rename pqs-device/{device-boot/src/main/java/com/njcn/device => pq-device/pq-device-boot/src/main/java/com/njcn/device/pq}/controller/TerminalMaintainController.java (87%) create mode 100644 pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/TerminalOnlineRateDataController.java rename pqs-device/{device-boot/src/main/java/com/njcn/device => pq-device/pq-device-boot/src/main/java/com/njcn/device/pq}/controller/TerminalTreeController.java (87%) rename pqs-device/{device-boot/src/main/java/com/njcn/device => pq-device/pq-device-boot/src/main/java/com/njcn/device/pq}/controller/TerminalVersionController.java (88%) rename pqs-device/{device-boot/src/main/java/com/njcn/device => pq-device/pq-device-boot/src/main/java/com/njcn/device/pq}/mapper/AlarmMapper.java (91%) rename pqs-device/{device-boot/src/main/java/com/njcn/device => pq-device/pq-device-boot/src/main/java/com/njcn/device/pq}/mapper/AlarmStrategyMapper.java (79%) rename pqs-device/{device-boot/src/main/java/com/njcn/device => pq-device/pq-device-boot/src/main/java/com/njcn/device/pq}/mapper/AreaDeviceOnlineMapper.java (91%) create mode 100644 pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/AreaIntegrityDataMapper.java rename pqs-device/{device-boot/src/main/java/com/njcn/device => pq-device/pq-device-boot/src/main/java/com/njcn/device/pq}/mapper/CommunicateMapper.java (84%) rename pqs-device/{device-boot/src/main/java/com/njcn/device => pq-device/pq-device-boot/src/main/java/com/njcn/device/pq}/mapper/DeptLineMapper.java (92%) rename pqs-device/{device-boot/src/main/java/com/njcn/device => pq-device/pq-device-boot/src/main/java/com/njcn/device/pq}/mapper/DevFuctionMapper.java (80%) rename pqs-device/{device-boot/src/main/java/com/njcn/device => pq-device/pq-device-boot/src/main/java/com/njcn/device/pq}/mapper/DevMealMapper.java (72%) rename pqs-device/{device-boot/src/main/java/com/njcn/device => pq-device/pq-device-boot/src/main/java/com/njcn/device/pq}/mapper/DevStateMapper.java (72%) rename pqs-device/{device-boot/src/main/java/com/njcn/device => pq-device/pq-device-boot/src/main/java/com/njcn/device/pq}/mapper/DevStrategyMapper.java (72%) rename pqs-device/{device-boot/src/main/java/com/njcn/device => pq-device/pq-device-boot/src/main/java/com/njcn/device/pq}/mapper/DevVersionMapper.java (72%) rename pqs-device/{device-boot/src/main/java/com/njcn/device => pq-device/pq-device-boot/src/main/java/com/njcn/device/pq}/mapper/DeviceBakMapper.java (72%) rename pqs-device/{device-boot/src/main/java/com/njcn/device => pq-device/pq-device-boot/src/main/java/com/njcn/device/pq}/mapper/DeviceMapper.java (86%) rename pqs-device/{device-boot/src/main/java/com/njcn/device => pq-device/pq-device-boot/src/main/java/com/njcn/device/pq}/mapper/DeviceOnlineDataMapper.java (78%) create mode 100644 pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/DeviceRunExceptionMapper.java rename pqs-device/{device-boot/src/main/java/com/njcn/device => pq-device/pq-device-boot/src/main/java/com/njcn/device/pq}/mapper/FlowMealMapper.java (72%) rename pqs-device/{device-boot/src/main/java/com/njcn/device => pq-device/pq-device-boot/src/main/java/com/njcn/device/pq}/mapper/FlowStrategyDicMapper.java (71%) rename pqs-device/{device-boot/src/main/java/com/njcn/device => pq-device/pq-device-boot/src/main/java/com/njcn/device/pq}/mapper/FlowStrategyMapper.java (71%) rename pqs-device/{device-boot/src/main/java/com/njcn/device => pq-device/pq-device-boot/src/main/java/com/njcn/device/pq}/mapper/LineBakMapper.java (73%) rename pqs-device/{device-boot/src/main/java/com/njcn/device => pq-device/pq-device-boot/src/main/java/com/njcn/device/pq}/mapper/LineDetailMapper.java (91%) create mode 100644 pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/LineIntegrityDataMapper.java rename pqs-device/{device-boot/src/main/java/com/njcn/device => pq-device/pq-device-boot/src/main/java/com/njcn/device/pq}/mapper/LineMapper.java (93%) rename pqs-device/{device-boot/src/main/java/com/njcn/device => pq-device/pq-device-boot/src/main/java/com/njcn/device/pq}/mapper/LineMarkMapper.java (91%) rename pqs-device/{device-boot/src/main/java/com/njcn/device => pq-device/pq-device-boot/src/main/java/com/njcn/device/pq}/mapper/LogManageMapper.java (78%) rename pqs-device/{device-boot/src/main/java/com/njcn/device => pq-device/pq-device-boot/src/main/java/com/njcn/device/pq}/mapper/MonthFlowMapper.java (72%) rename pqs-device/{device-boot/src/main/java/com/njcn/device => pq-device/pq-device-boot/src/main/java/com/njcn/device/pq}/mapper/NodeMapper.java (72%) rename pqs-device/{device-boot/src/main/java/com/njcn/device => pq-device/pq-device-boot/src/main/java/com/njcn/device/pq}/mapper/OverlimitMapper.java (72%) rename pqs-device/{device-boot/src/main/java/com/njcn/device => pq-device/pq-device-boot/src/main/java/com/njcn/device/pq}/mapper/ProgramVersionMapper.java (81%) rename pqs-device/{device-boot/src/main/java/com/njcn/device => pq-device/pq-device-boot/src/main/java/com/njcn/device/pq}/mapper/ProtectValueMapper.java (71%) rename pqs-device/{device-boot/src/main/java/com/njcn/device => pq-device/pq-device-boot/src/main/java/com/njcn/device/pq}/mapper/ProtectWordMapper.java (72%) rename pqs-device/{device-boot/src/main/java/com/njcn/device => pq-device/pq-device-boot/src/main/java/com/njcn/device/pq}/mapper/RateOfFlowMapper.java (84%) rename pqs-device/{device-boot/src/main/java/com/njcn/device => pq-device/pq-device-boot/src/main/java/com/njcn/device/pq}/mapper/StatisFlowMapper.java (72%) rename pqs-device/{device-boot/src/main/java/com/njcn/device => pq-device/pq-device-boot/src/main/java/com/njcn/device/pq}/mapper/StrategydicFunMapper.java (71%) rename pqs-device/{device-boot/src/main/java/com/njcn/device => pq-device/pq-device-boot/src/main/java/com/njcn/device/pq}/mapper/SubstationMapper.java (77%) rename pqs-device/{device-boot/src/main/java/com/njcn/device => pq-device/pq-device-boot/src/main/java/com/njcn/device/pq}/mapper/TerminalMaintainMapper.java (94%) create mode 100644 pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/TerminalOnlineRateDataMapper.java rename pqs-device/{device-boot/src/main/java/com/njcn/device => pq-device/pq-device-boot/src/main/java/com/njcn/device/pq}/mapper/TerminalVersionMapper.java (83%) rename pqs-device/{device-boot/src/main/java/com/njcn/device => pq-device/pq-device-boot/src/main/java/com/njcn/device/pq}/mapper/TreeMapper.java (92%) rename pqs-device/{device-boot/src/main/java/com/njcn/device => pq-device/pq-device-boot/src/main/java/com/njcn/device/pq}/mapper/VersionMapper.java (72%) rename pqs-device/{device-boot/src/main/java/com/njcn/device => pq-device/pq-device-boot/src/main/java/com/njcn/device/pq}/mapper/VoltageMapper.java (87%) rename pqs-device/{device-boot/src/main/java/com/njcn/device => pq-device/pq-device-boot/src/main/java/com/njcn/device/pq}/mapper/mapping/AlarmMapper.xml (98%) rename pqs-device/{device-boot/src/main/java/com/njcn/device => pq-device/pq-device-boot/src/main/java/com/njcn/device/pq}/mapper/mapping/AlarmStrategyMapper.xml (93%) rename pqs-device/{device-boot/src/main/java/com/njcn/device => pq-device/pq-device-boot/src/main/java/com/njcn/device/pq}/mapper/mapping/AreaDeviceOnlineMapper.xml (89%) create mode 100644 pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/AreaIntegrityDataMapper.xml rename pqs-device/{device-boot/src/main/java/com/njcn/device => pq-device/pq-device-boot/src/main/java/com/njcn/device/pq}/mapper/mapping/CommunicateMapper.xml (70%) rename pqs-device/{device-boot/src/main/java/com/njcn/device => pq-device/pq-device-boot/src/main/java/com/njcn/device/pq}/mapper/mapping/DeptLineMapper.xml (91%) rename pqs-device/{device-boot/src/main/java/com/njcn/device => pq-device/pq-device-boot/src/main/java/com/njcn/device/pq}/mapper/mapping/DevFuctionMapper.xml (86%) rename pqs-device/{device-boot/src/main/java/com/njcn/device => pq-device/pq-device-boot/src/main/java/com/njcn/device/pq}/mapper/mapping/DevMealMapper.xml (72%) rename pqs-device/{device-boot/src/main/java/com/njcn/device => pq-device/pq-device-boot/src/main/java/com/njcn/device/pq}/mapper/mapping/DevStateMapper.xml (71%) rename pqs-device/{device-boot/src/main/java/com/njcn/device => pq-device/pq-device-boot/src/main/java/com/njcn/device/pq}/mapper/mapping/DevStrategyMapper.xml (70%) rename pqs-device/{device-boot/src/main/java/com/njcn/device => pq-device/pq-device-boot/src/main/java/com/njcn/device/pq}/mapper/mapping/DevVersionMapper.xml (71%) rename pqs-device/{device-boot/src/main/java/com/njcn/device => pq-device/pq-device-boot/src/main/java/com/njcn/device/pq}/mapper/mapping/DeviceBakMapper.xml (71%) rename pqs-device/{device-boot/src/main/java/com/njcn/device => pq-device/pq-device-boot/src/main/java/com/njcn/device/pq}/mapper/mapping/DeviceMapper.xml (97%) rename pqs-device/{device-boot/src/main/java/com/njcn/device => pq-device/pq-device-boot/src/main/java/com/njcn/device/pq}/mapper/mapping/DeviceOnlineDataMapper.xml (95%) create mode 100644 pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/DeviceRunExceptionMapper.xml rename pqs-device/{device-boot/src/main/java/com/njcn/device => pq-device/pq-device-boot/src/main/java/com/njcn/device/pq}/mapper/mapping/FlowMealMapper.xml (71%) create mode 100644 pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/FlowStrategyDicMapper.xml rename pqs-device/{device-boot/src/main/java/com/njcn/device/mapper/mapping/FlowStrategyDicMapper.xml => pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/FlowStrategyMapper.xml} (71%) rename pqs-device/{device-boot/src/main/java/com/njcn/device => pq-device/pq-device-boot/src/main/java/com/njcn/device/pq}/mapper/mapping/LineBakMapper.xml (72%) rename pqs-device/{device-boot/src/main/java/com/njcn/device => pq-device/pq-device-boot/src/main/java/com/njcn/device/pq}/mapper/mapping/LineDetailMapper.xml (95%) create mode 100644 pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/LineIntegrityDataMapper.xml rename pqs-device/{device-boot/src/main/java/com/njcn/device => pq-device/pq-device-boot/src/main/java/com/njcn/device/pq}/mapper/mapping/LineMapper.xml (96%) rename pqs-device/{device-boot/src/main/java/com/njcn/device => pq-device/pq-device-boot/src/main/java/com/njcn/device/pq}/mapper/mapping/LineMarkMapper.xml (98%) rename pqs-device/{device-boot/src/main/java/com/njcn/device => pq-device/pq-device-boot/src/main/java/com/njcn/device/pq}/mapper/mapping/LogManageMapper.xml (96%) rename pqs-device/{device-boot/src/main/java/com/njcn/device => pq-device/pq-device-boot/src/main/java/com/njcn/device/pq}/mapper/mapping/MonthFlowMapper.xml (71%) rename pqs-device/{device-boot/src/main/java/com/njcn/device => pq-device/pq-device-boot/src/main/java/com/njcn/device/pq}/mapper/mapping/NodeMapper.xml (73%) rename pqs-device/{device-boot/src/main/java/com/njcn/device => pq-device/pq-device-boot/src/main/java/com/njcn/device/pq}/mapper/mapping/OverlimitMapper.xml (71%) rename pqs-device/{device-boot/src/main/java/com/njcn/device => pq-device/pq-device-boot/src/main/java/com/njcn/device/pq}/mapper/mapping/ProgramVersionMapper.xml (94%) rename pqs-device/{device-boot/src/main/java/com/njcn/device => pq-device/pq-device-boot/src/main/java/com/njcn/device/pq}/mapper/mapping/ProtectValueMapper.xml (70%) rename pqs-device/{device-boot/src/main/java/com/njcn/device => pq-device/pq-device-boot/src/main/java/com/njcn/device/pq}/mapper/mapping/ProtectWordMapper.xml (70%) rename pqs-device/{device-boot/src/main/java/com/njcn/device => pq-device/pq-device-boot/src/main/java/com/njcn/device/pq}/mapper/mapping/RateOfFlowMapper.xml (98%) rename pqs-device/{device-boot/src/main/java/com/njcn/device => pq-device/pq-device-boot/src/main/java/com/njcn/device/pq}/mapper/mapping/StatisFlowMapper.xml (71%) create mode 100644 pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/StrategydicFunMapper.xml rename pqs-device/{device-boot/src/main/java/com/njcn/device => pq-device/pq-device-boot/src/main/java/com/njcn/device/pq}/mapper/mapping/SubstationMapper.xml (79%) rename pqs-device/{device-boot/src/main/java/com/njcn/device => pq-device/pq-device-boot/src/main/java/com/njcn/device/pq}/mapper/mapping/TerminalMaintainMapper.xml (98%) create mode 100644 pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/TerminalOnlineRateDataMapper.xml rename pqs-device/{device-boot/src/main/java/com/njcn/device => pq-device/pq-device-boot/src/main/java/com/njcn/device/pq}/mapper/mapping/TerminalVersionMapper.xml (97%) rename pqs-device/{device-boot/src/main/java/com/njcn/device => pq-device/pq-device-boot/src/main/java/com/njcn/device/pq}/mapper/mapping/TreeMapper.xml (96%) rename pqs-device/{device-boot/src/main/java/com/njcn/device => pq-device/pq-device-boot/src/main/java/com/njcn/device/pq}/mapper/mapping/VersionMapper.xml (72%) rename pqs-device/{device-boot/src/main/java/com/njcn/device => pq-device/pq-device-boot/src/main/java/com/njcn/device/pq}/mapper/mapping/VoltageMapper.xml (89%) rename pqs-device/{device-boot/src/main/java/com/njcn/device => pq-device/pq-device-boot/src/main/java/com/njcn/device/pq}/service/AlarmStrategyService.java (79%) rename pqs-device/{device-boot/src/main/java/com/njcn/device => pq-device/pq-device-boot/src/main/java/com/njcn/device/pq}/service/AreaDeviceOnlineService.java (61%) create mode 100644 pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/AreaIntegrityDataService.java rename pqs-device/{device-boot/src/main/java/com/njcn/device => pq-device/pq-device-boot/src/main/java/com/njcn/device/pq}/service/AreaIntegrityService.java (61%) rename pqs-device/{device-boot/src/main/java/com/njcn/device => pq-device/pq-device-boot/src/main/java/com/njcn/device/pq}/service/CommunicateService.java (53%) rename pqs-device/{device-boot/src/main/java/com/njcn/device => pq-device/pq-device-boot/src/main/java/com/njcn/device/pq}/service/DeptLineService.java (93%) rename pqs-device/{device-boot/src/main/java/com/njcn/device => pq-device/pq-device-boot/src/main/java/com/njcn/device/pq}/service/DeviceBakService.java (70%) rename pqs-device/{device-boot/src/main/java/com/njcn/device => pq-device/pq-device-boot/src/main/java/com/njcn/device/pq}/service/DeviceOnlineDataService.java (61%) rename pqs-device/{device-boot/src/main/java/com/njcn/device => pq-device/pq-device-boot/src/main/java/com/njcn/device/pq}/service/DeviceOnlineService.java (76%) create mode 100644 pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/DeviceRunExceptionService.java rename pqs-device/{device-boot/src/main/java/com/njcn/device => pq-device/pq-device-boot/src/main/java/com/njcn/device/pq}/service/FlowMealService.java (81%) rename pqs-device/{device-boot/src/main/java/com/njcn/device => pq-device/pq-device-boot/src/main/java/com/njcn/device/pq}/service/FlowStrategyService.java (79%) rename pqs-device/{device-boot/src/main/java/com/njcn/device => pq-device/pq-device-boot/src/main/java/com/njcn/device/pq}/service/IDevMealService.java (71%) rename pqs-device/{device-boot/src/main/java/com/njcn/device => pq-device/pq-device-boot/src/main/java/com/njcn/device/pq}/service/IDevStrategyService.java (71%) rename pqs-device/{device-boot/src/main/java/com/njcn/device => pq-device/pq-device-boot/src/main/java/com/njcn/device/pq}/service/IDeviceService.java (72%) rename pqs-device/{device-boot/src/main/java/com/njcn/device => pq-device/pq-device-boot/src/main/java/com/njcn/device/pq}/service/INodeService.java (84%) rename pqs-device/{device-boot/src/main/java/com/njcn/device => pq-device/pq-device-boot/src/main/java/com/njcn/device/pq}/service/LineBakService.java (71%) create mode 100644 pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/LineIntegrityDataService.java rename pqs-device/{device-boot/src/main/java/com/njcn/device => pq-device/pq-device-boot/src/main/java/com/njcn/device/pq}/service/LineMarkService.java (80%) rename pqs-device/{device-boot/src/main/java/com/njcn/device => pq-device/pq-device-boot/src/main/java/com/njcn/device/pq}/service/LineService.java (90%) rename pqs-device/{device-boot/src/main/java/com/njcn/device => pq-device/pq-device-boot/src/main/java/com/njcn/device/pq}/service/LogManageService.java (68%) rename pqs-device/{device-boot/src/main/java/com/njcn/device => pq-device/pq-device-boot/src/main/java/com/njcn/device/pq}/service/ProgramVersionService.java (93%) rename pqs-device/{device-boot/src/main/java/com/njcn/device => pq-device/pq-device-boot/src/main/java/com/njcn/device/pq}/service/RunManageService.java (62%) rename pqs-device/{device-boot/src/main/java/com/njcn/device => pq-device/pq-device-boot/src/main/java/com/njcn/device/pq}/service/TerminalAlarmService.java (70%) rename pqs-device/{device-boot/src/main/java/com/njcn/device => pq-device/pq-device-boot/src/main/java/com/njcn/device/pq}/service/TerminalBaseService.java (87%) rename pqs-device/{device-boot/src/main/java/com/njcn/device => pq-device/pq-device-boot/src/main/java/com/njcn/device/pq}/service/TerminalMaintainService.java (70%) create mode 100644 pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/TerminalOnlineRateDataService.java rename pqs-device/{device-boot/src/main/java/com/njcn/device => pq-device/pq-device-boot/src/main/java/com/njcn/device/pq}/service/TerminalTreeService.java (78%) rename pqs-device/{device-boot/src/main/java/com/njcn/device => pq-device/pq-device-boot/src/main/java/com/njcn/device/pq}/service/TerminalVersionService.java (67%) rename pqs-device/{device-boot/src/main/java/com/njcn/device => pq-device/pq-device-boot/src/main/java/com/njcn/device/pq}/service/impl/AlarmStrategyServiceImpl.java (87%) rename pqs-device/{device-boot/src/main/java/com/njcn/device => pq-device/pq-device-boot/src/main/java/com/njcn/device/pq}/service/impl/AreaDeviceOnlineServiceImpl.java (94%) create mode 100644 pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/AreaIntegrityDataServiceImpl.java rename pqs-device/{device-boot/src/main/java/com/njcn/device => pq-device/pq-device-boot/src/main/java/com/njcn/device/pq}/service/impl/AreaIntegrityServiceImpl.java (93%) rename pqs-device/{device-boot/src/main/java/com/njcn/device => pq-device/pq-device-boot/src/main/java/com/njcn/device/pq}/service/impl/CommunicateServiceImpl.java (94%) rename pqs-device/{device-boot/src/main/java/com/njcn/device => pq-device/pq-device-boot/src/main/java/com/njcn/device/pq}/service/impl/DeptLineServiceImpl.java (92%) rename pqs-device/{device-boot/src/main/java/com/njcn/device => pq-device/pq-device-boot/src/main/java/com/njcn/device/pq}/service/impl/DevMealServiceImpl.java (63%) rename pqs-device/{device-boot/src/main/java/com/njcn/device => pq-device/pq-device-boot/src/main/java/com/njcn/device/pq}/service/impl/DevStrategyServiceImpl.java (63%) rename pqs-device/{device-boot/src/main/java/com/njcn/device => pq-device/pq-device-boot/src/main/java/com/njcn/device/pq}/service/impl/DeviceBakServiceImpl.java (68%) rename pqs-device/{device-boot/src/main/java/com/njcn/device => pq-device/pq-device-boot/src/main/java/com/njcn/device/pq}/service/impl/DeviceOnlineDataServiceImpl.java (94%) create mode 100644 pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/DeviceRunExceptionServiceImpl.java rename pqs-device/{device-boot/src/main/java/com/njcn/device => pq-device/pq-device-boot/src/main/java/com/njcn/device/pq}/service/impl/DeviceServiceImpl.java (63%) rename pqs-device/{device-boot/src/main/java/com/njcn/device => pq-device/pq-device-boot/src/main/java/com/njcn/device/pq}/service/impl/FlowMealServiceImpl.java (89%) rename pqs-device/{device-boot/src/main/java/com/njcn/device => pq-device/pq-device-boot/src/main/java/com/njcn/device/pq}/service/impl/FlowStrategyServiceImpl.java (94%) rename pqs-device/{device-boot/src/main/java/com/njcn/device => pq-device/pq-device-boot/src/main/java/com/njcn/device/pq}/service/impl/GeneralDeviceService.java (97%) rename pqs-device/{device-boot/src/main/java/com/njcn/device => pq-device/pq-device-boot/src/main/java/com/njcn/device/pq}/service/impl/LineBakServiceImpl.java (69%) create mode 100644 pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/LineIntegrityDataServiceImpl.java rename pqs-device/{device-boot/src/main/java/com/njcn/device => pq-device/pq-device-boot/src/main/java/com/njcn/device/pq}/service/impl/LineMarkServiceImpl.java (90%) rename pqs-device/{device-boot/src/main/java/com/njcn/device => pq-device/pq-device-boot/src/main/java/com/njcn/device/pq}/service/impl/LineServiceImpl.java (97%) rename pqs-device/{device-boot/src/main/java/com/njcn/device => pq-device/pq-device-boot/src/main/java/com/njcn/device/pq}/service/impl/LogManageServiceImpl.java (94%) rename pqs-device/{device-boot/src/main/java/com/njcn/device => pq-device/pq-device-boot/src/main/java/com/njcn/device/pq}/service/impl/NodeServiceImpl.java (95%) rename pqs-device/{device-boot/src/main/java/com/njcn/device => pq-device/pq-device-boot/src/main/java/com/njcn/device/pq}/service/impl/ProgramVersionServiceImpl.java (93%) rename pqs-device/{device-boot/src/main/java/com/njcn/device => pq-device/pq-device-boot/src/main/java/com/njcn/device/pq}/service/impl/RunManageServiceImpl.java (91%) rename pqs-device/{device-boot/src/main/java/com/njcn/device => pq-device/pq-device-boot/src/main/java/com/njcn/device/pq}/service/impl/TerminalAlarmServiceImpl.java (83%) rename pqs-device/{device-boot/src/main/java/com/njcn/device => pq-device/pq-device-boot/src/main/java/com/njcn/device/pq}/service/impl/TerminalBaseServiceImpl.java (99%) rename pqs-device/{device-boot/src/main/java/com/njcn/device => pq-device/pq-device-boot/src/main/java/com/njcn/device/pq}/service/impl/TerminalMaintainServiceImpl.java (85%) create mode 100644 pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/TerminalOnlineRateDataServiceImpl.java rename pqs-device/{device-boot/src/main/java/com/njcn/device => pq-device/pq-device-boot/src/main/java/com/njcn/device/pq}/service/impl/TerminalTreeServiceImpl.java (94%) rename pqs-device/{device-boot/src/main/java/com/njcn/device => pq-device/pq-device-boot/src/main/java/com/njcn/device/pq}/service/impl/TerminalVersionServiceImpl.java (82%) create mode 100644 pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/utils/DataStatisticsUtil.java rename pqs-device/{device-boot/src/main/java/com/njcn/device => pq-device/pq-device-boot/src/main/java/com/njcn/device/pq}/utils/DeviceUtil.java (96%) rename pqs-device/{device-boot/src/main/java/com/njcn/device => pq-device/pq-device-boot/src/main/java/com/njcn/device/pq}/utils/ExcelStyleUtil.java (98%) create mode 100644 pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/utils/SpiltDateUtil.java diff --git a/pom.xml b/pom.xml index 4cc0cc0eb..de2d78146 100644 --- a/pom.xml +++ b/pom.xml @@ -40,21 +40,21 @@ 192.168.1.13 - 192.168.1.130 + 192.168.1.111 ${middle.server.url}:18848 - 722a16dc-6988-419e-96e9-de885508296b + fd74182b-1fce-4dba-afa7-2623b0376205 ${middle.server.url}:8080 ${service.server.url}:10215 - http://${middle.server.url}:2375 + http://192.168.1.13:2375 - ${middle.server.url}:8090 + 192.168.1.13:8090 njcn deploy @@ -268,6 +268,11 @@ jackson-annotations ${jackson} + + com.fasterxml.jackson.datatype + jackson-datatype-jsr310 + ${jackson} + com.alibaba easyexcel diff --git a/pqs-advance/advance-boot/pom.xml b/pqs-advance/advance-boot/pom.xml index 258498f1c..7ed6a62a1 100644 --- a/pqs-advance/advance-boot/pom.xml +++ b/pqs-advance/advance-boot/pom.xml @@ -27,7 +27,7 @@ com.njcn - device-api + pq-device-api ${project.version} diff --git a/pqs-common/common-core/pom.xml b/pqs-common/common-core/pom.xml index 4a734c031..ad6364693 100644 --- a/pqs-common/common-core/pom.xml +++ b/pqs-common/common-core/pom.xml @@ -91,6 +91,10 @@ com.fasterxml.jackson.core jackson-annotations + + com.fasterxml.jackson.datatype + jackson-datatype-jsr310 + com.github.tocrhz diff --git a/pqs-common/common-influxdb/pom.xml b/pqs-common/common-influxdb/pom.xml index c47cd876a..bc3bc9568 100644 --- a/pqs-common/common-influxdb/pom.xml +++ b/pqs-common/common-influxdb/pom.xml @@ -21,7 +21,6 @@ org.influxdb influxdb-java - ${influxdb-java.version} diff --git a/pqs-common/common-influxdb/src/main/java/com/njcn/influxdb/config/InfluxDbOkHttpClientBuilderProvider.java b/pqs-common/common-influxdb/src/main/java/com/njcn/influxdb/config/InfluxDbOkHttpClientBuilderProvider.java new file mode 100644 index 000000000..5062b467a --- /dev/null +++ b/pqs-common/common-influxdb/src/main/java/com/njcn/influxdb/config/InfluxDbOkHttpClientBuilderProvider.java @@ -0,0 +1,25 @@ +//package com.njcn.influxdb.config; +// +///** +// * @author hongawen +// * @version 1.0.0 +// * @date 2022年09月20日 22:24 +// */ +// +//import okhttp3.OkHttpClient; +//import org.springframework.context.annotation.Configuration; +// +//import java.util.concurrent.TimeUnit; +// +//@Configuration +//public class InfluxDbOkHttpClientBuilderProvider implements org.springframework.boot.autoconfigure.influx.InfluxDbOkHttpClientBuilderProvider { +// +// @Override +// public OkHttpClient.Builder get() { +// // 设置超时时间为100秒 +// return new OkHttpClient.Builder() +// .connectTimeout(100, TimeUnit.SECONDS) +// .readTimeout(100, TimeUnit.SECONDS) +// .writeTimeout(100, TimeUnit.SECONDS); +// } +//} diff --git a/pqs-common/common-influxdb/src/main/java/com/njcn/influxdb/param/InfluxDBPublicParam.java b/pqs-common/common-influxdb/src/main/java/com/njcn/influxdb/param/InfluxDBPublicParam.java index b73b3878c..353e61ed4 100644 --- a/pqs-common/common-influxdb/src/main/java/com/njcn/influxdb/param/InfluxDBPublicParam.java +++ b/pqs-common/common-influxdb/src/main/java/com/njcn/influxdb/param/InfluxDBPublicParam.java @@ -12,7 +12,7 @@ public interface InfluxDBPublicParam { /** * influxDB数据库名称 */ - String DATABASE = "pqsbase"; + String DATABASE = "PQSBASE"; /** * 暂态事件汇总表 diff --git a/pqs-common/common-influxdb/src/main/java/com/njcn/influxdb/utils/InfluxDbUtils.java b/pqs-common/common-influxdb/src/main/java/com/njcn/influxdb/utils/InfluxDbUtils.java index 9840d8ecb..0e2266cdb 100644 --- a/pqs-common/common-influxdb/src/main/java/com/njcn/influxdb/utils/InfluxDbUtils.java +++ b/pqs-common/common-influxdb/src/main/java/com/njcn/influxdb/utils/InfluxDbUtils.java @@ -3,6 +3,7 @@ package com.njcn.influxdb.utils; import lombok.Data; import lombok.extern.slf4j.Slf4j; +import okhttp3.OkHttpClient; import org.influxdb.InfluxDB; import org.influxdb.InfluxDB.ConsistencyLevel; import org.influxdb.InfluxDBFactory; @@ -31,6 +32,10 @@ import java.util.concurrent.TimeUnit; @Slf4j @Data public class InfluxDbUtils { + static OkHttpClient.Builder client = new OkHttpClient.Builder() + .connectTimeout(1000,TimeUnit.SECONDS) + .readTimeout(1000, TimeUnit.SECONDS) + .writeTimeout(1000, TimeUnit.SECONDS); private static final int FRACTION_MIN_WIDTH = 0; private static final int FRACTION_MAX_WIDTH = 9; private static final boolean ADD_DECIMAL_POINT = true; @@ -70,7 +75,7 @@ public class InfluxDbUtils { */ public InfluxDB influxDbBuild() { if (influxDB == null) { - influxDB = InfluxDBFactory.connect(openurl, username, password); + influxDB = InfluxDBFactory.connect(openurl, username, password,client); } try { // if (!influxDB.databaseExists(database)) { @@ -87,6 +92,8 @@ public class InfluxDbUtils { } + + /** * 创建数据库 * diff --git a/pqs-common/common-influxdb/src/test/java/DataTest.java b/pqs-common/common-influxdb/src/test/java/DataTest.java index f8e731d8f..262ec2329 100644 --- a/pqs-common/common-influxdb/src/test/java/DataTest.java +++ b/pqs-common/common-influxdb/src/test/java/DataTest.java @@ -1,12 +1,16 @@ import cn.hutool.core.date.DateUtil; +import com.njcn.common.pojo.response.HttpResult; +import com.njcn.common.utils.PubUtils; import com.njcn.event.pojo.po.EventDetail; import com.njcn.influxdb.utils.InfluxDbUtils; +import feign.Util; import org.influxdb.InfluxDB.ConsistencyLevel; import org.influxdb.dto.BatchPoints; import org.influxdb.dto.Point; import org.influxdb.dto.QueryResult; import org.influxdb.impl.InfluxDBResultMapper; +import java.time.Instant; import java.util.*; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; @@ -59,19 +63,27 @@ public class DataTest { } public static void main(String[] args) { - InfluxDbUtils influxDBUtil = new InfluxDbUtils("admin", "123456", "http://192.168.1.18:8086", "pqsbase", ""); - insert(influxDBUtil); - Map tags = new HashMap<>(); - long time = Long.parseLong("1657959227000"); - tags.put("line_id","656da093bdb523b6ac619067a4045624"); - Map fields = new HashMap<>(); - fields.put("statis_value",1024000000.00); - influxDBUtil.insert("cld_month_flow", tags, fields, time, TimeUnit.MILLISECONDS); + InfluxDbUtils influxDBUtil = new InfluxDbUtils("admin", "njcnpqs", "http://192.168.1.18:8086", "PQSBASE", ""); + String sql = "select * from pqs_eventdetail limit 10"; + //获取暂降事件 + QueryResult result = influxDBUtil.query(sql); + InfluxDBResultMapper influxDBResultMapper = new InfluxDBResultMapper(); + List eventDetailList = influxDBResultMapper.toPOJO(result, EventDetail.class); + String bodyStr = PubUtils.obj2json(eventDetailList.get(0)); + //对结果进行转换 + EventDetail o = PubUtils.json2obj(bodyStr, EventDetail.class); + Instant timeId = o.getTimeId(); + System.out.println(timeId); + + + System.out.println(1); //select(influxDBUtil); } + public static void deleteDB(InfluxDbUtils influxDBUtil) { influxDBUtil.deleteDB("LIMIT_RATE"); } + //单条数据插入 public static void insert(InfluxDbUtils influxDBUtil) { Map tags = new HashMap<>(); @@ -80,8 +92,8 @@ public class DataTest { Map fields = new HashMap<>(); // fields.put("due",1440); // fields.put("real",1200); - fields.put("onlinemin",1123); - fields.put("offlinemin",377); + fields.put("onlinemin", 1123); + fields.put("offlinemin", 377); influxDBUtil.insert("pqs_onlinerate", tags, fields, time, TimeUnit.MILLISECONDS); // long time = Long.parseLong("1655135328135"); // Map tags = new HashMap<>(); 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 9bb826672..7b68ff6af 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,8 +53,8 @@ public class Knife4jSwaggerConfig { public Docket defaultApi() { List controllerPath = Stream.of( "com.njcn.user.controller", - "com.njcn.device.controller", - "com.njcn.pvdevice.controller", + "com.njcn.device.pq.controller", + "com.njcn.device.pms.controller", "com.njcn.auth.controller", "com.njcn.system.controller", "com.njcn.harmonic.controller", diff --git a/pqs-device/device-api/pom.xml b/pqs-device/common-device-biz/pom.xml similarity index 92% rename from pqs-device/device-api/pom.xml rename to pqs-device/common-device-biz/pom.xml index e92344057..a4136c16a 100644 --- a/pqs-device/device-api/pom.xml +++ b/pqs-device/common-device-biz/pom.xml @@ -7,12 +7,10 @@ com.njcn 1.0.0 - - 4.0.0 - device-api - 终端配置对外接口 - + common-device-biz + jar + 台账通用业务 8 @@ -20,6 +18,7 @@ + com.njcn common-core @@ -46,7 +45,4 @@ - - - - + \ No newline at end of file diff --git a/pqs-device/device-api/src/main/java/com/njcn/device/enums/LineFlagEnum.java b/pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/enums/LineFlagEnum.java similarity index 94% rename from pqs-device/device-api/src/main/java/com/njcn/device/enums/LineFlagEnum.java rename to pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/enums/LineFlagEnum.java index 06f31c341..ff8781fb6 100644 --- a/pqs-device/device-api/src/main/java/com/njcn/device/enums/LineFlagEnum.java +++ b/pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/enums/LineFlagEnum.java @@ -1,4 +1,4 @@ -package com.njcn.device.enums; +package com.njcn.device.biz.enums; import lombok.Getter; diff --git a/pqs-device/device-boot/pom.xml b/pqs-device/device-boot/pom.xml index 887000c59..4bfab5e16 100644 --- a/pqs-device/device-boot/pom.xml +++ b/pqs-device/device-boot/pom.xml @@ -21,44 +21,22 @@ com.njcn - device-api + pq-device-boot ${project.version} + com.njcn - user-api - ${project.version} - - - com.njcn - system-api - ${project.version} - - - com.njcn - event-api - ${project.version} - - - com.njcn - common-web + pms-device-boot ${project.version} + com.njcn common-swagger ${project.version} - - com.njcn - common-influxDB - 1.0.0 - compile - - - - - + diff --git a/pqs-device/device-boot/src/main/java/com/njcn/device/DeviceBootApplication.java b/pqs-device/device-boot/src/main/java/com/njcn/DeviceBootApplication.java similarity index 86% rename from pqs-device/device-boot/src/main/java/com/njcn/device/DeviceBootApplication.java rename to pqs-device/device-boot/src/main/java/com/njcn/DeviceBootApplication.java index 80bd35919..210bc589f 100644 --- a/pqs-device/device-boot/src/main/java/com/njcn/device/DeviceBootApplication.java +++ b/pqs-device/device-boot/src/main/java/com/njcn/DeviceBootApplication.java @@ -1,10 +1,9 @@ -package com.njcn.device; +package com.njcn; import lombok.extern.slf4j.Slf4j; import org.mybatis.spring.annotation.MapperScan; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.cloud.client.discovery.EnableDiscoveryClient; import org.springframework.cloud.openfeign.EnableFeignClients; /** diff --git a/pqs-device/device-boot/src/main/java/com/njcn/device/mapper/mapping/FlowStrategyMapper.xml b/pqs-device/device-boot/src/main/java/com/njcn/device/mapper/mapping/FlowStrategyMapper.xml deleted file mode 100644 index 5b8b6ba3b..000000000 --- a/pqs-device/device-boot/src/main/java/com/njcn/device/mapper/mapping/FlowStrategyMapper.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/pqs-device/device-boot/src/main/java/com/njcn/pvdevice/mapper/mapping/PvDispatchMapper.xml b/pqs-device/device-boot/src/main/java/com/njcn/pvdevice/mapper/mapping/PvDispatchMapper.xml deleted file mode 100644 index eb221771a..000000000 --- a/pqs-device/device-boot/src/main/java/com/njcn/pvdevice/mapper/mapping/PvDispatchMapper.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/pqs-device/device-boot/src/main/resources/bootstrap.yml b/pqs-device/device-boot/src/main/resources/bootstrap.yml index 23dc3c387..3b4528be0 100644 --- a/pqs-device/device-boot/src/main/resources/bootstrap.yml +++ b/pqs-device/device-boot/src/main/resources/bootstrap.yml @@ -53,7 +53,7 @@ logging: #mybatis配置信息 mybatis-plus: #别名扫描 - type-aliases-package: com.njcn.device.pojo + type-aliases-package: com.njcn.device.pq.pojo,com.njcn.device.pms.pojo, mqtt: diff --git a/pqs-device/device-boot/src/test/java/com/njcn/BaseJunitTest.java b/pqs-device/device-boot/src/test/java/com/njcn/BaseJunitTest.java index 7a3217fae..b62531dcf 100644 --- a/pqs-device/device-boot/src/test/java/com/njcn/BaseJunitTest.java +++ b/pqs-device/device-boot/src/test/java/com/njcn/BaseJunitTest.java @@ -1,6 +1,5 @@ package com.njcn; -import com.njcn.device.DeviceBootApplication; import org.junit.runner.RunWith; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.junit4.SpringRunner; diff --git a/pqs-device/device-boot/src/test/java/com/njcn/DeviceTest.java b/pqs-device/device-boot/src/test/java/com/njcn/DeviceTest.java index d3a2f2e35..efda306dc 100644 --- a/pqs-device/device-boot/src/test/java/com/njcn/DeviceTest.java +++ b/pqs-device/device-boot/src/test/java/com/njcn/DeviceTest.java @@ -1,7 +1,8 @@ +/* package com.njcn; -import com.njcn.device.pojo.po.DeptLine; -import com.njcn.device.service.DeptLineService; +import com.njcn.device.pq.pojo.po.DeptLine; +import com.njcn.device.pq.service.DeptLineService; import com.njcn.web.pojo.param.DeptLineParam; import org.junit.Test; import org.springframework.beans.factory.annotation.Autowired; @@ -12,11 +13,13 @@ import java.util.List; import java.util.stream.Collectors; import java.util.stream.Stream; +*/ /** * @author hongawen * @version 1.0.0 * @date 2021年12月14日 12:55 - */ + *//* + public class DeviceTest extends BaseJunitTest { @Autowired @@ -44,3 +47,4 @@ public class DeviceTest extends BaseJunitTest { } +*/ diff --git a/pqs-device/pms-device/pms-device-api/pom.xml b/pqs-device/pms-device/pms-device-api/pom.xml new file mode 100644 index 000000000..18864dfb5 --- /dev/null +++ b/pqs-device/pms-device/pms-device-api/pom.xml @@ -0,0 +1,26 @@ + + + + pms-device + com.njcn + 1.0.0 + + 4.0.0 + + pms-device-api + pms终端配置对外接口 + + 8 + 8 + + + + + com.njcn + common-device-biz + ${project.version} + + + \ No newline at end of file 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 new file mode 100644 index 000000000..b5dfa5b8b --- /dev/null +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/bo/DeviceRunExBO.java @@ -0,0 +1,47 @@ +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 children; + +} diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/dto/DeviceRunExDTO.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/dto/DeviceRunExDTO.java new file mode 100644 index 000000000..dab729c48 --- /dev/null +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/dto/DeviceRunExDTO.java @@ -0,0 +1,46 @@ +package com.njcn.device.pms.pojo.dto; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.Max; +import javax.validation.constraints.Min; +import javax.validation.constraints.NotNull; +import javax.validation.constraints.Pattern; + +/** + * 终端运行异常条件查询 + * + * @author yangj + * @date 2022/09/08 + */ +@Data +public class DeviceRunExDTO { + + /** + * 起始时间 + */ + @ApiModelProperty("起始时间") + @NotNull + @Pattern(regexp = "^\\d{4}-\\d{2}-\\d{2}$", message = "时间格式不正确") + private String startTime; + + /** + * 结束时间 + */ + @ApiModelProperty("结束时间") + @NotNull + @Pattern(regexp = "^\\d{4}-\\d{2}-\\d{2}$", message = "时间格式不正确") + private String endTime; + + + /** + * 监测点等级 + */ + @ApiModelProperty("监测点等级：0-全部；1-极重要；2-重要；3-普通；4-不重要；") + @NotNull(message = "监测点等级不可为空") + @Max(value = 4) + @Min(value = 0) + private String lineLevel; + +} diff --git a/pqs-device/device-api/src/main/java/com/njcn/device/pojo/param/pv/DeviceQueryParam.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/DeviceQueryParam.java similarity index 92% rename from pqs-device/device-api/src/main/java/com/njcn/device/pojo/param/pv/DeviceQueryParam.java rename to pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/DeviceQueryParam.java index ba70a23eb..79e6ec3c7 100644 --- a/pqs-device/device-api/src/main/java/com/njcn/device/pojo/param/pv/DeviceQueryParam.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/DeviceQueryParam.java @@ -1,4 +1,4 @@ -package com.njcn.device.pojo.param.pv; +package com.njcn.device.pms.pojo.param; import com.njcn.web.pojo.param.BaseParam; import io.swagger.annotations.ApiModelProperty; diff --git a/pqs-device/device-api/src/main/java/com/njcn/device/pojo/param/pv/DistributedQueryParam.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/DistributedQueryParam.java similarity index 92% rename from pqs-device/device-api/src/main/java/com/njcn/device/pojo/param/pv/DistributedQueryParam.java rename to pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/DistributedQueryParam.java index 3e1c014b6..81f08676c 100644 --- a/pqs-device/device-api/src/main/java/com/njcn/device/pojo/param/pv/DistributedQueryParam.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/DistributedQueryParam.java @@ -1,4 +1,4 @@ -package com.njcn.device.pojo.param.pv; +package com.njcn.device.pms.pojo.param; import com.njcn.web.pojo.param.BaseParam; import io.swagger.annotations.ApiModelProperty; diff --git a/pqs-device/device-api/src/main/java/com/njcn/device/pojo/param/pv/LineDetailQueryParam.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/LineDetailQueryParam.java similarity index 92% rename from pqs-device/device-api/src/main/java/com/njcn/device/pojo/param/pv/LineDetailQueryParam.java rename to pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/LineDetailQueryParam.java index 28952a008..7e13ef521 100644 --- a/pqs-device/device-api/src/main/java/com/njcn/device/pojo/param/pv/LineDetailQueryParam.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/LineDetailQueryParam.java @@ -1,4 +1,4 @@ -package com.njcn.device.pojo.param.pv; +package com.njcn.device.pms.pojo.param; import com.njcn.web.pojo.param.BaseParam; import io.swagger.annotations.ApiModelProperty; diff --git a/pqs-device/device-api/src/main/java/com/njcn/device/pojo/param/pv/LvUserQueryParam.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/LvUserQueryParam.java similarity index 93% rename from pqs-device/device-api/src/main/java/com/njcn/device/pojo/param/pv/LvUserQueryParam.java rename to pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/LvUserQueryParam.java index 48c4549d0..db7aa986e 100644 --- a/pqs-device/device-api/src/main/java/com/njcn/device/pojo/param/pv/LvUserQueryParam.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/LvUserQueryParam.java @@ -1,4 +1,4 @@ -package com.njcn.device.pojo.param.pv; +package com.njcn.device.pms.pojo.param; import com.njcn.web.pojo.param.BaseParam; import io.swagger.annotations.ApiModelProperty; diff --git a/pqs-device/device-api/src/main/java/com/njcn/device/pojo/param/pv/PvDeviceParam.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PvDeviceParam.java similarity index 97% rename from pqs-device/device-api/src/main/java/com/njcn/device/pojo/param/pv/PvDeviceParam.java rename to pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PvDeviceParam.java index 4cb366612..5149d5ff2 100644 --- a/pqs-device/device-api/src/main/java/com/njcn/device/pojo/param/pv/PvDeviceParam.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PvDeviceParam.java @@ -1,8 +1,7 @@ -package com.njcn.device.pojo.param.pv; +package com.njcn.device.pms.pojo.param; import com.baomidou.mybatisplus.annotation.TableName; import com.njcn.common.pojo.constant.PatternRegex; -import com.njcn.db.bo.BaseEntity; import com.njcn.web.constant.ValidMessage; import com.njcn.web.pojo.annotation.DateTimeStrValid; import io.swagger.annotations.ApiModelProperty; @@ -15,7 +14,6 @@ import javax.validation.constraints.NotNull; import javax.validation.constraints.Pattern; import java.io.Serializable; import java.time.LocalDate; -import java.time.LocalDateTime; /** *

diff --git a/pqs-device/device-api/src/main/java/com/njcn/device/pojo/param/pv/PvDispatchParam.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PvDispatchParam.java similarity index 86% rename from pqs-device/device-api/src/main/java/com/njcn/device/pojo/param/pv/PvDispatchParam.java rename to pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PvDispatchParam.java index cdeed755c..70b6b9b0e 100644 --- a/pqs-device/device-api/src/main/java/com/njcn/device/pojo/param/pv/PvDispatchParam.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PvDispatchParam.java @@ -1,7 +1,6 @@ -package com.njcn.device.pojo.param.pv; +package com.njcn.device.pms.pojo.param; import com.baomidou.mybatisplus.annotation.TableName; -import com.njcn.db.bo.BaseEntity; import lombok.Getter; import lombok.Setter; diff --git a/pqs-device/device-api/src/main/java/com/njcn/device/pojo/param/pv/PvDistributedParam.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PvDistributedParam.java similarity index 93% rename from pqs-device/device-api/src/main/java/com/njcn/device/pojo/param/pv/PvDistributedParam.java rename to pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PvDistributedParam.java index 0e0202f81..e50136835 100644 --- a/pqs-device/device-api/src/main/java/com/njcn/device/pojo/param/pv/PvDistributedParam.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PvDistributedParam.java @@ -1,19 +1,14 @@ -package com.njcn.device.pojo.param.pv; +package com.njcn.device.pms.pojo.param; -import com.baomidou.mybatisplus.annotation.TableName; import com.njcn.common.pojo.constant.PatternRegex; -import com.njcn.db.bo.BaseEntity; import com.njcn.web.constant.ValidMessage; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; -import lombok.Getter; -import lombok.Setter; import javax.validation.constraints.NotBlank; import javax.validation.constraints.Pattern; import java.io.Serializable; -import java.time.LocalDateTime; /** *

diff --git a/pqs-device/device-api/src/main/java/com/njcn/device/pojo/param/pv/PvLineDetailParam.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PvLineDetailParam.java similarity index 97% rename from pqs-device/device-api/src/main/java/com/njcn/device/pojo/param/pv/PvLineDetailParam.java rename to pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PvLineDetailParam.java index 4f2a8be8b..1c2c0e8f7 100644 --- a/pqs-device/device-api/src/main/java/com/njcn/device/pojo/param/pv/PvLineDetailParam.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PvLineDetailParam.java @@ -1,20 +1,16 @@ -package com.njcn.device.pojo.param.pv; +package com.njcn.device.pms.pojo.param; -import com.baomidou.mybatisplus.annotation.TableName; import com.njcn.common.pojo.constant.PatternRegex; -import com.njcn.db.bo.BaseEntity; 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.LocalDateTime; /** *

diff --git a/pqs-device/device-api/src/main/java/com/njcn/device/pojo/param/pv/PvLvUserParam.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PvLvUserParam.java similarity index 95% rename from pqs-device/device-api/src/main/java/com/njcn/device/pojo/param/pv/PvLvUserParam.java rename to pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PvLvUserParam.java index 5dce35de3..7acb323a5 100644 --- a/pqs-device/device-api/src/main/java/com/njcn/device/pojo/param/pv/PvLvUserParam.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PvLvUserParam.java @@ -1,8 +1,6 @@ -package com.njcn.device.pojo.param.pv; +package com.njcn.device.pms.pojo.param; -import com.baomidou.mybatisplus.annotation.TableName; import com.njcn.common.pojo.constant.PatternRegex; -import com.njcn.db.bo.BaseEntity; import com.njcn.web.constant.ValidMessage; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/pqs-device/device-api/src/main/java/com/njcn/device/pojo/param/pv/PvSubAreaParam.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PvSubAreaParam.java similarity index 95% rename from pqs-device/device-api/src/main/java/com/njcn/device/pojo/param/pv/PvSubAreaParam.java rename to pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PvSubAreaParam.java index c10d807e0..9d01e45cc 100644 --- a/pqs-device/device-api/src/main/java/com/njcn/device/pojo/param/pv/PvSubAreaParam.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PvSubAreaParam.java @@ -1,15 +1,12 @@ -package com.njcn.device.pojo.param.pv; +package com.njcn.device.pms.pojo.param; -import com.baomidou.mybatisplus.annotation.TableName; import com.njcn.common.pojo.constant.PatternRegex; -import com.njcn.db.bo.BaseEntity; 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; diff --git a/pqs-device/device-api/src/main/java/com/njcn/device/pojo/param/pv/PvSubstationParam.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PvSubstationParam.java similarity index 95% rename from pqs-device/device-api/src/main/java/com/njcn/device/pojo/param/pv/PvSubstationParam.java rename to pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PvSubstationParam.java index 413b43228..6d6cfee88 100644 --- a/pqs-device/device-api/src/main/java/com/njcn/device/pojo/param/pv/PvSubstationParam.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PvSubstationParam.java @@ -1,6 +1,5 @@ -package com.njcn.device.pojo.param.pv; +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 io.swagger.annotations.ApiModelProperty; diff --git a/pqs-device/device-api/src/main/java/com/njcn/device/pojo/param/pv/PvTenVoltageParam.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PvTenVoltageParam.java similarity index 96% rename from pqs-device/device-api/src/main/java/com/njcn/device/pojo/param/pv/PvTenVoltageParam.java rename to pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PvTenVoltageParam.java index a8f481838..2b7d592c4 100644 --- a/pqs-device/device-api/src/main/java/com/njcn/device/pojo/param/pv/PvTenVoltageParam.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PvTenVoltageParam.java @@ -1,8 +1,6 @@ -package com.njcn.device.pojo.param.pv; +package com.njcn.device.pms.pojo.param; -import com.baomidou.mybatisplus.annotation.TableName; import com.njcn.common.pojo.constant.PatternRegex; -import com.njcn.db.bo.BaseEntity; import com.njcn.web.constant.ValidMessage; import com.njcn.web.pojo.annotation.DateTimeStrValid; import io.swagger.annotations.ApiModelProperty; @@ -12,7 +10,6 @@ import lombok.EqualsAndHashCode; import javax.validation.constraints.NotBlank; import javax.validation.constraints.Pattern; import java.io.Serializable; -import java.time.LocalDateTime; /** *

diff --git a/pqs-device/device-api/src/main/java/com/njcn/device/pojo/param/pv/PvTerminalBaseQuery.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PvTerminalBaseQuery.java similarity index 90% rename from pqs-device/device-api/src/main/java/com/njcn/device/pojo/param/pv/PvTerminalBaseQuery.java rename to pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PvTerminalBaseQuery.java index 9d70dad5b..bff311a16 100644 --- a/pqs-device/device-api/src/main/java/com/njcn/device/pojo/param/pv/PvTerminalBaseQuery.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PvTerminalBaseQuery.java @@ -1,14 +1,12 @@ -package com.njcn.device.pojo.param.pv; +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.NotBlank; import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotNull; -import java.util.List; /** * pqs diff --git a/pqs-device/device-api/src/main/java/com/njcn/device/pojo/param/pv/PvUnitParam.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PvUnitParam.java similarity index 91% rename from pqs-device/device-api/src/main/java/com/njcn/device/pojo/param/pv/PvUnitParam.java rename to pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PvUnitParam.java index 4c73872b0..be7da54b8 100644 --- a/pqs-device/device-api/src/main/java/com/njcn/device/pojo/param/pv/PvUnitParam.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PvUnitParam.java @@ -1,13 +1,10 @@ -package com.njcn.device.pojo.param.pv; +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 io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; -import lombok.Getter; -import lombok.Setter; import javax.validation.constraints.NotBlank; import javax.validation.constraints.Pattern; diff --git a/pqs-device/device-api/src/main/java/com/njcn/device/pojo/param/pv/PvVoltageParam.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PvVoltageParam.java similarity index 90% rename from pqs-device/device-api/src/main/java/com/njcn/device/pojo/param/pv/PvVoltageParam.java rename to pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PvVoltageParam.java index 8de3618d5..83149e73c 100644 --- a/pqs-device/device-api/src/main/java/com/njcn/device/pojo/param/pv/PvVoltageParam.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PvVoltageParam.java @@ -1,14 +1,10 @@ -package com.njcn.device.pojo.param.pv; +package com.njcn.device.pms.pojo.param; -import com.baomidou.mybatisplus.annotation.TableName; import com.njcn.common.pojo.constant.PatternRegex; -import com.njcn.db.bo.BaseEntity; import com.njcn.web.constant.ValidMessage; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; -import lombok.Getter; -import lombok.Setter; import org.hibernate.validator.constraints.Range; import javax.validation.constraints.NotBlank; diff --git a/pqs-device/device-api/src/main/java/com/njcn/device/pojo/param/pv/SubAreaQueryParam.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/SubAreaQueryParam.java similarity index 93% rename from pqs-device/device-api/src/main/java/com/njcn/device/pojo/param/pv/SubAreaQueryParam.java rename to pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/SubAreaQueryParam.java index f6cb3aa62..c0660c536 100644 --- a/pqs-device/device-api/src/main/java/com/njcn/device/pojo/param/pv/SubAreaQueryParam.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/SubAreaQueryParam.java @@ -1,4 +1,4 @@ -package com.njcn.device.pojo.param.pv; +package com.njcn.device.pms.pojo.param; import com.njcn.web.pojo.param.BaseParam; import io.swagger.annotations.ApiModelProperty; diff --git a/pqs-device/device-api/src/main/java/com/njcn/device/pojo/param/pv/SubstationQueryParam.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/SubstationQueryParam.java similarity index 85% rename from pqs-device/device-api/src/main/java/com/njcn/device/pojo/param/pv/SubstationQueryParam.java rename to pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/SubstationQueryParam.java index 16df963bb..5933d9ecd 100644 --- a/pqs-device/device-api/src/main/java/com/njcn/device/pojo/param/pv/SubstationQueryParam.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/SubstationQueryParam.java @@ -1,11 +1,10 @@ -package com.njcn.device.pojo.param.pv; +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.NotBlank; import java.util.List; /** diff --git a/pqs-device/device-api/src/main/java/com/njcn/device/pojo/param/pv/TenVoltageQueryParam.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/TenVoltageQueryParam.java similarity index 87% rename from pqs-device/device-api/src/main/java/com/njcn/device/pojo/param/pv/TenVoltageQueryParam.java rename to pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/TenVoltageQueryParam.java index 4b8b9fbcb..683023820 100644 --- a/pqs-device/device-api/src/main/java/com/njcn/device/pojo/param/pv/TenVoltageQueryParam.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/TenVoltageQueryParam.java @@ -1,11 +1,10 @@ -package com.njcn.device.pojo.param.pv; +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.NotBlank; import java.util.List; /** diff --git a/pqs-device/device-api/src/main/java/com/njcn/device/pojo/param/pv/VoltageQueryParam.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/VoltageQueryParam.java similarity index 92% rename from pqs-device/device-api/src/main/java/com/njcn/device/pojo/param/pv/VoltageQueryParam.java rename to pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/VoltageQueryParam.java index 844ccc9b7..e89491200 100644 --- a/pqs-device/device-api/src/main/java/com/njcn/device/pojo/param/pv/VoltageQueryParam.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/VoltageQueryParam.java @@ -1,4 +1,4 @@ -package com.njcn.device.pojo.param.pv; +package com.njcn.device.pms.pojo.param; import com.njcn.web.pojo.param.BaseParam; import io.swagger.annotations.ApiModelProperty; diff --git a/pqs-device/device-api/src/main/java/com/njcn/device/pojo/po/pv/PvDevice.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/PvDevice.java similarity index 92% rename from pqs-device/device-api/src/main/java/com/njcn/device/pojo/po/pv/PvDevice.java rename to pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/PvDevice.java index ec106564c..9aff0d271 100644 --- a/pqs-device/device-api/src/main/java/com/njcn/device/pojo/po/pv/PvDevice.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/PvDevice.java @@ -1,15 +1,11 @@ -package com.njcn.device.pojo.po.pv; +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; + +import java.time.LocalDate; /** *

diff --git a/pqs-device/device-api/src/main/java/com/njcn/device/pojo/po/pv/PvDispatch.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/PvDispatch.java similarity index 87% rename from pqs-device/device-api/src/main/java/com/njcn/device/pojo/po/pv/PvDispatch.java rename to pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/PvDispatch.java index 799a0a13b..f286e3147 100644 --- a/pqs-device/device-api/src/main/java/com/njcn/device/pojo/po/pv/PvDispatch.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/PvDispatch.java @@ -1,8 +1,7 @@ -package com.njcn.device.pojo.po.pv; +package com.njcn.device.pms.pojo.po; import com.baomidou.mybatisplus.annotation.TableName; import com.njcn.db.bo.BaseEntity; -import java.io.Serializable; import lombok.Getter; import lombok.Setter; diff --git a/pqs-device/device-api/src/main/java/com/njcn/device/pojo/po/pv/PvDistributed.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/PvDistributed.java similarity index 88% rename from pqs-device/device-api/src/main/java/com/njcn/device/pojo/po/pv/PvDistributed.java rename to pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/PvDistributed.java index d28592e31..6faecb87f 100644 --- a/pqs-device/device-api/src/main/java/com/njcn/device/pojo/po/pv/PvDistributed.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/PvDistributed.java @@ -1,17 +1,12 @@ -package com.njcn.device.pojo.po.pv; +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 java.io.Serializable; -import java.time.LocalDate; -import java.time.LocalDateTime; - -import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; -import lombok.Getter; -import lombok.Setter; + +import java.time.LocalDate; /** *

diff --git a/pqs-device/device-api/src/main/java/com/njcn/device/pojo/po/pv/PvLineDetail.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/PvLineDetail.java similarity index 94% rename from pqs-device/device-api/src/main/java/com/njcn/device/pojo/po/pv/PvLineDetail.java rename to pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/PvLineDetail.java index 2255fd90f..4b06b345c 100644 --- a/pqs-device/device-api/src/main/java/com/njcn/device/pojo/po/pv/PvLineDetail.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/PvLineDetail.java @@ -1,16 +1,11 @@ -package com.njcn.device.pojo.po.pv; +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 io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; -import lombok.Getter; -import lombok.Setter; + +import java.time.LocalDate; /** *

diff --git a/pqs-device/device-api/src/main/java/com/njcn/device/pojo/po/pv/PvLvUser.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/PvLvUser.java similarity index 89% rename from pqs-device/device-api/src/main/java/com/njcn/device/pojo/po/pv/PvLvUser.java rename to pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/PvLvUser.java index 1adbf7673..07e703c2a 100644 --- a/pqs-device/device-api/src/main/java/com/njcn/device/pojo/po/pv/PvLvUser.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/PvLvUser.java @@ -1,14 +1,9 @@ -package com.njcn.device.pojo.po.pv; +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; /** *

diff --git a/pqs-device/device-api/src/main/java/com/njcn/device/pojo/po/pv/PvSubArea.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/PvSubArea.java similarity index 92% rename from pqs-device/device-api/src/main/java/com/njcn/device/pojo/po/pv/PvSubArea.java rename to pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/PvSubArea.java index 2f2d25c64..5f0a96066 100644 --- a/pqs-device/device-api/src/main/java/com/njcn/device/pojo/po/pv/PvSubArea.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/PvSubArea.java @@ -1,14 +1,9 @@ -package com.njcn.device.pojo.po.pv; +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; /** *

diff --git a/pqs-device/device-api/src/main/java/com/njcn/device/pojo/po/pv/PvSubstation.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/PvSubstation.java similarity index 84% rename from pqs-device/device-api/src/main/java/com/njcn/device/pojo/po/pv/PvSubstation.java rename to pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/PvSubstation.java index 3cf50e464..430d0230f 100644 --- a/pqs-device/device-api/src/main/java/com/njcn/device/pojo/po/pv/PvSubstation.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/PvSubstation.java @@ -1,12 +1,7 @@ -package com.njcn.device.pojo.po.pv; +package com.njcn.device.pms.pojo.po; import com.baomidou.mybatisplus.annotation.TableName; -import com.njcn.db.bo.BaseEntity; -import java.io.Serializable; - import lombok.Data; -import lombok.Getter; -import lombok.Setter; /** *

diff --git a/pqs-device/device-api/src/main/java/com/njcn/device/pojo/po/pv/PvTenVoltage.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/PvTenVoltage.java similarity index 94% rename from pqs-device/device-api/src/main/java/com/njcn/device/pojo/po/pv/PvTenVoltage.java rename to pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/PvTenVoltage.java index 3694003e1..a2f79afc6 100644 --- a/pqs-device/device-api/src/main/java/com/njcn/device/pojo/po/pv/PvTenVoltage.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/PvTenVoltage.java @@ -1,13 +1,10 @@ -package com.njcn.device.pojo.po.pv; +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; + +import java.time.LocalDateTime; /** *

diff --git a/pqs-device/device-api/src/main/java/com/njcn/device/pojo/po/pv/PvUnit.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/PvUnit.java similarity index 89% rename from pqs-device/device-api/src/main/java/com/njcn/device/pojo/po/pv/PvUnit.java rename to pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/PvUnit.java index cdec58986..c60908558 100644 --- a/pqs-device/device-api/src/main/java/com/njcn/device/pojo/po/pv/PvUnit.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/PvUnit.java @@ -1,11 +1,11 @@ -package com.njcn.device.pojo.po.pv; +package com.njcn.device.pms.pojo.po; import com.baomidou.mybatisplus.annotation.TableName; -import com.njcn.db.bo.BaseEntity; -import java.io.Serializable; import lombok.Getter; import lombok.Setter; +import java.io.Serializable; + /** *

* diff --git a/pqs-device/device-api/src/main/java/com/njcn/device/pojo/po/pv/PvVoltage.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/PvVoltage.java similarity index 79% rename from pqs-device/device-api/src/main/java/com/njcn/device/pojo/po/pv/PvVoltage.java rename to pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/PvVoltage.java index 7d41fd3dd..1198190a8 100644 --- a/pqs-device/device-api/src/main/java/com/njcn/device/pojo/po/pv/PvVoltage.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/PvVoltage.java @@ -1,12 +1,7 @@ -package com.njcn.device.pojo.po.pv; +package com.njcn.device.pms.pojo.po; import com.baomidou.mybatisplus.annotation.TableName; -import com.njcn.db.bo.BaseEntity; -import java.io.Serializable; - import lombok.Data; -import lombok.Getter; -import lombok.Setter; /** *

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 new file mode 100644 index 000000000..a814cb385 --- /dev/null +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/DeviceRunExVO.java @@ -0,0 +1,71 @@ +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/device-api/src/main/java/com/njcn/device/pojo/vo/pv/DisOrLvVO.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/DisOrLvVO.java similarity index 97% rename from pqs-device/device-api/src/main/java/com/njcn/device/pojo/vo/pv/DisOrLvVO.java rename to pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/DisOrLvVO.java index aa36c82f1..d6d31b015 100644 --- a/pqs-device/device-api/src/main/java/com/njcn/device/pojo/vo/pv/DisOrLvVO.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/DisOrLvVO.java @@ -1,4 +1,4 @@ -package com.njcn.device.pojo.vo.pv; +package com.njcn.device.pms.pojo.vo; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; diff --git a/pqs-device/device-api/src/main/java/com/njcn/device/pojo/vo/pv/PvDeviceVO.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/PvDeviceVO.java similarity index 83% rename from pqs-device/device-api/src/main/java/com/njcn/device/pojo/vo/pv/PvDeviceVO.java rename to pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/PvDeviceVO.java index b540eb56f..b41d40886 100644 --- a/pqs-device/device-api/src/main/java/com/njcn/device/pojo/vo/pv/PvDeviceVO.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/PvDeviceVO.java @@ -1,6 +1,6 @@ -package com.njcn.device.pojo.vo.pv; +package com.njcn.device.pms.pojo.vo; -import com.njcn.device.pojo.po.pv.PvDevice; +import com.njcn.device.pms.pojo.po.PvDevice; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/pqs-device/device-api/src/main/java/com/njcn/device/pojo/vo/pv/PvDistributedVO.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/PvDistributedVO.java similarity index 72% rename from pqs-device/device-api/src/main/java/com/njcn/device/pojo/vo/pv/PvDistributedVO.java rename to pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/PvDistributedVO.java index b7efc34d0..cfac09819 100644 --- a/pqs-device/device-api/src/main/java/com/njcn/device/pojo/vo/pv/PvDistributedVO.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/PvDistributedVO.java @@ -1,6 +1,6 @@ -package com.njcn.device.pojo.vo.pv; +package com.njcn.device.pms.pojo.vo; -import com.njcn.device.pojo.po.pv.PvDistributed; +import com.njcn.device.pms.pojo.po.PvDistributed; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/pqs-device/device-api/src/main/java/com/njcn/device/pojo/vo/pv/PvLineAllDetailVO.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/PvLineAllDetailVO.java similarity index 98% rename from pqs-device/device-api/src/main/java/com/njcn/device/pojo/vo/pv/PvLineAllDetailVO.java rename to pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/PvLineAllDetailVO.java index ecfbe6ae7..b6af81f64 100644 --- a/pqs-device/device-api/src/main/java/com/njcn/device/pojo/vo/pv/PvLineAllDetailVO.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/PvLineAllDetailVO.java @@ -1,9 +1,8 @@ -package com.njcn.device.pojo.vo.pv; +package com.njcn.device.pms.pojo.vo; import lombok.Data; import java.time.LocalDate; -import java.util.List; /** * pqs diff --git a/pqs-device/device-api/src/main/java/com/njcn/device/pojo/vo/pv/PvLvUserVO.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/PvLvUserVO.java similarity index 73% rename from pqs-device/device-api/src/main/java/com/njcn/device/pojo/vo/pv/PvLvUserVO.java rename to pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/PvLvUserVO.java index dcade8cec..6feb82941 100644 --- a/pqs-device/device-api/src/main/java/com/njcn/device/pojo/vo/pv/PvLvUserVO.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/PvLvUserVO.java @@ -1,6 +1,6 @@ -package com.njcn.device.pojo.vo.pv; +package com.njcn.device.pms.pojo.vo; -import com.njcn.device.pojo.po.pv.PvLvUser; +import com.njcn.device.pms.pojo.po.PvLvUser; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/pqs-device/device-api/src/main/java/com/njcn/device/pojo/vo/pv/PvSubAreaVO.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/PvSubAreaVO.java similarity index 86% rename from pqs-device/device-api/src/main/java/com/njcn/device/pojo/vo/pv/PvSubAreaVO.java rename to pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/PvSubAreaVO.java index 350860654..dc5e66e95 100644 --- a/pqs-device/device-api/src/main/java/com/njcn/device/pojo/vo/pv/PvSubAreaVO.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/PvSubAreaVO.java @@ -1,6 +1,6 @@ -package com.njcn.device.pojo.vo.pv; +package com.njcn.device.pms.pojo.vo; -import com.njcn.device.pojo.po.pv.PvSubArea; +import com.njcn.device.pms.pojo.po.PvSubArea; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/pqs-device/device-api/src/main/java/com/njcn/device/pojo/vo/pv/PvSubstationVO.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/PvSubstationVO.java similarity index 95% rename from pqs-device/device-api/src/main/java/com/njcn/device/pojo/vo/pv/PvSubstationVO.java rename to pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/PvSubstationVO.java index f5c89feb2..ced9c0b3a 100644 --- a/pqs-device/device-api/src/main/java/com/njcn/device/pojo/vo/pv/PvSubstationVO.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/PvSubstationVO.java @@ -1,4 +1,4 @@ -package com.njcn.device.pojo.vo.pv; +package com.njcn.device.pms.pojo.vo; import lombok.Data; diff --git a/pqs-device/device-api/src/main/java/com/njcn/device/pojo/vo/pv/PvTenVoltageVO.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/PvTenVoltageVO.java similarity index 60% rename from pqs-device/device-api/src/main/java/com/njcn/device/pojo/vo/pv/PvTenVoltageVO.java rename to pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/PvTenVoltageVO.java index 6ba0a84a6..8309c1bc9 100644 --- a/pqs-device/device-api/src/main/java/com/njcn/device/pojo/vo/pv/PvTenVoltageVO.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/PvTenVoltageVO.java @@ -1,9 +1,6 @@ -package com.njcn.device.pojo.vo.pv; +package com.njcn.device.pms.pojo.vo; -import com.alibaba.nacos.shaded.org.checkerframework.checker.units.qual.A; -import com.alibaba.nacos.shaded.org.checkerframework.checker.units.qual.C; -import com.njcn.device.pojo.po.pv.PvTenVoltage; -import io.swagger.annotations.Api; +import com.njcn.device.pms.pojo.po.PvTenVoltage; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/pqs-device/device-api/src/main/java/com/njcn/device/pojo/vo/pv/UnitTreeVO.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/UnitTreeVO.java similarity index 88% rename from pqs-device/device-api/src/main/java/com/njcn/device/pojo/vo/pv/UnitTreeVO.java rename to pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/UnitTreeVO.java index 07b14a5db..b420847b2 100644 --- a/pqs-device/device-api/src/main/java/com/njcn/device/pojo/vo/pv/UnitTreeVO.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/UnitTreeVO.java @@ -1,4 +1,4 @@ -package com.njcn.device.pojo.vo.pv; +package com.njcn.device.pms.pojo.vo; import lombok.Data; diff --git a/pqs-device/pms-device/pms-device-boot/pom.xml b/pqs-device/pms-device/pms-device-boot/pom.xml new file mode 100644 index 000000000..e97f1bc61 --- /dev/null +++ b/pqs-device/pms-device/pms-device-boot/pom.xml @@ -0,0 +1,55 @@ + + + + pms-device + com.njcn + 1.0.0 + + 4.0.0 + + pms-device-boot + jar + pms终端模块核心业务 + + + 8 + 8 + + + + + com.njcn + pms-device-api + ${project.version} + + + com.njcn + user-api + ${project.version} + + + com.njcn + system-api + ${project.version} + + + com.njcn + event-api + ${project.version} + + + com.njcn + common-web + ${project.version} + + + com.njcn + common-influxDB + ${project.version} + compile + + + + \ No newline at end of file diff --git a/pqs-device/device-boot/src/main/java/com/njcn/pvdevice/controller/PvDeviceController.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/PvDeviceController.java similarity index 95% rename from pqs-device/device-boot/src/main/java/com/njcn/pvdevice/controller/PvDeviceController.java rename to pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/PvDeviceController.java index f7d72d625..19509ae1f 100644 --- a/pqs-device/device-boot/src/main/java/com/njcn/pvdevice/controller/PvDeviceController.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/PvDeviceController.java @@ -1,4 +1,4 @@ -package com.njcn.pvdevice.controller; +package com.njcn.device.pms.controller; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -8,11 +8,12 @@ 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.pojo.param.pv.DeviceQueryParam; -import com.njcn.device.pojo.param.pv.PvDeviceParam; -import com.njcn.device.pojo.po.pv.PvDevice; -import com.njcn.device.pojo.vo.pv.PvDeviceVO; -import com.njcn.pvdevice.service.IPvDeviceService; +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; @@ -20,8 +21,6 @@ import lombok.RequiredArgsConstructor; 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; 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 new file mode 100644 index 000000000..06fc08461 --- /dev/null +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/PvDeviceRunExController.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.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> getPvDeviceExList(@RequestBody DeviceRunExDTO deviceRunExDTO) { + String methodDescribe = getMethodDescribe("getPvDeviceExList"); + List pvDeviceExList = pvDeviceRunExService.getPvDeviceExList(deviceRunExDTO); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, pvDeviceExList, methodDescribe); + } +} diff --git a/pqs-device/device-boot/src/main/java/com/njcn/pvdevice/controller/PvDispatchController.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/PvDispatchController.java similarity index 92% rename from pqs-device/device-boot/src/main/java/com/njcn/pvdevice/controller/PvDispatchController.java rename to pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/PvDispatchController.java index 3939641d1..e16b87467 100644 --- a/pqs-device/device-boot/src/main/java/com/njcn/pvdevice/controller/PvDispatchController.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/PvDispatchController.java @@ -1,12 +1,11 @@ -package com.njcn.pvdevice.controller; +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; /** *

diff --git a/pqs-device/device-boot/src/main/java/com/njcn/pvdevice/controller/PvDistributedController.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/PvDistributedController.java similarity index 95% rename from pqs-device/device-boot/src/main/java/com/njcn/pvdevice/controller/PvDistributedController.java rename to pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/PvDistributedController.java index f93fbbefa..199d7ace8 100644 --- a/pqs-device/device-boot/src/main/java/com/njcn/pvdevice/controller/PvDistributedController.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/PvDistributedController.java @@ -1,4 +1,4 @@ -package com.njcn.pvdevice.controller; +package com.njcn.device.pms.controller; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -8,11 +8,12 @@ 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.pojo.param.pv.PvDistributedParam; -import com.njcn.device.pojo.param.pv.DistributedQueryParam; -import com.njcn.device.pojo.po.pv.PvDistributed; -import com.njcn.device.pojo.vo.pv.PvDistributedVO; -import com.njcn.pvdevice.service.IPvDistributedService; +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; @@ -20,8 +21,6 @@ import lombok.RequiredArgsConstructor; 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; diff --git a/pqs-device/device-boot/src/main/java/com/njcn/pvdevice/controller/PvLineDetailController.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/PvLineDetailController.java similarity index 95% rename from pqs-device/device-boot/src/main/java/com/njcn/pvdevice/controller/PvLineDetailController.java rename to pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/PvLineDetailController.java index 1fc69e349..d15adac84 100644 --- a/pqs-device/device-boot/src/main/java/com/njcn/pvdevice/controller/PvLineDetailController.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/PvLineDetailController.java @@ -1,4 +1,4 @@ -package com.njcn.pvdevice.controller; +package com.njcn.device.pms.controller; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -8,10 +8,11 @@ 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.pojo.param.pv.LineDetailQueryParam; -import com.njcn.device.pojo.param.pv.PvLineDetailParam; -import com.njcn.device.pojo.po.pv.PvLineDetail; -import com.njcn.pvdevice.service.IPvLineDetailService; +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; @@ -19,8 +20,6 @@ import lombok.RequiredArgsConstructor; 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; diff --git a/pqs-device/device-boot/src/main/java/com/njcn/pvdevice/controller/PvLvUserController.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/PvLvUserController.java similarity index 95% rename from pqs-device/device-boot/src/main/java/com/njcn/pvdevice/controller/PvLvUserController.java rename to pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/PvLvUserController.java index 6635183c1..4d6bab0d6 100644 --- a/pqs-device/device-boot/src/main/java/com/njcn/pvdevice/controller/PvLvUserController.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/PvLvUserController.java @@ -1,4 +1,4 @@ -package com.njcn.pvdevice.controller; +package com.njcn.device.pms.controller; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -8,11 +8,12 @@ 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.pojo.param.pv.LvUserQueryParam; -import com.njcn.device.pojo.param.pv.PvLvUserParam; -import com.njcn.device.pojo.po.pv.PvLvUser; -import com.njcn.device.pojo.vo.pv.PvLvUserVO; -import com.njcn.pvdevice.service.IPvLvUserService; +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; @@ -20,8 +21,6 @@ import lombok.RequiredArgsConstructor; 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; diff --git a/pqs-device/device-boot/src/main/java/com/njcn/pvdevice/controller/PvSubAreaController.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/PvSubAreaController.java similarity index 94% rename from pqs-device/device-boot/src/main/java/com/njcn/pvdevice/controller/PvSubAreaController.java rename to pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/PvSubAreaController.java index 0c75afde0..3df74c4f3 100644 --- a/pqs-device/device-boot/src/main/java/com/njcn/pvdevice/controller/PvSubAreaController.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/PvSubAreaController.java @@ -1,4 +1,4 @@ -package com.njcn.pvdevice.controller; +package com.njcn.device.pms.controller; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -8,12 +8,12 @@ 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.pojo.param.pv.PvSubAreaParam; -import com.njcn.device.pojo.param.pv.SubAreaQueryParam; -import com.njcn.device.pojo.po.pv.PvSubArea; -import com.njcn.device.pojo.vo.pv.PvSubAreaVO; -import com.njcn.pvdevice.service.IPvSubAreaService; -import com.sun.el.parser.BooleanNode; +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; @@ -21,8 +21,6 @@ import lombok.RequiredArgsConstructor; 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; diff --git a/pqs-device/device-boot/src/main/java/com/njcn/pvdevice/controller/PvSubstationController.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/PvSubstationController.java similarity index 93% rename from pqs-device/device-boot/src/main/java/com/njcn/pvdevice/controller/PvSubstationController.java rename to pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/PvSubstationController.java index 17ed37c86..d83cf9803 100644 --- a/pqs-device/device-boot/src/main/java/com/njcn/pvdevice/controller/PvSubstationController.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/PvSubstationController.java @@ -1,4 +1,4 @@ -package com.njcn.pvdevice.controller; +package com.njcn.device.pms.controller; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -8,12 +8,12 @@ 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.pojo.param.pv.PvSubstationParam; -import com.njcn.device.pojo.param.pv.SubstationQueryParam; -import com.njcn.device.pojo.po.pv.PvSubstation; -import com.njcn.device.pojo.vo.pv.PvSubstationVO; -import com.njcn.pvdevice.service.IPvSubstationService; -import com.njcn.web.pojo.param.BaseParam; +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; @@ -21,8 +21,6 @@ import lombok.RequiredArgsConstructor; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import com.njcn.web.controller.BaseController; - import java.util.List; /** diff --git a/pqs-device/device-boot/src/main/java/com/njcn/pvdevice/controller/PvTenVoltageController.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/PvTenVoltageController.java similarity index 94% rename from pqs-device/device-boot/src/main/java/com/njcn/pvdevice/controller/PvTenVoltageController.java rename to pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/PvTenVoltageController.java index 58494c29f..0625360a6 100644 --- a/pqs-device/device-boot/src/main/java/com/njcn/pvdevice/controller/PvTenVoltageController.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/PvTenVoltageController.java @@ -1,4 +1,4 @@ -package com.njcn.pvdevice.controller; +package com.njcn.device.pms.controller; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -8,11 +8,12 @@ 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.pojo.param.pv.PvTenVoltageParam; -import com.njcn.device.pojo.param.pv.TenVoltageQueryParam; -import com.njcn.device.pojo.po.pv.PvTenVoltage; -import com.njcn.device.pojo.vo.pv.PvTenVoltageVO; -import com.njcn.pvdevice.service.IPvTenVoltageService; +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; @@ -20,8 +21,6 @@ import lombok.RequiredArgsConstructor; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import com.njcn.web.controller.BaseController; - import java.util.List; /** diff --git a/pqs-device/device-boot/src/main/java/com/njcn/pvdevice/controller/PvTerminalBaseController.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/PvTerminalBaseController.java similarity index 92% rename from pqs-device/device-boot/src/main/java/com/njcn/pvdevice/controller/PvTerminalBaseController.java rename to pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/PvTerminalBaseController.java index ff084b01a..b6278b24b 100644 --- a/pqs-device/device-boot/src/main/java/com/njcn/pvdevice/controller/PvTerminalBaseController.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/PvTerminalBaseController.java @@ -1,4 +1,4 @@ -package com.njcn.pvdevice.controller; +package com.njcn.device.pms.controller; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.njcn.common.pojo.annotation.OperateInfo; @@ -6,10 +6,10 @@ import com.njcn.common.pojo.enums.common.LogEnum; import com.njcn.common.pojo.enums.response.CommonResponseEnum; import com.njcn.common.pojo.response.HttpResult; import com.njcn.common.utils.HttpResultUtil; -import com.njcn.device.pojo.param.pv.PvTerminalBaseQuery; -import com.njcn.device.pojo.vo.pv.DisOrLvVO; -import com.njcn.device.pojo.vo.pv.PvLineAllDetailVO; -import com.njcn.pvdevice.service.PvTerminalBaseService; +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; diff --git a/pqs-device/device-boot/src/main/java/com/njcn/pvdevice/controller/PvUnitController.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/PvUnitController.java similarity index 82% rename from pqs-device/device-boot/src/main/java/com/njcn/pvdevice/controller/PvUnitController.java rename to pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/PvUnitController.java index 3ee9b8d08..115332588 100644 --- a/pqs-device/device-boot/src/main/java/com/njcn/pvdevice/controller/PvUnitController.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/PvUnitController.java @@ -1,27 +1,12 @@ -package com.njcn.pvdevice.controller; +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.pojo.param.pv.PvUnitParam; -import com.njcn.device.pojo.po.pv.PvUnit; -import com.njcn.device.pojo.vo.pv.UnitTreeVO; -import com.njcn.pvdevice.service.IPvUnitService; -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.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; - +import com.njcn.device.pms.service.IPvUnitService; import com.njcn.web.controller.BaseController; - -import java.util.List; +import io.swagger.annotations.Api; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; /** *

diff --git a/pqs-device/device-boot/src/main/java/com/njcn/pvdevice/controller/PvVoltageController.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/PvVoltageController.java similarity index 93% rename from pqs-device/device-boot/src/main/java/com/njcn/pvdevice/controller/PvVoltageController.java rename to pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/PvVoltageController.java index 3535ed189..5825a78b8 100644 --- a/pqs-device/device-boot/src/main/java/com/njcn/pvdevice/controller/PvVoltageController.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/PvVoltageController.java @@ -1,4 +1,4 @@ -package com.njcn.pvdevice.controller; +package com.njcn.device.pms.controller; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -8,12 +8,11 @@ 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.pojo.param.pv.PvVoltageParam; -import com.njcn.device.pojo.param.pv.VoltageQueryParam; -import com.njcn.device.pojo.po.pv.PvVoltage; -import com.njcn.pvdevice.service.IPvTenVoltageService; -import com.njcn.pvdevice.service.IPvVoltageService; -import com.njcn.web.pojo.param.BaseParam; +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; @@ -21,8 +20,6 @@ import lombok.RequiredArgsConstructor; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import com.njcn.web.controller.BaseController; - import java.util.List; /** diff --git a/pqs-device/device-boot/src/main/java/com/njcn/pvdevice/mapper/PvDeviceMapper.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/PvDeviceMapper.java similarity index 76% rename from pqs-device/device-boot/src/main/java/com/njcn/pvdevice/mapper/PvDeviceMapper.java rename to pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/PvDeviceMapper.java index f8d7844af..96843a0f9 100644 --- a/pqs-device/device-boot/src/main/java/com/njcn/pvdevice/mapper/PvDeviceMapper.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/PvDeviceMapper.java @@ -1,10 +1,10 @@ -package com.njcn.pvdevice.mapper; +package com.njcn.device.pms.mapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.njcn.device.pojo.param.pv.DeviceQueryParam; -import com.njcn.device.pojo.po.pv.PvDevice; +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.pojo.vo.pv.PvDeviceVO; +import com.njcn.device.pms.pojo.vo.PvDeviceVO; import org.apache.ibatis.annotations.Param; import java.util.List; 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 new file mode 100644 index 000000000..2daa5d373 --- /dev/null +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/PvDeviceRunExMapper.java @@ -0,0 +1,22 @@ +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 + */ + List findPQLineInfo(@Param("lineLevel") String lineLevel, @Param("pid") String pid); + +} diff --git a/pqs-device/device-boot/src/main/java/com/njcn/pvdevice/mapper/PvDispatchMapper.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/PvDispatchMapper.java similarity index 71% rename from pqs-device/device-boot/src/main/java/com/njcn/pvdevice/mapper/PvDispatchMapper.java rename to pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/PvDispatchMapper.java index 7db32cfdf..9fcddf407 100644 --- a/pqs-device/device-boot/src/main/java/com/njcn/pvdevice/mapper/PvDispatchMapper.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/PvDispatchMapper.java @@ -1,6 +1,6 @@ -package com.njcn.pvdevice.mapper; +package com.njcn.device.pms.mapper; -import com.njcn.device.pojo.po.pv.PvDispatch; +import com.njcn.device.pms.pojo.po.PvDispatch; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** diff --git a/pqs-device/device-boot/src/main/java/com/njcn/pvdevice/mapper/PvDistributedMapper.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/PvDistributedMapper.java similarity index 74% rename from pqs-device/device-boot/src/main/java/com/njcn/pvdevice/mapper/PvDistributedMapper.java rename to pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/PvDistributedMapper.java index b8ddf1c32..3735dbe27 100644 --- a/pqs-device/device-boot/src/main/java/com/njcn/pvdevice/mapper/PvDistributedMapper.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/PvDistributedMapper.java @@ -1,11 +1,11 @@ -package com.njcn.pvdevice.mapper; +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.pojo.param.pv.DistributedQueryParam; -import com.njcn.device.pojo.po.pv.PvDistributed; -import com.njcn.device.pojo.vo.pv.PvDistributedVO; +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; /** diff --git a/pqs-device/device-boot/src/main/java/com/njcn/pvdevice/mapper/PvLineDetailMapper.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/PvLineDetailMapper.java similarity index 84% rename from pqs-device/device-boot/src/main/java/com/njcn/pvdevice/mapper/PvLineDetailMapper.java rename to pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/PvLineDetailMapper.java index d0ec8ae26..2a0e372e1 100644 --- a/pqs-device/device-boot/src/main/java/com/njcn/pvdevice/mapper/PvLineDetailMapper.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/PvLineDetailMapper.java @@ -1,9 +1,9 @@ -package com.njcn.pvdevice.mapper; +package com.njcn.device.pms.mapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.njcn.device.pojo.po.pv.PvLineDetail; +import com.njcn.device.pms.pojo.po.PvLineDetail; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.njcn.device.pojo.vo.pv.PvLineAllDetailVO; +import com.njcn.device.pms.pojo.vo.PvLineAllDetailVO; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/pqs-device/device-boot/src/main/java/com/njcn/pvdevice/mapper/PvLvUserMapper.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/PvLvUserMapper.java similarity index 74% rename from pqs-device/device-boot/src/main/java/com/njcn/pvdevice/mapper/PvLvUserMapper.java rename to pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/PvLvUserMapper.java index 9931e0134..a6c3ae4c3 100644 --- a/pqs-device/device-boot/src/main/java/com/njcn/pvdevice/mapper/PvLvUserMapper.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/PvLvUserMapper.java @@ -1,10 +1,10 @@ -package com.njcn.pvdevice.mapper; +package com.njcn.device.pms.mapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.njcn.device.pojo.param.pv.LvUserQueryParam; -import com.njcn.device.pojo.po.pv.PvLvUser; +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.pojo.vo.pv.PvLvUserVO; +import com.njcn.device.pms.pojo.vo.PvLvUserVO; import org.apache.ibatis.annotations.Param; /** diff --git a/pqs-device/device-boot/src/main/java/com/njcn/pvdevice/mapper/PvSubAreaMapper.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/PvSubAreaMapper.java similarity index 77% rename from pqs-device/device-boot/src/main/java/com/njcn/pvdevice/mapper/PvSubAreaMapper.java rename to pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/PvSubAreaMapper.java index c0e1eb814..91e622d67 100644 --- a/pqs-device/device-boot/src/main/java/com/njcn/pvdevice/mapper/PvSubAreaMapper.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/PvSubAreaMapper.java @@ -1,11 +1,11 @@ -package com.njcn.pvdevice.mapper; +package com.njcn.device.pms.mapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.njcn.device.pojo.param.pv.SubAreaQueryParam; -import com.njcn.device.pojo.po.pv.PvSubArea; +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.pojo.vo.pv.DisOrLvVO; -import com.njcn.device.pojo.vo.pv.PvSubAreaVO; +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; diff --git a/pqs-device/device-boot/src/main/java/com/njcn/pvdevice/mapper/PvSubstationMapper.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/PvSubstationMapper.java similarity index 77% rename from pqs-device/device-boot/src/main/java/com/njcn/pvdevice/mapper/PvSubstationMapper.java rename to pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/PvSubstationMapper.java index 0593fad92..8a4778762 100644 --- a/pqs-device/device-boot/src/main/java/com/njcn/pvdevice/mapper/PvSubstationMapper.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/PvSubstationMapper.java @@ -1,10 +1,10 @@ -package com.njcn.pvdevice.mapper; +package com.njcn.device.pms.mapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.njcn.device.pojo.param.pv.SubstationQueryParam; -import com.njcn.device.pojo.po.pv.PvSubstation; +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.pojo.vo.pv.PvSubstationVO; +import com.njcn.device.pms.pojo.vo.PvSubstationVO; import com.njcn.user.pojo.vo.PvTerminalTreeVO; import org.apache.ibatis.annotations.Param; diff --git a/pqs-device/device-boot/src/main/java/com/njcn/pvdevice/mapper/PvTenVoltageMapper.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/PvTenVoltageMapper.java similarity index 74% rename from pqs-device/device-boot/src/main/java/com/njcn/pvdevice/mapper/PvTenVoltageMapper.java rename to pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/PvTenVoltageMapper.java index decdb5703..97dceeff9 100644 --- a/pqs-device/device-boot/src/main/java/com/njcn/pvdevice/mapper/PvTenVoltageMapper.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/PvTenVoltageMapper.java @@ -1,10 +1,10 @@ -package com.njcn.pvdevice.mapper; +package com.njcn.device.pms.mapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.njcn.device.pojo.param.pv.TenVoltageQueryParam; -import com.njcn.device.pojo.po.pv.PvTenVoltage; +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.pojo.vo.pv.PvTenVoltageVO; +import com.njcn.device.pms.pojo.vo.PvTenVoltageVO; import org.apache.ibatis.annotations.Param; /** diff --git a/pqs-device/device-boot/src/main/java/com/njcn/pvdevice/mapper/PvUnitMapper.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/PvUnitMapper.java similarity index 80% rename from pqs-device/device-boot/src/main/java/com/njcn/pvdevice/mapper/PvUnitMapper.java rename to pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/PvUnitMapper.java index d3d6e7b17..499678ea4 100644 --- a/pqs-device/device-boot/src/main/java/com/njcn/pvdevice/mapper/PvUnitMapper.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/PvUnitMapper.java @@ -1,8 +1,8 @@ -package com.njcn.pvdevice.mapper; +package com.njcn.device.pms.mapper; -import com.njcn.device.pojo.po.pv.PvUnit; +import com.njcn.device.pms.pojo.po.PvUnit; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.njcn.device.pojo.vo.pv.UnitTreeVO; +import com.njcn.device.pms.pojo.vo.UnitTreeVO; import com.njcn.user.pojo.vo.PvTerminalTreeVO; import org.apache.ibatis.annotations.Param; diff --git a/pqs-device/device-boot/src/main/java/com/njcn/pvdevice/mapper/PvVoltageMapper.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/PvVoltageMapper.java similarity index 71% rename from pqs-device/device-boot/src/main/java/com/njcn/pvdevice/mapper/PvVoltageMapper.java rename to pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/PvVoltageMapper.java index 8dd1c0ba2..066b4ffe7 100644 --- a/pqs-device/device-boot/src/main/java/com/njcn/pvdevice/mapper/PvVoltageMapper.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/PvVoltageMapper.java @@ -1,6 +1,6 @@ -package com.njcn.pvdevice.mapper; +package com.njcn.device.pms.mapper; -import com.njcn.device.pojo.po.pv.PvVoltage; +import com.njcn.device.pms.pojo.po.PvVoltage; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** diff --git a/pqs-device/device-boot/src/main/java/com/njcn/pvdevice/mapper/mapping/PvDeviceMapper.xml b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/PvDeviceMapper.xml similarity index 97% rename from pqs-device/device-boot/src/main/java/com/njcn/pvdevice/mapper/mapping/PvDeviceMapper.xml rename to pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/PvDeviceMapper.xml index 6c80d592c..ed630ba0a 100644 --- a/pqs-device/device-boot/src/main/java/com/njcn/pvdevice/mapper/mapping/PvDeviceMapper.xml +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/PvDeviceMapper.xml @@ -1,6 +1,6 @@ - + + 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 + + diff --git a/pqs-device/device-boot/src/main/java/com/njcn/device/mapper/mapping/StrategydicFunMapper.xml b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/PvDispatchMapper.xml similarity index 71% rename from pqs-device/device-boot/src/main/java/com/njcn/device/mapper/mapping/StrategydicFunMapper.xml rename to pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/PvDispatchMapper.xml index 501985aa9..10896b919 100644 --- a/pqs-device/device-boot/src/main/java/com/njcn/device/mapper/mapping/StrategydicFunMapper.xml +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/PvDispatchMapper.xml @@ -1,5 +1,5 @@ - + diff --git a/pqs-device/device-boot/src/main/java/com/njcn/pvdevice/mapper/mapping/PvDistributedMapper.xml b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/PvDistributedMapper.xml similarity index 95% rename from pqs-device/device-boot/src/main/java/com/njcn/pvdevice/mapper/mapping/PvDistributedMapper.xml rename to pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/PvDistributedMapper.xml index 8c19502ce..a16520bed 100644 --- a/pqs-device/device-boot/src/main/java/com/njcn/pvdevice/mapper/mapping/PvDistributedMapper.xml +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/PvDistributedMapper.xml @@ -1,6 +1,6 @@ - + diff --git a/pqs-device/device-boot/src/main/java/com/njcn/pvdevice/mapper/mapping/PvLvUserMapper.xml b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/PvLvUserMapper.xml similarity index 95% rename from pqs-device/device-boot/src/main/java/com/njcn/pvdevice/mapper/mapping/PvLvUserMapper.xml rename to pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/PvLvUserMapper.xml index ad794c4af..d5bfba422 100644 --- a/pqs-device/device-boot/src/main/java/com/njcn/pvdevice/mapper/mapping/PvLvUserMapper.xml +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/PvLvUserMapper.xml @@ -1,6 +1,6 @@ - + SELECT diff --git a/pqs-device/device-boot/src/main/java/com/njcn/pvdevice/mapper/mapping/PvSubstationMapper.xml b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/PvSubstationMapper.xml similarity index 96% rename from pqs-device/device-boot/src/main/java/com/njcn/pvdevice/mapper/mapping/PvSubstationMapper.xml rename to pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/PvSubstationMapper.xml index 8d29a37a6..fa901fbd2 100644 --- a/pqs-device/device-boot/src/main/java/com/njcn/pvdevice/mapper/mapping/PvSubstationMapper.xml +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/PvSubstationMapper.xml @@ -1,6 +1,6 @@ - + SELECT diff --git a/pqs-device/device-boot/src/main/java/com/njcn/pvdevice/mapper/mapping/PvUnitMapper.xml b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/PvUnitMapper.xml similarity index 87% rename from pqs-device/device-boot/src/main/java/com/njcn/pvdevice/mapper/mapping/PvUnitMapper.xml rename to pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/PvUnitMapper.xml index 9a58bc348..ed01a95c1 100644 --- a/pqs-device/device-boot/src/main/java/com/njcn/pvdevice/mapper/mapping/PvUnitMapper.xml +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/PvUnitMapper.xml @@ -1,6 +1,6 @@ - + SELECT diff --git a/pqs-device/device-boot/src/main/java/com/njcn/device/mapper/mapping/AlarmStrategyMapper.xml b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/AlarmStrategyMapper.xml similarity index 93% rename from pqs-device/device-boot/src/main/java/com/njcn/device/mapper/mapping/AlarmStrategyMapper.xml rename to pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/AlarmStrategyMapper.xml index 0ece0c697..c8673a4bc 100644 --- a/pqs-device/device-boot/src/main/java/com/njcn/device/mapper/mapping/AlarmStrategyMapper.xml +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/AlarmStrategyMapper.xml @@ -1,7 +1,7 @@ - + SELECT diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/AreaIntegrityDataMapper.xml b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/AreaIntegrityDataMapper.xml new file mode 100644 index 000000000..237698142 --- /dev/null +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/AreaIntegrityDataMapper.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/pqs-device/device-boot/src/main/java/com/njcn/device/mapper/mapping/CommunicateMapper.xml b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/CommunicateMapper.xml similarity index 70% rename from pqs-device/device-boot/src/main/java/com/njcn/device/mapper/mapping/CommunicateMapper.xml rename to pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/CommunicateMapper.xml index bcd763d8a..5706ab4c2 100644 --- a/pqs-device/device-boot/src/main/java/com/njcn/device/mapper/mapping/CommunicateMapper.xml +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/CommunicateMapper.xml @@ -1,5 +1,5 @@ - + diff --git a/pqs-device/device-boot/src/main/java/com/njcn/device/mapper/mapping/DeptLineMapper.xml b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/DeptLineMapper.xml similarity index 91% rename from pqs-device/device-boot/src/main/java/com/njcn/device/mapper/mapping/DeptLineMapper.xml rename to pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/DeptLineMapper.xml index fe03430aa..5323a7b49 100644 --- a/pqs-device/device-boot/src/main/java/com/njcn/device/mapper/mapping/DeptLineMapper.xml +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/DeptLineMapper.xml @@ -1,6 +1,6 @@ - + update pq_dept_line set id = #{id} where Line_Id = #{lineId} diff --git a/pqs-device/device-boot/src/main/java/com/njcn/device/mapper/mapping/DevFuctionMapper.xml b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/DevFuctionMapper.xml similarity index 86% rename from pqs-device/device-boot/src/main/java/com/njcn/device/mapper/mapping/DevFuctionMapper.xml rename to pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/DevFuctionMapper.xml index 9c4409777..61665a78e 100644 --- a/pqs-device/device-boot/src/main/java/com/njcn/device/mapper/mapping/DevFuctionMapper.xml +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/DevFuctionMapper.xml @@ -1,6 +1,6 @@ - + insert into cld_dev_fuction (id,line_id,fuc_name) values diff --git a/pqs-device/device-boot/src/main/java/com/njcn/device/mapper/mapping/DevMealMapper.xml b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/DevMealMapper.xml similarity index 72% rename from pqs-device/device-boot/src/main/java/com/njcn/device/mapper/mapping/DevMealMapper.xml rename to pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/DevMealMapper.xml index 17d84bf63..ca8867ea4 100644 --- a/pqs-device/device-boot/src/main/java/com/njcn/device/mapper/mapping/DevMealMapper.xml +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/DevMealMapper.xml @@ -1,5 +1,5 @@ - + diff --git a/pqs-device/device-boot/src/main/java/com/njcn/device/mapper/mapping/DevStateMapper.xml b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/DevStateMapper.xml similarity index 71% rename from pqs-device/device-boot/src/main/java/com/njcn/device/mapper/mapping/DevStateMapper.xml rename to pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/DevStateMapper.xml index e3c65028d..d6b2bfaac 100644 --- a/pqs-device/device-boot/src/main/java/com/njcn/device/mapper/mapping/DevStateMapper.xml +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/DevStateMapper.xml @@ -1,5 +1,5 @@ - + diff --git a/pqs-device/device-boot/src/main/java/com/njcn/device/mapper/mapping/DevStrategyMapper.xml b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/DevStrategyMapper.xml similarity index 70% rename from pqs-device/device-boot/src/main/java/com/njcn/device/mapper/mapping/DevStrategyMapper.xml rename to pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/DevStrategyMapper.xml index 2cb5d6586..2e9dc0bca 100644 --- a/pqs-device/device-boot/src/main/java/com/njcn/device/mapper/mapping/DevStrategyMapper.xml +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/DevStrategyMapper.xml @@ -1,5 +1,5 @@ - + diff --git a/pqs-device/device-boot/src/main/java/com/njcn/device/mapper/mapping/DevVersionMapper.xml b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/DevVersionMapper.xml similarity index 71% rename from pqs-device/device-boot/src/main/java/com/njcn/device/mapper/mapping/DevVersionMapper.xml rename to pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/DevVersionMapper.xml index ec0f72526..7162bb1bc 100644 --- a/pqs-device/device-boot/src/main/java/com/njcn/device/mapper/mapping/DevVersionMapper.xml +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/DevVersionMapper.xml @@ -1,5 +1,5 @@ - + diff --git a/pqs-device/device-boot/src/main/java/com/njcn/device/mapper/mapping/DeviceBakMapper.xml b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/DeviceBakMapper.xml similarity index 71% rename from pqs-device/device-boot/src/main/java/com/njcn/device/mapper/mapping/DeviceBakMapper.xml rename to pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/DeviceBakMapper.xml index f48127db4..59b26cf33 100644 --- a/pqs-device/device-boot/src/main/java/com/njcn/device/mapper/mapping/DeviceBakMapper.xml +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/DeviceBakMapper.xml @@ -1,6 +1,6 @@ - + diff --git a/pqs-device/device-boot/src/main/java/com/njcn/device/mapper/mapping/DeviceMapper.xml b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/DeviceMapper.xml similarity index 97% rename from pqs-device/device-boot/src/main/java/com/njcn/device/mapper/mapping/DeviceMapper.xml rename to pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/DeviceMapper.xml index c460db986..422d25b3d 100644 --- a/pqs-device/device-boot/src/main/java/com/njcn/device/mapper/mapping/DeviceMapper.xml +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/DeviceMapper.xml @@ -1,13 +1,13 @@ - + - SELECT linedetail.Num AS id, line.NAME AS lineName, @@ -109,7 +109,7 @@ areaId.NAME - SELECT dev.Id as id, area.NAME AS areaName, diff --git a/pqs-device/device-boot/src/main/java/com/njcn/device/mapper/mapping/DeviceOnlineDataMapper.xml b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/DeviceOnlineDataMapper.xml similarity index 95% rename from pqs-device/device-boot/src/main/java/com/njcn/device/mapper/mapping/DeviceOnlineDataMapper.xml rename to pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/DeviceOnlineDataMapper.xml index 17e3a0eea..a9a9d61d1 100644 --- a/pqs-device/device-boot/src/main/java/com/njcn/device/mapper/mapping/DeviceOnlineDataMapper.xml +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/DeviceOnlineDataMapper.xml @@ -1,7 +1,7 @@ - + + SELECT + device.id AS devId, + min( sdd.Algo_Describe ) AS algoDescribe + FROM + pq_line AS device + INNER JOIN pq_line AS voltage ON device.id = voltage.pid + INNER JOIN pq_line AS line ON voltage.id = line.pid + INNER JOIN pq_line_detail AS pld ON line.id = pld.id + LEFT JOIN sys_dict_data AS sdd ON pld.Line_Grade = sdd.id + WHERE + + date_format(device.update_Time,'%y%m%d') >= date_format(#{searchBeginTime},'%y%m%d') + + + and date_format(device.update_Time,'%y%m%d') <= date_format(#{searchEndTime},'%y%m%d') + + GROUP BY + device.id, + device.NAME, + sdd.Algo_Describe + + + + \ No newline at end of file diff --git a/pqs-device/device-boot/src/main/java/com/njcn/device/mapper/mapping/FlowMealMapper.xml b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/FlowMealMapper.xml similarity index 71% rename from pqs-device/device-boot/src/main/java/com/njcn/device/mapper/mapping/FlowMealMapper.xml rename to pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/FlowMealMapper.xml index 0f6cc0a3d..4f45ce6a5 100644 --- a/pqs-device/device-boot/src/main/java/com/njcn/device/mapper/mapping/FlowMealMapper.xml +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/FlowMealMapper.xml @@ -1,5 +1,5 @@ - + diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/FlowStrategyDicMapper.xml b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/FlowStrategyDicMapper.xml new file mode 100644 index 000000000..7cd3afe1e --- /dev/null +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/FlowStrategyDicMapper.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/pqs-device/device-boot/src/main/java/com/njcn/device/mapper/mapping/FlowStrategyDicMapper.xml b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/FlowStrategyMapper.xml similarity index 71% rename from pqs-device/device-boot/src/main/java/com/njcn/device/mapper/mapping/FlowStrategyDicMapper.xml rename to pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/FlowStrategyMapper.xml index 157acf72c..c16eee669 100644 --- a/pqs-device/device-boot/src/main/java/com/njcn/device/mapper/mapping/FlowStrategyDicMapper.xml +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/FlowStrategyMapper.xml @@ -1,5 +1,5 @@ - + diff --git a/pqs-device/device-boot/src/main/java/com/njcn/device/mapper/mapping/LineBakMapper.xml b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/LineBakMapper.xml similarity index 72% rename from pqs-device/device-boot/src/main/java/com/njcn/device/mapper/mapping/LineBakMapper.xml rename to pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/LineBakMapper.xml index d5d6576c8..29182122e 100644 --- a/pqs-device/device-boot/src/main/java/com/njcn/device/mapper/mapping/LineBakMapper.xml +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/LineBakMapper.xml @@ -1,6 +1,6 @@ - + diff --git a/pqs-device/device-boot/src/main/java/com/njcn/device/mapper/mapping/LineDetailMapper.xml b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/LineDetailMapper.xml similarity index 95% rename from pqs-device/device-boot/src/main/java/com/njcn/device/mapper/mapping/LineDetailMapper.xml rename to pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/LineDetailMapper.xml index b52729183..41dccd685 100644 --- a/pqs-device/device-boot/src/main/java/com/njcn/device/mapper/mapping/LineDetailMapper.xml +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/LineDetailMapper.xml @@ -1,6 +1,6 @@ - + + SELECT + DISTINCT(pro.id), + pro.pid, + pro.level, + pro.sort, + area.name name + FROM + pq_line pro, + pq_line gd, + sys_area area + WHERE + pro.id = gd.pid + AND + pro.name = area.id + AND + gd.id in + + #{item} + + + and date_format(pro.update_Time,'%y%m%d') >= date_format(#{searchBeginTime},'%y%m%d') + + + and date_format(pro.update_Time,'%y%m%d') <= date_format(#{searchEndTime},'%y%m%d') + + + + + + + + + + + + + \ No newline at end of file diff --git a/pqs-device/device-boot/src/main/java/com/njcn/device/mapper/mapping/LineMapper.xml b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/LineMapper.xml similarity index 96% rename from pqs-device/device-boot/src/main/java/com/njcn/device/mapper/mapping/LineMapper.xml rename to pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/LineMapper.xml index f71b75fb9..e8c64fc02 100644 --- a/pqs-device/device-boot/src/main/java/com/njcn/device/mapper/mapping/LineMapper.xml +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/LineMapper.xml @@ -1,6 +1,6 @@ - + - select c.id, c.num, c.pt1, @@ -541,7 +541,7 @@ - SELECT t.id id, t.pids pids, @@ -597,7 +597,7 @@ AND A2.Pid = A3.Id AND A3.Pid = A4.Id - SELECT DISTINCT gd.NAME gdName, substation.NAME subName, line.NAME lineName @@ -902,19 +902,6 @@ FROM SELECT Id FROM pq_device WHERE Dev_Model = 1 AND Dev_Data_Type IN (1,2) AND Run_Flag = 0 - - - - - - SELECT diff --git a/pqs-device/device-boot/src/main/java/com/njcn/device/mapper/mapping/LogManageMapper.xml b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/LogManageMapper.xml similarity index 96% rename from pqs-device/device-boot/src/main/java/com/njcn/device/mapper/mapping/LogManageMapper.xml rename to pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/LogManageMapper.xml index 68c340125..0ebbf1583 100644 --- a/pqs-device/device-boot/src/main/java/com/njcn/device/mapper/mapping/LogManageMapper.xml +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/LogManageMapper.xml @@ -1,7 +1,7 @@ - + SELECT diff --git a/pqs-device/device-boot/src/main/java/com/njcn/device/mapper/mapping/ProtectValueMapper.xml b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/ProtectValueMapper.xml similarity index 70% rename from pqs-device/device-boot/src/main/java/com/njcn/device/mapper/mapping/ProtectValueMapper.xml rename to pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/ProtectValueMapper.xml index 78dc70cf5..de3de9e4e 100644 --- a/pqs-device/device-boot/src/main/java/com/njcn/device/mapper/mapping/ProtectValueMapper.xml +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/ProtectValueMapper.xml @@ -1,5 +1,5 @@ - + diff --git a/pqs-device/device-boot/src/main/java/com/njcn/device/mapper/mapping/ProtectWordMapper.xml b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/ProtectWordMapper.xml similarity index 70% rename from pqs-device/device-boot/src/main/java/com/njcn/device/mapper/mapping/ProtectWordMapper.xml rename to pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/ProtectWordMapper.xml index 98d87d374..aa68e3296 100644 --- a/pqs-device/device-boot/src/main/java/com/njcn/device/mapper/mapping/ProtectWordMapper.xml +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/ProtectWordMapper.xml @@ -1,5 +1,5 @@ - + diff --git a/pqs-device/device-boot/src/main/java/com/njcn/device/mapper/mapping/RateOfFlowMapper.xml b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/RateOfFlowMapper.xml similarity index 98% rename from pqs-device/device-boot/src/main/java/com/njcn/device/mapper/mapping/RateOfFlowMapper.xml rename to pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/RateOfFlowMapper.xml index 15a392008..06ede2cc5 100644 --- a/pqs-device/device-boot/src/main/java/com/njcn/device/mapper/mapping/RateOfFlowMapper.xml +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/RateOfFlowMapper.xml @@ -1,7 +1,7 @@ - + + + SELECT diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/TerminalOnlineRateDataMapper.xml b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/TerminalOnlineRateDataMapper.xml new file mode 100644 index 000000000..a4ee78d9e --- /dev/null +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/TerminalOnlineRateDataMapper.xml @@ -0,0 +1,188 @@ + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/pqs-device/device-boot/src/main/java/com/njcn/device/mapper/mapping/TerminalVersionMapper.xml b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/TerminalVersionMapper.xml similarity index 97% rename from pqs-device/device-boot/src/main/java/com/njcn/device/mapper/mapping/TerminalVersionMapper.xml rename to pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/TerminalVersionMapper.xml index 02b6aa333..68481436c 100644 --- a/pqs-device/device-boot/src/main/java/com/njcn/device/mapper/mapping/TerminalVersionMapper.xml +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/TerminalVersionMapper.xml @@ -1,6 +1,6 @@ - + - + - + - + - + + + + + + diff --git a/pqs-device/device-boot/src/main/java/com/njcn/device/mapper/mapping/VersionMapper.xml b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/VersionMapper.xml similarity index 72% rename from pqs-device/device-boot/src/main/java/com/njcn/device/mapper/mapping/VersionMapper.xml rename to pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/VersionMapper.xml index c0519ea88..c6a2883f3 100644 --- a/pqs-device/device-boot/src/main/java/com/njcn/device/mapper/mapping/VersionMapper.xml +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/VersionMapper.xml @@ -1,5 +1,5 @@ - + diff --git a/pqs-device/device-boot/src/main/java/com/njcn/device/mapper/mapping/VoltageMapper.xml b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/VoltageMapper.xml similarity index 89% rename from pqs-device/device-boot/src/main/java/com/njcn/device/mapper/mapping/VoltageMapper.xml rename to pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/VoltageMapper.xml index 0ca98700c..fddcb37a5 100644 --- a/pqs-device/device-boot/src/main/java/com/njcn/device/mapper/mapping/VoltageMapper.xml +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/VoltageMapper.xml @@ -1,6 +1,6 @@ - +