排名修改

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

@@ -2,6 +2,7 @@ package com.huimv.admin.service.impl;
 
 import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONException;
 import com.alibaba.fastjson.JSONObject;
@@ -262,8 +263,33 @@ public class EnergyDataServiceImpl extends ServiceImpl<EnergyDataMapper, EnergyD
                 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) {
+                QueryWrapper<BasePigpen> queryWrapper = new QueryWrapper<>();
+                queryWrapper.eq("farm_id",farmId).in("other2",basePigpens);
+                List<BasePigpen> basePigpens1 = basePigpenMapper.selectList(queryWrapper);//得到所有下属的楼层和单元
+                System.out.println(basePigpens1);
+                for (BasePigpen basePigpen : basePigpens1) { //查找数据，到单元层次
+                    QueryWrapper<EnergyData> dataQueryWrapper = new QueryWrapper<>();
+                    dataQueryWrapper.eq("farm_id", farmId).eq("unit_id", basePigpen.getId())
+                            .between("create_date", startTime, endTime);
+                    dataQueryWrapper.select(
+                            "IFNULL(SUM(water_value),'0') waterValue  "
+                    );
+                    EnergyData energyData = dataMapper.selectOne(dataQueryWrapper);
+                    if (ObjectUtil.isNotEmpty(energyData)) {
+                        value = value + Float.parseFloat(energyData.getWaterValue());
+                        QueryWrapper<BasePigpen> queryWrapper1 = new QueryWrapper<>();
+                        queryWrapper1.eq("id", basePigpen.getParentId()).eq("farm_id", farmId);
+                        BasePigpen basePigpen1 = basePigpenMapper.selectOne(queryWrapper1);
+                        JSONObject jsonObject = new JSONObject();
+                        jsonObject.put("value", value);
+                        jsonObject.put("buildName", basePigpen1.getBuildName());
+                        jsonArray.add(jsonObject);
+                        value = 0.00f;
+                    }
+                }
+               /* 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);//得到所有的楼层
@@ -289,7 +315,7 @@ public class EnergyDataServiceImpl extends ServiceImpl<EnergyDataMapper, EnergyD
                         jsonArray.add(jsonObject);
                         value = 0.00f;
                     }
-                }
+                }*/
                 JSONArray arraySort = jsonArraySort(jsonArray, "value", true);
                 return new Result(ResultCode.SUCCESS, arraySort);
             }
@@ -297,34 +323,35 @@ public class EnergyDataServiceImpl extends ServiceImpl<EnergyDataMapper, EnergyD
             else if ("3".equals(timeType)) {
                 DateTime dateTime = DateUtil.beginOfYear(new Date());
                 basePigpenQueryWrapper.eq("parent_id", 0);
+                Float value = 0.00f;
                 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);
-                            value = value + Float.parseFloat(energyData.getWaterValue()); //把所有单元的值相加
+                    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())
+                                .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());
+                            QueryWrapper<BasePigpen> queryWrapper1 = new QueryWrapper<>();
+                            queryWrapper1.eq("id", pigpen.getParentId()).eq("farm_id", farmId);
+                            BasePigpen basePigpen1 = basePigpenMapper.selectOne(queryWrapper1);
+                            JSONObject jsonObject = new JSONObject();
+                            jsonObject.put("value", value);
+                            jsonObject.put("buildName", basePigpen1.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);
             }
