排名修改

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

@@ -78,7 +78,7 @@ public class EnergyDataServiceImpl extends ServiceImpl<EnergyDataMapper, EnergyD
             if ("4".equals(timeType)) {
                 startTime = startTime + " 00:00:00";
                 endTime = endTime + " 23:59:59";
-                dataQueryWrapper.between("create_time", startTime, endTime);
+                dataQueryWrapper.between("create_date", startTime, endTime);
                 return new Result(ResultCode.SUCCESS, dataMapper.listDayWater(dataQueryWrapper));
             }
             //全年
@@ -86,11 +86,6 @@ public class EnergyDataServiceImpl extends ServiceImpl<EnergyDataMapper, EnergyD
                 DateTime dateTime = DateUtil.beginOfYear(new Date());
                 dataQueryWrapper.ge("create_date", dateTime);
                 List<EnergyAllDataVo> energyWaterDataVos = dataMapper.listYearWater(dataQueryWrapper);
-                for (EnergyAllDataVo energyWaterDataVo : energyWaterDataVos) {
-                    if (energyWaterDataVo.getValue() == null || energyWaterDataVo.getValue() == "") {
-                        energyWaterDataVo.setValue("0");
-                    }
-                }
                 return new Result(ResultCode.SUCCESS, energyWaterDataVos);
             }
             //本月
@@ -105,11 +100,6 @@ public class EnergyDataServiceImpl extends ServiceImpl<EnergyDataMapper, EnergyD
                 calendar.set(Calendar.DATE, calendar.get(Calendar.DATE) - 7);
                 dataQueryWrapper.ge("create_date", calendar.getTime());
                 List<EnergyAllDataVo> energyWaterDataVos = dataMapper.listDayWater(dataQueryWrapper);
-                for (EnergyAllDataVo energyWaterDataVo : energyWaterDataVos) {
-                    if (energyWaterDataVo.getValue() == null || energyWaterDataVo.getValue() == "") {
-                        energyWaterDataVo.setValue("0");
-                    }
-                }
                 return new Result(ResultCode.SUCCESS, energyWaterDataVos);
             }
         }
@@ -119,7 +109,7 @@ public class EnergyDataServiceImpl extends ServiceImpl<EnergyDataMapper, EnergyD
             if ("4".equals(timeType)) {
                 startTime = startTime + " 00:00:00";
                 endTime = endTime + " 23:59:59";
-                dataQueryWrapper.between("create_time", startTime, endTime);
+                dataQueryWrapper.between("create_date", startTime, endTime);
                 return new Result(ResultCode.SUCCESS, dataMapper.listDayElectricity(dataQueryWrapper));
             }
             //全年
@@ -127,11 +117,6 @@ public class EnergyDataServiceImpl extends ServiceImpl<EnergyDataMapper, EnergyD
                 DateTime dateTime = DateUtil.beginOfYear(new Date());
                 dataQueryWrapper.ge("create_date", dateTime);
                 List<EnergyAllDataVo> energyElectricityDataVos = dataMapper.listYearElectricity(dataQueryWrapper);
-                for (EnergyAllDataVo energyElectricityDataVo : energyElectricityDataVos) {
-                    if (energyElectricityDataVo.getValue() == null || energyElectricityDataVo.getValue() == "") {
-                        energyElectricityDataVo.setValue("0");
-                    }
-                }
                 return new Result(ResultCode.SUCCESS, energyElectricityDataVos);
             }
             //本月
@@ -146,11 +131,6 @@ public class EnergyDataServiceImpl extends ServiceImpl<EnergyDataMapper, EnergyD
                 calendar.set(Calendar.DATE, calendar.get(Calendar.DATE) - 7);
                 dataQueryWrapper.ge("create_date", calendar.getTime());
                 List<EnergyAllDataVo> energyElectricityDataVos = dataMapper.listDayElectricity(dataQueryWrapper);
-                for (EnergyAllDataVo energyElectricityDataVo : energyElectricityDataVos) {
-                    if (energyElectricityDataVo.getValue() == null || energyElectricityDataVo.getValue() == "") {
-                        energyElectricityDataVo.setValue("0");
-                    }
-                }
                 return new Result(ResultCode.SUCCESS, energyElectricityDataVos);
             }
         }
@@ -160,7 +140,7 @@ public class EnergyDataServiceImpl extends ServiceImpl<EnergyDataMapper, EnergyD
             if ("4".equals(timeType)) {
                 startTime = startTime + " 00:00:00";
                 endTime = endTime + " 23:59:59";
-                dataQueryWrapper.between("create_time", startTime, endTime);
+                dataQueryWrapper.between("create_date", startTime, endTime);
                 return new Result(ResultCode.SUCCESS, dataMapper.listDayFeed(dataQueryWrapper));
             }
             //全年
@@ -168,11 +148,6 @@ public class EnergyDataServiceImpl extends ServiceImpl<EnergyDataMapper, EnergyD
                 DateTime dateTime = DateUtil.beginOfYear(new Date());
                 dataQueryWrapper.ge("create_date", dateTime);
                 List<EnergyAllDataVo> energyFeedDataVos = dataMapper.listYearFeed(dataQueryWrapper);
-                for (EnergyAllDataVo energyFeedDataVo : energyFeedDataVos) {
-                    if (energyFeedDataVo.getValue() == null || energyFeedDataVo.getValue() == "") {
-                        energyFeedDataVo.setValue("0");
-                    }
-                }
                 return new Result(ResultCode.SUCCESS, energyFeedDataVos);
             }
             //本月
@@ -187,11 +162,6 @@ public class EnergyDataServiceImpl extends ServiceImpl<EnergyDataMapper, EnergyD
                 calendar.set(Calendar.DATE, calendar.get(Calendar.DATE) - 7);
                 dataQueryWrapper.ge("create_date", calendar.getTime());
                 List<EnergyAllDataVo> energyFeedDataVos = dataMapper.listDayFeed(dataQueryWrapper);
-                for (EnergyAllDataVo energyFeedDataVo : energyFeedDataVos) {
-                    if (energyFeedDataVo.getValue() == null || energyFeedDataVo.getValue() == "") {
-                        energyFeedDataVo.setValue("0");
-                    }
-                }
                 return new Result(ResultCode.SUCCESS, energyFeedDataVos);
             }
         }
@@ -201,7 +171,7 @@ public class EnergyDataServiceImpl extends ServiceImpl<EnergyDataMapper, EnergyD
             if ("4".equals(timeType)) {
                 startTime = startTime + " 00:00:00";
                 endTime = endTime + " 23:59:59";
-                dataQueryWrapper.between("create_time", startTime, endTime);
+                dataQueryWrapper.between("create_date", startTime, endTime);
                 return new Result(ResultCode.SUCCESS, dataMapper.listDayGas(dataQueryWrapper));
             }
             //全年
@@ -209,11 +179,6 @@ public class EnergyDataServiceImpl extends ServiceImpl<EnergyDataMapper, EnergyD
                 DateTime dateTime = DateUtil.beginOfYear(new Date());
                 dataQueryWrapper.ge("create_date", dateTime);
                 List<EnergyAllDataVo> energyGasDataVos = dataMapper.listYearGas(dataQueryWrapper);
-                for (EnergyAllDataVo energyGasDataVo : energyGasDataVos) {
-                    if (energyGasDataVo.getValue() == null || energyGasDataVo.getValue() == "") {
-                        energyGasDataVo.setValue("0");
-                    }
-                }
                 return new Result(ResultCode.SUCCESS, energyGasDataVos);
             }
             //本月
@@ -228,11 +193,6 @@ public class EnergyDataServiceImpl extends ServiceImpl<EnergyDataMapper, EnergyD
                 calendar.set(Calendar.DATE, calendar.get(Calendar.DATE) - 7);
                 dataQueryWrapper.ge("create_date", calendar.getTime());
                 List<EnergyAllDataVo> energyGasDataVos = dataMapper.listDayGas(dataQueryWrapper);
-                for (EnergyAllDataVo energyGasDataVo : energyGasDataVos) {
-                    if (energyGasDataVo.getValue() == null || energyGasDataVo.getValue() == "") {
-                        energyGasDataVo.setValue("0");
-                    }
-                }
                 return new Result(ResultCode.SUCCESS, energyGasDataVos);
             }
         }
@@ -255,723 +215,94 @@ public class EnergyDataServiceImpl extends ServiceImpl<EnergyDataMapper, EnergyD
         QueryWrapper<BasePigpen> basePigpenQueryWrapper = new QueryWrapper<>();
         basePigpenQueryWrapper.eq("farm_id", farmId);
         JSONArray jsonArray = new JSONArray();
