大屏接口

huimv-admin/src/main/java/com/huimv/admin/controller/EnergyDataController.java

@@ -43,4 +43,10 @@ public class EnergyDataController {
     public Result listRank(HttpServletRequest httpServletRequest, @RequestBody Map<String,String> paramsMap) {
         return iEnergyDataService.listRank(httpServletRequest, paramsMap);
     }
+
+    //大屏
+    @RequestMapping("/listDataScreen")
+    public Result listDataScreen(HttpServletRequest httpServletRequest, @RequestBody Map<String,String> paramsMap) {
+        return iEnergyDataService.listDataScreen(httpServletRequest, paramsMap);
+    }
 }

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

@@ -15,4 +15,6 @@ public class EnergyDataVo {
 
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
     private String nowTime;
+
+    private String count;
 }

huimv-admin/src/main/java/com/huimv/admin/service/IEnergyDataService.java

@@ -21,4 +21,7 @@ public interface IEnergyDataService extends IService<EnergyData> {
     Result listData(HttpServletRequest httpServletRequest,Map<String,String> paramsMap);
 
     Result listRank(HttpServletRequest httpServletRequest,Map<String,String> paramsMap);
+
+    //大屏
+    Result listDataScreen(HttpServletRequest httpServletRequest,Map<String,String> paramsMap);
 }

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