@@ -557,23 +584,28 @@ public class EnergyDataServiceImpl extends ServiceImpl<EnergyDataMapper, EnergyD
                 List<BasePigpen> basePigpens = basePigpenMapper.selectList(basePigpenQueryWrapper);//得到所有的栋舍
                 for (BasePigpen basePigpen : basePigpens) {
                     QueryWrapper<BasePigpen> queryWrapper = new QueryWrapper<>();
-                    queryWrapper.eq("farm_id", farmId).eq("parent_id", basePigpen.getId()).eq("f_type", 2);
+                    queryWrapper.eq("farm_id", farmId).like("other2",basePigpen.getId());
                     List<BasePigpen> pigpens = basePigpenMapper.selectList(queryWrapper);//得到所有的楼层
                     Float value = 0.00f;
                     for (BasePigpen pigpen : pigpens) {
                         JSONObject jsonObject = new JSONObject();
                         QueryWrapper<EnergyData> dataQueryWrapper = new QueryWrapper<>();
                         dataQueryWrapper.eq("farm_id", farmId).eq("unit_id", pigpen.getId())
-                                .between("create_date", startTime, endTime);
+                                .between("create_date", startTime,endTime);
                         dataQueryWrapper.select(
                                 "IFNULL(SUM(feed_value),0) feedValue  "
                         );
                         EnergyData energyData = dataMapper.selectOne(dataQueryWrapper);
-                        value = value + Float.parseFloat(energyData.getFeedValue()); //所有的层数据相加
-                        jsonObject.put("value", value);
-                        jsonObject.put("buildName", pigpen.getBuildName());
-                        jsonArray.add(jsonObject);
-                        value = 0.00f;
+                        if (Float.parseFloat(energyData.getFeedValue())!=0.0f) {
+                            value = value + Float.parseFloat(energyData.getFeedValue());
+                            QueryWrapper<BasePigpen> queryWrapper1 = new QueryWrapper<>();
+                            queryWrapper1.eq("id", pigpen.getParentId()).eq("farm_id", farmId);
+                            BasePigpen basePigpen1 = basePigpenMapper.selectOne(queryWrapper1);
+                            jsonObject.put("value", value);
+                            jsonObject.put("buildName", basePigpen1.getBuildName());
+                            jsonArray.add(jsonObject);
+                            value = 0.00f;
+                        }
                     }
                 }
                 JSONArray arraySort = jsonArraySort(jsonArray, "value", true);
@@ -586,7 +618,7 @@ public class EnergyDataServiceImpl extends ServiceImpl<EnergyDataMapper, EnergyD
                 List<BasePigpen> basePigpens = basePigpenMapper.selectList(basePigpenQueryWrapper);//得到所有的栋舍
                 for (BasePigpen basePigpen : basePigpens) {
                     QueryWrapper<BasePigpen> queryWrapper = new QueryWrapper<>();
-                    queryWrapper.eq("farm_id", farmId).eq("parent_id", basePigpen.getId()).eq("f_type", 2);
+                    queryWrapper.eq("farm_id", farmId).like("other2",basePigpen.getId());
                     List<BasePigpen> pigpens = basePigpenMapper.selectList(queryWrapper);//得到所有的楼层
                     Float value = 0.00f;
                     for (BasePigpen pigpen : pigpens) {
@@ -598,11 +630,16 @@ public class EnergyDataServiceImpl extends ServiceImpl<EnergyDataMapper, EnergyD
                                 "IFNULL(SUM(feed_value),0) feedValue  "
                         );
                         EnergyData energyData = dataMapper.selectOne(dataQueryWrapper);
-                        value = value + Float.parseFloat(energyData.getFeedValue()); //所有的层数据相加
-                        jsonObject.put("value", value);
-                        jsonObject.put("buildName", pigpen.getBuildName());
-                        jsonArray.add(jsonObject);
-                        value = 0.00f;
+                        if (Float.parseFloat(energyData.getFeedValue())!=0.0f) {
+                            value = value + Float.parseFloat(energyData.getFeedValue());
+                            QueryWrapper<BasePigpen> queryWrapper1 = new QueryWrapper<>();
+                            queryWrapper1.eq("id", pigpen.getParentId()).eq("farm_id", farmId);
+                            BasePigpen basePigpen1 = basePigpenMapper.selectOne(queryWrapper1);
+                            jsonObject.put("value", value);
+                            jsonObject.put("buildName", basePigpen1.getBuildName());
+                            jsonArray.add(jsonObject);
+                            value = 0.00f;
+                        }
                     }
                 }
                 JSONArray arraySort = jsonArraySort(jsonArray, "value", true);
