From bb6856a82a588f05040b0410a9747ae8029bb3be Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Fri, 13 Oct 2023 10:06:51 +0800
Subject: [PATCH] Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into wb
---
screen-manage/src/main/java/com/moral/api/controller/ManageCoordinateController.java | 57 +++++++++++++++++++++++----------------------------------
1 files changed, 23 insertions(+), 34 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..ae841cc 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
@@ -1,51 +1,45 @@
package com.moral.api.controller;
-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;
-import org.springframework.web.bind.annotation.CrossOrigin;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.List;
-import java.util.Map;
-
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;
+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
@Api(tags = {"������������������"})
@RequestMapping("coordinate")
-@CrossOrigin(origins = "*", maxAge = 3600)
public class ManageCoordinateController {
@Autowired
private ManageCoordinateService manageCoordinateService;
-
+ @Autowired
+ 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();
@@ -54,12 +48,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);
@@ -68,19 +63,17 @@
/**
* ������������������
+ *
* @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());
}
- Integer integer = manageCoordinateService.deleteCoordinate(id);
- if (integer==1){
- return ResultMessage.ok("������������");
- }
+ manageCoordinateService.deleteCoordinate(id);
return ResultMessage.ok();
}
@@ -90,12 +83,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