华统大屏接口修改13

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

@@ -39,7 +39,10 @@ public class EnergyTimer {
         for (EnergyEnvDevice energyEnvDevice : energyEnvDevices) {
             QueryWrapper<BasePigpen> basePigpenQueryWrapper = new QueryWrapper<>();
             basePigpenQueryWrapper.eq("id", energyEnvDevice.getUnitId()).eq("farm_id", energyEnvDevice.getFarmId());
-            BasePigpen basePigpen = basePigpenMapper.selectOne(basePigpenQueryWrapper);
+            BasePigpen basePigpen1 = basePigpenMapper.selectOne(basePigpenQueryWrapper);
+            QueryWrapper<BasePigpen> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("id", basePigpen1.getParentId());
+            BasePigpen basePigpen = basePigpenMapper.selectOne(queryWrapper);
 
             String feed = NumberUtils.getNumFloat2(6.00,6.50);
             String water = NumberUtils.getNumFloat2(0.08,0.15);
@@ -74,7 +77,7 @@ public class EnergyTimer {
                 EnergyWarningInfo warningInfo = new EnergyWarningInfo();
                 warningInfo.setWarningType(1);
                 warningInfo.setWarningContent("今日累计用水量" + format + "t,超过阈值");
-                warningInfo.setUnitName(basePigpen.getBuildName());
+                warningInfo.setUnitName(basePigpen1.getBuildName());
                 warningInfo.setUnitId(energyEnvDevice.getUnitId());
                 warningInfo.setDeviceId(energyEnvDevice.getId());
                 warningInfo.setDate(new Date());
@@ -89,7 +92,7 @@ public class EnergyTimer {
                 EnergyWarningInfo warningInfo = new EnergyWarningInfo();
                 warningInfo.setWarningType(2);
                 warningInfo.setWarningContent("今日累计用电量" + format + "kw/h,超过阈值");
-                warningInfo.setUnitName(basePigpen.getBuildName());
+                warningInfo.setUnitName(basePigpen1.getBuildName());
                 warningInfo.setUnitId(energyEnvDevice.getUnitId());
                 warningInfo.setDeviceId(energyEnvDevice.getId());
                 warningInfo.setDate(new Date());