admin/wisdomisitezw-city_java
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

移动代码

Browse Source
This commit is contained in:
guo 2023-08-30 10:07:05 +08:00
parent cbe43d8438
commit 85801197b2
33 changed files with 89 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/com/zhgd/xmgl/modules/basicdata/controller/admin/HardWareCallbackController.java
View File

@ -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.entity.SystemDictData;
import com.zhgd.xmgl.modules.basicdata.service.IHardWareAlarmService; import com.zhgd.xmgl.modules.basicdata.service.IHardWareAlarmService;
import com.zhgd.xmgl.modules.basicdata.service.ISystemDictDataService; 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.entity.*;
import com.zhgd.xmgl.modules.wisdom.service.*; import com.zhgd.xmgl.modules.wisdom.service.*;
import com.zhgd.xmgl.util.CommonUtil; import com.zhgd.xmgl.util.CommonUtil;

4
src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntDustNoiseDataController.java
View File

@ -8,8 +8,8 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.zhgd.annotation.OperLog; import com.zhgd.annotation.OperLog;
import com.zhgd.jeecg.common.api.vo.Result; import com.zhgd.jeecg.common.api.vo.Result;
import com.zhgd.jeecg.common.util.PageUtil; import com.zhgd.jeecg.common.util.PageUtil;
import com.zhgd.xmgl.modules.wisdom.entity.DustNoiseData; import com.zhgd.xmgl.modules.city.dust.entity.DustNoiseData;
import com.zhgd.xmgl.modules.wisdom.service.IDustNoiseDataService; import com.zhgd.xmgl.modules.city.dust.service.IDustNoiseDataService;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiImplicitParams;

6
src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntEnvironmentAlarmController.java
View File