@@ -615,23 +652,28 @@ public class EnergyDataServiceImpl extends ServiceImpl<EnergyDataMapper, EnergyD
                 List<BasePigpen> basePigpens = basePigpenMapper.selectList(basePigpenQueryWrapper);//得到所有的栋舍
                 for (BasePigpen basePigpen : basePigpens) {
                     QueryWrapper<BasePigpen> queryWrapper = new QueryWrapper<>();
-                    queryWrapper.eq("farm_id", farmId).eq("parent_id", basePigpen.getId()).eq("f_type", 2);
+                    queryWrapper.eq("farm_id", farmId).like("other2",basePigpen.getId());
                     List<BasePigpen> pigpens = basePigpenMapper.selectList(queryWrapper);//得到所有的楼层
                     Float value = 0.00f;
                     for (BasePigpen pigpen : pigpens) {
                         JSONObject jsonObject = new JSONObject();
                         QueryWrapper<EnergyData> dataQueryWrapper = new QueryWrapper<>();
                         dataQueryWrapper.eq("farm_id", farmId).eq("unit_id", pigpen.getId())
-                                .ge("create_date", timesMonthmorning);
+                                .ge("create_date",timesMonthmorning);
                         dataQueryWrapper.select(
                                 "IFNULL(SUM(feed_value),0) feedValue  "
                         );
                         EnergyData energyData = dataMapper.selectOne(dataQueryWrapper);
-                        value = value + Float.parseFloat(energyData.getFeedValue()); //所有的层数据相加
-                        jsonObject.put("value", value);
-                        jsonObject.put("buildName", pigpen.getBuildName());
-                        jsonArray.add(jsonObject);
-                        value = 0.00f;
+                        if (Float.parseFloat(energyData.getFeedValue())!=0.0f) {
+                            value = value + Float.parseFloat(energyData.getFeedValue());
+                            QueryWrapper<BasePigpen> queryWrapper1 = new QueryWrapper<>();
+                            queryWrapper1.eq("id", pigpen.getParentId()).eq("farm_id", farmId);
+                            BasePigpen basePigpen1 = basePigpenMapper.selectOne(queryWrapper1);
+                            jsonObject.put("value", value);
+                            jsonObject.put("buildName", basePigpen1.getBuildName());
+                            jsonArray.add(jsonObject);
+                            value = 0.00f;
+                        }
                     }
                 }
                 JSONArray arraySort = jsonArraySort(jsonArray, "value", true);
@@ -645,23 +687,28 @@ public class EnergyDataServiceImpl extends ServiceImpl<EnergyDataMapper, EnergyD
                 List<BasePigpen> basePigpens = basePigpenMapper.selectList(basePigpenQueryWrapper);//得到所有的栋舍
                 for (BasePigpen basePigpen : basePigpens) {
                     QueryWrapper<BasePigpen> queryWrapper = new QueryWrapper<>();
-                    queryWrapper.eq("farm_id", farmId).eq("parent_id", basePigpen.getId()).eq("f_type", 2);
+                    queryWrapper.eq("farm_id", farmId).like("other2",basePigpen.getId());
                     List<BasePigpen> pigpens = basePigpenMapper.selectList(queryWrapper);//得到所有的楼层
                     Float value = 0.00f;
                     for (BasePigpen pigpen : pigpens) {
                         JSONObject jsonObject = new JSONObject();
                         QueryWrapper<EnergyData> dataQueryWrapper = new QueryWrapper<>();
                         dataQueryWrapper.eq("farm_id", farmId).eq("unit_id", pigpen.getId())
-                                .ge("create_date", calendar.getTime());
+                                .ge("create_date",calendar.getTime());
                         dataQueryWrapper.select(
                                 "IFNULL(SUM(feed_value),0) feedValue  "
                         );
                         EnergyData energyData = dataMapper.selectOne(dataQueryWrapper);
-                        value = value + Float.parseFloat(energyData.getFeedValue()); //所有的层数据相加
-                        jsonObject.put("value", value);
-                        jsonObject.put("buildName", pigpen.getBuildName());
-                        jsonArray.add(jsonObject);
-                        value = 0.00f;
+                        if (Float.parseFloat(energyData.getFeedValue())!=0.0f) {
+                            value = value + Float.parseFloat(energyData.getFeedValue());
+                            QueryWrapper<BasePigpen> queryWrapper1 = new QueryWrapper<>();
+                            queryWrapper1.eq("id", pigpen.getParentId()).eq("farm_id", farmId);
+                            BasePigpen basePigpen1 = basePigpenMapper.selectOne(queryWrapper1);
+                            jsonObject.put("value", value);
+                            jsonObject.put("buildName", basePigpen1.getBuildName());
+                            jsonArray.add(jsonObject);
+                            value = 0.00f;
+                        }
                     }
                 }
                 JSONArray arraySort = jsonArraySort(jsonArray, "value", true);
