各种能耗时间查询修改

huimv-admin/src/main/java/com/huimv/admin/entity/vo/EnergyDataVo.java

@@ -3,12 +3,16 @@ package com.huimv.admin.entity.vo;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
-import java.util.Date;
-
 @Data
 public class EnergyDataVo {
+    private String feedValue;
+
     private String gasValue;
 
-    @JsonFormat(pattern = "yyyy-MM", timezone = "GMT+8")
-    private Date createDate;
+    private String electricityValue;
+
+    private String waterValue;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    private String nowTime;
 }

huimv-admin/src/main/java/com/huimv/admin/entity/vo/EnergyGasDataVo.java

@@ -0,0 +1,14 @@
+package com.huimv.admin.entity.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class EnergyGasDataVo {
+    private String gasValue;
+
+    @JsonFormat(pattern = "yyyy-MM", timezone = "GMT+8")
+    private Date createDate;
+}

huimv-admin/src/main/java/com/huimv/admin/mapper/EnergyDataMapper.java

@@ -4,13 +4,9 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.huimv.admin.entity.EnergyData;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.huimv.admin.entity.EnergyFeed;
-import com.huimv.admin.entity.EnergyGas;
-import com.huimv.admin.entity.vo.EnergyDataVo;
-import com.huimv.admin.entity.vo.EnergyElectricityDataVo;
-import com.huimv.admin.entity.vo.EnergyFeedDataVo;
-import com.huimv.admin.entity.vo.EnergyWaterDataVo;
+import com.huimv.admin.entity.vo.*;
 import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
 
 import java.util.List;
 
@@ -22,13 +18,24 @@ import java.util.List;
  * @author author
  * @since 2023-02-14
  */
+@Repository
 public interface EnergyDataMapper extends BaseMapper<EnergyData> {
 
-    List<EnergyDataVo> listYear(@Param(Constants.WRAPPER) QueryWrapper<EnergyData> queryWrapper);
+    List<EnergyGasDataVo> listYear(@Param(Constants.WRAPPER) QueryWrapper<EnergyData> queryWrapper);
 
     List<EnergyFeedDataVo> listYear2(@Param(Constants.WRAPPER) QueryWrapper<EnergyData> queryWrapper);
 
     List<EnergyWaterDataVo> listYear3(@Param(Constants.WRAPPER) QueryWrapper<EnergyData> queryWrapper);
 
     List<EnergyElectricityDataVo> listYear4(@Param(Constants.WRAPPER) QueryWrapper<EnergyData> queryWrapper);
+
+    List<EnergyGasDataVo> listDay(@Param(Constants.WRAPPER) QueryWrapper<EnergyData> queryWrapper);
+
+    List<EnergyFeedDataVo> listDay2(@Param(Constants.WRAPPER) QueryWrapper<EnergyData> queryWrapper);
+
+    List<EnergyWaterDataVo> listDay3(@Param(Constants.WRAPPER) QueryWrapper<EnergyData> queryWrapper);
+
+    List<EnergyElectricityDataVo> listDay4(@Param(Constants.WRAPPER) QueryWrapper<EnergyData> queryWrapper);
+
+    EnergyDataVo listCount(@Param(Constants.WRAPPER) QueryWrapper<EnergyData> queryWrapper);
 }

huimv-admin/src/main/java/com/huimv/admin/mapper/EnergyFeedMapper.java

@@ -1,15 +1,7 @@
 package com.huimv.admin.mapper;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.huimv.admin.entity.EnergyFeed;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.huimv.admin.entity.EnergyGas;
-import com.huimv.admin.entity.vo.EnergyDataVo;
-import com.huimv.admin.entity.vo.EnergyFeedDataVo;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
 
 /**
  * <p>

huimv-admin/src/main/java/com/huimv/admin/mapper/EnergyGasMapper.java

@@ -1,16 +1,9 @@
 package com.huimv.admin.mapper;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Constants;
-import com.huimv.admin.common.utils.Result;
 import com.huimv.admin.entity.EnergyGas;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.huimv.admin.entity.vo.EnergyDataVo;
-import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
-import java.util.List;
-
 /**
  * <p>
  *  Mapper 接口

huimv-admin/src/main/java/com/huimv/admin/mapper/EnergyWaterMapper.java

@@ -2,10 +2,8 @@ package com.huimv.admin.mapper;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
-import com.huimv.admin.entity.EnergyGas;
 import com.huimv.admin.entity.EnergyWater;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.huimv.admin.entity.vo.EnergyDataVo;
 import com.huimv.admin.entity.vo.EnergyWaterDataVo;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
@@ -22,5 +20,5 @@ import java.util.List;
  */
 @Repository
 public interface EnergyWaterMapper extends BaseMapper<EnergyWater> {
-    List<EnergyWaterDataVo> listYear(@Param(Constants.WRAPPER) QueryWrapper<EnergyWater> queryWrapper);
+
 }

