bug修复

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<CountConcreteMonitorAlarmVo> countConcreteMonitorAlarm(@ApiIgnore @RequestBody HashMap<String, Object> paramMap) {
-        return Result.success(concreteMonitorAlarmService.countConcreteMonitorAlarm(paramMap));
-    }
 }

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<List<TrendOneVo>> countTrend(@ApiIgnore @RequestBody HashMap<String, Object> paramMap) {
+        return Result.success(concreteMonitorCurrentDataService.countTrend(paramMap));
+    }
 }

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<IPage<ConcreteMonitorDevPointPosition>> queryPageList(@ApiIgnore @RequestParam HashMap<String, Object> paramMap) {
+        return Result.success(concreteMonitorDevPointPositionService.queryPageList(paramMap));
+    }
+
+    /**
+     * 列表查询
+     *
+     * @return
+     */
+    @ApiOperation(value = "列表查询污水预警信息", notes = "列表查询污水预警信息", httpMethod = "GET")
+    @GetMapping(value = "/list")
+    public Result<List<ConcreteMonitorDevPointPosition>> queryList(@ApiIgnore @RequestParam HashMap<String, Object> 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<CountConcreteMonitorDevPointPositionVo> countConcreteMonitorDevPointPosition(@ApiIgnore @RequestBody HashMap<String, Object> paramMap) {
+        return Result.success(concreteMonitorDevPointPositionService.countConcreteMonitorDevPointPosition(paramMap));
+    }
+}

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 = "告警点位总数(个)")

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<ConcreteMonitorAl
 
     List<ConcreteMonitorAlarm> selectDevAlarmList(Map<String, Object> map);
 
-    CountConcreteMonitorAlarmVo countConcreteMonitorAlarm(HashMap<String, Object> paramMap);
 }

src/main/java/com/zhgd/xmgl/modules/concrete/mapper/ConcreteMonitorCurrentDataMapper.java

@@ -2,10 +2,13 @@ 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;
 
@@ -21,4 +24,6 @@ public interface ConcreteMonitorCurrentDataMapper extends BaseMapper<ConcreteMon
     List<ConcreteMonitorCurrentData> getTodayConcreteMonitorCurrentDataList(Map<String, Object> map);
 
     List<ConcreteMonitorCurrentData> getNewestConcreteMonitorCurrentData(@Param("devSn") String devSn, @Param("pointNo") String pointNo);
+
+    ArrayList<TrendOneVo> countTrend(HashMap<String, Object> paramMap);
 }

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.HashMap;
-import java.util.Map;
 
-import com.zhgd.jeecg.common.mybatis.EntityMap;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.zhgd.xmgl.modules.concrete.entity.ConcreteMonitorCurrentData;
+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;
@@ -18,4 +19,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 @Mapper
 public interface ConcreteMonitorDevPointPositionMapper extends BaseMapper<ConcreteMonitorDevPointPosition> {
 
+    CountConcreteMonitorDevPointPositionVo countConcreteMonitorAlarm(HashMap<String, Object> paramMap);
+
 }

src/main/java/com/zhgd/xmgl/modules/concrete/mapper/xml/ConcreteMonitorAlarmMapper.xml

@@ -39,12 +39,4 @@
         </if>
         order by a.add_time desc
     </select>
-
-    <select id="countConcreteMonitorAlarm"
-            resultType="com.zhgd.xmgl.modules.concrete.entity.vo.CountConcreteMonitorAlarmVo">
-        select count(distinct cma.dev_sn,cma.point_no) alarmPositionNum,count(cma.id) alarmNum
-        from concrete_monitor_alarm cma
-        join concrete_monitor_dev_point_position cmdpp on cma.point_no = cmdpp.point_no and cma.dev_sn=cmdpp.dev_sn
-        where cma.project_sn = #{projectSn}
-    </select>
 </mapper>

src/main/java/com/zhgd/xmgl/modules/concrete/mapper/xml/ConcreteMonitorCurrentDataMapper.xml

@@ -1,12 +1,12 @@
 <?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">
 <mapper namespace="com.zhgd.xmgl.modules.concrete.mapper.ConcreteMonitorCurrentDataMapper">
-
     <select id="getTodayConcreteMonitorCurrentDataList"
             resultType="com.zhgd.xmgl.modules.concrete.entity.ConcreteMonitorCurrentData">
         SELECT *
         from concrete_monitor_current_data
