生物防控人员

huimv-admin/src/main/java/com/huimv/admin/service/impl/GasDataServiceImpl.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.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -85,25 +86,45 @@ public class GasDataServiceImpl extends ServiceImpl<GasDataMapper, GasData> impl
         queryWrapper.eq("farm_id", farmId).eq("loction_type", 1).orderByDesc("create_time")
                 .last(" limit 1");
         GasData gasData = dataMapper.selectOne(queryWrapper);
-        jsonObject.put("pigpen", gasData);
+        if (ObjectUtil.isEmpty(gasData)){
+            jsonObject.put("pigpen", new GasData());
+        }else {
+            jsonObject.put("pigpen", gasData);
+        }
+
 
         QueryWrapper<GasData> queryWrapper2 = new QueryWrapper<>();
         queryWrapper2.eq("farm_id", farmId).eq("loction_type", 2).orderByDesc("create_time")
                 .last(" limit 1");
         GasData gasData2 = dataMapper.selectOne(queryWrapper2);
-        jsonObject.put("above", gasData2);
+        if (ObjectUtil.isEmpty(gasData2)){
+            jsonObject.put("above", new GasData());
+        }else {
+            jsonObject.put("above", gasData2);
+        }
+
 
         QueryWrapper<GasData> queryWrapper3 = new QueryWrapper<>();
         queryWrapper3.eq("farm_id", farmId).eq("loction_type", 3).orderByDesc("create_time")
                 .last(" limit 1");
         GasData gasData3 = dataMapper.selectOne(queryWrapper3);
-        jsonObject.put("under", gasData3);
+        if (ObjectUtil.isEmpty(gasData3)){
+            jsonObject.put("under", new GasData());
+        }else {
+            jsonObject.put("under", gasData3);
+        }
+
 
         QueryWrapper<GasData> queryWrapper4 = new QueryWrapper<>();
         queryWrapper4.eq("farm_id", farmId).eq("loction_type", 4).orderByDesc("create_time")
                 .last(" limit 1");
         GasData gasData4 = dataMapper.selectOne(queryWrapper4);
-        jsonObject.put("people", gasData4);
+        if (ObjectUtil.isEmpty(gasData4)){
+            jsonObject.put("people", new GasData());
+        }else {
+            jsonObject.put("people", gasData4);
+        }
+
 
         return new Result(ResultCode.SUCCESS, jsonObject);
     }