Merge remote-tracking branch 'origin/main'

ebike-maintenance/src/main/java/com/cdzy/ebikemaintenance/controller/EbikeCoreController.java

@@ -72,10 +72,14 @@ public class EbikeCoreController {
             EbikeEcuInfo ebikeEcuInfo = ecuInfoService.getById(ecuId);
             boolean online = EmqxApiClient.isClientOnline(ebikeEcuInfo.getEcuSn());
             CoreResult result = online ? CoreResult.online() : CoreResult.offline();
+            if (bikeId != null) {
                 saveLog(bikeId, "设备是否在线", "1");
+            }
             return JsonResult.success(result);
         } catch (Exception e) {
-            saveLog(bikeId, "设备是否在线", "0");
+            if (bikeId != null) {
+                saveLog(bikeId, "设备是否在线", "1");
+            }
             throw e;
         }
     }

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);