diff --git a/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/notification/NotificationEquipChargeStatusTask.java b/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/notification/NotificationEquipChargeStatusTask.java index f903d88c..2a79d6e0 100644 --- a/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/notification/NotificationEquipChargeStatusTask.java +++ b/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/notification/NotificationEquipChargeStatusTask.java @@ -43,7 +43,7 @@ public class NotificationEquipChargeStatusTask extends CoreDispatcher { @Autowired private OrderMappingRepository orderMappingRepository; - private Logger logger = LoggerFactory.getLogger(NotificationEquipChargeStatusTask.class); + private final Logger logger = LoggerFactory.getLogger(NotificationEquipChargeStatusTask.class); @Scheduled(fixedRate = 1000 * 50) public void run() throws IOException { @@ -56,7 +56,8 @@ public class NotificationEquipChargeStatusTask extends CoreDispatcher { final Map cacheGun = REDIS.getCacheMap(gunkey); final String status = cacheGun.get("status").toString(); if (isInteger(status)) { - final String orderkey = cacheGun.get("orderkey").toString(); + String orderkey = (String) cacheGun.get("orderkey"); + if (orderkey == null) continue; EquipChargeStatus equipChargeStatus = new EquipChargeStatus(); final String internetSerialNumber = REDIS.getCacheMapValue(orderkey.replace("order:", "pushOrder:"), "internetSerialNumber");