[功能修复]优化测试

src/main/java/com/tmzn/devicelinkykc/message/DeviceMsgHandle.java

@@ -495,7 +495,7 @@ public class DeviceMsgHandle {
 
         //判断连续无功率就自动停止
 
-        redisCache.setCacheObject(RedisConstant.DEVICE_PORT_STATUS + imei, data, 30, TimeUnit.MINUTES);
+        redisCache.setCacheObject(RedisConstant.DEVICE_PORT_STATUS + imei, data, 60, TimeUnit.MINUTES);
         if (port_first_status != null) {
 
             checkPort(port_first_status, 1, imei, type);
@@ -630,6 +630,11 @@ public class DeviceMsgHandle {
      */
     private void checkPort(Integer portStatus, int port, String imei, int type) throws Exception {
 
+        //交流桩101port_second_status解析不对忽略
+        if(portStatus>20){
+            return;
+        }
+
         if (portStatus.equals(PortStatusConstant.FREE)) {
             //处理特殊情况之后还要看枪状态变位上送
             deviceOnline(portStatus, imei, port, StatusConstant.FREE, StatusConstant.INSERT_GUNS_NO);

src/main/java/com/tmzn/devicelinkykc/taskQueue/runner/MsgCharngingRunner.java

@@ -158,7 +158,7 @@ public class MsgCharngingRunner {
         }
         log.info("{}-{}-5分钟内无状态下发一次103", orderStatus.getPileCode(), orderStatus.getGunsCode());
         deviceControlerService.sendImeiDetail(orderStatus.getDeviceImei());
-        redisCache.setCacheObject(key, System.currentTimeMillis(),300, TimeUnit.SECONDS);
+        redisCache.setCacheObject(key, System.currentTimeMillis(),240, TimeUnit.SECONDS);
     }
 
     //停止一个订单
@@ -260,9 +260,10 @@ public class MsgCharngingRunner {
         //????????????????????????????
         if (money.compareTo(orderStatus.getStartMoney()) > 0) {
             //余额没有了,停充
-            log.info("{},{},{}实时状态校验时余额不足>>>>>>停充>>>>",orderStatus.getPileCode(),orderStatus.getGunsCode(),orderStatus.getTransOrder());
             orderStatus.setReasonStopCharging(TransConstant.INSUFFICIENT_BALANCE_EXCEPTION_STOP);
             stopOneOrder(orderStatus);
+            log.info("{},{},{}实时状态校验时余额不足>>>>>>停充>>>>",orderStatus.getPileCode(),orderStatus.getGunsCode(),orderStatus.getTransOrder());
+
             return;
         }
         int mi = (int) (System.currentTimeMillis() - orderStatus.getCreateTime()) / 1000 / 60;

src/main/java/com/tmzn/devicelinkykc/taskQueue/runner/MsgTranscationRunner.java

@@ -75,6 +75,12 @@ public class MsgTranscationRunner {
 
     public void rebillOne(OrderStatus statusServiceOne) throws IOException {
 
+        long t = 1730795051000L;
+        if(statusServiceOne.getCreateTime()<t){
+            log.info("{}11月5号之前旧版的订单不上报了吧",statusServiceOne.getPileCode());
+            return;
+        }
+
         if(!deviceMsgHandle.checkConnection(statusServiceOne.getPileCode(),statusServiceOne.getDeviceImei())){
             log.info("{}重新上报句柄不存在等待下次执行",statusServiceOne.getPileCode());
             return;