-
-        //用水
-        if ("1".equals(dataType)) {
-            //自定义
-            if ("4".equals(timeType)) {
-                startTime = startTime + " 00:00:00";
-                endTime = endTime + " 23:59:59";
-                basePigpenQueryWrapper.eq("parent_id", 0);
-                Float value = 0.00f;
-                List<BasePigpen> basePigpens = basePigpenMapper.selectList(basePigpenQueryWrapper);//得到所有的栋舍
-                for (BasePigpen basePigpen : basePigpens) {
-                    JSONObject jsonObject = new JSONObject();
-                    QueryWrapper<BasePigpen> queryWrapper = new QueryWrapper<>();
-                    queryWrapper.eq("farm_id", farmId).like("other2", basePigpen.getId());
-                    List<BasePigpen> selectList = basePigpenMapper.selectList(queryWrapper);//所有下属
-                    for (BasePigpen pigpen : selectList) {
-                        QueryWrapper<EnergyData> dataQueryWrapper = new QueryWrapper<>();
-                        dataQueryWrapper.eq("farm_id", farmId).eq("unit_id", pigpen.getId())
-                                .between("create_date", startTime, endTime);
-                        dataQueryWrapper.select(
-                                "IFNULL(SUM(water_value),'0') waterValue  "
-                        );
-                        // EnergyData energyData = dataMapper.selectOne(dataQueryWrapper);
-                        EnergyData energyData = dataMapper.selectOne(dataQueryWrapper);
-                        if (Float.parseFloat(energyData.getWaterValue()) != 0.0f) {
-                            value = value + Float.parseFloat(energyData.getWaterValue());
-                            jsonObject.put("value", value);
-                            jsonObject.put("buildName", pigpen.getBuildName());
-                            jsonArray.add(jsonObject);
-                            value = 0.00f;
-                        } else {
-                            jsonObject.put("value", 0);
-                            jsonObject.put("buildName", pigpen.getBuildName());
-                            jsonArray.add(jsonObject);
-                            value = 0.00f;
-                        }
-                    }
-
-                }
-
-                JSONArray arraySort = jsonArraySort(jsonArray, "value", true);
-                return new Result(ResultCode.SUCCESS, arraySort);
-            }
-            //全年
-            else if ("3".equals(timeType)) {
-                DateTime dateTime = DateUtil.beginOfYear(new Date());
-                basePigpenQueryWrapper.eq("parent_id", 0);
-                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);
-                    List<BasePigpen> pigpens = basePigpenMapper.selectList(queryWrapper);//得到所有的楼层
-                    Float value = 0.00f;
-                    for (BasePigpen pigpen : pigpens) {
-                        JSONObject jsonObject = new JSONObject();
-                        QueryWrapper<BasePigpen> queryWrapper1 = new QueryWrapper<>();
-                        queryWrapper1.eq("farm_id", farmId).eq("parent_id", pigpen.getId());
-                        List<BasePigpen> basePigpens1 = basePigpenMapper.selectList(queryWrapper1);//得到所有的单元
-
-                        for (BasePigpen basePigpen1 : basePigpens1) {
-                            QueryWrapper<EnergyData> dataQueryWrapper = new QueryWrapper<>();
-                            dataQueryWrapper.eq("farm_id", farmId).eq("unit_id", basePigpen1.getId())
-                                    .ge("create_date", dateTime);
-                            dataQueryWrapper.select(
-                                    "IFNULL(SUM(water_value),0) waterValue  "
-                            );
-                            EnergyData energyData = dataMapper.selectOne(dataQueryWrapper);
-                            if (Float.parseFloat(energyData.getWaterValue()) != 0.0f) {
-                                value = value + Float.parseFloat(energyData.getWaterValue());
-                                jsonObject.put("value", value);
-                                jsonObject.put("buildName", pigpen.getBuildName());
-                                jsonArray.add(jsonObject);
-                                value = 0.00f;
-                            } else {
-                                jsonObject.put("value", 0);
-                                jsonObject.put("buildName", pigpen.getBuildName());
-                                jsonArray.add(jsonObject);
-                                value = 0.00f;
-                            }
-                        }
-                  /*      jsonObject.put("value", value);
-                        jsonObject.put("buildName", pigpen.getBuildName());
-                        jsonArray.add(jsonObject);
-                        value = 0.00f;*/
-                    }
+        basePigpenQueryWrapper.eq("parent_id", 0);
+        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);
+            List<BasePigpen> pigpens = basePigpenMapper.selectList(queryWrapper);//得到所有的楼层
+            Float value = 0.00f;
+            for (BasePigpen pigpen : pigpens) {
+                QueryWrapper<BasePigpen> queryWrapper1 = new QueryWrapper<>();
+                queryWrapper1.like("other2", pigpen.getId()).eq("farm_id", farmId);
+                List<BasePigpen> basePigpens1 = basePigpenMapper.selectList(queryWrapper1);
+                List<Integer> idList = new ArrayList<>();
+                basePigpens1.forEach(item -> {
+                    idList.add(item.getId());
+                });//某一层所有单元的id
+                QueryWrapper<EnergyData> dataQueryWrapper = new QueryWrapper<>();
+                dataQueryWrapper.eq("farm_id", farmId).in("unit_id", idList);
+
+                if ("4".equals(timeType)) {
+                    //自定义
+                    startTime = startTime + " 00:00:00";
+                    endTime = endTime + " 23:59:59";
+                    dataQueryWrapper.between("create_date", startTime, endTime);
+                } else if ("3".equals(timeType)) {
+                    //本年
+                    DateTime dateTime = DateUtil.beginOfYear(new Date());
+                    dataQueryWrapper.ge("create_date", dateTime);
+                } else if ("2".equals(timeType)) {
+                    //本月
+                    Date timesMonthmorning = DataUill.getTimesMonthmorning();
+                    dataQueryWrapper.ge("create_date", timesMonthmorning);
+                } else if ("1".equals(timeType)) {
+                    //本周
+                    Calendar calendar = Calendar.getInstance();
+                    calendar.set(Calendar.DATE, calendar.get(Calendar.DATE) - 7);
+                    dataQueryWrapper.ge("create_date", calendar.getTime());
                 }
-                JSONArray arraySort = jsonArraySort(jsonArray, "value", true);
-                return new Result(ResultCode.SUCCESS, arraySort);
-            }
-
-            //本月
-            else if ("2".equals(timeType)) {
-                Date timesMonthmorning = DataUill.getTimesMonthmorning();
-                basePigpenQueryWrapper.eq("parent_id", 0);
-                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);
-                    List<BasePigpen> pigpens = basePigpenMapper.selectList(queryWrapper);//得到所有的楼层
-                    Float value = 0.00f;
-                    for (BasePigpen pigpen : pigpens) {
-                        JSONObject jsonObject = new JSONObject();
-                        QueryWrapper<BasePigpen> queryWrapper1 = new QueryWrapper<>();
-                        queryWrapper1.eq("farm_id", farmId).eq("parent_id", pigpen.getId());
-                        List<BasePigpen> basePigpens1 = basePigpenMapper.selectList(queryWrapper1);//得到所有的单元
-
-                        for (BasePigpen basePigpen1 : basePigpens1) {
-                            QueryWrapper<EnergyData> dataQueryWrapper = new QueryWrapper<>();
-                            dataQueryWrapper.eq("farm_id", farmId).eq("unit_id", basePigpen1.getId())
-                                    .ge("create_date", timesMonthmorning);
-                            dataQueryWrapper.select(
-                                    "IFNULL(SUM(water_value),0) waterValue  "
-                            );
-                            EnergyData energyData = dataMapper.selectOne(dataQueryWrapper);
-                            if (Float.parseFloat(energyData.getWaterValue()) != 0.0f) {
-                                value = value + Float.parseFloat(energyData.getWaterValue());
-                                jsonObject.put("value", value);
-                                jsonObject.put("buildName", pigpen.getBuildName());
-                                jsonArray.add(jsonObject);
-                                value = 0.00f;
-                            } else {
-                                jsonObject.put("value", 0);
-                                jsonObject.put("buildName", pigpen.getBuildName());
-                                jsonArray.add(jsonObject);
-                                value = 0.00f;
-                            }
-                        }
-                  /*      jsonObject.put("value", value);
-                        jsonObject.put("buildName", pigpen.getBuildName());
-                        jsonArray.add(jsonObject);
-                        value = 0.00f;*/
-                    }
-                }
-                JSONArray arraySort = jsonArraySort(jsonArray, "value", true);
-                return new Result(ResultCode.SUCCESS, arraySort);
-            }
-            //本周
-            else if ("1".equals(timeType)) {
-                Calendar calendar = Calendar.getInstance();
-                calendar.set(Calendar.DATE, calendar.get(Calendar.DATE) - 7);
-                basePigpenQueryWrapper.eq("parent_id", 0);
-                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);
-                    List<BasePigpen> pigpens = basePigpenMapper.selectList(queryWrapper);//得到所有的楼层
-                    Float value = 0.00f;
-                    for (BasePigpen pigpen : pigpens) {
-                        JSONObject jsonObject = new JSONObject();
-                        QueryWrapper<BasePigpen> queryWrapper1 = new QueryWrapper<>();
-                        queryWrapper1.eq("farm_id", farmId).eq("parent_id", pigpen.getId());
-                        List<BasePigpen> basePigpens1 = basePigpenMapper.selectList(queryWrapper1);//得到所有的单元
-
-                        for (BasePigpen basePigpen1 : basePigpens1) {
-                            QueryWrapper<EnergyData> dataQueryWrapper = new QueryWrapper<>();
-                            dataQueryWrapper.eq("farm_id", farmId).eq("unit_id", basePigpen1.getId())
-                                    .ge("create_date", calendar.getTime());
-                            dataQueryWrapper.select(
-                                    "IFNULL(SUM(water_value),0) waterValue  "
-                            );
-                            EnergyData energyData = dataMapper.selectOne(dataQueryWrapper);
-                            if (Float.parseFloat(energyData.getWaterValue()) != 0.0f) {
-                                value = value + Float.parseFloat(energyData.getWaterValue());
-                                jsonObject.put("value", value);
-                                jsonObject.put("buildName", pigpen.getBuildName());
-                                jsonArray.add(jsonObject);
-                                value = 0.00f;
-                            } else {
-                                jsonObject.put("value", 0);
-                                jsonObject.put("buildName", pigpen.getBuildName());
-                                jsonArray.add(jsonObject);
-                                value = 0.00f;
-                            }
-                        }
-                        /*jsonObject.put("value", value);
-                        jsonObject.put("buildName", pigpen.getBuildName());
-                        jsonArray.add(jsonObject);
-                        value = 0.00f;*/
-                    }
-                }
-                JSONArray arraySort = jsonArraySort(jsonArray, "value", true);
-                return new Result(ResultCode.SUCCESS, arraySort);
-            }
-        }
-        //用电
-        else if ("2".equals(dataType)) {
-            //自定义
-            if ("4".equals(timeType)) {
-                startTime = startTime + " 00:00:00";
-                endTime = endTime + " 23:59:59";
-                basePigpenQueryWrapper.eq("parent_id", 0);
-                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);
-                    List<BasePigpen> pigpens = basePigpenMapper.selectList(queryWrapper);//得到所有的楼层
-                    Float value = 0.00f;
-                    for (BasePigpen pigpen : pigpens) {
-                        JSONObject jsonObject = new JSONObject();
-                        QueryWrapper<BasePigpen> queryWrapper1 = new QueryWrapper<>();
-                        queryWrapper1.eq("farm_id", farmId).eq("parent_id", pigpen.getId());
-                        List<BasePigpen> basePigpens1 = basePigpenMapper.selectList(queryWrapper1);//得到所有的单元
 
-                        for (BasePigpen basePigpen1 : basePigpens1) {
-                            QueryWrapper<EnergyData> dataQueryWrapper = new QueryWrapper<>();
-                            dataQueryWrapper.eq("farm_id", farmId).eq("unit_id", basePigpen1.getId())
-                                    .between("create_date", startTime, endTime);
-                            dataQueryWrapper.select(
-                                    "IFNULL(SUM(electricity_value),0) electricityValue  "
-                            );
-                            EnergyData energyData = dataMapper.selectOne(dataQueryWrapper);
-                            if (Float.parseFloat(energyData.getElectricityValue()) != 0.0f) {
-                                value = value + Float.parseFloat(energyData.getElectricityValue());
-                                jsonObject.put("value", value);
-                                jsonObject.put("buildName", pigpen.getBuildName());
-                                jsonArray.add(jsonObject);
-                                value = 0.00f;
-                            } else {
-                                jsonObject.put("value", 0);
-                                jsonObject.put("buildName", pigpen.getBuildName());
-                                jsonArray.add(jsonObject);
-                                value = 0.00f;
-                            }
-                        }
-                       /* jsonObject.put("value", value);
-                        jsonObject.put("buildName", pigpen.getBuildName());
-                        jsonArray.add(jsonObject);
-                        value = 0.00f;*/
-                    }
-                }
-                JSONArray arraySort = jsonArraySort(jsonArray, "value", true);
-                return new Result(ResultCode.SUCCESS, arraySort);
-            }
-            //全年
-            else if ("3".equals(timeType)) {
-                DateTime dateTime = DateUtil.beginOfYear(new Date());
-                basePigpenQueryWrapper.eq("parent_id", 0);
-                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);
-                    List<BasePigpen> pigpens = basePigpenMapper.selectList(queryWrapper);//得到所有的楼层
-                    Float value = 0.00f;
-                    for (BasePigpen pigpen : pigpens) {
-                        JSONObject jsonObject = new JSONObject();
-                        QueryWrapper<BasePigpen> queryWrapper1 = new QueryWrapper<>();
-                        queryWrapper1.eq("farm_id", farmId).eq("parent_id", pigpen.getId());
-                        List<BasePigpen> basePigpens1 = basePigpenMapper.selectList(queryWrapper1);//得到所有的单元
 
-                        for (BasePigpen basePigpen1 : basePigpens1) {
-                            QueryWrapper<EnergyData> dataQueryWrapper = new QueryWrapper<>();
-                            dataQueryWrapper.eq("farm_id", farmId).eq("unit_id", basePigpen1.getId())
-                                    .ge("create_date", dateTime);
-                            dataQueryWrapper.select(
-                                    "IFNULL(SUM(electricity_value),0) electricityValue  "
-                            );
-                            EnergyData energyData = dataMapper.selectOne(dataQueryWrapper);
-                            if (Float.parseFloat(energyData.getElectricityValue()) != 0.0f) {
-                                value = value + Float.parseFloat(energyData.getElectricityValue());
-                                jsonObject.put("value", value);
-                                jsonObject.put("buildName", pigpen.getBuildName());
-                                jsonArray.add(jsonObject);
-                                value = 0.00f;
-                            } else {
-                                jsonObject.put("value", 0);
-                                jsonObject.put("buildName", pigpen.getBuildName());
-                                jsonArray.add(jsonObject);
-                                value = 0.00f;
-                            }
-                        }
-                     /*   jsonObject.put("value", value);
-                        jsonObject.put("buildName", pigpen.getBuildName());
-                        jsonArray.add(jsonObject);
-                        value = 0.00f;*/
-                    }
-                }
-                JSONArray arraySort = jsonArraySort(jsonArray, "value", true);
-                return new Result(ResultCode.SUCCESS, arraySort);
-            }
+                dataQueryWrapper.select(
+                        "IFNULL(SUM(water_value),0) waterValue,IFNULL(SUM(gas_value),0) gasValue" +
+                                ",IFNULL(SUM(electricity_value),0) electricityValue" +
+                                ",IFNULL(SUM(feed_value),0) feedValue  "
+                );
+                EnergyData energyData = dataMapper.selectOne(dataQueryWrapper);
+                JSONObject jsonObject = new JSONObject();
 
