各种能耗修改

huimv-admin/src/main/java/com/huimv/admin/entity/EnergyData.java

@@ -4,6 +4,9 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.io.Serializable;
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -50,12 +53,12 @@ public class EnergyData implements Serializable {
     /**
      * 天然气记录值
      */
-    private String gasVarlue;
+    private String gasValue;
 
     /**
      * 天然气原始值
      */
-    private String originalGasVarlue;
+    private String originalGasValue;
 
     /**
      * 用电记录值
@@ -85,5 +88,9 @@ public class EnergyData implements Serializable {
 
     private String other3;
 
+    /*创建时间*/
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" ,timezone = "GMT+8")
+    private Date createDate;
+
 
 }

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

@@ -1,7 +1,18 @@
 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.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 org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -13,4 +24,11 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface EnergyDataMapper extends BaseMapper<EnergyData> {
 
+    List<EnergyDataVo> 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);
 }

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

@@ -21,5 +21,5 @@ import java.util.List;
  */
 @Repository
 public interface EnergyElectricityMapper extends BaseMapper<EnergyElectricity> {
-    List<EnergyElectricityDataVo> listYear(@Param(Constants.WRAPPER)QueryWrapper<EnergyElectricity> queryWrapper);
+
 }

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

@@ -20,5 +20,5 @@ import java.util.List;
  * @since 2023-02-14
  */
 public interface EnergyFeedMapper extends BaseMapper<EnergyFeed> {
-    List<EnergyFeedDataVo> listYear(@Param(Constants.WRAPPER) QueryWrapper<EnergyFeed> queryWrapper);
+
 }

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

@@ -22,5 +22,4 @@ import java.util.List;
 @Repository
 public interface EnergyGasMapper extends BaseMapper<EnergyGas> {
 
-    List<EnergyDataVo> listYear(@Param(Constants.WRAPPER) QueryWrapper<EnergyGas> queryWrapper);
 }

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

@@ -10,9 +10,11 @@ import com.huimv.admin.common.utils.DataUill;
 import com.huimv.admin.common.utils.Result;
 import com.huimv.admin.common.utils.ResultCode;
 import com.huimv.admin.entity.BasePigpen;
+import com.huimv.admin.entity.EnergyData;
 import com.huimv.admin.entity.EnergyElectricity;
 import com.huimv.admin.entity.vo.EnergyElectricityDataVo;
 import com.huimv.admin.mapper.BasePigpenMapper;
+import com.huimv.admin.mapper.EnergyDataMapper;
 import com.huimv.admin.mapper.EnergyElectricityMapper;
 import com.huimv.admin.service.IEnergyElectricityService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -39,6 +41,8 @@ public class EnergyElectricityServiceImpl extends ServiceImpl<EnergyElectricityM
     private EnergyElectricityMapper energyElectricityMapper;
     @Autowired
     private BasePigpenMapper basePigpenMapper;