huimv-admin/src/main/java/com/huimv/admin/service/impl/EnergyElectricityServiceImpl.java

@@ -120,31 +120,43 @@ public class EnergyElectricityServiceImpl extends ServiceImpl<EnergyElectricityM
 
         QueryWrapper<EnergyData> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("farm_id", farmId).eq("unit_id", id);
-        List<EnergyData> electricityList = null;
+        List<EnergyElectricityDataVo> electricityList = null;
         //自定义查询
         if ("4".equals(type)) {
             startTime = startTime + " 00:00:00";
             endTime = endTime + " 23:59:59";
-            queryWrapper.between("create_date", startTime, endTime).orderByAsc("create_date");
-            electricityList = dataMapper.selectList(queryWrapper);
+            queryWrapper.between("create_date", startTime, endTime);
+            electricityList = dataMapper.listDay4(queryWrapper);
         }
         //本年
         else if ("3".equals(type)) {
             DateTime dateTime = DateUtil.beginOfYear(new Date());
             queryWrapper.ge("create_date", dateTime);
-            return new Result(ResultCode.SUCCESS, dataMapper.listYear4(queryWrapper));
+            List<EnergyElectricityDataVo> energyElectricityDataVos = dataMapper.listYear4(queryWrapper);
+            for (EnergyElectricityDataVo energyElectricityDataVo : energyElectricityDataVos) {
+                if (energyElectricityDataVo.getElectricityValue() == null || energyElectricityDataVo.getElectricityValue() == "") {
+                    energyElectricityDataVo.setElectricityValue("0");
+                }
+            }
+            electricityList = energyElectricityDataVos;
         }
         //本月
         else if ("2".equals(type)) {
             Date timesMonthmorning = DataUill.getTimesMonthmorning();
-            queryWrapper.ge("create_date", timesMonthmorning).orderByAsc("create_date");
-            electricityList = dataMapper.selectList(queryWrapper);
+            queryWrapper.ge("create_date", timesMonthmorning);
+            electricityList = dataMapper.listDay4(queryWrapper);
         }
         //本周
         else if ("1".equals(type)) {
             DateTime dateTime = DateUtil.beginOfWeek(new Date());
-            queryWrapper.ge("create_date", dateTime).orderByAsc("create_date");
-            electricityList = dataMapper.selectList(queryWrapper);
+            queryWrapper.ge("create_date", dateTime);
+            List<EnergyElectricityDataVo> energyElectricityDataVos = dataMapper.listDay4(queryWrapper);
+            for (EnergyElectricityDataVo energyElectricityDataVo : energyElectricityDataVos) {
+                if (energyElectricityDataVo.getElectricityValue() == null || energyElectricityDataVo.getElectricityValue() == "") {
+                    energyElectricityDataVo.setElectricityValue("0");
+                }
+            }
+            electricityList = energyElectricityDataVos;
         }
         return new Result(ResultCode.SUCCESS, electricityList);
     }

huimv-admin/src/main/java/com/huimv/admin/service/impl/EnergyFeedServiceImpl.java

@@ -12,8 +12,6 @@ import com.huimv.admin.common.utils.ResultCode;
 import com.huimv.admin.entity.BasePigpen;
 import com.huimv.admin.entity.EnergyData;
 import com.huimv.admin.entity.EnergyFeed;
-import com.huimv.admin.entity.EnergyGas;
-import com.huimv.admin.entity.vo.EnergyDataVo;
 import com.huimv.admin.entity.vo.EnergyFeedDataVo;
 import com.huimv.admin.mapper.BasePigpenMapper;
 import com.huimv.admin.mapper.EnergyDataMapper;
@@ -111,7 +109,7 @@ public class EnergyFeedServiceImpl extends ServiceImpl<EnergyFeedMapper, EnergyF
         String startTime = paramsMap.get("startTime");
         String endTime = paramsMap.get("endTime");
 