@ -3,8 +3,8 @@ package com.zhgd.xmgl.modules.basicdata.controller.enterprise;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.zhgd.annotation.OperLog; import com.zhgd.annotation.OperLog;
import com.zhgd.jeecg.common.api.vo.Result; import com.zhgd.jeecg.common.api.vo.Result;
import com.zhgd.xmgl.modules.wisdom.entity.EnvironmentAlarm; import com.zhgd.xmgl.modules.city.dust.entity.EnvironmentAlarm;
import com.zhgd.xmgl.modules.wisdom.service.IEnvironmentAlarmService; import com.zhgd.xmgl.modules.city.dust.service.IEnvironmentAlarmService;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiImplicitParams;
@ -56,7 +56,7 @@ public class EntEnvironmentAlarmController {
IPage<EnvironmentAlarm> pageList = environmentAlarmService.pageList(map); IPage<EnvironmentAlarm> pageList = environmentAlarmService.pageList(map);
return Result.success(pageList); return Result.success(pageList);
} }
/** /**
* 编辑 * 编辑
* @param environmentAlarm * @param environmentAlarm

4
src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntEnvironmentDevController.java
View File

@ -9,9 +9,9 @@ import com.zhgd.annotation.OperLog;
import com.zhgd.jeecg.common.api.vo.Result; import com.zhgd.jeecg.common.api.vo.Result;
import com.zhgd.jeecg.common.util.PageUtil; import com.zhgd.jeecg.common.util.PageUtil;
import com.zhgd.xmgl.modules.wisdom.dto.EnvironmentDevDto; 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.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.SecurityUser;
import com.zhgd.xmgl.security.SecurityUtil; import com.zhgd.xmgl.security.SecurityUtil;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;

2
src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovEngineeringController.java
View File

@ -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.city.engineering.entity.Engineering;
import com.zhgd.xmgl.modules.wisdom.service.IAiMonitorAlarmService; import com.zhgd.xmgl.modules.wisdom.service.IAiMonitorAlarmService;
import com.zhgd.xmgl.modules.city.engineering.service.IEngineeringService; 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.statistics.EngineeringStat;
import com.zhgd.xmgl.modules.basicdata.vo.EngineeringVo; import com.zhgd.xmgl.modules.basicdata.vo.EngineeringVo;
import com.zhgd.xmgl.valid.EditGroup; import com.zhgd.xmgl.valid.EditGroup;

4
src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovEnvironmentAlarmController.java
View File

@ -3,8 +3,8 @@ package com.zhgd.xmgl.modules.basicdata.controller.government;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.zhgd.annotation.OperLog; import com.zhgd.annotation.OperLog;
import com.zhgd.jeecg.common.api.vo.Result; import com.zhgd.jeecg.common.api.vo.Result;
import com.zhgd.xmgl.modules.wisdom.entity.EnvironmentAlarm; import com.zhgd.xmgl.modules.city.dust.entity.EnvironmentAlarm;
import com.zhgd.xmgl.modules.wisdom.service.IEnvironmentAlarmService; import com.zhgd.xmgl.modules.city.dust.service.IEnvironmentAlarmService;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiImplicitParams;

6
src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovEnvironmentDevController.java
View File

@ -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.city.engineering.service.IEngineeringService;
import com.zhgd.xmgl.modules.wisdom.dto.EnvironmentDevDto; import com.zhgd.xmgl.modules.wisdom.dto.EnvironmentDevDto;
import com.zhgd.xmgl.modules.wisdom.dto.EnvironmentDevStatDto; 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 com.zhgd.xmgl.modules.wisdom.service.IEnvironmentAlarmService; import com.zhgd.xmgl.modules.city.dust.service.IEnvironmentAlarmService;
import com.zhgd.xmgl.modules.wisdom.service.IEnvironmentDevService; import com.zhgd.xmgl.modules.city.dust.service.IEnvironmentDevService;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiImplicitParams;

2
src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovProjectController.java
View File

@ -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.basicdata.entity.Enterprise;
import com.zhgd.xmgl.modules.city.project.entity.Project; import com.zhgd.xmgl.modules.city.project.entity.Project;
import com.zhgd.xmgl.modules.wisdom.service.IAiMonitorAlarmService; 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.modules.city.project.service.IProjectService;
import com.zhgd.xmgl.security.SecurityUtil; import com.zhgd.xmgl.security.SecurityUtil;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;

8
src/main/java/com/zhgd/xmgl/modules/basicdata/controller/project/DustNoiseDataController.java → src/main/java/com/zhgd/xmgl/modules/city/dust/controller/DustNoiseDataController.java
View File

@ -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 cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; 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.api.vo.Result;
import com.zhgd.jeecg.common.util.PageUtil; import com.zhgd.jeecg.common.util.PageUtil;
import com.zhgd.xmgl.modules.basicdata.constant.ParamConstants; import com.zhgd.xmgl.modules.basicdata.constant.ParamConstants;
import com.zhgd.xmgl.modules.wisdom.entity.DustNoiseData; import com.zhgd.xmgl.modules.city.dust.entity.DustNoiseData;
import com.zhgd.xmgl.modules.wisdom.service.IDustNoiseDataService; import com.zhgd.xmgl.modules.city.dust.service.IDustNoiseDataService;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiImplicitParams;
@ -42,7 +42,7 @@ import java.util.Map;
public class DustNoiseDataController { public class DustNoiseDataController {
@Autowired @Autowired
private IDustNoiseDataService dustNoiseDataService; private IDustNoiseDataService dustNoiseDataService;
/** /**
* 分页列表查询 * 分页列表查询
* @return * @return

6
src/main/java/com/zhgd/xmgl/modules/basicdata/controller/project/EnvironmentAlarmController.java → src/main/java/com/zhgd/xmgl/modules/city/dust/controller/EnvironmentAlarmController.java
View File

@ -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.baomidou.mybatisplus.core.metadata.IPage;
import com.zhgd.annotation.OperLog; import com.zhgd.annotation.OperLog;
import com.zhgd.jeecg.common.api.vo.Result; import com.zhgd.jeecg.common.api.vo.Result;
import com.zhgd.xmgl.modules.wisdom.entity.EnvironmentAlarm; import com.zhgd.xmgl.modules.city.dust.entity.EnvironmentAlarm;
import com.zhgd.xmgl.modules.wisdom.service.IEnvironmentAlarmService; import com.zhgd.xmgl.modules.city.dust.service.IEnvironmentAlarmService;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiImplicitParams;

6
src/main/java/com/zhgd/xmgl/modules/basicdata/controller/project/EnvironmentDevController.java → src/main/java/com/zhgd/xmgl/modules/city/dust/controller/EnvironmentDevController.java
View File

@ -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 cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; 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.jeecg.common.util.PageUtil;
import com.zhgd.xmgl.modules.basicdata.constant.ParamConstants; import com.zhgd.xmgl.modules.basicdata.constant.ParamConstants;
import com.zhgd.xmgl.modules.wisdom.dto.EnvironmentDevDto; 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.wisdom.service.IEnvironmentDevService; import com.zhgd.xmgl.modules.city.dust.service.IEnvironmentDevService;
import com.zhgd.xmgl.security.SecurityUser; import com.zhgd.xmgl.security.SecurityUser;
import com.zhgd.xmgl.security.SecurityUtil; import com.zhgd.xmgl.security.SecurityUtil;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;

2
src/main/java/com/zhgd/xmgl/modules/wisdom/entity/DustNoiseData.java → src/main/java/com/zhgd/xmgl/modules/city/dust/entity/DustNoiseData.java
View File

@ -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.IdType;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;

2
src/main/java/com/zhgd/xmgl/modules/wisdom/entity/EnvironmentAlarm.java → src/main/java/com/zhgd/xmgl/modules/city/dust/entity/EnvironmentAlarm.java
View File

@ -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.IdType;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;

2
src/main/java/com/zhgd/xmgl/modules/wisdom/entity/EnvironmentDev.java → src/main/java/com/zhgd/xmgl/modules/city/dust/entity/EnvironmentDev.java
View File

@ -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.IdType;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;

4
src/main/java/com/zhgd/xmgl/modules/wisdom/mapper/DustNoiseDataMapper.java → src/main/java/com/zhgd/xmgl/modules/city/dust/mapper/DustNoiseDataMapper.java
View File

@ -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.conditions.Wrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.toolkit.Constants; import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.zhgd.annotation.DataScope; 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.Mapper;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;

4
src/main/java/com/zhgd/xmgl/modules/wisdom/mapper/EnvironmentAlarmMapper.java → src/main/java/com/zhgd/xmgl/modules/city/dust/mapper/EnvironmentAlarmMapper.java
View File

@ -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.conditions.Wrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.toolkit.Constants; import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.zhgd.annotation.DataScope; 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.Mapper;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;

4
src/main/java/com/zhgd/xmgl/modules/wisdom/mapper/EnvironmentDevMapper.java → src/main/java/com/zhgd/xmgl/modules/city/dust/mapper/EnvironmentDevMapper.java
View File

@ -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.conditions.Wrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.toolkit.Constants; import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.zhgd.annotation.DataScope; 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.Mapper;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;

8
src/main/java/com/zhgd/xmgl/modules/wisdom/mapper/xml/DustNoiseDataMapper.xml → src/main/java/com/zhgd/xmgl/modules/city/dust/mapper/xml/DustNoiseDataMapper.xml
View File

@ -1,14 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.zhgd.xmgl.modules.wisdom.mapper.DustNoiseDataMapper"> <mapper namespace="com.zhgd.xmgl.modules.city.dust.mapper.DustNoiseDataMapper">
<select id="getNewData" resultType="com.zhgd.xmgl.modules.wisdom.entity.DustNoiseData"> <select id="getNewData" resultType="com.zhgd.xmgl.modules.city.dust.entity.DustNoiseData">
SELECT * FROM dust_noise_data WHERE device_code = #{deviceCode} ORDER BY upload_date DESC LIMIT 1 SELECT * FROM dust_noise_data WHERE device_code = #{deviceCode} ORDER BY upload_date DESC LIMIT 1
</select> </select>
<select id="pageList" resultType="com.zhgd.xmgl.modules.wisdom.entity.DustNoiseData"> <select id="pageList" resultType="com.zhgd.xmgl.modules.city.dust.entity.DustNoiseData">
SELECT d.*, ed.`name` as deviceName, e.engineering_name FROM dust_noise_data d 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 environment_dev ed ON d.device_code = ed.`code`
LEFT JOIN engineering e ON d.engineering_sn = e.engineering_sn LEFT JOIN engineering e ON d.engineering_sn = e.engineering_sn
${ew.customSqlSegment} ${ew.customSqlSegment}
</select> </select>
</mapper> </mapper>

6
src/main/java/com/zhgd/xmgl/modules/wisdom/mapper/xml/EnvironmentAlarmMapper.xml → src/main/java/com/zhgd/xmgl/modules/city/dust/mapper/xml/EnvironmentAlarmMapper.xml
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.zhgd.xmgl.modules.wisdom.mapper.EnvironmentAlarmMapper"> <mapper namespace="com.zhgd.xmgl.modules.city.dust.mapper.EnvironmentAlarmMapper">
<select id="pageList" resultType="com.zhgd.xmgl.modules.wisdom.entity.EnvironmentAlarm"> <select id="pageList" resultType="com.zhgd.xmgl.modules.city.dust.entity.EnvironmentAlarm">
SELECT a.*, d.name as deviceName FROM environment_alarm a SELECT a.*, d.name as deviceName FROM environment_alarm a
LEFT JOIN environment_dev d ON d.code = a.device_code LEFT JOIN environment_dev d ON d.code = a.device_code
${ew.customSqlSegment} ${ew.customSqlSegment}
@ -14,4 +14,4 @@
<select id="statByEngineering" resultType="java.lang.Integer"> <select id="statByEngineering" resultType="java.lang.Integer">
SELECT COUNT(DISTINCT engineering_sn) AS environmentAlarmNum FROM environment_alarm WHERE engineering_sn != '' SELECT COUNT(DISTINCT engineering_sn) AS environmentAlarmNum FROM environment_alarm WHERE engineering_sn != ''
</select> </select>
</mapper> </mapper>

10
src/main/java/com/zhgd/xmgl/modules/wisdom/mapper/xml/EnvironmentDevMapper.xml → src/main/java/com/zhgd/xmgl/modules/city/dust/mapper/xml/EnvironmentDevMapper.xml
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.zhgd.xmgl.modules.wisdom.mapper.EnvironmentDevMapper"> <mapper namespace="com.zhgd.xmgl.modules.city.dust.mapper.EnvironmentDevMapper">
<select id="pageList" resultType="com.zhgd.xmgl.modules.wisdom.entity.EnvironmentDev"> <select id="pageList" resultType="com.zhgd.xmgl.modules.city.dust.entity.EnvironmentDev">
SELECT d.*, p.project_name, e.engineering_name FROM environment_dev d 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 project p ON d.project_sn = p.project_sn
LEFT JOIN engineering e ON d.engineering_sn = e.engineering_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 COUNT(1) AS aiMonitorDevNum FROM environment_dev
</select> </select>
<select id="getDetail" resultType="com.zhgd.xmgl.modules.wisdom.entity.EnvironmentDev"> <select id="getDetail" resultType="com.zhgd.xmgl.modules.city.dust.entity.EnvironmentDev">
SELECT d.*, p.project_name, e.engineering_name FROM environment_dev d 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 project p ON d.project_sn = p.project_sn
LEFT JOIN engineering e ON d.engineering_sn = e.engineering_sn LEFT JOIN engineering e ON d.engineering_sn = e.engineering_sn
@ -33,7 +33,7 @@
</if> </if>
</select> </select>
<select id="getByCode" resultType="com.zhgd.xmgl.modules.wisdom.entity.EnvironmentDev"> <select id="getByCode" resultType="com.zhgd.xmgl.modules.city.dust.entity.EnvironmentDev">
SELECT * FROM environment_dev WHERE code = #{code} SELECT * FROM environment_dev WHERE code = #{code}
</select> </select>
</mapper> </mapper>

4
src/main/java/com/zhgd/xmgl/modules/wisdom/service/IDustNoiseDataService.java → src/main/java/com/zhgd/xmgl/modules/city/dust/service/IDustNoiseDataService.java
View File

@ -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.core.conditions.Wrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService; 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: 扬尘实时数据管理 * @Description: 扬尘实时数据管理

4
src/main/java/com/zhgd/xmgl/modules/wisdom/service/IEnvironmentAlarmService.java → src/main/java/com/zhgd/xmgl/modules/city/dust/service/IEnvironmentAlarmService.java
View File

@ -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.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
import com.zhgd.xmgl.modules.wisdom.dto.MapEnvironAlarmDto; 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; import java.util.Map;

4
src/main/java/com/zhgd/xmgl/modules/wisdom/service/IEnvironmentDevService.java → src/main/java/com/zhgd/xmgl/modules/city/dust/service/IEnvironmentDevService.java
View File

@ -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.core.conditions.Wrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; 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.basicdata.dto.ProjectDeviceDto;
import com.zhgd.xmgl.modules.wisdom.dto.EnvironmentDevDto; import com.zhgd.xmgl.modules.wisdom.dto.EnvironmentDevDto;
import com.zhgd.xmgl.modules.wisdom.dto.EnvironmentDevStatDto; 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.List;
import java.util.Map; import java.util.Map;

8
src/main/java/com/zhgd/xmgl/modules/wisdom/service/impl/DustNoiseDataServiceImpl.java → src/main/java/com/zhgd/xmgl/modules/city/dust/service/impl/DustNoiseDataServiceImpl.java
View File

@ -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.core.conditions.Wrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; 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.basicdata.entity.SystemDictData;
import com.zhgd.xmgl.modules.wisdom.mapper.DustNoiseDataMapper; import com.zhgd.xmgl.modules.city.dust.mapper.DustNoiseDataMapper;
import com.zhgd.xmgl.modules.wisdom.service.IDustNoiseDataService; import com.zhgd.xmgl.modules.city.dust.service.IDustNoiseDataService;
import com.zhgd.xmgl.modules.basicdata.service.ISystemDictDataService; import com.zhgd.xmgl.modules.basicdata.service.ISystemDictDataService;
import com.zhgd.xmgl.util.ParamEnum; import com.zhgd.xmgl.util.ParamEnum;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;

14
src/main/java/com/zhgd/xmgl/modules/wisdom/service/impl/EnvironmentAlarmServiceImpl.java → src/main/java/com/zhgd/xmgl/modules/city/dust/service/impl/EnvironmentAlarmServiceImpl.java
View File

@ -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.date.DateUtil;
import cn.hutool.core.util.StrUtil; 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.CacheConstants;
import com.zhgd.xmgl.modules.basicdata.constant.ParamConstants; import com.zhgd.xmgl.modules.basicdata.constant.ParamConstants;
import com.zhgd.xmgl.modules.wisdom.dto.MapEnvironAlarmDto; import com.zhgd.xmgl.modules.wisdom.dto.MapEnvironAlarmDto;
import com.zhgd.xmgl.modules.wisdom.entity.DustNoiseData; import com.zhgd.xmgl.modules.city.dust.entity.DustNoiseData;
import com.zhgd.xmgl.modules.wisdom.entity.EnvironmentAlarm; import com.zhgd.xmgl.modules.city.dust.entity.EnvironmentAlarm;
import com.zhgd.xmgl.modules.wisdom.mapper.EnvironmentAlarmMapper; import com.zhgd.xmgl.modules.city.dust.mapper.EnvironmentAlarmMapper;
import com.zhgd.xmgl.modules.wisdom.service.IDustNoiseDataService; import com.zhgd.xmgl.modules.city.dust.service.IDustNoiseDataService;
import com.zhgd.xmgl.modules.wisdom.service.IEnvironmentAlarmService; import com.zhgd.xmgl.modules.city.dust.service.IEnvironmentAlarmService;
import com.zhgd.xmgl.modules.wisdom.service.IEnvironmentDevService; import com.zhgd.xmgl.modules.city.dust.service.IEnvironmentDevService;
import com.zhgd.xmgl.util.DateUtils; import com.zhgd.xmgl.util.DateUtils;
import org.apache.commons.collections.MapUtils; import org.apache.commons.collections.MapUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;

16
src/main/java/com/zhgd/xmgl/modules/wisdom/service/impl/EnvironmentDevServiceImpl.java → src/main/java/com/zhgd/xmgl/modules/city/dust/service/impl/EnvironmentDevServiceImpl.java
View File

@ -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.bean.BeanUtil;
import cn.hutool.core.util.NumberUtil; 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.city.project.service.IProjectService;
import com.zhgd.xmgl.modules.wisdom.dto.EnvironmentDevDto; import com.zhgd.xmgl.modules.wisdom.dto.EnvironmentDevDto;
import com.zhgd.xmgl.modules.wisdom.dto.EnvironmentDevStatDto; import com.zhgd.xmgl.modules.wisdom.dto.EnvironmentDevStatDto;
import com.zhgd.xmgl.modules.wisdom.entity.DustNoiseData; import com.zhgd.xmgl.modules.city.dust.entity.DustNoiseData;
import com.zhgd.xmgl.modules.wisdom.entity.EnvironmentAlarm; import com.zhgd.xmgl.modules.city.dust.entity.EnvironmentAlarm;
import com.zhgd.xmgl.modules.wisdom.entity.EnvironmentDev; import com.zhgd.xmgl.modules.city.dust.entity.EnvironmentDev;
import com.zhgd.xmgl.modules.wisdom.mapper.EnvironmentDevMapper; import com.zhgd.xmgl.modules.city.dust.mapper.EnvironmentDevMapper;
import com.zhgd.xmgl.modules.wisdom.service.IDustNoiseDataService; import com.zhgd.xmgl.modules.city.dust.service.IDustNoiseDataService;
import com.zhgd.xmgl.modules.wisdom.service.IEnvironmentAlarmService; import com.zhgd.xmgl.modules.city.dust.service.IEnvironmentAlarmService;
import com.zhgd.xmgl.modules.wisdom.service.IEnvironmentDevService; import com.zhgd.xmgl.modules.city.dust.service.IEnvironmentDevService;
import org.springframework.beans.BeanUtils; import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;

2
src/main/java/com/zhgd/xmgl/modules/city/engineering/service/impl/EngineeringServiceImpl.java
View File

@ -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.entity.bo.OnlineGroupByProjectBo;
import com.zhgd.xmgl.modules.city.monitor.mapper.MonitorDevMapper; import com.zhgd.xmgl.modules.city.monitor.mapper.MonitorDevMapper;
import com.zhgd.xmgl.modules.wisdom.service.IAiMonitorAlarmService; 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.SecurityUser;
import com.zhgd.xmgl.security.SecurityUtil; import com.zhgd.xmgl.security.SecurityUtil;
import com.zhgd.xmgl.util.CommonUtil; import com.zhgd.xmgl.util.CommonUtil;

2
src/main/java/com/zhgd/xmgl/modules/city/monitor/service/impl/MonitorDevServiceImpl.java
View File

@ -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.monitor.service.IMonitorDevService;
import com.zhgd.xmgl.modules.city.project.entity.Project; import com.zhgd.xmgl.modules.city.project.entity.Project;
import com.zhgd.xmgl.modules.wisdom.mapper.AiMonitorDevMapper; 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.SecurityUser;
import com.zhgd.xmgl.security.SecurityUtil; import com.zhgd.xmgl.security.SecurityUtil;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;

2
src/main/java/com/zhgd/xmgl/modules/city/monitor/service/impl/MonitorQuestionServiceImpl.java
View File

@ -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.mapper.MonitorQuestionMapper;
import com.zhgd.xmgl.modules.city.monitor.service.IMonitorQuestionService; import com.zhgd.xmgl.modules.city.monitor.service.IMonitorQuestionService;
import com.zhgd.xmgl.modules.wisdom.mapper.AiMonitorAlarmMapper; 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.DateUtils;
import com.zhgd.xmgl.util.RefUtil; import com.zhgd.xmgl.util.RefUtil;
import org.apache.commons.collections.MapUtils; import org.apache.commons.collections.MapUtils;

2
src/main/java/com/zhgd/xmgl/modules/city/project/service/impl/ProjectServiceImpl.java
View File

@ -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.mapper.ProjectMapper;
import com.zhgd.xmgl.modules.city.project.service.IProjectService; import com.zhgd.xmgl.modules.city.project.service.IProjectService;
import com.zhgd.xmgl.modules.wisdom.service.IAiMonitorAlarmService; 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.SecurityUser;
import com.zhgd.xmgl.security.SecurityUtil; import com.zhgd.xmgl.security.SecurityUtil;
import com.zhgd.xmgl.util.CommonUtil; import com.zhgd.xmgl.util.CommonUtil;

6
src/main/java/com/zhgd/xmgl/modules/wisdom/dto/EnvironmentDevDto.java
View File

@ -1,8 +1,8 @@
package com.zhgd.xmgl.modules.wisdom.dto; package com.zhgd.xmgl.modules.wisdom.dto;
import com.zhgd.xmgl.modules.wisdom.entity.DustNoiseData; import com.zhgd.xmgl.modules.city.dust.entity.DustNoiseData;
import com.zhgd.xmgl.modules.wisdom.entity.EnvironmentAlarm; import com.zhgd.xmgl.modules.city.dust.entity.EnvironmentAlarm;
import com.zhgd.xmgl.modules.wisdom.entity.EnvironmentDev; import com.zhgd.xmgl.modules.city.dust.entity.EnvironmentDev;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;

4
src/main/java/com/zhgd/xmgl/modules/wisdom/dto/MapEnvironAlarmDto.java
View File

@ -1,7 +1,7 @@
package com.zhgd.xmgl.modules.wisdom.dto; package com.zhgd.xmgl.modules.wisdom.dto;
import com.zhgd.xmgl.modules.wisdom.entity.DustNoiseData; import com.zhgd.xmgl.modules.city.dust.entity.DustNoiseData;
import com.zhgd.xmgl.modules.wisdom.entity.EnvironmentAlarm; import com.zhgd.xmgl.modules.city.dust.entity.EnvironmentAlarm;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;

4
src/main/java/com/zhgd/xmgl/task/DevStateTask.java
View File

@ -5,6 +5,10 @@ import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.zhgd.xmgl.modules.basicdata.api.camera.MonitorApi; 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.entity.MonitorDev;
import com.zhgd.xmgl.modules.city.monitor.service.IMonitorDevService; import com.zhgd.xmgl.modules.city.monitor.service.IMonitorDevService;
import com.zhgd.xmgl.modules.wisdom.entity.*; import com.zhgd.xmgl.modules.wisdom.entity.*;