-            //本月
-            else if ("2".equals(timeType)) {
-                Date timesMonthmorning = DataUill.getTimesMonthmorning();
-                basePigpenQueryWrapper.eq("parent_id", 0);
-                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);
-                    List<BasePigpen> pigpens = basePigpenMapper.selectList(queryWrapper);//得到所有的楼层
-                    Float value = 0.00f;
-                    for (BasePigpen pigpen : pigpens) {
-                        JSONObject jsonObject = new JSONObject();
-                        QueryWrapper<BasePigpen> queryWrapper1 = new QueryWrapper<>();
-                        queryWrapper1.eq("farm_id", farmId).eq("parent_id", pigpen.getId());
-                        List<BasePigpen> basePigpens1 = basePigpenMapper.selectList(queryWrapper1);//得到所有的单元
 
-                        for (BasePigpen basePigpen1 : basePigpens1) {
-                            QueryWrapper<EnergyData> dataQueryWrapper = new QueryWrapper<>();
-                            dataQueryWrapper.eq("farm_id", farmId).eq("unit_id", basePigpen1.getId())
-                                    .ge("create_date", timesMonthmorning);
-                            dataQueryWrapper.select(
-                                    "IFNULL(SUM(electricity_value),0) electricityValue  "
-                            );
-                            EnergyData energyData = dataMapper.selectOne(dataQueryWrapper);
-                            if (Float.parseFloat(energyData.getElectricityValue()) != 0.0f) {
-                                value = value + Float.parseFloat(energyData.getElectricityValue());
-                                jsonObject.put("value", value);
-                                jsonObject.put("buildName", pigpen.getBuildName());
-                                jsonArray.add(jsonObject);
-                                value = 0.00f;
-                            } else {
-                                jsonObject.put("value", 0);
-                                jsonObject.put("buildName", pigpen.getBuildName());
-                                jsonArray.add(jsonObject);
-                                value = 0.00f;
-                            }
-                        }
-                    /*    jsonObject.put("value", value);
-                        jsonObject.put("buildName", pigpen.getBuildName());
-                        jsonArray.add(jsonObject);
-                        value = 0.00f;*/
-                    }
-                }
-                JSONArray arraySort = jsonArraySort(jsonArray, "value", true);
-                return new Result(ResultCode.SUCCESS, arraySort);
-            }
-            //本周
-            else if ("1".equals(timeType)) {
-                Calendar calendar = Calendar.getInstance();
-                calendar.set(Calendar.DATE, calendar.get(Calendar.DATE) - 7);
-                basePigpenQueryWrapper.eq("parent_id", 0);
-                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);
-                    List<BasePigpen> pigpens = basePigpenMapper.selectList(queryWrapper);//得到所有的楼层
-                    Float value = 0.00f;
-                    for (BasePigpen pigpen : pigpens) {
-                        JSONObject jsonObject = new JSONObject();
-                        QueryWrapper<BasePigpen> queryWrapper1 = new QueryWrapper<>();
-                        queryWrapper1.eq("farm_id", farmId).eq("parent_id", pigpen.getId());
-                        List<BasePigpen> basePigpens1 = basePigpenMapper.selectList(queryWrapper1);//得到所有的单元
-
-                        for (BasePigpen basePigpen1 : basePigpens1) {
-                            QueryWrapper<EnergyData> dataQueryWrapper = new QueryWrapper<>();
-                            dataQueryWrapper.eq("farm_id", farmId).eq("unit_id", basePigpen1.getId())
-                                    .ge("create_date", calendar.getTime());
-                            dataQueryWrapper.select(
-                                    "IFNULL(SUM(electricity_value),0) electricityValue  "
-                            );
-
-                            EnergyData energyData = dataMapper.selectOne(dataQueryWrapper);
-                            if (Float.parseFloat(energyData.getElectricityValue()) != 0.0f) {
-                                value = value + Float.parseFloat(energyData.getElectricityValue());
-                                jsonObject.put("value", value);
-                                jsonObject.put("buildName", pigpen.getBuildName());
-                                jsonArray.add(jsonObject);
-                                value = 0.00f;
-                            } else {
-                                jsonObject.put("value", 0);
-                                jsonObject.put("buildName", pigpen.getBuildName());
-                                jsonArray.add(jsonObject);
-                                value = 0.00f;
-                            }
-                        }/*
+                if ("1".equals(dataType)) {
+                    if (Float.parseFloat(energyData.getWaterValue()) != 0.0f) {
+                        value = value + Float.parseFloat(energyData.getWaterValue());
                         jsonObject.put("value", value);
-                        jsonObject.put("buildName", pigpen.getBuildName());
-                        jsonArray.add(jsonObject);
-                        value = 0.00f;*/
-                    }
-                }
-                JSONArray arraySort = jsonArraySort(jsonArray, "value", true);
-                return new Result(ResultCode.SUCCESS, arraySort);
-            }
-        }
-        //饲料
-        else if ("3".equals(dataType)) {
-            //自定义
-            if ("4".equals(timeType)) {
-                startTime = startTime + " 00:00:00";
-                endTime = endTime + " 23:59:59";
-                basePigpenQueryWrapper.eq("parent_id", 0);
-                List<BasePigpen> basePigpens = basePigpenMapper.selectList(basePigpenQueryWrapper);//得到所有的栋舍
-                for (BasePigpen basePigpen : basePigpens) {
-                    QueryWrapper<BasePigpen> queryWrapper = new QueryWrapper<>();
-                    queryWrapper.eq("farm_id", farmId).like("other2", basePigpen.getId()).eq("f_type", 2);
-                    List<BasePigpen> pigpens = basePigpenMapper.selectList(queryWrapper);//得到所有的楼层
-                    Float value = 0.00f;
-                    for (BasePigpen pigpen : pigpens) { //一层 二层
-                        QueryWrapper<BasePigpen> queryWrapper1 = new QueryWrapper<>();
-                        queryWrapper1.like("other2", pigpen.getId()).eq("farm_id", farmId);
-                        List<BasePigpen> basePigpens1 = basePigpenMapper.selectList(queryWrapper1);//所有单元
-                        for (BasePigpen pigpen1 : basePigpens1) {
-                            JSONObject jsonObject = new JSONObject();
-                            QueryWrapper<EnergyData> dataQueryWrapper = new QueryWrapper<>();
-                            dataQueryWrapper.eq("farm_id", farmId).eq("unit_id", pigpen1.getId())
-                                    .between("create_date", startTime, endTime);
-                            dataQueryWrapper.select(
-                                    "IFNULL(SUM(feed_value),0) feedValue  "
-                            );
-                            EnergyData energyData = dataMapper.selectOne(dataQueryWrapper);
-                            if (Float.parseFloat(energyData.getFeedValue()) != 0.0f) {
-                                value = value + Float.parseFloat(energyData.getFeedValue());
-                                jsonObject.put("value", value);
-                                jsonObject.put("buildName", pigpen.getBuildName());
-                                jsonArray.add(jsonObject);
-                                value = 0.00f;
-                            } else {
-                                jsonObject.put("value", 0);
-                                jsonObject.put("buildName", pigpen.getBuildName());
-                                jsonArray.add(jsonObject);
-                                value = 0.00f;
-                            }
-                        }
-                    }
-                }
-                JSONArray arraySort = jsonArraySort(jsonArray, "value", true);
-                return new Result(ResultCode.SUCCESS, arraySort);
-            }
-            //全年
-            else if ("3".equals(timeType)) {
-                DateTime dateTime = DateUtil.beginOfYear(new Date());
-                basePigpenQueryWrapper.eq("parent_id", 0);
-                List<BasePigpen> basePigpens = basePigpenMapper.selectList(basePigpenQueryWrapper);//得到所有的栋舍
-                for (BasePigpen basePigpen : basePigpens) {
-                    QueryWrapper<BasePigpen> queryWrapper = new QueryWrapper<>();
-                    queryWrapper.eq("farm_id", farmId).like("other2", basePigpen.getId()).eq("f_type", 2);
-                    List<BasePigpen> pigpens = basePigpenMapper.selectList(queryWrapper);//得到所有的楼层
-                    Float value = 0.00f;
-                    for (BasePigpen pigpen : pigpens) { //一层 二层
-                        QueryWrapper<BasePigpen> queryWrapper1 = new QueryWrapper<>();
-                        queryWrapper1.like("other2", pigpen.getId()).eq("farm_id", farmId);
-                        List<BasePigpen> basePigpens1 = basePigpenMapper.selectList(queryWrapper1);//所有单元
-                        for (BasePigpen pigpen1 : basePigpens1) {
-                            JSONObject jsonObject = new JSONObject();
-                            QueryWrapper<EnergyData> dataQueryWrapper = new QueryWrapper<>();
-                            dataQueryWrapper.eq("farm_id", farmId).eq("unit_id", pigpen1.getId())
-                                    .ge("create_date", dateTime);
-                            dataQueryWrapper.select(
-                                    "IFNULL(SUM(feed_value),0) feedValue  "
-                            );
-                            EnergyData energyData = dataMapper.selectOne(dataQueryWrapper);
-                            if (Float.parseFloat(energyData.getFeedValue()) != 0.0f) {
-                                value = value + Float.parseFloat(energyData.getFeedValue());
-                                jsonObject.put("value", value);
-                                jsonObject.put("buildName", pigpen.getBuildName());
-                                jsonArray.add(jsonObject);
-                                value = 0.00f;
-                            } else {
-                                jsonObject.put("value", 0);
-                                jsonObject.put("buildName", pigpen.getBuildName());
-                                jsonArray.add(jsonObject);
-                                value = 0.00f;
-                            }
-                        }
-                    }
-                }
-                JSONArray arraySort = jsonArraySort(jsonArray, "value", true);
-                return new Result(ResultCode.SUCCESS, arraySort);
-            }
-            //本月
-            else if ("2".equals(timeType)) {
-                Date timesMonthmorning = DataUill.getTimesMonthmorning();
-                basePigpenQueryWrapper.eq("parent_id", 0);
-                List<BasePigpen> basePigpens = basePigpenMapper.selectList(basePigpenQueryWrapper);//得到所有的栋舍
-                for (BasePigpen basePigpen : basePigpens) {
-                    QueryWrapper<BasePigpen> queryWrapper = new QueryWrapper<>();
-                    queryWrapper.eq("farm_id", farmId).like("other2", basePigpen.getId()).eq("f_type", 2);
-                    List<BasePigpen> pigpens = basePigpenMapper.selectList(queryWrapper);//得到所有的楼层
-                    Float value = 0.00f;
-                    for (BasePigpen pigpen : pigpens) { //一层 二层
-                        QueryWrapper<BasePigpen> queryWrapper1 = new QueryWrapper<>();
-                        queryWrapper1.like("other2", pigpen.getId()).eq("farm_id", farmId);
-                        List<BasePigpen> basePigpens1 = basePigpenMapper.selectList(queryWrapper1);//所有单元
-                        for (BasePigpen pigpen1 : basePigpens1) {
-                            JSONObject jsonObject = new JSONObject();
-                            QueryWrapper<EnergyData> dataQueryWrapper = new QueryWrapper<>();
-                            dataQueryWrapper.eq("farm_id", farmId).eq("unit_id", pigpen1.getId())
-                                    .ge("create_date", timesMonthmorning);
-                            dataQueryWrapper.select(
-                                    "IFNULL(SUM(feed_value),0) feedValue  "
-                            );
-                            EnergyData energyData = dataMapper.selectOne(dataQueryWrapper);
-                            if (Float.parseFloat(energyData.getFeedValue()) != 0.0f) {
-                                value = value + Float.parseFloat(energyData.getFeedValue());
-                                jsonObject.put("value", value);
-                                jsonObject.put("buildName", pigpen.getBuildName());
-                                jsonArray.add(jsonObject);
-                                value = 0.00f;
-                            } else {
-                                jsonObject.put("value", 0);
-                                jsonObject.put("buildName", pigpen.getBuildName());
-                                jsonArray.add(jsonObject);
-                                value = 0.00f;
-                            }
-                        }
-                    }
-                }
-                JSONArray arraySort = jsonArraySort(jsonArray, "value", true);
-                return new Result(ResultCode.SUCCESS, arraySort);
-            }
-            //本周
-            else if ("1".equals(timeType)) {
-                Calendar calendar = Calendar.getInstance();
-                calendar.set(Calendar.DATE, calendar.get(Calendar.DATE) - 7);
-                basePigpenQueryWrapper.eq("parent_id", 0);
-                List<BasePigpen> basePigpens = basePigpenMapper.selectList(basePigpenQueryWrapper);//得到所有的栋舍
-                for (BasePigpen basePigpen : basePigpens) { //一栋
-                    QueryWrapper<BasePigpen> queryWrapper = new QueryWrapper<>();
-                    queryWrapper.eq("farm_id", farmId).like("other2", basePigpen.getId()).eq("f_type", 2);
-                    List<BasePigpen> pigpens = basePigpenMapper.selectList(queryWrapper);//得到所有的楼层
-                    Float value = 0.00f;
-                    for (BasePigpen pigpen : pigpens) { //一层 二层
-                        QueryWrapper<BasePigpen> queryWrapper1 = new QueryWrapper<>();
-                        queryWrapper1.like("other2", pigpen.getId()).eq("farm_id", farmId);
-                        List<BasePigpen> basePigpens1 = basePigpenMapper.selectList(queryWrapper1);//所有单元
-                        for (BasePigpen pigpen1 : basePigpens1) {
-                            JSONObject jsonObject = new JSONObject();
-                            QueryWrapper<EnergyData> dataQueryWrapper = new QueryWrapper<>();
-                            dataQueryWrapper.eq("farm_id", farmId).eq("unit_id", pigpen1.getId())
-                                    .ge("create_date", calendar.getTime());
-                            dataQueryWrapper.select(
-                                    "IFNULL(SUM(feed_value),0) feedValue  "
-                            );
-                            EnergyData energyData = dataMapper.selectOne(dataQueryWrapper);
-                            if (Float.parseFloat(energyData.getFeedValue()) != 0.0f) {
-                                value = value + Float.parseFloat(energyData.getFeedValue());
-                                jsonObject.put("value", value);
-                                jsonObject.put("buildName", pigpen.getBuildName());
-                                jsonArray.add(jsonObject);
-                                value = 0.00f;
-                            } else {
-                                jsonObject.put("value", 0);
-                                jsonObject.put("buildName", pigpen.getBuildName());
-                                jsonArray.add(jsonObject);
-                                value = 0.00f;
-                            }
-                        }
-                    }
-                }
-                JSONArray arraySort = jsonArraySort(jsonArray, "value", true);
-                return new Result(ResultCode.SUCCESS, arraySort);
-            }
-        }
-        //天然气
-        else if ("4".equals(dataType)) {
-            //自定义
-            if ("4".equals(timeType)) {
-                startTime = startTime + " 00:00:00";
-                endTime = endTime + " 23:59:59";
-                basePigpenQueryWrapper.eq("parent_id", 0);
-                List<BasePigpen> basePigpens = basePigpenMapper.selectList(basePigpenQueryWrapper);//得到所有的栋舍
-                for (BasePigpen basePigpen : basePigpens) {
-                    QueryWrapper<BasePigpen> queryWrapper = new QueryWrapper<>();
-                    queryWrapper.eq("farm_id", farmId).like("other2", basePigpen.getId()).eq("f_type", 2);
-                    List<BasePigpen> pigpens = basePigpenMapper.selectList(queryWrapper);//得到所有的楼层
-                    Float value = 0.00f;
-                    for (BasePigpen pigpen : pigpens) { //一层 二层
-                        QueryWrapper<BasePigpen> queryWrapper1 = new QueryWrapper<>();
-                        queryWrapper1.like("other2", pigpen.getId()).eq("farm_id", farmId);
-                        List<BasePigpen> basePigpens1 = basePigpenMapper.selectList(queryWrapper1);//所有单元
-                        for (BasePigpen pigpen1 : basePigpens1) {
-                            JSONObject jsonObject = new JSONObject();
-                            QueryWrapper<EnergyData> dataQueryWrapper = new QueryWrapper<>();
-                            dataQueryWrapper.eq("farm_id", farmId).eq("unit_id", pigpen1.getId())
-                                    .between("create_date", startTime, endTime);
-                            dataQueryWrapper.select(
-                                    "IFNULL(SUM(gas_value),0) gasValue  "
-                            );
-                            EnergyData energyData = dataMapper.selectOne(dataQueryWrapper);
-                            if (Float.parseFloat(energyData.getGasValue()) != 0.0f) {
-                                value = value + Float.parseFloat(energyData.getGasValue());
-                                jsonObject.put("value", value);
-                                jsonObject.put("buildName", pigpen.getBuildName());
-                                jsonArray.add(jsonObject);
-                                value = 0.00f;
-                            } else {
-                                jsonObject.put("value", 0);
-                                jsonObject.put("buildName", pigpen.getBuildName());
-                                jsonArray.add(jsonObject);
-                                value = 0.00f;
-                            }
-                        }
+                    } else {
+                        jsonObject.put("value", 0);
                     }
                 }
-                JSONArray arraySort = jsonArraySort(jsonArray, "value", true);
-                return new Result(ResultCode.SUCCESS, arraySort);
-            }
-            //全年
-            else if ("3".equals(timeType)) {
-                DateTime dateTime = DateUtil.beginOfYear(new Date());
-                basePigpenQueryWrapper.eq("parent_id", 0);
-                List<BasePigpen> basePigpens = basePigpenMapper.selectList(basePigpenQueryWrapper);//得到所有的栋舍
-                for (BasePigpen basePigpen : basePigpens) {
-                    QueryWrapper<BasePigpen> queryWrapper = new QueryWrapper<>();
-                    queryWrapper.eq("farm_id", farmId).like("other2", basePigpen.getId()).eq("f_type", 2);
-                    List<BasePigpen> pigpens = basePigpenMapper.selectList(queryWrapper);//得到所有的楼层
-                    Float value = 0.00f;
-                    for (BasePigpen pigpen : pigpens) { //一层 二层
-                        QueryWrapper<BasePigpen> queryWrapper1 = new QueryWrapper<>();
-                        queryWrapper1.like("other2", pigpen.getId()).eq("farm_id", farmId);
-                        List<BasePigpen> basePigpens1 = basePigpenMapper.selectList(queryWrapper1);//所有单元
-                        for (BasePigpen pigpen1 : basePigpens1) {
-                            JSONObject jsonObject = new JSONObject();
-                            QueryWrapper<EnergyData> dataQueryWrapper = new QueryWrapper<>();
-                            dataQueryWrapper.eq("farm_id", farmId).eq("unit_id", pigpen1.getId())
-                                    .ge("create_date", dateTime);
-                            dataQueryWrapper.select(
-                                    "IFNULL(SUM(gas_value),0) gasValue  "
-                            );
-                            EnergyData energyData = dataMapper.selectOne(dataQueryWrapper);
-                            if (Float.parseFloat(energyData.getGasValue()) != 0.0f) {
-                                value = value + Float.parseFloat(energyData.getGasValue());
-                                jsonObject.put("value", value);
-                                jsonObject.put("buildName", pigpen.getBuildName());
-                                jsonArray.add(jsonObject);
-                                value = 0.00f;
-                            } else {
-                                jsonObject.put("value", 0);
-                                jsonObject.put("buildName", pigpen.getBuildName());
-                                jsonArray.add(jsonObject);
-                                value = 0.00f;
-                            }
-                        }
+                if ("2".equals(dataType)) {
+                    if (Float.parseFloat(energyData.getElectricityValue()) != 0.0f) {
+                        value = value + Float.parseFloat(energyData.getElectricityValue());
+                        jsonObject.put("value", value);
+                    } else {
+                        jsonObject.put("value", 0);
                     }
                 }
-                JSONArray arraySort = jsonArraySort(jsonArray, "value", true);
-                return new Result(ResultCode.SUCCESS, arraySort);
-            }
-            //本月
-            else if ("2".equals(timeType)) {
-                Date timesMonthmorning = DataUill.getTimesMonthmorning();
-                basePigpenQueryWrapper.eq("parent_id", 0);
-                List<BasePigpen> basePigpens = basePigpenMapper.selectList(basePigpenQueryWrapper);//得到所有的栋舍
-                for (BasePigpen basePigpen : basePigpens) {
-                    QueryWrapper<BasePigpen> queryWrapper = new QueryWrapper<>();
-                    queryWrapper.eq("farm_id", farmId).like("other2", basePigpen.getId()).eq("f_type", 2);
-                    List<BasePigpen> pigpens = basePigpenMapper.selectList(queryWrapper);//得到所有的楼层
-                    Float value = 0.00f;
-                    for (BasePigpen pigpen : pigpens) { //一层 二层
-                        QueryWrapper<BasePigpen> queryWrapper1 = new QueryWrapper<>();
-                        queryWrapper1.like("other2", pigpen.getId()).eq("farm_id", farmId);
-                        List<BasePigpen> basePigpens1 = basePigpenMapper.selectList(queryWrapper1);//所有单元
-                        for (BasePigpen pigpen1 : basePigpens1) {
-                            JSONObject jsonObject = new JSONObject();
-                            QueryWrapper<EnergyData> dataQueryWrapper = new QueryWrapper<>();
-                            dataQueryWrapper.eq("farm_id", farmId).eq("unit_id", pigpen1.getId())
-                                    .ge("create_date", timesMonthmorning);
-                            dataQueryWrapper.select(
-                                    "IFNULL(SUM(gas_value),0) gasValue  "
-                            );
-                            EnergyData energyData = dataMapper.selectOne(dataQueryWrapper);
-                            if (Float.parseFloat(energyData.getGasValue()) != 0.0f) {
-                                value = value + Float.parseFloat(energyData.getGasValue());
-                                jsonObject.put("value", value);
-                                jsonObject.put("buildName", pigpen.getBuildName());
-                                jsonArray.add(jsonObject);
-                                value = 0.00f;
-                            } else {
-                                jsonObject.put("value", 0);
-                                jsonObject.put("buildName", pigpen.getBuildName());
-                                jsonArray.add(jsonObject);
-                                value = 0.00f;
-                            }
-                        }
+                if ("3".equals(dataType)) {
+                    if (Float.parseFloat(energyData.getFeedValue()) != 0.0f) {
+                        value = value + Float.parseFloat(energyData.getFeedValue());
+                        jsonObject.put("value", value);
+                    } else {
+                        jsonObject.put("value", 0);
                     }
                 }
-                JSONArray arraySort = jsonArraySort(jsonArray, "value", true);
-                return new Result(ResultCode.SUCCESS, arraySort);
-            }
-            //本周
-            else if ("1".equals(timeType)) {
-                Calendar calendar = Calendar.getInstance();
-                calendar.set(Calendar.DATE, calendar.get(Calendar.DATE) - 7);
-                basePigpenQueryWrapper.eq("parent_id", 0);
-                basePigpenQueryWrapper.eq("parent_id", 0);
-                List<BasePigpen> basePigpens = basePigpenMapper.selectList(basePigpenQueryWrapper);//得到所有的栋舍
-                for (BasePigpen basePigpen : basePigpens) {
-                    QueryWrapper<BasePigpen> queryWrapper = new QueryWrapper<>();
-                    queryWrapper.eq("farm_id", farmId).like("other2", basePigpen.getId()).eq("f_type", 2);
-                    List<BasePigpen> pigpens = basePigpenMapper.selectList(queryWrapper);//得到所有的楼层
-                    Float value = 0.00f;
-                    for (BasePigpen pigpen : pigpens) { //一层 二层
-                        QueryWrapper<BasePigpen> queryWrapper1 = new QueryWrapper<>();
-                        queryWrapper1.like("other2", pigpen.getId()).eq("farm_id", farmId);
-                        List<BasePigpen> basePigpens1 = basePigpenMapper.selectList(queryWrapper1);//所有单元
-                        for (BasePigpen pigpen1 : basePigpens1) {
-                            JSONObject jsonObject = new JSONObject();
-                            QueryWrapper<EnergyData> dataQueryWrapper = new QueryWrapper<>();
-                            dataQueryWrapper.eq("farm_id", farmId).eq("unit_id", pigpen1.getId())
-                                    .ge("create_date", calendar.getTime());
-                            dataQueryWrapper.select(
-                                    "IFNULL(SUM(gas_value),0) gasValue  "
-                            );
-                            EnergyData energyData = dataMapper.selectOne(dataQueryWrapper);
-                            if (Float.parseFloat(energyData.getGasValue()) != 0.0f) {
-                                value = value + Float.parseFloat(energyData.getGasValue());
-                                jsonObject.put("value", value);
-                                jsonObject.put("buildName", pigpen.getBuildName());
-                                jsonArray.add(jsonObject);
-                                value = 0.00f;
-                            } else {
-                                jsonObject.put("value", 0);
-                                jsonObject.put("buildName", pigpen.getBuildName());
-                                jsonArray.add(jsonObject);
-                                value = 0.00f;
-                            }
-                        }
+                if ("4".equals(dataType)) {
+                    if (Float.parseFloat(energyData.getGasValue()) != 0.0f) {
+                        value = value + Float.parseFloat(energyData.getGasValue());
+                        jsonObject.put("value", value);
+                    } else {
+                        jsonObject.put("value", 0);
                     }
                 }
-                JSONArray arraySort = jsonArraySort(jsonArray, "value", true);
-                return new Result(ResultCode.SUCCESS, arraySort);
+                jsonObject.put("buildName", pigpen.getBuildName());
+                jsonArray.add(jsonObject);
+                value = 0.00f;
             }
         }
 
-
-        return new Result(ResultCode.SUCCESS);
+        JSONArray arraySort = jsonArraySort(jsonArray, "value", true);
+        return new Result(ResultCode.SUCCESS, arraySort);
     }
 
     @Override

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

@@ -22,6 +22,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.Calendar;
 import java.util.Date;
 import java.util.List;
@@ -29,7 +30,7 @@ import java.util.Map;
 
 /**
  * <p>
- *  服务实现类
+ * 服务实现类
  * </p>
  *
  * @author author
@@ -44,6 +45,7 @@ public class EnergyElectricityServiceImpl extends ServiceImpl<EnergyElectricityM
     private BasePigpenMapper basePigpenMapper;
     @Autowired
     private EnergyDataMapper dataMapper;
+
     @Override
     public Result listPigpen(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
         String farmId = paramsMap.get("farmId");
@@ -51,60 +53,32 @@ public class EnergyElectricityServiceImpl extends ServiceImpl<EnergyElectricityM
 
         JSONArray jsonArray = new JSONArray();
         QueryWrapper<BasePigpen> basePigpenQueryWrapper = new QueryWrapper<>();
-        if (id == null || id == "") {
-            basePigpenQueryWrapper.eq("farm_id", farmId).eq("parent_id", 0);
-            List<BasePigpen> basePigpens = basePigpenMapper.selectList(basePigpenQueryWrapper);//所有栋
-            for (BasePigpen pigpen : basePigpens) {
-                QueryWrapper<BasePigpen> queryWrapper = new QueryWrapper<>();
-                queryWrapper.eq("farm_id", farmId).like("other2", pigpen.getId());
-                List<BasePigpen> basePigpens1 = basePigpenMapper.selectList(queryWrapper);//所有层
-                for (BasePigpen basePigpen : basePigpens1) {
-                    QueryWrapper<BasePigpen> queryWrapper1 = new QueryWrapper<>();
-                    queryWrapper1.eq("farm_id", farmId).like("other2", basePigpen.getId());//所有单元
-                    List<BasePigpen> basePigpens2 = basePigpenMapper.selectList(queryWrapper1);
-                    for (BasePigpen basePigpen1 : basePigpens2) {
-                        JSONObject jsonObject = new JSONObject();
-                        QueryWrapper<EnergyData> energyElectricityQueryWrapper = new QueryWrapper<>();
-                        energyElectricityQueryWrapper.eq("farm_id", farmId).eq("unit_id", basePigpen1.getId())
-                                .orderByDesc("create_date").last(" limit 1");
-                        EnergyData energyElectricity = dataMapper.selectOne(energyElectricityQueryWrapper);
-                        if (ObjectUtil.isEmpty(energyElectricity)) {
-                            jsonObject.put("buildName", basePigpen1.getBuildName());
-                            jsonObject.put("value", 0);
-                            jsonObject.put("id", basePigpen1.getId());
-                        } else {
-                            jsonObject.put("buildName", basePigpen1.getBuildName());
-                            jsonObject.put("value", energyElectricity.getElectricityValue());
-                            jsonObject.put("id", basePigpen1.getId());
-                        }
-                        jsonArray.add(jsonObject);
+        basePigpenQueryWrapper.eq("farm_id", farmId).like("other2", id);
+        List<BasePigpen> basePigpens = basePigpenMapper.selectList(basePigpenQueryWrapper);//所有的单元
+        for (BasePigpen basePigpen : basePigpens) {
+            JSONObject jsonObject = new JSONObject();
+            QueryWrapper<EnergyData> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("farm_id", farmId).eq("unit_id", basePigpen.getId());
+            queryWrapper.select(" IFNULL(SUM(electricity_value),'0') electricityValue");
+            DateTime dateTime = DateUtil.beginOfDay(new Date());
+            queryWrapper.ge("create_date", dateTime);
 
-                    }
-                }
-            }
-        } else {
-            basePigpenQueryWrapper.eq("farm_id", farmId).like("other2", id);
-            List<BasePigpen> basePigpens = basePigpenMapper.selectList(basePigpenQueryWrapper);//所有的单元
-            for (BasePigpen basePigpen : basePigpens) {
-                JSONObject jsonObject = new JSONObject();
-                QueryWrapper<EnergyData> queryWrapper = new QueryWrapper<>();
-                queryWrapper.eq("farm_id", farmId).eq("unit_id", basePigpen.getId())
-                        .orderByDesc("create_date").last(" limit 1");
-                EnergyData energyElectricity = dataMapper.selectOne(queryWrapper);
-                if (ObjectUtil.isEmpty(energyElectricity)) {
-                    jsonObject.put("buildName", basePigpen.getBuildName());
-                    jsonObject.put("value", 0);
-                    jsonObject.put("id", basePigpen.getId());
-                } else {
-                    jsonObject.put("buildName", basePigpen.getBuildName());
-                    jsonObject.put("value", energyElectricity.getElectricityValue());
-                    jsonObject.put("id", basePigpen.getId());
-                }
-                jsonArray.add(jsonObject);
+            EnergyData energyElectricity = dataMapper.selectOne(queryWrapper);
+            if (ObjectUtil.isEmpty(energyElectricity)) {
+                jsonObject.put("buildName", basePigpen.getBuildName());
+                jsonObject.put("value", 0);
+                jsonObject.put("id", basePigpen.getId());
+            } else {
+                DecimalFormat df = new DecimalFormat("0.00");
+                jsonObject.put("buildName", basePigpen.getBuildName());
+                jsonObject.put("value", df.format(Float.parseFloat(energyElectricity.getElectricityValue())));
+                jsonObject.put("id", basePigpen.getId());
             }
+            jsonArray.add(jsonObject);
         }
 
-        return new Result(ResultCode.SUCCESS,jsonArray);
+
+        return new Result(ResultCode.SUCCESS, jsonArray);
     }
 
     @Override
@@ -134,11 +108,6 @@ public class EnergyElectricityServiceImpl extends ServiceImpl<EnergyElectricityM
             DateTime dateTime = DateUtil.beginOfYear(new Date());
             queryWrapper.ge("create_date", dateTime);
             List<EnergyElectricityDataVo> energyElectricityDataVos = dataMapper.listYear4(queryWrapper);
-            for (EnergyElectricityDataVo energyElectricityDataVo : energyElectricityDataVos) {
-                if (energyElectricityDataVo.getElectricityValue() == null || energyElectricityDataVo.getElectricityValue() == "") {
-                    energyElectricityDataVo.setElectricityValue("0");
-                }
-            }
             electricityList = energyElectricityDataVos;
         }
         //本月
@@ -153,11 +122,6 @@ public class EnergyElectricityServiceImpl extends ServiceImpl<EnergyElectricityM
             calendar.set(Calendar.DATE, calendar.get(Calendar.DATE) - 7);
             queryWrapper.ge("create_date", calendar.getTime());
             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

@@ -22,6 +22,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.*;
 
 /**
@@ -48,69 +49,40 @@ public class EnergyFeedServiceImpl extends ServiceImpl<EnergyFeedMapper, EnergyF
         String id = paramsMap.get("id");
 
         JSONArray jsonArray = new JSONArray();
-        if (id == null || id == "") {
-            QueryWrapper<BasePigpen> queryWrapper = new QueryWrapper<>();
-            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) {
-
-                    QueryWrapper<BasePigpen> basePigpenQueryWrapper1 = new QueryWrapper<>();
-                    basePigpenQueryWrapper1.like("other2", basePigpen.getId()).eq("farm_id", farmId);
-                    List<BasePigpen> basePigpens2 = basePigpenMapper.selectList(basePigpenQueryWrapper1);//得到所有的单元
-                    for (BasePigpen pigpen : basePigpens2) {
-                        JSONObject jsonObject = new JSONObject();
-                        QueryWrapper<EnergyData> queryWrapper1 = new QueryWrapper<>();
-                        queryWrapper1.eq("unit_id", pigpen.getId()).eq("farm_id", farmId)
-                                .orderByDesc("create_date").last(" limit 1");
-                        EnergyData energyFeed = dataMapper.selectOne(queryWrapper1);
-                        if (ObjectUtil.isEmpty(energyFeed)) {
-                            jsonObject.put("buildName", basePigpen.getBuildName());
-                            jsonObject.put("value", 0);
-                            jsonObject.put("id", basePigpen.getId());
-                        } else {
-                            jsonObject.put("buildName", basePigpen.getBuildName());
-                            jsonObject.put("value", energyFeed.getFeedValue());
-                            jsonObject.put("id", basePigpen.getId());
-                        }
-                        jsonArray.add(jsonObject);
-                    }
-
-                }
-            }
-        } else {
-            Float count = 0.00f;
-            QueryWrapper<BasePigpen> queryWrapper = new QueryWrapper<>();
-            queryWrapper.eq("farm_id", farmId).eq("parent_id", id);
-            List<BasePigpen> basePigpens = basePigpenMapper.selectList(queryWrapper);//所有层
-            for (BasePigpen basePigpen : basePigpens) {
-                QueryWrapper<BasePigpen> basePigpenQueryWrapper = new QueryWrapper<>();
-                basePigpenQueryWrapper.like("other2", basePigpen.getId()).eq("farm_id", farmId).eq("f_type",3);
-                List<BasePigpen> basePigpens1 = basePigpenMapper.selectList(basePigpenQueryWrapper);//得到所有的单元
-                JSONObject jsonObject = new JSONObject();
-                for (BasePigpen pigpen : basePigpens1) {
-                    QueryWrapper<EnergyData> queryWrapper1 = new QueryWrapper<>();
-                    queryWrapper1.eq("unit_id", pigpen.getId()).eq("farm_id", farmId)
-                            .orderByDesc("create_date").last(" limit 1");
-                    EnergyData energyGas = dataMapper.selectOne(queryWrapper1);
-
-                    if (ObjectUtil.isNotEmpty(energyGas)) {
-                        count = count + Float.parseFloat(energyGas.getFeedValue());
-                    } else {
-                        count = count + 0.00f;
-                    }
-                }
-                jsonObject.put("value", count);
-                jsonObject.put("buildName", basePigpen.getBuildName());
-                jsonObject.put("id", basePigpen.getId());
-                jsonArray.add(jsonObject);
 
+        QueryWrapper<BasePigpen> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("farm_id", farmId).eq("parent_id", id);
+        List<BasePigpen> basePigpens = basePigpenMapper.selectList(queryWrapper);//所有层
+        for (BasePigpen basePigpen : basePigpens) {
+            Float count = 0.00f;
+            QueryWrapper<BasePigpen> basePigpenQueryWrapper = new QueryWrapper<>();
+            basePigpenQueryWrapper.like("other2", basePigpen.getId()).eq("farm_id", farmId).eq("f_type", 3);
+            List<BasePigpen> basePigpens1 = basePigpenMapper.selectList(basePigpenQueryWrapper);//得到所有的单元
+            List<Integer> idList = new ArrayList<>();
+            basePigpens1.forEach(item->{
+                idList.add(item.getId());
+            });
+            JSONObject jsonObject = new JSONObject();
+            QueryWrapper<EnergyData> queryWrapper1 = new QueryWrapper<>();
+            queryWrapper1.in("unit_id", idList).eq("farm_id", farmId);
+            DateTime dateTime = DateUtil.beginOfDay(new Date());
+            queryWrapper1.ge("create_date", dateTime);
+            queryWrapper1.select(" IFNULL(SUM(feed_value),'0') feedValue");
+            EnergyData energyGas = dataMapper.selectOne(queryWrapper1);
+
+            if (ObjectUtil.isNotEmpty(energyGas)) {
+                count = count + Float.parseFloat(energyGas.getFeedValue());
+            } else {
+                count = count + 0.00f;
             }
+            DecimalFormat df = new DecimalFormat("#.00");
+            jsonObject.put("value", df.format(count));
+            jsonObject.put("buildName", basePigpen.getBuildName());
+            jsonObject.put("id", basePigpen.getId());
+            jsonArray.add(jsonObject);
+
         }
+
         return new Result(ResultCode.SUCCESS, jsonArray);
     }
 
@@ -144,18 +116,12 @@ public class EnergyFeedServiceImpl extends ServiceImpl<EnergyFeedMapper, EnergyF
             endTime = endTime + " 23:59:59";
             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);
             List<EnergyFeedDataVo> energyFeedDataVos = dataMapper.listYear2(queryWrapper);
-            for (EnergyFeedDataVo energyFeedDataVo : energyFeedDataVos) {
-                if (energyFeedDataVo.getFeedValue() == null || energyFeedDataVo.getFeedValue() == "") {
-                    energyFeedDataVo.setFeedValue("0");
-                }
-            }
             energyGasList = energyFeedDataVos;
         }
         //本月
@@ -170,11 +136,6 @@ public class EnergyFeedServiceImpl extends ServiceImpl<EnergyFeedMapper, EnergyF
             calendar.set(Calendar.DATE, calendar.get(Calendar.DATE) - 7);
             queryWrapper.ge("create_date", calendar.getTime());
             List<EnergyFeedDataVo> energyFeedDataVos = dataMapper.listDay2(queryWrapper);
-            for (EnergyFeedDataVo energyFeedDataVo : energyFeedDataVos) {
-                if (energyFeedDataVo.getFeedValue() == null || energyFeedDataVo.getFeedValue() == "") {
-                    energyFeedDataVo.setFeedValue("0");
-                }
-            }
             energyGasList = energyFeedDataVos;
         }
 

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

@@ -23,6 +23,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.*;
 
 /**
@@ -49,71 +50,41 @@ public class EnergyGasServiceImpl extends ServiceImpl<EnergyGasMapper, EnergyGas
         String id = paramsMap.get("id");
 
         JSONArray jsonArray = new JSONArray();
-        if (id == null || id == "") {
-            QueryWrapper<BasePigpen> queryWrapper = new QueryWrapper<>();
-            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) {
-
-                    QueryWrapper<BasePigpen> basePigpenQueryWrapper1 = new QueryWrapper<>();
-                    basePigpenQueryWrapper1.like("other2", basePigpen.getId()).eq("farm_id", farmId);
-                    List<BasePigpen> basePigpens2 = basePigpenMapper.selectList(basePigpenQueryWrapper1);//得到所有的单元
-                    for (BasePigpen pigpen : basePigpens2) {
-                        JSONObject jsonObject = new JSONObject();
-                        QueryWrapper<EnergyData> queryWrapper1 = new QueryWrapper<>();
-                        queryWrapper1.eq("unit_id", pigpen.getId()).eq("farm_id", farmId)
-                                .orderByDesc("create_date").last(" limit 1");
-                        EnergyData energyGas = dataMapper.selectOne(queryWrapper1);
-                        if (ObjectUtil.isEmpty(energyGas)) {
-                            jsonObject.put("buildName", basePigpen.getBuildName());
-                            jsonObject.put("value", 0);
-                            jsonObject.put("id", basePigpen.getId());
-                        } else {
-                            jsonObject.put("buildName", basePigpen.getBuildName());
-                            jsonObject.put("value", energyGas.getGasValue());
-                            jsonObject.put("id", basePigpen.getId());
-                        }
-                        jsonArray.add(jsonObject);
-                    }
-
-                }
-            }
-        } else {
+        QueryWrapper<BasePigpen> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("farm_id", farmId).eq("parent_id", id);
+        List<BasePigpen> basePigpens = basePigpenMapper.selectList(queryWrapper);//得到所有的楼层
+        for (BasePigpen basePigpen : basePigpens) {
             Float count = 0.00f;
-            QueryWrapper<BasePigpen> queryWrapper = new QueryWrapper<>();
-            queryWrapper.eq("farm_id", farmId).eq("parent_id", id);
-            List<BasePigpen> basePigpens = basePigpenMapper.selectList(queryWrapper);//得到所有的楼层
-            for (BasePigpen basePigpen : basePigpens) {
-                QueryWrapper<BasePigpen> basePigpenQueryWrapper = new QueryWrapper<>();
-                basePigpenQueryWrapper.like("other2", basePigpen.getId()).eq("farm_id", farmId).eq("f_type", 3);
-                List<BasePigpen> basePigpens1 = basePigpenMapper.selectList(basePigpenQueryWrapper);//得到所有的单元
-                JSONObject jsonObject = new JSONObject();
-                for (BasePigpen pigpen : basePigpens1) {
-                    QueryWrapper<EnergyData> queryWrapper1 = new QueryWrapper<>();
-                    queryWrapper1.eq("unit_id", pigpen.getId()).eq("farm_id", farmId)
-                            .orderByDesc("create_date").last(" limit 1");
-                    EnergyData energyGas = dataMapper.selectOne(queryWrapper1);
+            QueryWrapper<BasePigpen> basePigpenQueryWrapper = new QueryWrapper<>();
+            basePigpenQueryWrapper.like("other2", basePigpen.getId()).eq("farm_id", farmId).eq("f_type", 3);
+            List<BasePigpen> basePigpens1 = basePigpenMapper.selectList(basePigpenQueryWrapper);//得到所有的单元
+            List<Integer> idList = new ArrayList<>();
+            basePigpens1.forEach(item->{
+                idList.add(item.getId());
+            });
+            JSONObject jsonObject = new JSONObject();
+            QueryWrapper<EnergyData> queryWrapper1 = new QueryWrapper<>();
+            queryWrapper1.in("unit_id", idList).eq("farm_id", farmId);
+            DateTime dateTime = DateUtil.beginOfDay(new Date());
+            queryWrapper1.ge("create_date", dateTime);
+            queryWrapper1.select(" IFNULL(SUM(gas_value),'0') gasValue");
+            EnergyData energyGas = dataMapper.selectOne(queryWrapper1);
+
+            if (ObjectUtil.isNotEmpty(energyGas)) {
+                count = count + Float.parseFloat(energyGas.getGasValue());
+            } else {
+                count = count + 0.00f;
+            }
 
-                    if (ObjectUtil.isNotEmpty(energyGas)) {
-                        count = count + Float.parseFloat(energyGas.getGasValue());
-                    } else {
-                        count = count + 0.00f;
-                    }
-                }
-                jsonObject.put("value", count);
-                jsonObject.put("buildName", basePigpen.getBuildName());
-                jsonObject.put("id", basePigpen.getId());
-                jsonArray.add(jsonObject);
+            DecimalFormat df = new DecimalFormat("#.00");
+            jsonObject.put("value", df.format(count));
+            jsonObject.put("buildName", basePigpen.getBuildName());
+            jsonObject.put("id", basePigpen.getId());
+            jsonArray.add(jsonObject);
 
-            }
         }
 
+
         return new Result(ResultCode.SUCCESS, jsonArray);
     }
 
@@ -152,11 +123,6 @@ public class EnergyGasServiceImpl extends ServiceImpl<EnergyGasMapper, EnergyGas
             DateTime dateTime = DateUtil.beginOfYear(new Date());
             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 = energyGasDataVos;
         }
         //本月
@@ -171,11 +137,6 @@ public class EnergyGasServiceImpl extends ServiceImpl<EnergyGasMapper, EnergyGas
             calendar.set(Calendar.DATE, calendar.get(Calendar.DATE) - 7);
             queryWrapper.ge("create_date", calendar.getTime());
             List<EnergyGasDataVo> energyGasDataVos = dataMapper.listDay(queryWrapper);
-            for (EnergyGasDataVo energyGasDataVo : energyGasDataVos) {
-                if (energyGasDataVo.getGasValue() == null || energyGasDataVo.getGasValue() == "") {
-                    energyGasDataVo.setGasValue("0");
-                }
-            }
             energyGasList = energyGasDataVos;
         }
 

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

@@ -18,10 +18,12 @@ 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;
+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.text.DecimalFormat;
 import java.util.Calendar;
 import java.util.Date;
 import java.util.List;
@@ -52,62 +54,32 @@ public class EnergyWaterServiceImpl extends ServiceImpl<EnergyWaterMapper, Energ
 
         JSONArray jsonArray = new JSONArray();
         QueryWrapper<BasePigpen> basePigpenQueryWrapper = new QueryWrapper<>();
-        if (id == null || id == "") {
-            basePigpenQueryWrapper.eq("farm_id", farmId).eq("parent_id", 0);
-            List<BasePigpen> basePigpens = basePigpenMapper.selectList(basePigpenQueryWrapper);//得到所有的栋
-            for (BasePigpen basePigpen : basePigpens) {
-                basePigpen.getId();
-                QueryWrapper<BasePigpen> queryWrapper = new QueryWrapper<>();
-                queryWrapper.eq("parent_id", basePigpen.getId());
-                List<BasePigpen> pigpens = basePigpenMapper.selectList(queryWrapper);//得到所有的层
-                for (BasePigpen pigpen : pigpens) {
-                    QueryWrapper<BasePigpen> queryWrapper1 = new QueryWrapper<>();
-                    queryWrapper1.eq("farm_id", farmId).like("other2", pigpen.getId());
-                    List<BasePigpen> basePigpens1 = basePigpenMapper.selectList(queryWrapper1);//得到所有的单元
-                    for (BasePigpen basePigpen1 : basePigpens1) {
-                        JSONObject jsonObject = new JSONObject();
-                        QueryWrapper<EnergyData> energyWaterQueryWrapper = new QueryWrapper<>();
-                        energyWaterQueryWrapper.eq("farm_id",farmId).eq("unit_id",basePigpen1.getId())
-                                .orderByDesc("create_date").last(" limit 1");
-                        EnergyData energyWater = dataMapper.selectOne(energyWaterQueryWrapper);
-                        if (ObjectUtil.isEmpty(energyWater)) {
-                            jsonObject.put("buildName", basePigpen1.getBuildName());
-                            jsonObject.put("value", 0);
-                            jsonObject.put("id", basePigpen1.getId());
-                        } else {
-                            jsonObject.put("buildName", basePigpen1.getBuildName());
-                            jsonObject.put("value", energyWater.getWaterValue());
-                            jsonObject.put("id", basePigpen1.getId());
-                        }
-                        jsonArray.add(jsonObject);
-                    }
+        basePigpenQueryWrapper.eq("farm_id", farmId).like("other2", id);
+        List<BasePigpen> basePigpenList = basePigpenMapper.selectList(basePigpenQueryWrapper);//得到所有的单元
+        for (BasePigpen basePigpen : basePigpenList) {
+            JSONObject jsonObject = new JSONObject();
+            QueryWrapper<EnergyData> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("farm_id", farmId).eq("unit_id", basePigpen.getId());
+            queryWrapper.select(" IFNULL(SUM(water_value),'0') waterValue");
+            DateTime dateTime = DateUtil.beginOfDay(new Date());
+            queryWrapper.ge("create_date", dateTime);
 
-                }
-
-            }
-        } else {
-            basePigpenQueryWrapper.eq("farm_id", farmId).like("other2", id);
-            List<BasePigpen> basePigpenList = basePigpenMapper.selectList(basePigpenQueryWrapper);//得到所有的单元
-            for (BasePigpen basePigpen : basePigpenList) {
-                JSONObject jsonObject = new JSONObject();
-                QueryWrapper<EnergyData> queryWrapper = new QueryWrapper<>();
-                queryWrapper.eq("farm_id", farmId).eq("unit_id", basePigpen.getId())
-                        .orderByDesc("create_date").last(" limit 1");
-                EnergyData energyWater = dataMapper.selectOne(queryWrapper);
-                if (ObjectUtil.isEmpty(energyWater)) {
-                    jsonObject.put("buildName", basePigpen.getBuildName());
-                    jsonObject.put("value", 0);
-                    jsonObject.put("id", basePigpen.getId());
-                } else {
-                    jsonObject.put("buildName", basePigpen.getBuildName());
-                    jsonObject.put("value", energyWater.getWaterValue());
-                    jsonObject.put("id", basePigpen.getId());
-                }
-                jsonArray.add(jsonObject);
+            EnergyData energyWater = dataMapper.selectOne(queryWrapper);
+            if (ObjectUtil.isEmpty(energyWater)) {
+                jsonObject.put("buildName", basePigpen.getBuildName());
+                jsonObject.put("value", 0);
+                jsonObject.put("id", basePigpen.getId());
+            } else {
+                DecimalFormat df = new DecimalFormat("0.00");
+                jsonObject.put("buildName", basePigpen.getBuildName());
+                jsonObject.put("value",df.format(Float.parseFloat(energyWater.getWaterValue())));
+                jsonObject.put("id", basePigpen.getId());
             }
-
+            jsonArray.add(jsonObject);
         }
-        return new Result(ResultCode.SUCCESS,jsonArray);
+
+
+        return new Result(ResultCode.SUCCESS, jsonArray);
     }
 
     @Override
@@ -135,13 +107,8 @@ public class EnergyWaterServiceImpl extends ServiceImpl<EnergyWaterMapper, Energ
         //本年
         else if ("3".equals(type)) {
             DateTime dateTime = DateUtil.beginOfYear(new Date());
-            queryWrapper.ge("create_date",dateTime);
+            queryWrapper.ge("create_date", dateTime);
             List<EnergyWaterDataVo> energyWaterDataVos = dataMapper.listYear3(queryWrapper);
-            for (EnergyWaterDataVo energyWaterDataVo : energyWaterDataVos) {
-                if (energyWaterDataVo.getWaterValue() == null || energyWaterDataVo.getWaterValue() == "") {
-                    energyWaterDataVo.setWaterValue("0");
-                }
-            }
             energyWaterList = dataMapper.listYear3(queryWrapper);
         }
         //本月
@@ -156,13 +123,8 @@ public class EnergyWaterServiceImpl extends ServiceImpl<EnergyWaterMapper, Energ
             calendar.set(Calendar.DATE, calendar.get(Calendar.DATE) - 7);
             queryWrapper.ge("create_date", calendar.getTime());
             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);
+        return new Result(ResultCode.SUCCESS, energyWaterList);
     }
 }

huimv-admin/src/main/java/com/huimv/admin/timer/EnergyTimer.java

@@ -34,7 +34,7 @@ public class EnergyTimer {
             energyData.setCreateDate(new Date());
             energyData.setFarmId(energyEnvDevice.getFarmId());
             energyData.setUnitId(energyEnvDevice.getUnitId());
-            energyData.setFeedValue(NumberUtils.getNum(80, 100, 1));
+            energyData.setFeedValue(NumberUtils.getNum(1, 10, 1));
             energyData.setWaterValue(NumberUtils.getNum(1, 5, 1));
             energyData.setGasValue(NumberUtils.getNum(1, 5, 1));
             energyData.setElectricityValue(NumberUtils.getNum(5, 10, 1));

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

@@ -25,15 +25,15 @@
         <result column="other3" property="other3"/>
     </resultMap>
     <select id="listDay" resultType="com.huimv.admin.entity.ProdProduction">
-        SELECT Convert((IFNULL(AVG(CFCHL),0)),DECIMAL(10,2)) 'cfchl'
-         ,Convert((IFNULL(AVG(BYCHL),0)),DECIMAL(10,2)) 'bychl',
-         Convert((IFNULL(AVG(FZCHL),0)),DECIMAL(10,2)) 'fzchl',
-         Convert((IFNULL(AVG(QRDPL),0)),DECIMAL(10,2)) 'qrdpl',
-         Convert((IFNULL(AVG(PJWDNZ),0)),DECIMAL(10,2)) 'pjwdnz',
-         Convert((IFNULL(AVG(PJWCZS),0)),DECIMAL(10,2)) 'pjwczs',
-         Convert((IFNULL(AVG(PJWCHZS),0)),DECIMAL(10,2)) 'pjwchzs',
-         Convert((IFNULL(AVG(PJWCZCZS),0)),DECIMAL(10,2)) 'pjwczczs',
-         Convert((IFNULL(AVG(WDNZZS),0)),DECIMAL(10,2)) 'wdnzzs',
+        SELECT Convert((IFNULL(AVG(CFCHL),'0')),DECIMAL(10,2)) 'cfchl'
+         ,Convert((IFNULL(AVG(BYCHL),'0')),DECIMAL(10,2)) 'bychl',
+         Convert((IFNULL(AVG(FZCHL),'0')),DECIMAL(10,2)) 'fzchl',
+         Convert((IFNULL(AVG(QRDPL),'0')),DECIMAL(10,2)) 'qrdpl',
+         Convert((IFNULL(AVG(PJWDNZ),'0')),DECIMAL(10,2)) 'pjwdnz',
+         Convert((IFNULL(AVG(PJWCZS),'0')),DECIMAL(10,2)) 'pjwczs',
+         Convert((IFNULL(AVG(PJWCHZS),'0')),DECIMAL(10,2)) 'pjwchzs',
+         Convert((IFNULL(AVG(PJWCZCZS),'0')),DECIMAL(10,2)) 'pjwczczs',
+         Convert((IFNULL(AVG(WDNZZS),'0')),DECIMAL(10,2)) 'wdnzzs',
          creat_time
          FROM prod_production
          ${ew.customSqlSegment}

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

@@ -22,8 +22,8 @@
         <result column="other3" property="other3" />
     </resultMap>
 <select id="listDay" resultType="com.huimv.admin.entity.ProdStock">
-    select sum(MZCL) 'MZCL',sum(GZCL) 'GZCL',sum(BRZCL) 'BRZCL',sum(BYZCL) 'BYZCL',sum(YFZCL) 'YFZCL',
-    sum(HBZCL) 'HBZCL',sum(RSZCL) 'RSZCL',sum(BRMZCL) 'BRMZCL',sum(KHZCL) 'KHZCL',sum(SPZCL) 'SPZCL',creat_time
+    select IFNULL(sum(MZCL),'0') 'MZCL',IFNULL(sum(GZCL),'0') 'GZCL',IFNULL(sum(BRZCL),'0') 'BRZCL',IFNULL(sum(BYZCL),'0') 'BYZCL',IFNULL(sum(YFZCL),'0') 'YFZCL',
+    IFNULL(sum(HBZCL),'0') 'HBZCL',IFNULL(sum(RSZCL),'0') 'RSZCL',IFNULL(sum(BRMZCL),'0') 'BRMZCL',IFNULL(sum(KHZCL),'0') 'KHZCL',IFNULL(sum(SPZCL),'0') 'SPZCL',creat_time
     from prod_stock
     ${ew.customSqlSegment}
     GROUP BY DATE_FORMAT(creat_time,'%Y-%m-%d')

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

@@ -20,37 +20,37 @@
         <result column="create_date" property="createDate" />
     </resultMap>
     <select id="listPh" resultType="com.huimv.admin.entity.vo.ProCountVo">
-        select Convert((IFNULL(AVG(ph),0)),DECIMAL(10,2)) 'value',create_date,loction_type from prot_data
+        select Convert((IFNULL(AVG(ph),'0')),DECIMAL(10,2)) 'value',create_date,loction_type from prot_data
         ${ew.customSqlSegment}
         group BY DATE_FORMAT(create_date,'%Y-%m-%d')
         ORDER BY create_date ASC
     </select>
     <select id="listCod" resultType="com.huimv.admin.entity.vo.ProCountVo">
-        select Convert((IFNULL(AVG(cod),0)),DECIMAL(10,2)) 'value',create_date,loction_type from prot_data
+        select Convert((IFNULL(AVG(cod),'0')),DECIMAL(10,2)) 'value',create_date,loction_type from prot_data
         ${ew.customSqlSegment}
         group BY DATE_FORMAT(create_date,'%Y-%m-%d')
         ORDER BY create_date ASC
     </select>
     <select id="listNh3n" resultType="com.huimv.admin.entity.vo.ProCountVo">
-        select Convert((IFNULL(AVG(NH3N),0)),DECIMAL(10,2)) 'value',create_date,loction_type from prot_data
+        select Convert((IFNULL(AVG(NH3N),'0')),DECIMAL(10,2)) 'value',create_date,loction_type from prot_data
         ${ew.customSqlSegment}
         group BY DATE_FORMAT(create_date,'%Y-%m-%d')
         ORDER BY create_date ASC
     </select>
     <select id="listTp" resultType="com.huimv.admin.entity.vo.ProCountVo">
-        select Convert((IFNULL(AVG(TP),0)),DECIMAL(10,2)) 'value',create_date,loction_type from prot_data
+        select Convert((IFNULL(AVG(TP),'0')),DECIMAL(10,2)) 'value',create_date,loction_type from prot_data
         ${ew.customSqlSegment}
         group BY DATE_FORMAT(create_date,'%Y-%m-%d')
         ORDER BY create_date ASC
     </select>
     <select id="listTn" resultType="com.huimv.admin.entity.vo.ProCountVo">
-        select Convert((IFNULL(AVG(TN),0)),DECIMAL(10,2)) 'value',create_date,loction_type from prot_data
+        select Convert((IFNULL(AVG(TN),'0')),DECIMAL(10,2)) 'value',create_date,loction_type from prot_data
         ${ew.customSqlSegment}
         group BY DATE_FORMAT(create_date,'%Y-%m-%d')
         ORDER BY create_date ASC
     </select>
     <select id="listFlow" resultType="com.huimv.admin.entity.vo.ProCountVo">
-        select Convert((IFNULL(AVG(FLOW),0)),DECIMAL(10,2)) 'value',create_date,loction_type from prot_data
+        select Convert((IFNULL(AVG(FLOW),'0')),DECIMAL(10,2)) 'value',create_date,loction_type from prot_data
         ${ew.customSqlSegment}
         group BY DATE_FORMAT(create_date,'%Y-%m-%d')
         ORDER BY create_date ASC
@@ -58,7 +58,7 @@
 
     <!--大屏-->
     <select id="flowCount" resultType="com.huimv.admin.entity.ProtData">
-        select Convert((IFNULL(sum(FLOW),0)),DECIMAL(10,2)) 'flow',create_date,loction_type from prot_data
+        select Convert((IFNULL(sum(FLOW),'0')),DECIMAL(10,2)) 'flow',create_date,loction_type from prot_data
         ${ew.customSqlSegment}
         group BY DATE_FORMAT(create_date,'%Y')
     </select>