排名修改

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

@@ -83,31 +83,31 @@ public class EnergyFeedServiceImpl extends ServiceImpl<EnergyFeedMapper, EnergyF
                 }
             }
         } 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);
+                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) {
-                    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());
+                    EnergyData energyGas = dataMapper.selectOne(queryWrapper1);
+
+                    if (ObjectUtil.isNotEmpty(energyGas)) {
+                        count = count + Float.parseFloat(energyGas.getFeedValue());
                     } else {
-                        jsonObject.put("buildName", basePigpen.getBuildName());
-                        jsonObject.put("value", energyFeed.getFeedValue());
-                        jsonObject.put("id", basePigpen.getId());
+                        count = count + 0.00f;
                     }
-
-                    jsonArray.add(jsonObject);
                 }
+                jsonObject.put("value", count);
+                jsonObject.put("buildName", basePigpen.getBuildName());
+                jsonObject.put("id", basePigpen.getId());
+                jsonArray.add(jsonObject);
 
             }
         }

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

@@ -85,31 +85,31 @@ public class EnergyGasServiceImpl extends ServiceImpl<EnergyGasMapper, EnergyGas
                 }
             }
         } 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);
+                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) {
-                    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());
+
+                    if (ObjectUtil.isNotEmpty(energyGas)) {
+                        count = count + Float.parseFloat(energyGas.getGasValue());
                     } else {
-                        jsonObject.put("buildName", basePigpen.getBuildName());
-                        jsonObject.put("value", energyGas.getGasValue());
-                        jsonObject.put("id", basePigpen.getId());
+                        count = count + 0.00f;
                     }
-
-                    jsonArray.add(jsonObject);
                 }
+                jsonObject.put("value", count);
+                jsonObject.put("buildName", basePigpen.getBuildName());
+                jsonObject.put("id", basePigpen.getId());
+                jsonArray.add(jsonObject);
 
             }
         }