+    @Autowired
+    private EnergyDataMapper dataMapper;
     @Override
     public Result listPigpen(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
         String farmId = paramsMap.get("farmId");
@@ -59,10 +63,10 @@ public class EnergyElectricityServiceImpl extends ServiceImpl<EnergyElectricityM
                     List<BasePigpen> basePigpens2 = basePigpenMapper.selectList(queryWrapper1);
                     for (BasePigpen basePigpen1 : basePigpens2) {
                         JSONObject jsonObject = new JSONObject();
-                        QueryWrapper<EnergyElectricity> energyElectricityQueryWrapper = new QueryWrapper<>();
+                        QueryWrapper<EnergyData> energyElectricityQueryWrapper = new QueryWrapper<>();
                         energyElectricityQueryWrapper.eq("farm_id", farmId).eq("unit_id", basePigpen1.getId())
                                 .orderByDesc("create_date").last(" limit 1");
-                        EnergyElectricity energyElectricity = energyElectricityMapper.selectOne(energyElectricityQueryWrapper);
+                        EnergyData energyElectricity = dataMapper.selectOne(energyElectricityQueryWrapper);
                         if (ObjectUtil.isEmpty(energyElectricity)) {
                             jsonObject.put("buildName", basePigpen1.getBuildName());
                             jsonObject.put("value", 0);
@@ -82,10 +86,10 @@ public class EnergyElectricityServiceImpl extends ServiceImpl<EnergyElectricityM
             List<BasePigpen> basePigpens = basePigpenMapper.selectList(basePigpenQueryWrapper);//所有的单元
             for (BasePigpen basePigpen : basePigpens) {
                 JSONObject jsonObject = new JSONObject();
-                QueryWrapper<EnergyElectricity> queryWrapper = new QueryWrapper<>();
+                QueryWrapper<EnergyData> queryWrapper = new QueryWrapper<>();
                 queryWrapper.eq("farm_id", farmId).eq("unit_id", basePigpen.getId())
                         .orderByDesc("create_date").last(" limit 1");
-                EnergyElectricity energyElectricity = energyElectricityMapper.selectOne(queryWrapper);
+                EnergyData energyElectricity = dataMapper.selectOne(queryWrapper);
                 if (ObjectUtil.isEmpty(energyElectricity)) {
                     jsonObject.put("buildName", basePigpen.getBuildName());
                     jsonObject.put("value", 0);
@@ -114,33 +118,33 @@ public class EnergyElectricityServiceImpl extends ServiceImpl<EnergyElectricityM
             type = "3";
         }
 
-        QueryWrapper<EnergyElectricity> queryWrapper = new QueryWrapper<>();
+        QueryWrapper<EnergyData> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("farm_id", farmId).eq("unit_id", id);
-        List<EnergyElectricity> electricityList = null;
+        List<EnergyData> electricityList = null;
         //自定义查询
         if ("4".equals(type)) {
             startTime = startTime + " 00:00:00";
             endTime = endTime + " 23:59:59";
-            queryWrapper.between("create_date", startTime, endTime);
-            electricityList = energyElectricityMapper.selectList(queryWrapper);
+            queryWrapper.between("create_date", startTime, endTime).orderByAsc("create_date");
+            electricityList = dataMapper.selectList(queryWrapper);
         }
         //本年
         else if ("3".equals(type)) {
             DateTime dateTime = DateUtil.beginOfYear(new Date());
             queryWrapper.ge("create_date", dateTime);
-            return new Result(ResultCode.SUCCESS, energyElectricityMapper.listYear(queryWrapper));
+            return new Result(ResultCode.SUCCESS, dataMapper.listYear4(queryWrapper));
         }
         //本月
         else if ("2".equals(type)) {
             Date timesMonthmorning = DataUill.getTimesMonthmorning();
-            queryWrapper.ge("create_date", timesMonthmorning);
-            electricityList = energyElectricityMapper.selectList(queryWrapper);
+            queryWrapper.ge("create_date", timesMonthmorning).orderByAsc("create_date");
+            electricityList = dataMapper.selectList(queryWrapper);
         }
         //本周
         else if ("1".equals(type)) {
             DateTime dateTime = DateUtil.beginOfWeek(new Date());
-            queryWrapper.ge("create_date", dateTime);
-            electricityList = energyElectricityMapper.selectList(queryWrapper);
+            queryWrapper.ge("create_date", dateTime).orderByAsc("create_date");
+            electricityList = dataMapper.selectList(queryWrapper);
         }
         return new Result(ResultCode.SUCCESS, electricityList);
     }

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

@@ -10,11 +10,13 @@ import com.huimv.admin.common.utils.DataUill;
 import com.huimv.admin.common.utils.Result;
 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;
 import com.huimv.admin.mapper.EnergyFeedMapper;
 import com.huimv.admin.service.IEnergyFeedService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -41,6 +43,8 @@ public class EnergyFeedServiceImpl extends ServiceImpl<EnergyFeedMapper, EnergyF
     private EnergyFeedMapper energyFeedMapper;
     @Autowired
     private BasePigpenMapper basePigpenMapper;
+    @Autowired
+    private EnergyDataMapper dataMapper;
     @Override
     public Result listPigpen(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
         String farmId = paramsMap.get("farmId");
@@ -52,17 +56,15 @@ public class EnergyFeedServiceImpl extends ServiceImpl<EnergyFeedMapper, EnergyF
             queryWrapper.eq("farm_id", farmId).eq("parent_id", 0);
             List<BasePigpen> basePigpens = basePigpenMapper.selectList(queryWrapper);
             for (int i = 0; i < basePigpens.size(); i++) {
-
-
                 QueryWrapper<BasePigpen> basePigpenQueryWrapper = new QueryWrapper<>();
                 basePigpenQueryWrapper.eq("parent_id", basePigpens.get(i).getId()).eq("farm_id", farmId);
                 List<BasePigpen> basePigpens1 = basePigpenMapper.selectList(basePigpenQueryWrapper);
                 for (BasePigpen basePigpen : basePigpens1) {
                     JSONObject jsonObject = new JSONObject();
-                    QueryWrapper<EnergyFeed> queryWrapper1 = new QueryWrapper<>();
+                    QueryWrapper<EnergyData> queryWrapper1 = new QueryWrapper<>();
                     queryWrapper1.eq("unit_id", basePigpen.getId()).eq("farm_id", farmId)
                             .orderByDesc("create_date").last(" limit 1");
-                    EnergyFeed energyFeed = energyFeedMapper.selectOne(queryWrapper1);
+                    EnergyData energyFeed = dataMapper.selectOne(queryWrapper1);
                     if (ObjectUtil.isEmpty(energyFeed)) {
                         jsonObject.put("buildName", basePigpen.getBuildName());
                         jsonObject.put("value", 0);
@@ -81,10 +83,10 @@ public class EnergyFeedServiceImpl extends ServiceImpl<EnergyFeedMapper, EnergyF
             List<BasePigpen> basePigpens = basePigpenMapper.selectList(queryWrapper);
             for (BasePigpen basePigpen : basePigpens) {
                 JSONObject jsonObject = new JSONObject();
-                QueryWrapper<EnergyFeed> queryWrapper1 = new QueryWrapper<>();
+                QueryWrapper<EnergyData> queryWrapper1 = new QueryWrapper<>();
                 queryWrapper1.eq("unit_id", basePigpen.getId()).eq("farm_id", farmId)
                         .orderByDesc("create_date").last(" limit 1");
-                EnergyFeed energyFeed = energyFeedMapper.selectOne(queryWrapper1);
+                EnergyData energyFeed = dataMapper.selectOne(queryWrapper1);
                 if (ObjectUtil.isEmpty(energyFeed)) {
                     jsonObject.put("buildName", basePigpen.getBuildName());
                     jsonObject.put("value", 0);
@@ -109,41 +111,37 @@ public class EnergyFeedServiceImpl extends ServiceImpl<EnergyFeedMapper, EnergyF
         String startTime = paramsMap.get("startTime");
         String endTime = paramsMap.get("endTime");
 
-        List<EnergyFeed> energyGasList=null;
+        List<EnergyData> energyGasList=null;
         //默认显示本年
         if (type == null || type == "") {
             type = "3";
         }
-        QueryWrapper<EnergyFeed> queryWrapper = new QueryWrapper<>();
+        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("create_date", startTime, endTime).orderByAsc("create_date");
-            List<EnergyFeed> energyGases = energyFeedMapper.selectList(queryWrapper);
-            energyGasList = energyGases;
+            energyGasList = dataMapper.selectList(queryWrapper);;
         }
         //全年
         else if ("3".equals(type)) {
             DateTime dateTime = DateUtil.beginOfYear(new Date());
             queryWrapper.ge("create_date",dateTime);
-            List<EnergyFeedDataVo> energyDataVos = energyFeedMapper.listYear(queryWrapper);
-            return new Result(ResultCode.SUCCESS, energyDataVos);
+            return new Result(ResultCode.SUCCESS,  dataMapper.listYear2(queryWrapper));
         }
         //本月
         else if ("2".equals(type)) {
             Date timesMonthmorning = DataUill.getTimesMonthmorning();
             queryWrapper.ge("create_date", timesMonthmorning).orderByAsc("create_date");
-            List<EnergyFeed> energyGases = energyFeedMapper.selectList(queryWrapper);
-            energyGasList = energyGases;
+            energyGasList =dataMapper.selectList(queryWrapper);
         }
         //本周
         else if ("1".equals(type)) {
             DateTime dateTime = DateUtil.beginOfWeek(new Date());
             queryWrapper.ge("create_date", dateTime).orderByAsc("create_date");
-            List<EnergyFeed> energyGases = energyFeedMapper.selectList(queryWrapper);
-            energyGasList = energyGases;
+            energyGasList = dataMapper.selectList(queryWrapper);
         }
         return new Result(ResultCode.SUCCESS,energyGasList);
 

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

@@ -10,9 +10,11 @@ import com.huimv.admin.common.utils.DataUill;
 import com.huimv.admin.common.utils.Result;
 import com.huimv.admin.common.utils.ResultCode;
 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.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;
@@ -42,6 +44,8 @@ public class EnergyGasServiceImpl extends ServiceImpl<EnergyGasMapper, EnergyGas
     private EnergyGasMapper energyGasMapper;
     @Autowired
     private BasePigpenMapper basePigpenMapper;
+    @Autowired
+    private EnergyDataMapper dataMapper;
 
     @Override
     public Result listPigpen(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
@@ -61,10 +65,10 @@ public class EnergyGasServiceImpl extends ServiceImpl<EnergyGasMapper, EnergyGas
                 List<BasePigpen> basePigpens1 = basePigpenMapper.selectList(basePigpenQueryWrapper);
                 for (BasePigpen basePigpen : basePigpens1) {
                     JSONObject jsonObject = new JSONObject();
-                    QueryWrapper<EnergyGas> queryWrapper1 = new QueryWrapper<>();
+                    QueryWrapper<EnergyData> queryWrapper1 = new QueryWrapper<>();
                     queryWrapper1.eq("unit_id", basePigpen.getId()).eq("farm_id", farmId)
                             .orderByDesc("create_date").last(" limit 1");
-                    EnergyGas energyGas = energyGasMapper.selectOne(queryWrapper1);
+                    EnergyData energyGas = dataMapper.selectOne(queryWrapper1);
                     if (ObjectUtil.isEmpty(energyGas)) {
                         jsonObject.put("buildName", basePigpen.getBuildName());
                         jsonObject.put("value", 0);
@@ -83,10 +87,10 @@ public class EnergyGasServiceImpl extends ServiceImpl<EnergyGasMapper, EnergyGas
             List<BasePigpen> basePigpens = basePigpenMapper.selectList(queryWrapper);
             for (BasePigpen basePigpen : basePigpens) {
                 JSONObject jsonObject = new JSONObject();
-                QueryWrapper<EnergyGas> queryWrapper1 = new QueryWrapper<>();
+                QueryWrapper<EnergyData> queryWrapper1 = new QueryWrapper<>();
                 queryWrapper1.eq("unit_id", basePigpen.getId()).eq("farm_id", farmId)
                         .orderByDesc("create_date").last(" limit 1");
-                EnergyGas energyGas = energyGasMapper.selectOne(queryWrapper1);
+                EnergyData energyGas = dataMapper.selectOne(queryWrapper1);
                 if (ObjectUtil.isEmpty(energyGas)) {
                     jsonObject.put("buildName", basePigpen.getBuildName());
                     jsonObject.put("value", 0);
@@ -112,41 +116,38 @@ public class EnergyGasServiceImpl extends ServiceImpl<EnergyGasMapper, EnergyGas
         String startTime = paramsMap.get("startTime");
         String endTime = paramsMap.get("endTime");
 
-        List<EnergyGas> energyGasList=null;
+        List<EnergyData> energyGasList=null;
         //默认显示本年
         if (type == null || type == "") {
             type = "3";
         }
-        QueryWrapper<EnergyGas> queryWrapper = new QueryWrapper<>();
+        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("create_date", startTime, endTime).orderByAsc("create_date");
-            List<EnergyGas> energyGases = energyGasMapper.selectList(queryWrapper);
-            energyGasList = energyGases;
+            energyGasList =dataMapper.selectList(queryWrapper);
         }
         //全年
         else if ("3".equals(type)) {
             DateTime dateTime = DateUtil.beginOfYear(new Date());
             queryWrapper.ge("create_date",dateTime);
-            List<EnergyDataVo> energyDataVos = energyGasMapper.listYear(queryWrapper);
+            List<EnergyDataVo> energyDataVos = dataMapper.listYear(queryWrapper);
             return new Result(ResultCode.SUCCESS, energyDataVos);
         }
         //本月
         else if ("2".equals(type)) {
             Date timesMonthmorning = DataUill.getTimesMonthmorning();
             queryWrapper.ge("create_date", timesMonthmorning).orderByAsc("create_date");
-            List<EnergyGas> energyGases = energyGasMapper.selectList(queryWrapper);
-            energyGasList = energyGases;
+            energyGasList =  dataMapper.selectList(queryWrapper);
         }
         //本周
         else if ("1".equals(type)) {
             DateTime dateTime = DateUtil.beginOfWeek(new Date());
             queryWrapper.ge("create_date", dateTime).orderByAsc("create_date");
-            List<EnergyGas> energyGases = energyGasMapper.selectList(queryWrapper);
-            energyGasList = energyGases;
+            energyGasList = dataMapper.selectList(queryWrapper);;
         }
         return new Result(ResultCode.SUCCESS,energyGasList);
     }

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

@@ -10,9 +10,11 @@ import com.huimv.admin.common.utils.DataUill;
 import com.huimv.admin.common.utils.Result;
 import com.huimv.admin.common.utils.ResultCode;
 import com.huimv.admin.entity.BasePigpen;
+import com.huimv.admin.entity.EnergyData;
 import com.huimv.admin.entity.EnergyWater;
 import com.huimv.admin.entity.vo.EnergyWaterDataVo;
 import com.huimv.admin.mapper.BasePigpenMapper;
+import com.huimv.admin.mapper.EnergyDataMapper;
 import com.huimv.admin.mapper.EnergyWaterMapper;
 import com.huimv.admin.service.IEnergyWaterService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -39,6 +41,8 @@ public class EnergyWaterServiceImpl extends ServiceImpl<EnergyWaterMapper, Energ
     private BasePigpenMapper basePigpenMapper;
     @Autowired
     private EnergyWaterMapper energyWaterMapper;
+    @Autowired
+    private EnergyDataMapper dataMapper;
 
     @Override
     public Result listPigpen(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
@@ -61,10 +65,10 @@ public class EnergyWaterServiceImpl extends ServiceImpl<EnergyWaterMapper, Energ
                     List<BasePigpen> basePigpens1 = basePigpenMapper.selectList(queryWrapper1);//得到所有的单元
                     for (BasePigpen basePigpen1 : basePigpens1) {
                         JSONObject jsonObject = new JSONObject();
-                        QueryWrapper<EnergyWater> energyWaterQueryWrapper = new QueryWrapper<>();
+                        QueryWrapper<EnergyData> energyWaterQueryWrapper = new QueryWrapper<>();
                         energyWaterQueryWrapper.eq("farm_id",farmId).eq("unit_id",basePigpen1.getId())
                                 .orderByDesc("create_date").last(" limit 1");
-                        EnergyWater energyWater = energyWaterMapper.selectOne(energyWaterQueryWrapper);
+                        EnergyData energyWater = dataMapper.selectOne(energyWaterQueryWrapper);
                         if (ObjectUtil.isEmpty(energyWater)) {
                             jsonObject.put("buildName", basePigpen1.getBuildName());
                             jsonObject.put("value", 0);
@@ -85,10 +89,10 @@ public class EnergyWaterServiceImpl extends ServiceImpl<EnergyWaterMapper, Energ
             List<BasePigpen> basePigpenList = basePigpenMapper.selectList(basePigpenQueryWrapper);//得到所有的单元
             for (BasePigpen basePigpen : basePigpenList) {
                 JSONObject jsonObject = new JSONObject();
-                QueryWrapper<EnergyWater> queryWrapper = new QueryWrapper<>();
+                QueryWrapper<EnergyData> queryWrapper = new QueryWrapper<>();
                 queryWrapper.eq("farm_id", farmId).eq("unit_id", basePigpen.getId())
                         .orderByDesc("create_date").last(" limit 1");
-                EnergyWater energyWater = energyWaterMapper.selectOne(queryWrapper);
+                EnergyData energyWater = dataMapper.selectOne(queryWrapper);
                 if (ObjectUtil.isEmpty(energyWater)) {
                     jsonObject.put("buildName", basePigpen.getBuildName());
                     jsonObject.put("value", 0);
@@ -117,37 +121,33 @@ public class EnergyWaterServiceImpl extends ServiceImpl<EnergyWaterMapper, Energ
             type = "3";
         }
 
-        List<EnergyWater> energyWaterList = null;
-        QueryWrapper<EnergyWater> queryWrapper = new QueryWrapper<>();
+        List<EnergyData> 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);
-            List<EnergyWater> energyWaters = energyWaterMapper.selectList(queryWrapper);
-            energyWaterList = energyWaters;
+            queryWrapper.between("creata_date", startTime, endTime).orderByAsc("create_date");
+            energyWaterList = dataMapper.selectList(queryWrapper);
         }
         //本年
         else if ("3".equals(type)) {
             DateTime dateTime = DateUtil.beginOfYear(new Date());
             queryWrapper.ge("create_date",dateTime);
-            List<EnergyWaterDataVo> waterList = energyWaterMapper.listYear(queryWrapper);
-            return new Result(ResultCode.SUCCESS, waterList);
+            return new Result(ResultCode.SUCCESS, dataMapper.listYear3(queryWrapper));
         }
         //本月
         else if ("2".equals(type)) {
             Date timesMonthmorning = DataUill.getTimesMonthmorning();
-            queryWrapper.ge("create_date",timesMonthmorning);
-            List<EnergyWater> energyWaters = energyWaterMapper.selectList(queryWrapper);
-            energyWaterList = energyWaters;
+            queryWrapper.ge("create_date", timesMonthmorning).orderByAsc("create_date");
+            energyWaterList = dataMapper.selectList(queryWrapper);
         }
         //本周
         else if ("1".equals(type)) {
             DateTime dateTime = DateUtil.beginOfWeek(new Date());
-            queryWrapper.ge("create_date", dateTime);
-            List<EnergyWater> energyWaters = energyWaterMapper.selectList(queryWrapper);
-            energyWaterList = energyWaters;
+            queryWrapper.ge("create_date", dateTime).orderByAsc("create_date");
+            energyWaterList = dataMapper.selectList(queryWrapper);
         }
         return new Result(ResultCode.SUCCESS,energyWaterList);
     }

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

@@ -9,8 +9,8 @@
         <result column="original_feed_value" property="originalFeedValue" />
         <result column="water_value" property="waterValue" />
         <result column="original_water_value" property="originalWaterValue" />
-        <result column="gas_varlue" property="gasVarlue" />
-        <result column="original_gas_varlue" property="originalGasVarlue" />
+        <result column="gas_varlue" property="gasValue" />
+        <result column="original_gas_varlue" property="originalGasValue" />
         <result column="electricity_value" property="electricityValue" />
         <result column="original_electricity_value" property="originalElectricityValue" />
         <result column="original_data" property="originalData" />
@@ -19,6 +19,31 @@
         <result column="other1" property="other1" />
         <result column="other2" property="other2" />
         <result column="other3" property="other3" />
+        <result column="create_date" property="createDate"/>
     </resultMap>
+    <select id="listYear" resultType="com.huimv.admin.entity.vo.EnergyDataVo">
+        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="listYear2" 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')
+        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="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>
 </mapper>

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

@@ -15,10 +15,5 @@
         <result column="other3" property="other3" />
         <result column="create_date" property="createDate"/>
     </resultMap>
-    <select id="listYear" resultType="com.huimv.admin.entity.vo.EnergyElectricityDataVo">
-        SELECT sum(electricity_value) 'electricityValue',create_date 'createDate' FROM `energy_electricity`
-         ${ew.customSqlSegment}
-        GROUP BY DATE_FORMAT(create_date,'%Y-%m')
-        ORDER BY create_date ASC
-    </select>
+
 </mapper>

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

@@ -15,10 +15,5 @@
         <result column="other3" property="other3" />
         <result column="create_date" property="createDate"/>
     </resultMap>
-    <select id="listYear" resultType="com.huimv.admin.entity.vo.EnergyFeedDataVo">
-        SELECT sum(feed_value) 'feedValue',create_date 'createDate' FROM `energy_feed`
-         ${ew.customSqlSegment}
-        GROUP BY DATE_FORMAT(create_date,'%Y-%m')
-        ORDER BY create_date ASC
-    </select>
+
 </mapper>

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

@@ -15,10 +15,5 @@
         <result column="other3" property="other3" />
         <result column="create_date" property="createDate" />
     </resultMap>
-    <select id="listYear" resultType="com.huimv.admin.entity.vo.EnergyDataVo">
-        SELECT sum(gas_value) 'gasValue',create_date 'createDate' FROM `energy_gas`
-         ${ew.customSqlSegment}
-        GROUP BY DATE_FORMAT(create_date,'%Y-%m')
-        ORDER BY create_date ASC
-    </select>
+
 </mapper>

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

@@ -15,10 +15,5 @@
         <result column="other3" property="other3" />
         <result column="create_date" property="createDate"/>
     </resultMap>
-    <select id="listYear" resultType="com.huimv.admin.entity.vo.EnergyWaterDataVo">
-        SELECT sum(water_value) 'waterValue',create_date 'createDate' FROM `energy_water`
-         ${ew.customSqlSegment}
-        GROUP BY DATE_FORMAT(create_date,'%Y-%m')
-        ORDER BY create_date ASC
-    </select>
+
 </mapper>