liuf 1 год назад
Родитель
Сommit
d11d2d9c03
1 измененных файлов с 18 добавлено и 17 удалено
  1. 18 17
      src/main/java/com/tmzn/devicelinkykc/message/DeviceMsgHandle.java

+ 18 - 17
src/main/java/com/tmzn/devicelinkykc/message/DeviceMsgHandle.java

@@ -531,20 +531,25 @@ public class DeviceMsgHandle {
             if (statusServiceOne.getReasonStopCharging() == TransConstant.APP_REMOTE_STOP) {
                 logger.info(statusServiceOne.getPileCode() + ":云快充>>>>>>远程停充>>>>");
             } else {
-                //不处理急停
-                if (reson == 0x01) {
-                    logger.info(statusServiceOne.getPileCode() + ":用户主动停充>>>>>>停充>>>>");
-                    statusServiceOne.setReasonStopCharging(TransConstant.APP_REMOTE_STOP);
-                } else if (reson == 0x00) {
-                    logger.info(statusServiceOne.getPileCode() + ":设备余额不足>>>>>>停充>>>>");
-                    statusServiceOne.setReasonStopCharging(TransConstant.INSUFFICIENT_BALANCE_EXCEPTION_STOP);
-                } else if (reson == 0x03) {
-                    logger.info(statusServiceOne.getPileCode() + ":设备充电充满>>>>>>停充>>>>");
-                    statusServiceOne.setReasonStopCharging(TransConstant.SOC_FULL_OF_STOP);
-                } else {
-                    logger.info(statusServiceOne.getPileCode() + ":设备充电停止>>>>其他>>>");
-                    statusServiceOne.setReasonStopCharging(TransConstant.OTHER_STOP);
+                if(statusServiceOne.getReasonStopCharging()==0){
+                    logger.info(statusServiceOne.getPileCode() + ":充满主动>>>>>>停充>>>>");
+                }else{
+                    //不处理急停
+                    if (reson == 0x01) {
+                        logger.info(statusServiceOne.getPileCode() + ":用户主动停充>>>>>>停充>>>>");
+                        statusServiceOne.setReasonStopCharging(TransConstant.APP_REMOTE_STOP);
+                    } else if (reson == 0x00) {
+                        logger.info(statusServiceOne.getPileCode() + ":设备余额不足>>>>>>停充>>>>");
+                        statusServiceOne.setReasonStopCharging(TransConstant.INSUFFICIENT_BALANCE_EXCEPTION_STOP);
+                    } else if (reson == 0x03) {
+                        logger.info(statusServiceOne.getPileCode() + ":设备充电充满>>>>>>停充>>>>");
+                        statusServiceOne.setReasonStopCharging(TransConstant.SOC_FULL_OF_STOP);
+                    } else {
+                        logger.info(statusServiceOne.getPileCode() + ":设备充电停止>>>>其他>>>");
+                        statusServiceOne.setReasonStopCharging(TransConstant.OTHER_STOP);
+                    }
                 }
+
             }
 
             //设置订单已停止充电和结束时间
@@ -645,10 +650,6 @@ public class DeviceMsgHandle {
     }
 
 
-    //重启一个订单 因为重启
-    private void restartOrderByWaiting(){
-
-    }
 
     /**
      * 1.这里接收到消息就是设备在线;2.对状态进行处理,不同类型消息的枪状态不同进行落库;3.并且状态变化的一个变位上送