diff --git a/src/main/java/com/zhgd/xmgl/base/entity/vo/CityAndDistrictDeviceCountVo.java b/src/main/java/com/zhgd/xmgl/base/entity/vo/CityAndDistrictDeviceCountVo.java index 73521aa..9f7fdcb 100644 --- a/src/main/java/com/zhgd/xmgl/base/entity/vo/CityAndDistrictDeviceCountVo.java +++ b/src/main/java/com/zhgd/xmgl/base/entity/vo/CityAndDistrictDeviceCountVo.java @@ -26,6 +26,12 @@ public class CityAndDistrictDeviceCountVo extends Engineering { @ApiModelProperty("总数") @JsonInclude(JsonInclude.Include.NON_NULL) private Integer count; + @ApiModelProperty("工程总数") + @JsonInclude(JsonInclude.Include.NON_NULL) + private Integer engineeringCount; + @ApiModelProperty("安装了的工程总数") + @JsonInclude(JsonInclude.Include.NON_NULL) + private Integer installEngineeringCount; @ApiModelProperty("在线数量") @JsonInclude(JsonInclude.Include.NON_NULL) private Integer onlineCount; diff --git a/src/main/java/com/zhgd/xmgl/base/entity/vo/SectorOneVo.java b/src/main/java/com/zhgd/xmgl/base/entity/vo/SectorOneVo.java index 91a4dd0..13e4196 100644 --- a/src/main/java/com/zhgd/xmgl/base/entity/vo/SectorOneVo.java +++ b/src/main/java/com/zhgd/xmgl/base/entity/vo/SectorOneVo.java @@ -41,7 +41,7 @@ public class SectorOneVo { public static List getSectorOneVosForGovernment(List list, GovernmentMapper governmentMapper) { Map map = list.stream().collect(Collectors.toMap(SectorOneVo::getName, Function.identity(), (o1, o2) -> o1)); - List myGovernments = governmentMapper.getMyGovernments(SecurityUtil.getUser().getSn()); + List myGovernments = governmentMapper.getMyUnderGovernments(SecurityUtil.getUser().getSn()); List rtList = new ArrayList<>(); for (Government government : myGovernments) { String governmentName = government.getGovernmentName(); diff --git a/src/main/java/com/zhgd/xmgl/base/entity/vo/TrendVo.java b/src/main/java/com/zhgd/xmgl/base/entity/vo/TrendVo.java index ce1764f..9d34c79 100644 --- a/src/main/java/com/zhgd/xmgl/base/entity/vo/TrendVo.java +++ b/src/main/java/com/zhgd/xmgl/base/entity/vo/TrendVo.java @@ -21,7 +21,7 @@ public class TrendVo { public static List getTrendVosForGovernment(List list, GovernmentMapper governmentMapper) { Map map = list.stream().collect(Collectors.toMap(TrendVo::getX, Function.identity(), (o1, o2) -> o1)); - List myGovernments = governmentMapper.getMyGovernments(SecurityUtil.getUser().getSn()); + List myGovernments = governmentMapper.getMyUnderGovernments(SecurityUtil.getUser().getSn()); List rtList = new ArrayList<>(); for (Government government : myGovernments) { String governmentName = government.getGovernmentName(); diff --git a/src/main/java/com/zhgd/xmgl/constant/CommonConstant.java b/src/main/java/com/zhgd/xmgl/constant/CommonConstant.java new file mode 100644 index 0000000..1f3074d --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/constant/CommonConstant.java @@ -0,0 +1,5 @@ +package com.zhgd.xmgl.constant; + +public interface CommonConstant { + public static final String IGNORE_DATA_SCOPE = "ignoreDataScope"; +} diff --git a/src/main/java/com/zhgd/xmgl/modules/city/deepexcavation/service/impl/DeepExcavationEngineeringServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/city/deepexcavation/service/impl/DeepExcavationEngineeringServiceImpl.java index ea7c921..a448b5d 100644 --- a/src/main/java/com/zhgd/xmgl/modules/city/deepexcavation/service/impl/DeepExcavationEngineeringServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/city/deepexcavation/service/impl/DeepExcavationEngineeringServiceImpl.java @@ -193,7 +193,7 @@ public class DeepExcavationEngineeringServiceImpl extends ServiceImpl map = new HashMap<>(); - List myGovernments = governmentMapper.getMyGovernments(SecurityUtil.getUser().getSn()); + List myGovernments = governmentMapper.getMyUnderGovernments(SecurityUtil.getUser().getSn()); List names = myGovernments.stream().map(Government::getGovernmentName).collect(Collectors.toList()); vo.setX(names); List datas = new ArrayList<>(); 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 56b82a5..ac30354 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 @@ -3,7 +3,9 @@ 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.base.entity.vo.MultiTrendVo; import com.zhgd.xmgl.modules.city.dust.entity.EnvironmentAlarm; +import com.zhgd.xmgl.modules.city.dust.entity.vo.EnvironmentAlarmRankVo; import com.zhgd.xmgl.modules.city.dust.entity.vo.EnvironmentAlarmTypeVo; import com.zhgd.xmgl.modules.city.dust.service.IEnvironmentAlarmService; import io.swagger.annotations.Api; @@ -18,6 +20,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import springfox.documentation.annotations.ApiIgnore; +import java.util.HashMap; import java.util.Map; @@ -58,29 +61,6 @@ public class EnvironmentAlarmController { return Result.success(pageList); } - /** - * 编辑 - * - * @param environmentAlarm - * @return - */ - @OperLog(operModul = "扬尘报警管理", operType = "修改", operDesc = "编辑扬尘报警台账表信息") - @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) { - result.error500("未找到对应实体"); - } else { - boolean ok = environmentAlarmService.updateById(environmentAlarm); - if (ok) { - result.success("修改成功!"); - } - } - return result; - } - @OperLog(operModul = "扬尘报警管理", operType = "统计", operDesc = "按类型统计今日预警") @ApiOperation(value = " 按类型统计今日预警", notes = "按类型统计今日预警", httpMethod = "POST") @PostMapping(value = "/countTodayEnvironmentAlarmGroupByType") @@ -88,4 +68,27 @@ public class EnvironmentAlarmController { EnvironmentAlarmTypeVo list = environmentAlarmService.countTodayEnvironmentAlarmGroupByType(); return Result.success(list); } + + @OperLog(operModul = "扬尘报警管理", operType = "统计", operDesc = "统计监督执法不同区域闭合情况数量") + @ApiOperation(value = "统计监督执法不同区域闭合情况数量", notes = "统计监督执法不同区域闭合情况数量", httpMethod = "POST") + @ApiImplicitParams({ + @ApiImplicitParam(name = "year", value = "年份：如2020", paramType = "body", required = false, dataType = "String"), + @ApiImplicitParam(name = "month", value = "年份：如2020-11", paramType = "body", required = false, dataType = "String"), + }) + @PostMapping(value = "/countEnvironmentAlarmDistrict") + public Result countEnvironmentAlarmDistrict(@ApiIgnore @RequestBody Map map) { + return Result.success(environmentAlarmService.countEnvironmentAlarmDistrict(map)); + } + + @OperLog(operModul = "扬尘报警管理", operType = "统计", operDesc = "报警工程排名") + @ApiOperation(value = "报警工程排名", notes = "报警工程排名", httpMethod = "POST") + @ApiImplicitParams({ + @ApiImplicitParam(name = "engineeringSn", value = "工程SN", paramType = "body", dataType = "String"), + @ApiImplicitParam(name = "engineeringName", value = "工程名称", paramType = "body", dataType = "String"), + }) + @PostMapping(value = "/getEnvironmentAlarmRank") + public Result> getEnvironmentAlarmRank(@ApiIgnore @RequestBody HashMap paramMap) { + return Result.success(environmentAlarmService.getEnvironmentAlarmRank(paramMap)); + } + } 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 554995e..3d6f8f2 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 @@ -11,6 +11,7 @@ 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.base.entity.vo.CityAndDistrictDeviceCountVo; import com.zhgd.xmgl.modules.basicdata.constant.ParamConstants; import com.zhgd.xmgl.modules.city.dust.entity.EnvironmentDev; import com.zhgd.xmgl.modules.city.dust.entity.vo.EngineeringAndEnvironmentDevVo; @@ -18,8 +19,6 @@ 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; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -33,6 +32,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import springfox.documentation.annotations.ApiIgnore; +import java.util.HashMap; import java.util.List; import java.util.Map; @@ -157,5 +157,15 @@ public class EnvironmentDevController { return Result.success(environmentDevService.countEnvironmentDev()); } + @OperLog(operModul = "扬尘管理", operType = "统计", operDesc = "统计市级和区级的扬尘") + @ApiOperation(value = "统计市级和区级的扬尘", notes = "统计市级和区级的扬尘", httpMethod = "POST") + @ApiImplicitParams({ + @ApiImplicitParam(name = "showCity", value = "是否查询城市", paramType = "body", required = true, dataType = "Integer"), + }) + @PostMapping(value = "/countCityAndDistrictEnvironmentDev") + public Result> countCityAndDistrictEnvironmentDev(@ApiIgnore @RequestBody HashMap paramMap) { + List countCityAndDistrictMonitors = environmentDevService.countCityAndDistrictEnvironmentDev(paramMap); + return Result.success(countCityAndDistrictMonitors); + } } diff --git a/src/main/java/com/zhgd/xmgl/modules/city/dust/entity/vo/EnvironmentAlarmRankVo.java b/src/main/java/com/zhgd/xmgl/modules/city/dust/entity/vo/EnvironmentAlarmRankVo.java new file mode 100644 index 0000000..b2d4a3b --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/city/dust/entity/vo/EnvironmentAlarmRankVo.java @@ -0,0 +1,10 @@ +package com.zhgd.xmgl.modules.city.dust.entity.vo; + +import lombok.Data; + +@Data +public class EnvironmentAlarmRankVo { + private String engineeringName; + private String engineeringSn; + private String count; +} 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 eb179e7..7c2e51a 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 @@ -2,16 +2,22 @@ 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.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Constants; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.zhgd.annotation.DataScope; +import com.zhgd.xmgl.base.entity.vo.TrendVo; import com.zhgd.xmgl.modules.city.dust.entity.EnvironmentAlarm; +import com.zhgd.xmgl.modules.city.dust.entity.vo.EnvironmentAlarmRankVo; import com.zhgd.xmgl.modules.city.dust.entity.vo.EnvironmentAlarmTypeVo; import com.zhgd.xmgl.modules.city.dust.entity.vo.EnvironmentDevCountVo; +import com.zhgd.xmgl.modules.city.project.entity.Project; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; +import java.util.HashMap; import java.util.List; +import java.util.Map; /** * @Description: 扬尘报警台账表 @@ -32,4 +38,8 @@ public interface EnvironmentAlarmMapper extends BaseMapper { Integer getCount(); List countTodayEnvironmentAlarmGroupByType(); + + IPage getEnvironmentAlarmRank(Page page, @Param("param") HashMap paramMap); + + List countInspectRecordDistrict(Map map); } 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 4ef0239..2cbf4c5 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 @@ -5,11 +5,13 @@ 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.base.entity.vo.CityAndDistrictDeviceCountVo; import com.zhgd.xmgl.modules.city.dust.entity.EnvironmentDev; 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.HashMap; import java.util.List; /** @@ -35,4 +37,5 @@ public interface EnvironmentDevMapper extends BaseMapper { List countGroupByProject(); + List countCityAndDistrictEnvironmentDev(HashMap paramMap); } 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 fdd8abb..275f4d3 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 @@ -32,4 +32,36 @@ where ea.create_time >= CURDATE() group by ea.type + + + + 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 de58fe3..b0e27ae 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 @@ -55,5 +55,23 @@ group by md.engineering_sn - + 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 e3bf879..fabe8bf 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 @@ -1,11 +1,15 @@ package com.zhgd.xmgl.modules.city.dust.service; +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.base.entity.vo.MultiTrendVo; +import com.zhgd.xmgl.modules.city.dust.entity.vo.EnvironmentAlarmRankVo; 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.HashMap; import java.util.Map; /** @@ -23,4 +27,8 @@ public interface IEnvironmentAlarmService extends IService { boolean checkAlarm(String sn); EnvironmentAlarmTypeVo countTodayEnvironmentAlarmGroupByType(); + + IPage getEnvironmentAlarmRank(HashMap paramMap); + + MultiTrendVo countEnvironmentAlarmDistrict(Map map); } 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 0c38050..4379fde 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 @@ -5,6 +5,7 @@ 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.base.entity.vo.CityAndDistrictDeviceCountVo; 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; @@ -14,6 +15,7 @@ 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; +import java.util.HashMap; import java.util.List; import java.util.Map; @@ -48,4 +50,6 @@ public interface IEnvironmentDevService extends IService { IPage queryEngineeringAndEnvironmentDevPage(Page page, QueryWrapper wrapper); EnvironmentDevCountVo countEnvironmentDev(); + + List countCityAndDistrictEnvironmentDev(HashMap paramMap); } 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 664af1d..06b0009 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 @@ -4,6 +4,7 @@ import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSONObject; 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; @@ -11,26 +12,30 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.gexin.fastjson.JSON; import com.zhgd.jeecg.common.util.PageUtil; import com.zhgd.redis.lock.RedisRepository; +import com.zhgd.xmgl.base.entity.vo.MultiTrendOne; +import com.zhgd.xmgl.base.entity.vo.MultiTrendVo; import com.zhgd.xmgl.modules.basicdata.constant.CacheConstants; import com.zhgd.xmgl.modules.basicdata.constant.ParamConstants; 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.EnvironmentAlarmRankVo; 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.city.government.entity.Government; +import com.zhgd.xmgl.modules.city.government.mapper.GovernmentMapper; +import com.zhgd.xmgl.modules.city.project.entity.Project; import com.zhgd.xmgl.modules.wisdom.dto.MapEnvironAlarmDto; +import com.zhgd.xmgl.security.SecurityUtil; 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.*; import java.util.function.Function; import java.util.stream.Collectors; @@ -52,6 +57,9 @@ public class EnvironmentAlarmServiceImpl extends ServiceImpl pageList(Map map) { String engineeringSn = MapUtils.getString(map, ParamConstants.ENGINEERING_SN); @@ -142,4 +150,23 @@ public class EnvironmentAlarmServiceImpl extends ServiceImpl getEnvironmentAlarmRank(HashMap paramMap) { + Page page = PageUtil.getPage(paramMap); + return baseMapper.getEnvironmentAlarmRank(page,paramMap); + } + + @Override + public MultiTrendVo countEnvironmentAlarmDistrict(Map map) { + MultiTrendVo vo = new MultiTrendVo(); + List myGovernments = governmentMapper.getMyUnderGovernments(SecurityUtil.getUser().getSn()); + List names = myGovernments.stream().map(Government::getGovernmentName).collect(Collectors.toList()); + vo.setX(names); + List datas = new ArrayList<>(); + map.put("state", 4); + datas.add(new MultiTrendOne("报警", MultiTrendVo.fillData(baseMapper.countInspectRecordDistrict(map), names))); + vo.setData(datas); + 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 7f53e99..03fee11 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 @@ -1,6 +1,7 @@ package com.zhgd.xmgl.modules.city.dust.service.impl; import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.NumberUtil; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSONObject; @@ -14,6 +15,8 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.gexin.fastjson.JSON; import com.zhgd.jeecg.common.util.PageUtil; import com.zhgd.redis.lock.RedisRepository; +import com.zhgd.xmgl.base.entity.vo.CityAndDistrictDeviceCountVo; +import com.zhgd.xmgl.constant.CommonConstant; import com.zhgd.xmgl.handler.exception.CustomException; import com.zhgd.xmgl.modules.basicdata.constant.CacheConstants; import com.zhgd.xmgl.modules.basicdata.dto.EngineeringDeviceDto; @@ -31,10 +34,13 @@ 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.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.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 com.zhgd.xmgl.security.SecurityUtil; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -74,6 +80,8 @@ public class EnvironmentDevServiceImpl extends ServiceImpl pageList(Page page, Wrapper wrapper) { @@ -209,4 +217,17 @@ public class EnvironmentDevServiceImpl extends ServiceImpl countCityAndDistrictEnvironmentDev(HashMap paramMap) { + paramMap.put(CommonConstant.IGNORE_DATA_SCOPE, CommonConstant.IGNORE_DATA_SCOPE); + List myUnderGovernments = governmentMapper.getMyUnderGovernments(SecurityUtil.getUser().getSn()); + if (CollUtil.isEmpty(myUnderGovernments)) { + return null; + } + paramMap.put("list", myUnderGovernments.stream().map(Government::getGovernmentSn).collect(Collectors.toList())); + List list = baseMapper.countCityAndDistrictEnvironmentDev(paramMap); + CityAndDistrictDeviceCountVo.addCityIf(paramMap, list, governmentMapper); + return list; + } + } diff --git a/src/main/java/com/zhgd/xmgl/modules/city/engineering/controller/EngineeringController.java b/src/main/java/com/zhgd/xmgl/modules/city/engineering/controller/EngineeringController.java index 0413a14..9da97a9 100644 --- a/src/main/java/com/zhgd/xmgl/modules/city/engineering/controller/EngineeringController.java +++ b/src/main/java/com/zhgd/xmgl/modules/city/engineering/controller/EngineeringController.java @@ -65,6 +65,7 @@ public class EngineeringController { @ApiImplicitParam(name = "pageSize", value = "每页条数", paramType = "body", required = true, defaultValue = "10", dataType = "Integer"), @ApiImplicitParam(name = "newThisYear", value = "是否今年新增1是0否", paramType = "body", required = false, dataType = "Integer"), @ApiImplicitParam(name = "endThisYear", value = "是否今年竣工合格1是0否", paramType = "body", required = false, dataType = "Integer"), + @ApiImplicitParam(name = "notMonitor", value = "未接入视频工程", paramType = "body", required = false, dataType = "Integer"), }) @PostMapping(value = "/page") public Result> queryPageList(@ApiIgnore @RequestBody Map map) { @@ -78,6 +79,15 @@ public class EngineeringController { if (Objects.equals(MapUtils.getInteger(map, "endThisYear"), 1)) { wrapper.ge(RefUtil.fieldNameUlc(Engineering::getEndTime), dateTime); } + String existsSql = "(\n" + + "\tSELECT\n" + + "\t\t* \n" + + "\tFROM\n" + + "\t\tmonitor_dev d \n" + + "WHERE\n" + + "\td.engineering_sn = engineering.engineering_sn)"; + wrapper.notExists(Objects.equals(MapUtils.getInteger(map, "notMonitor"), 1), existsSql); + wrapper.exists(Objects.equals(MapUtils.getInteger(map, "notMonitor"), 0), existsSql); IPage pageList = engineeringService.getPageList(page, wrapper); return Result.success(pageList); } diff --git a/src/main/java/com/zhgd/xmgl/modules/city/engineering/mapper/EngineeringMapper.java b/src/main/java/com/zhgd/xmgl/modules/city/engineering/mapper/EngineeringMapper.java index 5f40e05..3c6e10c 100644 --- a/src/main/java/com/zhgd/xmgl/modules/city/engineering/mapper/EngineeringMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/city/engineering/mapper/EngineeringMapper.java @@ -72,4 +72,5 @@ public interface EngineeringMapper extends BaseMapper { List countEngineeringType(); List countEngineeringEveryDistrictAndType(); + } diff --git a/src/main/java/com/zhgd/xmgl/modules/city/engineering/service/impl/DangerousEngineeringServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/city/engineering/service/impl/DangerousEngineeringServiceImpl.java index afe88e5..e9783a6 100644 --- a/src/main/java/com/zhgd/xmgl/modules/city/engineering/service/impl/DangerousEngineeringServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/city/engineering/service/impl/DangerousEngineeringServiceImpl.java @@ -40,7 +40,7 @@ public class DangerousEngineeringServiceImpl extends ServiceImpl map = new HashMap<>(); - List myGovernments = governmentMapper.getMyGovernments(SecurityUtil.getUser().getSn()); + List myGovernments = governmentMapper.getMyUnderGovernments(SecurityUtil.getUser().getSn()); List names = myGovernments.stream().map(Government::getGovernmentName).collect(Collectors.toList()); vo.setX(names); List datas = new ArrayList<>(); 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 8ddd915..a9a4a8d 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 @@ -96,7 +96,7 @@ public class EngineeringServiceImpl extends ServiceImpl getPageList(Page page, Wrapper wrapper) { - Page pageList = this.page(page, wrapper); + Page pageList = page(page, wrapper); List engineeringTypes = systemDictDataService.getByType(ParamEnum.SysDictType.ENGINEERING_TYPE.getValue()); List engineeringStates = systemDictDataService.getByType(ParamEnum.SysDictType.ENGINEERING_STATE.getValue()); pageList.getRecords().stream().forEach(s -> { @@ -407,7 +407,7 @@ public class EngineeringServiceImpl extends ServiceImpl list = baseMapper.countEngineeringEveryDistrictAndType(); - List myGovernments = governmentMapper.getMyGovernments(SecurityUtil.getUser().getSn()); + List myGovernments = governmentMapper.getMyUnderGovernments(SecurityUtil.getUser().getSn()); if (CollUtil.isEmpty(myGovernments)) { return null; } diff --git a/src/main/java/com/zhgd/xmgl/modules/city/government/mapper/GovernmentMapper.java b/src/main/java/com/zhgd/xmgl/modules/city/government/mapper/GovernmentMapper.java index 064a94f..0c6a660 100644 --- a/src/main/java/com/zhgd/xmgl/modules/city/government/mapper/GovernmentMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/city/government/mapper/GovernmentMapper.java @@ -14,5 +14,5 @@ import java.util.List; */ @Mapper public interface GovernmentMapper extends BaseMapper { - List getMyGovernments(String sn); + List getMyUnderGovernments(String sn); } diff --git a/src/main/java/com/zhgd/xmgl/modules/city/government/mapper/xml/GovernmentMapper.xml b/src/main/java/com/zhgd/xmgl/modules/city/government/mapper/xml/GovernmentMapper.xml index 0a85e38..1f4b749 100644 --- a/src/main/java/com/zhgd/xmgl/modules/city/government/mapper/xml/GovernmentMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/city/government/mapper/xml/GovernmentMapper.xml @@ -1,7 +1,7 @@ - select * from `government` g INNER JOIN `government` fg ON g.parent_id = fg.government_id diff --git a/src/main/java/com/zhgd/xmgl/modules/city/highformwork/service/impl/HighFormworkMeasurePointServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/city/highformwork/service/impl/HighFormworkMeasurePointServiceImpl.java index 75e15cc..cfbac68 100644 --- a/src/main/java/com/zhgd/xmgl/modules/city/highformwork/service/impl/HighFormworkMeasurePointServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/city/highformwork/service/impl/HighFormworkMeasurePointServiceImpl.java @@ -161,7 +161,7 @@ public class HighFormworkMeasurePointServiceImpl extends ServiceImpl map = new HashMap<>(); - List myGovernments = governmentMapper.getMyGovernments(SecurityUtil.getUser().getSn()); + List myGovernments = governmentMapper.getMyUnderGovernments(SecurityUtil.getUser().getSn()); if (CollUtil.isEmpty(myGovernments)) { return null; } diff --git a/src/main/java/com/zhgd/xmgl/modules/city/inspect/service/impl/InspectRecordServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/city/inspect/service/impl/InspectRecordServiceImpl.java index 0a24610..3f4c607 100644 --- a/src/main/java/com/zhgd/xmgl/modules/city/inspect/service/impl/InspectRecordServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/city/inspect/service/impl/InspectRecordServiceImpl.java @@ -334,7 +334,7 @@ public class InspectRecordServiceImpl extends ServiceImpl map) { MultiTrendVo vo = new MultiTrendVo(); - List myGovernments = governmentMapper.getMyGovernments(SecurityUtil.getUser().getSn()); + List myGovernments = governmentMapper.getMyUnderGovernments(SecurityUtil.getUser().getSn()); List names = myGovernments.stream().map(Government::getGovernmentName).collect(Collectors.toList()); vo.setX(names); List datas = new ArrayList<>(); @@ -363,7 +363,7 @@ public class InspectRecordServiceImpl extends ServiceImpl map) { MultiTrendVo vo = new MultiTrendVo(); - List myGovernments = governmentMapper.getMyGovernments(SecurityUtil.getUser().getSn()); + List myGovernments = governmentMapper.getMyUnderGovernments(SecurityUtil.getUser().getSn()); List names = myGovernments.stream().map(Government::getGovernmentName).collect(Collectors.toList()); vo.setX(names); List datas = new ArrayList<>(); diff --git a/src/main/java/com/zhgd/xmgl/modules/city/monitor/mapper/MonitorDevMapper.java b/src/main/java/com/zhgd/xmgl/modules/city/monitor/mapper/MonitorDevMapper.java index c5a0322..e131e01 100644 --- a/src/main/java/com/zhgd/xmgl/modules/city/monitor/mapper/MonitorDevMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/city/monitor/mapper/MonitorDevMapper.java @@ -11,6 +11,7 @@ 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.HashMap; import java.util.List; /** @@ -33,7 +34,7 @@ public interface MonitorDevMapper extends BaseMapper { MonitorDev getByCode(String code, String ignore); - List countDistrictMonitor(); + List countDistrictMonitor(HashMap paramMap); List countOnlineGroupByProject(); 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 9722397..fd970d1 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 @@ -38,12 +38,20 @@ 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 f698d17..1673633 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,6 +1,7 @@ package com.zhgd.xmgl.modules.city.monitor.service.impl; import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.NumberUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.Wrapper; @@ -12,6 +13,7 @@ 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.base.entity.vo.CityAndDistrictDeviceCountVo; +import com.zhgd.xmgl.constant.CommonConstant; import com.zhgd.xmgl.modules.basicdata.dto.AppIndexDeviceDto; import com.zhgd.xmgl.modules.basicdata.dto.MonitorTreeDto; import com.zhgd.xmgl.modules.basicdata.service.ISystemDictDataService; @@ -19,6 +21,7 @@ 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; @@ -28,6 +31,7 @@ import com.zhgd.xmgl.modules.city.monitor.mapper.MonitorQuestionMapper; 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.security.SecurityUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -174,7 +178,13 @@ public class MonitorDevServiceImpl extends ServiceImpl countCityAndDistrictMonitor(HashMap paramMap) { - List list = baseMapper.countDistrictMonitor(); + paramMap.put(CommonConstant.IGNORE_DATA_SCOPE, CommonConstant.IGNORE_DATA_SCOPE); + List myUnderGovernments = governmentMapper.getMyUnderGovernments(SecurityUtil.getUser().getSn()); + if (CollUtil.isEmpty(myUnderGovernments)) { + return null; + } + paramMap.put("list", myUnderGovernments.stream().map(Government::getGovernmentSn).collect(Collectors.toList())); + List list = baseMapper.countDistrictMonitor(paramMap); CityAndDistrictDeviceCountVo.addCityIf(paramMap, list, governmentMapper); return list; } diff --git a/src/main/java/com/zhgd/xmgl/modules/city/worker/service/impl/WorkerInfoServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/city/worker/service/impl/WorkerInfoServiceImpl.java index 285509a..a68c71b 100644 --- a/src/main/java/com/zhgd/xmgl/modules/city/worker/service/impl/WorkerInfoServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/city/worker/service/impl/WorkerInfoServiceImpl.java @@ -298,7 +298,7 @@ public class WorkerInfoServiceImpl extends ServiceImpl paramMap) { - List myGovernments = governmentMapper.getMyGovernments(SecurityUtil.getUser().getSn()); + List myGovernments = governmentMapper.getMyUnderGovernments(SecurityUtil.getUser().getSn()); if (CollUtil.isEmpty(myGovernments)) { return null; }