From 495fad8166b5952c013aea275243cb9ee6e7fa2a Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Tue, 10 Oct 2023 13:43:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/qa' into qa
---
screen-manage/src/main/java/com/moral/api/controller/ManageCoordinateController.java | 27 +++++++++------------------
1 files changed, 9 insertions(+), 18 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 c058d89..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
@@ -21,13 +21,6 @@
import com.moral.api.service.ManageCoordinateService;
import com.moral.constant.ResponseCodeEnum;
import com.moral.constant.ResultMessage;
-import io.swagger.annotations.Api;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
-import java.util.Map;
@Slf4j
@RestController
@@ -41,19 +34,19 @@
private ManageCoordinateMapper manageCoordinateMapper;
+
/**
* ������������������
- *
* @param params
* @return
*/
@PostMapping("interCruiserRoad")
- public ResultMessage interCruiserRoad(@RequestBody Map<String, Object> params) {
+ public ResultMessage interCruiserRoad(@RequestBody Map<String,Object> params){
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);
- if (integer == null) {
+ if (integer==null){
return ResultMessage.ok("���������������");
}
return ResultMessage.ok();
@@ -62,13 +55,12 @@
/**
* ������������������
- *
* @param manageCoordinate
* @return
*/
@PostMapping("updateCruiserRoad")
- public ResultMessage updateCruiserRoad(@RequestBody ManageCoordinate manageCoordinate) {
- if (ObjectUtils.isEmpty(manageCoordinate)) {
+ public ResultMessage updateCruiserRoad(@RequestBody ManageCoordinate manageCoordinate){
+ if (ObjectUtils.isEmpty(manageCoordinate)){
return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(), ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
}
manageCoordinateService.updateCoordinate(manageCoordinate);
@@ -77,13 +69,12 @@
/**
* ������������������
- *
* @param id
* @return
*/
@GetMapping("deleteCruiserRoad")
- public ResultMessage deleteCruiser(Integer id) {
- if (id == null) {
+ public ResultMessage deleteCruiser(Integer id){
+ if (id==null){
return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(),
ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
}
@@ -97,8 +88,8 @@
* @return
*/
@GetMapping("selectCruiserRoad")
- public ResultMessage selectCruiser(String name, String mac) {
- List<ManageCoordinate> manageCoordinates = manageCoordinateService.selectCoordinate(name, mac);
+ public ResultMessage selectCruiser(String name,String mac){
+ List<ManageCoordinate> manageCoordinates = manageCoordinateService.selectCoordinate(name,mac);
return ResultMessage.ok(manageCoordinates);
}
}
--
Gitblit v1.8.0