@@ -678,23 +725,28 @@ public class EnergyDataServiceImpl extends ServiceImpl<EnergyDataMapper, EnergyD
                 List<BasePigpen> basePigpens = basePigpenMapper.selectList(basePigpenQueryWrapper);//得到所有的栋舍
                 for (BasePigpen basePigpen : basePigpens) {
                     QueryWrapper<BasePigpen> queryWrapper = new QueryWrapper<>();
-                    queryWrapper.eq("farm_id", farmId).eq("parent_id", basePigpen.getId()).eq("f_type", 2);
+                    queryWrapper.eq("farm_id", farmId).like("other2",basePigpen.getId());
                     List<BasePigpen> pigpens = basePigpenMapper.selectList(queryWrapper);//得到所有的楼层
                     Float value = 0.00f;
                     for (BasePigpen pigpen : pigpens) {
                         JSONObject jsonObject = new JSONObject();
                         QueryWrapper<EnergyData> dataQueryWrapper = new QueryWrapper<>();
                         dataQueryWrapper.eq("farm_id", farmId).eq("unit_id", pigpen.getId())
-                                .between("create_date", startTime, endTime);
+                                .between("create_date", startTime,endTime);
                         dataQueryWrapper.select(
                                 "IFNULL(SUM(gas_value),0) gasValue  "
                         );
                         EnergyData energyData = dataMapper.selectOne(dataQueryWrapper);
-                        value = value + Float.parseFloat(energyData.getGasValue()); //所有的层数据相加
-                        jsonObject.put("value", value);
-                        jsonObject.put("buildName", pigpen.getBuildName());
-                        jsonArray.add(jsonObject);
-                        value = 0.00f;
+                        if (Float.parseFloat(energyData.getGasValue())!=0.0f) {
+                            value = value + Float.parseFloat(energyData.getGasValue());
+                            QueryWrapper<BasePigpen> queryWrapper1 = new QueryWrapper<>();
+                            queryWrapper1.eq("id", pigpen.getParentId()).eq("farm_id", farmId);
+                            BasePigpen basePigpen1 = basePigpenMapper.selectOne(queryWrapper1);
+                            jsonObject.put("value", value);
+                            jsonObject.put("buildName", basePigpen1.getBuildName());
+                            jsonArray.add(jsonObject);
+                            value = 0.00f;
+                        }
                     }
                 }
                 JSONArray arraySort = jsonArraySort(jsonArray, "value", true);
@@ -707,7 +759,7 @@ public class EnergyDataServiceImpl extends ServiceImpl<EnergyDataMapper, EnergyD
                 List<BasePigpen> basePigpens = basePigpenMapper.selectList(basePigpenQueryWrapper);//得到所有的栋舍
                 for (BasePigpen basePigpen : basePigpens) {
                     QueryWrapper<BasePigpen> queryWrapper = new QueryWrapper<>();
-                    queryWrapper.eq("farm_id", farmId).eq("parent_id", basePigpen.getId()).eq("f_type", 2);
+                    queryWrapper.eq("farm_id", farmId).like("other2",basePigpen.getId());
                     List<BasePigpen> pigpens = basePigpenMapper.selectList(queryWrapper);//得到所有的楼层
                     Float value = 0.00f;
                     for (BasePigpen pigpen : pigpens) {
@@ -719,11 +771,16 @@ public class EnergyDataServiceImpl extends ServiceImpl<EnergyDataMapper, EnergyD
                                 "IFNULL(SUM(gas_value),0) gasValue  "
                         );
                         EnergyData energyData = dataMapper.selectOne(dataQueryWrapper);
-                        value = value + Float.parseFloat(energyData.getGasValue()); //所有的层数据相加
-                        jsonObject.put("value", value);
-                        jsonObject.put("buildName", pigpen.getBuildName());
-                        jsonArray.add(jsonObject);
-                        value = 0.00f;
+                        if (Float.parseFloat(energyData.getGasValue())!=0.0f) {
+                            value = value + Float.parseFloat(energyData.getGasValue());
+                            QueryWrapper<BasePigpen> queryWrapper1 = new QueryWrapper<>();
+                            queryWrapper1.eq("id", pigpen.getParentId()).eq("farm_id", farmId);
+                            BasePigpen basePigpen1 = basePigpenMapper.selectOne(queryWrapper1);
+                            jsonObject.put("value", value);
+                            jsonObject.put("buildName", basePigpen1.getBuildName());
+                            jsonArray.add(jsonObject);
+                            value = 0.00f;
+                        }
                     }
                 }
                 JSONArray arraySort = jsonArraySort(jsonArray, "value", true);