-        List<EnergyData> energyGasList=null;
+        List<EnergyFeedDataVo> energyGasList=null;
         //默认显示本年
         if (type == null || type == "") {
             type = "3";
@@ -122,26 +120,38 @@ public class EnergyFeedServiceImpl extends ServiceImpl<EnergyFeedMapper, EnergyF
         if ("4".equals(type)) {
             startTime = startTime + " 00:00:00";
             endTime = endTime + " 23:59:59";
-            queryWrapper.between("create_date", startTime, endTime).orderByAsc("create_date");
-            energyGasList = dataMapper.selectList(queryWrapper);;
+            queryWrapper.between("create_date", startTime, endTime);
+            energyGasList = dataMapper.listDay2(queryWrapper);;
         }
         //全年
         else if ("3".equals(type)) {
             DateTime dateTime = DateUtil.beginOfYear(new Date());
             queryWrapper.ge("create_date",dateTime);
-            return new Result(ResultCode.SUCCESS,  dataMapper.listYear2(queryWrapper));
+            List<EnergyFeedDataVo> energyFeedDataVos = dataMapper.listYear2(queryWrapper);
+            for (EnergyFeedDataVo energyFeedDataVo : energyFeedDataVos) {
+                if (energyFeedDataVo.getFeedValue() == null || energyFeedDataVo.getFeedValue() == "") {
+                    energyFeedDataVo.setFeedValue("0");
+                }
+            }
+            energyGasList = energyFeedDataVos;
         }
         //本月
         else if ("2".equals(type)) {
             Date timesMonthmorning = DataUill.getTimesMonthmorning();
-            queryWrapper.ge("create_date", timesMonthmorning).orderByAsc("create_date");
-            energyGasList =dataMapper.selectList(queryWrapper);
+            queryWrapper.ge("create_date", timesMonthmorning);
+            energyGasList =dataMapper.listDay2(queryWrapper);
         }
         //本周
         else if ("1".equals(type)) {
             DateTime dateTime = DateUtil.beginOfWeek(new Date());
-            queryWrapper.ge("create_date", dateTime).orderByAsc("create_date");
-            energyGasList = dataMapper.selectList(queryWrapper);
+            queryWrapper.ge("create_date", dateTime);
+            List<EnergyFeedDataVo> energyFeedDataVos = dataMapper.listDay2(queryWrapper);
+            for (EnergyFeedDataVo energyFeedDataVo : energyFeedDataVos) {
+                if (energyFeedDataVo.getFeedValue() == null || energyFeedDataVo.getFeedValue() == "") {
+                    energyFeedDataVo.setFeedValue("0");
+                }
+            }
+            energyGasList = energyFeedDataVos;
         }
         return new Result(ResultCode.SUCCESS,energyGasList);
 

huimv-admin/src/main/java/com/huimv/admin/service/impl/EnergyGasServiceImpl.java

@@ -13,25 +13,23 @@ import com.huimv.admin.entity.BasePigpen;
 import com.huimv.admin.entity.EnergyData;
 import com.huimv.admin.entity.EnergyGas;
 import com.huimv.admin.entity.vo.EnergyDataVo;
+import com.huimv.admin.entity.vo.EnergyGasDataVo;
 import com.huimv.admin.mapper.BasePigpenMapper;
 import com.huimv.admin.mapper.EnergyDataMapper;
 import com.huimv.admin.mapper.EnergyGasMapper;
 import com.huimv.admin.service.IEnergyGasService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.mysql.cj.util.StringUtils;
-import org.apache.commons.lang.time.DateUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import javax.servlet.http.HttpServletRequest;
 import java.util.Date;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
 /**
  * <p>
- *  服务实现类
+ * 服务实现类
  * </p>
  *
  * @author author
@@ -105,7 +103,7 @@ public class EnergyGasServiceImpl extends ServiceImpl<EnergyGasMapper, EnergyGas
             }
         }
 
-        return new Result(ResultCode.SUCCESS,jsonArray);
+        return new Result(ResultCode.SUCCESS, jsonArray);
     }
 
     @Override
@@ -116,39 +114,50 @@ public class EnergyGasServiceImpl extends ServiceImpl<EnergyGasMapper, EnergyGas
         String startTime = paramsMap.get("startTime");
         String endTime = paramsMap.get("endTime");
 
-        List<EnergyData> energyGasList=null;
+        List<EnergyGasDataVo> energyGasList = null;
         //默认显示本年
         if (type == null || type == "") {
             type = "3";
         }
         QueryWrapper<EnergyData> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("farm_id", farmId).eq("unit_id",id);
+        queryWrapper.eq("farm_id", farmId).eq("unit_id", id);
         //自定义查询
         if ("4".equals(type)) {
             startTime = startTime + " 00:00:00";
             endTime = endTime + " 23:59:59";
-            queryWrapper.between("create_date", startTime, endTime).orderByAsc("create_date");
-            energyGasList =dataMapper.selectList(queryWrapper);
+            queryWrapper.between("create_date", startTime, endTime);
+            energyGasList = dataMapper.listDay(queryWrapper);
         }
         //全年
         else if ("3".equals(type)) {
             DateTime dateTime = DateUtil.beginOfYear(new Date());
-            queryWrapper.ge("create_date",dateTime);
-            List<EnergyDataVo> energyDataVos = dataMapper.listYear(queryWrapper);
-            return new Result(ResultCode.SUCCESS, energyDataVos);
+            queryWrapper.ge("create_date", dateTime);
+            List<EnergyGasDataVo> energyGasDataVos = dataMapper.listYear(queryWrapper);
+            for (EnergyGasDataVo energyGasDataVo : energyGasDataVos) {
+                if (energyGasDataVo.getGasValue() == null || energyGasDataVo.getGasValue() == "") {
+                   energyGasDataVo.setGasValue("0");
+                }
+            }
+            energyGasList = dataMapper.listYear(queryWrapper);
         }
         //本月
         else if ("2".equals(type)) {
             Date timesMonthmorning = DataUill.getTimesMonthmorning();
-            queryWrapper.ge("create_date", timesMonthmorning).orderByAsc("create_date");
-            energyGasList =  dataMapper.selectList(queryWrapper);
+            queryWrapper.ge("create_date", timesMonthmorning);
+            energyGasList = dataMapper.listDay(queryWrapper);
         }
         //本周
         else if ("1".equals(type)) {
             DateTime dateTime = DateUtil.beginOfWeek(new Date());
-            queryWrapper.ge("create_date", dateTime).orderByAsc("create_date");
-            energyGasList = dataMapper.selectList(queryWrapper);;
+            queryWrapper.ge("create_date", dateTime);
+            List<EnergyGasDataVo> energyGasDataVos = dataMapper.listDay(queryWrapper);
+            for (EnergyGasDataVo energyGasDataVo : energyGasDataVos) {
+                if (energyGasDataVo.getGasValue() == null || energyGasDataVo.getGasValue() == "") {
+                    energyGasDataVo.setGasValue("0");
+                }
+            }
+            energyGasList =energyGasDataVos;
         }
-        return new Result(ResultCode.SUCCESS,energyGasList);
+        return new Result(ResultCode.SUCCESS, energyGasList);
     }
 }

huimv-admin/src/main/java/com/huimv/admin/service/impl/EnergyWaterServiceImpl.java

@@ -121,33 +121,45 @@ public class EnergyWaterServiceImpl extends ServiceImpl<EnergyWaterMapper, Energ
             type = "3";
         }
 
-        List<EnergyData> energyWaterList = null;
+        List<EnergyWaterDataVo> energyWaterList = null;
         QueryWrapper<EnergyData> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("farm_id", farmId).eq("unit_id", id);
         //自定义查询
         if ("4".equals(type)) {
             startTime = startTime + " 00:00:00";
             endTime = endTime + " 23:59:59";
-            queryWrapper.between("creata_date", startTime, endTime).orderByAsc("create_date");
-            energyWaterList = dataMapper.selectList(queryWrapper);
+            queryWrapper.between("creata_date", startTime, endTime);
+            energyWaterList = dataMapper.listDay3(queryWrapper);
         }
         //本年
         else if ("3".equals(type)) {
             DateTime dateTime = DateUtil.beginOfYear(new Date());
             queryWrapper.ge("create_date",dateTime);
-            return new Result(ResultCode.SUCCESS, dataMapper.listYear3(queryWrapper));
+            List<EnergyWaterDataVo> energyWaterDataVos = dataMapper.listYear3(queryWrapper);
+            for (EnergyWaterDataVo energyWaterDataVo : energyWaterDataVos) {
+                if (energyWaterDataVo.getWaterValue() == null || energyWaterDataVo.getWaterValue() == "") {
+                    energyWaterDataVo.setWaterValue("0");
+                }
+            }
+            energyWaterList = dataMapper.listYear3(queryWrapper);
         }
         //本月
         else if ("2".equals(type)) {
             Date timesMonthmorning = DataUill.getTimesMonthmorning();
-            queryWrapper.ge("create_date", timesMonthmorning).orderByAsc("create_date");
-            energyWaterList = dataMapper.selectList(queryWrapper);
+            queryWrapper.ge("create_date", timesMonthmorning);
+            energyWaterList = dataMapper.listDay3(queryWrapper);
         }
         //本周
         else if ("1".equals(type)) {
             DateTime dateTime = DateUtil.beginOfWeek(new Date());
-            queryWrapper.ge("create_date", dateTime).orderByAsc("create_date");
-            energyWaterList = dataMapper.selectList(queryWrapper);
+            queryWrapper.ge("create_date", dateTime);
+            List<EnergyWaterDataVo> energyWaterDataVos = dataMapper.listDay3(queryWrapper);
+            for (EnergyWaterDataVo energyWaterDataVo : energyWaterDataVos) {
+                if (energyWaterDataVo.getWaterValue() == null || energyWaterDataVo.getWaterValue() == "") {
+                    energyWaterDataVo.setWaterValue("0");
+                }
+            }
+            energyWaterList = energyWaterDataVos;
         }
         return new Result(ResultCode.SUCCESS,energyWaterList);
     }

huimv-admin/src/main/resources/com/huimv/admin/mapper/EnergyDataMapper.xml

@@ -21,12 +21,18 @@
         <result column="other3" property="other3" />
         <result column="create_date" property="createDate"/>
     </resultMap>
-    <select id="listYear" resultType="com.huimv.admin.entity.vo.EnergyDataVo">
+    <select id="listYear" resultType="com.huimv.admin.entity.vo.EnergyGasDataVo">
         SELECT sum(gas_value) 'gasValue',create_date 'createDate' FROM `energy_data`
          ${ew.customSqlSegment}
         GROUP BY DATE_FORMAT(create_date,'%Y-%m')
         ORDER BY create_date ASC
     </select>
+    <select id="listDay" resultType="com.huimv.admin.entity.vo.EnergyGasDataVo">
+        SELECT sum(gas_value) 'gasValue',create_date 'createDate' FROM `energy_data`
+         ${ew.customSqlSegment}
+        GROUP BY DATE_FORMAT(create_date,'%Y-%m-%d')
+        ORDER BY create_date ASC
+    </select>
 
     <select id="listYear2" resultType="com.huimv.admin.entity.vo.EnergyFeedDataVo">
         SELECT sum(feed_value) 'feedValue',create_date 'createDate' FROM `energy_data`
@@ -34,16 +40,40 @@
         GROUP BY DATE_FORMAT(create_date,'%Y-%m')
         ORDER BY create_date ASC
     </select>
+    <select id="listDay2" resultType="com.huimv.admin.entity.vo.EnergyFeedDataVo">
+        SELECT sum(feed_value) 'feedValue',create_date 'createDate' FROM `energy_data`
+         ${ew.customSqlSegment}
+        GROUP BY DATE_FORMAT(create_date,'%Y-%m-%d')
+        ORDER BY create_date ASC
+    </select>
     <select id="listYear3" resultType="com.huimv.admin.entity.vo.EnergyWaterDataVo">
         SELECT sum(water_value) 'waterValue',create_date 'createDate' FROM `energy_data`
          ${ew.customSqlSegment}
         GROUP BY DATE_FORMAT(create_date,'%Y-%m')
         ORDER BY create_date ASC
     </select>
+    <select id="listDay3" resultType="com.huimv.admin.entity.vo.EnergyWaterDataVo">
+        SELECT sum(water_value) 'waterValue',create_date 'createDate' FROM `energy_data`
+         ${ew.customSqlSegment}
+        GROUP BY DATE_FORMAT(create_date,'%Y-%m-%d')
+        ORDER BY create_date ASC
+    </select>
     <select id="listYear4" resultType="com.huimv.admin.entity.vo.EnergyElectricityDataVo">
         SELECT sum(electricity_value) 'electricityValue',create_date 'createDate' FROM `energy_data`
          ${ew.customSqlSegment}
         GROUP BY DATE_FORMAT(create_date,'%Y-%m')
         ORDER BY create_date ASC
     </select>
+    <select id="listDay4" resultType="com.huimv.admin.entity.vo.EnergyElectricityDataVo">
+        SELECT sum(electricity_value) 'electricityValue',create_date 'createDate' FROM `energy_data`
+         ${ew.customSqlSegment}
+        GROUP BY DATE_FORMAT(create_date,'%Y-%m-%d')
+        ORDER BY create_date ASC
+    </select>
+    <select id="listCount" resultType="com.huimv.admin.entity.vo.EnergyDataVo">
+        select sum(water_value) 'waterValue',sum(electricity_value) 'electricityValue',sum(feed_value) 'feedValue',sum(gas_value) 'gasValue',now() 'nowTime'
+         from energy_data
+        ${ew.customSqlSegment}
+    </select>
+
 </mapper>