From ff3af3a0dd0fe87a500c13e933bea1f553083508 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Thu, 21 Sep 2023 10:47:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/cjl' into qa
---
screen-manage/src/main/java/com/moral/api/controller/ManageCoordinateController.java | 20 +++++++-------------
1 files changed, 7 insertions(+), 13 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 8182b65..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
@@ -2,7 +2,6 @@
import io.swagger.annotations.Api;
-import javafx.scene.input.Mnemonic;
import lombok.extern.slf4j.Slf4j;
import org.apache.ibatis.annotations.Update;
import org.springframework.beans.factory.annotation.Autowired;
@@ -18,6 +17,7 @@
import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
import com.moral.api.entity.ManageCoordinate;
+import com.moral.api.mapper.ManageCoordinateMapper;
import com.moral.api.service.ManageCoordinateService;
import com.moral.constant.ResponseCodeEnum;
import com.moral.constant.ResultMessage;
@@ -26,11 +26,12 @@
@RestController
@Api(tags = {"������������������"})
@RequestMapping("coordinate")
-@CrossOrigin(origins = "*", maxAge = 3600)
public class ManageCoordinateController {
@Autowired
private ManageCoordinateService manageCoordinateService;
+ @Autowired
+ private ManageCoordinateMapper manageCoordinateMapper;
@@ -41,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);
@@ -77,10 +78,7 @@
return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(),
ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
}
- Integer integer = manageCoordinateService.deleteCoordinate(id);
- if (integer==1){
- return ResultMessage.ok("������������");
- }
+ manageCoordinateService.deleteCoordinate(id);
return ResultMessage.ok();
}
@@ -90,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