修改

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

@@ -301,7 +301,7 @@ 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("update_time", dateTime)
+        tempQueryWrapper.eq("farm_id", farmId).eq("unit_id", unitId).ge("ask_time", dateTime)
                 .orderByDesc("handle_value").last(" limit 1");
         EnvTemp temp = tempMapper.selectOne(tempQueryWrapper);
         if (ObjectUtil.isEmpty(temp)) {
@@ -311,7 +311,7 @@ public class BasePigpenServiceImpl extends ServiceImpl<BasePigpenMapper, BasePig
         }
         QueryWrapper<EnvTemp> tempQueryWrapper1 = new QueryWrapper<>();
 
-        tempQueryWrapper1.eq("farm_id", farmId).eq("unit_id", unitId).ge("update_time", dateTime)
+        tempQueryWrapper1.eq("farm_id", farmId).eq("unit_id", unitId).ge("ask_time", dateTime)
                 .orderByAsc("handle_value").last(" limit 1");
         EnvTemp temp1 = tempMapper.selectOne(tempQueryWrapper1);
         if (ObjectUtil.isEmpty(temp1)) {
@@ -391,7 +391,7 @@ public class BasePigpenServiceImpl extends ServiceImpl<BasePigpenMapper, BasePig
             endTime = endTime + " 23:59:59";
             if ("1".equals(dataType)) {
                 QueryWrapper<EnvTemp> tempQueryWrapper = new QueryWrapper<>();
-                tempQueryWrapper.eq("farm_id", farmId).eq("unit_id", unitId)
+                tempQueryWrapper.eq("farm_id", farmId).eq("unit_id", unitId).eq("chip_code",10011411)
                         .between("ask_time", startTime, endTime).orderByAsc("update_time");
                 List<EnvTemp> envTemps = tempMapper.selectList(tempQueryWrapper);
                 map.put("name", "temp");