diff --git a/src/main/java/com/isu/gaswellwatch/service/impl/DeviceServiceImpl.java b/src/main/java/com/isu/gaswellwatch/service/impl/DeviceServiceImpl.java
index 93c6eb8..b8b239b 100644
--- a/src/main/java/com/isu/gaswellwatch/service/impl/DeviceServiceImpl.java
+++ b/src/main/java/com/isu/gaswellwatch/service/impl/DeviceServiceImpl.java
@@ -59,15 +59,36 @@ public class DeviceServiceImpl extends ServiceImpl<DeviceDao, Device> implements
 
             for (DeviceVO deviceVO : deviceVOList) {
                 String deviceKey = PersistenceHandler.DEVICE_DATA_CACHE + deviceVO.getId();
-                deviceVO.setCasPressure(Objects.requireNonNull(redisTemplate.opsForHash().get(deviceKey, "casPressure")).toString());
-                deviceVO.setOilPressure(Objects.requireNonNull(redisTemplate.opsForHash().get(deviceKey, "oilPressure")).toString());
-                deviceVO.setPrePressure(Objects.requireNonNull(redisTemplate.opsForHash().get(deviceKey, "prePressure")).toString());
-                deviceVO.setOnline(Objects.requireNonNull(redisTemplate.opsForHash().get(deviceKey, "online")).toString());
-                Dictionary runMode = runModeMap.get(Objects.requireNonNull(redisTemplate.opsForHash().get(deviceKey, "runMode")).toString());
-                deviceVO.setRunMode(runMode==null?"":runMode.getName());
-                Dictionary plugStatus = plugStatusMap.get(Objects.requireNonNull(redisTemplate.opsForHash().get(deviceKey, "plugStatus")).toString());
-                deviceVO.setPlugStatus(plugStatus==null?"":plugStatus.getName());
-                deviceVO.setWellCtl(Objects.requireNonNull(redisTemplate.opsForHash().get(deviceKey, "gas_status")).toString());
+                Object casPressure = redisTemplate.opsForHash().get(deviceKey, "casPressure");
+                deviceVO.setCasPressure(casPressure == null ? "" : casPressure.toString());
+
+                Object oilPressure = redisTemplate.opsForHash().get(deviceKey, "oilPressure");
+                deviceVO.setOilPressure(oilPressure == null ? "" : oilPressure.toString());
+
+                Object prePressure = redisTemplate.opsForHash().get(deviceKey, "prePressure");
+                deviceVO.setPrePressure(prePressure == null ? "" : prePressure.toString());
+
+                Object online = redisTemplate.opsForHash().get(deviceKey, "online");
+                deviceVO.setOnline(online == null ? "" : online.toString());
+
+                Object gas_status = redisTemplate.opsForHash().get(deviceKey, "gas_status");
+                deviceVO.setWellCtl(gas_status == null ? "" : gas_status.toString());
+
+                Object runMode = redisTemplate.opsForHash().get(deviceKey, "runMode");
+                if(runMode==null) {
+                    deviceVO.setRunMode("");
+                }else {
+                    Dictionary runMode1 = runModeMap.get(runMode.toString());
+                    deviceVO.setRunMode(runMode1==null?"":runMode1.getName());
+                }
+                Object plugStatus = redisTemplate.opsForHash().get(deviceKey, "plugStatus");
+                if(plugStatus==null) {
+                    deviceVO.setPlugStatus("");
+                }else {
+                    Dictionary plugStatus1 = plugStatusMap.get(plugStatus.toString());
+                    deviceVO.setPlugStatus(plugStatus1==null?"":plugStatus1.getName());
+                }
+
             }
         }
         return ConverterUtil.convertPage(page, DeviceVO.class);