1

src/main/java/com/huimv/admin/controller/EnvElectricityController.java

@@ -10,6 +10,7 @@ import com.huimv.admin.service.IEnvElectricityService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -36,6 +37,11 @@ public class EnvElectricityController {
     @PostMapping("/testList")
     public Result testList(){
         List<EnvElectricity> envElectricities = envElectricityService.list(new QueryWrapper<EnvElectricity>().eq("farm_Id", 27).orderByDesc("update_time").last("limit 10"));
-        return new Result(ResultCode.SUCCESS,envElectricities);
+        String s = envElectricityService.sumDayElect();
+        s = "0.0000".equals(s) ? "0.0":s;
+        Map map = new HashMap();
+        map.put("list",envElectricities);
+        map.put("dayWater",s);
+        return new Result(ResultCode.SUCCESS,map);
     }
 }

src/main/java/com/huimv/admin/controller/EnvWaterController.java

@@ -1,14 +1,18 @@
 package com.huimv.admin.controller;
 
 
+import cn.hutool.core.date.DateUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.huimv.admin.common.utils.Result;
 import com.huimv.admin.common.utils.ResultCode;
 import com.huimv.admin.entity.EnvWater;
 import com.huimv.admin.service.IEnvWaterService;
+import io.swagger.models.auth.In;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.Date;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -35,6 +39,9 @@ public class EnvWaterController {
     @PostMapping("/testList")
     public Result testList(){
         List<EnvWater> envWaters = envWaterService.list(new QueryWrapper<EnvWater>().eq("farm_Id", 27).orderByDesc("update_time").last("limit 10"));
-        return new Result(ResultCode.SUCCESS,envWaters);
+        Map map = new HashMap();
+        map.put("list",envWaters);
+        map.put("dayWater",envWaterService.sumDayWater());
+        return new Result(ResultCode.SUCCESS,map);
     }
 }

src/main/java/com/huimv/admin/mapper/EnvElectricityMapper.java

@@ -28,4 +28,6 @@ public interface EnvElectricityMapper extends BaseMapper<EnvElectricity> {
     BigDecimal getElectricity(@Param(Constants.WRAPPER)QueryWrapper<EnvElectricity> queryWrapper);
 
     List<energyYearVo> listMonthElectricity(@Param(Constants.WRAPPER)QueryWrapper<EnvElectricity> queryWrapper);
+
+    String sumDayWater(@Param(Constants.WRAPPER) QueryWrapper<EnvElectricity> wrapper);
 }

src/main/java/com/huimv/admin/mapper/EnvWaterMapper.java

@@ -28,4 +28,6 @@ public interface EnvWaterMapper extends BaseMapper<EnvWater> {
     List<energyMonthVo> listDayWater(@Param(Constants.WRAPPER) QueryWrapper<EnvWater> ge);
 
     List<energyYearVo> listMonthWater(@Param(Constants.WRAPPER) QueryWrapper<EnvWater> ge);
+
+    String sumDayWater(@Param(Constants.WRAPPER) QueryWrapper<EnvWater> wrapper);
 }

src/main/java/com/huimv/admin/service/IEnvElectricityService.java

@@ -16,4 +16,6 @@ import java.util.Map;
  */
 public interface IEnvElectricityService extends IService<EnvElectricity> {
     Result listElectricity(Map<String, String> paramsMap);
+
+    String sumDayElect();
 }

src/main/java/com/huimv/admin/service/IEnvWaterService.java

@@ -17,4 +17,6 @@ import java.util.Map;
 public interface IEnvWaterService extends IService<EnvWater> {
 
     Result listWater(Map<String, String> paramsMap);
+
+    String sumDayWater();
 }

src/main/java/com/huimv/admin/service/impl/BasePigpenServiceImpl.java

@@ -581,7 +581,7 @@ public class BasePigpenServiceImpl extends ServiceImpl<BasePigpenMapper, BasePig
             pageSize = "20";
         }
         QueryWrapper<EnvWarning> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("farm_id", farmId).eq("unit_id", unitId).eq("warning_type",8)
+        queryWrapper.eq("farm_id", farmId).eq("unit_id", unitId)
                 .orderByDesc("update_time");
         Page<EnvWarning> page = new Page(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
         Page<EnvWarning> envWarningPage = envWarningMapper.selectPage(page, queryWrapper);

src/main/java/com/huimv/admin/service/impl/EnvElectricityServiceImpl.java

@@ -1,5 +1,6 @@
 package com.huimv.admin.service.impl;
 
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.huimv.admin.common.utils.DataUill;
@@ -123,4 +124,11 @@ public class EnvElectricityServiceImpl extends ServiceImpl<EnvElectricityMapper,
             return new Result(ResultCode.SUCCESS,resultMap);
         }
     }
+
+    @Override
+    public String sumDayElect() {
+        QueryWrapper<EnvElectricity> wrapper = new QueryWrapper<>();
+        wrapper.eq("farm_Id", 27).ge("update_time", DateUtil.beginOfDay(new Date()));
+        return envElectricityMapper.sumDayWater(wrapper);
+    }
 }

src/main/java/com/huimv/admin/service/impl/EnvWaterServiceImpl.java

@@ -1,5 +1,6 @@
 package com.huimv.admin.service.impl;
 
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.huimv.admin.common.utils.DataUill;
@@ -124,4 +125,11 @@ public class EnvWaterServiceImpl extends ServiceImpl<EnvWaterMapper, EnvWater> i
         }
 
     }
+
+    @Override
+    public String sumDayWater() {
+        QueryWrapper<EnvWater> wrapper = new QueryWrapper<>();
+        wrapper.eq("farm_Id", 27).ge("update_time", DateUtil.beginOfDay(new Date()));
+        return envWaterMapper.sumDayWater(wrapper);
+    }
 }

src/main/resources/application-prod.yml

@@ -43,6 +43,6 @@ spring:
 
 mybatis-plus:
   configuration:
-    #    log-impl: org.apache.ibatis.logging.nologging.NoLoggingImpl
+#        log-impl: org.apache.ibatis.logging.nologging.NoLoggingImpl
     log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
 

src/main/resources/mapper/EnvElectricityMapper.xml

@@ -18,5 +18,9 @@
         ${ew.customSqlSegment}
          GROUP BY DATE_FORMAT(update_time,"%y-%m")
     </select>
+    <select id="sumDayWater" resultType="java.lang.String">
+          select  IFNULL(SUM(`handle_value`) ,0)from `env_electricity`
+        ${ew.customSqlSegment}
+    </select>
 
 </mapper>

src/main/resources/mapper/EnvTempMapper.xml

@@ -0,0 +1,5 @@
+<?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.huimv.admin.mapper.EnvTempMapper">
+
+</mapper>

src/main/resources/mapper/EnvWaterMapper.xml

@@ -18,6 +18,10 @@
         ${ew.customSqlSegment}
          GROUP BY DATE_FORMAT(update_time,"%y-%m")
     </select>
+    <select id="sumDayWater" resultType="java.lang.String">
+         select  IFNULL(ROUND(SUM(`handle_value`),1) ,0)from `env_water`
+        ${ew.customSqlSegment}
+    </select>
 
 
 </mapper>