新增：用电统计（每天用电量、环比，每月用电量、环比）

huimv-env-platform/huimv-env-common/src/main/java/com/huimv/env/common/entity/EnvWaterDay.java

@@ -6,6 +6,8 @@ import java.util.Date;
 import com.baomidou.mybatisplus.annotation.Version;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.io.Serializable;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -31,7 +33,7 @@ public class EnvWaterDay implements Serializable {
     private Integer sensorSn;
 
     private BigDecimal dayWater;
-
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
     private Date addDate;
 
     private String pigpenId;
@@ -45,9 +47,9 @@ public class EnvWaterDay implements Serializable {
     private BigDecimal startWater;
 
     private BigDecimal endWater;
-
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
     private Date startTime;
-
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
     private Date endTime;
 
     private BigDecimal linkRelativeRatio;

huimv-env-platform/huimv-env-common/src/main/java/com/huimv/env/common/entity/EnvWaterMonth.java

@@ -6,6 +6,8 @@ import java.util.Date;
 import com.baomidou.mybatisplus.annotation.Version;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.io.Serializable;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -44,8 +46,10 @@ public class EnvWaterMonth implements Serializable {
 
     private Integer year;
 
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
     private Date startTime;
 
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
     private Date endTime;
 
     private BigDecimal startWater;

huimv-env-platform/huimv-env-common/src/main/java/com/huimv/env/common/mapper/EnvWaterMonthMapper.java

@@ -2,6 +2,9 @@ package com.huimv.env.common.mapper;
 
 import com.huimv.env.common.entity.EnvWaterMonth;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -13,4 +16,10 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface EnvWaterMonthMapper extends BaseMapper<EnvWaterMonth> {
 
+    List<EnvWaterMonth> getWaterList(@Param("year") int year);
+
+//    List<Map<String,Object>> getWaterList(@Param(Constants.WRAPPER) QueryWrapper<EnvWaterMonth> ew);
+//    List<Map<String,Object>> getWaterList(@Param("ew") Wrapper<EnvWaterMonth> ew);
+//        List<Map<String,Object>> getWaterList();
+
 }

huimv-env-platform/huimv-env-common/src/main/java/com/huimv/env/common/mapper/xml/EnvWaterMonthMapper.xml

@@ -24,5 +24,17 @@
     <sql id="Base_Column_List">
         id, device_code, sensor_sn, month_water, pigpen_id, unit_id, farm_code, data_unit, month, year, start_time, end_time, start_water, end_water
     </sql>
+    <select id="getWaterList" resultType="com.huimv.env.common.entity.EnvWaterMonth" parameterType="int">
+         SELECT * from env_water_month where year=#{year}
+    </select>
+
+    <!--    <select id="getWaterList" resultType="com.huimv.env.common.entity.EnvWaterMonth">-->
+<!--        SELECT * from env_water_month where year=#{year}-->
+<!--    </select>-->
+
+    <!--    <select id="getWaterList" resultType="java.util.Map">-->
+<!--&#45;&#45;         SELECT year,month,month_water from env_water_month ${ew.customSqlSegment}-->
+<!--        SELECT year,month,month_water from env_water_month-->
+<!--    </select>-->
 
 </mapper>

huimv-env-platform/huimv-env-common/src/main/java/com/huimv/env/common/service/EnvElectricityDayService.java

@@ -28,4 +28,6 @@ public interface EnvElectricityDayService extends IService<EnvElectricityDay> {
     void updateDayElectricity(EnvElectricityDay envElectricityDay, JSONObject dataJo, EnvDeviceRegisterEntity envDeviceRegisterEntity, Timestamp nowTimestamp, Date todayDate, String farmCode);
 
     Result getTodayElectricity(Map<String, String> paramsMap) throws ParseException;
+
+    Result getElectricityCount(Map<String, String> paramsMap) throws ParseException;
 }

huimv-env-platform/huimv-env-common/src/main/java/com/huimv/env/common/service/EnvElectricityMonthService.java

@@ -25,5 +25,5 @@ public interface EnvElectricityMonthService extends IService<EnvElectricityMonth
 
     void updateMonthElectricity(EnvElectricityMonth envElectricityMonth, JSONObject dataJo, Timestamp nowTimestamp);
 
-    Result getMonthElectricity(Map<String, String> paramsMap);
+    Result getDayAndMonthElectricity(Map<String, String> paramsMap);
 }

huimv-env-platform/huimv-env-common/src/main/java/com/huimv/env/common/service/EnvWaterDayService.java

@@ -31,6 +31,8 @@ public interface EnvWaterDayService extends IService<EnvWaterDay> {
 
     Result getTodayWater(Map<String, String> paramsMap) throws ParseException;
 
+    Result getWaterCount(Map<String, String> paramsMap) throws ParseException;
+
 //    void saveDayElectricity(JSONObject dataJo, EnvDeviceRegisterEntity envDeviceRegisterEntity, Timestamp nowTimestamp, Date todayDate, String farmCode);
 
 //    void updateDayElectricity(EnvElectricityDay envElectricityDay, JSONObject dataJo, EnvDeviceRegisterEntity envDeviceRegisterEntity, Timestamp nowTimestamp, Date todayDate, String farmCode);

huimv-env-platform/huimv-env-common/src/main/java/com/huimv/env/common/service/EnvWaterMonthService.java

@@ -7,6 +7,7 @@ import com.huimv.env.common.entity.EnvWaterMonth;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 import java.sql.Timestamp;
+import java.text.ParseException;
 import java.util.Map;
 
 /**
@@ -27,5 +28,5 @@ public interface EnvWaterMonthService extends IService<EnvWaterMonth> {
 
     EnvWaterMonth getMonthWaterConsumption(String farmCode, String deviceCode, String sensorSn, String year, String month);
 
-    Result getMonthWater(Map<String, String> paramsMap);
+    Result getDayAndMonthWaterList(Map<String, String> paramsMap) throws ParseException;
 }

huimv-env-platform/huimv-env-common/src/main/java/com/huimv/env/common/service/impl/EnvElectricityDayServiceImpl.java

@@ -6,8 +6,10 @@ import com.huimv.common.utils.Result;
 import com.huimv.common.utils.ResultCode;
 import com.huimv.env.common.dao.entity.EnvDeviceRegisterEntity;
 import com.huimv.env.common.entity.EnvElectricityDay;
+import com.huimv.env.common.entity.EnvElectricityMonth;
 import com.huimv.env.common.entity.EnvWaterDay;
 import com.huimv.env.common.mapper.EnvElectricityDayMapper;
+import com.huimv.env.common.mapper.EnvElectricityMonthMapper;
 import com.huimv.env.common.service.EnvElectricityDayService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huimv.env.common.utils.Const;
@@ -33,6 +35,8 @@ import java.util.Map;
 public class EnvElectricityDayServiceImpl extends ServiceImpl<EnvElectricityDayMapper, EnvElectricityDay> implements EnvElectricityDayService {
     @Resource
     private EnvElectricityDayMapper envElectricityDayMapper;
+    @Resource
+    private EnvElectricityMonthMapper envElectricityMonthMapper;
 
     @Override
     public EnvElectricityDay getDayElectricityConsumption(String farmCode, String deviceCode, String sensorSn, Date todayDate) {
@@ -59,7 +63,60 @@ public class EnvElectricityDayServiceImpl extends ServiceImpl<EnvElectricityDayM
         }else{
             return new Result(ResultCode.SUCCESS,envElectricityDay);
         }
+    }
+
+    @Override
+    public Result getElectricityCount(Map<String, String> paramsMap) throws ParseException {
+        //今日用电
+        EnvElectricityDay envElectricityDay = _getDayElectricityCount(paramsMap);
+        BigDecimal todayCountBd = new BigDecimal(0);
+        BigDecimal todayLinkrelativeRatioBd = new BigDecimal(0);
+        if(envElectricityDay != null){
+            todayCountBd = envElectricityDay.getDayElectricity();
+            todayLinkrelativeRatioBd = envElectricityDay.getLinkRelativeRatio();
+        }
+
+        //本月用电
+        EnvElectricityMonth envElectricityMonth = _getMonthElectricityCount(paramsMap);
+        BigDecimal monthCountBd = new BigDecimal(0);
+        BigDecimal monthLinkrelativeRatioBd = new BigDecimal(0);
+        if(envElectricityMonth != null){
+            monthCountBd = envElectricityMonth.getMonthElectricity();
+            monthLinkrelativeRatioBd = envElectricityMonth.getLinkRelativeRatio();
+        }
+
+        JSONObject resultJo = new JSONObject();
+        resultJo.put("todayCount",todayCountBd);
+        resultJo.put("todayLinkrelativeRatio",todayLinkrelativeRatioBd);
+        resultJo.put("monthCount",monthCountBd);
+        resultJo.put("monthLinkrelativeRatio",monthLinkrelativeRatioBd);
+        return new Result(ResultCode.SUCCESS,resultJo);
+    }
+
+    //本月用电
+    private EnvElectricityMonth _getMonthElectricityCount(Map<String, String> paramsMap) throws ParseException {
+        DateUtil dateUtil = new DateUtil();
+        String farmCode = paramsMap.get("farmCode");
+        QueryWrapper<EnvElectricityMonth> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("farm_code", farmCode);
+        queryWrapper.eq("year", dateUtil.getThisYear());
+        queryWrapper.eq("month", dateUtil.getThisMonth());
+        return envElectricityMonthMapper.selectOne(queryWrapper);
+    }
 
+    //今日用电
+    private EnvElectricityDay _getDayElectricityCount(Map<String, String> paramsMap) throws ParseException {
+        DateUtil dateUtil = new DateUtil();
+        String farmCode = paramsMap.get("farmCode");
+        QueryWrapper<EnvElectricityDay> queryWrapper = new QueryWrapper();
+        queryWrapper.eq("farm_code", farmCode);
+        queryWrapper.eq("add_date", dateUtil.getTodayDate());
+        return envElectricityDayMapper.selectOne(queryWrapper);
+//        if(envElectricityDay == null){
+//            return new Result(Const.ERR_TODAY_ELECTRICITY_CODE,Const.ERR_TODAY_ELECTRICITY_INFO,false);
+//        }else{
+//            return new Result(ResultCode.SUCCESS,envElectricityDay);
+//        }
     }
 
     @Override

huimv-env-platform/huimv-env-common/src/main/java/com/huimv/env/common/service/impl/EnvElectricityMonthServiceImpl.java

@@ -80,7 +80,7 @@ public class EnvElectricityMonthServiceImpl extends ServiceImpl<EnvElectricityMo
     }
 
     @Override
-    public Result getMonthElectricity(Map<String, String> paramsMap) {
+    public Result getDayAndMonthElectricity(Map<String, String> paramsMap) {
         String farmCode = paramsMap.get("farmCode");
         String months = paramsMap.get("months");
         QueryWrapper<EnvElectricityMonth> queryWrapper = new QueryWrapper();

huimv-env-platform/huimv-env-common/src/main/java/com/huimv/env/common/service/impl/EnvWaterDayServiceImpl.java

@@ -6,7 +6,9 @@ import com.huimv.common.utils.Result;
 import com.huimv.common.utils.ResultCode;
 import com.huimv.env.common.dao.entity.EnvDeviceRegisterEntity;
 import com.huimv.env.common.entity.EnvWaterDay;
+import com.huimv.env.common.entity.EnvWaterMonth;
 import com.huimv.env.common.mapper.EnvWaterDayMapper;
+import com.huimv.env.common.mapper.EnvWaterMonthMapper;
 import com.huimv.env.common.service.EnvWaterDayService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huimv.env.common.utils.Const;
@@ -18,6 +20,8 @@ import java.math.BigDecimal;
 import java.sql.Date;
 import java.sql.Timestamp;
 import java.text.ParseException;
+import java.util.ArrayList;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -32,6 +36,8 @@ import java.util.Map;
 public class EnvWaterDayServiceImpl extends ServiceImpl<EnvWaterDayMapper, EnvWaterDay> implements EnvWaterDayService {
     @Resource
     private EnvWaterDayMapper envWaterDayMapper;
+    @Resource
+    private EnvWaterMonthMapper envWaterMonthMapper;
 
     @Override
     public EnvWaterDay getDayWaterConsumption(String farmCode, String deviceCode, String sensorSn, Date todayDate) {
@@ -62,6 +68,57 @@ public class EnvWaterDayServiceImpl extends ServiceImpl<EnvWaterDayMapper, EnvWa
     }
 
     @Override
+    public Result getWaterCount(Map<String, String> paramsMap) throws ParseException {
+        //-- 今日用水统计(今日用水消耗和环比) --//
+        EnvWaterDay envWaterDay = _getTodayWaterCount(paramsMap);
+        BigDecimal todayCount = new BigDecimal(0);
+        BigDecimal todayLinkRelativeRatio = new BigDecimal(0);
+        if(envWaterDay != null){
+            todayCount = envWaterDay.getDayWater();
+            todayLinkRelativeRatio = envWaterDay.getLinkRelativeRatio();
+        }
+        //-- 本月用水统计(本月用水消耗和环比) --//
+        EnvWaterMonth envWaterMonth = _getMonthWaterCount(paramsMap);
+        BigDecimal thisMonthCount = new BigDecimal(0);
+        BigDecimal thisMonthLinkRelativeRatio = new BigDecimal(0);
+        if(envWaterMonth != null){
+            thisMonthCount = envWaterMonth.getMonthWater();
+            thisMonthLinkRelativeRatio = envWaterMonth.getLinkRelativeRatio();
+        }
+        JSONObject resultJo = new JSONObject();
+        resultJo.put("todayCount",todayCount);
+        resultJo.put("todayLinkRelativeRatio",todayLinkRelativeRatio);
+        resultJo.put("thisMonthCount",thisMonthCount);
+        resultJo.put("thisMonthLinkRelativeRatio",thisMonthLinkRelativeRatio);
+        return new Result(ResultCode.SUCCESS,resultJo);
+    }
+
+    //获取本月用水统计
+    private EnvWaterMonth _getMonthWaterCount(Map<String, String> paramsMap) {
+        String farmCode = paramsMap.get("farmCode");
+        DateUtil dateUtil = new DateUtil();
+        QueryWrapper<EnvWaterMonth> queryWrapper = new QueryWrapper();
+        queryWrapper.eq("farm_code", farmCode);
+        queryWrapper.eq("year",dateUtil.getThisYear());
+        queryWrapper.eq("month",dateUtil.getThisMonth());
+//        queryWrapper.orderByDesc("year").orderByDesc("month");
+//        queryWrapper.last("LIMIT 1");
+        return envWaterMonthMapper.selectOne(queryWrapper);
+    }
+
+    //获取今天用水统计
+    private EnvWaterDay _getTodayWaterCount(Map<String, String> paramsMap) throws ParseException {
+        DateUtil dateUtil = new DateUtil();
+        String farmCode = paramsMap.get("farmCode");
+        QueryWrapper<EnvWaterDay> queryWrapper = new QueryWrapper();
+        queryWrapper.eq("farm_code", farmCode);
+        queryWrapper.eq("add_date", dateUtil.getTodayDate());
+        //读取当天的记录(每天本牧场所有用水统计)
+        EnvWaterDay envWaterDay = envWaterDayMapper.selectOne(queryWrapper);
+        return envWaterDay;
+    }
+
+    @Override
     public void saveDayWater(JSONObject dataJo, EnvDeviceRegisterEntity envDeviceRegisterEntity, Timestamp nowTimestamp, Date todayDate, String farmCode) {
         String newWaterValue = dataJo.getString("value");
         BigDecimal newWaterBd = new BigDecimal(newWaterValue).divide(new BigDecimal("100"), 2, BigDecimal.ROUND_HALF_UP);

huimv-env-platform/huimv-env-common/src/main/java/com/huimv/env/common/service/impl/EnvWaterMonthServiceImpl.java

@@ -5,16 +5,22 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.huimv.common.utils.Result;
 import com.huimv.common.utils.ResultCode;
 import com.huimv.env.common.dao.entity.EnvDeviceRegisterEntity;
+import com.huimv.env.common.entity.EnvWaterDay;
 import com.huimv.env.common.entity.EnvWaterMonth;
+import com.huimv.env.common.mapper.EnvWaterDayMapper;
 import com.huimv.env.common.mapper.EnvWaterMonthMapper;
 import com.huimv.env.common.service.EnvWaterMonthService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huimv.env.common.utils.DateUtil;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 import java.math.BigDecimal;
 import java.sql.Timestamp;
+import java.text.ParseException;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -30,6 +36,8 @@ import java.util.Map;
 public class EnvWaterMonthServiceImpl extends ServiceImpl<EnvWaterMonthMapper, EnvWaterMonth> implements EnvWaterMonthService {
     @Resource
     private EnvWaterMonthMapper envWaterMonthMapper;
+    @Resource
+    private EnvWaterDayMapper envWaterDayMapper;
 
     @Override
     public EnvWaterMonth getMonthWaterConsumption(String farmCode, String deviceCode, String sensorSn, String year, String month) {
@@ -43,19 +51,59 @@ public class EnvWaterMonthServiceImpl extends ServiceImpl<EnvWaterMonthMapper, E
     }
 
     @Override
-    public Result getMonthWater(Map<String, String> paramsMap) {
+    public Result getDayAndMonthWaterList(Map<String, String> paramsMap) throws ParseException {
         String farmCode = paramsMap.get("farmCode");
         String months = paramsMap.get("months");
+        String days = paramsMap.get("days");
+        if(StringUtils.isNotBlank(months) && StringUtils.isBlank(days)){
+            //查看12个月用水记录
+            return new Result(ResultCode.SUCCESS,_getMonthWaterList(farmCode,months));
+        }else if(StringUtils.isBlank(months) && StringUtils.isNotBlank(days)){
+            //查看30天用水记录
+            return new Result(ResultCode.SUCCESS,_getDayWaterList(farmCode,days));
+        }else{
+            System.out.println("months="+months);
+            System.out.println("days="+days);
+            return new Result(ResultCode.FAIL,"months和days两个参数只能二选一。");
+        }
+    }
+
+    //查看30天用水记录
+    private Object _getDayWaterList(String farmCode, String days) throws ParseException {
+        QueryWrapper<EnvWaterDay> queryWrapper = new QueryWrapper();
+        queryWrapper.eq("farm_code", farmCode);
+        queryWrapper.orderByDesc("add_date");
+        queryWrapper.last("LIMIT "+days);
+        List<EnvWaterDay> envWaterDayList = envWaterDayMapper.selectList(queryWrapper);
+        List dayList = new ArrayList();
+        DateUtil dateUtil = new DateUtil();
+        for(int a=envWaterDayList.size()-1;a>=0;a--){
+            EnvWaterDay envWaterDay = envWaterDayList.get(a);
+            Map<String,Object> waterMap = new HashMap();
+            waterMap.put("datetime",dateUtil.formatDateText(envWaterDay.getAddDate()));
+            waterMap.put("water",envWaterDay.getDayWater());
+            dayList.add(waterMap);
+        }
+        return dayList;
+    }
+
+    //查看12个月用水记录
+    private Object _getMonthWaterList(String farmCode, String months) {
         QueryWrapper<EnvWaterMonth> queryWrapper = new QueryWrapper();
         queryWrapper.eq("farm_code", farmCode);
         queryWrapper.orderByDesc("year").orderByDesc("month");
         queryWrapper.last("LIMIT "+months);
+//        List<Map<String,Object>> envWaterMonthList = envWaterMonthMapper.getWaterList();
         List<EnvWaterMonth> envWaterMonthList = envWaterMonthMapper.selectList(queryWrapper);
         List monthList = new ArrayList();
         for(int a=envWaterMonthList.size()-1;a>=0;a--){
-            monthList.add(envWaterMonthList.get(a));
+            EnvWaterMonth envWaterMonth = envWaterMonthList.get(a);
+            Map<String,Object> waterMonthMap = new HashMap<>();
+            waterMonthMap.put("datetime",envWaterMonth.getYear()+"-"+envWaterMonth.getMonth());
+            waterMonthMap.put("water",envWaterMonth.getMonthWater());
+            monthList.add(waterMonthMap);
         }
-        return new Result(ResultCode.SUCCESS,monthList);
+        return monthList;
     }
 
     @Override

huimv-env-platform/huimv-env-manage/pom.xml

@@ -171,5 +171,16 @@
                 <version>2.6</version>
             </plugin>
         </plugins>
+
+<!--        <resources>-->
+<!--            <resource>-->
+<!--                <directory>src/main/java</directory>-->
+<!--                <includes>-->
+<!--                    <include>**/*.xml</include>-->
+<!--                </includes>-->
+<!--                <filtering>true</filtering>-->
+<!--            </resource>-->
+<!--        </resources>-->
     </build>
+
 </project>

huimv-env-platform/huimv-env-manage/src/main/java/com/huimv/env/manage/HuimvEnvManageApplication.java

@@ -30,6 +30,7 @@ import org.springframework.web.client.RestTemplate;
 @EnableScheduling
 @ComponentScans({@ComponentScan("com.huimv.env.common.service"),@ComponentScan("com.huimv.env.common.utils")})
 @MapperScan("com.huimv.env.*.mapper")
+//@MapperScan("com.huimv.env.manage.mapper")
 @EntityScan(value = "com.huimv.env.common.dao.entity")
 @EnableJpaRepositories(basePackages = "com.huimv.env.common.dao.repo")
 public class HuimvEnvManageApplication {

huimv-env-platform/huimv-env-manage/src/main/java/com/huimv/env/manage/controller/EnvElectricityDayController.java

@@ -37,10 +37,17 @@ public class EnvElectricityDayController {
         return envElectricityDayService.getTodayElectricity(paramsMap);
     }
 
-    @PostMapping("/getMonthElectricity")
-    public Result getMonthElectricity(@RequestBody Map<String, String> paramsMap) throws ParseException {
+    @PostMapping("/getDayAndMonthElectricity")
+    public Result getDayAndMonthElectricity(@RequestBody Map<String, String> paramsMap) throws ParseException {
         //
-        return envElectricityMonthService.getMonthElectricity(paramsMap);
+        return envElectricityMonthService.getDayAndMonthElectricity(paramsMap);
     }
+
+    @PostMapping("/getElectricityCount")
+    public Result getElectricityCount(@RequestBody Map<String, String> paramsMap) throws ParseException {
+        //
+        return envElectricityDayService.getElectricityCount(paramsMap);
+    }
+
 }
 

huimv-env-platform/huimv-env-manage/src/main/java/com/huimv/env/manage/controller/EnvWaterDayController.java

@@ -37,10 +37,26 @@ public class EnvWaterDayController {
         return envWaterDayService.getTodayWater(paramsMap);
     }
 
-    @PostMapping("/getMonthWater")
-    public Result getMonthWater(@RequestBody Map<String, String> paramsMap) throws ParseException {
+    @PostMapping("/getDayAndMonthWaterList")
+    public Result getDayAndMonthWaterList(@RequestBody Map<String, String> paramsMap) throws ParseException {
         //
-        return envWaterMonthService.getMonthWater(paramsMap);
+        return envWaterMonthService.getDayAndMonthWaterList(paramsMap);
+    }
+
+    /**
+     * @Method      : getWaterCount
+     * @Description : 今天和本月用水量
+     * @Params      : [paramsMap]
+     * @Return      : com.huimv.common.utils.Result
+     *
+     * @Author      : ZhuoNing
+     * @Date        : 2022/10/28
+     * @Time        : 9:26
+     */
+    @PostMapping("/getWaterCount")
+    public Result getWaterCount(@RequestBody Map<String, String> paramsMap) throws ParseException {
+        //
+        return envWaterDayService.getWaterCount(paramsMap);
     }
 }