diff --git a/jsowell-common/src/main/java/com/jsowell/common/constant/Constants.java b/jsowell-common/src/main/java/com/jsowell/common/constant/Constants.java index 96d68d6b9..76854b2c5 100644 --- a/jsowell-common/src/main/java/com/jsowell/common/constant/Constants.java +++ b/jsowell-common/src/main/java/com/jsowell/common/constant/Constants.java @@ -8,6 +8,9 @@ import io.jsonwebtoken.Claims; * @author jsowell */ public class Constants { + // 非法交易流水号 由充电桩启动的订单会传全是0的交易流水号 + public static final String ILLEGAL_TRANSACTION_CODE = "00000000000000000000000000000000"; + // 充电桩sn号长度 public static final int PILE_SN_LENGTH = 14; @@ -18,9 +21,14 @@ public class Constants { public static final int PILE_CONNECTOR_CODE_LENGTH = PILE_SN_LENGTH + CONNECTOR_CODE_LENGTH; public static final String SOCKET_IP = "127.0.0.1"; + + // 默认端口号 public static final Integer SOCKET_PORT = 9011; + // 阿里云服务器地址 public static final String updateServerIP = "47.103.124.69"; + + // ftp端口号 public static final int port = 0x15; public static final byte[] updateServerPort = new byte[]{port}; 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 43193fb78..c74e7b855 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 @@ -445,7 +445,7 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService { @Override public OrderBasicInfo getOrderInfoByOrderCode(String orderCode) { // 如果orderCode是00000000000000000000000000000000,直接返回null - if (StringUtils.equals("00000000000000000000000000000000", orderCode)) { + if (StringUtils.equals(Constants.ILLEGAL_TRANSACTION_CODE, orderCode)) { return null; } String redisKey = CacheConstants.GET_ORDER_INFO_BY_ORDER_CODE + orderCode; @@ -464,7 +464,7 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService { @Override public OrderBasicInfo getOrderInfoByTransactionCode(String transactionCode) { - if (StringUtils.equals("00000000000000000000000000000000", transactionCode)) { + if (StringUtils.equals(Constants.ILLEGAL_TRANSACTION_CODE, transactionCode)) { return null; } String redisKey = CacheConstants.GET_ORDER_INFO_BY_TRANSACTION_CODE + transactionCode; @@ -731,7 +731,7 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService { } /** - * 从redis中取出实时记录保存到表中 + * 从redis中取出实时记录保存到表中j * 当订单完成的时候调用 */ @Override 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 c1be265c5..75ae44bbc 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 @@ -470,6 +470,9 @@ public class PileBasicInfoServiceImpl implements IPileBasicInfoService { */ @Override public void saveRealTimeMonitorData2Redis(RealTimeMonitorData realTimeMonitorData) { + if (StringUtils.equals(realTimeMonitorData.getTransactionCode(), Constants.ILLEGAL_TRANSACTION_CODE)) { + + } // 保存到redis String redisKey = CacheConstants.PILE_REAL_TIME_MONITOR_DATA + realTimeMonitorData.getPileConnectorCode() + "_" + realTimeMonitorData.getTransactionCode();