فهرست منبع

[功能修复]优化上报

liuf 1 سال پیش
والد
کامیت
bf1729ecc2

+ 7 - 0
src/main/java/com/tmzn/devicelinkykc/controller/DeviceController.java

@@ -149,6 +149,13 @@ public class DeviceController {
         imeis.add(imei);
         imeis.add(imei);
         //redisCachel.setCacheObject(RedisConstant.DEVICE_INFO, imeis, 6 * 1000 * 60, TimeUnit.MILLISECONDS);
         //redisCachel.setCacheObject(RedisConstant.DEVICE_INFO, imeis, 6 * 1000 * 60, TimeUnit.MILLISECONDS);
         redisCachel.setCacheObject(RedisConstant.DEVICE_INFO,imeis);
         redisCachel.setCacheObject(RedisConstant.DEVICE_INFO,imeis);
+        //
+        QueryWrapper<Device> mapper = new QueryWrapper<>();
+        mapper.eq("device_imei",imei);
+        Device device = deviceService.getOne(mapper);
+        if(device!=null){
+            redisCachel.setCacheMapValue(RedisConstant.DEVICE_IMEI_PILE_MAP,imei,device.getPileCode());
+        }
         //imei保存后发个获取103,让新增设备立马上线
         //imei保存后发个获取103,让新增设备立马上线
         DeviceParam deviceParam = new DeviceParam();
         DeviceParam deviceParam = new DeviceParam();
         deviceParam.setDeviceId(imei);
         deviceParam.setDeviceId(imei);

+ 3 - 0
src/main/java/com/tmzn/devicelinkykc/service/impl/DeviceServiceImpl.java

@@ -104,8 +104,11 @@ public class DeviceServiceImpl extends ServiceImpl<DeviceMapper, Device> impleme
                 }
                 }
                 //redisCache.setCacheObject(RedisConstant.DEVICE_INFO, imeis, 6 * 1000 * 60, TimeUnit.MILLISECONDS);
                 //redisCache.setCacheObject(RedisConstant.DEVICE_INFO, imeis, 6 * 1000 * 60, TimeUnit.MILLISECONDS);
                 redisCache.setCacheObject(RedisConstant.DEVICE_INFO,imeis);
                 redisCache.setCacheObject(RedisConstant.DEVICE_INFO,imeis);
+
             }
             }
 
 
+            redisCache.deleteCacheMapValue(RedisConstant.DEVICE_IMEI_PILE_MAP, device.getDeviceImei());
+
         }
         }
         return AjaxResult.success();
         return AjaxResult.success();
     }
     }

+ 2 - 2
src/main/java/com/tmzn/devicelinkykc/taskQueue/TranscationTask.java

@@ -32,8 +32,8 @@ public class TranscationTask {
                 msgTranscationQueue.add(deviceConnectionMsgMap);
                 msgTranscationQueue.add(deviceConnectionMsgMap);
             }
             }
         };
         };
-        //每50分钟检测要执行的订单
-        scheduler.scheduleAtFixedRate(task,10,50*1000, TimeUnit.MILLISECONDS);
+        //每50检测要执行的订单
+        scheduler.scheduleAtFixedRate(task,10,40*1000, TimeUnit.MILLISECONDS);
 
 
     }
     }
 }
 }

+ 1 - 1
src/main/java/com/tmzn/devicelinkykc/taskQueue/runner/MsgTranscationRunner.java

@@ -143,7 +143,7 @@ public class MsgTranscationRunner {
         //处理已结束的订单 未上报的 离线上报
         //处理已结束的订单 未上报的 离线上报
         log.info("======离线订单记录补送=====");
         log.info("======离线订单记录补送=====");
         //任务处理 1.上报交易流水消息后没有响应回复的情况,30秒上送一次三次后停止,五分钟后上送最后一次,不管是否成功都不再上送:有结束时间,充电状态是结束充电的
         //任务处理 1.上报交易流水消息后没有响应回复的情况,30秒上送一次三次后停止,五分钟后上送最后一次,不管是否成功都不再上送:有结束时间,充电状态是结束充电的
-        long t = System.currentTimeMillis()-60 *1000;
+        long t = System.currentTimeMillis()-40 *1000;
         QueryWrapper<OrderStatus> queryWrapper = new QueryWrapper<>();
         QueryWrapper<OrderStatus> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("now_order_status", StatusConstant.NOW_ORDER_STATUS_CHARGING_ENDING).orderByDesc("id"); //充电完成
         queryWrapper.eq("now_order_status", StatusConstant.NOW_ORDER_STATUS_CHARGING_ENDING).orderByDesc("id"); //充电完成
         //已经停止一分钟了 还没有上送成功的
         //已经停止一分钟了 还没有上送成功的