设备管理费pc接口

device-api-service/src/main/java/com/xy/service/DeviceChargingServiceImpl.java

@@ -233,7 +233,9 @@ public class DeviceChargingServiceImpl extends ServiceImpl<DeviceChargingMapper,
                 deviceInfo.setBusyState(1);
                 //激活设备
                 if (deviceChargingHistory.getChargingType() != 100) {
-                    deviceInfo.setActiveState(1);
+                    if(deviceInfo.getActiveState() == 2 && deviceInfo.getActiveTime() == null){
+                        deviceInfo.setActiveState(1).setActiveTime(now);
+                    }
                 }
                 updateDeviceInfos.add(deviceInfo);
             }