[功能修复]添加日志

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

@@ -783,11 +783,11 @@ public class DeviceMsgHandle {
         //订单还在充电中 但是枪不在充电中状态 就结束订单
         // 但是拔了再插 会短暂的从1 变成5 所以在判断空闲的时候 要加上订单60秒的变位限制 6如果有订单60秒后才关闭
         if (one.getNowOrderStatus() == StatusConstant.NOW_ORDER_STATUS_CHARGING) {
-            logger.info("{}枪非充电中状态,结束订单状态 等待任务重试上报订单", one.getPileCode());
             if ((System.currentTimeMillis() - one.getCreateTime()) < 60 * 1000 && one.getReasonStopCharging() != TransConstant.APP_REMOTE_STOP) {
                 logger.info("下订单60秒内{}不处理空闲这个状态", one.getPileCode());
                 return;
             }
+            logger.info("{}枪非充电中状态,结束订单状态 等待任务重试上报订单", one.getPileCode());
             one.setNowOrderStatus(StatusConstant.NOW_ORDER_STATUS_CHARGING_ENDING);
             one.setEndTime(System.currentTimeMillis());
             one.setReasonStopCharging(TransConstant.OTHER_STOP);

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

@@ -372,7 +372,7 @@ public class YkcMsgHandle {
                 //未插枪不启充设备,但是返回未插枪
                 logger.info("未插枪等待插枪充电订单{}-{}",orderStatus.getPileCode(),orderStatus.getGunsCode());
                 charngingPushFrame.startStatus(deviceConnectionMsg,transOrder,guns[0],result,reason );
-                redisCache.setCacheObject(RedisConstant.WAITING_INSERT_GUN+":"+orderStatus.getPileCode()+'_'+orderStatus.getGunsCode(),orderStatus.getId(),60*1000, TimeUnit.MILLISECONDS);
+                redisCache.setCacheObject(RedisConstant.WAITING_INSERT_GUN+":"+orderStatus.getPileCode()+'_'+orderStatus.getGunsCode(),orderStatus.getId(),55*1000, TimeUnit.MILLISECONDS);
             }else {
                 logger.info("已就绪启动充电{}-{}",orderStatus.getPileCode(),orderStatus.getGunsCode());
                 deviceControlerService.startCharge(deviceStatus.getDeviceImei(), orderStatus.getDeviceImei(), (int) guns[0],0);