[功能修复]调整上报频率

src/main/java/com/tmzn/devicelinkykc/frameMsg/frameType/HeartFrameSend.java

@@ -33,7 +33,7 @@ public class HeartFrameSend {
             return false;
         }
         deviceConnectionMsg.incrementMessageCount();
-        log.info("pileCode:"+device.getPileCode()+" ,heart push frame over");
+        log.info("pileCode:"+device.getPileCode()+" -{},heart push frame over",device.getGunPort());
         return true;
     }
 

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

@@ -128,14 +128,14 @@ public class YkcMsgHandle {
                 //消息体
                 byte[] respone_msg = Arrays.copyOfRange(response, 6, response.length - 2);
                 if (encry == 0) {
-                    logger.info("{},未加密消息,frame:{},data:{}",deviceConnectionMsg.getDeviceId(),framType, DataConversion.bytesToHexString(respone_msg));
+                    logger.info("{},un_encry_msg,frame:{},data:{}",deviceConnectionMsg.getDeviceId(),framType, DataConversion.bytesToHexString(respone_msg));
                 } else {
                     try {
                         String key = redisCache.getCacheMapValue(RedisConstant.YKC_KEY_MAP,deviceConnectionMsg.getDeviceId());
 //                        String key = redisCache.getCacheObject(RedisConstant.KEYS + deviceConnectionMsg.getDeviceId());
                         respone_msg = Encrytion.decrypt(respone_msg, key.getBytes());
 
-                        logger.info("{},加密消息,frame:{},data:{}",deviceConnectionMsg.getDeviceId(),framType, DataConversion.bytesToHexString(respone_msg));
+                        logger.info("{},encry_msg,frame:{},data:{}",deviceConnectionMsg.getDeviceId(),framType, DataConversion.bytesToHexString(respone_msg));
                     } catch (Exception e) {
                         logger.info("{},ykc->msg decrypt Exception",deviceConnectionMsg.getDeviceId());
                         e.printStackTrace();

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

@@ -158,8 +158,8 @@ public class MsgCharngingRunner {
         }
         log.info("{}-{}-5分钟内无状态下发一次103", orderStatus.getPileCode(), orderStatus.getGunsCode());
         deviceControlerService.sendImeiDetail(orderStatus.getDeviceImei());
-        int timeout = 240;
-        //订单3分钟内一分钟请求一次103 否则就4分钟获取一次
+        int timeout = 90;
+        //订单3分钟内一分钟请求一次103 否则就1分钟半获取一次
         if((System.currentTimeMillis()-orderStatus.getCreateTime())<180*1000){
             timeout = 60;
         }
@@ -261,7 +261,7 @@ public class MsgCharngingRunner {
                 log.error("计算订单异常{},{}",orderStatus.getPileCode(),e.getMessage());
                 return;
             }
-            redisCache.setCacheObject(transCacheKey, start, 120, TimeUnit.SECONDS);
+            redisCache.setCacheObject(transCacheKey, start, 90, TimeUnit.SECONDS);
         }
 
         BigDecimal elec = start.get("elec");

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

@@ -112,7 +112,7 @@ public class MsgFreeRunner {
                     //急停中也是空闲状态上报
                     deviceStatus.setGunStatus(StatusConstant.FREE);
                 }
-                log.info("↑↑↑↑{}空闲实时状态上报",deviceStatus.getPileCode());
+                log.info("↑↑↑↑{}-{}空闲实时状态上报",deviceStatus.getPileCode(),deviceStatus.getGunPort());
                 realTimeStatusPushFrame.deviceStatusPush(deviceConnectionMsg, FrameDataSplicing.
                         transactionNum(deviceStatus.getPileCode(), deviceConnectionMsg.getMessageCount()), deviceStatus.getPileCode(), deviceStatus.getGunPort(), deviceStatus.getGunStatus(), deviceStatus.getInsertGunStatus(), 0, 0, zero, zero, 0);
             }