-        WHERE dev_sn=#{devSn} and point_no=#{pointNo}
+        WHERE dev_sn = #{devSn}
+        and point_no = #{pointNo}
         <if test="type == 1">
             and receive_time >= DATE_ADD(NOW(), INTERVAL -24 HOUR)
         </if>
@@ -14,15 +14,33 @@
             and receive_time >= DATE_ADD(NOW(), INTERVAL -48 HOUR)
         </if>
         ORDER BY receive_time
-
-
     </select>
     <select id="getNewestConcreteMonitorCurrentData"
             resultType="com.zhgd.xmgl.modules.concrete.entity.ConcreteMonitorCurrentData">
         SELECT a.*
         from concrete_monitor_current_data a
-        WHERE dev_sn=#{devSn} and point_no=#{pointNo}
+        WHERE dev_sn = #{devSn}
+        and point_no = #{pointNo}
         ORDER BY receive_time DESC
         LIMIT 1
     </select>
+
+    <select id="countTrend" resultType="com.zhgd.xmgl.base.entity.vo.TrendOneVo">
+        select date_format(receive_time, '%Y-%m-%d %H:00') x,
+        ifnull(round(avg(temperature),2),0) y
+        from concrete_monitor_current_data
+        where project_sn = #{projectSn}
+        <if test="devSn != null and devSn != ''">
+            and dev_sn = #{devSn}
+        </if>
+        <choose>
+            <when test="date != null and date != ''">
+                and receive_time >= date_format(#{date}, '%Y-%m-%d')
+            </when>
+            <otherwise>
+                and receive_time >= current_date
+            </otherwise>
+        </choose>
+        group by x
+    </select>
 </mapper>

src/main/java/com/zhgd/xmgl/modules/concrete/mapper/xml/ConcreteMonitorDevPointPositionMapper.xml

@@ -1,5 +1,11 @@
 <?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">
 <mapper namespace="com.zhgd.xmgl.modules.concrete.mapper.ConcreteMonitorDevPointPositionMapper">
-
+    <select id="countConcreteMonitorAlarm"
+            resultType="com.zhgd.xmgl.modules.concrete.entity.vo.CountConcreteMonitorDevPointPositionVo">
+        select count(distinct cma.dev_sn,cma.point_no) alarmPositionNum,count(cma.id) alarmNum
+        from concrete_monitor_alarm cma
+        join concrete_monitor_dev_point_position cmdpp on cma.point_no = cmdpp.point_no and cma.dev_sn=cmdpp.dev_sn
+        where cma.project_sn = #{projectSn}
+    </select>
 </mapper>

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<ConcreteMonitorAl
 
     List<ConcreteMonitorAlarm> selectDevAlarmList(Map<String, Object> map);
 
-    CountConcreteMonitorAlarmVo countConcreteMonitorAlarm(HashMap<String, Object> paramMap);
 }

src/main/java/com/zhgd/xmgl/modules/concrete/service/IConcreteMonitorCurrentDataService.java

@@ -2,10 +2,12 @@ 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;
 
@@ -22,4 +24,6 @@ public interface IConcreteMonitorCurrentDataService extends IService<ConcreteMon
     List<ConcreteMonitorCurrentData> getTodayConcreteMonitorCurrentDataList(Map<String, Object> map);
 
     List<ConcreteMonitorDevPointPosition> getNewestConcreteMonitorCurrentData(Map<String, Object> map);
+
+    List<TrendOneVo> countTrend(HashMap<String, Object> paramMap);
 }

src/main/java/com/zhgd/xmgl/modules/concrete/service/IConcreteMonitorDevPointPositionService.java

@@ -1,7 +1,13 @@
 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: 混凝土监测设备-监测点位置
@@ -11,4 +17,9 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface IConcreteMonitorDevPointPositionService extends IService<ConcreteMonitorDevPointPosition> {
 
+    IPage<ConcreteMonitorDevPointPosition> queryPageList(HashMap<String, Object> paramMap);
+
+    List<ConcreteMonitorDevPointPosition> queryList(HashMap<String, Object> paramMap);
+
+    CountConcreteMonitorDevPointPositionVo countConcreteMonitorDevPointPosition(HashMap<String, Object> paramMap);
 }

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<ConcreteMonitor
         return concreteMonitorAlarmMapper.selectDevAlarmList(map);
     }
 
