From 5f110d23ecd7cbbaa3a063f7d0171513654ccbc6 Mon Sep 17 00:00:00 2001
From: ZZ <coml_aaron@163.com>
Date: Tue, 23 Nov 2021 10:30:05 +0800
Subject: [PATCH] eliminate: NPE

---
 .../evcs/notification/NotificationEquipChargeStatusTask.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

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<String, Object> 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");