From e2d0ad14a9068b207d147d42db1b4ad9856a254b Mon Sep 17 00:00:00 2001 From: guo Date: Mon, 29 Jan 2024 17:23:34 +0800 Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ConcreteMonitorAlarmController.java | 10 --- .../ConcreteMonitorCurrentDataController.java | 10 +++ ...reteMonitorDevPointPositionController.java | 67 +++++++++++++++++++ ...untConcreteMonitorDevPointPositionVo.java} | 3 +- .../mapper/ConcreteMonitorAlarmMapper.java | 3 - .../ConcreteMonitorCurrentDataMapper.java | 7 +- ...ConcreteMonitorDevPointPositionMapper.java | 13 ++-- .../mapper/xml/ConcreteMonitorAlarmMapper.xml | 8 --- .../xml/ConcreteMonitorCurrentDataMapper.xml | 36 +++++++--- .../ConcreteMonitorDevPointPositionMapper.xml | 8 ++- .../service/IConcreteMonitorAlarmService.java | 4 -- .../IConcreteMonitorCurrentDataService.java | 6 +- ...oncreteMonitorDevPointPositionService.java | 13 +++- .../impl/ConcreteMonitorAlarmServiceImpl.java | 11 +-- ...ConcreteMonitorCurrentDataServiceImpl.java | 13 +++- ...eteMonitorDevPointPositionServiceImpl.java | 55 ++++++++++++++- .../WaterMeterMonthRecordServiceImpl.java | 4 +- 17 files changed, 209 insertions(+), 62 deletions(-) create mode 100644 src/main/java/com/zhgd/xmgl/modules/concrete/controller/ConcreteMonitorDevPointPositionController.java rename src/main/java/com/zhgd/xmgl/modules/concrete/entity/vo/{CountConcreteMonitorAlarmVo.java => CountConcreteMonitorDevPointPositionVo.java} (76%) diff --git a/src/main/java/com/zhgd/xmgl/modules/concrete/controller/ConcreteMonitorAlarmController.java b/src/main/java/com/zhgd/xmgl/modules/concrete/controller/ConcreteMonitorAlarmController.java index f866ef365..18e0854ee 100644 --- a/src/main/java/com/zhgd/xmgl/modules/concrete/controller/ConcreteMonitorAlarmController.java +++ b/src/main/java/com/zhgd/xmgl/modules/concrete/controller/ConcreteMonitorAlarmController.java @@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.gexin.fastjson.JSON; import com.zhgd.jeecg.common.api.vo.Result; import com.zhgd.xmgl.modules.concrete.entity.ConcreteMonitorAlarm; -import com.zhgd.xmgl.modules.concrete.entity.vo.CountConcreteMonitorAlarmVo; import com.zhgd.xmgl.modules.concrete.service.IConcreteMonitorAlarmService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; @@ -115,13 +114,4 @@ public class ConcreteMonitorAlarmController { return result; } - - @ApiOperation(value = "统计报警(监测点位总数)", notes = "统计报警(监测点位总数)", httpMethod = "POST") - @ApiImplicitParams({ - @ApiImplicitParam(name = "projectSn", value = "项目sn", paramType = "body", required = true, dataType = "String"), - }) - @PostMapping(value = "/countConcreteMonitorAlarm") - public Result countConcreteMonitorAlarm(@ApiIgnore @RequestBody HashMap paramMap) { - return Result.success(concreteMonitorAlarmService.countConcreteMonitorAlarm(paramMap)); - } } diff --git a/src/main/java/com/zhgd/xmgl/modules/concrete/controller/ConcreteMonitorCurrentDataController.java b/src/main/java/com/zhgd/xmgl/modules/concrete/controller/ConcreteMonitorCurrentDataController.java index 7c65da675..5a92540f9 100644 --- a/src/main/java/com/zhgd/xmgl/modules/concrete/controller/ConcreteMonitorCurrentDataController.java +++ b/src/main/java/com/zhgd/xmgl/modules/concrete/controller/ConcreteMonitorCurrentDataController.java @@ -2,6 +2,7 @@ package com.zhgd.xmgl.modules.concrete.controller; import com.gexin.fastjson.JSON; import com.zhgd.jeecg.common.api.vo.Result; +import com.zhgd.xmgl.base.entity.vo.TrendOneVo; import com.zhgd.xmgl.entity.vo.ConcreteMonitorCurrentDataVo; import com.zhgd.xmgl.modules.concrete.entity.ConcreteMonitorCurrentData; import com.zhgd.xmgl.modules.concrete.entity.ConcreteMonitorDevPointPosition; @@ -113,4 +114,13 @@ public class ConcreteMonitorCurrentDataController { } + @ApiOperation(value = "统计数据曲线趋势", notes = "统计数据曲线趋势", httpMethod = "POST") + @ApiImplicitParams({ + @ApiImplicitParam(name = "projectSn", value = "项目sn", paramType = "body", required = true, dataType = "String"), + @ApiImplicitParam(name = "date", value = "日期", paramType = "body", required = false, dataType = "String"), + }) + @PostMapping(value = "/countTrend") + public Result> countTrend(@ApiIgnore @RequestBody HashMap paramMap) { + return Result.success(concreteMonitorCurrentDataService.countTrend(paramMap)); + } } diff --git a/src/main/java/com/zhgd/xmgl/modules/concrete/controller/ConcreteMonitorDevPointPositionController.java b/src/main/java/com/zhgd/xmgl/modules/concrete/controller/ConcreteMonitorDevPointPositionController.java new file mode 100644 index 000000000..ef73b62f9 --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/concrete/controller/ConcreteMonitorDevPointPositionController.java @@ -0,0 +1,67 @@ +package com.zhgd.xmgl.modules.concrete.controller; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.zhgd.jeecg.common.api.vo.Result; +import com.zhgd.xmgl.modules.concrete.entity.ConcreteMonitorAlarm; +import com.zhgd.xmgl.modules.concrete.entity.ConcreteMonitorDevPointPosition; +import com.zhgd.xmgl.modules.concrete.entity.vo.CountConcreteMonitorDevPointPositionVo; +import com.zhgd.xmgl.modules.concrete.service.IConcreteMonitorDevPointPositionService; +import com.zhgd.xmgl.modules.sewage.entity.SewageAlarm; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiImplicitParams; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import springfox.documentation.annotations.ApiIgnore; + +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +@RestController +@RequestMapping("/xmgl/concreteMonitorDevPointPosition") +@Slf4j +@Api(tags = "混凝土监测设备-监测点位置") +public class ConcreteMonitorDevPointPositionController { + @Autowired + private IConcreteMonitorDevPointPositionService concreteMonitorDevPointPositionService; + + /** + * 分页列表查询 + * + * @return + */ + @ApiOperation(value = "分页列表查询污水预警信息", notes = "分页列表查询污水预警信息", httpMethod = "GET") + @ApiImplicitParams({ + @ApiImplicitParam(name = "pageNo", value = "第几页", paramType = "query", required = true, dataType = "Integer"), + @ApiImplicitParam(name = "pageSize", value = "每页显示条数", paramType = "query", required = true, dataType = "Integer"), + @ApiImplicitParam(name = "type", value = "1今日", paramType = "query", required = false, dataType = "Integer"), + }) + @GetMapping(value = "/page") + public Result> queryPageList(@ApiIgnore @RequestParam HashMap paramMap) { + return Result.success(concreteMonitorDevPointPositionService.queryPageList(paramMap)); + } + + /** + * 列表查询 + * + * @return + */ + @ApiOperation(value = "列表查询污水预警信息", notes = "列表查询污水预警信息", httpMethod = "GET") + @GetMapping(value = "/list") + public Result> queryList(@ApiIgnore @RequestParam HashMap paramMap) { + return Result.success(concreteMonitorDevPointPositionService.queryList(paramMap)); + } + + + @ApiOperation(value = "统计报警(监测点位总数)", notes = "统计报警(监测点位总数)", httpMethod = "POST") + @ApiImplicitParams({ + @ApiImplicitParam(name = "projectSn", value = "项目sn", paramType = "body", required = true, dataType = "String"), + }) + @PostMapping(value = "/countConcreteMonitorDevPointPosition") + public Result countConcreteMonitorDevPointPosition(@ApiIgnore @RequestBody HashMap paramMap) { + return Result.success(concreteMonitorDevPointPositionService.countConcreteMonitorDevPointPosition(paramMap)); + } +} diff --git a/src/main/java/com/zhgd/xmgl/modules/concrete/entity/vo/CountConcreteMonitorAlarmVo.java b/src/main/java/com/zhgd/xmgl/modules/concrete/entity/vo/CountConcreteMonitorDevPointPositionVo.java similarity index 76% rename from src/main/java/com/zhgd/xmgl/modules/concrete/entity/vo/CountConcreteMonitorAlarmVo.java rename to src/main/java/com/zhgd/xmgl/modules/concrete/entity/vo/CountConcreteMonitorDevPointPositionVo.java index 83a5fe7fe..285c79476 100644 --- a/src/main/java/com/zhgd/xmgl/modules/concrete/entity/vo/CountConcreteMonitorAlarmVo.java +++ b/src/main/java/com/zhgd/xmgl/modules/concrete/entity/vo/CountConcreteMonitorDevPointPositionVo.java @@ -1,11 +1,10 @@ package com.zhgd.xmgl.modules.concrete.entity.vo; -import com.zhgd.xmgl.modules.concrete.entity.ConcreteMonitorDevPointPosition; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @Data -public class CountConcreteMonitorAlarmVo { +public class CountConcreteMonitorDevPointPositionVo { @ApiModelProperty(value = "监测点位总数(个)") private Integer monitorPositionNum; @ApiModelProperty(value = "告警点位总数(个)") diff --git a/src/main/java/com/zhgd/xmgl/modules/concrete/mapper/ConcreteMonitorAlarmMapper.java b/src/main/java/com/zhgd/xmgl/modules/concrete/mapper/ConcreteMonitorAlarmMapper.java index fa44d1e1e..3103a953f 100644 --- a/src/main/java/com/zhgd/xmgl/modules/concrete/mapper/ConcreteMonitorAlarmMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/concrete/mapper/ConcreteMonitorAlarmMapper.java @@ -3,11 +3,9 @@ package com.zhgd.xmgl.modules.concrete.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.zhgd.xmgl.modules.concrete.entity.ConcreteMonitorAlarm; -import com.zhgd.xmgl.modules.concrete.entity.vo.CountConcreteMonitorAlarmVo; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; -import java.util.HashMap; import java.util.List; import java.util.Map; @@ -24,5 +22,4 @@ public interface ConcreteMonitorAlarmMapper extends BaseMapper selectDevAlarmList(Map map); - CountConcreteMonitorAlarmVo countConcreteMonitorAlarm(HashMap paramMap); } diff --git a/src/main/java/com/zhgd/xmgl/modules/concrete/mapper/ConcreteMonitorCurrentDataMapper.java b/src/main/java/com/zhgd/xmgl/modules/concrete/mapper/ConcreteMonitorCurrentDataMapper.java index 07a1f37c9..4e46eb25d 100644 --- a/src/main/java/com/zhgd/xmgl/modules/concrete/mapper/ConcreteMonitorCurrentDataMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/concrete/mapper/ConcreteMonitorCurrentDataMapper.java @@ -2,17 +2,20 @@ package com.zhgd.xmgl.modules.concrete.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.zhgd.jeecg.common.mybatis.EntityMap; +import com.zhgd.xmgl.base.entity.vo.TrendOneVo; import com.zhgd.xmgl.modules.concrete.entity.ConcreteMonitorCurrentData; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; +import java.util.ArrayList; +import java.util.HashMap; import java.util.List; import java.util.Map; /** * @Description: 混凝土监测-实时数据 * @author： pds - * @date： 2021-04-22 + * @date： 2021-04-22 * @version： V1.0 */ @Mapper @@ -21,4 +24,6 @@ public interface ConcreteMonitorCurrentDataMapper extends BaseMapper getTodayConcreteMonitorCurrentDataList(Map map); List getNewestConcreteMonitorCurrentData(@Param("devSn") String devSn, @Param("pointNo") String pointNo); + + ArrayList countTrend(HashMap paramMap); } diff --git a/src/main/java/com/zhgd/xmgl/modules/concrete/mapper/ConcreteMonitorDevPointPositionMapper.java b/src/main/java/com/zhgd/xmgl/modules/concrete/mapper/ConcreteMonitorDevPointPositionMapper.java index decfe37d4..fa2557f04 100644 --- a/src/main/java/com/zhgd/xmgl/modules/concrete/mapper/ConcreteMonitorDevPointPositionMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/concrete/mapper/ConcreteMonitorDevPointPositionMapper.java @@ -1,10 +1,11 @@ package com.zhgd.xmgl.modules.concrete.mapper; -import java.util.List; -import java.util.Map; +import java.util.HashMap; -import com.zhgd.jeecg.common.mybatis.EntityMap; -import com.zhgd.xmgl.modules.concrete.entity.ConcreteMonitorCurrentData; +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.zhgd.xmgl.modules.concrete.entity.vo.CountConcreteMonitorDevPointPositionVo; import org.apache.ibatis.annotations.Mapper; import com.zhgd.xmgl.modules.concrete.entity.ConcreteMonitorDevPointPosition; import com.baomidou.mybatisplus.core.mapper.BaseMapper; @@ -12,10 +13,12 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** * @Description: 混凝土监测设备-监测点位置 * @author： pds - * @date： 2021-04-22 + * @date： 2021-04-22 * @version： V1.0 */ @Mapper public interface ConcreteMonitorDevPointPositionMapper extends BaseMapper { + CountConcreteMonitorDevPointPositionVo countConcreteMonitorAlarm(HashMap paramMap); + } diff --git a/src/main/java/com/zhgd/xmgl/modules/concrete/mapper/xml/ConcreteMonitorAlarmMapper.xml b/src/main/java/com/zhgd/xmgl/modules/concrete/mapper/xml/ConcreteMonitorAlarmMapper.xml index c33af52d1..04c4393ec 100644 --- a/src/main/java/com/zhgd/xmgl/modules/concrete/mapper/xml/ConcreteMonitorAlarmMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/concrete/mapper/xml/ConcreteMonitorAlarmMapper.xml @@ -39,12 +39,4 @@ order by a.add_time desc - - diff --git a/src/main/java/com/zhgd/xmgl/modules/concrete/mapper/xml/ConcreteMonitorCurrentDataMapper.xml b/src/main/java/com/zhgd/xmgl/modules/concrete/mapper/xml/ConcreteMonitorCurrentDataMapper.xml index 82fdc216e..cdcd6cc30 100644 --- a/src/main/java/com/zhgd/xmgl/modules/concrete/mapper/xml/ConcreteMonitorCurrentDataMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/concrete/mapper/xml/ConcreteMonitorCurrentDataMapper.xml @@ -1,28 +1,46 @@ - + + diff --git a/src/main/java/com/zhgd/xmgl/modules/concrete/mapper/xml/ConcreteMonitorDevPointPositionMapper.xml b/src/main/java/com/zhgd/xmgl/modules/concrete/mapper/xml/ConcreteMonitorDevPointPositionMapper.xml index 0b0b8e8f8..0e7cb8091 100644 --- a/src/main/java/com/zhgd/xmgl/modules/concrete/mapper/xml/ConcreteMonitorDevPointPositionMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/concrete/mapper/xml/ConcreteMonitorDevPointPositionMapper.xml @@ -1,5 +1,11 @@ - + diff --git a/src/main/java/com/zhgd/xmgl/modules/concrete/service/IConcreteMonitorAlarmService.java b/src/main/java/com/zhgd/xmgl/modules/concrete/service/IConcreteMonitorAlarmService.java index bca5a3446..7f21b44ed 100644 --- a/src/main/java/com/zhgd/xmgl/modules/concrete/service/IConcreteMonitorAlarmService.java +++ b/src/main/java/com/zhgd/xmgl/modules/concrete/service/IConcreteMonitorAlarmService.java @@ -1,13 +1,10 @@ package com.zhgd.xmgl.modules.concrete.service; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.zhgd.jeecg.common.mybatis.EntityMap; import com.zhgd.xmgl.modules.concrete.entity.ConcreteMonitorAlarm; import com.baomidou.mybatisplus.extension.service.IService; import com.zhgd.xmgl.modules.concrete.entity.ConcreteMonitorDev; -import com.zhgd.xmgl.modules.concrete.entity.vo.CountConcreteMonitorAlarmVo; -import java.util.HashMap; import java.util.List; import java.util.Map; @@ -27,5 +24,4 @@ public interface IConcreteMonitorAlarmService extends IService selectDevAlarmList(Map map); - CountConcreteMonitorAlarmVo countConcreteMonitorAlarm(HashMap paramMap); } diff --git a/src/main/java/com/zhgd/xmgl/modules/concrete/service/IConcreteMonitorCurrentDataService.java b/src/main/java/com/zhgd/xmgl/modules/concrete/service/IConcreteMonitorCurrentDataService.java index 82e477f80..7dd2efff4 100644 --- a/src/main/java/com/zhgd/xmgl/modules/concrete/service/IConcreteMonitorCurrentDataService.java +++ b/src/main/java/com/zhgd/xmgl/modules/concrete/service/IConcreteMonitorCurrentDataService.java @@ -2,17 +2,19 @@ package com.zhgd.xmgl.modules.concrete.service; import com.baomidou.mybatisplus.extension.service.IService; import com.zhgd.jeecg.common.mybatis.EntityMap; +import com.zhgd.xmgl.base.entity.vo.TrendOneVo; import com.zhgd.xmgl.modules.concrete.entity.ConcreteMonitorCurrentData; import com.zhgd.xmgl.entity.vo.ConcreteMonitorCurrentDataVo; import com.zhgd.xmgl.modules.concrete.entity.ConcreteMonitorDevPointPosition; +import java.util.HashMap; import java.util.List; import java.util.Map; /** * @Description: 混凝土监测-实时数据 * @author： pds - * @date： 2021-04-22 + * @date： 2021-04-22 * @version： V1.0 */ public interface IConcreteMonitorCurrentDataService extends IService { @@ -22,4 +24,6 @@ public interface IConcreteMonitorCurrentDataService extends IService getTodayConcreteMonitorCurrentDataList(Map map); List getNewestConcreteMonitorCurrentData(Map map); + + List countTrend(HashMap paramMap); } diff --git a/src/main/java/com/zhgd/xmgl/modules/concrete/service/IConcreteMonitorDevPointPositionService.java b/src/main/java/com/zhgd/xmgl/modules/concrete/service/IConcreteMonitorDevPointPositionService.java index 84fedc591..687b48dac 100644 --- a/src/main/java/com/zhgd/xmgl/modules/concrete/service/IConcreteMonitorDevPointPositionService.java +++ b/src/main/java/com/zhgd/xmgl/modules/concrete/service/IConcreteMonitorDevPointPositionService.java @@ -1,14 +1,25 @@ package com.zhgd.xmgl.modules.concrete.service; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.zhgd.xmgl.modules.concrete.entity.ConcreteMonitorDevPointPosition; import com.baomidou.mybatisplus.extension.service.IService; +import com.zhgd.xmgl.modules.concrete.entity.vo.CountConcreteMonitorDevPointPositionVo; +import com.zhgd.xmgl.modules.sewage.entity.SewageAlarm; + +import java.util.HashMap; +import java.util.List; /** * @Description: 混凝土监测设备-监测点位置 * @author： pds - * @date： 2021-04-22 + * @date： 2021-04-22 * @version： V1.0 */ public interface IConcreteMonitorDevPointPositionService extends IService { + IPage queryPageList(HashMap paramMap); + + List queryList(HashMap paramMap); + + CountConcreteMonitorDevPointPositionVo countConcreteMonitorDevPointPosition(HashMap paramMap); } diff --git a/src/main/java/com/zhgd/xmgl/modules/concrete/service/impl/ConcreteMonitorAlarmServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/concrete/service/impl/ConcreteMonitorAlarmServiceImpl.java index 9e7838b4e..48bce5d13 100644 --- a/src/main/java/com/zhgd/xmgl/modules/concrete/service/impl/ConcreteMonitorAlarmServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/concrete/service/impl/ConcreteMonitorAlarmServiceImpl.java @@ -4,11 +4,9 @@ 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.zhgd.jeecg.common.execption.OpenAlertException; -import com.zhgd.jeecg.common.mybatis.EntityMap; import com.zhgd.xmgl.modules.concrete.entity.ConcreteMonitorAlarm; import com.zhgd.xmgl.modules.concrete.entity.ConcreteMonitorDev; import com.zhgd.xmgl.modules.basicdata.entity.Notice; -import com.zhgd.xmgl.modules.concrete.entity.vo.CountConcreteMonitorAlarmVo; import com.zhgd.xmgl.modules.concrete.mapper.ConcreteMonitorAlarmMapper; import com.zhgd.xmgl.modules.concrete.mapper.ConcreteMonitorDevMapper; import com.zhgd.xmgl.modules.concrete.service.IConcreteMonitorAlarmService; @@ -21,7 +19,6 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.transaction.annotation.Transactional; import java.util.Date; -import java.util.HashMap; import java.util.List; import java.util.Map; @@ -134,11 +131,5 @@ public class ConcreteMonitorAlarmServiceImpl extends ServiceImpl paramMap) { - Integer pn = concreteMonitorDevMapper.countPointNum(paramMap); - CountConcreteMonitorAlarmVo vo = baseMapper.countConcreteMonitorAlarm(paramMap); - vo.setMonitorPositionNum(pn); - return vo; - } + } diff --git a/src/main/java/com/zhgd/xmgl/modules/concrete/service/impl/ConcreteMonitorCurrentDataServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/concrete/service/impl/ConcreteMonitorCurrentDataServiceImpl.java index 95a2027db..fe9abe18e 100644 --- a/src/main/java/com/zhgd/xmgl/modules/concrete/service/impl/ConcreteMonitorCurrentDataServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/concrete/service/impl/ConcreteMonitorCurrentDataServiceImpl.java @@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.zhgd.jeecg.common.execption.OpenAlertException; +import com.zhgd.jeecg.upload.util.DateUtil; +import com.zhgd.xmgl.base.entity.vo.TrendOneVo; import com.zhgd.xmgl.entity.vo.ConcreteMonitorCurrentDataVo; import com.zhgd.xmgl.modules.concrete.entity.ConcreteMonitorAlarm; import com.zhgd.xmgl.modules.concrete.entity.ConcreteMonitorCurrentData; @@ -14,6 +16,7 @@ import com.zhgd.xmgl.modules.concrete.mapper.ConcreteMonitorDevMapper; import com.zhgd.xmgl.modules.concrete.mapper.ConcreteMonitorDevPointPositionMapper; import com.zhgd.xmgl.modules.concrete.service.IConcreteMonitorAlarmService; import com.zhgd.xmgl.modules.concrete.service.IConcreteMonitorCurrentDataService; +import com.zhgd.xmgl.util.DateUtils; import com.zhgd.xmgl.util.MessageUtil; import org.apache.commons.collections.MapUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -21,9 +24,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.text.SimpleDateFormat; -import java.util.Date; -import java.util.List; -import java.util.Map; +import java.util.*; /** * @Description: 混凝土监测-实时数据 @@ -102,4 +103,10 @@ public class ConcreteMonitorCurrentDataServiceImpl extends ServiceImpl countTrend(HashMap paramMap) { + ArrayList list = baseMapper.countTrend(paramMap); + return TrendOneVo.fillTrendVos(list, DateUtils.getDateTimeStrList(100, "yyyy-MM-dd HH:00"), "HH:00"); + } } diff --git a/src/main/java/com/zhgd/xmgl/modules/concrete/service/impl/ConcreteMonitorDevPointPositionServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/concrete/service/impl/ConcreteMonitorDevPointPositionServiceImpl.java index 86e043619..5dcec3a88 100644 --- a/src/main/java/com/zhgd/xmgl/modules/concrete/service/impl/ConcreteMonitorDevPointPositionServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/concrete/service/impl/ConcreteMonitorDevPointPositionServiceImpl.java @@ -1,19 +1,72 @@ package com.zhgd.xmgl.modules.concrete.service.impl; +import cn.hutool.core.date.DateUtil; +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.zhgd.jeecg.common.system.query.QueryGenerator; import com.zhgd.xmgl.modules.concrete.entity.ConcreteMonitorDevPointPosition; +import com.zhgd.xmgl.modules.concrete.entity.vo.CountConcreteMonitorDevPointPositionVo; +import com.zhgd.xmgl.modules.concrete.mapper.ConcreteMonitorAlarmMapper; +import com.zhgd.xmgl.modules.concrete.mapper.ConcreteMonitorDevMapper; import com.zhgd.xmgl.modules.concrete.mapper.ConcreteMonitorDevPointPositionMapper; import com.zhgd.xmgl.modules.concrete.service.IConcreteMonitorDevPointPositionService; +import com.zhgd.xmgl.util.PageUtil; +import com.zhgd.xmgl.util.RefUtil; +import org.apache.commons.collections.MapUtils; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import java.util.HashMap; +import java.util.List; +import java.util.Objects; + /** * @Description: 混凝土监测设备-监测点位置 * @author： pds - * @date： 2021-04-22 + * @date： 2021-04-22 * @version： V1.0 */ @Service public class ConcreteMonitorDevPointPositionServiceImpl extends ServiceImpl implements IConcreteMonitorDevPointPositionService { + @Autowired + private ConcreteMonitorAlarmMapper concreteMonitorAlarmMapper; + @Autowired + private ConcreteMonitorDevMapper concreteMonitorDevMapper; + @Override + public IPage queryPageList(HashMap paramMap) { + QueryWrapper queryWrapper = getQueryWrapper(paramMap); + Page page = PageUtil.getPage(paramMap); + IPage pageList = this.page(page, queryWrapper); + pageList.setRecords(dealList(pageList.getRecords())); + return pageList; + } + + @Override + public List queryList(HashMap paramMap) { + QueryWrapper queryWrapper = getQueryWrapper(paramMap); + return dealList(this.list(queryWrapper)); + } + + @Override + public CountConcreteMonitorDevPointPositionVo countConcreteMonitorDevPointPosition(HashMap paramMap) { + Integer pn = concreteMonitorDevMapper.countPointNum(paramMap); + CountConcreteMonitorDevPointPositionVo vo = baseMapper.countConcreteMonitorAlarm(paramMap); + vo.setMonitorPositionNum(pn); + return vo; + } + + private QueryWrapper getQueryWrapper(HashMap paramMap) { + String alias = ""; + QueryWrapper queryWrapper = QueryGenerator.initPageQueryWrapper(ConcreteMonitorDevPointPosition.class, paramMap, alias); + queryWrapper.orderByDesc(alias + RefUtil.fieldNameUlc(ConcreteMonitorDevPointPosition::getId)); + return queryWrapper; + } + + private List dealList(List list) { + return list; + } } diff --git a/src/main/java/com/zhgd/xmgl/modules/water/service/impl/WaterMeterMonthRecordServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/water/service/impl/WaterMeterMonthRecordServiceImpl.java index adc119e9a..f41897a87 100644 --- a/src/main/java/com/zhgd/xmgl/modules/water/service/impl/WaterMeterMonthRecordServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/water/service/impl/WaterMeterMonthRecordServiceImpl.java @@ -148,10 +148,8 @@ public class WaterMeterMonthRecordServiceImpl extends ServiceImpl list = new ArrayList<>(); - Map dataMap = monthWater.stream().collect(Collectors.toMap(m -> m.getMonthTime(), m -> Double.valueOf(m.getWaterTonnage()))); + Map dataMap = monthWater.stream().collect(Collectors.toMap(WaterMeterStatisticsVo.MonthWater::getMonthTime, WaterMeterStatisticsVo.MonthWater::getWaterTonnage)); for (String s : sequenceMonth) { WaterMeterStatisticsVo.MonthWater m = new WaterMeterStatisticsVo.MonthWater(); m.setMonthTime(s);