环控bug修改

.gitignore

@@ -1,3 +1,3 @@
-/huimv-farm-env/target/
+/humv-farm-env/target/
 .idea
 

src/main/java/com/huimv/admin/service/impl/BasePigpenServiceImpl.java

@@ -301,16 +301,24 @@ public class BasePigpenServiceImpl extends ServiceImpl<BasePigpenMapper, BasePig
 
         DateTime dateTime = DateUtil.beginOfDay(new Date());
         QueryWrapper<EnvTemp> tempQueryWrapper = new QueryWrapper<>();
-        tempQueryWrapper.eq("farm_id", farmId).eq("unit_id", unitId).ge("ask_time", dateTime)
+        tempQueryWrapper.eq("farm_id", farmId).eq("unit_id", unitId).ge("update_time", dateTime)
                 .orderByDesc("handle_value").last(" limit 1");
         EnvTemp temp = tempMapper.selectOne(tempQueryWrapper);
-        jsonObject.put("maxTemp", temp.getHandleValue());
+        if (ObjectUtil.isEmpty(temp)) {
+            jsonObject.put("maxTemp", 0);
+        } else {
+            jsonObject.put("maxTemp", temp.getHandleValue());
+        }
         QueryWrapper<EnvTemp> tempQueryWrapper1 = new QueryWrapper<>();
 
-        tempQueryWrapper1.eq("farm_id", farmId).eq("unit_id", unitId).ge("ask_time", dateTime)
+        tempQueryWrapper1.eq("farm_id", farmId).eq("unit_id", unitId).ge("update_time", dateTime)
                 .orderByAsc("handle_value").last(" limit 1");
         EnvTemp temp1 = tempMapper.selectOne(tempQueryWrapper1);
-        jsonObject.put("minTemp", temp1.getHandleValue());
+        if (ObjectUtil.isEmpty(temp1)) {
+            jsonObject.put("minTemp", 0);
+        } else {
+            jsonObject.put("minTemp", temp1.getHandleValue());
+        }
         return new Result(ResultCode.SUCCESS, jsonObject);
     }