-    @Override
+
-    public CountConcreteMonitorAlarmVo countConcreteMonitorAlarm(HashMap<String, Object> paramMap) {
-        Integer pn = concreteMonitorDevMapper.countPointNum(paramMap);
-        CountConcreteMonitorAlarmVo vo = baseMapper.countConcreteMonitorAlarm(paramMap);
-        vo.setMonitorPositionNum(pn);
-        return vo;
-    }
 }

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.*;
-import java.util.List;
-import java.util.Map;
 
 /**
  * @Description: 混凝土监测-实时数据
@@ -102,4 +103,10 @@ public class ConcreteMonitorCurrentDataServiceImpl extends ServiceImpl<ConcreteM
         }
         return pointList;
     }
+
+    @Override
+    public List<TrendOneVo> countTrend(HashMap<String, Object> paramMap) {
+        ArrayList<TrendOneVo> list = baseMapper.countTrend(paramMap);
+        return TrendOneVo.fillTrendVos(list, DateUtils.getDateTimeStrList(100, "yyyy-MM-dd HH:00"), "HH:00");
+    }
 }

src/main/java/com/zhgd/xmgl/modules/concrete/service/impl/ConcreteMonitorDevPointPositionServiceImpl.java

@@ -1,12 +1,28 @@
 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
@@ -15,5 +31,42 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
  */
 @Service
 public class ConcreteMonitorDevPointPositionServiceImpl extends ServiceImpl<ConcreteMonitorDevPointPositionMapper, ConcreteMonitorDevPointPosition> implements IConcreteMonitorDevPointPositionService {
+    @Autowired
+    private ConcreteMonitorAlarmMapper concreteMonitorAlarmMapper;
+    @Autowired
+    private ConcreteMonitorDevMapper concreteMonitorDevMapper;
 
+    @Override
+    public IPage<ConcreteMonitorDevPointPosition> queryPageList(HashMap<String, Object> paramMap) {
+        QueryWrapper<ConcreteMonitorDevPointPosition> queryWrapper = getQueryWrapper(paramMap);
+        Page<ConcreteMonitorDevPointPosition> page = PageUtil.getPage(paramMap);
+        IPage<ConcreteMonitorDevPointPosition> pageList = this.page(page, queryWrapper);
+        pageList.setRecords(dealList(pageList.getRecords()));
+        return pageList;
+    }
+
+    @Override
+    public List<ConcreteMonitorDevPointPosition> queryList(HashMap<String, Object> paramMap) {
+        QueryWrapper<ConcreteMonitorDevPointPosition> queryWrapper = getQueryWrapper(paramMap);
+        return dealList(this.list(queryWrapper));
+    }
+
+    @Override
+    public CountConcreteMonitorDevPointPositionVo countConcreteMonitorDevPointPosition(HashMap<String, Object> paramMap) {
+        Integer pn = concreteMonitorDevMapper.countPointNum(paramMap);
+        CountConcreteMonitorDevPointPositionVo vo = baseMapper.countConcreteMonitorAlarm(paramMap);
+        vo.setMonitorPositionNum(pn);
+        return vo;
+    }
+
+    private QueryWrapper<ConcreteMonitorDevPointPosition> getQueryWrapper(HashMap<String, Object> paramMap) {
+        String alias = "";
+        QueryWrapper<ConcreteMonitorDevPointPosition> queryWrapper = QueryGenerator.initPageQueryWrapper(ConcreteMonitorDevPointPosition.class, paramMap, alias);
+        queryWrapper.orderByDesc(alias + RefUtil.fieldNameUlc(ConcreteMonitorDevPointPosition::getId));
+        return queryWrapper;
+    }
+
+    private List<ConcreteMonitorDevPointPosition> dealList(List<ConcreteMonitorDevPointPosition> list) {
+        return list;
+    }
 }

src/main/java/com/zhgd/xmgl/modules/water/service/impl/WaterMeterMonthRecordServiceImpl.java

@@ -148,10 +148,8 @@ public class WaterMeterMonthRecordServiceImpl extends ServiceImpl<WaterMeterMont
         for (int i = 1; i <= 12; i++) {
             sequenceMonth.add(yearTime + "-" + String.format("%02d", i));
         }
-        String monthTime = "monthTime";
-        String waterTonnage = "waterTonnage";
         List<WaterMeterStatisticsVo.MonthWater> list = new ArrayList<>();
-        Map<String, Double> dataMap = monthWater.stream().collect(Collectors.toMap(m -> m.getMonthTime(), m -> Double.valueOf(m.getWaterTonnage())));
+        Map<String, Double> 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);