From db5304c707f58d14c80ca638c147f34ac4c385b8 Mon Sep 17 00:00:00 2001 From: guo Date: Thu, 31 Aug 2023 09:47:46 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xmgl/constant/TimeFormatConstant.java | 7 + .../admin/HardWareCallbackController.java | 16 + .../enterprise/EntLifterAlarmController.java | 4 +- .../enterprise/EntLifterController.java | 4 +- .../EntLifterCurrentDataController.java | 10 +- .../EntLifterWorkCycleController.java | 4 +- .../EntTowerCraneAlarmController.java | 4 +- .../enterprise/EntTowerCraneController.java | 4 +- .../EntTowerCraneCurrentDataController.java | 8 +- .../EntTowerCraneWorkCycleController.java | 4 +- .../government/GovLifterAlarmController.java | 4 +- .../government/GovLifterController.java | 4 +- .../GovLifterCurrentDataController.java | 10 +- .../GovTowerCraneAlarmController.java | 4 +- .../government/GovTowerCraneController.java | 4 +- .../GovTowerCraneCurrentDataController.java | 8 +- .../controller/DustNoiseDataController.java | 96 ++++-- .../EnvironmentAlarmController.java | 25 +- .../controller/EnvironmentDevController.java | 307 ++++++++++-------- .../city/dust/entity/DustNoiseData.java | 4 +- .../vo/EngineeringAndEnvironmentDevVo.java | 14 + .../entity/vo/EnvironmentAlarmTypeVo.java | 17 + .../dust/entity/vo/EnvironmentDevCountVo.java | 17 + .../city/dust/mapper/DustNoiseDataMapper.java | 5 + .../dust/mapper/EnvironmentAlarmMapper.java | 8 + .../dust/mapper/EnvironmentDevMapper.java | 10 + .../dust/mapper/xml/DustNoiseDataMapper.xml | 29 +- .../mapper/xml/EnvironmentAlarmMapper.xml | 26 +- .../dust/mapper/xml/EnvironmentDevMapper.xml | 51 ++- .../dust/service/IDustNoiseDataService.java | 5 + .../service/IEnvironmentAlarmService.java | 4 + .../dust/service/IEnvironmentDevService.java | 9 + .../impl/DustNoiseDataServiceImpl.java | 66 +++- .../impl/EnvironmentAlarmServiceImpl.java | 34 +- .../impl/EnvironmentDevServiceImpl.java | 52 ++- .../city/engineering/entity/Engineering.java | 6 - .../service/impl/EngineeringServiceImpl.java | 4 - .../controller}/LifterAlarmController.java | 6 +- .../lifter/controller}/LifterController.java | 6 +- .../LifterCurrentDataController.java | 12 +- .../LifterWorkCycleController.java | 6 +- .../lifter}/entity/Lifter.java | 2 +- .../lifter}/entity/LifterAlarm.java | 2 +- .../lifter}/entity/LifterCurrentData.java | 2 +- .../lifter}/entity/LifterWorkCycle.java | 2 +- .../lifter}/mapper/LifterAlarmMapper.java | 7 +- .../mapper/LifterCurrentDataMapper.java | 7 +- .../lifter}/mapper/LifterMapper.java | 7 +- .../lifter}/mapper/LifterWorkCycleMapper.java | 7 +- .../lifter}/mapper/xml/LifterAlarmMapper.xml | 4 +- .../mapper/xml/LifterCurrentDataMapper.xml | 4 +- .../lifter}/mapper/xml/LifterMapper.xml | 4 +- .../mapper/xml/LifterWorkCycleMapper.xml | 4 +- .../lifter}/service/ILifterAlarmService.java | 4 +- .../service/ILifterCurrentDataService.java | 4 +- .../lifter}/service/ILifterService.java | 4 +- .../service/ILifterWorkCycleService.java | 4 +- .../service/impl/LifterAlarmServiceImpl.java | 12 +- .../impl/LifterCurrentDataServiceImpl.java | 12 +- .../service/impl/LifterServiceImpl.java | 8 +- .../impl/LifterWorkCycleServiceImpl.java | 15 +- .../controller/MonitorDevController.java | 18 + .../entity/bo/OnlineGroupByProjectBo.java | 1 + .../entity/vo/EngineeringAndStatusVo.java | 14 + .../monitor/mapper/xml/MonitorDevMapper.xml | 4 +- .../monitor/service/IMonitorDevService.java | 5 + .../service/impl/MonitorDevServiceImpl.java | 33 +- .../TowerCraneAlarmController.java | 6 +- .../controller}/TowerCraneController.java | 6 +- .../TowerCraneCurrentDataController.java | 10 +- .../TowerCraneWorkCycleController.java | 6 +- .../towercrane}/entity/TowerCrane.java | 2 +- .../towercrane}/entity/TowerCraneAlarm.java | 2 +- .../entity/TowerCraneCurrentData.java | 2 +- .../entity/TowerCraneWorkCycle.java | 2 +- .../mapper/TowerCraneAlarmMapper.java | 4 +- .../mapper/TowerCraneCurrentDataMapper.java | 4 +- .../towercrane}/mapper/TowerCraneMapper.java | 4 +- .../mapper/TowerCraneWorkCycleMapper.java | 4 +- .../mapper/xml/TowerCraneAlarmMapper.xml | 4 +- .../xml/TowerCraneCurrentDataMapper.xml | 4 +- .../mapper/xml/TowerCraneMapper.xml | 4 +- .../mapper/xml/TowerCraneWorkCycleMapper.xml | 4 +- .../service/ITowerCraneAlarmService.java | 4 +- .../ITowerCraneCurrentDataService.java | 4 +- .../service/ITowerCraneService.java | 4 +- .../service/ITowerCraneWorkCycleService.java | 4 +- .../impl/TowerCraneAlarmServiceImpl.java | 12 +- .../TowerCraneCurrentDataServiceImpl.java | 12 +- .../service/impl/TowerCraneServiceImpl.java | 8 +- .../impl/TowerCraneWorkCycleServiceImpl.java | 12 +- .../wisdom/dto/TowerCraneCurrentDataDto.java | 2 +- .../java/com/zhgd/xmgl/task/DevStateTask.java | 6 +- .../java/com/zhgd/xmgl/util/DateUtils.java | 301 ++++++++++++----- 94 files changed, 1052 insertions(+), 493 deletions(-) create mode 100644 src/main/java/com/zhgd/xmgl/constant/TimeFormatConstant.java create mode 100644 src/main/java/com/zhgd/xmgl/modules/city/dust/entity/vo/EngineeringAndEnvironmentDevVo.java create mode 100644 src/main/java/com/zhgd/xmgl/modules/city/dust/entity/vo/EnvironmentAlarmTypeVo.java create mode 100644 src/main/java/com/zhgd/xmgl/modules/city/dust/entity/vo/EnvironmentDevCountVo.java rename src/main/java/com/zhgd/xmgl/modules/{basicdata/controller/project => city/lifter/controller}/LifterAlarmController.java (97%) rename src/main/java/com/zhgd/xmgl/modules/{basicdata/controller/project => city/lifter/controller}/LifterController.java (97%) rename src/main/java/com/zhgd/xmgl/modules/{basicdata/controller/project => city/lifter/controller}/LifterCurrentDataController.java (94%) rename src/main/java/com/zhgd/xmgl/modules/{basicdata/controller/project => city/lifter/controller}/LifterWorkCycleController.java (96%) rename src/main/java/com/zhgd/xmgl/modules/{wisdom => city/lifter}/entity/Lifter.java (99%) rename src/main/java/com/zhgd/xmgl/modules/{wisdom => city/lifter}/entity/LifterAlarm.java (99%) rename src/main/java/com/zhgd/xmgl/modules/{wisdom => city/lifter}/entity/LifterCurrentData.java (99%) rename src/main/java/com/zhgd/xmgl/modules/{wisdom => city/lifter}/entity/LifterWorkCycle.java (99%) rename src/main/java/com/zhgd/xmgl/modules/{wisdom => city/lifter}/mapper/LifterAlarmMapper.java (63%) rename src/main/java/com/zhgd/xmgl/modules/{wisdom => city/lifter}/mapper/LifterCurrentDataMapper.java (63%) rename src/main/java/com/zhgd/xmgl/modules/{wisdom => city/lifter}/mapper/LifterMapper.java (62%) rename src/main/java/com/zhgd/xmgl/modules/{wisdom => city/lifter}/mapper/LifterWorkCycleMapper.java (64%) rename src/main/java/com/zhgd/xmgl/modules/{wisdom => city/lifter}/mapper/xml/LifterAlarmMapper.xml (62%) rename src/main/java/com/zhgd/xmgl/modules/{wisdom => city/lifter}/mapper/xml/LifterCurrentDataMapper.xml (60%) rename src/main/java/com/zhgd/xmgl/modules/{wisdom => city/lifter}/mapper/xml/LifterMapper.xml (63%) rename src/main/java/com/zhgd/xmgl/modules/{wisdom => city/lifter}/mapper/xml/LifterWorkCycleMapper.xml (61%) rename src/main/java/com/zhgd/xmgl/modules/{wisdom => city/lifter}/service/ILifterAlarmService.java (79%) rename src/main/java/com/zhgd/xmgl/modules/{wisdom => city/lifter}/service/ILifterCurrentDataService.java (78%) rename src/main/java/com/zhgd/xmgl/modules/{wisdom => city/lifter}/service/ILifterService.java (84%) rename src/main/java/com/zhgd/xmgl/modules/{wisdom => city/lifter}/service/ILifterWorkCycleService.java (73%) rename src/main/java/com/zhgd/xmgl/modules/{wisdom => city/lifter}/service/impl/LifterAlarmServiceImpl.java (87%) rename src/main/java/com/zhgd/xmgl/modules/{wisdom => city/lifter}/service/impl/LifterCurrentDataServiceImpl.java (88%) rename src/main/java/com/zhgd/xmgl/modules/{wisdom => city/lifter}/service/impl/LifterServiceImpl.java (83%) rename src/main/java/com/zhgd/xmgl/modules/{wisdom => city/lifter}/service/impl/LifterWorkCycleServiceImpl.java (62%) create mode 100644 src/main/java/com/zhgd/xmgl/modules/city/monitor/entity/vo/EngineeringAndStatusVo.java rename src/main/java/com/zhgd/xmgl/modules/{basicdata/controller/project => city/towercrane/controller}/TowerCraneAlarmController.java (97%) rename src/main/java/com/zhgd/xmgl/modules/{basicdata/controller/project => city/towercrane/controller}/TowerCraneController.java (97%) rename src/main/java/com/zhgd/xmgl/modules/{basicdata/controller/project => city/towercrane/controller}/TowerCraneCurrentDataController.java (95%) rename src/main/java/com/zhgd/xmgl/modules/{basicdata/controller/project => city/towercrane/controller}/TowerCraneWorkCycleController.java (96%) rename src/main/java/com/zhgd/xmgl/modules/{wisdom => city/towercrane}/entity/TowerCrane.java (99%) rename src/main/java/com/zhgd/xmgl/modules/{wisdom => city/towercrane}/entity/TowerCraneAlarm.java (99%) rename src/main/java/com/zhgd/xmgl/modules/{wisdom => city/towercrane}/entity/TowerCraneCurrentData.java (99%) rename src/main/java/com/zhgd/xmgl/modules/{wisdom => city/towercrane}/entity/TowerCraneWorkCycle.java (99%) rename src/main/java/com/zhgd/xmgl/modules/{wisdom => city/towercrane}/mapper/TowerCraneAlarmMapper.java (73%) rename src/main/java/com/zhgd/xmgl/modules/{wisdom => city/towercrane}/mapper/TowerCraneCurrentDataMapper.java (73%) rename src/main/java/com/zhgd/xmgl/modules/{wisdom => city/towercrane}/mapper/TowerCraneMapper.java (74%) rename src/main/java/com/zhgd/xmgl/modules/{wisdom => city/towercrane}/mapper/TowerCraneWorkCycleMapper.java (74%) rename src/main/java/com/zhgd/xmgl/modules/{wisdom => city/towercrane}/mapper/xml/TowerCraneAlarmMapper.xml (60%) rename src/main/java/com/zhgd/xmgl/modules/{wisdom => city/towercrane}/mapper/xml/TowerCraneCurrentDataMapper.xml (58%) rename src/main/java/com/zhgd/xmgl/modules/{wisdom => city/towercrane}/mapper/xml/TowerCraneMapper.xml (61%) rename src/main/java/com/zhgd/xmgl/modules/{wisdom => city/towercrane}/mapper/xml/TowerCraneWorkCycleMapper.xml (59%) rename src/main/java/com/zhgd/xmgl/modules/{wisdom => city/towercrane}/service/ITowerCraneAlarmService.java (78%) rename src/main/java/com/zhgd/xmgl/modules/{wisdom => city/towercrane}/service/ITowerCraneCurrentDataService.java (77%) rename src/main/java/com/zhgd/xmgl/modules/{wisdom => city/towercrane}/service/ITowerCraneService.java (83%) rename src/main/java/com/zhgd/xmgl/modules/{wisdom => city/towercrane}/service/ITowerCraneWorkCycleService.java (71%) rename src/main/java/com/zhgd/xmgl/modules/{wisdom => city/towercrane}/service/impl/TowerCraneAlarmServiceImpl.java (87%) rename src/main/java/com/zhgd/xmgl/modules/{wisdom => city/towercrane}/service/impl/TowerCraneCurrentDataServiceImpl.java (89%) rename src/main/java/com/zhgd/xmgl/modules/{wisdom => city/towercrane}/service/impl/TowerCraneServiceImpl.java (81%) rename src/main/java/com/zhgd/xmgl/modules/{wisdom => city/towercrane}/service/impl/TowerCraneWorkCycleServiceImpl.java (71%) diff --git a/src/main/java/com/zhgd/xmgl/constant/TimeFormatConstant.java b/src/main/java/com/zhgd/xmgl/constant/TimeFormatConstant.java new file mode 100644 index 0000000..2911698 --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/constant/TimeFormatConstant.java @@ -0,0 +1,7 @@ +package com.zhgd.xmgl.constant; + +public interface TimeFormatConstant { + public static final String HOUR = "%Y-%m-%d %H"; + public static final String DAY = "%Y-%m-%d"; + public static final String MONTH = "%Y-%m"; +} diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/admin/HardWareCallbackController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/admin/HardWareCallbackController.java index c63347a..97ee8d9 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/admin/HardWareCallbackController.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/admin/HardWareCallbackController.java @@ -18,6 +18,22 @@ import com.zhgd.xmgl.modules.city.dust.entity.EnvironmentDev; import com.zhgd.xmgl.modules.city.dust.service.IDustNoiseDataService; import com.zhgd.xmgl.modules.city.dust.service.IEnvironmentAlarmService; import com.zhgd.xmgl.modules.city.dust.service.IEnvironmentDevService; +import com.zhgd.xmgl.modules.city.lifter.entity.Lifter; +import com.zhgd.xmgl.modules.city.lifter.entity.LifterAlarm; +import com.zhgd.xmgl.modules.city.lifter.entity.LifterCurrentData; +import com.zhgd.xmgl.modules.city.lifter.entity.LifterWorkCycle; +import com.zhgd.xmgl.modules.city.lifter.service.ILifterAlarmService; +import com.zhgd.xmgl.modules.city.lifter.service.ILifterCurrentDataService; +import com.zhgd.xmgl.modules.city.lifter.service.ILifterService; +import com.zhgd.xmgl.modules.city.lifter.service.ILifterWorkCycleService; +import com.zhgd.xmgl.modules.city.towercrane.entity.TowerCrane; +import com.zhgd.xmgl.modules.city.towercrane.entity.TowerCraneAlarm; +import com.zhgd.xmgl.modules.city.towercrane.entity.TowerCraneCurrentData; +import com.zhgd.xmgl.modules.city.towercrane.entity.TowerCraneWorkCycle; +import com.zhgd.xmgl.modules.city.towercrane.service.ITowerCraneAlarmService; +import com.zhgd.xmgl.modules.city.towercrane.service.ITowerCraneCurrentDataService; +import com.zhgd.xmgl.modules.city.towercrane.service.ITowerCraneService; +import com.zhgd.xmgl.modules.city.towercrane.service.ITowerCraneWorkCycleService; import com.zhgd.xmgl.modules.wisdom.entity.*; import com.zhgd.xmgl.modules.wisdom.service.*; import com.zhgd.xmgl.util.CommonUtil; diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntLifterAlarmController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntLifterAlarmController.java index e181a5b..74fe578 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntLifterAlarmController.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntLifterAlarmController.java @@ -10,8 +10,8 @@ import com.zhgd.jeecg.common.api.vo.Result; import com.zhgd.jeecg.common.system.query.QueryGenerator; import com.zhgd.jeecg.common.util.PageUtil; import com.zhgd.xmgl.modules.basicdata.constant.ParamConstants; -import com.zhgd.xmgl.modules.wisdom.entity.LifterAlarm; -import com.zhgd.xmgl.modules.wisdom.service.ILifterAlarmService; +import com.zhgd.xmgl.modules.city.lifter.entity.LifterAlarm; +import com.zhgd.xmgl.modules.city.lifter.service.ILifterAlarmService; import com.zhgd.xmgl.modules.wisdom.statistics.LifterAlarmStat; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntLifterController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntLifterController.java index a1089f6..e755db7 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntLifterController.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntLifterController.java @@ -10,8 +10,8 @@ import com.zhgd.jeecg.common.api.vo.Result; import com.zhgd.jeecg.common.system.query.QueryGenerator; import com.zhgd.jeecg.common.util.PageUtil; import com.zhgd.xmgl.modules.basicdata.constant.ParamConstants; -import com.zhgd.xmgl.modules.wisdom.entity.Lifter; -import com.zhgd.xmgl.modules.wisdom.service.ILifterService; +import com.zhgd.xmgl.modules.city.lifter.entity.Lifter; +import com.zhgd.xmgl.modules.city.lifter.service.ILifterService; import com.zhgd.xmgl.security.SecurityUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntLifterCurrentDataController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntLifterCurrentDataController.java index 7b5a2a9..aac20b5 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntLifterCurrentDataController.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntLifterCurrentDataController.java @@ -12,11 +12,11 @@ import com.zhgd.jeecg.common.system.query.QueryGenerator; import com.zhgd.jeecg.common.util.PageUtil; import com.zhgd.xmgl.modules.basicdata.constant.ParamConstants; import com.zhgd.xmgl.modules.wisdom.dto.LifterOperationDto; -import com.zhgd.xmgl.modules.wisdom.entity.Lifter; -import com.zhgd.xmgl.modules.wisdom.entity.LifterCurrentData; -import com.zhgd.xmgl.modules.wisdom.entity.TowerCrane; -import com.zhgd.xmgl.modules.wisdom.service.ILifterCurrentDataService; -import com.zhgd.xmgl.modules.wisdom.service.ILifterService; +import com.zhgd.xmgl.modules.city.lifter.entity.Lifter; +import com.zhgd.xmgl.modules.city.lifter.entity.LifterCurrentData; +import com.zhgd.xmgl.modules.city.towercrane.entity.TowerCrane; +import com.zhgd.xmgl.modules.city.lifter.service.ILifterCurrentDataService; +import com.zhgd.xmgl.modules.city.lifter.service.ILifterService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntLifterWorkCycleController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntLifterWorkCycleController.java index 7e9cb8e..4d0c959 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntLifterWorkCycleController.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntLifterWorkCycleController.java @@ -10,8 +10,8 @@ import com.zhgd.jeecg.common.api.vo.Result; import com.zhgd.jeecg.common.system.query.QueryGenerator; import com.zhgd.jeecg.common.util.PageUtil; import com.zhgd.xmgl.modules.basicdata.constant.ParamConstants; -import com.zhgd.xmgl.modules.wisdom.entity.LifterWorkCycle; -import com.zhgd.xmgl.modules.wisdom.service.ILifterWorkCycleService; +import com.zhgd.xmgl.modules.city.lifter.entity.LifterWorkCycle; +import com.zhgd.xmgl.modules.city.lifter.service.ILifterWorkCycleService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntTowerCraneAlarmController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntTowerCraneAlarmController.java index c4d0ca8..26ef9a2 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntTowerCraneAlarmController.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntTowerCraneAlarmController.java @@ -11,8 +11,8 @@ import com.zhgd.jeecg.common.api.vo.Result; import com.zhgd.jeecg.common.system.query.QueryGenerator; import com.zhgd.jeecg.common.util.PageUtil; import com.zhgd.xmgl.modules.basicdata.constant.ParamConstants; -import com.zhgd.xmgl.modules.wisdom.entity.TowerCraneAlarm; -import com.zhgd.xmgl.modules.wisdom.service.ITowerCraneAlarmService; +import com.zhgd.xmgl.modules.city.towercrane.entity.TowerCraneAlarm; +import com.zhgd.xmgl.modules.city.towercrane.service.ITowerCraneAlarmService; import com.zhgd.xmgl.modules.wisdom.statistics.TowerCraneAlarmStat; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntTowerCraneController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntTowerCraneController.java index eeebe90..81458ca 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntTowerCraneController.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntTowerCraneController.java @@ -10,8 +10,8 @@ import com.zhgd.jeecg.common.api.vo.Result; import com.zhgd.jeecg.common.system.query.QueryGenerator; import com.zhgd.jeecg.common.util.PageUtil; import com.zhgd.xmgl.modules.basicdata.constant.ParamConstants; -import com.zhgd.xmgl.modules.wisdom.entity.TowerCrane; -import com.zhgd.xmgl.modules.wisdom.service.ITowerCraneService; +import com.zhgd.xmgl.modules.city.towercrane.entity.TowerCrane; +import com.zhgd.xmgl.modules.city.towercrane.service.ITowerCraneService; import com.zhgd.xmgl.security.SecurityUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntTowerCraneCurrentDataController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntTowerCraneCurrentDataController.java index 7098617..ece7aa3 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntTowerCraneCurrentDataController.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntTowerCraneCurrentDataController.java @@ -14,10 +14,10 @@ import com.zhgd.jeecg.common.util.PageUtil; import com.zhgd.xmgl.modules.basicdata.constant.ParamConstants; import com.zhgd.xmgl.modules.wisdom.dto.TowerCraneCurrentDataDto; import com.zhgd.xmgl.modules.wisdom.dto.TowerCraneOperationDto; -import com.zhgd.xmgl.modules.wisdom.entity.TowerCrane; -import com.zhgd.xmgl.modules.wisdom.entity.TowerCraneCurrentData; -import com.zhgd.xmgl.modules.wisdom.service.ITowerCraneCurrentDataService; -import com.zhgd.xmgl.modules.wisdom.service.ITowerCraneService; +import com.zhgd.xmgl.modules.city.towercrane.entity.TowerCrane; +import com.zhgd.xmgl.modules.city.towercrane.entity.TowerCraneCurrentData; +import com.zhgd.xmgl.modules.city.towercrane.service.ITowerCraneCurrentDataService; +import com.zhgd.xmgl.modules.city.towercrane.service.ITowerCraneService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntTowerCraneWorkCycleController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntTowerCraneWorkCycleController.java index 53f26a9..751529e 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntTowerCraneWorkCycleController.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntTowerCraneWorkCycleController.java @@ -10,8 +10,8 @@ import com.zhgd.jeecg.common.api.vo.Result; import com.zhgd.jeecg.common.system.query.QueryGenerator; import com.zhgd.jeecg.common.util.PageUtil; import com.zhgd.xmgl.modules.basicdata.constant.ParamConstants; -import com.zhgd.xmgl.modules.wisdom.entity.TowerCraneWorkCycle; -import com.zhgd.xmgl.modules.wisdom.service.ITowerCraneWorkCycleService; +import com.zhgd.xmgl.modules.city.towercrane.entity.TowerCraneWorkCycle; +import com.zhgd.xmgl.modules.city.towercrane.service.ITowerCraneWorkCycleService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovLifterAlarmController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovLifterAlarmController.java index 3e92e26..19c2546 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovLifterAlarmController.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovLifterAlarmController.java @@ -10,8 +10,8 @@ import com.zhgd.jeecg.common.api.vo.Result; import com.zhgd.jeecg.common.system.query.QueryGenerator; import com.zhgd.jeecg.common.util.PageUtil; import com.zhgd.xmgl.modules.basicdata.constant.ParamConstants; -import com.zhgd.xmgl.modules.wisdom.entity.LifterAlarm; -import com.zhgd.xmgl.modules.wisdom.service.ILifterAlarmService; +import com.zhgd.xmgl.modules.city.lifter.entity.LifterAlarm; +import com.zhgd.xmgl.modules.city.lifter.service.ILifterAlarmService; import com.zhgd.xmgl.modules.wisdom.statistics.LifterAlarmStat; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovLifterController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovLifterController.java index 7374488..b64ebae 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovLifterController.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovLifterController.java @@ -9,8 +9,8 @@ import com.zhgd.jeecg.common.api.vo.Result; import com.zhgd.jeecg.common.system.query.QueryGenerator; import com.zhgd.xmgl.modules.basicdata.dto.EngineeringPageDto; import com.zhgd.xmgl.modules.basicdata.dto.ProjectPageDto; -import com.zhgd.xmgl.modules.wisdom.entity.Lifter; -import com.zhgd.xmgl.modules.wisdom.service.ILifterService; +import com.zhgd.xmgl.modules.city.lifter.entity.Lifter; +import com.zhgd.xmgl.modules.city.lifter.service.ILifterService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovLifterCurrentDataController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovLifterCurrentDataController.java index f399b54..0fc7bba 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovLifterCurrentDataController.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovLifterCurrentDataController.java @@ -12,11 +12,11 @@ import com.zhgd.jeecg.common.system.query.QueryGenerator; import com.zhgd.jeecg.common.util.PageUtil; import com.zhgd.xmgl.modules.basicdata.constant.ParamConstants; import com.zhgd.xmgl.modules.wisdom.dto.LifterOperationDto; -import com.zhgd.xmgl.modules.wisdom.entity.Lifter; -import com.zhgd.xmgl.modules.wisdom.entity.LifterCurrentData; -import com.zhgd.xmgl.modules.wisdom.entity.TowerCrane; -import com.zhgd.xmgl.modules.wisdom.service.ILifterCurrentDataService; -import com.zhgd.xmgl.modules.wisdom.service.ILifterService; +import com.zhgd.xmgl.modules.city.lifter.entity.Lifter; +import com.zhgd.xmgl.modules.city.lifter.entity.LifterCurrentData; +import com.zhgd.xmgl.modules.city.towercrane.entity.TowerCrane; +import com.zhgd.xmgl.modules.city.lifter.service.ILifterCurrentDataService; +import com.zhgd.xmgl.modules.city.lifter.service.ILifterService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovTowerCraneAlarmController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovTowerCraneAlarmController.java index 8a4de78..e355a0b 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovTowerCraneAlarmController.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovTowerCraneAlarmController.java @@ -8,8 +8,8 @@ import com.zhgd.annotation.OperLog; import com.zhgd.jeecg.common.api.vo.Result; import com.zhgd.jeecg.common.system.query.QueryGenerator; import com.zhgd.jeecg.common.util.PageUtil; -import com.zhgd.xmgl.modules.wisdom.entity.TowerCraneAlarm; -import com.zhgd.xmgl.modules.wisdom.service.ITowerCraneAlarmService; +import com.zhgd.xmgl.modules.city.towercrane.entity.TowerCraneAlarm; +import com.zhgd.xmgl.modules.city.towercrane.service.ITowerCraneAlarmService; import com.zhgd.xmgl.modules.wisdom.statistics.TowerCraneAlarmStat; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovTowerCraneController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovTowerCraneController.java index 2a5cd39..69a4bbe 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovTowerCraneController.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovTowerCraneController.java @@ -9,8 +9,8 @@ import com.zhgd.jeecg.common.api.vo.Result; import com.zhgd.jeecg.common.system.query.QueryGenerator; import com.zhgd.xmgl.modules.basicdata.dto.EngineeringPageDto; import com.zhgd.xmgl.modules.basicdata.dto.ProjectPageDto; -import com.zhgd.xmgl.modules.wisdom.entity.TowerCrane; -import com.zhgd.xmgl.modules.wisdom.service.ITowerCraneService; +import com.zhgd.xmgl.modules.city.towercrane.entity.TowerCrane; +import com.zhgd.xmgl.modules.city.towercrane.service.ITowerCraneService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovTowerCraneCurrentDataController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovTowerCraneCurrentDataController.java index ec9aec5..36eb23c 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovTowerCraneCurrentDataController.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovTowerCraneCurrentDataController.java @@ -11,10 +11,10 @@ import com.zhgd.jeecg.common.system.query.QueryGenerator; import com.zhgd.jeecg.common.util.PageUtil; import com.zhgd.xmgl.modules.wisdom.dto.TowerCraneCurrentDataDto; import com.zhgd.xmgl.modules.wisdom.dto.TowerCraneOperationDto; -import com.zhgd.xmgl.modules.wisdom.entity.TowerCrane; -import com.zhgd.xmgl.modules.wisdom.entity.TowerCraneCurrentData; -import com.zhgd.xmgl.modules.wisdom.service.ITowerCraneCurrentDataService; -import com.zhgd.xmgl.modules.wisdom.service.ITowerCraneService; +import com.zhgd.xmgl.modules.city.towercrane.entity.TowerCrane; +import com.zhgd.xmgl.modules.city.towercrane.entity.TowerCraneCurrentData; +import com.zhgd.xmgl.modules.city.towercrane.service.ITowerCraneCurrentDataService; +import com.zhgd.xmgl.modules.city.towercrane.service.ITowerCraneService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; diff --git a/src/main/java/com/zhgd/xmgl/modules/city/dust/controller/DustNoiseDataController.java b/src/main/java/com/zhgd/xmgl/modules/city/dust/controller/DustNoiseDataController.java index 30ad5cd..286f822 100644 --- a/src/main/java/com/zhgd/xmgl/modules/city/dust/controller/DustNoiseDataController.java +++ b/src/main/java/com/zhgd/xmgl/modules/city/dust/controller/DustNoiseDataController.java @@ -1,5 +1,6 @@ package com.zhgd.xmgl.modules.city.dust.controller; +import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -25,14 +26,16 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import springfox.documentation.annotations.ApiIgnore; +import java.util.List; import java.util.Map; +import java.util.Optional; - /** +/** * @Title: Controller * @Description: 扬尘实时数据管理 * @author： pds - * @date： 2023-03-01 + * @date： 2023-03-01 * @version： V1.0 */ @RestController @@ -40,36 +43,63 @@ import java.util.Map; @Slf4j @Api(tags = "扬尘实时数据") public class DustNoiseDataController { - @Autowired - private IDustNoiseDataService dustNoiseDataService; + @Autowired + private IDustNoiseDataService dustNoiseDataService; + + /** + * 分页列表查询 + * + * @return + */ + @OperLog(operModul = "扬尘实时数据管理", operType = "分页查询", operDesc = "分页列表查询扬尘实时数据管理信息") + @ApiOperation(value = " 分页列表查询扬尘实时数据管理信息", notes = "分页列表查询扬尘实时数据管理信息", httpMethod = "POST") + @ApiImplicitParams({ + @ApiImplicitParam(name = "name", value = "扬尘名称", paramType = "body", dataType = "String"), + @ApiImplicitParam(name = "pageNo", value = "页数", paramType = "body", required = true, defaultValue = "1", dataType = "Integer"), + @ApiImplicitParam(name = "pageSize", value = "每页条数", paramType = "body", required = true, defaultValue = "10", dataType = "Integer") + }) + @PostMapping(value = "/page") + public Result> queryPageList(@ApiIgnore @RequestBody Map map) { + String name = MapUtils.getString(map, "name"); + QueryWrapper wrapper = Wrappers.query(); + if (StringUtils.isNotBlank(MapUtils.getString(map, ParamConstants.PROJECT_SN))) { + wrapper.eq("d.engineering_sn", StrUtil.EMPTY); + } + if (StringUtils.isNotBlank(MapUtils.getString(map, ParamConstants.ENGINEERING_SN))) { + wrapper.eq("d.engineering_sn", MapUtils.getString(map, ParamConstants.ENGINEERING_SN)); + } + if (StringUtils.isNotBlank(name)) { + wrapper.like("ed.name", name); + } + wrapper.orderByDesc("d.create_time"); + Page page = PageUtil.getPage(map); + IPage pageList = dustNoiseDataService.pageList(page, wrapper); + return Result.success(pageList); + } + + @OperLog(operModul = "扬尘实时数据管理", operType = "查询", operDesc = "查询最新扬尘实时数据") + @ApiOperation(value = "查询最新扬尘实时数据", notes = "查询最新扬尘实时数据", httpMethod = "POST") + @ApiImplicitParams({ + @ApiImplicitParam(name = "name", value = "扬尘名称", paramType = "body", dataType = "String"), + @ApiImplicitParam(name = "pageNo", value = "页数", paramType = "body", required = true, defaultValue = "1", dataType = "Integer"), + @ApiImplicitParam(name = "pageSize", value = "每页条数", paramType = "body", required = true, defaultValue = "10", dataType = "Integer") + }) + @PostMapping(value = "/newest/one") + public Result queryNewestOne(@ApiIgnore @RequestBody Map map) { + Result> result = queryPageList(map); + List list = Optional.of(result.getResult()).map(s -> s.getRecords()).orElse(null); + return Result.success(CollUtil.isNotEmpty(list) ? list.get(0) : null); + } + + @OperLog(operModul = "扬尘实时数据管理", operType = "查询", operDesc = "查询扬尘趋势") + @ApiOperation(value = "查询扬尘趋势", notes = "查询扬尘趋势", httpMethod = "POST") + @ApiImplicitParams({ + @ApiImplicitParam(name = "type", value = "1:日，2:月，3：年", paramType = "body", dataType = "String"), + }) + @PostMapping(value = "/queryTrend") + public Result> queryTrend(@ApiIgnore @RequestBody Map map) { + return Result.success(dustNoiseDataService.queryTrend(map)); + } + - /** - * 分页列表查询 - * @return - */ - @OperLog(operModul = "扬尘实时数据管理", operType = "分页查询", operDesc = "分页列表查询扬尘实时数据管理信息") - @ApiOperation(value = " 分页列表查询扬尘实时数据管理信息", notes = "分页列表查询扬尘实时数据管理信息", httpMethod="POST") - @ApiImplicitParams({ - @ApiImplicitParam(name = "name", value = "扬尘名称", paramType = "body", dataType = "String"), - @ApiImplicitParam(name = "pageNo", value = "页数", paramType = "body", required = true, defaultValue = "1", dataType = "Integer"), - @ApiImplicitParam(name = "pageSize", value = "每页条数", paramType = "body", required = true, defaultValue = "10", dataType = "Integer") - }) - @PostMapping(value = "/page") - public Result> queryPageList(@ApiIgnore @RequestBody Map map) { - String name = MapUtils.getString(map, "name"); - QueryWrapper wrapper = Wrappers.query(); - if (StringUtils.isNotBlank(MapUtils.getString(map, ParamConstants.PROJECT_SN))) { - wrapper.eq("d.engineering_sn", StrUtil.EMPTY); - } - if (StringUtils.isNotBlank(MapUtils.getString(map, ParamConstants.ENGINEERING_SN))) { - wrapper.eq("d.engineering_sn", MapUtils.getString(map, ParamConstants.ENGINEERING_SN)); - } - if (StringUtils.isNotBlank(name)) { - wrapper.like("ed.name", name); - } - wrapper.orderByDesc("d.create_time"); - Page page = PageUtil.getPage(map); - IPage pageList = dustNoiseDataService.pageList(page, wrapper); - return Result.success(pageList); - } } diff --git a/src/main/java/com/zhgd/xmgl/modules/city/dust/controller/EnvironmentAlarmController.java b/src/main/java/com/zhgd/xmgl/modules/city/dust/controller/EnvironmentAlarmController.java index a4c0068..56b82a5 100644 --- a/src/main/java/com/zhgd/xmgl/modules/city/dust/controller/EnvironmentAlarmController.java +++ b/src/main/java/com/zhgd/xmgl/modules/city/dust/controller/EnvironmentAlarmController.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.zhgd.annotation.OperLog; import com.zhgd.jeecg.common.api.vo.Result; import com.zhgd.xmgl.modules.city.dust.entity.EnvironmentAlarm; +import com.zhgd.xmgl.modules.city.dust.entity.vo.EnvironmentAlarmTypeVo; import com.zhgd.xmgl.modules.city.dust.service.IEnvironmentAlarmService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; @@ -24,7 +25,7 @@ import java.util.Map; * @Title: Controller * @Description: 扬尘报警台账表 * @author： pengj - * @date： 2023-03-01 + * @date： 2023-03-01 * @version： V1.0 */ @RestController @@ -37,10 +38,11 @@ public class EnvironmentAlarmController { /** * 分页列表查询 + * * @return */ @OperLog(operModul = "扬尘报警管理", operType = "分页查询", operDesc = "分页列表查询扬尘报警台账表信息") - @ApiOperation(value = " 分页列表查询扬尘报警台账表信息", notes = "分页列表查询扬尘报警台账表信息", httpMethod="POST") + @ApiOperation(value = " 分页列表查询扬尘报警台账表信息", notes = "分页列表查询扬尘报警台账表信息", httpMethod = "POST") @ApiImplicitParams({ @ApiImplicitParam(name = "name", value = "设备名称", paramType = "body", dataType = "String"), @ApiImplicitParam(name = "type", value = "报警类型", paramType = "body", dataType = "String"), @@ -57,24 +59,33 @@ public class EnvironmentAlarmController { } /** - * 编辑 + * 编辑 + * * @param environmentAlarm * @return */ @OperLog(operModul = "扬尘报警管理", operType = "修改", operDesc = "编辑扬尘报警台账表信息") - @ApiOperation(value = "编辑扬尘报警台账表信息", notes = "编辑扬尘报警台账表信息" , httpMethod="POST") + @ApiOperation(value = "编辑扬尘报警台账表信息", notes = "编辑扬尘报警台账表信息", httpMethod = "POST") @PostMapping(value = "/edit") public Result edit(@RequestBody EnvironmentAlarm environmentAlarm) { Result result = new Result(); EnvironmentAlarm environmentAlarmEntity = environmentAlarmService.getById(environmentAlarm.getId()); - if(environmentAlarmEntity==null) { + if (environmentAlarmEntity == null) { result.error500("未找到对应实体"); - }else { + } else { boolean ok = environmentAlarmService.updateById(environmentAlarm); - if(ok) { + if (ok) { result.success("修改成功!"); } } return result; } + + @OperLog(operModul = "扬尘报警管理", operType = "统计", operDesc = "按类型统计今日预警") + @ApiOperation(value = " 按类型统计今日预警", notes = "按类型统计今日预警", httpMethod = "POST") + @PostMapping(value = "/countTodayEnvironmentAlarmGroupByType") + public Result countTodayEnvironmentAlarmGroupByType() { + EnvironmentAlarmTypeVo list = environmentAlarmService.countTodayEnvironmentAlarmGroupByType(); + return Result.success(list); + } } diff --git a/src/main/java/com/zhgd/xmgl/modules/city/dust/controller/EnvironmentDevController.java b/src/main/java/com/zhgd/xmgl/modules/city/dust/controller/EnvironmentDevController.java index 61cd813..226bf9d 100644 --- a/src/main/java/com/zhgd/xmgl/modules/city/dust/controller/EnvironmentDevController.java +++ b/src/main/java/com/zhgd/xmgl/modules/city/dust/controller/EnvironmentDevController.java @@ -12,9 +12,12 @@ import com.zhgd.jeecg.common.api.vo.Result; import com.zhgd.jeecg.common.system.query.QueryGenerator; import com.zhgd.jeecg.common.util.PageUtil; import com.zhgd.xmgl.modules.basicdata.constant.ParamConstants; -import com.zhgd.xmgl.modules.wisdom.dto.EnvironmentDevDto; import com.zhgd.xmgl.modules.city.dust.entity.EnvironmentDev; +import com.zhgd.xmgl.modules.city.dust.entity.vo.EngineeringAndEnvironmentDevVo; +import com.zhgd.xmgl.modules.city.dust.entity.vo.EnvironmentDevCountVo; import com.zhgd.xmgl.modules.city.dust.service.IEnvironmentDevService; +import com.zhgd.xmgl.modules.city.engineering.entity.Engineering; +import com.zhgd.xmgl.modules.wisdom.dto.EnvironmentDevDto; import com.zhgd.xmgl.security.SecurityUser; import com.zhgd.xmgl.security.SecurityUtil; import io.swagger.annotations.Api; @@ -46,150 +49,176 @@ import java.util.Map; @Slf4j @Api(tags = "扬尘管理") public class EnvironmentDevController { - @Autowired - private IEnvironmentDevService environmentDevService; + @Autowired + private IEnvironmentDevService environmentDevService; - /** - * 分页列表查询 - * - * @return - */ - @OperLog(operModul = "扬尘管理", operType = "分页查询", operDesc = "分页列表查询扬尘设备管理信息") - @ApiOperation(value = " 分页列表查询扬尘设备管理信息", notes = "分页列表查询扬尘设备管理信息", httpMethod = "POST") - @ApiImplicitParams({ - @ApiImplicitParam(name = "name", value = "扬尘名称", paramType = "body", dataType = "String"), - @ApiImplicitParam(name = "pageNo", value = "页数", paramType = "body", required = true, defaultValue = "1", dataType = "Integer"), - @ApiImplicitParam(name = "pageSize", value = "每页条数", paramType = "body", required = true, defaultValue = "10", dataType = "Integer") - }) - @PostMapping(value = "/page") - public Result> queryPageList(@ApiIgnore @RequestBody Map map) { - QueryWrapper wrapper = QueryGenerator.initPageQueryWrapper(EnvironmentDev.class, map); - if (StringUtils.isNotBlank(MapUtils.getString(map, ParamConstants.PROJECT_SN))) { - wrapper.lambda().eq(EnvironmentDev::getEngineeringSn, StrUtil.EMPTY); - } - Page page = PageUtil.getPage(map); - IPage pageList = environmentDevService.page(page, wrapper); - return Result.success(pageList); - } + /** + * 分页列表查询 + * + * @return + */ + @OperLog(operModul = "扬尘管理", operType = "分页查询", operDesc = "分页列表查询扬尘设备管理信息") + @ApiOperation(value = " 分页列表查询扬尘设备管理信息", notes = "分页列表查询扬尘设备管理信息", httpMethod = "POST") + @ApiImplicitParams({ + @ApiImplicitParam(name = "name", value = "扬尘名称", paramType = "body", dataType = "String"), + @ApiImplicitParam(name = "pageNo", value = "页数", paramType = "body", required = true, defaultValue = "1", dataType = "Integer"), + @ApiImplicitParam(name = "pageSize", value = "每页条数", paramType = "body", required = true, defaultValue = "10", dataType = "Integer") + }) + @PostMapping(value = "/page") + public Result> queryPageList(@ApiIgnore @RequestBody Map map) { + QueryWrapper wrapper = QueryGenerator.initPageQueryWrapper(EnvironmentDev.class, map); + if (StringUtils.isNotBlank(MapUtils.getString(map, ParamConstants.PROJECT_SN))) { + wrapper.lambda().eq(EnvironmentDev::getEngineeringSn, StrUtil.EMPTY); + } + Page page = PageUtil.getPage(map); + IPage pageList = environmentDevService.page(page, wrapper); + return Result.success(pageList); + } - /** - * 列表查询 - * - * @return - */ - @OperLog(operModul = "扬尘管理", operType = "列表查询", operDesc = "列表查询扬尘设备管理信息") - @ApiOperation(value = " 列表查询扬尘设备管理信息", notes = "列表查询扬尘设备管理信息", httpMethod = "POST") - @ApiImplicitParams({ - @ApiImplicitParam(name = "engineeringSn", value = "工程sn", paramType = "body", dataType = "String"), - @ApiImplicitParam(name = "projectSn", value = "项目sn", paramType = "body", dataType = "String") - }) - @PostMapping(value = "/list") - public Result> queryList(@ApiIgnore @RequestBody EnvironmentDev environmentDev) { - LambdaQueryWrapper wrapper = Wrappers.lambdaQuery(); - if (environmentDev.getEngineeringSn() != null) { - wrapper.eq(EnvironmentDev::getEngineeringSn, environmentDev.getEngineeringSn()); - } - if (environmentDev.getProjectSn() != null) { - wrapper.eq(EnvironmentDev::getEngineeringSn, StrUtil.EMPTY); - } - List list = environmentDevService.list(wrapper); - return Result.success(list); - } + /** + * 列表查询 + * + * @return + */ + @OperLog(operModul = "扬尘管理", operType = "列表查询", operDesc = "列表查询扬尘设备管理信息") + @ApiOperation(value = " 列表查询扬尘设备管理信息", notes = "列表查询扬尘设备管理信息", httpMethod = "POST") + @ApiImplicitParams({ + @ApiImplicitParam(name = "engineeringSn", value = "工程sn", paramType = "body", dataType = "String"), + @ApiImplicitParam(name = "projectSn", value = "项目sn", paramType = "body", dataType = "String") + }) + @PostMapping(value = "/list") + public Result> queryList(@ApiIgnore @RequestBody EnvironmentDev environmentDev) { + LambdaQueryWrapper wrapper = Wrappers.lambdaQuery(); + if (environmentDev.getEngineeringSn() != null) { + wrapper.eq(EnvironmentDev::getEngineeringSn, environmentDev.getEngineeringSn()); + } + if (environmentDev.getProjectSn() != null) { + wrapper.eq(EnvironmentDev::getEngineeringSn, StrUtil.EMPTY); + } + List list = environmentDevService.list(wrapper); + return Result.success(list); + } - /** - * 添加 - * - * @param environmentDev - * @return - */ - @OperLog(operModul = "扬尘管理", operType = "新增", operDesc = "添加扬尘设备管理信息") - @ApiOperation(value = " 添加扬尘设备管理信息", notes = "添加扬尘设备管理信息", httpMethod = "POST") - @PostMapping(value = "/add") - public Result add(@RequestBody EnvironmentDev environmentDev) { - Result result = new Result(); - environmentDevService.saveInfo(environmentDev); - result.success("添加成功！"); - return result; - } + /** + * 添加 + * + * @param environmentDev + * @return + */ + @OperLog(operModul = "扬尘管理", operType = "新增", operDesc = "添加扬尘设备管理信息") + @ApiOperation(value = " 添加扬尘设备管理信息", notes = "添加扬尘设备管理信息", httpMethod = "POST") + @PostMapping(value = "/add") + public Result add(@RequestBody EnvironmentDev environmentDev) { + Result result = new Result(); + environmentDevService.saveInfo(environmentDev); + result.success("添加成功！"); + return result; + } - /** - * 编辑 - * - * @param environmentDev - * @return - */ - @OperLog(operModul = "扬尘管理", operType = "修改", operDesc = "编辑扬尘设备管理信息") - @ApiOperation(value = "编辑扬尘设备管理信息", notes = "编辑扬尘设备管理信息", httpMethod = "POST") - @PostMapping(value = "/edit") - public Result edit(@RequestBody EnvironmentDev environmentDev) { - Result result = new Result(); - EnvironmentDev environmentDevEntity = environmentDevService.getById(environmentDev.getId()); - if (environmentDevEntity == null) { - result.error500("未找到对应实体"); - } else { - SecurityUser user = SecurityUtil.getUser(); - environmentDev.setProjectSn(user.getSn()); - boolean ok = environmentDevService.updateInfo(environmentDev); - if (ok) { - result.success("修改成功!"); - } - } - return result; - } + /** + * 编辑 + * + * @param environmentDev + * @return + */ + @OperLog(operModul = "扬尘管理", operType = "修改", operDesc = "编辑扬尘设备管理信息") + @ApiOperation(value = "编辑扬尘设备管理信息", notes = "编辑扬尘设备管理信息", httpMethod = "POST") + @PostMapping(value = "/edit") + public Result edit(@RequestBody EnvironmentDev environmentDev) { + Result result = new Result(); + EnvironmentDev environmentDevEntity = environmentDevService.getById(environmentDev.getId()); + if (environmentDevEntity == null) { + result.error500("未找到对应实体"); + } else { + SecurityUser user = SecurityUtil.getUser(); + environmentDev.setProjectSn(user.getSn()); + boolean ok = environmentDevService.updateInfo(environmentDev); + if (ok) { + result.success("修改成功!"); + } + } + return result; + } - /** - * 通过id删除 - * @return - */ - @OperLog(operModul = "扬尘管理", operType = "删除", operDesc = "删除扬尘设备管理信息") - @ApiOperation(value = "删除扬尘设备管理信息", notes = "删除扬尘设备管理信息", httpMethod = "POST") - @ApiImplicitParam(name = "id", value = "扬尘设备管理ID", paramType = "body", required = true, dataType = "Integer") - @PostMapping(value = "/delete") - public Result delete(@ApiIgnore @RequestBody EnvironmentDev environmentDev) { - Result result = new Result(); - EnvironmentDev iEnvironmentDev = environmentDevService.getById(environmentDev.getId()); - if (iEnvironmentDev == null) { - result.error500("未找到对应实体"); - } else { - boolean ok = environmentDevService.removeById(environmentDev.getId()); - if (ok) { - result.success("删除成功!"); - } - } - return result; - } + /** + * 通过id删除 + * + * @return + */ + @OperLog(operModul = "扬尘管理", operType = "删除", operDesc = "删除扬尘设备管理信息") + @ApiOperation(value = "删除扬尘设备管理信息", notes = "删除扬尘设备管理信息", httpMethod = "POST") + @ApiImplicitParam(name = "id", value = "扬尘设备管理ID", paramType = "body", required = true, dataType = "Integer") + @PostMapping(value = "/delete") + public Result delete(@ApiIgnore @RequestBody EnvironmentDev environmentDev) { + Result result = new Result(); + EnvironmentDev iEnvironmentDev = environmentDevService.getById(environmentDev.getId()); + if (iEnvironmentDev == null) { + result.error500("未找到对应实体"); + } else { + boolean ok = environmentDevService.removeById(environmentDev.getId()); + if (ok) { + result.success("删除成功!"); + } + } + return result; + } + + /** + * 列表查询 + * + * @return + */ + @OperLog(operModul = "扬尘管理", operType = "列表查询", operDesc = "列表查询设备信息以及详细参数") + @ApiOperation(value = " 列表查询设备信息以及详细参数", notes = "列表查询设备信息以及详细参数", httpMethod = "POST") + @PostMapping(value = "/detailList") + public Result> detailList(@RequestBody EnvironmentDev environmentDev) { + List list = environmentDevService.detailList(environmentDev); + return Result.success(list); + } + + /** + * 通过设备编码查询设备详细信息 + * + * @return + */ + @OperLog(operModul = "扬尘管理", operType = "查询", operDesc = "通过设备ID查询设备详细信息") + @ApiOperation(value = "通过设备ID查询设备详细信息", notes = "通过设备ID查询设备详细信息", httpMethod = "POST") + @ApiImplicitParam(name = "id", value = "扬尘设备id", paramType = "body", required = true, dataType = "String") + @PostMapping(value = "/queryDetailById") + public Result queryById(@ApiIgnore @RequestBody EnvironmentDev environmentDev) { + Result result = new Result(); + EnvironmentDevDto detail = environmentDevService.getDetail(environmentDev.getId()); + if (detail == null) { + result.error500("未找到对应实体"); + } else { + result.setResult(detail); + result.setSuccess(true); + } + return result; + } + + @OperLog(operModul = "扬尘管理", operType = "分页查询", operDesc = "分页查询工程信息和扬尘设备数量列表") + @ApiOperation(value = "分页查询工程信息和扬尘设备数量列表", notes = "分页查询工程信息和扬尘设备数量列表", httpMethod = "POST") + @ApiImplicitParams({ + @ApiImplicitParam(name = "pageNo", value = "页数", paramType = "body", required = true, defaultValue = "1", dataType = "Integer"), + @ApiImplicitParam(name = "pageSize", value = "每页条数", paramType = "body", required = true, defaultValue = "10", dataType = "Integer") + }) + @PostMapping(value = "/queryEngineeringAndEnvironmentDevPage") + public Result> queryEngineeringAndEnvironmentDevPage(@ApiIgnore @RequestBody Map map) { + QueryWrapper wrapper = QueryGenerator.initPageQueryWrapper(Engineering.class, map); + Page page = PageUtil.getPage(map); + wrapper.lambda().orderByDesc(Engineering::getCreateTime); + IPage pageList = environmentDevService.queryEngineeringAndEnvironmentDevPage(page, wrapper); + return Result.success(pageList); + } + + @OperLog(operModul = "扬尘管理", operType = "统计", operDesc = "扬尘统计") + @ApiOperation(value = "扬尘统计", notes = "扬尘统计", httpMethod = "POST") + @PostMapping(value = "/countEnvironmentDev") + public Result countEnvironmentDev() { + return Result.success(environmentDevService.countEnvironmentDev()); + } - /** - * 列表查询 - * @return - */ - @OperLog(operModul = "扬尘管理", operType = "列表查询", operDesc = "列表查询设备信息以及详细参数") - @ApiOperation(value = " 列表查询设备信息以及详细参数", notes = "列表查询设备信息以及详细参数", httpMethod = "POST") - @PostMapping(value = "/detailList") - public Result> detailList(@RequestBody EnvironmentDev environmentDev) { - List list = environmentDevService.detailList(environmentDev); - return Result.success(list); - } - /** - * 通过设备编码查询设备详细信息 - * - * @return - */ - @OperLog(operModul = "扬尘管理", operType = "查询", operDesc = "通过设备ID查询设备详细信息") - @ApiOperation(value = "通过设备ID查询设备详细信息", notes = "通过设备ID查询设备详细信息", httpMethod = "POST") - @ApiImplicitParam(name = "id", value = "扬尘设备id", paramType = "body", required = true, dataType = "String") - @PostMapping(value = "/queryDetailById") - public Result queryById(@ApiIgnore @RequestBody EnvironmentDev environmentDev) { - Result result = new Result(); - EnvironmentDevDto detail = environmentDevService.getDetail(environmentDev.getId()); - if (detail == null) { - result.error500("未找到对应实体"); - } else { - result.setResult(detail); - result.setSuccess(true); - } - return result; - } } diff --git a/src/main/java/com/zhgd/xmgl/modules/city/dust/entity/DustNoiseData.java b/src/main/java/com/zhgd/xmgl/modules/city/dust/entity/DustNoiseData.java index 55d32f4..5f4bd0b 100644 --- a/src/main/java/com/zhgd/xmgl/modules/city/dust/entity/DustNoiseData.java +++ b/src/main/java/com/zhgd/xmgl/modules/city/dust/entity/DustNoiseData.java @@ -191,6 +191,8 @@ public class DustNoiseData implements Serializable { @ApiModelProperty(value = "板载湿度是否预警(false:否;true:是)") private Boolean plateHumidityAlarm; - + @TableField(exist = false) + @ApiModelProperty(value = "时间") + private String time; } diff --git a/src/main/java/com/zhgd/xmgl/modules/city/dust/entity/vo/EngineeringAndEnvironmentDevVo.java b/src/main/java/com/zhgd/xmgl/modules/city/dust/entity/vo/EngineeringAndEnvironmentDevVo.java new file mode 100644 index 0000000..f5f7b8b --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/city/dust/entity/vo/EngineeringAndEnvironmentDevVo.java @@ -0,0 +1,14 @@ +package com.zhgd.xmgl.modules.city.dust.entity.vo; + +import com.zhgd.xmgl.modules.city.dust.entity.EnvironmentDev; +import com.zhgd.xmgl.modules.city.engineering.entity.Engineering; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +@Data +public class EngineeringAndEnvironmentDevVo extends Engineering { + @ApiModelProperty("扬尘设备数量") + private Integer environmentDevCount; +} diff --git a/src/main/java/com/zhgd/xmgl/modules/city/dust/entity/vo/EnvironmentAlarmTypeVo.java b/src/main/java/com/zhgd/xmgl/modules/city/dust/entity/vo/EnvironmentAlarmTypeVo.java new file mode 100644 index 0000000..c8b6cbb --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/city/dust/entity/vo/EnvironmentAlarmTypeVo.java @@ -0,0 +1,17 @@ +package com.zhgd.xmgl.modules.city.dust.entity.vo; + +import lombok.Data; + +import java.util.List; + +@Data +public class EnvironmentAlarmTypeVo { + private Integer count; + private List list; + + @Data + public static class TypeNum { + private String type; + private Integer count; + } +} diff --git a/src/main/java/com/zhgd/xmgl/modules/city/dust/entity/vo/EnvironmentDevCountVo.java b/src/main/java/com/zhgd/xmgl/modules/city/dust/entity/vo/EnvironmentDevCountVo.java new file mode 100644 index 0000000..d0723cb --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/city/dust/entity/vo/EnvironmentDevCountVo.java @@ -0,0 +1,17 @@ +package com.zhgd.xmgl.modules.city.dust.entity.vo; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +public class EnvironmentDevCountVo { + @ApiModelProperty("已监管工程数量") + private Integer supervisedEngineeringCount; + @ApiModelProperty("已监管生产单位数量") + private Integer supervisedProductionUnitCount; + @ApiModelProperty("扬尘噪声设备数量") + private Integer dustNoiseEquipmentCount; + @ApiModelProperty("扬尘噪声预警数量") + private Integer dustAndNoiseWarningCount; + +} diff --git a/src/main/java/com/zhgd/xmgl/modules/city/dust/mapper/DustNoiseDataMapper.java b/src/main/java/com/zhgd/xmgl/modules/city/dust/mapper/DustNoiseDataMapper.java index 694fd4e..135634c 100644 --- a/src/main/java/com/zhgd/xmgl/modules/city/dust/mapper/DustNoiseDataMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/city/dust/mapper/DustNoiseDataMapper.java @@ -9,6 +9,9 @@ import com.zhgd.xmgl.modules.city.dust.entity.DustNoiseData; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; +import java.util.List; +import java.util.Map; + /** * @Description: 扬尘实时数据管理 * @author： pds @@ -22,4 +25,6 @@ public interface DustNoiseDataMapper extends BaseMapper { Page pageList(Page page, @Param(Constants.WRAPPER)Wrapper wrapper); DustNoiseData getNewData(@Param("deviceCode") String deviceCode); + + List queryTrend(Map map); } diff --git a/src/main/java/com/zhgd/xmgl/modules/city/dust/mapper/EnvironmentAlarmMapper.java b/src/main/java/com/zhgd/xmgl/modules/city/dust/mapper/EnvironmentAlarmMapper.java index d24e8cb..b66f091 100644 --- a/src/main/java/com/zhgd/xmgl/modules/city/dust/mapper/EnvironmentAlarmMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/city/dust/mapper/EnvironmentAlarmMapper.java @@ -6,9 +6,13 @@ import com.baomidou.mybatisplus.core.toolkit.Constants; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.zhgd.annotation.DataScope; import com.zhgd.xmgl.modules.city.dust.entity.EnvironmentAlarm; +import com.zhgd.xmgl.modules.city.dust.entity.vo.EnvironmentAlarmTypeVo; +import com.zhgd.xmgl.modules.city.dust.entity.vo.EnvironmentDevCountVo; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; +import java.util.List; + /** * @Description: 扬尘报警台账表 * @author： pengj @@ -24,4 +28,8 @@ public interface EnvironmentAlarmMapper extends BaseMapper { Integer statByState(); Integer statByEngineering(); + + EnvironmentDevCountVo count(); + + List countTodayEnvironmentAlarmGroupByType(); } diff --git a/src/main/java/com/zhgd/xmgl/modules/city/dust/mapper/EnvironmentDevMapper.java b/src/main/java/com/zhgd/xmgl/modules/city/dust/mapper/EnvironmentDevMapper.java index 1f54afa..f1105d8 100644 --- a/src/main/java/com/zhgd/xmgl/modules/city/dust/mapper/EnvironmentDevMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/city/dust/mapper/EnvironmentDevMapper.java @@ -6,9 +6,13 @@ import com.baomidou.mybatisplus.core.toolkit.Constants; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.zhgd.annotation.DataScope; import com.zhgd.xmgl.modules.city.dust.entity.EnvironmentDev; +import com.zhgd.xmgl.modules.city.dust.entity.vo.EnvironmentDevCountVo; +import com.zhgd.xmgl.modules.city.monitor.entity.bo.OnlineGroupByProjectBo; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; +import java.util.List; + /** * @Description: 扬尘设备管理 * @author： pds @@ -29,4 +33,10 @@ public interface EnvironmentDevMapper extends BaseMapper { String getAllDeviceNameBySn(String projectSn, String engineeringSn); EnvironmentDev getByCode(String code, String ignore); + + List countGroupByProject(); + + EnvironmentDevCountVo countInstallEngineering(); + + EnvironmentDevCountVo count(); } diff --git a/src/main/java/com/zhgd/xmgl/modules/city/dust/mapper/xml/DustNoiseDataMapper.xml b/src/main/java/com/zhgd/xmgl/modules/city/dust/mapper/xml/DustNoiseDataMapper.xml index 3792c02..23de205 100644 --- a/src/main/java/com/zhgd/xmgl/modules/city/dust/mapper/xml/DustNoiseDataMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/city/dust/mapper/xml/DustNoiseDataMapper.xml @@ -2,13 +2,34 @@ + + diff --git a/src/main/java/com/zhgd/xmgl/modules/city/dust/mapper/xml/EnvironmentAlarmMapper.xml b/src/main/java/com/zhgd/xmgl/modules/city/dust/mapper/xml/EnvironmentAlarmMapper.xml index 4ce5e6c..5aa82f5 100644 --- a/src/main/java/com/zhgd/xmgl/modules/city/dust/mapper/xml/EnvironmentAlarmMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/city/dust/mapper/xml/EnvironmentAlarmMapper.xml @@ -2,16 +2,34 @@ + + + + diff --git a/src/main/java/com/zhgd/xmgl/modules/city/dust/mapper/xml/EnvironmentDevMapper.xml b/src/main/java/com/zhgd/xmgl/modules/city/dust/mapper/xml/EnvironmentDevMapper.xml index 7c698fd..a4df399 100644 --- a/src/main/java/com/zhgd/xmgl/modules/city/dust/mapper/xml/EnvironmentDevMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/city/dust/mapper/xml/EnvironmentDevMapper.xml @@ -2,31 +2,38 @@ + + + + + + diff --git a/src/main/java/com/zhgd/xmgl/modules/city/dust/service/IDustNoiseDataService.java b/src/main/java/com/zhgd/xmgl/modules/city/dust/service/IDustNoiseDataService.java index f525ac8..d855f07 100644 --- a/src/main/java/com/zhgd/xmgl/modules/city/dust/service/IDustNoiseDataService.java +++ b/src/main/java/com/zhgd/xmgl/modules/city/dust/service/IDustNoiseDataService.java @@ -5,6 +5,9 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import com.zhgd.xmgl.modules.city.dust.entity.DustNoiseData; +import java.util.List; +import java.util.Map; + /** * @Description: 扬尘实时数据管理 * @author： pds @@ -29,4 +32,6 @@ public interface IDustNoiseDataService extends IService { * @return */ DustNoiseData setAlarm(DustNoiseData dustNoiseData); + + List queryTrend(Map map); } diff --git a/src/main/java/com/zhgd/xmgl/modules/city/dust/service/IEnvironmentAlarmService.java b/src/main/java/com/zhgd/xmgl/modules/city/dust/service/IEnvironmentAlarmService.java index 8eb53ed..22a3f56 100644 --- a/src/main/java/com/zhgd/xmgl/modules/city/dust/service/IEnvironmentAlarmService.java +++ b/src/main/java/com/zhgd/xmgl/modules/city/dust/service/IEnvironmentAlarmService.java @@ -2,9 +2,11 @@ package com.zhgd.xmgl.modules.city.dust.service; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; +import com.zhgd.xmgl.modules.city.dust.entity.vo.EnvironmentAlarmTypeVo; import com.zhgd.xmgl.modules.wisdom.dto.MapEnvironAlarmDto; import com.zhgd.xmgl.modules.city.dust.entity.EnvironmentAlarm; +import java.util.List; import java.util.Map; /** @@ -20,4 +22,6 @@ public interface IEnvironmentAlarmService extends IService { MapEnvironAlarmDto queryMapEnvironAlarmBySn(String projectSn, String engineeringSn); boolean checkAlarm(String sn); + + EnvironmentAlarmTypeVo countTodayEnvironmentAlarmGroupByType(); } diff --git a/src/main/java/com/zhgd/xmgl/modules/city/dust/service/IEnvironmentDevService.java b/src/main/java/com/zhgd/xmgl/modules/city/dust/service/IEnvironmentDevService.java index 563d830..0c38050 100644 --- a/src/main/java/com/zhgd/xmgl/modules/city/dust/service/IEnvironmentDevService.java +++ b/src/main/java/com/zhgd/xmgl/modules/city/dust/service/IEnvironmentDevService.java @@ -1,10 +1,15 @@ package com.zhgd.xmgl.modules.city.dust.service; import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import com.zhgd.xmgl.modules.basicdata.dto.EngineeringDeviceDto; import com.zhgd.xmgl.modules.basicdata.dto.ProjectDeviceDto; +import com.zhgd.xmgl.modules.city.dust.entity.vo.EngineeringAndEnvironmentDevVo; +import com.zhgd.xmgl.modules.city.dust.entity.vo.EnvironmentDevCountVo; +import com.zhgd.xmgl.modules.city.engineering.entity.Engineering; import com.zhgd.xmgl.modules.wisdom.dto.EnvironmentDevDto; import com.zhgd.xmgl.modules.wisdom.dto.EnvironmentDevStatDto; import com.zhgd.xmgl.modules.city.dust.entity.EnvironmentDev; @@ -39,4 +44,8 @@ public interface IEnvironmentDevService extends IService { boolean updateInfo(EnvironmentDev environmentDev); EnvironmentDevStatDto statistics(); + + IPage queryEngineeringAndEnvironmentDevPage(Page page, QueryWrapper wrapper); + + EnvironmentDevCountVo countEnvironmentDev(); } diff --git a/src/main/java/com/zhgd/xmgl/modules/city/dust/service/impl/DustNoiseDataServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/city/dust/service/impl/DustNoiseDataServiceImpl.java index 783d4a0..8c5e1e8 100644 --- a/src/main/java/com/zhgd/xmgl/modules/city/dust/service/impl/DustNoiseDataServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/city/dust/service/impl/DustNoiseDataServiceImpl.java @@ -1,24 +1,29 @@ package com.zhgd.xmgl.modules.city.dust.service.impl; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.zhgd.xmgl.modules.city.dust.entity.DustNoiseData; +import com.zhgd.xmgl.constant.TimeFormatConstant; import com.zhgd.xmgl.modules.basicdata.entity.SystemDictData; +import com.zhgd.xmgl.modules.basicdata.service.ISystemDictDataService; +import com.zhgd.xmgl.modules.city.dust.entity.DustNoiseData; import com.zhgd.xmgl.modules.city.dust.mapper.DustNoiseDataMapper; import com.zhgd.xmgl.modules.city.dust.service.IDustNoiseDataService; -import com.zhgd.xmgl.modules.basicdata.service.ISystemDictDataService; +import com.zhgd.xmgl.util.DateUtils; import com.zhgd.xmgl.util.ParamEnum; +import org.apache.commons.collections.MapUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import java.util.List; +import java.util.*; +import java.util.function.Function; import java.util.stream.Collectors; /** * @Description: 扬尘实时数据管理 * @author： pds - * @date： 2023-03-01 + * @date： 2023-03-01 * @version： V1.0 */ @Service @@ -54,12 +59,63 @@ public class DustNoiseDataServiceImpl extends ServiceImpl queryTrend(Map map) { + Integer type = MapUtils.getInteger(map, "type"); + Date date = new Date(); + //1:日，2:月，3：年 + if (Objects.equals(type, 1)) { + map.put("startTime", DateUtil.offsetDay(date, -1)); + map.put("endTime", DateUtil.now()); + map.put("timeFormat", TimeFormatConstant.HOUR); + } else if (Objects.equals(type, 2)) { + map.put("startTime", DateUtil.offsetMonth(date, -1)); + map.put("endTime", DateUtil.now()); + map.put("timeFormat", TimeFormatConstant.DAY); + } else if (Objects.equals(type, 3)) { + map.put("startTime", DateUtil.offsetMonth(date, -12)); + map.put("endTime", DateUtil.now()); + map.put("timeFormat", TimeFormatConstant.MONTH); + } + List dustNoiseDatas = baseMapper.queryTrend(map); + dustNoiseDatas = fillDate(dustNoiseDatas, map); + return dustNoiseDatas; + } + + private List fillDate(List dustNoiseDatas, Map map) { + List list = new ArrayList<>(); + Integer type = MapUtils.getInteger(map, "type"); + List times = null; + Map timeMap = dustNoiseDatas.stream().collect(Collectors.toMap(DustNoiseData::getTime, Function.identity())); + if (Objects.equals(type, 1)) { + times = DateUtils.getHoursListLastDay(); + } else if (Objects.equals(type, 2)) { + times = DateUtils.getDaysBetweenLastMonth(); + } else if (Objects.equals(type, 3)) { + times = DateUtils.getMonthsBetweenLastYear(); + } + for (String time : times) { + DustNoiseData dustNoiseData = timeMap.get(time); + if (dustNoiseData == null) { + dustNoiseData = new DustNoiseData(); + dustNoiseData.setPm10(0F); + dustNoiseData.setPm25(0F); + dustNoiseData.setNoise(0F); + dustNoiseData.setTsp(0F); + dustNoiseData.setTime(time); + } + list.add(dustNoiseData); + } + return list; + } + private Float dictValue(List systemDictDataList, Integer type) { String thresholdValue = "0"; List systemDictData = systemDictDataList.stream().filter(d -> d.getDictLabel().equals(type)).collect(Collectors.toList()); if (systemDictData.size() > 0) { - thresholdValue = systemDictData.get(0).getDictValue(); + thresholdValue = systemDictData.get(0).getDictValue(); } return Float.valueOf(thresholdValue); } + } diff --git a/src/main/java/com/zhgd/xmgl/modules/city/dust/service/impl/EnvironmentAlarmServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/city/dust/service/impl/EnvironmentAlarmServiceImpl.java index 1b96bf2..664af1d 100644 --- a/src/main/java/com/zhgd/xmgl/modules/city/dust/service/impl/EnvironmentAlarmServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/city/dust/service/impl/EnvironmentAlarmServiceImpl.java @@ -13,26 +13,31 @@ import com.zhgd.jeecg.common.util.PageUtil; import com.zhgd.redis.lock.RedisRepository; import com.zhgd.xmgl.modules.basicdata.constant.CacheConstants; import com.zhgd.xmgl.modules.basicdata.constant.ParamConstants; -import com.zhgd.xmgl.modules.wisdom.dto.MapEnvironAlarmDto; import com.zhgd.xmgl.modules.city.dust.entity.DustNoiseData; import com.zhgd.xmgl.modules.city.dust.entity.EnvironmentAlarm; +import com.zhgd.xmgl.modules.city.dust.entity.vo.EnvironmentAlarmTypeVo; import com.zhgd.xmgl.modules.city.dust.mapper.EnvironmentAlarmMapper; import com.zhgd.xmgl.modules.city.dust.service.IDustNoiseDataService; import com.zhgd.xmgl.modules.city.dust.service.IEnvironmentAlarmService; import com.zhgd.xmgl.modules.city.dust.service.IEnvironmentDevService; +import com.zhgd.xmgl.modules.wisdom.dto.MapEnvironAlarmDto; import com.zhgd.xmgl.util.DateUtils; +import com.zhgd.xmgl.util.ParamEnum; import org.apache.commons.collections.MapUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.ArrayList; import java.util.Date; import java.util.List; import java.util.Map; +import java.util.function.Function; +import java.util.stream.Collectors; /** * @Description: 扬尘报警台账表 * @author： pengj - * @date： 2023-03-01 + * @date： 2023-03-01 * @version： V1.0 */ @Service @@ -112,4 +117,29 @@ public class EnvironmentAlarmServiceImpl extends ServiceImpl environmentAlarmTypeVos = baseMapper.countTodayEnvironmentAlarmGroupByType(); + List typeList = new ArrayList<>(); + typeList.add(ParamEnum.EnvironmentAlarmTypeThreshold.PM10.name()); + typeList.add(ParamEnum.EnvironmentAlarmTypeThreshold.PM25.name()); + typeList.add(ParamEnum.EnvironmentAlarmTypeThreshold.NOISE.name()); + typeList.add(ParamEnum.EnvironmentAlarmTypeThreshold.TSP.name()); + List list = environmentAlarmTypeVos.stream().filter(vo -> typeList.contains(vo.getType())).collect(Collectors.toList()); + Map typeMap = list.stream().collect(Collectors.toMap(EnvironmentAlarmTypeVo.TypeNum::getType, Function.identity())); + for (String type : typeList) { + if (typeMap.get(type) == null) { + EnvironmentAlarmTypeVo.TypeNum typeNum = new EnvironmentAlarmTypeVo.TypeNum(); + typeNum.setType(type); + typeNum.setCount(0); + list.add(typeNum); + } + } + list.stream().sorted((o1, o2) -> o2.getCount().compareTo(o1.getCount())); + EnvironmentAlarmTypeVo vo = new EnvironmentAlarmTypeVo(); + vo.setCount(environmentAlarmTypeVos.stream().mapToInt(e -> e.getCount()).sum()); + vo.setList(list); + return vo; + } + } diff --git a/src/main/java/com/zhgd/xmgl/modules/city/dust/service/impl/EnvironmentDevServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/city/dust/service/impl/EnvironmentDevServiceImpl.java index 8167f07..a222dcd 100644 --- a/src/main/java/com/zhgd/xmgl/modules/city/dust/service/impl/EnvironmentDevServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/city/dust/service/impl/EnvironmentDevServiceImpl.java @@ -6,6 +6,8 @@ import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -16,18 +18,22 @@ import com.zhgd.xmgl.handler.exception.CustomException; import com.zhgd.xmgl.modules.basicdata.constant.CacheConstants; import com.zhgd.xmgl.modules.basicdata.dto.EngineeringDeviceDto; import com.zhgd.xmgl.modules.basicdata.dto.ProjectDeviceDto; -import com.zhgd.xmgl.modules.city.engineering.entity.Engineering; -import com.zhgd.xmgl.modules.city.engineering.service.IEngineeringService; -import com.zhgd.xmgl.modules.city.project.service.IProjectService; -import com.zhgd.xmgl.modules.wisdom.dto.EnvironmentDevDto; -import com.zhgd.xmgl.modules.wisdom.dto.EnvironmentDevStatDto; import com.zhgd.xmgl.modules.city.dust.entity.DustNoiseData; import com.zhgd.xmgl.modules.city.dust.entity.EnvironmentAlarm; import com.zhgd.xmgl.modules.city.dust.entity.EnvironmentDev; +import com.zhgd.xmgl.modules.city.dust.entity.vo.EngineeringAndEnvironmentDevVo; +import com.zhgd.xmgl.modules.city.dust.entity.vo.EnvironmentDevCountVo; +import com.zhgd.xmgl.modules.city.dust.mapper.EnvironmentAlarmMapper; import com.zhgd.xmgl.modules.city.dust.mapper.EnvironmentDevMapper; import com.zhgd.xmgl.modules.city.dust.service.IDustNoiseDataService; import com.zhgd.xmgl.modules.city.dust.service.IEnvironmentAlarmService; import com.zhgd.xmgl.modules.city.dust.service.IEnvironmentDevService; +import com.zhgd.xmgl.modules.city.engineering.entity.Engineering; +import com.zhgd.xmgl.modules.city.engineering.service.IEngineeringService; +import com.zhgd.xmgl.modules.city.monitor.entity.bo.OnlineGroupByProjectBo; +import com.zhgd.xmgl.modules.city.project.service.IProjectService; +import com.zhgd.xmgl.modules.wisdom.dto.EnvironmentDevDto; +import com.zhgd.xmgl.modules.wisdom.dto.EnvironmentDevStatDto; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -36,11 +42,12 @@ import org.springframework.transaction.annotation.Transactional; import java.util.Date; import java.util.List; import java.util.Map; +import java.util.stream.Collectors; /** * @Description: 扬尘设备管理 * @author： pds - * @date： 2023-03-01 + * @date： 2023-03-01 * @version： V1.0 */ @Service @@ -61,6 +68,8 @@ public class EnvironmentDevServiceImpl extends ServiceImpl pageList(Page page, Wrapper wrapper) { @@ -162,13 +171,34 @@ public class EnvironmentDevServiceImpl extends ServiceImpllambdaQuery().isNotNull(EnvironmentAlarm::getProjectSn))); } else {*/ - int installNum = this.statByEngineering(); - Integer engineeringNum = engineeringService.list(Wrappers.lambdaQuery().eq(Engineering::getExamineState, 3)).size(); - environmentDev.setInstallNum(installNum); - environmentDev.setUseRate(engineeringNum == 0 ? 0 : NumberUtil.round(installNum * 100F / engineeringNum, 2).floatValue()); - environmentDev.setTotalAlarm(environmentAlarmService.count(Wrappers.lambdaQuery().isNotNull(EnvironmentAlarm::getEngineeringSn))); + int installNum = this.statByEngineering(); + Integer engineeringNum = engineeringService.list(Wrappers.lambdaQuery().eq(Engineering::getExamineState, 3)).size(); + environmentDev.setInstallNum(installNum); + environmentDev.setUseRate(engineeringNum == 0 ? 0 : NumberUtil.round(installNum * 100F / engineeringNum, 2).floatValue()); + environmentDev.setTotalAlarm(environmentAlarmService.count(Wrappers.lambdaQuery().isNotNull(EnvironmentAlarm::getEngineeringSn))); // } return environmentDev; } + @Override + public IPage queryEngineeringAndEnvironmentDevPage(Page page, QueryWrapper wrapper) { + Page pageList = engineeringService.page(page, wrapper); + Page rtPage = BeanUtil.toBean(pageList, Page.class); + rtPage.setRecords(BeanUtil.copyToList(pageList.getRecords(), EngineeringAndEnvironmentDevVo.class)); + List onlineGroupByProjectBos = baseMapper.countGroupByProject(); + Map engineeringMap = onlineGroupByProjectBos.stream().collect(Collectors.toMap(OnlineGroupByProjectBo::getEngineeringSn, onlineGroupByProjectBo -> onlineGroupByProjectBo)); + rtPage.getRecords().stream().forEach(s -> { + s.setEnvironmentDevCount(engineeringMap.get(s.getEngineeringSn()) != null ? engineeringMap.get(s.getEngineeringSn()).getCount() : 0); + }); + return rtPage; + } + + @Override + public EnvironmentDevCountVo countEnvironmentDev() { + EnvironmentDevCountVo vo = baseMapper.countInstallEngineering(); + vo.setDustNoiseEquipmentCount(baseMapper.count().getDustNoiseEquipmentCount()); + vo.setDustAndNoiseWarningCount(environmentAlarmMapper.count().getDustAndNoiseWarningCount()); + return vo; + } + } diff --git a/src/main/java/com/zhgd/xmgl/modules/city/engineering/entity/Engineering.java b/src/main/java/com/zhgd/xmgl/modules/city/engineering/entity/Engineering.java index 892e0d4..a3fca09 100644 --- a/src/main/java/com/zhgd/xmgl/modules/city/engineering/entity/Engineering.java +++ b/src/main/java/com/zhgd/xmgl/modules/city/engineering/entity/Engineering.java @@ -335,11 +335,5 @@ public class Engineering implements Serializable { @ApiModelProperty(value = "单体工程") private List engineeringSingleList; - @TableField(exist = false) - @ApiModelProperty(value = "视频监控在线数量") - private Integer monitorDevOnlineCount; - @TableField(exist = false) - @ApiModelProperty(value = "视频监控离线数量") - private Integer monitorDevOfflineCount; } diff --git a/src/main/java/com/zhgd/xmgl/modules/city/engineering/service/impl/EngineeringServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/city/engineering/service/impl/EngineeringServiceImpl.java index 6e05ed5..da80501 100644 --- a/src/main/java/com/zhgd/xmgl/modules/city/engineering/service/impl/EngineeringServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/city/engineering/service/impl/EngineeringServiceImpl.java @@ -76,13 +76,9 @@ public class EngineeringServiceImpl extends ServiceImpl pageList = this.page(page, wrapper); List engineeringTypes = systemDictDataService.getByType(ParamEnum.SysDictType.ENGINEERING_TYPE.getValue()); List engineeringStates = systemDictDataService.getByType(ParamEnum.SysDictType.ENGINEERING_STATE.getValue()); - List onlineGroupByProjectBos = monitorDevMapper.countOnlineGroupByProject(); - Map projectMap = onlineGroupByProjectBos.stream().collect(Collectors.toMap(OnlineGroupByProjectBo::getProjectSn, onlineGroupByProjectBo -> onlineGroupByProjectBo)); pageList.getRecords().stream().forEach(s -> { s.setEngineeringTypeName(CommonUtil.getDictValue(engineeringTypes, s.getEngineeringType())); s.setStateName(CommonUtil.getDictValue(engineeringStates, s.getState())); - s.setMonitorDevOnlineCount(projectMap.get(s.getProjectSn()) != null ? projectMap.get(s.getProjectSn()).getOnlineCount() : 0); - s.setMonitorDevOfflineCount(projectMap.get(s.getProjectSn()) != null ? projectMap.get(s.getProjectSn()).getOfflineCount() : 0); }); return pageList; } diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/project/LifterAlarmController.java b/src/main/java/com/zhgd/xmgl/modules/city/lifter/controller/LifterAlarmController.java similarity index 97% rename from src/main/java/com/zhgd/xmgl/modules/basicdata/controller/project/LifterAlarmController.java rename to src/main/java/com/zhgd/xmgl/modules/city/lifter/controller/LifterAlarmController.java index fb25460..cc1131b 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/project/LifterAlarmController.java +++ b/src/main/java/com/zhgd/xmgl/modules/city/lifter/controller/LifterAlarmController.java @@ -1,4 +1,4 @@ -package com.zhgd.xmgl.modules.basicdata.controller.project; +package com.zhgd.xmgl.modules.city.lifter.controller; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -10,8 +10,8 @@ import com.zhgd.jeecg.common.api.vo.Result; import com.zhgd.jeecg.common.system.query.QueryGenerator; import com.zhgd.jeecg.common.util.PageUtil; import com.zhgd.xmgl.modules.basicdata.constant.ParamConstants; -import com.zhgd.xmgl.modules.wisdom.entity.LifterAlarm; -import com.zhgd.xmgl.modules.wisdom.service.ILifterAlarmService; +import com.zhgd.xmgl.modules.city.lifter.entity.LifterAlarm; +import com.zhgd.xmgl.modules.city.lifter.service.ILifterAlarmService; import com.zhgd.xmgl.modules.wisdom.statistics.LifterAlarmStat; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/project/LifterController.java b/src/main/java/com/zhgd/xmgl/modules/city/lifter/controller/LifterController.java similarity index 97% rename from src/main/java/com/zhgd/xmgl/modules/basicdata/controller/project/LifterController.java rename to src/main/java/com/zhgd/xmgl/modules/city/lifter/controller/LifterController.java index 2cca06e..a86bae3 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/project/LifterController.java +++ b/src/main/java/com/zhgd/xmgl/modules/city/lifter/controller/LifterController.java @@ -1,4 +1,4 @@ -package com.zhgd.xmgl.modules.basicdata.controller.project; +package com.zhgd.xmgl.modules.city.lifter.controller; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -10,8 +10,8 @@ import com.zhgd.jeecg.common.api.vo.Result; import com.zhgd.jeecg.common.system.query.QueryGenerator; import com.zhgd.jeecg.common.util.PageUtil; import com.zhgd.xmgl.modules.basicdata.constant.ParamConstants; -import com.zhgd.xmgl.modules.wisdom.entity.Lifter; -import com.zhgd.xmgl.modules.wisdom.service.ILifterService; +import com.zhgd.xmgl.modules.city.lifter.entity.Lifter; +import com.zhgd.xmgl.modules.city.lifter.service.ILifterService; import com.zhgd.xmgl.security.SecurityUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/project/LifterCurrentDataController.java b/src/main/java/com/zhgd/xmgl/modules/city/lifter/controller/LifterCurrentDataController.java similarity index 94% rename from src/main/java/com/zhgd/xmgl/modules/basicdata/controller/project/LifterCurrentDataController.java rename to src/main/java/com/zhgd/xmgl/modules/city/lifter/controller/LifterCurrentDataController.java index 8c33467..263b162 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/project/LifterCurrentDataController.java +++ b/src/main/java/com/zhgd/xmgl/modules/city/lifter/controller/LifterCurrentDataController.java @@ -1,4 +1,4 @@ -package com.zhgd.xmgl.modules.basicdata.controller.project; +package com.zhgd.xmgl.modules.city.lifter.controller; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -12,11 +12,11 @@ import com.zhgd.jeecg.common.system.query.QueryGenerator; import com.zhgd.jeecg.common.util.PageUtil; import com.zhgd.xmgl.modules.basicdata.constant.ParamConstants; import com.zhgd.xmgl.modules.wisdom.dto.LifterOperationDto; -import com.zhgd.xmgl.modules.wisdom.entity.Lifter; -import com.zhgd.xmgl.modules.wisdom.entity.LifterCurrentData; -import com.zhgd.xmgl.modules.wisdom.entity.TowerCrane; -import com.zhgd.xmgl.modules.wisdom.service.ILifterCurrentDataService; -import com.zhgd.xmgl.modules.wisdom.service.ILifterService; +import com.zhgd.xmgl.modules.city.lifter.entity.Lifter; +import com.zhgd.xmgl.modules.city.lifter.entity.LifterCurrentData; +import com.zhgd.xmgl.modules.city.towercrane.entity.TowerCrane; +import com.zhgd.xmgl.modules.city.lifter.service.ILifterCurrentDataService; +import com.zhgd.xmgl.modules.city.lifter.service.ILifterService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/project/LifterWorkCycleController.java b/src/main/java/com/zhgd/xmgl/modules/city/lifter/controller/LifterWorkCycleController.java similarity index 96% rename from src/main/java/com/zhgd/xmgl/modules/basicdata/controller/project/LifterWorkCycleController.java rename to src/main/java/com/zhgd/xmgl/modules/city/lifter/controller/LifterWorkCycleController.java index 06de4f8..6e4c62e 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/project/LifterWorkCycleController.java +++ b/src/main/java/com/zhgd/xmgl/modules/city/lifter/controller/LifterWorkCycleController.java @@ -1,4 +1,4 @@ -package com.zhgd.xmgl.modules.basicdata.controller.project; +package com.zhgd.xmgl.modules.city.lifter.controller; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -10,8 +10,8 @@ import com.zhgd.jeecg.common.api.vo.Result; import com.zhgd.jeecg.common.system.query.QueryGenerator; import com.zhgd.jeecg.common.util.PageUtil; import com.zhgd.xmgl.modules.basicdata.constant.ParamConstants; -import com.zhgd.xmgl.modules.wisdom.entity.LifterWorkCycle; -import com.zhgd.xmgl.modules.wisdom.service.ILifterWorkCycleService; +import com.zhgd.xmgl.modules.city.lifter.entity.LifterWorkCycle; +import com.zhgd.xmgl.modules.city.lifter.service.ILifterWorkCycleService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; diff --git a/src/main/java/com/zhgd/xmgl/modules/wisdom/entity/Lifter.java b/src/main/java/com/zhgd/xmgl/modules/city/lifter/entity/Lifter.java similarity index 99% rename from src/main/java/com/zhgd/xmgl/modules/wisdom/entity/Lifter.java rename to src/main/java/com/zhgd/xmgl/modules/city/lifter/entity/Lifter.java index 9aab791..a03d738 100644 --- a/src/main/java/com/zhgd/xmgl/modules/wisdom/entity/Lifter.java +++ b/src/main/java/com/zhgd/xmgl/modules/city/lifter/entity/Lifter.java @@ -1,4 +1,4 @@ -package com.zhgd.xmgl.modules.wisdom.entity; +package com.zhgd.xmgl.modules.city.lifter.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/src/main/java/com/zhgd/xmgl/modules/wisdom/entity/LifterAlarm.java b/src/main/java/com/zhgd/xmgl/modules/city/lifter/entity/LifterAlarm.java similarity index 99% rename from src/main/java/com/zhgd/xmgl/modules/wisdom/entity/LifterAlarm.java rename to src/main/java/com/zhgd/xmgl/modules/city/lifter/entity/LifterAlarm.java index d94fbd2..dd3bebb 100644 --- a/src/main/java/com/zhgd/xmgl/modules/wisdom/entity/LifterAlarm.java +++ b/src/main/java/com/zhgd/xmgl/modules/city/lifter/entity/LifterAlarm.java @@ -1,4 +1,4 @@ -package com.zhgd.xmgl.modules.wisdom.entity; +package com.zhgd.xmgl.modules.city.lifter.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/src/main/java/com/zhgd/xmgl/modules/wisdom/entity/LifterCurrentData.java b/src/main/java/com/zhgd/xmgl/modules/city/lifter/entity/LifterCurrentData.java similarity index 99% rename from src/main/java/com/zhgd/xmgl/modules/wisdom/entity/LifterCurrentData.java rename to src/main/java/com/zhgd/xmgl/modules/city/lifter/entity/LifterCurrentData.java index f6a6a8c..b9c1d02 100644 --- a/src/main/java/com/zhgd/xmgl/modules/wisdom/entity/LifterCurrentData.java +++ b/src/main/java/com/zhgd/xmgl/modules/city/lifter/entity/LifterCurrentData.java @@ -1,4 +1,4 @@ -package com.zhgd.xmgl.modules.wisdom.entity; +package com.zhgd.xmgl.modules.city.lifter.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/src/main/java/com/zhgd/xmgl/modules/wisdom/entity/LifterWorkCycle.java b/src/main/java/com/zhgd/xmgl/modules/city/lifter/entity/LifterWorkCycle.java similarity index 99% rename from src/main/java/com/zhgd/xmgl/modules/wisdom/entity/LifterWorkCycle.java rename to src/main/java/com/zhgd/xmgl/modules/city/lifter/entity/LifterWorkCycle.java index a46d55e..d22f1d0 100644 --- a/src/main/java/com/zhgd/xmgl/modules/wisdom/entity/LifterWorkCycle.java +++ b/src/main/java/com/zhgd/xmgl/modules/city/lifter/entity/LifterWorkCycle.java @@ -1,4 +1,4 @@ -package com.zhgd.xmgl.modules.wisdom.entity; +package com.zhgd.xmgl.modules.city.lifter.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/src/main/java/com/zhgd/xmgl/modules/wisdom/mapper/LifterAlarmMapper.java b/src/main/java/com/zhgd/xmgl/modules/city/lifter/mapper/LifterAlarmMapper.java similarity index 63% rename from src/main/java/com/zhgd/xmgl/modules/wisdom/mapper/LifterAlarmMapper.java rename to src/main/java/com/zhgd/xmgl/modules/city/lifter/mapper/LifterAlarmMapper.java index 5e5e2c9..fd4f7d0 100644 --- a/src/main/java/com/zhgd/xmgl/modules/wisdom/mapper/LifterAlarmMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/city/lifter/mapper/LifterAlarmMapper.java @@ -1,10 +1,7 @@ -package com.zhgd.xmgl.modules.wisdom.mapper; - -import java.util.List; +package com.zhgd.xmgl.modules.city.lifter.mapper; import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; -import com.zhgd.xmgl.modules.wisdom.entity.LifterAlarm; +import com.zhgd.xmgl.modules.city.lifter.entity.LifterAlarm; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** diff --git a/src/main/java/com/zhgd/xmgl/modules/wisdom/mapper/LifterCurrentDataMapper.java b/src/main/java/com/zhgd/xmgl/modules/city/lifter/mapper/LifterCurrentDataMapper.java similarity index 63% rename from src/main/java/com/zhgd/xmgl/modules/wisdom/mapper/LifterCurrentDataMapper.java rename to src/main/java/com/zhgd/xmgl/modules/city/lifter/mapper/LifterCurrentDataMapper.java index 6365ad2..5218a53 100644 --- a/src/main/java/com/zhgd/xmgl/modules/wisdom/mapper/LifterCurrentDataMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/city/lifter/mapper/LifterCurrentDataMapper.java @@ -1,10 +1,7 @@ -package com.zhgd.xmgl.modules.wisdom.mapper; - -import java.util.List; +package com.zhgd.xmgl.modules.city.lifter.mapper; import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; -import com.zhgd.xmgl.modules.wisdom.entity.LifterCurrentData; +import com.zhgd.xmgl.modules.city.lifter.entity.LifterCurrentData; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** diff --git a/src/main/java/com/zhgd/xmgl/modules/wisdom/mapper/LifterMapper.java b/src/main/java/com/zhgd/xmgl/modules/city/lifter/mapper/LifterMapper.java similarity index 62% rename from src/main/java/com/zhgd/xmgl/modules/wisdom/mapper/LifterMapper.java rename to src/main/java/com/zhgd/xmgl/modules/city/lifter/mapper/LifterMapper.java index 7827457..5809bf0 100644 --- a/src/main/java/com/zhgd/xmgl/modules/wisdom/mapper/LifterMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/city/lifter/mapper/LifterMapper.java @@ -1,10 +1,7 @@ -package com.zhgd.xmgl.modules.wisdom.mapper; - -import java.util.List; +package com.zhgd.xmgl.modules.city.lifter.mapper; import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; -import com.zhgd.xmgl.modules.wisdom.entity.Lifter; +import com.zhgd.xmgl.modules.city.lifter.entity.Lifter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** diff --git a/src/main/java/com/zhgd/xmgl/modules/wisdom/mapper/LifterWorkCycleMapper.java b/src/main/java/com/zhgd/xmgl/modules/city/lifter/mapper/LifterWorkCycleMapper.java similarity index 64% rename from src/main/java/com/zhgd/xmgl/modules/wisdom/mapper/LifterWorkCycleMapper.java rename to src/main/java/com/zhgd/xmgl/modules/city/lifter/mapper/LifterWorkCycleMapper.java index b866664..33826a7 100644 --- a/src/main/java/com/zhgd/xmgl/modules/wisdom/mapper/LifterWorkCycleMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/city/lifter/mapper/LifterWorkCycleMapper.java @@ -1,10 +1,7 @@ -package com.zhgd.xmgl.modules.wisdom.mapper; - -import java.util.List; +package com.zhgd.xmgl.modules.city.lifter.mapper; import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; -import com.zhgd.xmgl.modules.wisdom.entity.LifterWorkCycle; +import com.zhgd.xmgl.modules.city.lifter.entity.LifterWorkCycle; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** diff --git a/src/main/java/com/zhgd/xmgl/modules/wisdom/mapper/xml/LifterAlarmMapper.xml b/src/main/java/com/zhgd/xmgl/modules/city/lifter/mapper/xml/LifterAlarmMapper.xml similarity index 62% rename from src/main/java/com/zhgd/xmgl/modules/wisdom/mapper/xml/LifterAlarmMapper.xml rename to src/main/java/com/zhgd/xmgl/modules/city/lifter/mapper/xml/LifterAlarmMapper.xml index 40d1554..9dd8875 100644 --- a/src/main/java/com/zhgd/xmgl/modules/wisdom/mapper/xml/LifterAlarmMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/city/lifter/mapper/xml/LifterAlarmMapper.xml @@ -1,5 +1,5 @@ - + - \ No newline at end of file + diff --git a/src/main/java/com/zhgd/xmgl/modules/wisdom/mapper/xml/LifterCurrentDataMapper.xml b/src/main/java/com/zhgd/xmgl/modules/city/lifter/mapper/xml/LifterCurrentDataMapper.xml similarity index 60% rename from src/main/java/com/zhgd/xmgl/modules/wisdom/mapper/xml/LifterCurrentDataMapper.xml rename to src/main/java/com/zhgd/xmgl/modules/city/lifter/mapper/xml/LifterCurrentDataMapper.xml index d5487a2..dd63bf0 100644 --- a/src/main/java/com/zhgd/xmgl/modules/wisdom/mapper/xml/LifterCurrentDataMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/city/lifter/mapper/xml/LifterCurrentDataMapper.xml @@ -1,5 +1,5 @@ - + - \ No newline at end of file + diff --git a/src/main/java/com/zhgd/xmgl/modules/wisdom/mapper/xml/LifterMapper.xml b/src/main/java/com/zhgd/xmgl/modules/city/lifter/mapper/xml/LifterMapper.xml similarity index 63% rename from src/main/java/com/zhgd/xmgl/modules/wisdom/mapper/xml/LifterMapper.xml rename to src/main/java/com/zhgd/xmgl/modules/city/lifter/mapper/xml/LifterMapper.xml index 097b01f..338c5c9 100644 --- a/src/main/java/com/zhgd/xmgl/modules/wisdom/mapper/xml/LifterMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/city/lifter/mapper/xml/LifterMapper.xml @@ -1,5 +1,5 @@ - + - \ No newline at end of file + diff --git a/src/main/java/com/zhgd/xmgl/modules/wisdom/mapper/xml/LifterWorkCycleMapper.xml b/src/main/java/com/zhgd/xmgl/modules/city/lifter/mapper/xml/LifterWorkCycleMapper.xml similarity index 61% rename from src/main/java/com/zhgd/xmgl/modules/wisdom/mapper/xml/LifterWorkCycleMapper.xml rename to src/main/java/com/zhgd/xmgl/modules/city/lifter/mapper/xml/LifterWorkCycleMapper.xml index b1f913b..41abcb3 100644 --- a/src/main/java/com/zhgd/xmgl/modules/wisdom/mapper/xml/LifterWorkCycleMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/city/lifter/mapper/xml/LifterWorkCycleMapper.xml @@ -1,5 +1,5 @@ - + - \ No newline at end of file + diff --git a/src/main/java/com/zhgd/xmgl/modules/wisdom/service/ILifterAlarmService.java b/src/main/java/com/zhgd/xmgl/modules/city/lifter/service/ILifterAlarmService.java similarity index 79% rename from src/main/java/com/zhgd/xmgl/modules/wisdom/service/ILifterAlarmService.java rename to src/main/java/com/zhgd/xmgl/modules/city/lifter/service/ILifterAlarmService.java index 2fafe93..07908b4 100644 --- a/src/main/java/com/zhgd/xmgl/modules/wisdom/service/ILifterAlarmService.java +++ b/src/main/java/com/zhgd/xmgl/modules/city/lifter/service/ILifterAlarmService.java @@ -1,7 +1,7 @@ -package com.zhgd.xmgl.modules.wisdom.service; +package com.zhgd.xmgl.modules.city.lifter.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.zhgd.xmgl.modules.wisdom.entity.LifterAlarm; +import com.zhgd.xmgl.modules.city.lifter.entity.LifterAlarm; import com.zhgd.xmgl.modules.wisdom.statistics.LifterAlarmStat; import java.util.Map; diff --git a/src/main/java/com/zhgd/xmgl/modules/wisdom/service/ILifterCurrentDataService.java b/src/main/java/com/zhgd/xmgl/modules/city/lifter/service/ILifterCurrentDataService.java similarity index 78% rename from src/main/java/com/zhgd/xmgl/modules/wisdom/service/ILifterCurrentDataService.java rename to src/main/java/com/zhgd/xmgl/modules/city/lifter/service/ILifterCurrentDataService.java index 5b4cd31..bb67f44 100644 --- a/src/main/java/com/zhgd/xmgl/modules/wisdom/service/ILifterCurrentDataService.java +++ b/src/main/java/com/zhgd/xmgl/modules/city/lifter/service/ILifterCurrentDataService.java @@ -1,8 +1,8 @@ -package com.zhgd.xmgl.modules.wisdom.service; +package com.zhgd.xmgl.modules.city.lifter.service; import com.baomidou.mybatisplus.extension.service.IService; import com.zhgd.xmgl.modules.wisdom.dto.LifterOperationDto; -import com.zhgd.xmgl.modules.wisdom.entity.LifterCurrentData; +import com.zhgd.xmgl.modules.city.lifter.entity.LifterCurrentData; /** * @Description: 升降机实时数据 diff --git a/src/main/java/com/zhgd/xmgl/modules/wisdom/service/ILifterService.java b/src/main/java/com/zhgd/xmgl/modules/city/lifter/service/ILifterService.java similarity index 84% rename from src/main/java/com/zhgd/xmgl/modules/wisdom/service/ILifterService.java rename to src/main/java/com/zhgd/xmgl/modules/city/lifter/service/ILifterService.java index 209c09e..df03738 100644 --- a/src/main/java/com/zhgd/xmgl/modules/wisdom/service/ILifterService.java +++ b/src/main/java/com/zhgd/xmgl/modules/city/lifter/service/ILifterService.java @@ -1,10 +1,10 @@ -package com.zhgd.xmgl.modules.wisdom.service; +package com.zhgd.xmgl.modules.city.lifter.service; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import com.zhgd.xmgl.modules.basicdata.dto.EngineeringPageDto; import com.zhgd.xmgl.modules.basicdata.dto.ProjectPageDto; -import com.zhgd.xmgl.modules.wisdom.entity.Lifter; +import com.zhgd.xmgl.modules.city.lifter.entity.Lifter; import java.util.Map; diff --git a/src/main/java/com/zhgd/xmgl/modules/wisdom/service/ILifterWorkCycleService.java b/src/main/java/com/zhgd/xmgl/modules/city/lifter/service/ILifterWorkCycleService.java similarity index 73% rename from src/main/java/com/zhgd/xmgl/modules/wisdom/service/ILifterWorkCycleService.java rename to src/main/java/com/zhgd/xmgl/modules/city/lifter/service/ILifterWorkCycleService.java index f58e737..f811b7e 100644 --- a/src/main/java/com/zhgd/xmgl/modules/wisdom/service/ILifterWorkCycleService.java +++ b/src/main/java/com/zhgd/xmgl/modules/city/lifter/service/ILifterWorkCycleService.java @@ -1,6 +1,6 @@ -package com.zhgd.xmgl.modules.wisdom.service; +package com.zhgd.xmgl.modules.city.lifter.service; -import com.zhgd.xmgl.modules.wisdom.entity.LifterWorkCycle; +import com.zhgd.xmgl.modules.city.lifter.entity.LifterWorkCycle; import com.baomidou.mybatisplus.extension.service.IService; /** diff --git a/src/main/java/com/zhgd/xmgl/modules/wisdom/service/impl/LifterAlarmServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/city/lifter/service/impl/LifterAlarmServiceImpl.java similarity index 87% rename from src/main/java/com/zhgd/xmgl/modules/wisdom/service/impl/LifterAlarmServiceImpl.java rename to src/main/java/com/zhgd/xmgl/modules/city/lifter/service/impl/LifterAlarmServiceImpl.java index 5516c36..209a90a 100644 --- a/src/main/java/com/zhgd/xmgl/modules/wisdom/service/impl/LifterAlarmServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/city/lifter/service/impl/LifterAlarmServiceImpl.java @@ -1,14 +1,14 @@ -package com.zhgd.xmgl.modules.wisdom.service.impl; +package com.zhgd.xmgl.modules.city.lifter.service.impl; import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.zhgd.jeecg.common.system.query.QueryGenerator; -import com.zhgd.xmgl.modules.wisdom.entity.Lifter; -import com.zhgd.xmgl.modules.wisdom.entity.LifterAlarm; -import com.zhgd.xmgl.modules.wisdom.mapper.LifterAlarmMapper; -import com.zhgd.xmgl.modules.wisdom.service.ILifterAlarmService; -import com.zhgd.xmgl.modules.wisdom.service.ILifterService; +import com.zhgd.xmgl.modules.city.lifter.entity.Lifter; +import com.zhgd.xmgl.modules.city.lifter.entity.LifterAlarm; +import com.zhgd.xmgl.modules.city.lifter.mapper.LifterAlarmMapper; +import com.zhgd.xmgl.modules.city.lifter.service.ILifterAlarmService; +import com.zhgd.xmgl.modules.city.lifter.service.ILifterService; import com.zhgd.xmgl.modules.wisdom.statistics.LifterAlarmStat; import org.apache.commons.collections.MapUtils; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/main/java/com/zhgd/xmgl/modules/wisdom/service/impl/LifterCurrentDataServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/city/lifter/service/impl/LifterCurrentDataServiceImpl.java similarity index 88% rename from src/main/java/com/zhgd/xmgl/modules/wisdom/service/impl/LifterCurrentDataServiceImpl.java rename to src/main/java/com/zhgd/xmgl/modules/city/lifter/service/impl/LifterCurrentDataServiceImpl.java index c1aa03d..aab0946 100644 --- a/src/main/java/com/zhgd/xmgl/modules/wisdom/service/impl/LifterCurrentDataServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/city/lifter/service/impl/LifterCurrentDataServiceImpl.java @@ -1,4 +1,4 @@ -package com.zhgd.xmgl.modules.wisdom.service.impl; +package com.zhgd.xmgl.modules.city.lifter.service.impl; import cn.hutool.core.bean.BeanUtil; import com.baomidou.mybatisplus.core.toolkit.Wrappers; @@ -6,11 +6,11 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.zhgd.redis.lock.RedisRepository; import com.zhgd.xmgl.modules.basicdata.constant.CacheConstants; import com.zhgd.xmgl.modules.wisdom.dto.LifterOperationDto; -import com.zhgd.xmgl.modules.wisdom.entity.Lifter; -import com.zhgd.xmgl.modules.wisdom.entity.LifterCurrentData; -import com.zhgd.xmgl.modules.wisdom.mapper.LifterCurrentDataMapper; -import com.zhgd.xmgl.modules.wisdom.service.ILifterCurrentDataService; -import com.zhgd.xmgl.modules.wisdom.service.ILifterService; +import com.zhgd.xmgl.modules.city.lifter.entity.Lifter; +import com.zhgd.xmgl.modules.city.lifter.entity.LifterCurrentData; +import com.zhgd.xmgl.modules.city.lifter.mapper.LifterCurrentDataMapper; +import com.zhgd.xmgl.modules.city.lifter.service.ILifterCurrentDataService; +import com.zhgd.xmgl.modules.city.lifter.service.ILifterService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/zhgd/xmgl/modules/wisdom/service/impl/LifterServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/city/lifter/service/impl/LifterServiceImpl.java similarity index 83% rename from src/main/java/com/zhgd/xmgl/modules/wisdom/service/impl/LifterServiceImpl.java rename to src/main/java/com/zhgd/xmgl/modules/city/lifter/service/impl/LifterServiceImpl.java index ad1e7e5..943a9d1 100644 --- a/src/main/java/com/zhgd/xmgl/modules/wisdom/service/impl/LifterServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/city/lifter/service/impl/LifterServiceImpl.java @@ -1,13 +1,13 @@ -package com.zhgd.xmgl.modules.wisdom.service.impl; +package com.zhgd.xmgl.modules.city.lifter.service.impl; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.zhgd.xmgl.modules.basicdata.dto.EngineeringPageDto; import com.zhgd.xmgl.modules.basicdata.dto.ProjectPageDto; import com.zhgd.xmgl.modules.city.engineering.service.IEngineeringService; import com.zhgd.xmgl.modules.city.project.service.IProjectService; -import com.zhgd.xmgl.modules.wisdom.entity.Lifter; -import com.zhgd.xmgl.modules.wisdom.mapper.LifterMapper; -import com.zhgd.xmgl.modules.wisdom.service.ILifterService; +import com.zhgd.xmgl.modules.city.lifter.entity.Lifter; +import com.zhgd.xmgl.modules.city.lifter.mapper.LifterMapper; +import com.zhgd.xmgl.modules.city.lifter.service.ILifterService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/zhgd/xmgl/modules/wisdom/service/impl/LifterWorkCycleServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/city/lifter/service/impl/LifterWorkCycleServiceImpl.java similarity index 62% rename from src/main/java/com/zhgd/xmgl/modules/wisdom/service/impl/LifterWorkCycleServiceImpl.java rename to src/main/java/com/zhgd/xmgl/modules/city/lifter/service/impl/LifterWorkCycleServiceImpl.java index e24cceb..4eee27d 100644 --- a/src/main/java/com/zhgd/xmgl/modules/wisdom/service/impl/LifterWorkCycleServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/city/lifter/service/impl/LifterWorkCycleServiceImpl.java @@ -1,13 +1,10 @@ -package com.zhgd.xmgl.modules.wisdom.service.impl; +package com.zhgd.xmgl.modules.city.lifter.service.impl; -import com.zhgd.xmgl.modules.wisdom.entity.Lifter; -import com.zhgd.xmgl.modules.wisdom.entity.LifterWorkCycle; -import com.zhgd.xmgl.modules.wisdom.entity.TowerCrane; -import com.zhgd.xmgl.modules.wisdom.entity.TowerCraneWorkCycle; -import com.zhgd.xmgl.modules.wisdom.mapper.LifterWorkCycleMapper; -import com.zhgd.xmgl.modules.wisdom.service.ILifterService; -import com.zhgd.xmgl.modules.wisdom.service.ILifterWorkCycleService; -import com.zhgd.xmgl.modules.wisdom.service.ITowerCraneService; +import com.zhgd.xmgl.modules.city.lifter.entity.Lifter; +import com.zhgd.xmgl.modules.city.lifter.entity.LifterWorkCycle; +import com.zhgd.xmgl.modules.city.lifter.mapper.LifterWorkCycleMapper; +import com.zhgd.xmgl.modules.city.lifter.service.ILifterService; +import com.zhgd.xmgl.modules.city.lifter.service.ILifterWorkCycleService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/zhgd/xmgl/modules/city/monitor/controller/MonitorDevController.java b/src/main/java/com/zhgd/xmgl/modules/city/monitor/controller/MonitorDevController.java index b2a7a16..0f42f39 100644 --- a/src/main/java/com/zhgd/xmgl/modules/city/monitor/controller/MonitorDevController.java +++ b/src/main/java/com/zhgd/xmgl/modules/city/monitor/controller/MonitorDevController.java @@ -16,6 +16,7 @@ import com.zhgd.xmgl.modules.basicdata.dto.MonitorTreeDto; import com.zhgd.xmgl.modules.city.engineering.entity.Engineering; import com.zhgd.xmgl.modules.city.monitor.entity.MonitorDev; import com.zhgd.xmgl.modules.city.monitor.entity.vo.CityAndDistrictMonitorVo; +import com.zhgd.xmgl.modules.city.monitor.entity.vo.EngineeringAndStatusVo; import com.zhgd.xmgl.modules.city.monitor.service.IMonitorDevService; import com.zhgd.xmgl.security.SecurityUser; import com.zhgd.xmgl.security.SecurityUtil; @@ -174,6 +175,7 @@ public class MonitorDevController { /** * 通过id查询 + * * @return */ @OperLog(operModul = "项目视频管理", operType = "查询", operDesc = "通过id查询视频管理表信息") @@ -194,6 +196,7 @@ public class MonitorDevController { /** * 监控点树形列表 + * * @return */ @OperLog(operModul = "项目视频管理", operType = "查询", operDesc = "监控点树形列表") @@ -215,5 +218,20 @@ public class MonitorDevController { return Result.success(countCityAndDistrictMonitors); } + @OperLog(operModul = "工程信息和视频在线状态列表", operType = "分页查询", operDesc = "分页查询工程信息和视频在线状态列表") + @ApiOperation(value = "分页查询工程信息和视频在线状态列表", notes = "分页查询工程信息和视频在线状态列表", httpMethod = "POST") + @ApiImplicitParams({ + @ApiImplicitParam(name = "pageNo", value = "页数", paramType = "body", required = true, defaultValue = "1", dataType = "Integer"), + @ApiImplicitParam(name = "pageSize", value = "每页条数", paramType = "body", required = true, defaultValue = "10", dataType = "Integer") + }) + @PostMapping(value = "/queryEngineeringAndStatusPage") + public Result> queryEngineeringAndStatusPage(@ApiIgnore @RequestBody Map map) { + QueryWrapper wrapper = QueryGenerator.initPageQueryWrapper(Engineering.class, map); + Page page = PageUtil.getPage(map); + wrapper.lambda().orderByDesc(Engineering::getCreateTime); + IPage pageList = monitorDevService.queryEngineeringAndStatusPage(page, wrapper); + return Result.success(pageList); + } + } diff --git a/src/main/java/com/zhgd/xmgl/modules/city/monitor/entity/bo/OnlineGroupByProjectBo.java b/src/main/java/com/zhgd/xmgl/modules/city/monitor/entity/bo/OnlineGroupByProjectBo.java index 00c3754..279f016 100644 --- a/src/main/java/com/zhgd/xmgl/modules/city/monitor/entity/bo/OnlineGroupByProjectBo.java +++ b/src/main/java/com/zhgd/xmgl/modules/city/monitor/entity/bo/OnlineGroupByProjectBo.java @@ -6,6 +6,7 @@ import lombok.Data; @Data public class OnlineGroupByProjectBo { private String projectSn; + private String engineeringSn; private Integer count; private Integer onlineCount; private Integer offlineCount; diff --git a/src/main/java/com/zhgd/xmgl/modules/city/monitor/entity/vo/EngineeringAndStatusVo.java b/src/main/java/com/zhgd/xmgl/modules/city/monitor/entity/vo/EngineeringAndStatusVo.java new file mode 100644 index 0000000..ba37eb8 --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/city/monitor/entity/vo/EngineeringAndStatusVo.java @@ -0,0 +1,14 @@ +package com.zhgd.xmgl.modules.city.monitor.entity.vo; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.zhgd.xmgl.modules.city.engineering.entity.Engineering; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +public class EngineeringAndStatusVo extends Engineering { + @ApiModelProperty(value = "视频监控在线数量") + private Integer monitorDevOnlineCount; + @ApiModelProperty(value = "视频监控离线数量") + private Integer monitorDevOfflineCount; +} diff --git a/src/main/java/com/zhgd/xmgl/modules/city/monitor/mapper/xml/MonitorDevMapper.xml b/src/main/java/com/zhgd/xmgl/modules/city/monitor/mapper/xml/MonitorDevMapper.xml index a7ff6d7..c2cd761 100644 --- a/src/main/java/com/zhgd/xmgl/modules/city/monitor/mapper/xml/MonitorDevMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/city/monitor/mapper/xml/MonitorDevMapper.xml @@ -49,11 +49,11 @@ diff --git a/src/main/java/com/zhgd/xmgl/modules/city/monitor/service/IMonitorDevService.java b/src/main/java/com/zhgd/xmgl/modules/city/monitor/service/IMonitorDevService.java index 499577e..82fcf33 100644 --- a/src/main/java/com/zhgd/xmgl/modules/city/monitor/service/IMonitorDevService.java +++ b/src/main/java/com/zhgd/xmgl/modules/city/monitor/service/IMonitorDevService.java @@ -1,12 +1,15 @@ package com.zhgd.xmgl.modules.city.monitor.service; import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import com.zhgd.xmgl.modules.basicdata.dto.AppIndexDeviceDto; import com.zhgd.xmgl.modules.basicdata.dto.MonitorTreeDto; import com.zhgd.xmgl.modules.city.engineering.entity.Engineering; import com.zhgd.xmgl.modules.city.monitor.entity.MonitorDev; +import com.zhgd.xmgl.modules.city.monitor.entity.vo.EngineeringAndStatusVo; import com.zhgd.xmgl.modules.city.project.entity.Project; import com.zhgd.xmgl.modules.city.monitor.entity.vo.CityAndDistrictMonitorVo; @@ -39,4 +42,6 @@ public interface IMonitorDevService extends IService { boolean updateInfo(MonitorDev monitorDev); List countCityAndDistrictMonitor(); + + IPage queryEngineeringAndStatusPage(Page page, QueryWrapper wrapper); } diff --git a/src/main/java/com/zhgd/xmgl/modules/city/monitor/service/impl/MonitorDevServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/city/monitor/service/impl/MonitorDevServiceImpl.java index 13a0c02..66e2847 100644 --- a/src/main/java/com/zhgd/xmgl/modules/city/monitor/service/impl/MonitorDevServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/city/monitor/service/impl/MonitorDevServiceImpl.java @@ -1,35 +1,46 @@ package com.zhgd.xmgl.modules.city.monitor.service.impl; +import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.StringUtils; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.zhgd.xmgl.handler.exception.CustomException; -import com.zhgd.xmgl.modules.basicdata.api.camera.MonitorApi; import com.zhgd.xmgl.modules.basicdata.dto.AppIndexDeviceDto; import com.zhgd.xmgl.modules.basicdata.dto.MonitorTreeDto; +import com.zhgd.xmgl.modules.basicdata.entity.SystemDictData; +import com.zhgd.xmgl.modules.basicdata.service.ISystemDictDataService; +import com.zhgd.xmgl.modules.city.dust.mapper.EnvironmentDevMapper; import com.zhgd.xmgl.modules.city.engineering.entity.Engineering; import com.zhgd.xmgl.modules.city.engineering.mapper.EngineeringMapper; +import com.zhgd.xmgl.modules.city.engineering.service.IEngineeringService; import com.zhgd.xmgl.modules.city.government.entity.Government; import com.zhgd.xmgl.modules.city.government.mapper.GovernmentMapper; import com.zhgd.xmgl.modules.city.monitor.entity.MonitorDev; +import com.zhgd.xmgl.modules.city.monitor.entity.bo.OnlineGroupByProjectBo; import com.zhgd.xmgl.modules.city.monitor.entity.vo.CityAndDistrictMonitorVo; +import com.zhgd.xmgl.modules.city.monitor.entity.vo.EngineeringAndStatusVo; import com.zhgd.xmgl.modules.city.monitor.mapper.MonitorDevMapper; import com.zhgd.xmgl.modules.city.monitor.service.IMonitorDevService; import com.zhgd.xmgl.modules.city.project.entity.Project; import com.zhgd.xmgl.modules.wisdom.mapper.AiMonitorDevMapper; -import com.zhgd.xmgl.modules.city.dust.mapper.EnvironmentDevMapper; import com.zhgd.xmgl.security.SecurityUser; import com.zhgd.xmgl.security.SecurityUtil; +import com.zhgd.xmgl.util.CommonUtil; +import com.zhgd.xmgl.util.ParamEnum; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Bean; import org.springframework.stereotype.Service; import java.util.ArrayList; import java.util.Date; import java.util.List; +import java.util.Map; import java.util.stream.Collectors; /** @@ -51,7 +62,9 @@ public class MonitorDevServiceImpl extends ServiceImpl queryEngineeringAndStatusPage(Page page, QueryWrapper wrapper) { + Page pageList = engineeringService.page(page, wrapper); + Page rtPage = BeanUtil.toBean(pageList, Page.class); + rtPage.setRecords(BeanUtil.copyToList(pageList.getRecords(), EngineeringAndStatusVo.class)); + List onlineGroupByProjectBos = baseMapper.countOnlineGroupByProject(); + Map engineeringMap = onlineGroupByProjectBos.stream().collect(Collectors.toMap(OnlineGroupByProjectBo::getEngineeringSn, onlineGroupByProjectBo -> onlineGroupByProjectBo)); + rtPage.getRecords().stream().forEach(s -> { + s.setMonitorDevOnlineCount(engineeringMap.get(s.getEngineeringSn()) != null ? engineeringMap.get(s.getEngineeringSn()).getOnlineCount() : 0); + s.setMonitorDevOfflineCount(engineeringMap.get(s.getEngineeringSn()) != null ? engineeringMap.get(s.getEngineeringSn()).getOfflineCount() : 0); + }); + return rtPage; + } } diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/project/TowerCraneAlarmController.java b/src/main/java/com/zhgd/xmgl/modules/city/towercrane/controller/TowerCraneAlarmController.java similarity index 97% rename from src/main/java/com/zhgd/xmgl/modules/basicdata/controller/project/TowerCraneAlarmController.java rename to src/main/java/com/zhgd/xmgl/modules/city/towercrane/controller/TowerCraneAlarmController.java index 579e79d..4c20904 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/project/TowerCraneAlarmController.java +++ b/src/main/java/com/zhgd/xmgl/modules/city/towercrane/controller/TowerCraneAlarmController.java @@ -1,4 +1,4 @@ -package com.zhgd.xmgl.modules.basicdata.controller.project; +package com.zhgd.xmgl.modules.city.towercrane.controller; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; @@ -11,8 +11,8 @@ import com.zhgd.jeecg.common.api.vo.Result; import com.zhgd.jeecg.common.system.query.QueryGenerator; import com.zhgd.jeecg.common.util.PageUtil; import com.zhgd.xmgl.modules.basicdata.constant.ParamConstants; -import com.zhgd.xmgl.modules.wisdom.entity.TowerCraneAlarm; -import com.zhgd.xmgl.modules.wisdom.service.ITowerCraneAlarmService; +import com.zhgd.xmgl.modules.city.towercrane.entity.TowerCraneAlarm; +import com.zhgd.xmgl.modules.city.towercrane.service.ITowerCraneAlarmService; import com.zhgd.xmgl.modules.wisdom.statistics.TowerCraneAlarmStat; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/project/TowerCraneController.java b/src/main/java/com/zhgd/xmgl/modules/city/towercrane/controller/TowerCraneController.java similarity index 97% rename from src/main/java/com/zhgd/xmgl/modules/basicdata/controller/project/TowerCraneController.java rename to src/main/java/com/zhgd/xmgl/modules/city/towercrane/controller/TowerCraneController.java index a048b6b..46ab630 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/project/TowerCraneController.java +++ b/src/main/java/com/zhgd/xmgl/modules/city/towercrane/controller/TowerCraneController.java @@ -1,4 +1,4 @@ -package com.zhgd.xmgl.modules.basicdata.controller.project; +package com.zhgd.xmgl.modules.city.towercrane.controller; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -10,8 +10,8 @@ import com.zhgd.jeecg.common.api.vo.Result; import com.zhgd.jeecg.common.system.query.QueryGenerator; import com.zhgd.jeecg.common.util.PageUtil; import com.zhgd.xmgl.modules.basicdata.constant.ParamConstants; -import com.zhgd.xmgl.modules.wisdom.entity.TowerCrane; -import com.zhgd.xmgl.modules.wisdom.service.ITowerCraneService; +import com.zhgd.xmgl.modules.city.towercrane.entity.TowerCrane; +import com.zhgd.xmgl.modules.city.towercrane.service.ITowerCraneService; import com.zhgd.xmgl.security.SecurityUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/project/TowerCraneCurrentDataController.java b/src/main/java/com/zhgd/xmgl/modules/city/towercrane/controller/TowerCraneCurrentDataController.java similarity index 95% rename from src/main/java/com/zhgd/xmgl/modules/basicdata/controller/project/TowerCraneCurrentDataController.java rename to src/main/java/com/zhgd/xmgl/modules/city/towercrane/controller/TowerCraneCurrentDataController.java index 573e992..eee2d82 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/project/TowerCraneCurrentDataController.java +++ b/src/main/java/com/zhgd/xmgl/modules/city/towercrane/controller/TowerCraneCurrentDataController.java @@ -1,4 +1,4 @@ -package com.zhgd.xmgl.modules.basicdata.controller.project; +package com.zhgd.xmgl.modules.city.towercrane.controller; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.util.StrUtil; @@ -14,10 +14,10 @@ import com.zhgd.jeecg.common.util.PageUtil; import com.zhgd.xmgl.modules.basicdata.constant.ParamConstants; import com.zhgd.xmgl.modules.wisdom.dto.TowerCraneCurrentDataDto; import com.zhgd.xmgl.modules.wisdom.dto.TowerCraneOperationDto; -import com.zhgd.xmgl.modules.wisdom.entity.TowerCrane; -import com.zhgd.xmgl.modules.wisdom.entity.TowerCraneCurrentData; -import com.zhgd.xmgl.modules.wisdom.service.ITowerCraneCurrentDataService; -import com.zhgd.xmgl.modules.wisdom.service.ITowerCraneService; +import com.zhgd.xmgl.modules.city.towercrane.entity.TowerCrane; +import com.zhgd.xmgl.modules.city.towercrane.entity.TowerCraneCurrentData; +import com.zhgd.xmgl.modules.city.towercrane.service.ITowerCraneCurrentDataService; +import com.zhgd.xmgl.modules.city.towercrane.service.ITowerCraneService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/project/TowerCraneWorkCycleController.java b/src/main/java/com/zhgd/xmgl/modules/city/towercrane/controller/TowerCraneWorkCycleController.java similarity index 96% rename from src/main/java/com/zhgd/xmgl/modules/basicdata/controller/project/TowerCraneWorkCycleController.java rename to src/main/java/com/zhgd/xmgl/modules/city/towercrane/controller/TowerCraneWorkCycleController.java index 6a35a5a..5e53117 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/project/TowerCraneWorkCycleController.java +++ b/src/main/java/com/zhgd/xmgl/modules/city/towercrane/controller/TowerCraneWorkCycleController.java @@ -1,4 +1,4 @@ -package com.zhgd.xmgl.modules.basicdata.controller.project; +package com.zhgd.xmgl.modules.city.towercrane.controller; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -10,8 +10,8 @@ import com.zhgd.jeecg.common.api.vo.Result; import com.zhgd.jeecg.common.system.query.QueryGenerator; import com.zhgd.jeecg.common.util.PageUtil; import com.zhgd.xmgl.modules.basicdata.constant.ParamConstants; -import com.zhgd.xmgl.modules.wisdom.entity.TowerCraneWorkCycle; -import com.zhgd.xmgl.modules.wisdom.service.ITowerCraneWorkCycleService; +import com.zhgd.xmgl.modules.city.towercrane.entity.TowerCraneWorkCycle; +import com.zhgd.xmgl.modules.city.towercrane.service.ITowerCraneWorkCycleService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; diff --git a/src/main/java/com/zhgd/xmgl/modules/wisdom/entity/TowerCrane.java b/src/main/java/com/zhgd/xmgl/modules/city/towercrane/entity/TowerCrane.java similarity index 99% rename from src/main/java/com/zhgd/xmgl/modules/wisdom/entity/TowerCrane.java rename to src/main/java/com/zhgd/xmgl/modules/city/towercrane/entity/TowerCrane.java index e802bc5..c7489b9 100644 --- a/src/main/java/com/zhgd/xmgl/modules/wisdom/entity/TowerCrane.java +++ b/src/main/java/com/zhgd/xmgl/modules/city/towercrane/entity/TowerCrane.java @@ -1,4 +1,4 @@ -package com.zhgd.xmgl.modules.wisdom.entity; +package com.zhgd.xmgl.modules.city.towercrane.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/src/main/java/com/zhgd/xmgl/modules/wisdom/entity/TowerCraneAlarm.java b/src/main/java/com/zhgd/xmgl/modules/city/towercrane/entity/TowerCraneAlarm.java similarity index 99% rename from src/main/java/com/zhgd/xmgl/modules/wisdom/entity/TowerCraneAlarm.java rename to src/main/java/com/zhgd/xmgl/modules/city/towercrane/entity/TowerCraneAlarm.java index df6e00b..40576c0 100644 --- a/src/main/java/com/zhgd/xmgl/modules/wisdom/entity/TowerCraneAlarm.java +++ b/src/main/java/com/zhgd/xmgl/modules/city/towercrane/entity/TowerCraneAlarm.java @@ -1,4 +1,4 @@ -package com.zhgd.xmgl.modules.wisdom.entity; +package com.zhgd.xmgl.modules.city.towercrane.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/src/main/java/com/zhgd/xmgl/modules/wisdom/entity/TowerCraneCurrentData.java b/src/main/java/com/zhgd/xmgl/modules/city/towercrane/entity/TowerCraneCurrentData.java similarity index 99% rename from src/main/java/com/zhgd/xmgl/modules/wisdom/entity/TowerCraneCurrentData.java rename to src/main/java/com/zhgd/xmgl/modules/city/towercrane/entity/TowerCraneCurrentData.java index 6d01acc..0442bc5 100644 --- a/src/main/java/com/zhgd/xmgl/modules/wisdom/entity/TowerCraneCurrentData.java +++ b/src/main/java/com/zhgd/xmgl/modules/city/towercrane/entity/TowerCraneCurrentData.java @@ -1,4 +1,4 @@ -package com.zhgd.xmgl.modules.wisdom.entity; +package com.zhgd.xmgl.modules.city.towercrane.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/src/main/java/com/zhgd/xmgl/modules/wisdom/entity/TowerCraneWorkCycle.java b/src/main/java/com/zhgd/xmgl/modules/city/towercrane/entity/TowerCraneWorkCycle.java similarity index 99% rename from src/main/java/com/zhgd/xmgl/modules/wisdom/entity/TowerCraneWorkCycle.java rename to src/main/java/com/zhgd/xmgl/modules/city/towercrane/entity/TowerCraneWorkCycle.java index 1a7e5f5..7f3a6ae 100644 --- a/src/main/java/com/zhgd/xmgl/modules/wisdom/entity/TowerCraneWorkCycle.java +++ b/src/main/java/com/zhgd/xmgl/modules/city/towercrane/entity/TowerCraneWorkCycle.java @@ -1,4 +1,4 @@ -package com.zhgd.xmgl.modules.wisdom.entity; +package com.zhgd.xmgl.modules.city.towercrane.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/src/main/java/com/zhgd/xmgl/modules/wisdom/mapper/TowerCraneAlarmMapper.java b/src/main/java/com/zhgd/xmgl/modules/city/towercrane/mapper/TowerCraneAlarmMapper.java similarity index 73% rename from src/main/java/com/zhgd/xmgl/modules/wisdom/mapper/TowerCraneAlarmMapper.java rename to src/main/java/com/zhgd/xmgl/modules/city/towercrane/mapper/TowerCraneAlarmMapper.java index 75b30f6..1b22f90 100644 --- a/src/main/java/com/zhgd/xmgl/modules/wisdom/mapper/TowerCraneAlarmMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/city/towercrane/mapper/TowerCraneAlarmMapper.java @@ -1,8 +1,8 @@ -package com.zhgd.xmgl.modules.wisdom.mapper; +package com.zhgd.xmgl.modules.city.towercrane.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.zhgd.annotation.DataScope; -import com.zhgd.xmgl.modules.wisdom.entity.TowerCraneAlarm; +import com.zhgd.xmgl.modules.city.towercrane.entity.TowerCraneAlarm; import org.apache.ibatis.annotations.Mapper; /** diff --git a/src/main/java/com/zhgd/xmgl/modules/wisdom/mapper/TowerCraneCurrentDataMapper.java b/src/main/java/com/zhgd/xmgl/modules/city/towercrane/mapper/TowerCraneCurrentDataMapper.java similarity index 73% rename from src/main/java/com/zhgd/xmgl/modules/wisdom/mapper/TowerCraneCurrentDataMapper.java rename to src/main/java/com/zhgd/xmgl/modules/city/towercrane/mapper/TowerCraneCurrentDataMapper.java index ee28b34..bd62678 100644 --- a/src/main/java/com/zhgd/xmgl/modules/wisdom/mapper/TowerCraneCurrentDataMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/city/towercrane/mapper/TowerCraneCurrentDataMapper.java @@ -1,8 +1,8 @@ -package com.zhgd.xmgl.modules.wisdom.mapper; +package com.zhgd.xmgl.modules.city.towercrane.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.zhgd.annotation.DataScope; -import com.zhgd.xmgl.modules.wisdom.entity.TowerCraneCurrentData; +import com.zhgd.xmgl.modules.city.towercrane.entity.TowerCraneCurrentData; import org.apache.ibatis.annotations.Mapper; /** diff --git a/src/main/java/com/zhgd/xmgl/modules/wisdom/mapper/TowerCraneMapper.java b/src/main/java/com/zhgd/xmgl/modules/city/towercrane/mapper/TowerCraneMapper.java similarity index 74% rename from src/main/java/com/zhgd/xmgl/modules/wisdom/mapper/TowerCraneMapper.java rename to src/main/java/com/zhgd/xmgl/modules/city/towercrane/mapper/TowerCraneMapper.java index 5e022e7..a3b998e 100644 --- a/src/main/java/com/zhgd/xmgl/modules/wisdom/mapper/TowerCraneMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/city/towercrane/mapper/TowerCraneMapper.java @@ -1,8 +1,8 @@ -package com.zhgd.xmgl.modules.wisdom.mapper; +package com.zhgd.xmgl.modules.city.towercrane.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.zhgd.annotation.DataScope; -import com.zhgd.xmgl.modules.wisdom.entity.TowerCrane; +import com.zhgd.xmgl.modules.city.towercrane.entity.TowerCrane; import org.apache.ibatis.annotations.Mapper; /** diff --git a/src/main/java/com/zhgd/xmgl/modules/wisdom/mapper/TowerCraneWorkCycleMapper.java b/src/main/java/com/zhgd/xmgl/modules/city/towercrane/mapper/TowerCraneWorkCycleMapper.java similarity index 74% rename from src/main/java/com/zhgd/xmgl/modules/wisdom/mapper/TowerCraneWorkCycleMapper.java rename to src/main/java/com/zhgd/xmgl/modules/city/towercrane/mapper/TowerCraneWorkCycleMapper.java index b8edb37..f38bd54 100644 --- a/src/main/java/com/zhgd/xmgl/modules/wisdom/mapper/TowerCraneWorkCycleMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/city/towercrane/mapper/TowerCraneWorkCycleMapper.java @@ -1,8 +1,8 @@ -package com.zhgd.xmgl.modules.wisdom.mapper; +package com.zhgd.xmgl.modules.city.towercrane.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.zhgd.annotation.DataScope; -import com.zhgd.xmgl.modules.wisdom.entity.TowerCraneWorkCycle; +import com.zhgd.xmgl.modules.city.towercrane.entity.TowerCraneWorkCycle; import org.apache.ibatis.annotations.Mapper; /** diff --git a/src/main/java/com/zhgd/xmgl/modules/wisdom/mapper/xml/TowerCraneAlarmMapper.xml b/src/main/java/com/zhgd/xmgl/modules/city/towercrane/mapper/xml/TowerCraneAlarmMapper.xml similarity index 60% rename from src/main/java/com/zhgd/xmgl/modules/wisdom/mapper/xml/TowerCraneAlarmMapper.xml rename to src/main/java/com/zhgd/xmgl/modules/city/towercrane/mapper/xml/TowerCraneAlarmMapper.xml index 9e8ad9f..d7ae3f3 100644 --- a/src/main/java/com/zhgd/xmgl/modules/wisdom/mapper/xml/TowerCraneAlarmMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/city/towercrane/mapper/xml/TowerCraneAlarmMapper.xml @@ -1,5 +1,5 @@ - + - \ No newline at end of file + diff --git a/src/main/java/com/zhgd/xmgl/modules/wisdom/mapper/xml/TowerCraneCurrentDataMapper.xml b/src/main/java/com/zhgd/xmgl/modules/city/towercrane/mapper/xml/TowerCraneCurrentDataMapper.xml similarity index 58% rename from src/main/java/com/zhgd/xmgl/modules/wisdom/mapper/xml/TowerCraneCurrentDataMapper.xml rename to src/main/java/com/zhgd/xmgl/modules/city/towercrane/mapper/xml/TowerCraneCurrentDataMapper.xml index 93a5904..8602c59 100644 --- a/src/main/java/com/zhgd/xmgl/modules/wisdom/mapper/xml/TowerCraneCurrentDataMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/city/towercrane/mapper/xml/TowerCraneCurrentDataMapper.xml @@ -1,5 +1,5 @@ - + - \ No newline at end of file + diff --git a/src/main/java/com/zhgd/xmgl/modules/wisdom/mapper/xml/TowerCraneMapper.xml b/src/main/java/com/zhgd/xmgl/modules/city/towercrane/mapper/xml/TowerCraneMapper.xml similarity index 61% rename from src/main/java/com/zhgd/xmgl/modules/wisdom/mapper/xml/TowerCraneMapper.xml rename to src/main/java/com/zhgd/xmgl/modules/city/towercrane/mapper/xml/TowerCraneMapper.xml index fb88123..f04cf07 100644 --- a/src/main/java/com/zhgd/xmgl/modules/wisdom/mapper/xml/TowerCraneMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/city/towercrane/mapper/xml/TowerCraneMapper.xml @@ -1,5 +1,5 @@ - + - \ No newline at end of file + diff --git a/src/main/java/com/zhgd/xmgl/modules/wisdom/mapper/xml/TowerCraneWorkCycleMapper.xml b/src/main/java/com/zhgd/xmgl/modules/city/towercrane/mapper/xml/TowerCraneWorkCycleMapper.xml similarity index 59% rename from src/main/java/com/zhgd/xmgl/modules/wisdom/mapper/xml/TowerCraneWorkCycleMapper.xml rename to src/main/java/com/zhgd/xmgl/modules/city/towercrane/mapper/xml/TowerCraneWorkCycleMapper.xml index 5224879..b27dbb2 100644 --- a/src/main/java/com/zhgd/xmgl/modules/wisdom/mapper/xml/TowerCraneWorkCycleMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/city/towercrane/mapper/xml/TowerCraneWorkCycleMapper.xml @@ -1,5 +1,5 @@ - + - \ No newline at end of file + diff --git a/src/main/java/com/zhgd/xmgl/modules/wisdom/service/ITowerCraneAlarmService.java b/src/main/java/com/zhgd/xmgl/modules/city/towercrane/service/ITowerCraneAlarmService.java similarity index 78% rename from src/main/java/com/zhgd/xmgl/modules/wisdom/service/ITowerCraneAlarmService.java rename to src/main/java/com/zhgd/xmgl/modules/city/towercrane/service/ITowerCraneAlarmService.java index bf8b828..a6f4110 100644 --- a/src/main/java/com/zhgd/xmgl/modules/wisdom/service/ITowerCraneAlarmService.java +++ b/src/main/java/com/zhgd/xmgl/modules/city/towercrane/service/ITowerCraneAlarmService.java @@ -1,7 +1,7 @@ -package com.zhgd.xmgl.modules.wisdom.service; +package com.zhgd.xmgl.modules.city.towercrane.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.zhgd.xmgl.modules.wisdom.entity.TowerCraneAlarm; +import com.zhgd.xmgl.modules.city.towercrane.entity.TowerCraneAlarm; import com.zhgd.xmgl.modules.wisdom.statistics.TowerCraneAlarmStat; import java.util.Map; diff --git a/src/main/java/com/zhgd/xmgl/modules/wisdom/service/ITowerCraneCurrentDataService.java b/src/main/java/com/zhgd/xmgl/modules/city/towercrane/service/ITowerCraneCurrentDataService.java similarity index 77% rename from src/main/java/com/zhgd/xmgl/modules/wisdom/service/ITowerCraneCurrentDataService.java rename to src/main/java/com/zhgd/xmgl/modules/city/towercrane/service/ITowerCraneCurrentDataService.java index cc7f158..97b0f76 100644 --- a/src/main/java/com/zhgd/xmgl/modules/wisdom/service/ITowerCraneCurrentDataService.java +++ b/src/main/java/com/zhgd/xmgl/modules/city/towercrane/service/ITowerCraneCurrentDataService.java @@ -1,8 +1,8 @@ -package com.zhgd.xmgl.modules.wisdom.service; +package com.zhgd.xmgl.modules.city.towercrane.service; import com.baomidou.mybatisplus.extension.service.IService; import com.zhgd.xmgl.modules.wisdom.dto.TowerCraneOperationDto; -import com.zhgd.xmgl.modules.wisdom.entity.TowerCraneCurrentData; +import com.zhgd.xmgl.modules.city.towercrane.entity.TowerCraneCurrentData; /** * @Description: 塔吊实时数据 diff --git a/src/main/java/com/zhgd/xmgl/modules/wisdom/service/ITowerCraneService.java b/src/main/java/com/zhgd/xmgl/modules/city/towercrane/service/ITowerCraneService.java similarity index 83% rename from src/main/java/com/zhgd/xmgl/modules/wisdom/service/ITowerCraneService.java rename to src/main/java/com/zhgd/xmgl/modules/city/towercrane/service/ITowerCraneService.java index 0768e93..510790f 100644 --- a/src/main/java/com/zhgd/xmgl/modules/wisdom/service/ITowerCraneService.java +++ b/src/main/java/com/zhgd/xmgl/modules/city/towercrane/service/ITowerCraneService.java @@ -1,9 +1,9 @@ -package com.zhgd.xmgl.modules.wisdom.service; +package com.zhgd.xmgl.modules.city.towercrane.service; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.zhgd.xmgl.modules.basicdata.dto.EngineeringPageDto; import com.zhgd.xmgl.modules.basicdata.dto.ProjectPageDto; -import com.zhgd.xmgl.modules.wisdom.entity.TowerCrane; +import com.zhgd.xmgl.modules.city.towercrane.entity.TowerCrane; import com.baomidou.mybatisplus.extension.service.IService; import java.util.Map; diff --git a/src/main/java/com/zhgd/xmgl/modules/wisdom/service/ITowerCraneWorkCycleService.java b/src/main/java/com/zhgd/xmgl/modules/city/towercrane/service/ITowerCraneWorkCycleService.java similarity index 71% rename from src/main/java/com/zhgd/xmgl/modules/wisdom/service/ITowerCraneWorkCycleService.java rename to src/main/java/com/zhgd/xmgl/modules/city/towercrane/service/ITowerCraneWorkCycleService.java index 1eee91c..bcc0d5d 100644 --- a/src/main/java/com/zhgd/xmgl/modules/wisdom/service/ITowerCraneWorkCycleService.java +++ b/src/main/java/com/zhgd/xmgl/modules/city/towercrane/service/ITowerCraneWorkCycleService.java @@ -1,7 +1,7 @@ -package com.zhgd.xmgl.modules.wisdom.service; +package com.zhgd.xmgl.modules.city.towercrane.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.zhgd.xmgl.modules.wisdom.entity.TowerCraneWorkCycle; +import com.zhgd.xmgl.modules.city.towercrane.entity.TowerCraneWorkCycle; /** * @Description: 塔吊工作循环数据 diff --git a/src/main/java/com/zhgd/xmgl/modules/wisdom/service/impl/TowerCraneAlarmServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/city/towercrane/service/impl/TowerCraneAlarmServiceImpl.java similarity index 87% rename from src/main/java/com/zhgd/xmgl/modules/wisdom/service/impl/TowerCraneAlarmServiceImpl.java rename to src/main/java/com/zhgd/xmgl/modules/city/towercrane/service/impl/TowerCraneAlarmServiceImpl.java index f4e201f..29cdf75 100644 --- a/src/main/java/com/zhgd/xmgl/modules/wisdom/service/impl/TowerCraneAlarmServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/city/towercrane/service/impl/TowerCraneAlarmServiceImpl.java @@ -1,14 +1,14 @@ -package com.zhgd.xmgl.modules.wisdom.service.impl; +package com.zhgd.xmgl.modules.city.towercrane.service.impl; import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.zhgd.jeecg.common.system.query.QueryGenerator; -import com.zhgd.xmgl.modules.wisdom.entity.TowerCrane; -import com.zhgd.xmgl.modules.wisdom.entity.TowerCraneAlarm; -import com.zhgd.xmgl.modules.wisdom.mapper.TowerCraneAlarmMapper; -import com.zhgd.xmgl.modules.wisdom.service.ITowerCraneAlarmService; -import com.zhgd.xmgl.modules.wisdom.service.ITowerCraneService; +import com.zhgd.xmgl.modules.city.towercrane.entity.TowerCrane; +import com.zhgd.xmgl.modules.city.towercrane.entity.TowerCraneAlarm; +import com.zhgd.xmgl.modules.city.towercrane.mapper.TowerCraneAlarmMapper; +import com.zhgd.xmgl.modules.city.towercrane.service.ITowerCraneAlarmService; +import com.zhgd.xmgl.modules.city.towercrane.service.ITowerCraneService; import com.zhgd.xmgl.modules.wisdom.statistics.TowerCraneAlarmStat; import org.apache.commons.collections.MapUtils; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/main/java/com/zhgd/xmgl/modules/wisdom/service/impl/TowerCraneCurrentDataServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/city/towercrane/service/impl/TowerCraneCurrentDataServiceImpl.java similarity index 89% rename from src/main/java/com/zhgd/xmgl/modules/wisdom/service/impl/TowerCraneCurrentDataServiceImpl.java rename to src/main/java/com/zhgd/xmgl/modules/city/towercrane/service/impl/TowerCraneCurrentDataServiceImpl.java index c99ccfd..1846a1a 100644 --- a/src/main/java/com/zhgd/xmgl/modules/wisdom/service/impl/TowerCraneCurrentDataServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/city/towercrane/service/impl/TowerCraneCurrentDataServiceImpl.java @@ -1,4 +1,4 @@ -package com.zhgd.xmgl.modules.wisdom.service.impl; +package com.zhgd.xmgl.modules.city.towercrane.service.impl; import cn.hutool.core.bean.BeanUtil; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; @@ -7,11 +7,11 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.zhgd.redis.lock.RedisRepository; import com.zhgd.xmgl.modules.basicdata.constant.CacheConstants; import com.zhgd.xmgl.modules.wisdom.dto.TowerCraneOperationDto; -import com.zhgd.xmgl.modules.wisdom.entity.TowerCrane; -import com.zhgd.xmgl.modules.wisdom.entity.TowerCraneCurrentData; -import com.zhgd.xmgl.modules.wisdom.mapper.TowerCraneCurrentDataMapper; -import com.zhgd.xmgl.modules.wisdom.service.ITowerCraneCurrentDataService; -import com.zhgd.xmgl.modules.wisdom.service.ITowerCraneService; +import com.zhgd.xmgl.modules.city.towercrane.entity.TowerCrane; +import com.zhgd.xmgl.modules.city.towercrane.entity.TowerCraneCurrentData; +import com.zhgd.xmgl.modules.city.towercrane.mapper.TowerCraneCurrentDataMapper; +import com.zhgd.xmgl.modules.city.towercrane.service.ITowerCraneCurrentDataService; +import com.zhgd.xmgl.modules.city.towercrane.service.ITowerCraneService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/src/main/java/com/zhgd/xmgl/modules/wisdom/service/impl/TowerCraneServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/city/towercrane/service/impl/TowerCraneServiceImpl.java similarity index 81% rename from src/main/java/com/zhgd/xmgl/modules/wisdom/service/impl/TowerCraneServiceImpl.java rename to src/main/java/com/zhgd/xmgl/modules/city/towercrane/service/impl/TowerCraneServiceImpl.java index f1989e6..ebf3bc2 100644 --- a/src/main/java/com/zhgd/xmgl/modules/wisdom/service/impl/TowerCraneServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/city/towercrane/service/impl/TowerCraneServiceImpl.java @@ -1,13 +1,13 @@ -package com.zhgd.xmgl.modules.wisdom.service.impl; +package com.zhgd.xmgl.modules.city.towercrane.service.impl; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.zhgd.xmgl.modules.basicdata.dto.EngineeringPageDto; import com.zhgd.xmgl.modules.basicdata.dto.ProjectPageDto; import com.zhgd.xmgl.modules.city.engineering.service.IEngineeringService; import com.zhgd.xmgl.modules.city.project.service.IProjectService; -import com.zhgd.xmgl.modules.wisdom.entity.TowerCrane; -import com.zhgd.xmgl.modules.wisdom.mapper.TowerCraneMapper; -import com.zhgd.xmgl.modules.wisdom.service.ITowerCraneService; +import com.zhgd.xmgl.modules.city.towercrane.entity.TowerCrane; +import com.zhgd.xmgl.modules.city.towercrane.mapper.TowerCraneMapper; +import com.zhgd.xmgl.modules.city.towercrane.service.ITowerCraneService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/zhgd/xmgl/modules/wisdom/service/impl/TowerCraneWorkCycleServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/city/towercrane/service/impl/TowerCraneWorkCycleServiceImpl.java similarity index 71% rename from src/main/java/com/zhgd/xmgl/modules/wisdom/service/impl/TowerCraneWorkCycleServiceImpl.java rename to src/main/java/com/zhgd/xmgl/modules/city/towercrane/service/impl/TowerCraneWorkCycleServiceImpl.java index d620a29..6a0050b 100644 --- a/src/main/java/com/zhgd/xmgl/modules/wisdom/service/impl/TowerCraneWorkCycleServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/city/towercrane/service/impl/TowerCraneWorkCycleServiceImpl.java @@ -1,10 +1,10 @@ -package com.zhgd.xmgl.modules.wisdom.service.impl; +package com.zhgd.xmgl.modules.city.towercrane.service.impl; -import com.zhgd.xmgl.modules.wisdom.entity.TowerCrane; -import com.zhgd.xmgl.modules.wisdom.entity.TowerCraneWorkCycle; -import com.zhgd.xmgl.modules.wisdom.mapper.TowerCraneWorkCycleMapper; -import com.zhgd.xmgl.modules.wisdom.service.ITowerCraneService; -import com.zhgd.xmgl.modules.wisdom.service.ITowerCraneWorkCycleService; +import com.zhgd.xmgl.modules.city.towercrane.entity.TowerCrane; +import com.zhgd.xmgl.modules.city.towercrane.entity.TowerCraneWorkCycle; +import com.zhgd.xmgl.modules.city.towercrane.mapper.TowerCraneWorkCycleMapper; +import com.zhgd.xmgl.modules.city.towercrane.service.ITowerCraneService; +import com.zhgd.xmgl.modules.city.towercrane.service.ITowerCraneWorkCycleService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/zhgd/xmgl/modules/wisdom/dto/TowerCraneCurrentDataDto.java b/src/main/java/com/zhgd/xmgl/modules/wisdom/dto/TowerCraneCurrentDataDto.java index 7324b2b..cdcd114 100644 --- a/src/main/java/com/zhgd/xmgl/modules/wisdom/dto/TowerCraneCurrentDataDto.java +++ b/src/main/java/com/zhgd/xmgl/modules/wisdom/dto/TowerCraneCurrentDataDto.java @@ -1,6 +1,6 @@ package com.zhgd.xmgl.modules.wisdom.dto; -import com.zhgd.xmgl.modules.wisdom.entity.TowerCraneCurrentData; +import com.zhgd.xmgl.modules.city.towercrane.entity.TowerCraneCurrentData; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/src/main/java/com/zhgd/xmgl/task/DevStateTask.java b/src/main/java/com/zhgd/xmgl/task/DevStateTask.java index 22b7dcc..9269180 100644 --- a/src/main/java/com/zhgd/xmgl/task/DevStateTask.java +++ b/src/main/java/com/zhgd/xmgl/task/DevStateTask.java @@ -11,8 +11,10 @@ import com.zhgd.xmgl.modules.city.dust.service.IDustNoiseDataService; import com.zhgd.xmgl.modules.city.dust.service.IEnvironmentDevService; import com.zhgd.xmgl.modules.city.monitor.entity.MonitorDev; import com.zhgd.xmgl.modules.city.monitor.service.IMonitorDevService; -import com.zhgd.xmgl.modules.wisdom.entity.*; -import com.zhgd.xmgl.modules.wisdom.service.*; +import com.zhgd.xmgl.modules.city.towercrane.entity.TowerCrane; +import com.zhgd.xmgl.modules.city.towercrane.entity.TowerCraneCurrentData; +import com.zhgd.xmgl.modules.city.towercrane.service.ITowerCraneCurrentDataService; +import com.zhgd.xmgl.modules.city.towercrane.service.ITowerCraneService; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/main/java/com/zhgd/xmgl/util/DateUtils.java b/src/main/java/com/zhgd/xmgl/util/DateUtils.java index 43dfcb3..65ad92e 100644 --- a/src/main/java/com/zhgd/xmgl/util/DateUtils.java +++ b/src/main/java/com/zhgd/xmgl/util/DateUtils.java @@ -1,5 +1,10 @@ package com.zhgd.xmgl.util; +import cn.hutool.core.date.DateTime; +import cn.hutool.core.date.DateUnit; +import cn.hutool.core.date.DateUtil; + +import java.text.DateFormat; import java.text.ParseException; import java.text.SimpleDateFormat; import java.time.DayOfWeek; @@ -29,11 +34,9 @@ public class DateUtils { return cn.hutool.core.date.DateUtil.format(endOfDay, "yyyy-MM-dd HH:mm:ss"); } - public static void main(String[] args) { - System.out.println(end("2023-03-04")); - } /** * 时间格式化 + * * @param oldDate * @return */ @@ -43,7 +46,7 @@ public class DateUtils { try { SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss"); Date date = df.parse(oldDate); - Calendar beijingcal=Calendar.getInstance(); + Calendar beijingcal = Calendar.getInstance(); beijingcal.setTime(date); //SimpleDateFormat df1 = new SimpleDateFormat ("EEE MMM dd HH:mm:ss Z yyyy", Locale.UK); //date1 = df1.parse(date.toString()); @@ -74,7 +77,7 @@ public class DateUtils { String formatStr2 = null; SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss");//注意格式化的表达式 try { - Date time = format.parse(createTime ); + Date time = format.parse(createTime); String date = time.toString(); //将西方形式的日期字符串转换成java.util.Date对象 SimpleDateFormat sdf = new SimpleDateFormat("EEE MMM dd HH:mm:ss zzz yyyy", java.util.Locale.US); @@ -89,9 +92,10 @@ public class DateUtils { /** * 查询本周所有天数 + * * @return */ - public static List getNowWeekAllDayList(){ + public static List getNowWeekAllDayList() { Calendar cal = Calendar.getInstance(); // 判断要计算的日期是否是周日，如果是则减一天计算周六的，否则会出问题，计算到下一周去了 // 获得当前日期是一个星期的第几天 @@ -106,46 +110,50 @@ public class DateUtils { int day = cal.get(Calendar.DAY_OF_WEEK); // 根据日历的规则，给当前日期减去星期几与一个星期第一天的差值 cal.add(Calendar.DATE, cal.getFirstDayOfWeek() - day); - return findDates(cal.getTime(),new Date()); + return findDates(cal.getTime(), new Date()); } /** * 查询现在时间几天前到现在之间的所有日期 + * * @param days * @return */ - public static List getOtherDayAllDayList(int days){ + public static List getOtherDayAllDayList(int days) { Calendar cal = Calendar.getInstance(); - cal.add(Calendar.DATE,-days); - return findDates(cal.getTime(),new Date()); + cal.add(Calendar.DATE, -days); + return findDates(cal.getTime(), new Date()); } + /** * 查询本月所有天数 + * * @return */ - public static List getNowMonthAllDayList(){ + public static List getNowMonthAllDayList() { Calendar cal = Calendar.getInstance(); cal.set(Calendar.DAY_OF_MONTH, 1); - return findDates(cal.getTime(),new Date()); + return findDates(cal.getTime(), new Date()); } /** * 获取两个时间段所有天数 + * * @param beginTime * @param endTime * @return */ - public static List getDiffTimeDayList(String beginTime,String endTime){ + public static List getDiffTimeDayList(String beginTime, String endTime) { SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); try { - return findDates(sdf.parse(beginTime),sdf.parse(endTime)); + return findDates(sdf.parse(beginTime), sdf.parse(endTime)); } catch (ParseException e) { e.printStackTrace(); } return null; } - public static List findDates(Date dBegin, Date dEnd){ + public static List findDates(Date dBegin, Date dEnd) { SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); List lDate = new ArrayList(); lDate.add(sdf.format(dBegin)); @@ -156,10 +164,10 @@ public class DateUtils { // 使用给定的 Date 设置此 Calendar 的时间 calEnd.setTime(dEnd); // 测试此日期是否在指定日期之后 - while (dEnd.after(calBegin.getTime())){ + while (dEnd.after(calBegin.getTime())) { // 根据日历的规则，为给定的日历字段添加或减去指定的时间量 calBegin.add(Calendar.DAY_OF_MONTH, 1); - if(calBegin.getTimeInMillis()<=dEnd.getTime()) { + if (calBegin.getTimeInMillis() <= dEnd.getTime()) { lDate.add(sdf.format(calBegin.getTime())); } } @@ -168,36 +176,37 @@ public class DateUtils { /** * 获取指定年份所有天数 + * * @param yearMonth * @return */ public static List getYearAllMonthList(String yearMonth) { - String year=yearMonth.substring(0,4); - List list=new ArrayList<>(); - for (int i = 1; i <=12 ; i++) { - if(i<10){ - list.add(year+"0"+i); - }else{ - list.add(year+i); + String year = yearMonth.substring(0, 4); + List list = new ArrayList<>(); + for (int i = 1; i <= 12; i++) { + if (i < 10) { + list.add(year + "0" + i); + } else { + list.add(year + i); } } return list; } /** - * - * @param yearMonth 月份格式yyyy-MM + * @param yearMonth 月份格式yyyy-MM * @return */ public static List getMonthDayList(String yearMonth) { SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM"); //判断是否是当月 - if(yearMonth.equals(sdf.format(new Date()))){ + if (yearMonth.equals(sdf.format(new Date()))) { return getNowMonthAllDayList(); - }else{ + } else { return getDayListOfMonth(yearMonth); } } + public static List getDayListOfMonth(String yearMonth) { int year = Integer.parseInt(yearMonth.split("-")[0]); //年 int month = Integer.parseInt(yearMonth.split("-")[1]); //月 @@ -220,14 +229,15 @@ public class DateUtils { int firstDay = startCal.getActualMinimum(Calendar.DAY_OF_MONTH); //设置日历中月份的最小天数 startCal.set(Calendar.DAY_OF_MONTH, firstDay); - return findDates(startCal.getTime(),endCal.getTime()); + return findDates(startCal.getTime(), endCal.getTime()); } /** * 获取当前周第一天日期 + * * @return */ - public static String getNowWeekStartTime(){ + public static String getNowWeekStartTime() { Calendar cal = Calendar.getInstance(); // 判断要计算的日期是否是周日，如果是则减一天计算周六的，否则会出问题，计算到下一周去了 // 获得当前日期是一个星期的第几天 @@ -245,16 +255,18 @@ public class DateUtils { SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); return sdf.format(cal.getTime()); } - public static List getDiffTimeYearList(String beginTime,String endTime){ + + public static List getDiffTimeYearList(String beginTime, String endTime) { SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); try { - return findYear(sdf.parse(beginTime),sdf.parse(endTime)); + return findYear(sdf.parse(beginTime), sdf.parse(endTime)); } catch (ParseException e) { e.printStackTrace(); } return null; } - public static List findYear(Date dBegin, Date dEnd){ + + public static List findYear(Date dBegin, Date dEnd) { SimpleDateFormat sdf = new SimpleDateFormat("yyyy"); List lDate = new ArrayList(); lDate.add(sdf.format(dBegin)); @@ -265,25 +277,27 @@ public class DateUtils { // 使用给定的 Date 设置此 Calendar 的时间 calEnd.setTime(dEnd); // 测试此日期是否在指定日期之后 - while (dEnd.after(calBegin.getTime())){ + while (dEnd.after(calBegin.getTime())) { // 根据日历的规则，为给定的日历字段添加或减去指定的时间量 calBegin.add(Calendar.YEAR, 1); - if(calBegin.getTimeInMillis()<=dEnd.getTime()) { + if (calBegin.getTimeInMillis() <= dEnd.getTime()) { lDate.add(sdf.format(calBegin.getTime())); } } return lDate; } - public static List getDiffTimeMonthList(String beginTime,String endTime){ + + public static List getDiffTimeMonthList(String beginTime, String endTime) { SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); try { - return findMonth(sdf.parse(beginTime),sdf.parse(endTime)); + return findMonth(sdf.parse(beginTime), sdf.parse(endTime)); } catch (ParseException e) { e.printStackTrace(); } return null; } - public static List findMonth(Date dBegin, Date dEnd){ + + public static List findMonth(Date dBegin, Date dEnd) { SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM"); List lDate = new ArrayList(); lDate.add(sdf.format(dBegin)); @@ -294,10 +308,10 @@ public class DateUtils { // 使用给定的 Date 设置此 Calendar 的时间 calEnd.setTime(dEnd); // 测试此日期是否在指定日期之后 - while (dEnd.after(calBegin.getTime())){ + while (dEnd.after(calBegin.getTime())) { // 根据日历的规则，为给定的日历字段添加或减去指定的时间量 calBegin.add(Calendar.MONTH, 1); - if(calBegin.getTimeInMillis()<=dEnd.getTime()) { + if (calBegin.getTimeInMillis() <= dEnd.getTime()) { lDate.add(sdf.format(calBegin.getTime())); } } @@ -305,16 +319,16 @@ public class DateUtils { } - public static List getDiffTimeWeekList(String beginTime,String endTime){ + public static List getDiffTimeWeekList(String beginTime, String endTime) { DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd"); - LocalDate startDate = LocalDate.parse(beginTime,formatter); - LocalDate endDate = LocalDate.parse(endTime,formatter); + LocalDate startDate = LocalDate.parse(beginTime, formatter); + LocalDate endDate = LocalDate.parse(endTime, formatter); List lDate = new ArrayList(); - while (endDate.isAfter(startDate)){ - String start=startDate.format(formatter); - if(startDate.getDayOfWeek()==DayOfWeek.SUNDAY) { + while (endDate.isAfter(startDate)) { + String start = startDate.format(formatter); + if (startDate.getDayOfWeek() == DayOfWeek.SUNDAY) { lDate.add(start + "/" + start); - }else{ + } else { LocalDate sunday = startDate.with(TemporalAdjusters.next(DayOfWeek.SUNDAY)); if (sunday.isAfter(endDate)) { lDate.add(start + "/" + endDate.format(formatter)); @@ -322,7 +336,7 @@ public class DateUtils { lDate.add(start + "/" + sunday.format(formatter)); } } - startDate=startDate.with(TemporalAdjusters.next(DayOfWeek.SUNDAY)).plusDays(1); + startDate = startDate.with(TemporalAdjusters.next(DayOfWeek.SUNDAY)).plusDays(1); } return lDate; @@ -330,15 +344,16 @@ public class DateUtils { /** * 获取当前时间和当天时间几天前之间的所有天数 - * @param dayNum 当天时间以前具体几天 + * + * @param dayNum 当天时间以前具体几天 * @return */ - public static List getNowFewDaysAgoList(int dayNum){ + public static List getNowFewDaysAgoList(int dayNum) { try { Calendar calendar = Calendar.getInstance(); calendar.add(Calendar.DATE, -dayNum); Date date = calendar.getTime(); - return findDates(date,new Date()); + return findDates(date, new Date()); } catch (Exception e) { e.printStackTrace(); } @@ -346,22 +361,20 @@ public class DateUtils { } - /** - * * @param type 1 今日24 小时，2本周所有天，3本月所有天 * @return */ public static List getDayList(Integer type) { - if(type==1){ - List list=new ArrayList<>(); - for(int i=0;i<=23;i++){ - list.add(i+""); + if (type == 1) { + List list = new ArrayList<>(); + for (int i = 0; i <= 23; i++) { + list.add(i + ""); } return list; - }else if(type==2){ + } else if (type == 2) { return getNowWeekAllDayList(); - }else if(type==3){ + } else if (type == 3) { return getNowMonthAllDayList(); } return null; @@ -369,48 +382,184 @@ public class DateUtils { /** * 比较两个日期大小 + * * @param time1 * @param time2 * @return * @throws ParseException */ - public static boolean compareTime(String time1,String time2){ + public static boolean compareTime(String time1, String time2) { try { //如果想比较日期则写成"yyyy-MM-dd"就可以了 - SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd"); + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); //将字符串形式的时间转化为Date类型的时间 - Date a=sdf.parse(time1); - Date b=sdf.parse(time2); + Date a = sdf.parse(time1); + Date b = sdf.parse(time2); //Date类的一个方法，如果a早于b返回true，否则返回false //a时间下雨b时间返回true,否正返回false - if(a.before(b)) { + if (a.before(b)) { return true; - }else { + } else { return false; } - }catch (Exception e){ + } catch (Exception e) { e.printStackTrace(); } return false; } + /** * 查询当前时间指定天数之前的日期 - * @Title: getBeginDayTime - * @Description: TODO(这里用一句话描述这个方法的作用) - * @param @param days - * @param @return 参数 + * + * @param @param days + * @param @return 参数 * @return String 返回类型 * @throws + * @Title: getBeginDayTime */ - public static String getBeginDayTime(int days){ + public static String getBeginDayTime(int days) { Calendar cal = Calendar.getInstance(); - cal.add(Calendar.DATE,-days); + cal.add(Calendar.DATE, -days); SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); return sdf.format(cal.getTime()); } -// public static void main(String[] args) { -// //log.info(dealDateFormat("2021-08-25T04:22:20+0000")); -// System.out.println(getOtherDayAllDayList(10)); -// } + /** + * 获取一天内的小时列表 + * + * @return + */ + public static List getAllHourInDay() { + return Arrays.asList("00:00", "01:00", "02:00", "03:00", "04:00", "05:00", "06:00", "07:00", "08:00", "09:00", "10:00", "11:00", "12:00", "13:00", "14:00", "15:00", "16:00", "17:00", "18:00", "19:00", "20:00", "21:00", "22:00", "23:00"); + } + + /** + * 转成GMT时间 + * + * @param date + */ + public static String getGMTTime(Date date) { + DateFormat dateFormat = new SimpleDateFormat("E, dd MMM yyyy HH:mm:ss z", Locale.ENGLISH); + dateFormat.setTimeZone(TimeZone.getTimeZone("GMT")); + return dateFormat.format(date); + } + + + /** + * 查询本月所有天数Fix，如：2023-06-01到2023-06-30 + * + * @return + */ + public static List getCurrentMonthAllDayList() { + ArrayList rtList = new ArrayList<>(); + Date now = new Date(); + DateTime beginDate = cn.hutool.core.date.DateUtil.beginOfMonth(now); + DateTime endDate = cn.hutool.core.date.DateUtil.endOfMonth(now); + long offset = cn.hutool.core.date.DateUtil.betweenDay(beginDate, endDate, true); + for (int i = 0; i < offset + 1; i++) { + rtList.add(cn.hutool.core.date.DateUtil.formatDate(cn.hutool.core.date.DateUtil.offsetDay(beginDate, i))); + } + return rtList; + } + + /** + * 查询一个月前内所有天数，如：2023-06-10到2023-07-10 + * + * @return + */ + public static List getDaysBetweenLastMonth() { + ArrayList rtList = new ArrayList<>(); + DateTime beginDate = cn.hutool.core.date.DateUtil.lastMonth(); + DateTime endDate = DateTime.now(); + long offset = cn.hutool.core.date.DateUtil.betweenDay(beginDate, endDate, true); + for (int i = 0; i < offset + 1; i++) { + rtList.add(cn.hutool.core.date.DateUtil.formatDate(cn.hutool.core.date.DateUtil.offsetDay(beginDate, i))); + } + return rtList; + } + + /** + * 查询一个年内所有月份，如：2022-06到2023-06 + * + * @return + */ + public static List getMonthsBetweenLastYear() { + ArrayList rtList = new ArrayList<>(); + DateTime endDate = DateTime.now(); + DateTime beginDate = cn.hutool.core.date.DateUtil.offsetMonth(endDate, -12); + for (int i = 0; i <= 12; i++) { + rtList.add(cn.hutool.core.date.DateUtil.format(cn.hutool.core.date.DateUtil.offsetMonth(beginDate, i),"yyyy-MM")); + } + return rtList; + } + + /** + * 查询一个周前内所有天数，如：2023-06-10到2023-06-17 + * + * @return + */ + public static List getDaysBetweenLastWeek() { + ArrayList rtList = new ArrayList<>(); + DateTime beginDate = cn.hutool.core.date.DateUtil.lastWeek(); + DateTime endDate = DateTime.now(); + long offset = cn.hutool.core.date.DateUtil.betweenDay(beginDate, endDate, true); + for (int i = 0; i < offset + 1; i++) { + rtList.add(cn.hutool.core.date.DateUtil.formatDate(cn.hutool.core.date.DateUtil.offsetDay(beginDate, i))); + } + return rtList; + } + + /** + * 查询指定天数内所有天数列表, 返回：如：[07-30, 07-31] + * + * @param queryStartTime 2023-07-31 + * @param queryEndTime 2023-07-31 + * @return + */ + public static List getBetweenDays(String queryStartTime, String queryEndTime) { + ArrayList rtList = new ArrayList<>(); + DateTime beginDate = DateUtil.parseDate(queryStartTime); + DateTime endDate = DateUtil.parseDate(queryEndTime); + long offset = cn.hutool.core.date.DateUtil.betweenDay(beginDate, endDate, true); + for (int i = 0; i < offset + 1; i++) { + rtList.add(cn.hutool.core.date.DateUtil.format(cn.hutool.core.date.DateUtil.offsetDay(beginDate, i), "MM-dd")); + } + return rtList; + } + + /** + * 查询一个周前内所有天数，如：06-10到06-17 + * + * @return + */ + public static List getDaysBetweenLastWeekWithoutYear() { + ArrayList rtList = new ArrayList<>(); + DateTime beginDate = cn.hutool.core.date.DateUtil.lastWeek(); + DateTime endDate = DateTime.now(); + long offset = cn.hutool.core.date.DateUtil.betweenDay(beginDate, endDate, true); + for (int i = 0; i < offset + 1; i++) { + rtList.add(cn.hutool.core.date.DateUtil.format(cn.hutool.core.date.DateUtil.offsetDay(beginDate, i), "MM-dd")); + } + return rtList; + } + + /** + * 查询一天前内所有小时，12:00 > 11:00 + * + * @return + */ + public static List getHoursListLastDay() { + ArrayList rtList = new ArrayList<>(); + DateTime beginDate = cn.hutool.core.date.DateUtil.yesterday(); + DateTime endDate = DateTime.now(); + long offset = cn.hutool.core.date.DateUtil.between(beginDate, endDate, DateUnit.HOUR); + for (int i = 1; i < offset + 1; i++) { + rtList.add(cn.hutool.core.date.DateUtil.format(cn.hutool.core.date.DateUtil.offsetHour(beginDate, i), "HH:00")); + } + return rtList; + } + + public static void main(String[] args) { + System.out.println(getMonthsBetweenLastYear()); + } }