From c41d8e00d0c2d6a6ac5e3d973446d942789b411d Mon Sep 17 00:00:00 2001
From: Lemon <ziao4956@gmail.com>
Date: Tue, 26 Sep 2023 11:39:57 +0800
Subject: [PATCH] =?UTF-8?q?update=20=20=E5=90=8E=E7=AE=A1=E6=9E=AA?=
 =?UTF-8?q?=E5=8F=A3=E5=88=97=E8=A1=A8=E5=8F=AA=E6=9C=89=E5=85=85=E7=94=B5?=
 =?UTF-8?q?=E6=97=B6=E6=89=8D=E6=9F=A5=E8=AF=A2=E5=AE=9E=E6=97=B6=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/PileConnectorInfoServiceImpl.java     | 10 +++++++---
 .../nanrui/domain/NRConnectorInfo.java         |  4 ++--
 .../thirdparty/nanrui/domain/NROrderInfo.java  |  2 +-
 .../thirdparty/nanrui/service/NRService.java   | 12 ++++++++++++
 .../nanrui/service/impl/NRServiceImpl.java     | 18 ++++++++++++++++++
 5 files changed, 40 insertions(+), 6 deletions(-)
 create mode 100644 jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/nanrui/service/NRService.java
 create mode 100644 jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/nanrui/service/impl/NRServiceImpl.java

diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileConnectorInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileConnectorInfoServiceImpl.java
index 69d22eff6..57deacd19 100644
--- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileConnectorInfoServiceImpl.java
+++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileConnectorInfoServiceImpl.java
@@ -13,6 +13,7 @@ import com.jsowell.common.core.domain.ykc.RealTimeMonitorData;
 import com.jsowell.common.core.page.PageResponse;
 import com.jsowell.common.core.redis.RedisCache;
 import com.jsowell.common.enums.ykc.PileConnectorDataBaseStatusEnum;
+import com.jsowell.common.enums.ykc.PileConnectorStatusEnum;
 import com.jsowell.common.enums.ykc.PileStatusEnum;
 import com.jsowell.common.util.DateUtils;
 import com.jsowell.common.util.StringUtils;
@@ -285,9 +286,12 @@ public class PileConnectorInfoServiceImpl implements IPileConnectorInfoService {
             }else {
                 pileConnectorInfoVO.setConnectorQrCodeUrl(getPileConnectorQrCodeUrl(pileConnectorCode)); // 枪口号二维码
             }
-            OrderBasicInfo order = orderBasicInfoService.queryChargingByPileConnectorCode(pileConnectorCode);
-            if (order != null) {
-                pileConnectorInfoVO.setOrderCode(order.getOrderCode());
+            if (StringUtils.equals(String.valueOf(pileConnectorInfoVO.getStatus()), "3")) {
+                // 当枪口状态为充电中时，再去查询实时数据等信息
+                OrderBasicInfo order = orderBasicInfoService.queryChargingByPileConnectorCode(pileConnectorCode);
+                if (order != null) {
+                    pileConnectorInfoVO.setOrderCode(order.getOrderCode());
+                }
             }
         }
 
diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/nanrui/domain/NRConnectorInfo.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/nanrui/domain/NRConnectorInfo.java
index ad6f423b2..cbae89477 100644
--- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/nanrui/domain/NRConnectorInfo.java
+++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/nanrui/domain/NRConnectorInfo.java
@@ -17,7 +17,7 @@ public class NRConnectorInfo {
      * 充电设备接口编码
      */
     @JSONField(name = "ConnectorID")
-    private String connectorID;
+    private String connectorId;
 
     /**
      * 充电设备接口名称
@@ -31,7 +31,7 @@ public class NRConnectorInfo {
      * 2：交流接口插座（模式 3，连接方式 B ）
      * 3：交流接口插头（带枪线，模式 3，连接方式 C）
      * 4：直流接口枪头（带枪线，模式 4）
-     * 5:无线充电座；
+     * 5：无线充电座；
      */
     @JSONField(name = "ConnectorType")
     private Integer connectorType;
diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/nanrui/domain/NROrderInfo.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/nanrui/domain/NROrderInfo.java
index c79271306..ec364552a 100644
--- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/nanrui/domain/NROrderInfo.java
+++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/nanrui/domain/NROrderInfo.java
@@ -22,7 +22,7 @@ public class NROrderInfo {
      * 充电设备接口编码
      */
     @JSONField(name = "ConnectorID")
-    private String connectorID;
+    private String connectorId;
 
     /**
      * 充电业务编号
diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/nanrui/service/NRService.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/nanrui/service/NRService.java
new file mode 100644
index 000000000..3fba0c6d1
--- /dev/null
+++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/nanrui/service/NRService.java
@@ -0,0 +1,12 @@
+package com.jsowell.thirdparty.nanrui.service;
+
+/**
+ * 南瑞Service
+ *
+ * @author Lemon
+ * @Date 2023/9/26 9:17
+ */
+public interface NRService {
+
+    public String notification_stationInfo(String stationId);
+}
diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/nanrui/service/impl/NRServiceImpl.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/nanrui/service/impl/NRServiceImpl.java
new file mode 100644
index 000000000..972f586d7
--- /dev/null
+++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/nanrui/service/impl/NRServiceImpl.java
@@ -0,0 +1,18 @@
+package com.jsowell.thirdparty.nanrui.service.impl;
+
+import com.jsowell.thirdparty.nanrui.service.NRService;
+
+/**
+ * TODO
+ *
+ * @author Lemon
+ * @Date 2023/9/26 9:20
+ */
+public class NRServiceImpl implements NRService {
+    @Override
+    public String notification_stationInfo(String stationId) {
+
+
+        return null;
+    }
+}