From 6992aaf0587c09f7c511c1afd12e1519d91363d3 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Thu, 14 Dec 2023 15:38:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/cjl' into qa

---
 screen-manage/src/main/java/com/moral/api/controller/ManageCoordinateController.java |   10 +++-------
 1 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/screen-manage/src/main/java/com/moral/api/controller/ManageCoordinateController.java b/screen-manage/src/main/java/com/moral/api/controller/ManageCoordinateController.java
index 0437c8f..d08b5b4 100644
--- a/screen-manage/src/main/java/com/moral/api/controller/ManageCoordinateController.java
+++ b/screen-manage/src/main/java/com/moral/api/controller/ManageCoordinateController.java
@@ -42,7 +42,7 @@
      */
     @PostMapping("interCruiserRoad")
     public ResultMessage interCruiserRoad(@RequestBody Map<String,Object> params){
-        if (!params.containsKey("startPoint") || !params.containsKey("endPoint")) {
+        if (!params.containsKey("startPoint") || !params.containsKey("mac")) {
             return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(), ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
         }
         Integer integer = manageCoordinateService.interCoordinate(params);
@@ -88,12 +88,8 @@
      * @return
      */
     @GetMapping("selectCruiserRoad")
-    public ResultMessage selectCruiser(){
-        List<ManageCoordinate> manageCoordinates = manageCoordinateService.selectCoordinate();
-        if (ObjectUtils.isEmpty(manageCoordinates)){
-            return ResultMessage.fail(ResponseCodeEnum.TARGET_IS_NULL.getCode(),
-                    ResponseCodeEnum.TARGET_IS_NULL.getMsg());
-        }
+    public ResultMessage selectCruiser(String name,String mac){
+        List<ManageCoordinate> manageCoordinates = manageCoordinateService.selectCoordinate(name,mac);
         return ResultMessage.ok(manageCoordinates);
     }
 }

--
Gitblit v1.8.0