diff --git a/ebike-maintenance/src/main/java/com/cdzy/ebikemaintenance/controller/EbikeCoreController.java b/ebike-maintenance/src/main/java/com/cdzy/ebikemaintenance/controller/EbikeCoreController.java
index 6517483b..cc0b56f9 100644
--- a/ebike-maintenance/src/main/java/com/cdzy/ebikemaintenance/controller/EbikeCoreController.java
+++ b/ebike-maintenance/src/main/java/com/cdzy/ebikemaintenance/controller/EbikeCoreController.java
@@ -67,15 +67,19 @@ public class EbikeCoreController {
      * @return 执行结构
      */
     @GetMapping("online")
-    public JsonResult<?> online(@RequestParam("ecuId") Long ecuId, @RequestParam(value = "bikeId",required = false) Long bikeId) throws IOException {
+    public JsonResult<?> online(@RequestParam("ecuId") Long ecuId, @RequestParam(value = "bikeId", required = false) Long bikeId) throws IOException {
         try {
             EbikeEcuInfo ebikeEcuInfo = ecuInfoService.getById(ecuId);
             boolean online = EmqxApiClient.isClientOnline(ebikeEcuInfo.getEcuSn());
             CoreResult result = online ? CoreResult.online() : CoreResult.offline();
-            saveLog(bikeId, "设备是否在线", "1");
+            if (bikeId != null) {
+                saveLog(bikeId, "设备是否在线", "1");
+            }
             return JsonResult.success(result);
         } catch (Exception e) {
-            saveLog(bikeId, "设备是否在线", "0");
+            if (bikeId != null) {
+                saveLog(bikeId, "设备是否在线", "1");
+            }
             throw e;
         }
     }
@@ -86,9 +90,9 @@ public class EbikeCoreController {
      * @return 执行结构
      */
     @GetMapping("findEbike")
-    public DeferredResult<JsonResult<?>> findEbike(@RequestParam("ecuId") Long ecuId, @RequestParam(value = "bikeId",required = false) Long bikeId) {
+    public DeferredResult<JsonResult<?>> findEbike(@RequestParam("ecuId") Long ecuId, @RequestParam(value = "bikeId", required = false) Long bikeId) {
         DeferredResult<JsonResult<?>> deferredResult = new DeferredResult<>(5000L); // 5秒超时
-        ebikeCoreService.executeCommand(ecuId, CmdCode.VIDEO_5, bikeId,getStaffId() ).whenComplete((response, ex) -> {
+        ebikeCoreService.executeCommand(ecuId, CmdCode.VIDEO_5, bikeId, getStaffId()).whenComplete((response, ex) -> {
             if (ex != null) {
                 CoreResult result = CoreResult.failed(ex.getMessage());
                 deferredResult.setResult(JsonResult.success(result));
@@ -116,9 +120,9 @@ public class EbikeCoreController {
      * @return 执行结构
      */
     @GetMapping("gps")
-    public DeferredResult<JsonResult<?>> gps(@RequestParam("ecuId") Long ecuId, @RequestParam(value = "bikeId",required = false) Long bikeId) {
+    public DeferredResult<JsonResult<?>> gps(@RequestParam("ecuId") Long ecuId, @RequestParam(value = "bikeId", required = false) Long bikeId) {
         DeferredResult<JsonResult<?>> deferredResult = new DeferredResult<>(5000L); // 5秒超时
-        ebikeCoreService.executeCommand(ecuId, CmdCode.GPS, bikeId,getStaffId() ).whenComplete((response, ex) -> {
+        ebikeCoreService.executeCommand(ecuId, CmdCode.GPS, bikeId, getStaffId()).whenComplete((response, ex) -> {
             if (ex != null) {
                 CoreResult result = CoreResult.failed(ex.getMessage());
                 deferredResult.setResult(JsonResult.success(result));
@@ -157,9 +161,9 @@ public class EbikeCoreController {
      * @return 执行结构
      */
     @GetMapping("openBatteryLock")
-    public DeferredResult<JsonResult<?>> openBatteryLock(@RequestParam("ecuId") Long ecuId, @RequestParam(value = "bikeId",required = false) Long bikeId) {
+    public DeferredResult<JsonResult<?>> openBatteryLock(@RequestParam("ecuId") Long ecuId, @RequestParam(value = "bikeId", required = false) Long bikeId) {
         DeferredResult<JsonResult<?>> deferredResult = new DeferredResult<>(5000L); // 5秒超时
-        ebikeCoreService.executeCommand(ecuId, CmdCode.OPEN_BATTERY_LOCK, bikeId,getStaffId() ).whenComplete((response, ex) -> {
+        ebikeCoreService.executeCommand(ecuId, CmdCode.OPEN_BATTERY_LOCK, bikeId, getStaffId()).whenComplete((response, ex) -> {
             if (ex != null) {
                 CoreResult result = CoreResult.failed(ex.getMessage());
                 deferredResult.setResult(JsonResult.success(result));
@@ -186,9 +190,9 @@ public class EbikeCoreController {
      * @return 执行结构
      */
     @GetMapping("closeBatteryLock")
-    public DeferredResult<JsonResult<?>> closeBatteryLock(@RequestParam("ecuId") Long ecuId, @RequestParam(value = "bikeId",required = false) Long bikeId) {
+    public DeferredResult<JsonResult<?>> closeBatteryLock(@RequestParam("ecuId") Long ecuId, @RequestParam(value = "bikeId", required = false) Long bikeId) {
         DeferredResult<JsonResult<?>> deferredResult = new DeferredResult<>(5000L); // 5秒超时
-        ebikeCoreService.executeCommand(ecuId, CmdCode.CLOSE_BATTERY_LOCK, bikeId,getStaffId() ).whenComplete((response, ex) -> {
+        ebikeCoreService.executeCommand(ecuId, CmdCode.CLOSE_BATTERY_LOCK, bikeId, getStaffId()).whenComplete((response, ex) -> {
             if (ex != null) {
                 CoreResult result = CoreResult.failed(ex.getMessage());
                 deferredResult.setResult(JsonResult.success(result));
@@ -215,9 +219,9 @@ public class EbikeCoreController {
      * @return 执行结构
      */
     @GetMapping("lock")
-    public DeferredResult<JsonResult<?>> lock(@RequestParam("ecuId") Long ecuId, @RequestParam(value = "bikeId",required = false) Long bikeId) {
+    public DeferredResult<JsonResult<?>> lock(@RequestParam("ecuId") Long ecuId, @RequestParam(value = "bikeId", required = false) Long bikeId) {
         DeferredResult<JsonResult<?>> deferredResult = new DeferredResult<>(5000L); // 5秒超时
-        ebikeCoreService.executeCommand(ecuId, CmdCode.LOCK, bikeId,getStaffId() ).whenComplete((response, ex) -> {
+        ebikeCoreService.executeCommand(ecuId, CmdCode.LOCK, bikeId, getStaffId()).whenComplete((response, ex) -> {
             if (ex != null) {
                 CoreResult result = CoreResult.failed(ex.getMessage());
                 deferredResult.setResult(JsonResult.success(result));
@@ -244,9 +248,9 @@ public class EbikeCoreController {
      * @return 执行结构
      */
     @GetMapping("unlock")
-    public DeferredResult<JsonResult<?>> unlock(@RequestParam("ecuId") Long ecuId, @RequestParam(value = "bikeId",required = false) Long bikeId) {
+    public DeferredResult<JsonResult<?>> unlock(@RequestParam("ecuId") Long ecuId, @RequestParam(value = "bikeId", required = false) Long bikeId) {
         DeferredResult<JsonResult<?>> deferredResult = new DeferredResult<>(5000L); // 5秒超时
-        ebikeCoreService.executeCommand(ecuId, CmdCode.UNLOCK, bikeId,getStaffId() ).whenComplete((response, ex) -> {
+        ebikeCoreService.executeCommand(ecuId, CmdCode.UNLOCK, bikeId, getStaffId()).whenComplete((response, ex) -> {
             if (ex != null) {
                 CoreResult result = CoreResult.failed(ex.getMessage());
                 deferredResult.setResult(JsonResult.success(result));
@@ -273,9 +277,9 @@ public class EbikeCoreController {
      * @return 执行结构
      */
     @GetMapping("openHelmet")
-    public DeferredResult<JsonResult<?>> openHelmet(@RequestParam("ecuId") Long ecuId, @RequestParam(value = "bikeId",required = false) Long bikeId) {
+    public DeferredResult<JsonResult<?>> openHelmet(@RequestParam("ecuId") Long ecuId, @RequestParam(value = "bikeId", required = false) Long bikeId) {
         DeferredResult<JsonResult<?>> deferredResult = new DeferredResult<>(5000L); // 5秒超时
-        ebikeCoreService.executeCommand(ecuId, CmdCode.OPEN_HEMET, bikeId,getStaffId() ).whenComplete((response, ex) -> {
+        ebikeCoreService.executeCommand(ecuId, CmdCode.OPEN_HEMET, bikeId, getStaffId()).whenComplete((response, ex) -> {
             if (ex != null) {
                 CoreResult result = CoreResult.failed(ex.getMessage());
                 deferredResult.setResult(JsonResult.success(result));
@@ -302,9 +306,9 @@ public class EbikeCoreController {
      * @return 执行结构
      */
     @GetMapping("cameraReturn")
-    public DeferredResult<JsonResult<?>> cameraReturn(@RequestParam("ecuId") Long ecuId, @RequestParam(value = "bikeId",required = false) Long bikeId) {
+    public DeferredResult<JsonResult<?>> cameraReturn(@RequestParam("ecuId") Long ecuId, @RequestParam(value = "bikeId", required = false) Long bikeId) {
         DeferredResult<JsonResult<?>> deferredResult = new DeferredResult<>(5000L); // 5秒超时
-        ebikeCoreService.executeCommand(ecuId, CmdCode.CAMERA_RETURN, bikeId,getStaffId() ).whenComplete((response, ex) -> {
+        ebikeCoreService.executeCommand(ecuId, CmdCode.CAMERA_RETURN, bikeId, getStaffId()).whenComplete((response, ex) -> {
             if (ex != null) {
                 CoreResult result = CoreResult.failed(ex.getMessage());
                 deferredResult.setResult(JsonResult.success(result));
@@ -331,9 +335,9 @@ public class EbikeCoreController {
      * @return 执行结构
      */
     @GetMapping("cancelAntiTheft")
-    public DeferredResult<JsonResult<?>> cancelAntiTheft(@RequestParam("ecuId") Long ecuId, @RequestParam(value = "bikeId",required = false) Long bikeId) {
+    public DeferredResult<JsonResult<?>> cancelAntiTheft(@RequestParam("ecuId") Long ecuId, @RequestParam(value = "bikeId", required = false) Long bikeId) {
         DeferredResult<JsonResult<?>> deferredResult = new DeferredResult<>(5000L); // 5秒超时
-        ebikeCoreService.executeCommand(ecuId, CmdCode.CANCEL_ANTI_THEFT, bikeId,getStaffId() ).whenComplete((response, ex) -> {
+        ebikeCoreService.executeCommand(ecuId, CmdCode.CANCEL_ANTI_THEFT, bikeId, getStaffId()).whenComplete((response, ex) -> {
             if (ex != null) {
                 CoreResult result = CoreResult.failed(ex.getMessage());
                 deferredResult.setResult(JsonResult.success(result));
@@ -361,9 +365,9 @@ public class EbikeCoreController {
      * @return 执行结构
      */
     @GetMapping("powerOff")
-    public DeferredResult<JsonResult<?>> powerOff(@RequestParam("ecuId") Long ecuId, @RequestParam(value = "bikeId",required = false) Long bikeId) {
+    public DeferredResult<JsonResult<?>> powerOff(@RequestParam("ecuId") Long ecuId, @RequestParam(value = "bikeId", required = false) Long bikeId) {
         DeferredResult<JsonResult<?>> deferredResult = new DeferredResult<>(5000L); // 5秒超时
-        ebikeCoreService.executeCommand(ecuId, CmdCode.GPS, bikeId,getStaffId() ).whenComplete((response, ex) -> {
+        ebikeCoreService.executeCommand(ecuId, CmdCode.GPS, bikeId, getStaffId()).whenComplete((response, ex) -> {
             if (ex != null) {
                 CoreResult result = CoreResult.failed(ex.getMessage());
                 deferredResult.setResult(JsonResult.success(result));
@@ -391,9 +395,9 @@ public class EbikeCoreController {
      * @return 执行结构
      */
     @GetMapping("restart")
-    public DeferredResult<JsonResult<?>> restart(@RequestParam("ecuId") Long ecuId, @RequestParam(value = "bikeId",required = false) Long bikeId) {
+    public DeferredResult<JsonResult<?>> restart(@RequestParam("ecuId") Long ecuId, @RequestParam(value = "bikeId", required = false) Long bikeId) {
         DeferredResult<JsonResult<?>> deferredResult = new DeferredResult<>(5000L); // 5秒超时
-        ebikeCoreService.executeCommand(ecuId, CmdCode.RESTART, bikeId,getStaffId() ).whenComplete((response, ex) -> {
+        ebikeCoreService.executeCommand(ecuId, CmdCode.RESTART, bikeId, getStaffId()).whenComplete((response, ex) -> {
             if (ex != null) {
                 CoreResult result = CoreResult.failed(ex.getMessage());
                 deferredResult.setResult(JsonResult.success(result));
@@ -421,9 +425,9 @@ public class EbikeCoreController {
      * @return 执行结构
      */
     @GetMapping("tempLock")
-    public DeferredResult<JsonResult<?>> tempLock(@RequestParam("ecuId") Long ecuId, @RequestParam(value = "bikeId",required = false) Long bikeId) {
+    public DeferredResult<JsonResult<?>> tempLock(@RequestParam("ecuId") Long ecuId, @RequestParam(value = "bikeId", required = false) Long bikeId) {
         DeferredResult<JsonResult<?>> deferredResult = new DeferredResult<>(5000L); // 5秒超时
-        ebikeCoreService.executeCommand(ecuId, CmdCode.TEMP_LOCK, bikeId,getStaffId() ).whenComplete((response, ex) -> {
+        ebikeCoreService.executeCommand(ecuId, CmdCode.TEMP_LOCK, bikeId, getStaffId()).whenComplete((response, ex) -> {
             if (ex != null) {
                 CoreResult result = CoreResult.failed(ex.getMessage());
                 deferredResult.setResult(JsonResult.success(result));
diff --git a/ebike-maintenance/src/main/java/com/cdzy/ebikemaintenance/controller/EbikeOperationController.java b/ebike-maintenance/src/main/java/com/cdzy/ebikemaintenance/controller/EbikeOperationController.java
index c81f1a33..3b29fb5b 100644
--- a/ebike-maintenance/src/main/java/com/cdzy/ebikemaintenance/controller/EbikeOperationController.java
+++ b/ebike-maintenance/src/main/java/com/cdzy/ebikemaintenance/controller/EbikeOperationController.java
@@ -35,7 +35,6 @@ public class EbikeOperationController {
      */
     @GetMapping("page")
     public JsonResult<?> page(PageParam pageParam) {
-        //TODO：添加筛选条件。过滤运营状态
         QueryWrapper queryWrapper = QueryWrapper.create()
                 .where(EBIKE_BIKE_INFO.STATE.eq(1));
         Page<EbikeBikeInfo> page = bikeInfoService.page(pageParam.getPage(), queryWrapper);