From 33890e25f6260963a0a3a92d9ccdc4ad3badaf61 Mon Sep 17 00:00:00 2001 From: guo Date: Fri, 22 Sep 2023 10:08:53 +0800 Subject: [PATCH] =?UTF-8?q?=E9=AB=98=E6=94=AF=E6=A8=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...kMeasureCurrentAndAlarmDataController.java | 25 ++++ .../HighFormworkMeasurePointController.java | 31 ++++- .../entity/vo/HighFormworkAlarmRankVo.java | 10 ++ .../entity/vo/HighFormworkMeasurePointVo.java | 14 +++ ...mworkMeasureCurrentAndAlarmDataMapper.java | 9 ++ .../HighFormworkMeasurePointMapper.java | 8 +- ...rmworkMeasureCurrentAndAlarmDataMapper.xml | 28 ++++- .../xml/HighFormworkMeasurePointMapper.xml | 20 +++- ...workMeasureCurrentAndAlarmDataService.java | 8 ++ .../IHighFormworkMeasurePointService.java | 15 ++- ...MeasureCurrentAndAlarmDataServiceImpl.java | 20 ++++ .../HighFormworkMeasurePointServiceImpl.java | 109 +++++++++--------- .../impl/InspectRecordServiceImpl.java | 2 +- 13 files changed, 233 insertions(+), 66 deletions(-) create mode 100644 src/main/java/com/zhgd/xmgl/modules/city/highformwork/entity/vo/HighFormworkAlarmRankVo.java create mode 100644 src/main/java/com/zhgd/xmgl/modules/city/highformwork/entity/vo/HighFormworkMeasurePointVo.java diff --git a/src/main/java/com/zhgd/xmgl/modules/city/highformwork/controller/HighFormworkMeasureCurrentAndAlarmDataController.java b/src/main/java/com/zhgd/xmgl/modules/city/highformwork/controller/HighFormworkMeasureCurrentAndAlarmDataController.java index 7335150..47a1bec 100644 --- a/src/main/java/com/zhgd/xmgl/modules/city/highformwork/controller/HighFormworkMeasureCurrentAndAlarmDataController.java +++ b/src/main/java/com/zhgd/xmgl/modules/city/highformwork/controller/HighFormworkMeasureCurrentAndAlarmDataController.java @@ -7,7 +7,10 @@ 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.TrendVo; +import com.zhgd.xmgl.modules.city.deepexcavation.entity.vo.DeepExcavationAlarmRankVo; import com.zhgd.xmgl.modules.city.highformwork.entity.HighFormworkMeasureCurrentAndAlarmData; +import com.zhgd.xmgl.modules.city.highformwork.entity.vo.HighFormworkAlarmRankVo; import com.zhgd.xmgl.modules.city.highformwork.service.IHighFormworkMeasureCurrentAndAlarmDataService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; @@ -21,6 +24,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; @@ -102,5 +106,26 @@ public class HighFormworkMeasureCurrentAndAlarmDataController { return result; } + @OperLog(operModul = "高支模-测量点实时数据和报警数据管理", operType = "统计", operDesc = "高支模各区预警情况") + @ApiOperation(value = "高支模各区预警情况", notes = "高支模各区预警情况", httpMethod = "POST") + @ApiImplicitParams({ + @ApiImplicitParam(name = "type", value = "1一个月2三个月3半年", paramType = "body", required = false, dataType = "Integer"), + }) + @PostMapping(value = "/countHighFormworkAlarmDistrict") + public Result> countHighFormworkAlarmDistrict(@ApiIgnore @RequestBody HashMap paramMap) { + return Result.success(highFormworkMeasureCurrentAndAlarmDataService.countHighFormworkAlarmDistrict(paramMap)); + } + + @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 = "/getDeepExcavationAlarmRank") + public Result> getHighFormworkAlarmRank(@ApiIgnore @RequestBody HashMap paramMap) { + return Result.success(highFormworkMeasureCurrentAndAlarmDataService.getHighFormworkAlarmRank(paramMap)); + } + } diff --git a/src/main/java/com/zhgd/xmgl/modules/city/highformwork/controller/HighFormworkMeasurePointController.java b/src/main/java/com/zhgd/xmgl/modules/city/highformwork/controller/HighFormworkMeasurePointController.java index 1b1f46d..b5e13f1 100644 --- a/src/main/java/com/zhgd/xmgl/modules/city/highformwork/controller/HighFormworkMeasurePointController.java +++ b/src/main/java/com/zhgd/xmgl/modules/city/highformwork/controller/HighFormworkMeasurePointController.java @@ -5,12 +5,14 @@ import com.baomidou.mybatisplus.core.metadata.IPage; 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.mybatis.EntityMap; 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.base.entity.vo.MultiTrendVo; +import com.zhgd.xmgl.base.entity.vo.SectorVo; import com.zhgd.xmgl.modules.city.engineering.entity.Engineering; import com.zhgd.xmgl.modules.city.highformwork.entity.HighFormworkMeasurePoint; +import com.zhgd.xmgl.modules.city.highformwork.entity.vo.HighFormworkMeasurePointVo; import com.zhgd.xmgl.modules.city.highformwork.service.IHighFormworkMeasurePointService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; @@ -107,4 +109,31 @@ public class HighFormworkMeasurePointController { return Result.success(pageList); } + @OperLog(operModul = "高支模测点管理", operType = "统计", operDesc = "高支模总体概况") + @ApiOperation(value = "高支模总体概况", notes = "高支模总体概况", httpMethod = "POST") + @ApiImplicitParams({ + }) + @PostMapping(value = "/countHighFormworkMeasurePoint") + public Result countHighFormworkMeasurePoint() { + return Result.success(highFormworkMeasurePointService.countHighFormworkMeasurePoint()); + } + + @OperLog(operModul = "高支模测点管理", operType = "统计", operDesc = "高支模监测情况") + @ApiOperation(value = "高支模监测情况", notes = "高支模监测情况", httpMethod = "POST") + @ApiImplicitParams({ + }) + @PostMapping(value = "/countHighFormworkMeasurePointMonitor") + public Result countHighFormworkMeasurePointMonitor() { + return Result.success(highFormworkMeasurePointService.countHighFormworkMeasurePointMonitor()); + } + + @OperLog(operModul = "高支模测点管理", operType = "统计", operDesc = "高支模各区工程情况") + @ApiOperation(value = "高支模各区工程情况", notes = "高支模各区工程情况", httpMethod = "POST") + @ApiImplicitParams({ + }) + @PostMapping(value = "/countHighFormworkMeasurePointDistrict") + public Result countHighFormworkMeasurePointDistrict() { + return Result.success(highFormworkMeasurePointService.countHighFormworkMeasurePointDistrict()); + } + } diff --git a/src/main/java/com/zhgd/xmgl/modules/city/highformwork/entity/vo/HighFormworkAlarmRankVo.java b/src/main/java/com/zhgd/xmgl/modules/city/highformwork/entity/vo/HighFormworkAlarmRankVo.java new file mode 100644 index 0000000..139bb22 --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/city/highformwork/entity/vo/HighFormworkAlarmRankVo.java @@ -0,0 +1,10 @@ +package com.zhgd.xmgl.modules.city.highformwork.entity.vo; + +import lombok.Data; + +@Data +public class HighFormworkAlarmRankVo { + private String engineeringName; + private String engineeringSn; + private String count; +} diff --git a/src/main/java/com/zhgd/xmgl/modules/city/highformwork/entity/vo/HighFormworkMeasurePointVo.java b/src/main/java/com/zhgd/xmgl/modules/city/highformwork/entity/vo/HighFormworkMeasurePointVo.java new file mode 100644 index 0000000..ab2139a --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/city/highformwork/entity/vo/HighFormworkMeasurePointVo.java @@ -0,0 +1,14 @@ +package com.zhgd.xmgl.modules.city.highformwork.entity.vo; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +public class HighFormworkMeasurePointVo { + @ApiModelProperty("高支模数量") + private Integer count; + @ApiModelProperty("监测高支模数量") + private Integer monitorCount; + @ApiModelProperty("高支模预警数量") + private Integer warningCount; +} diff --git a/src/main/java/com/zhgd/xmgl/modules/city/highformwork/mapper/HighFormworkMeasureCurrentAndAlarmDataMapper.java b/src/main/java/com/zhgd/xmgl/modules/city/highformwork/mapper/HighFormworkMeasureCurrentAndAlarmDataMapper.java index 05eab24..1b631ac 100644 --- a/src/main/java/com/zhgd/xmgl/modules/city/highformwork/mapper/HighFormworkMeasureCurrentAndAlarmDataMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/city/highformwork/mapper/HighFormworkMeasureCurrentAndAlarmDataMapper.java @@ -1,16 +1,21 @@ package com.zhgd.xmgl.modules.city.highformwork.mapper; +import java.util.HashMap; import java.util.List; import java.util.Map; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.zhgd.annotation.DataScope; import com.zhgd.xmgl.base.entity.bo.CountExt; import com.zhgd.xmgl.base.entity.vo.TrendVo; import com.zhgd.xmgl.modules.city.highformwork.entity.HighFormworkMeasureCurrentAndAlarmData; import com.zhgd.xmgl.modules.city.highformwork.entity.HighFormworkMeasureDevice; +import com.zhgd.xmgl.modules.city.highformwork.entity.vo.HighFormworkAlarmRankVo; import org.apache.ibatis.annotations.Mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; /** * @Description: 高支模-测量点实时数据和报警数据 @@ -27,4 +32,8 @@ public interface HighFormworkMeasureCurrentAndAlarmDataMapper extends BaseMapper List queryLastDayTrend(HighFormworkMeasureDevice device); Integer getCount(Map map); + + List countHighFormworkAlarmDistrict(HashMap paramMap); + + IPage getHighFormworkAlarmRank(Page page, @Param("param") HashMap paramMap); } diff --git a/src/main/java/com/zhgd/xmgl/modules/city/highformwork/mapper/HighFormworkMeasurePointMapper.java b/src/main/java/com/zhgd/xmgl/modules/city/highformwork/mapper/HighFormworkMeasurePointMapper.java index 549f0fc..260ae2e 100644 --- a/src/main/java/com/zhgd/xmgl/modules/city/highformwork/mapper/HighFormworkMeasurePointMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/city/highformwork/mapper/HighFormworkMeasurePointMapper.java @@ -4,11 +4,14 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; 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.base.entity.vo.TrendVo; import com.zhgd.xmgl.modules.city.highformwork.entity.HighFormworkMeasurePoint; +import com.zhgd.xmgl.modules.city.highformwork.entity.vo.HighFormworkMeasurePointVo; 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; import java.util.Map; @@ -28,5 +31,8 @@ public interface HighFormworkMeasurePointMapper extends BaseMapper countCompleteGroupByProject(); - Integer getCount(); + Integer getCount(Map map); + + + List countHighFormworkMeasurePointDistrict(HashMap map); } diff --git a/src/main/java/com/zhgd/xmgl/modules/city/highformwork/mapper/xml/HighFormworkMeasureCurrentAndAlarmDataMapper.xml b/src/main/java/com/zhgd/xmgl/modules/city/highformwork/mapper/xml/HighFormworkMeasureCurrentAndAlarmDataMapper.xml index 98de654..fabcdb0 100644 --- a/src/main/java/com/zhgd/xmgl/modules/city/highformwork/mapper/xml/HighFormworkMeasureCurrentAndAlarmDataMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/city/highformwork/mapper/xml/HighFormworkMeasureCurrentAndAlarmDataMapper.xml @@ -20,10 +20,36 @@ + + + + diff --git a/src/main/java/com/zhgd/xmgl/modules/city/highformwork/mapper/xml/HighFormworkMeasurePointMapper.xml b/src/main/java/com/zhgd/xmgl/modules/city/highformwork/mapper/xml/HighFormworkMeasurePointMapper.xml index a6a6391..33edc3f 100644 --- a/src/main/java/com/zhgd/xmgl/modules/city/highformwork/mapper/xml/HighFormworkMeasurePointMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/city/highformwork/mapper/xml/HighFormworkMeasurePointMapper.xml @@ -9,7 +9,8 @@ columnPrefix="hfmd_" autoMapping="true"> - SELECT a.* from high_formwork_measure_point a WHERE 1 = 1 @@ -67,6 +68,21 @@ + + diff --git a/src/main/java/com/zhgd/xmgl/modules/city/highformwork/service/IHighFormworkMeasureCurrentAndAlarmDataService.java b/src/main/java/com/zhgd/xmgl/modules/city/highformwork/service/IHighFormworkMeasureCurrentAndAlarmDataService.java index 6b15afa..e7c213f 100644 --- a/src/main/java/com/zhgd/xmgl/modules/city/highformwork/service/IHighFormworkMeasureCurrentAndAlarmDataService.java +++ b/src/main/java/com/zhgd/xmgl/modules/city/highformwork/service/IHighFormworkMeasureCurrentAndAlarmDataService.java @@ -1,9 +1,13 @@ package com.zhgd.xmgl.modules.city.highformwork.service; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; +import com.zhgd.xmgl.base.entity.vo.TrendVo; import com.zhgd.xmgl.modules.city.highformwork.entity.HighFormworkMeasureCurrentAndAlarmData; +import com.zhgd.xmgl.modules.city.highformwork.entity.vo.HighFormworkAlarmRankVo; +import java.util.HashMap; import java.util.List; /** @@ -17,4 +21,8 @@ public interface IHighFormworkMeasureCurrentAndAlarmDataService extends IService List queryAlarms(); List queryDeviceDataAndTrend(HighFormworkMeasureCurrentAndAlarmData highFormworkMeasureCurrentAndAlarmData); + + List countHighFormworkAlarmDistrict(HashMap paramMap); + + IPage getHighFormworkAlarmRank(HashMap paramMap); } diff --git a/src/main/java/com/zhgd/xmgl/modules/city/highformwork/service/IHighFormworkMeasurePointService.java b/src/main/java/com/zhgd/xmgl/modules/city/highformwork/service/IHighFormworkMeasurePointService.java index ea9b02b..35854b7 100644 --- a/src/main/java/com/zhgd/xmgl/modules/city/highformwork/service/IHighFormworkMeasurePointService.java +++ b/src/main/java/com/zhgd/xmgl/modules/city/highformwork/service/IHighFormworkMeasurePointService.java @@ -6,8 +6,11 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import com.zhgd.jeecg.common.mybatis.EntityMap; import com.zhgd.xmgl.base.entity.vo.CityAndDistrictDeviceCountVo; +import com.zhgd.xmgl.base.entity.vo.MultiTrendVo; +import com.zhgd.xmgl.base.entity.vo.SectorVo; import com.zhgd.xmgl.modules.city.engineering.entity.Engineering; import com.zhgd.xmgl.modules.city.highformwork.entity.HighFormworkMeasurePoint; +import com.zhgd.xmgl.modules.city.highformwork.entity.vo.HighFormworkMeasurePointVo; import java.util.List; import java.util.Map; @@ -22,12 +25,6 @@ public interface IHighFormworkMeasurePointService extends IService selectHighFormworkMeasurePointPage(Map map); - void saveHighFormworkMeasurePoint(HighFormworkMeasurePoint highFormworkMeasurePoint); - - void editHighFormworkMeasurePoint(HighFormworkMeasurePoint highFormworkMeasurePoint); - - void deleteHighFormworkMeasurePoint(Map map); - HighFormworkMeasurePoint selectMeasurePointInfo(Map map); List selectPointList(HighFormworkMeasurePoint point); @@ -35,4 +32,10 @@ public interface IHighFormworkMeasurePointService extends IService countCityAndDistrictHighFormworkMeasurePoint(); IPage queryEngineeringAndStatusPage(Page page, QueryWrapper wrapper); + + HighFormworkMeasurePointVo countHighFormworkMeasurePoint(); + + SectorVo countHighFormworkMeasurePointMonitor(); + + MultiTrendVo countHighFormworkMeasurePointDistrict(); } diff --git a/src/main/java/com/zhgd/xmgl/modules/city/highformwork/service/impl/HighFormworkMeasureCurrentAndAlarmDataServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/city/highformwork/service/impl/HighFormworkMeasureCurrentAndAlarmDataServiceImpl.java index 5f3e788..91cb0e0 100644 --- a/src/main/java/com/zhgd/xmgl/modules/city/highformwork/service/impl/HighFormworkMeasureCurrentAndAlarmDataServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/city/highformwork/service/impl/HighFormworkMeasureCurrentAndAlarmDataServiceImpl.java @@ -2,11 +2,16 @@ package com.zhgd.xmgl.modules.city.highformwork.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.zhgd.jeecg.common.util.PageUtil; import com.zhgd.xmgl.base.entity.vo.TrendVo; +import com.zhgd.xmgl.modules.city.government.mapper.GovernmentMapper; import com.zhgd.xmgl.modules.city.highformwork.entity.HighFormworkMeasureCurrentAndAlarmData; import com.zhgd.xmgl.modules.city.highformwork.entity.HighFormworkMeasureDevice; import com.zhgd.xmgl.modules.city.highformwork.entity.HighFormworkMeasurePoint; +import com.zhgd.xmgl.modules.city.highformwork.entity.vo.HighFormworkAlarmRankVo; import com.zhgd.xmgl.modules.city.highformwork.mapper.HighFormworkMeasureCurrentAndAlarmDataMapper; import com.zhgd.xmgl.modules.city.highformwork.mapper.HighFormworkMeasureDeviceMapper; import com.zhgd.xmgl.modules.city.highformwork.mapper.HighFormworkMeasurePointMapper; @@ -16,6 +21,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.ArrayList; +import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.function.Function; @@ -33,6 +39,8 @@ public class HighFormworkMeasureCurrentAndAlarmDataServiceImpl extends ServiceIm private HighFormworkMeasureDeviceMapper highFormworkMeasureDeviceMapper; @Autowired private HighFormworkMeasurePointMapper highFormworkMeasurePointMapper; + @Autowired + private GovernmentMapper governmentMapper; @Override @@ -78,6 +86,18 @@ public class HighFormworkMeasureCurrentAndAlarmDataServiceImpl extends ServiceIm return rtList; } + @Override + public List countHighFormworkAlarmDistrict(HashMap paramMap) { + List list = baseMapper.countHighFormworkAlarmDistrict(paramMap); + return TrendVo.getTrendVosForGovernment(list, governmentMapper); + } + + @Override + public IPage getHighFormworkAlarmRank(HashMap paramMap) { + Page page = PageUtil.getPage(paramMap); + return baseMapper.getHighFormworkAlarmRank(page,paramMap); + } + private List fill(List trendList) { List list = DateUtils.getHoursListLastDay(); Map map = trendList.stream().collect(Collectors.toMap(TrendVo::getX, Function.identity())); 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 2fc5d32..75e15cc 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 @@ -1,21 +1,23 @@ package com.zhgd.xmgl.modules.city.highformwork.service.impl; import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.util.NumberUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.zhgd.jeecg.common.execption.OpenAlertException; import com.zhgd.jeecg.common.system.query.QueryGenerator; import com.zhgd.xmgl.base.entity.bo.CountExt; -import com.zhgd.xmgl.base.entity.vo.CityAndDistrictDeviceCountVo; +import com.zhgd.xmgl.base.entity.vo.*; import com.zhgd.xmgl.modules.city.engineering.entity.Engineering; 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.highformwork.entity.HighFormworkMeasurePoint; import com.zhgd.xmgl.modules.city.highformwork.entity.HighFormworkMeasurePointThreshold; +import com.zhgd.xmgl.modules.city.highformwork.entity.vo.HighFormworkMeasurePointVo; import com.zhgd.xmgl.modules.city.highformwork.mapper.HighFormworkMeasureCurrentAndAlarmDataMapper; import com.zhgd.xmgl.modules.city.highformwork.mapper.HighFormworkMeasurePointMapper; import com.zhgd.xmgl.modules.city.highformwork.mapper.HighFormworkMeasurePointThresholdMapper; @@ -24,14 +26,13 @@ import com.zhgd.xmgl.modules.city.highformwork.service.IHighFormworkMeasurePoint import com.zhgd.xmgl.modules.city.monitor.entity.bo.OnlineGroupByProjectBo; import com.zhgd.xmgl.security.SecurityUser; import com.zhgd.xmgl.security.SecurityUtil; -import com.zhgd.xmgl.util.MessageUtil; import org.apache.commons.collections.MapUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.util.ArrayList; -import java.util.Date; +import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.function.Function; @@ -68,56 +69,6 @@ public class HighFormworkMeasurePointServiceImpl extends ServiceImpl queryWrapper = new QueryWrapper<>(); - queryWrapper.lambda().eq(HighFormworkMeasurePoint::getMeasurePointNumber, highFormworkMeasurePoint.getMeasurePointNumber()); - int count = highFormworkMeasurePointMapper.selectCount(queryWrapper); - if (count > 0) { - throw new OpenAlertException(MessageUtil.get("pointNoExistErr")); - } - highFormworkMeasurePoint.setRealTime(new Date()); - highFormworkMeasurePointMapper.insert(highFormworkMeasurePoint); - if (highFormworkMeasurePoint.getThresholdList() != null && highFormworkMeasurePoint.getThresholdList().size() > 0) { - for (HighFormworkMeasurePointThreshold threshold : highFormworkMeasurePoint.getThresholdList()) { - threshold.setMeasurePointId(highFormworkMeasurePoint.getId()); - highFormworkMeasurePointThresholdMapper.insert(threshold); - } - } - } - - @Override - public void editHighFormworkMeasurePoint(HighFormworkMeasurePoint highFormworkMeasurePoint) { - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.lambda().eq(HighFormworkMeasurePoint::getMeasurePointNumber, highFormworkMeasurePoint.getMeasurePointNumber()) - .ne(HighFormworkMeasurePoint::getId, highFormworkMeasurePoint.getId()); - int count = highFormworkMeasurePointMapper.selectCount(queryWrapper); - if (count > 0) { - throw new OpenAlertException(MessageUtil.get("pointNoExistErr")); - } - highFormworkMeasurePoint.setRealTime(null); - highFormworkMeasurePointMapper.updateById(highFormworkMeasurePoint); - if (highFormworkMeasurePoint.getThresholdList() != null && highFormworkMeasurePoint.getThresholdList().size() > 0) { - for (HighFormworkMeasurePointThreshold threshold : highFormworkMeasurePoint.getThresholdList()) { - if (threshold.getId() != null) { - threshold.setMeasurePointId(highFormworkMeasurePoint.getId()); - highFormworkMeasurePointThresholdMapper.updateById(threshold); - } else { - threshold.setMeasurePointId(highFormworkMeasurePoint.getId()); - highFormworkMeasurePointThresholdMapper.insert(threshold); - } - } - } - } - - @Override - public void deleteHighFormworkMeasurePoint(Map map) { - highFormworkMeasurePointMapper.deleteById(MapUtils.getString(map, "id")); - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.lambda().eq(HighFormworkMeasurePointThreshold::getMeasurePointId, MapUtils.getString(map, "id")); - highFormworkMeasurePointThresholdMapper.delete(queryWrapper); - } - @Override public HighFormworkMeasurePoint selectMeasurePointInfo(Map map) { HighFormworkMeasurePoint measurePoint = highFormworkMeasurePointMapper.selectById(MapUtils.getString(map, "id")); @@ -174,4 +125,54 @@ public class HighFormworkMeasurePointServiceImpl extends ServiceImpl map = new HashMap<>(); + HighFormworkMeasurePointVo vo = new HighFormworkMeasurePointVo(); + vo.setCount(baseMapper.getCount(map)); + map.put("completeStatus", 2); + vo.setMonitorCount(baseMapper.getCount(map)); + map.put("completeStatus", 2); + vo.setWarningCount(highFormworkMeasureCurrentAndAlarmDataMapper.getCount(map)); + return vo; + } + + @Override + public SectorVo countHighFormworkMeasurePointMonitor() { + HashMap map = new HashMap<>(); + List data = new ArrayList<>(); + Integer count = baseMapper.getCount(map); + SectorVo vo = new SectorVo(); + map.put("completeStatus", 1); + Integer count1 = baseMapper.getCount(map); + data.add(new SectorOneVo("待监测", String.valueOf(count1), NumberUtil.roundStr((double) count1 / count * 100, 2))); + map.put("completeStatus", 2); + Integer count2 = baseMapper.getCount(map); + data.add(new SectorOneVo("在监测", String.valueOf(count2), NumberUtil.roundStr((double) count2 / count * 100, 2))); + map.put("completeStatus", 3); + Integer count3 = baseMapper.getCount(map); + data.add(new SectorOneVo("已监测", String.valueOf(count3), NumberUtil.roundStr((double) count3 / count * 100, 2))); + vo.setData(data); + vo.setCount(String.valueOf(data.stream().map(o -> Integer.parseInt(o.getCount())).mapToInt(value -> value).sum())); + return vo; + } + + @Override + public MultiTrendVo countHighFormworkMeasurePointDistrict() { + HashMap map = new HashMap<>(); + List myGovernments = governmentMapper.getMyGovernments(SecurityUtil.getUser().getSn()); + if (CollUtil.isEmpty(myGovernments)) { + return null; + } + List names = myGovernments.stream().map(Government::getGovernmentName).collect(Collectors.toList()); + MultiTrendVo vo = new MultiTrendVo(); + vo.setX(names); + List data = new ArrayList<>(); + data.add(new MultiTrendOne("工程数", MultiTrendVo.fillData(baseMapper.countHighFormworkMeasurePointDistrict(map), names))); + map.put("completeStatus", 2); + data.add(new MultiTrendOne("在监数", MultiTrendVo.fillData(baseMapper.countHighFormworkMeasurePointDistrict(map), names))); + vo.setData(data); + return vo; + } } 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 392ab94..0a24610 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 @@ -307,7 +307,7 @@ public class InspectRecordServiceImpl extends ServiceImpl