From 32a5daeeac5120660a32c8194191176e743b459d Mon Sep 17 00:00:00 2001
From: "autumn.g@foxmail.com" <autumn.g@foxmail.com>
Date: Wed, 28 Feb 2024 14:47:47 +0800
Subject: [PATCH] update

---
 .../netty/handler/UploadRealTimeMonitorHandler.java    |  2 +-
 .../com/jsowell/pile/mapper/OrderBasicInfoMapper.java  | 10 ++++++++++
 .../com/jsowell/pile/service/PileRemoteService.java    |  4 ++--
 .../pile/service/impl/OrderBasicInfoServiceImpl.java   |  6 ++++++
 .../pile/service/impl/PileBasicInfoServiceImpl.java    |  2 +-
 .../resources/mapper/pile/OrderBasicInfoMapper.xml     |  8 ++++++++
 6 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/UploadRealTimeMonitorHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/UploadRealTimeMonitorHandler.java
index 241bf784e..7dde53443 100644
--- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/UploadRealTimeMonitorHandler.java
+++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/UploadRealTimeMonitorHandler.java
@@ -26,7 +26,7 @@ import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.TimeUnit;
 
 /**
- * 获取桩上传的实时监测数据
+ * 获取桩上传的实时监测数据 0x13
  *
  * @author JS-ZZA
  * @date 2022/9/19 9:08
diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/mapper/OrderBasicInfoMapper.java b/jsowell-pile/src/main/java/com/jsowell/pile/mapper/OrderBasicInfoMapper.java
index 41af172c2..9b8cf1991 100644
--- a/jsowell-pile/src/main/java/com/jsowell/pile/mapper/OrderBasicInfoMapper.java
+++ b/jsowell-pile/src/main/java/com/jsowell/pile/mapper/OrderBasicInfoMapper.java
@@ -341,4 +341,14 @@ public interface OrderBasicInfoMapper {
      * @return 订单列表
      */
     List<OrderBasicInfo> queryOrderListByGroupCode(String groupCode);
+
+    /**
+     * 查询新电途订单列表
+     * @param merchantId
+     * @param stationId
+     * @param startDate
+     * @param endDate
+     * @return
+     */
+    List<OrderBasicInfo> queryXDTOrderList(String merchantId, String stationId, String startDate, String endDate);
 }
\ No newline at end of file
diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/PileRemoteService.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/PileRemoteService.java
index 5a88a4e69..125b09afb 100644
--- a/jsowell-pile/src/main/java/com/jsowell/pile/service/PileRemoteService.java
+++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/PileRemoteService.java
@@ -96,8 +96,8 @@ public class PileRemoteService {
 		// 获取充电桩0x13数据，校验交易流水号是否一致
 		String pileIsChargingKey = CacheConstants.PILE_IS_CHARGING + pileSn + connectorCode;
 		String redisResult = redisCache.getCacheObject(pileIsChargingKey);
-		if (!StringUtils.equals(redisResult, transactionCode)) {
-			log.info("发送远程停止充电指令-充电桩枪口编号:{}, 获取到正在充电中的交易流水号:{}与入参交易流水号:{}不一致", pileSn + connectorCode, redisResult, transactionCode);
+		if (StringUtils.isNotBlank(redisResult) && !StringUtils.equals(redisResult, transactionCode)) {
+			log.info("发送远程停止充电指令-充电桩枪口编号:{}, 获取到正在充电中的交易流水号:{}, 与入参交易流水号:{}不一致", pileSn + connectorCode, redisResult, transactionCode);
 			return;
 		}
 		StopChargingCommand command = StopChargingCommand.builder()
diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java
index eb642b700..f70d4762e 100644
--- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java
+++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java
@@ -3636,6 +3636,12 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService {
         return orderBasicInfoMapper.queryOrderListByGroupCode(groupCode);
     }
 
+    /**
+     * 查询新电途订单
+     */
+    public List<OrderBasicInfo> queryXDTOrderList(String merchantId, String stationId, String startDate, String endDate) {
+        return orderBasicInfoMapper.queryXDTOrderList(merchantId, stationId, startDate, endDate);
+    }
 
 }
 
diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileBasicInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileBasicInfoServiceImpl.java
index 1957fe3e4..f47f5f900 100644
--- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileBasicInfoServiceImpl.java
+++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileBasicInfoServiceImpl.java
@@ -570,7 +570,7 @@ public class PileBasicInfoServiceImpl implements PileBasicInfoService {
 
 		// 把充电桩正在充电中的状态存到redis
 		String pileIsChargingKey = CacheConstants.PILE_IS_CHARGING + realTimeMonitorData.getPileConnectorCode();
-		redisCache.setCacheObject(pileIsChargingKey, realTimeMonitorData.getTransactionCode(), 12);
+		redisCache.setCacheObject(pileIsChargingKey, realTimeMonitorData.getTransactionCode(), 20);
 	}
 
 	@Override
diff --git a/jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml
index 52e1675d4..c746bbe67 100644
--- a/jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml
+++ b/jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml
@@ -2797,4 +2797,12 @@
     and pay_mode = '1'
     and group_code =#{groupCode,jdbcType=VARCHAR}
   </select>
+
+  <select id="queryXDTOrderList" resultMap="BaseResultMap">
+    select
+    <include refid="Base_Column_List"/>
+    from order_basic_info
+    where order_status = '3'
+    and member_id =#{memberId,jdbcType=VARCHAR}
+  </select>
 </mapper>
\ No newline at end of file