diff --git a/src/main/java/com/ycwl/basic/repository/DeviceRepository.java b/src/main/java/com/ycwl/basic/repository/DeviceRepository.java index f6bc66e..c72e634 100644 --- a/src/main/java/com/ycwl/basic/repository/DeviceRepository.java +++ b/src/main/java/com/ycwl/basic/repository/DeviceRepository.java @@ -29,6 +29,9 @@ public class DeviceRepository { DeviceEntity device = deviceMapper.getByDeviceId(deviceId); if (null != device) { redisTemplate.opsForValue().set(String.format(DEVICE_CACHE_KEY, deviceId), JSONObject.toJSONString(device)); + if (!Integer.valueOf(1).equals(device.getStatus())) { + return null; + } } return device; } @@ -43,6 +46,9 @@ public class DeviceRepository { } if (null != device) { redisTemplate.opsForValue().set(String.format(DEVICE_CACHE_KEY, deviceNo), JSONObject.toJSONString(device)); + if (!Integer.valueOf(1).equals(device.getStatus())) { + return null; + } } else { redisTemplate.opsForValue().set(String.format(DEVICE_CACHE_KEY, deviceNo), "null", 60L, TimeUnit.SECONDS); } diff --git a/src/main/java/com/ycwl/basic/service/impl/pc/DeviceServiceImpl.java b/src/main/java/com/ycwl/basic/service/impl/pc/DeviceServiceImpl.java index f54027a..0465fd7 100644 --- a/src/main/java/com/ycwl/basic/service/impl/pc/DeviceServiceImpl.java +++ b/src/main/java/com/ycwl/basic/service/impl/pc/DeviceServiceImpl.java @@ -72,7 +72,10 @@ public class DeviceServiceImpl implements DeviceService { @Override public ApiResponse updateStatus(Long id) { - return ApiResponse.success(deviceMapper.updateStatus(id)); + deviceRepository.clearDeviceCache(id); + deviceMapper.updateStatus(id); + deviceRepository.clearDeviceCache(id); + return ApiResponse.success(1); } @Override