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 9705e4f..c63347a 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 @@ -12,6 +12,12 @@ import com.zhgd.xmgl.modules.basicdata.entity.HardWareAlarm; import com.zhgd.xmgl.modules.basicdata.entity.SystemDictData; import com.zhgd.xmgl.modules.basicdata.service.IHardWareAlarmService; import com.zhgd.xmgl.modules.basicdata.service.ISystemDictDataService; +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.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.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/EntDustNoiseDataController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntDustNoiseDataController.java index 94ed84d..ad30d70 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntDustNoiseDataController.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntDustNoiseDataController.java @@ -8,8 +8,8 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.zhgd.annotation.OperLog; import com.zhgd.jeecg.common.api.vo.Result; import com.zhgd.jeecg.common.util.PageUtil; -import com.zhgd.xmgl.modules.wisdom.entity.DustNoiseData; -import com.zhgd.xmgl.modules.wisdom.service.IDustNoiseDataService; +import com.zhgd.xmgl.modules.city.dust.entity.DustNoiseData; +import com.zhgd.xmgl.modules.city.dust.service.IDustNoiseDataService; 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/EntEnvironmentAlarmController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntEnvironmentAlarmController.java index 61ce2cf..d16da4a 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntEnvironmentAlarmController.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntEnvironmentAlarmController.java @@ -3,8 +3,8 @@ package com.zhgd.xmgl.modules.basicdata.controller.enterprise; 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.wisdom.entity.EnvironmentAlarm; -import com.zhgd.xmgl.modules.wisdom.service.IEnvironmentAlarmService; +import com.zhgd.xmgl.modules.city.dust.entity.EnvironmentAlarm; +import com.zhgd.xmgl.modules.city.dust.service.IEnvironmentAlarmService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -56,7 +56,7 @@ public class EntEnvironmentAlarmController { IPage pageList = environmentAlarmService.pageList(map); return Result.success(pageList); } - + /** * 编辑 * @param environmentAlarm diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntEnvironmentDevController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntEnvironmentDevController.java index 12912df..4356493 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntEnvironmentDevController.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntEnvironmentDevController.java @@ -9,9 +9,9 @@ import com.zhgd.annotation.OperLog; import com.zhgd.jeecg.common.api.vo.Result; import com.zhgd.jeecg.common.util.PageUtil; import com.zhgd.xmgl.modules.wisdom.dto.EnvironmentDevDto; -import com.zhgd.xmgl.modules.wisdom.entity.EnvironmentDev; +import com.zhgd.xmgl.modules.city.dust.entity.EnvironmentDev; import com.zhgd.xmgl.modules.city.engineering.service.IEngineeringService; -import com.zhgd.xmgl.modules.wisdom.service.IEnvironmentDevService; +import com.zhgd.xmgl.modules.city.dust.service.IEnvironmentDevService; import com.zhgd.xmgl.security.SecurityUser; import com.zhgd.xmgl.security.SecurityUtil; import io.swagger.annotations.Api; diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovEngineeringController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovEngineeringController.java index a4b567c..0ef3f7b 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovEngineeringController.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovEngineeringController.java @@ -16,7 +16,7 @@ import com.zhgd.xmgl.modules.wisdom.dto.MapEnvironAlarmDto; import com.zhgd.xmgl.modules.city.engineering.entity.Engineering; import com.zhgd.xmgl.modules.wisdom.service.IAiMonitorAlarmService; import com.zhgd.xmgl.modules.city.engineering.service.IEngineeringService; -import com.zhgd.xmgl.modules.wisdom.service.IEnvironmentAlarmService; +import com.zhgd.xmgl.modules.city.dust.service.IEnvironmentAlarmService; import com.zhgd.xmgl.modules.basicdata.statistics.EngineeringStat; import com.zhgd.xmgl.modules.basicdata.vo.EngineeringVo; import com.zhgd.xmgl.valid.EditGroup; diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovEnvironmentAlarmController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovEnvironmentAlarmController.java index b7a651b..1a9b69d 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovEnvironmentAlarmController.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovEnvironmentAlarmController.java @@ -3,8 +3,8 @@ package com.zhgd.xmgl.modules.basicdata.controller.government; 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.wisdom.entity.EnvironmentAlarm; -import com.zhgd.xmgl.modules.wisdom.service.IEnvironmentAlarmService; +import com.zhgd.xmgl.modules.city.dust.entity.EnvironmentAlarm; +import com.zhgd.xmgl.modules.city.dust.service.IEnvironmentAlarmService; 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/GovEnvironmentDevController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovEnvironmentDevController.java index 18bc394..661a374 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovEnvironmentDevController.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovEnvironmentDevController.java @@ -15,9 +15,9 @@ import com.zhgd.xmgl.modules.basicdata.dto.ProjectDeviceDto; import com.zhgd.xmgl.modules.city.engineering.service.IEngineeringService; import com.zhgd.xmgl.modules.wisdom.dto.EnvironmentDevDto; import com.zhgd.xmgl.modules.wisdom.dto.EnvironmentDevStatDto; -import com.zhgd.xmgl.modules.wisdom.entity.EnvironmentDev; -import com.zhgd.xmgl.modules.wisdom.service.IEnvironmentAlarmService; -import com.zhgd.xmgl.modules.wisdom.service.IEnvironmentDevService; +import com.zhgd.xmgl.modules.city.dust.entity.EnvironmentDev; +import com.zhgd.xmgl.modules.city.dust.service.IEnvironmentAlarmService; +import com.zhgd.xmgl.modules.city.dust.service.IEnvironmentDevService; 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/GovProjectController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovProjectController.java index 3c105ce..5947501 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovProjectController.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovProjectController.java @@ -9,7 +9,7 @@ import com.zhgd.xmgl.modules.wisdom.dto.MapAiAlarmDto; import com.zhgd.xmgl.modules.basicdata.entity.Enterprise; import com.zhgd.xmgl.modules.city.project.entity.Project; import com.zhgd.xmgl.modules.wisdom.service.IAiMonitorAlarmService; -import com.zhgd.xmgl.modules.wisdom.service.IEnvironmentAlarmService; +import com.zhgd.xmgl.modules.city.dust.service.IEnvironmentAlarmService; import com.zhgd.xmgl.modules.city.project.service.IProjectService; import com.zhgd.xmgl.security.SecurityUtil; import io.swagger.annotations.Api; diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/project/DustNoiseDataController.java b/src/main/java/com/zhgd/xmgl/modules/city/dust/controller/DustNoiseDataController.java similarity index 94% rename from src/main/java/com/zhgd/xmgl/modules/basicdata/controller/project/DustNoiseDataController.java rename to src/main/java/com/zhgd/xmgl/modules/city/dust/controller/DustNoiseDataController.java index 203f230..30ad5cd 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/project/DustNoiseDataController.java +++ b/src/main/java/com/zhgd/xmgl/modules/city/dust/controller/DustNoiseDataController.java @@ -1,4 +1,4 @@ -package com.zhgd.xmgl.modules.basicdata.controller.project; +package com.zhgd.xmgl.modules.city.dust.controller; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -10,8 +10,8 @@ import com.zhgd.annotation.OperLog; import com.zhgd.jeecg.common.api.vo.Result; import com.zhgd.jeecg.common.util.PageUtil; import com.zhgd.xmgl.modules.basicdata.constant.ParamConstants; -import com.zhgd.xmgl.modules.wisdom.entity.DustNoiseData; -import com.zhgd.xmgl.modules.wisdom.service.IDustNoiseDataService; +import com.zhgd.xmgl.modules.city.dust.entity.DustNoiseData; +import com.zhgd.xmgl.modules.city.dust.service.IDustNoiseDataService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -42,7 +42,7 @@ import java.util.Map; public class DustNoiseDataController { @Autowired private IDustNoiseDataService dustNoiseDataService; - + /** * 分页列表查询 * @return diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/project/EnvironmentAlarmController.java b/src/main/java/com/zhgd/xmgl/modules/city/dust/controller/EnvironmentAlarmController.java similarity index 94% rename from src/main/java/com/zhgd/xmgl/modules/basicdata/controller/project/EnvironmentAlarmController.java rename to src/main/java/com/zhgd/xmgl/modules/city/dust/controller/EnvironmentAlarmController.java index a6561ed..a4c0068 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/project/EnvironmentAlarmController.java +++ b/src/main/java/com/zhgd/xmgl/modules/city/dust/controller/EnvironmentAlarmController.java @@ -1,10 +1,10 @@ -package com.zhgd.xmgl.modules.basicdata.controller.project; +package com.zhgd.xmgl.modules.city.dust.controller; 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.wisdom.entity.EnvironmentAlarm; -import com.zhgd.xmgl.modules.wisdom.service.IEnvironmentAlarmService; +import com.zhgd.xmgl.modules.city.dust.entity.EnvironmentAlarm; +import com.zhgd.xmgl.modules.city.dust.service.IEnvironmentAlarmService; 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/EnvironmentDevController.java b/src/main/java/com/zhgd/xmgl/modules/city/dust/controller/EnvironmentDevController.java similarity index 97% rename from src/main/java/com/zhgd/xmgl/modules/basicdata/controller/project/EnvironmentDevController.java rename to src/main/java/com/zhgd/xmgl/modules/city/dust/controller/EnvironmentDevController.java index dc8d752..61cd813 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/project/EnvironmentDevController.java +++ b/src/main/java/com/zhgd/xmgl/modules/city/dust/controller/EnvironmentDevController.java @@ -1,4 +1,4 @@ -package com.zhgd.xmgl.modules.basicdata.controller.project; +package com.zhgd.xmgl.modules.city.dust.controller; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @@ -13,8 +13,8 @@ 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.wisdom.entity.EnvironmentDev; -import com.zhgd.xmgl.modules.wisdom.service.IEnvironmentDevService; +import com.zhgd.xmgl.modules.city.dust.entity.EnvironmentDev; +import com.zhgd.xmgl.modules.city.dust.service.IEnvironmentDevService; import com.zhgd.xmgl.security.SecurityUser; import com.zhgd.xmgl.security.SecurityUtil; import io.swagger.annotations.Api; diff --git a/src/main/java/com/zhgd/xmgl/modules/wisdom/entity/DustNoiseData.java b/src/main/java/com/zhgd/xmgl/modules/city/dust/entity/DustNoiseData.java similarity index 99% rename from src/main/java/com/zhgd/xmgl/modules/wisdom/entity/DustNoiseData.java rename to src/main/java/com/zhgd/xmgl/modules/city/dust/entity/DustNoiseData.java index 32ac39e..55d32f4 100644 --- a/src/main/java/com/zhgd/xmgl/modules/wisdom/entity/DustNoiseData.java +++ b/src/main/java/com/zhgd/xmgl/modules/city/dust/entity/DustNoiseData.java @@ -1,4 +1,4 @@ -package com.zhgd.xmgl.modules.wisdom.entity; +package com.zhgd.xmgl.modules.city.dust.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/src/main/java/com/zhgd/xmgl/modules/wisdom/entity/EnvironmentAlarm.java b/src/main/java/com/zhgd/xmgl/modules/city/dust/entity/EnvironmentAlarm.java similarity index 98% rename from src/main/java/com/zhgd/xmgl/modules/wisdom/entity/EnvironmentAlarm.java rename to src/main/java/com/zhgd/xmgl/modules/city/dust/entity/EnvironmentAlarm.java index 96b12ec..15c67a5 100644 --- a/src/main/java/com/zhgd/xmgl/modules/wisdom/entity/EnvironmentAlarm.java +++ b/src/main/java/com/zhgd/xmgl/modules/city/dust/entity/EnvironmentAlarm.java @@ -1,4 +1,4 @@ -package com.zhgd.xmgl.modules.wisdom.entity; +package com.zhgd.xmgl.modules.city.dust.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/src/main/java/com/zhgd/xmgl/modules/wisdom/entity/EnvironmentDev.java b/src/main/java/com/zhgd/xmgl/modules/city/dust/entity/EnvironmentDev.java similarity index 98% rename from src/main/java/com/zhgd/xmgl/modules/wisdom/entity/EnvironmentDev.java rename to src/main/java/com/zhgd/xmgl/modules/city/dust/entity/EnvironmentDev.java index 35a50a4..a7cd4ff 100644 --- a/src/main/java/com/zhgd/xmgl/modules/wisdom/entity/EnvironmentDev.java +++ b/src/main/java/com/zhgd/xmgl/modules/city/dust/entity/EnvironmentDev.java @@ -1,4 +1,4 @@ -package com.zhgd.xmgl.modules.wisdom.entity; +package com.zhgd.xmgl.modules.city.dust.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/src/main/java/com/zhgd/xmgl/modules/wisdom/mapper/DustNoiseDataMapper.java b/src/main/java/com/zhgd/xmgl/modules/city/dust/mapper/DustNoiseDataMapper.java similarity index 87% rename from src/main/java/com/zhgd/xmgl/modules/wisdom/mapper/DustNoiseDataMapper.java rename to src/main/java/com/zhgd/xmgl/modules/city/dust/mapper/DustNoiseDataMapper.java index 483397a..694fd4e 100644 --- a/src/main/java/com/zhgd/xmgl/modules/wisdom/mapper/DustNoiseDataMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/city/dust/mapper/DustNoiseDataMapper.java @@ -1,11 +1,11 @@ -package com.zhgd.xmgl.modules.wisdom.mapper; +package com.zhgd.xmgl.modules.city.dust.mapper; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; 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.wisdom.entity.DustNoiseData; +import com.zhgd.xmgl.modules.city.dust.entity.DustNoiseData; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/src/main/java/com/zhgd/xmgl/modules/wisdom/mapper/EnvironmentAlarmMapper.java b/src/main/java/com/zhgd/xmgl/modules/city/dust/mapper/EnvironmentAlarmMapper.java similarity index 86% rename from src/main/java/com/zhgd/xmgl/modules/wisdom/mapper/EnvironmentAlarmMapper.java rename to src/main/java/com/zhgd/xmgl/modules/city/dust/mapper/EnvironmentAlarmMapper.java index 97b6194..d24e8cb 100644 --- a/src/main/java/com/zhgd/xmgl/modules/wisdom/mapper/EnvironmentAlarmMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/city/dust/mapper/EnvironmentAlarmMapper.java @@ -1,11 +1,11 @@ -package com.zhgd.xmgl.modules.wisdom.mapper; +package com.zhgd.xmgl.modules.city.dust.mapper; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; 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.wisdom.entity.EnvironmentAlarm; +import com.zhgd.xmgl.modules.city.dust.entity.EnvironmentAlarm; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/src/main/java/com/zhgd/xmgl/modules/wisdom/mapper/EnvironmentDevMapper.java b/src/main/java/com/zhgd/xmgl/modules/city/dust/mapper/EnvironmentDevMapper.java similarity index 89% rename from src/main/java/com/zhgd/xmgl/modules/wisdom/mapper/EnvironmentDevMapper.java rename to src/main/java/com/zhgd/xmgl/modules/city/dust/mapper/EnvironmentDevMapper.java index 2553f9f..1f54afa 100644 --- a/src/main/java/com/zhgd/xmgl/modules/wisdom/mapper/EnvironmentDevMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/city/dust/mapper/EnvironmentDevMapper.java @@ -1,11 +1,11 @@ -package com.zhgd.xmgl.modules.wisdom.mapper; +package com.zhgd.xmgl.modules.city.dust.mapper; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; 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.wisdom.entity.EnvironmentDev; +import com.zhgd.xmgl.modules.city.dust.entity.EnvironmentDev; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/src/main/java/com/zhgd/xmgl/modules/wisdom/mapper/xml/DustNoiseDataMapper.xml b/src/main/java/com/zhgd/xmgl/modules/city/dust/mapper/xml/DustNoiseDataMapper.xml similarity index 66% rename from src/main/java/com/zhgd/xmgl/modules/wisdom/mapper/xml/DustNoiseDataMapper.xml rename to src/main/java/com/zhgd/xmgl/modules/city/dust/mapper/xml/DustNoiseDataMapper.xml index 1c2b752..3792c02 100644 --- a/src/main/java/com/zhgd/xmgl/modules/wisdom/mapper/xml/DustNoiseDataMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/city/dust/mapper/xml/DustNoiseDataMapper.xml @@ -1,14 +1,14 @@ - - SELECT * FROM dust_noise_data WHERE device_code = #{deviceCode} ORDER BY upload_date DESC LIMIT 1 - SELECT d.*, ed.`name` as deviceName, e.engineering_name FROM dust_noise_data d LEFT JOIN environment_dev ed ON d.device_code = ed.`code` LEFT JOIN engineering e ON d.engineering_sn = e.engineering_sn ${ew.customSqlSegment} - \ No newline at end of file + diff --git a/src/main/java/com/zhgd/xmgl/modules/wisdom/mapper/xml/EnvironmentAlarmMapper.xml b/src/main/java/com/zhgd/xmgl/modules/city/dust/mapper/xml/EnvironmentAlarmMapper.xml similarity index 78% rename from src/main/java/com/zhgd/xmgl/modules/wisdom/mapper/xml/EnvironmentAlarmMapper.xml rename to src/main/java/com/zhgd/xmgl/modules/city/dust/mapper/xml/EnvironmentAlarmMapper.xml index be7a366..4ce5e6c 100644 --- a/src/main/java/com/zhgd/xmgl/modules/wisdom/mapper/xml/EnvironmentAlarmMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/city/dust/mapper/xml/EnvironmentAlarmMapper.xml @@ -1,7 +1,7 @@ - - SELECT a.*, d.name as deviceName FROM environment_alarm a LEFT JOIN environment_dev d ON d.code = a.device_code ${ew.customSqlSegment} @@ -14,4 +14,4 @@ - \ No newline at end of file + diff --git a/src/main/java/com/zhgd/xmgl/modules/wisdom/mapper/xml/EnvironmentDevMapper.xml b/src/main/java/com/zhgd/xmgl/modules/city/dust/mapper/xml/EnvironmentDevMapper.xml similarity index 80% rename from src/main/java/com/zhgd/xmgl/modules/wisdom/mapper/xml/EnvironmentDevMapper.xml rename to src/main/java/com/zhgd/xmgl/modules/city/dust/mapper/xml/EnvironmentDevMapper.xml index a6a1cb3..7c698fd 100644 --- a/src/main/java/com/zhgd/xmgl/modules/wisdom/mapper/xml/EnvironmentDevMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/city/dust/mapper/xml/EnvironmentDevMapper.xml @@ -1,7 +1,7 @@ - - SELECT d.*, p.project_name, e.engineering_name FROM environment_dev d LEFT JOIN project p ON d.project_sn = p.project_sn LEFT JOIN engineering e ON d.engineering_sn = e.engineering_sn @@ -16,7 +16,7 @@ SELECT COUNT(1) AS aiMonitorDevNum FROM environment_dev - SELECT d.*, p.project_name, e.engineering_name FROM environment_dev d LEFT JOIN project p ON d.project_sn = p.project_sn LEFT JOIN engineering e ON d.engineering_sn = e.engineering_sn @@ -33,7 +33,7 @@ - SELECT * FROM environment_dev WHERE code = #{code} - \ No newline at end of file + diff --git a/src/main/java/com/zhgd/xmgl/modules/wisdom/service/IDustNoiseDataService.java b/src/main/java/com/zhgd/xmgl/modules/city/dust/service/IDustNoiseDataService.java similarity index 87% rename from src/main/java/com/zhgd/xmgl/modules/wisdom/service/IDustNoiseDataService.java rename to src/main/java/com/zhgd/xmgl/modules/city/dust/service/IDustNoiseDataService.java index 9cc1306..f525ac8 100644 --- a/src/main/java/com/zhgd/xmgl/modules/wisdom/service/IDustNoiseDataService.java +++ b/src/main/java/com/zhgd/xmgl/modules/city/dust/service/IDustNoiseDataService.java @@ -1,9 +1,9 @@ -package com.zhgd.xmgl.modules.wisdom.service; +package com.zhgd.xmgl.modules.city.dust.service; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; -import com.zhgd.xmgl.modules.wisdom.entity.DustNoiseData; +import com.zhgd.xmgl.modules.city.dust.entity.DustNoiseData; /** * @Description: 扬尘实时数据管理 diff --git a/src/main/java/com/zhgd/xmgl/modules/wisdom/service/IEnvironmentAlarmService.java b/src/main/java/com/zhgd/xmgl/modules/city/dust/service/IEnvironmentAlarmService.java similarity index 84% rename from src/main/java/com/zhgd/xmgl/modules/wisdom/service/IEnvironmentAlarmService.java rename to src/main/java/com/zhgd/xmgl/modules/city/dust/service/IEnvironmentAlarmService.java index 0126918..8eb53ed 100644 --- a/src/main/java/com/zhgd/xmgl/modules/wisdom/service/IEnvironmentAlarmService.java +++ b/src/main/java/com/zhgd/xmgl/modules/city/dust/service/IEnvironmentAlarmService.java @@ -1,9 +1,9 @@ -package com.zhgd.xmgl.modules.wisdom.service; +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.wisdom.dto.MapEnvironAlarmDto; -import com.zhgd.xmgl.modules.wisdom.entity.EnvironmentAlarm; +import com.zhgd.xmgl.modules.city.dust.entity.EnvironmentAlarm; import java.util.Map; diff --git a/src/main/java/com/zhgd/xmgl/modules/wisdom/service/IEnvironmentDevService.java b/src/main/java/com/zhgd/xmgl/modules/city/dust/service/IEnvironmentDevService.java similarity index 91% rename from src/main/java/com/zhgd/xmgl/modules/wisdom/service/IEnvironmentDevService.java rename to src/main/java/com/zhgd/xmgl/modules/city/dust/service/IEnvironmentDevService.java index b376dd8..563d830 100644 --- a/src/main/java/com/zhgd/xmgl/modules/wisdom/service/IEnvironmentDevService.java +++ b/src/main/java/com/zhgd/xmgl/modules/city/dust/service/IEnvironmentDevService.java @@ -1,4 +1,4 @@ -package com.zhgd.xmgl.modules.wisdom.service; +package com.zhgd.xmgl.modules.city.dust.service; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -7,7 +7,7 @@ import com.zhgd.xmgl.modules.basicdata.dto.EngineeringDeviceDto; import com.zhgd.xmgl.modules.basicdata.dto.ProjectDeviceDto; import com.zhgd.xmgl.modules.wisdom.dto.EnvironmentDevDto; import com.zhgd.xmgl.modules.wisdom.dto.EnvironmentDevStatDto; -import com.zhgd.xmgl.modules.wisdom.entity.EnvironmentDev; +import com.zhgd.xmgl.modules.city.dust.entity.EnvironmentDev; import java.util.List; import java.util.Map; diff --git a/src/main/java/com/zhgd/xmgl/modules/wisdom/service/impl/DustNoiseDataServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/city/dust/service/impl/DustNoiseDataServiceImpl.java similarity index 92% rename from src/main/java/com/zhgd/xmgl/modules/wisdom/service/impl/DustNoiseDataServiceImpl.java rename to src/main/java/com/zhgd/xmgl/modules/city/dust/service/impl/DustNoiseDataServiceImpl.java index 4730225..783d4a0 100644 --- a/src/main/java/com/zhgd/xmgl/modules/wisdom/service/impl/DustNoiseDataServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/city/dust/service/impl/DustNoiseDataServiceImpl.java @@ -1,12 +1,12 @@ -package com.zhgd.xmgl.modules.wisdom.service.impl; +package com.zhgd.xmgl.modules.city.dust.service.impl; 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.wisdom.entity.DustNoiseData; +import com.zhgd.xmgl.modules.city.dust.entity.DustNoiseData; import com.zhgd.xmgl.modules.basicdata.entity.SystemDictData; -import com.zhgd.xmgl.modules.wisdom.mapper.DustNoiseDataMapper; -import com.zhgd.xmgl.modules.wisdom.service.IDustNoiseDataService; +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.ParamEnum; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/main/java/com/zhgd/xmgl/modules/wisdom/service/impl/EnvironmentAlarmServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/city/dust/service/impl/EnvironmentAlarmServiceImpl.java similarity index 91% rename from src/main/java/com/zhgd/xmgl/modules/wisdom/service/impl/EnvironmentAlarmServiceImpl.java rename to src/main/java/com/zhgd/xmgl/modules/city/dust/service/impl/EnvironmentAlarmServiceImpl.java index 5e5000d..1b96bf2 100644 --- a/src/main/java/com/zhgd/xmgl/modules/wisdom/service/impl/EnvironmentAlarmServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/city/dust/service/impl/EnvironmentAlarmServiceImpl.java @@ -1,4 +1,4 @@ -package com.zhgd.xmgl.modules.wisdom.service.impl; +package com.zhgd.xmgl.modules.city.dust.service.impl; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; @@ -14,12 +14,12 @@ 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.wisdom.entity.DustNoiseData; -import com.zhgd.xmgl.modules.wisdom.entity.EnvironmentAlarm; -import com.zhgd.xmgl.modules.wisdom.mapper.EnvironmentAlarmMapper; -import com.zhgd.xmgl.modules.wisdom.service.IDustNoiseDataService; -import com.zhgd.xmgl.modules.wisdom.service.IEnvironmentAlarmService; -import com.zhgd.xmgl.modules.wisdom.service.IEnvironmentDevService; +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.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.util.DateUtils; 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/EnvironmentDevServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/city/dust/service/impl/EnvironmentDevServiceImpl.java similarity index 93% rename from src/main/java/com/zhgd/xmgl/modules/wisdom/service/impl/EnvironmentDevServiceImpl.java rename to src/main/java/com/zhgd/xmgl/modules/city/dust/service/impl/EnvironmentDevServiceImpl.java index c7d0316..8167f07 100644 --- a/src/main/java/com/zhgd/xmgl/modules/wisdom/service/impl/EnvironmentDevServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/city/dust/service/impl/EnvironmentDevServiceImpl.java @@ -1,4 +1,4 @@ -package com.zhgd.xmgl.modules.wisdom.service.impl; +package com.zhgd.xmgl.modules.city.dust.service.impl; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.util.NumberUtil; @@ -21,13 +21,13 @@ 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.wisdom.entity.DustNoiseData; -import com.zhgd.xmgl.modules.wisdom.entity.EnvironmentAlarm; -import com.zhgd.xmgl.modules.wisdom.entity.EnvironmentDev; -import com.zhgd.xmgl.modules.wisdom.mapper.EnvironmentDevMapper; -import com.zhgd.xmgl.modules.wisdom.service.IDustNoiseDataService; -import com.zhgd.xmgl.modules.wisdom.service.IEnvironmentAlarmService; -import com.zhgd.xmgl.modules.wisdom.service.IEnvironmentDevService; +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.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 org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; 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 9281d63..6e05ed5 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 @@ -22,7 +22,7 @@ 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.monitor.mapper.MonitorDevMapper; import com.zhgd.xmgl.modules.wisdom.service.IAiMonitorAlarmService; -import com.zhgd.xmgl.modules.wisdom.service.IEnvironmentAlarmService; +import com.zhgd.xmgl.modules.city.dust.service.IEnvironmentAlarmService; import com.zhgd.xmgl.security.SecurityUser; import com.zhgd.xmgl.security.SecurityUtil; import com.zhgd.xmgl.util.CommonUtil; 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 80e7db2..13a0c02 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 @@ -21,7 +21,7 @@ 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.wisdom.mapper.EnvironmentDevMapper; +import com.zhgd.xmgl.modules.city.dust.mapper.EnvironmentDevMapper; import com.zhgd.xmgl.security.SecurityUser; import com.zhgd.xmgl.security.SecurityUtil; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/main/java/com/zhgd/xmgl/modules/city/monitor/service/impl/MonitorQuestionServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/city/monitor/service/impl/MonitorQuestionServiceImpl.java index 5761fc5..a51778e 100644 --- a/src/main/java/com/zhgd/xmgl/modules/city/monitor/service/impl/MonitorQuestionServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/city/monitor/service/impl/MonitorQuestionServiceImpl.java @@ -17,7 +17,7 @@ import com.zhgd.xmgl.modules.city.monitor.mapper.MonitorDevMapper; import com.zhgd.xmgl.modules.city.monitor.mapper.MonitorQuestionMapper; import com.zhgd.xmgl.modules.city.monitor.service.IMonitorQuestionService; import com.zhgd.xmgl.modules.wisdom.mapper.AiMonitorAlarmMapper; -import com.zhgd.xmgl.modules.wisdom.mapper.EnvironmentAlarmMapper; +import com.zhgd.xmgl.modules.city.dust.mapper.EnvironmentAlarmMapper; import com.zhgd.xmgl.util.DateUtils; import com.zhgd.xmgl.util.RefUtil; import org.apache.commons.collections.MapUtils; diff --git a/src/main/java/com/zhgd/xmgl/modules/city/project/service/impl/ProjectServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/city/project/service/impl/ProjectServiceImpl.java index 95ed1b1..5f9ad9d 100644 --- a/src/main/java/com/zhgd/xmgl/modules/city/project/service/impl/ProjectServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/city/project/service/impl/ProjectServiceImpl.java @@ -18,7 +18,7 @@ import com.zhgd.xmgl.modules.city.project.entity.Project; import com.zhgd.xmgl.modules.city.project.mapper.ProjectMapper; import com.zhgd.xmgl.modules.city.project.service.IProjectService; import com.zhgd.xmgl.modules.wisdom.service.IAiMonitorAlarmService; -import com.zhgd.xmgl.modules.wisdom.service.IEnvironmentAlarmService; +import com.zhgd.xmgl.modules.city.dust.service.IEnvironmentAlarmService; import com.zhgd.xmgl.security.SecurityUser; import com.zhgd.xmgl.security.SecurityUtil; import com.zhgd.xmgl.util.CommonUtil; diff --git a/src/main/java/com/zhgd/xmgl/modules/wisdom/dto/EnvironmentDevDto.java b/src/main/java/com/zhgd/xmgl/modules/wisdom/dto/EnvironmentDevDto.java index 2615ce9..9ac7ff2 100644 --- a/src/main/java/com/zhgd/xmgl/modules/wisdom/dto/EnvironmentDevDto.java +++ b/src/main/java/com/zhgd/xmgl/modules/wisdom/dto/EnvironmentDevDto.java @@ -1,8 +1,8 @@ package com.zhgd.xmgl.modules.wisdom.dto; -import com.zhgd.xmgl.modules.wisdom.entity.DustNoiseData; -import com.zhgd.xmgl.modules.wisdom.entity.EnvironmentAlarm; -import com.zhgd.xmgl.modules.wisdom.entity.EnvironmentDev; +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 io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/src/main/java/com/zhgd/xmgl/modules/wisdom/dto/MapEnvironAlarmDto.java b/src/main/java/com/zhgd/xmgl/modules/wisdom/dto/MapEnvironAlarmDto.java index c6796fe..74a7db5 100644 --- a/src/main/java/com/zhgd/xmgl/modules/wisdom/dto/MapEnvironAlarmDto.java +++ b/src/main/java/com/zhgd/xmgl/modules/wisdom/dto/MapEnvironAlarmDto.java @@ -1,7 +1,7 @@ package com.zhgd.xmgl.modules.wisdom.dto; -import com.zhgd.xmgl.modules.wisdom.entity.DustNoiseData; -import com.zhgd.xmgl.modules.wisdom.entity.EnvironmentAlarm; +import com.zhgd.xmgl.modules.city.dust.entity.DustNoiseData; +import com.zhgd.xmgl.modules.city.dust.entity.EnvironmentAlarm; 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 3ee6825..22b7dcc 100644 --- a/src/main/java/com/zhgd/xmgl/task/DevStateTask.java +++ b/src/main/java/com/zhgd/xmgl/task/DevStateTask.java @@ -5,6 +5,10 @@ import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.zhgd.xmgl.modules.basicdata.api.camera.MonitorApi; +import com.zhgd.xmgl.modules.city.dust.entity.DustNoiseData; +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.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.*;