@@ -20,6 +20,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import javax.servlet.http.HttpServletRequest;
+import java.text.DecimalFormat;
 import java.util.*;
 
 /**
@@ -44,6 +45,12 @@ public class EnergyDataServiceImpl extends ServiceImpl<EnergyDataMapper, EnergyD
         QueryWrapper<EnergyData> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("farm_id", farmId);
         EnergyDataVo energyDataVo = dataMapper.listCount(queryWrapper);
+        Float f = 0.00f;
+        f = (Float.parseFloat(energyDataVo.getElectricityValue()) +
+                Float.parseFloat(energyDataVo.getFeedValue()) +
+                Float.parseFloat(energyDataVo.getGasValue()) + Float.parseFloat(energyDataVo.getWaterValue()));
+        DecimalFormat df1 = new DecimalFormat("#.00");
+        energyDataVo.setCount(df1.format(f));
         return new Result(ResultCode.SUCCESS, energyDataVo);
     }
 
@@ -71,7 +78,7 @@ public class EnergyDataServiceImpl extends ServiceImpl<EnergyDataMapper, EnergyD
                 startTime = startTime + " 00:00:00";
                 endTime = endTime + " 23:59:59";
                 dataQueryWrapper.between("create_time", startTime, endTime);
-               return new Result(ResultCode.SUCCESS, dataMapper.listDayWater(dataQueryWrapper));
+                return new Result(ResultCode.SUCCESS, dataMapper.listDayWater(dataQueryWrapper));
             }
             //全年
             if ("3".equals(timeType)) {
@@ -258,7 +265,7 @@ public class EnergyDataServiceImpl extends ServiceImpl<EnergyDataMapper, EnergyD
                 List<BasePigpen> basePigpens = basePigpenMapper.selectList(basePigpenQueryWrapper);//得到所有的栋舍
                 for (BasePigpen basePigpen : basePigpens) {
                     QueryWrapper<BasePigpen> queryWrapper = new QueryWrapper<>();
-                    queryWrapper.eq("farm_id", farmId).eq("parent_id", basePigpen.getId()).eq("f_type",2);
+                    queryWrapper.eq("farm_id", farmId).eq("parent_id", basePigpen.getId()).eq("f_type", 2);
                     List<BasePigpen> pigpens = basePigpenMapper.selectList(queryWrapper);//得到所有的楼层
                     Float value = 0.00f;
                     for (BasePigpen pigpen : pigpens) {
@@ -270,7 +277,7 @@ public class EnergyDataServiceImpl extends ServiceImpl<EnergyDataMapper, EnergyD
                         for (BasePigpen basePigpen1 : basePigpens1) {
                             QueryWrapper<EnergyData> dataQueryWrapper = new QueryWrapper<>();
                             dataQueryWrapper.eq("farm_id", farmId).eq("unit_id", basePigpen1.getId())
-                                    .between("create_date",startTime,endTime);
+                                    .between("create_date", startTime, endTime);
                             dataQueryWrapper.select(
                                     "IFNULL(SUM(water_value),0) waterValue  "
                             );
@@ -293,7 +300,7 @@ public class EnergyDataServiceImpl extends ServiceImpl<EnergyDataMapper, EnergyD
                 List<BasePigpen> basePigpens = basePigpenMapper.selectList(basePigpenQueryWrapper);//得到所有的栋舍
                 for (BasePigpen basePigpen : basePigpens) {
                     QueryWrapper<BasePigpen> queryWrapper = new QueryWrapper<>();
-                    queryWrapper.eq("farm_id", farmId).eq("parent_id", basePigpen.getId()).eq("f_type",2);
+                    queryWrapper.eq("farm_id", farmId).eq("parent_id", basePigpen.getId()).eq("f_type", 2);
                     List<BasePigpen> pigpens = basePigpenMapper.selectList(queryWrapper);//得到所有的楼层
                     Float value = 0.00f;
                     for (BasePigpen pigpen : pigpens) {
@@ -305,7 +312,7 @@ public class EnergyDataServiceImpl extends ServiceImpl<EnergyDataMapper, EnergyD
                         for (BasePigpen basePigpen1 : basePigpens1) {
                             QueryWrapper<EnergyData> dataQueryWrapper = new QueryWrapper<>();
                             dataQueryWrapper.eq("farm_id", farmId).eq("unit_id", basePigpen1.getId())
-                                    .ge("create_date",dateTime);
+                                    .ge("create_date", dateTime);
                             dataQueryWrapper.select(
                                     "IFNULL(SUM(water_value),0) waterValue  "
                             );
@@ -329,7 +336,7 @@ public class EnergyDataServiceImpl extends ServiceImpl<EnergyDataMapper, EnergyD
                 List<BasePigpen> basePigpens = basePigpenMapper.selectList(basePigpenQueryWrapper);//得到所有的栋舍
                 for (BasePigpen basePigpen : basePigpens) {
                     QueryWrapper<BasePigpen> queryWrapper = new QueryWrapper<>();
-                    queryWrapper.eq("farm_id", farmId).eq("parent_id", basePigpen.getId()).eq("f_type",2);
+                    queryWrapper.eq("farm_id", farmId).eq("parent_id", basePigpen.getId()).eq("f_type", 2);
                     List<BasePigpen> pigpens = basePigpenMapper.selectList(queryWrapper);//得到所有的楼层
                     Float value = 0.00f;
                     for (BasePigpen pigpen : pigpens) {
@@ -341,7 +348,7 @@ public class EnergyDataServiceImpl extends ServiceImpl<EnergyDataMapper, EnergyD
                         for (BasePigpen basePigpen1 : basePigpens1) {
                             QueryWrapper<EnergyData> dataQueryWrapper = new QueryWrapper<>();
                             dataQueryWrapper.eq("farm_id", farmId).eq("unit_id", basePigpen1.getId())
-                                    .ge("create_date",timesMonthmorning);
+                                    .ge("create_date", timesMonthmorning);
                             dataQueryWrapper.select(
                                     "IFNULL(SUM(water_value),0) waterValue  "
                             );
@@ -365,7 +372,7 @@ public class EnergyDataServiceImpl extends ServiceImpl<EnergyDataMapper, EnergyD
                 List<BasePigpen> basePigpens = basePigpenMapper.selectList(basePigpenQueryWrapper);//得到所有的栋舍
                 for (BasePigpen basePigpen : basePigpens) {
                     QueryWrapper<BasePigpen> queryWrapper = new QueryWrapper<>();
-                    queryWrapper.eq("farm_id", farmId).eq("parent_id", basePigpen.getId()).eq("f_type",2);
+                    queryWrapper.eq("farm_id", farmId).eq("parent_id", basePigpen.getId()).eq("f_type", 2);
                     List<BasePigpen> pigpens = basePigpenMapper.selectList(queryWrapper);//得到所有的楼层
                     Float value = 0.00f;
                     for (BasePigpen pigpen : pigpens) {
@@ -377,7 +384,7 @@ public class EnergyDataServiceImpl extends ServiceImpl<EnergyDataMapper, EnergyD
                         for (BasePigpen basePigpen1 : basePigpens1) {
                             QueryWrapper<EnergyData> dataQueryWrapper = new QueryWrapper<>();
                             dataQueryWrapper.eq("farm_id", farmId).eq("unit_id", basePigpen1.getId())
-                                    .ge("create_date",calendar.getTime());
+                                    .ge("create_date", calendar.getTime());
                             dataQueryWrapper.select(
                                     "IFNULL(SUM(water_value),0) waterValue  "
                             );
@@ -404,7 +411,7 @@ public class EnergyDataServiceImpl extends ServiceImpl<EnergyDataMapper, EnergyD
                 List<BasePigpen> basePigpens = basePigpenMapper.selectList(basePigpenQueryWrapper);//得到所有的栋舍
                 for (BasePigpen basePigpen : basePigpens) {
                     QueryWrapper<BasePigpen> queryWrapper = new QueryWrapper<>();
-                    queryWrapper.eq("farm_id", farmId).eq("parent_id", basePigpen.getId()).eq("f_type",2);
+                    queryWrapper.eq("farm_id", farmId).eq("parent_id", basePigpen.getId()).eq("f_type", 2);
                     List<BasePigpen> pigpens = basePigpenMapper.selectList(queryWrapper);//得到所有的楼层
                     Float value = 0.00f;
                     for (BasePigpen pigpen : pigpens) {
@@ -416,7 +423,7 @@ public class EnergyDataServiceImpl extends ServiceImpl<EnergyDataMapper, EnergyD
                         for (BasePigpen basePigpen1 : basePigpens1) {
                             QueryWrapper<EnergyData> dataQueryWrapper = new QueryWrapper<>();
                             dataQueryWrapper.eq("farm_id", farmId).eq("unit_id", basePigpen1.getId())
-                                    .between("create_date",startTime,endTime);
+                                    .between("create_date", startTime, endTime);
                             dataQueryWrapper.select(
                                     "IFNULL(SUM(electricity_value),0) electricityValue  "
                             );
@@ -439,7 +446,7 @@ public class EnergyDataServiceImpl extends ServiceImpl<EnergyDataMapper, EnergyD
                 List<BasePigpen> basePigpens = basePigpenMapper.selectList(basePigpenQueryWrapper);//得到所有的栋舍
                 for (BasePigpen basePigpen : basePigpens) {
                     QueryWrapper<BasePigpen> queryWrapper = new QueryWrapper<>();
-                    queryWrapper.eq("farm_id", farmId).eq("parent_id", basePigpen.getId()).eq("f_type",2);
+                    queryWrapper.eq("farm_id", farmId).eq("parent_id", basePigpen.getId()).eq("f_type", 2);
                     List<BasePigpen> pigpens = basePigpenMapper.selectList(queryWrapper);//得到所有的楼层
                     Float value = 0.00f;
                     for (BasePigpen pigpen : pigpens) {
@@ -451,7 +458,7 @@ public class EnergyDataServiceImpl extends ServiceImpl<EnergyDataMapper, EnergyD
                         for (BasePigpen basePigpen1 : basePigpens1) {
                             QueryWrapper<EnergyData> dataQueryWrapper = new QueryWrapper<>();
                             dataQueryWrapper.eq("farm_id", farmId).eq("unit_id", basePigpen1.getId())
-                                    .ge("create_date",dateTime);
+                                    .ge("create_date", dateTime);
                             dataQueryWrapper.select(
                                     "IFNULL(SUM(electricity_value),0) electricityValue  "
                             );
@@ -475,7 +482,7 @@ public class EnergyDataServiceImpl extends ServiceImpl<EnergyDataMapper, EnergyD
                 List<BasePigpen> basePigpens = basePigpenMapper.selectList(basePigpenQueryWrapper);//得到所有的栋舍
                 for (BasePigpen basePigpen : basePigpens) {
                     QueryWrapper<BasePigpen> queryWrapper = new QueryWrapper<>();
-                    queryWrapper.eq("farm_id", farmId).eq("parent_id", basePigpen.getId()).eq("f_type",2);
+                    queryWrapper.eq("farm_id", farmId).eq("parent_id", basePigpen.getId()).eq("f_type", 2);
                     List<BasePigpen> pigpens = basePigpenMapper.selectList(queryWrapper);//得到所有的楼层
                     Float value = 0.00f;
                     for (BasePigpen pigpen : pigpens) {
@@ -487,7 +494,7 @@ public class EnergyDataServiceImpl extends ServiceImpl<EnergyDataMapper, EnergyD
                         for (BasePigpen basePigpen1 : basePigpens1) {
                             QueryWrapper<EnergyData> dataQueryWrapper = new QueryWrapper<>();
                             dataQueryWrapper.eq("farm_id", farmId).eq("unit_id", basePigpen1.getId())
-                                    .ge("create_date",timesMonthmorning);
+                                    .ge("create_date", timesMonthmorning);
                             dataQueryWrapper.select(
                                     "IFNULL(SUM(electricity_value),0) electricityValue  "
                             );
@@ -511,7 +518,7 @@ public class EnergyDataServiceImpl extends ServiceImpl<EnergyDataMapper, EnergyD
                 List<BasePigpen> basePigpens = basePigpenMapper.selectList(basePigpenQueryWrapper);//得到所有的栋舍
                 for (BasePigpen basePigpen : basePigpens) {
                     QueryWrapper<BasePigpen> queryWrapper = new QueryWrapper<>();
-                    queryWrapper.eq("farm_id", farmId).eq("parent_id", basePigpen.getId()).eq("f_type",2);
+                    queryWrapper.eq("farm_id", farmId).eq("parent_id", basePigpen.getId()).eq("f_type", 2);
                     List<BasePigpen> pigpens = basePigpenMapper.selectList(queryWrapper);//得到所有的楼层
                     Float value = 0.00f;
                     for (BasePigpen pigpen : pigpens) {
@@ -523,7 +530,7 @@ public class EnergyDataServiceImpl extends ServiceImpl<EnergyDataMapper, EnergyD
                         for (BasePigpen basePigpen1 : basePigpens1) {
                             QueryWrapper<EnergyData> dataQueryWrapper = new QueryWrapper<>();
                             dataQueryWrapper.eq("farm_id", farmId).eq("unit_id", basePigpen1.getId())
-                                    .ge("create_date",calendar.getTime());
+                                    .ge("create_date", calendar.getTime());
                             dataQueryWrapper.select(
                                     "IFNULL(SUM(electricity_value),0) electricityValue  "
                             );
@@ -557,7 +564,7 @@ public class EnergyDataServiceImpl extends ServiceImpl<EnergyDataMapper, EnergyD
                         JSONObject jsonObject = new JSONObject();
                         QueryWrapper<EnergyData> dataQueryWrapper = new QueryWrapper<>();
                         dataQueryWrapper.eq("farm_id", farmId).eq("unit_id", pigpen.getId())
-                                .between("create_date",startTime,endTime);
+                                .between("create_date", startTime, endTime);
                         dataQueryWrapper.select(
                                 "IFNULL(SUM(feed_value),0) feedValue  "
                         );
@@ -586,7 +593,7 @@ public class EnergyDataServiceImpl extends ServiceImpl<EnergyDataMapper, EnergyD
                         JSONObject jsonObject = new JSONObject();
                         QueryWrapper<EnergyData> dataQueryWrapper = new QueryWrapper<>();
                         dataQueryWrapper.eq("farm_id", farmId).eq("unit_id", pigpen.getId())
-                                .ge("create_date",dateTime);
+                                .ge("create_date", dateTime);
                         dataQueryWrapper.select(
                                 "IFNULL(SUM(feed_value),0) feedValue  "
                         );
@@ -615,7 +622,7 @@ public class EnergyDataServiceImpl extends ServiceImpl<EnergyDataMapper, EnergyD
                         JSONObject jsonObject = new JSONObject();
                         QueryWrapper<EnergyData> dataQueryWrapper = new QueryWrapper<>();
                         dataQueryWrapper.eq("farm_id", farmId).eq("unit_id", pigpen.getId())
-                                .ge("create_date",timesMonthmorning);
+                                .ge("create_date", timesMonthmorning);
                         dataQueryWrapper.select(
                                 "IFNULL(SUM(feed_value),0) feedValue  "
                         );
@@ -645,7 +652,7 @@ public class EnergyDataServiceImpl extends ServiceImpl<EnergyDataMapper, EnergyD
                         JSONObject jsonObject = new JSONObject();
                         QueryWrapper<EnergyData> dataQueryWrapper = new QueryWrapper<>();
                         dataQueryWrapper.eq("farm_id", farmId).eq("unit_id", pigpen.getId())
-                                .ge("create_date",calendar.getTime());
+                                .ge("create_date", calendar.getTime());
                         dataQueryWrapper.select(
                                 "IFNULL(SUM(feed_value),0) feedValue  "
                         );
@@ -678,7 +685,7 @@ public class EnergyDataServiceImpl extends ServiceImpl<EnergyDataMapper, EnergyD
                         JSONObject jsonObject = new JSONObject();
                         QueryWrapper<EnergyData> dataQueryWrapper = new QueryWrapper<>();
                         dataQueryWrapper.eq("farm_id", farmId).eq("unit_id", pigpen.getId())
-                                .between("create_date",startTime,endTime);
+                                .between("create_date", startTime, endTime);
                         dataQueryWrapper.select(
                                 "IFNULL(SUM(gas_value),0) gasValue  "
                         );
@@ -707,7 +714,7 @@ public class EnergyDataServiceImpl extends ServiceImpl<EnergyDataMapper, EnergyD
                         JSONObject jsonObject = new JSONObject();
                         QueryWrapper<EnergyData> dataQueryWrapper = new QueryWrapper<>();
                         dataQueryWrapper.eq("farm_id", farmId).eq("unit_id", pigpen.getId())
-                                .ge("create_date",dateTime);
+                                .ge("create_date", dateTime);
                         dataQueryWrapper.select(
                                 "IFNULL(SUM(gas_value),0) gasValue  "
                         );
@@ -736,7 +743,7 @@ public class EnergyDataServiceImpl extends ServiceImpl<EnergyDataMapper, EnergyD
                         JSONObject jsonObject = new JSONObject();
                         QueryWrapper<EnergyData> dataQueryWrapper = new QueryWrapper<>();
                         dataQueryWrapper.eq("farm_id", farmId).eq("unit_id", pigpen.getId())
-                                .ge("create_date",timesMonthmorning);
+                                .ge("create_date", timesMonthmorning);
                         dataQueryWrapper.select(
                                 "IFNULL(SUM(gas_value),0) gasValue  "
                         );
@@ -766,7 +773,7 @@ public class EnergyDataServiceImpl extends ServiceImpl<EnergyDataMapper, EnergyD
                         JSONObject jsonObject = new JSONObject();
                         QueryWrapper<EnergyData> dataQueryWrapper = new QueryWrapper<>();
                         dataQueryWrapper.eq("farm_id", farmId).eq("unit_id", pigpen.getId())
-                                .ge("create_date",calendar.getTime());
+                                .ge("create_date", calendar.getTime());
                         dataQueryWrapper.select(
                                 "IFNULL(SUM(gas_value),0) gasValue  "
                         );
@@ -784,13 +791,29 @@ public class EnergyDataServiceImpl extends ServiceImpl<EnergyDataMapper, EnergyD
         }
 
 
-
         return new Result(ResultCode.SUCCESS);
     }
 
+    @Override
+    public Result listDataScreen(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
+        String farmId = paramsMap.get("farmId");
+        QueryWrapper<EnergyData> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("farm_id", farmId);
+        List<EnergyAllDataVo> energyGasDataVos = dataMapper.listDayGas(queryWrapper);
+        List<EnergyAllDataVo> energyFeedDataVos = dataMapper.listDayFeed(queryWrapper);
+        List<EnergyAllDataVo> energyWaterDataVos = dataMapper.listDayWater(queryWrapper);
+        List<EnergyAllDataVo> energyElectricityDataVos = dataMapper.listDayElectricity(queryWrapper);
+        JSONObject jsonObject = new JSONObject();
+        jsonObject.put("gas", energyGasDataVos);
+        jsonObject.put("water", energyWaterDataVos);
+        jsonObject.put("energyElectricity", energyElectricityDataVos);
+        jsonObject.put("feed", energyFeedDataVos);
+        return new Result(ResultCode.SUCCESS,jsonObject);
+    }
+
 
     /*数组排序*/
