From 0aea8bd18daaaf91e622fdcfdd81dbb2e1b4860c Mon Sep 17 00:00:00 2001
From: swb <jpy123456>
Date: Mon, 21 Oct 2024 09:01:18 +0800
Subject: [PATCH] fix:立行立改责任主体修改提交

---
 screen-manage/src/main/java/com/moral/api/controller/ManageCoordinateController.java |   73 ++++++++++++++++++++----------------
 1 files changed, 40 insertions(+), 33 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..a78d5ee 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,32 +1,25 @@
 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.pojo.form.coordinate.CoordinateCode;
 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
@@ -36,16 +29,17 @@
 
     /**
      * ������������������
+     *
      * @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,33 +48,32 @@
 
     /**
      * ������������������
-     * @param manageCoordinate
+     *
+     * @param coordinateCode
      * @return
      */
     @PostMapping("updateCruiserRoad")
-    public ResultMessage updateCruiserRoad(@RequestBody ManageCoordinate manageCoordinate){
-        if (ObjectUtils.isEmpty(manageCoordinate)){
+    public ResultMessage updateCruiserRoad(@RequestBody CoordinateCode coordinateCode) {
+        if (ObjectUtils.isEmpty(coordinateCode)) {
             return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(), ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
         }
-        manageCoordinateService.updateCoordinate(manageCoordinate);
+        manageCoordinateService.updateCoordinate(coordinateCode);
         return ResultMessage.ok();
     }
 
     /**
      * ������������������
+     *
      * @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,26 @@
      * @return
      */
     @GetMapping("selectCruiserRoad")
-    public ResultMessage selectCruiser(){
-        List<ManageCoordinate> manageCoordinates = manageCoordinateService.selectCoordinate();
-        if (ObjectUtils.isEmpty(manageCoordinates)){
+    public ResultMessage selectCruiser(String name, String mac) {
+        List<ManageCoordinate> manageCoordinates = manageCoordinateService.selectCoordinate(name, mac);
+        return ResultMessage.ok(manageCoordinates);
+    }
+
+    /**
+     * ������id������������������
+     * @param id
+     * @return
+     */
+    @GetMapping("query")
+    public ResultMessage query(Integer id){
+        ManageCoordinate manageCoordinate = manageCoordinateService.query(id);
+        if (ObjectUtils.isEmpty(manageCoordinate)){
             return ResultMessage.fail(ResponseCodeEnum.TARGET_IS_NULL.getCode(),
                     ResponseCodeEnum.TARGET_IS_NULL.getMsg());
         }
-        return ResultMessage.ok(manageCoordinates);
+        return ResultMessage.ok(manageCoordinate);
     }
+
+
+
 }

--
Gitblit v1.8.0