云快充拆包

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

@@ -510,15 +510,21 @@ public class DeviceMsgHandle {
         QueryWrapper<OrderStatus> orderStatusQueryWrapper = new QueryWrapper<>();
         orderStatusQueryWrapper.eq("device_imei", imei).eq("guns_code", port).orderByDesc("create_time").last("limit 1");
         OrderStatus statusServiceOne = orderStatusService.getOne(orderStatusQueryWrapper);
-        byte[] bytes = statusServiceOne.getTransOrder();
-        logger.info(statusServiceOne.getPileCode() + ":设备开启充电流水号:" + DataConversion.bytesToHexString(bytes));
-        DeviceConnectionMsg deviceConnection = socketHandle.getDeviceConnection(statusServiceOne.getPileCode());
-
-        if(orderStatusService==null){
+        if(statusServiceOne==null){
             logger.info("没有充电记录 其他方式启动{}", imei);
             deviceControlerService.sendImeiDetail(imei);
             return;
         }
+        if(statusServiceOne.getNowOrderStatus()== StatusConstant.NOW_ORDER_STATUS_CHARGING_ENDING){
+            logger.info("订单已结束 无待上报订单{}", imei);
+            deviceControlerService.sendImeiDetail(imei);
+            return;
+        }
+
+        byte[] bytes = statusServiceOne.getTransOrder();
+        logger.info(statusServiceOne.getPileCode() + ":设备开启充电流水号:" + DataConversion.bytesToHexString(bytes));
+        DeviceConnectionMsg deviceConnection = socketHandle.getDeviceConnection(statusServiceOne.getPileCode());
+
 
         int reson = 0x00;
         if (result == 0x01) {