@@ -736,7 +793,7 @@ public class EnergyDataServiceImpl extends ServiceImpl<EnergyDataMapper, EnergyD
                 List<BasePigpen> basePigpens = basePigpenMapper.selectList(basePigpenQueryWrapper);//得到所有的栋舍
                 for (BasePigpen basePigpen : basePigpens) {
                     QueryWrapper<BasePigpen> queryWrapper = new QueryWrapper<>();
-                    queryWrapper.eq("farm_id", farmId).eq("parent_id", basePigpen.getId()).eq("f_type", 2);
+                    queryWrapper.eq("farm_id", farmId).like("other2",basePigpen.getId());
                     List<BasePigpen> pigpens = basePigpenMapper.selectList(queryWrapper);//得到所有的楼层
                     Float value = 0.00f;
                     for (BasePigpen pigpen : pigpens) {
@@ -748,11 +805,16 @@ public class EnergyDataServiceImpl extends ServiceImpl<EnergyDataMapper, EnergyD
                                 "IFNULL(SUM(gas_value),0) gasValue  "
                         );
                         EnergyData energyData = dataMapper.selectOne(dataQueryWrapper);
-                        value = value + Float.parseFloat(energyData.getGasValue()); //所有的层数据相加
-                        jsonObject.put("value", value);
-                        jsonObject.put("buildName", pigpen.getBuildName());
-                        jsonArray.add(jsonObject);
-                        value = 0.00f;
+                        if (Float.parseFloat(energyData.getGasValue())!=0.0f) {
+                            value = value + Float.parseFloat(energyData.getGasValue());
+                            QueryWrapper<BasePigpen> queryWrapper1 = new QueryWrapper<>();
+                            queryWrapper1.eq("id", pigpen.getParentId()).eq("farm_id", farmId);
+                            BasePigpen basePigpen1 = basePigpenMapper.selectOne(queryWrapper1);
+                            jsonObject.put("value", value);
+                            jsonObject.put("buildName", basePigpen1.getBuildName());
+                            jsonArray.add(jsonObject);
+                            value = 0.00f;
+                        }
                     }
                 }
                 JSONArray arraySort = jsonArraySort(jsonArray, "value", true);
@@ -763,10 +825,11 @@ public class EnergyDataServiceImpl extends ServiceImpl<EnergyDataMapper, EnergyD
                 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).eq("parent_id", basePigpen.getId()).eq("f_type", 2);
+                    queryWrapper.eq("farm_id", farmId).like("other2",basePigpen.getId());
                     List<BasePigpen> pigpens = basePigpenMapper.selectList(queryWrapper);//得到所有的楼层
                     Float value = 0.00f;
                     for (BasePigpen pigpen : pigpens) {
@@ -778,11 +841,16 @@ public class EnergyDataServiceImpl extends ServiceImpl<EnergyDataMapper, EnergyD
                                 "IFNULL(SUM(gas_value),0) gasValue  "
                         );
                         EnergyData energyData = dataMapper.selectOne(dataQueryWrapper);
-                        value = value + Float.parseFloat(energyData.getGasValue()); //所有的层数据相加
-                        jsonObject.put("value", value);
-                        jsonObject.put("buildName", pigpen.getBuildName());
-                        jsonArray.add(jsonObject);
-                        value = 0.00f;
+                        if (Float.parseFloat(energyData.getGasValue())!=0.0f) {
+                            value = value + Float.parseFloat(energyData.getGasValue());
+                            QueryWrapper<BasePigpen> queryWrapper1 = new QueryWrapper<>();
+                            queryWrapper1.eq("id", pigpen.getParentId()).eq("farm_id", farmId);
+                            BasePigpen basePigpen1 = basePigpenMapper.selectOne(queryWrapper1);
+                            jsonObject.put("value", value);
+                            jsonObject.put("buildName", basePigpen1.getBuildName());
+                            jsonArray.add(jsonObject);
+                            value = 0.00f;
+                        }
                     }
                 }
                 JSONArray arraySort = jsonArraySort(jsonArray, "value", true);