|
@@ -151,14 +151,14 @@ public class MsgCharngingRunner {
|
|
|
|
|
|
|
|
//尝试下发103 避免下发太频繁
|
|
//尝试下发103 避免下发太频繁
|
|
|
public void try103(OrderStatus orderStatus){
|
|
public void try103(OrderStatus orderStatus){
|
|
|
- String key = "try103:_"+orderStatus.getDeviceImei()+"_"+orderStatus.getGunsCode();
|
|
|
|
|
|
|
+ String key = "try103_charging:_"+orderStatus.getDeviceImei()+"_"+orderStatus.getGunsCode();
|
|
|
if(redisCache.hasKey(key)){
|
|
if(redisCache.hasKey(key)){
|
|
|
- log.info("{}-{}忽略下发103", orderStatus.getPileCode(), orderStatus.getGunsCode());
|
|
|
|
|
|
|
+ log.info("{}-{}忽略下发充电中103", orderStatus.getPileCode(), orderStatus.getGunsCode());
|
|
|
return;
|
|
return;
|
|
|
}
|
|
}
|
|
|
log.info("{}-{}-5分钟内无状态下发一次103", orderStatus.getPileCode(), orderStatus.getGunsCode());
|
|
log.info("{}-{}-5分钟内无状态下发一次103", orderStatus.getPileCode(), orderStatus.getGunsCode());
|
|
|
deviceControlerService.sendImeiDetail(orderStatus.getDeviceImei());
|
|
deviceControlerService.sendImeiDetail(orderStatus.getDeviceImei());
|
|
|
- int timeout = 90;
|
|
|
|
|
|
|
+ int timeout = 60;
|
|
|
//订单3分钟内一分钟请求一次103 否则就1分钟半获取一次
|
|
//订单3分钟内一分钟请求一次103 否则就1分钟半获取一次
|
|
|
if((System.currentTimeMillis()-orderStatus.getCreateTime())<180*1000){
|
|
if((System.currentTimeMillis()-orderStatus.getCreateTime())<180*1000){
|
|
|
timeout = 60;
|
|
timeout = 60;
|