-    public static JSONArray jsonArraySort(JSONArray jsonArr,String sortKey,boolean is_desc) {
+    public static JSONArray jsonArraySort(JSONArray jsonArr, String sortKey, boolean is_desc) {
         //存放排序结果json数组
         JSONArray sortedJsonArray = new JSONArray();
         //用于排序的list
@@ -802,7 +825,8 @@ public class EnergyDataServiceImpl extends ServiceImpl<EnergyDataMapper, EnergyD
         //快速排序，重写compare方法，完成按指定字段比较，完成排序
         Collections.sort(jsonValues, new Comparator<JSONObject>() {
             //排序字段
-            private  final String KEY_NAME = sortKey;
+            private final String KEY_NAME = sortKey;
+
             //重写compare方法
             @Override
             public int compare(JSONObject a, JSONObject b) {
@@ -818,7 +842,7 @@ public class EnergyDataServiceImpl extends ServiceImpl<EnergyDataMapper, EnergyD
                     e.printStackTrace();
                 }
                 //是升序还是降序
-                if (is_desc){
+                if (is_desc) {
                     return -valA.compareTo(valB);
                 } else {
                     return -valB.compareTo(valA);

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

@@ -80,50 +80,50 @@
 
     <!--为的是给前端不改变值的写法-->
     <select id="listYearGas" resultType="com.huimv.admin.entity.vo.EnergyAllDataVo">
-        SELECT sum(gas_value) 'value',create_date 'createDate' FROM `energy_data`
+        SELECT IFNULL(sum(gas_value),'0') 'value',create_date 'createDate' FROM `energy_data`
          ${ew.customSqlSegment}
         GROUP BY DATE_FORMAT(create_date,'%Y-%m')
         ORDER BY create_date ASC
     </select>
     <select id="listDayGas" resultType="com.huimv.admin.entity.vo.EnergyAllDataVo">
-        SELECT sum(gas_value) 'value',create_date 'createDate' FROM `energy_data`
+        SELECT IFNULL(sum(gas_value),'0') 'value',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="listYearFeed" resultType="com.huimv.admin.entity.vo.EnergyAllDataVo">
-        SELECT sum(feed_value) 'value',create_date 'createDate' FROM `energy_data`
+        SELECT IFNULL(sum(feed_value),'0') 'value',create_date 'createDate' FROM `energy_data`
          ${ew.customSqlSegment}
         GROUP BY DATE_FORMAT(create_date,'%Y-%m')
         ORDER BY create_date ASC
     </select>
     <select id="listDayFeed" resultType="com.huimv.admin.entity.vo.EnergyAllDataVo">
-        SELECT sum(feed_value) 'value',create_date 'createDate' FROM `energy_data`
+        SELECT IFNULL(sum(feed_value),'0') 'value',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="listYearWater" resultType="com.huimv.admin.entity.vo.EnergyAllDataVo">
-        SELECT sum(water_value) 'value',create_date 'createDate' FROM `energy_data`
+        SELECT IFNULL(sum(water_value),'0') 'value',create_date 'createDate' FROM `energy_data`
          ${ew.customSqlSegment}
         GROUP BY DATE_FORMAT(create_date,'%Y-%m')
         ORDER BY create_date ASC
     </select>
     <select id="listDayWater" resultType="com.huimv.admin.entity.vo.EnergyAllDataVo">
-        SELECT sum(water_value) 'value',create_date 'createDate' FROM `energy_data`
+        SELECT IFNULL(sum(water_value),'0') 'value',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="listYearElectricity" resultType="com.huimv.admin.entity.vo.EnergyAllDataVo">
-        SELECT sum(electricity_value) 'value',create_date 'createDate' FROM `energy_data`
+        SELECT IFNULL(sum(electricity_value),'0') 'value',create_date 'createDate' FROM `energy_data`
          ${ew.customSqlSegment}
         GROUP BY DATE_FORMAT(create_date,'%Y-%m')
         ORDER BY create_date ASC
     </select>
     <select id="listDayElectricity" resultType="com.huimv.admin.entity.vo.EnergyAllDataVo">
-        SELECT sum(electricity_value) 'value',create_date 'createDate' FROM `energy_data`
+        SELECT IFNULL(sum(electricity_value),'0') 'value',create_date 'createDate' FROM `energy_data`
          ${ew.customSqlSegment}
         GROUP BY DATE_FORMAT(create_date,'%Y-%m-%d')
         ORDER BY create_date ASC