From 8b5439ba2748f91720975f73e7479a751d6a452b Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Sat, 07 Oct 2023 14:55:52 +0800
Subject: [PATCH] Merge branch 'cjl' into qa
---
screen-manage/src/main/java/com/moral/api/controller/ManageCoordinateController.java | 34 +++++++++++++++++++---------------
1 files changed, 19 insertions(+), 15 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 a546546..c058d89 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;
@@ -22,6 +21,13 @@
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
@@ -35,19 +41,19 @@
private ManageCoordinateMapper manageCoordinateMapper;
-
/**
* ������������������
+ *
* @param params
* @return
*/
@PostMapping("interCruiserRoad")
- public ResultMessage interCruiserRoad(@RequestBody Map<String,Object> params){
- if (!params.containsKey("startPoint") || !params.containsKey("endPoint")) {
+ 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();
@@ -56,12 +62,13 @@
/**
* ������������������
+ *
* @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);
@@ -70,12 +77,13 @@
/**
* ������������������
+ *
* @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());
}
@@ -89,12 +97,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