From 57c673aa3e83677bcf5d30b4b45d06bae6609db8 Mon Sep 17 00:00:00 2001
From: liusuyi <1951119284@qq.com>
Date: 星期四, 08 八月 2024 16:14:40 +0800
Subject: [PATCH] 优化：获取会话

---
 ard-work/src/main/java/com/ruoyi/app/application/controller/ArdAppApplicationController.java |   56 ++++++++++++++++++++++++++++++++++++++++++++++++--------
 1 files changed, 48 insertions(+), 8 deletions(-)

diff --git a/ard-work/src/main/java/com/ruoyi/app/application/controller/ArdAppApplicationController.java b/ard-work/src/main/java/com/ruoyi/app/application/controller/ArdAppApplicationController.java
index 5b5d0d5..f061476 100644
--- a/ard-work/src/main/java/com/ruoyi/app/application/controller/ArdAppApplicationController.java
+++ b/ard-work/src/main/java/com/ruoyi/app/application/controller/ArdAppApplicationController.java
@@ -1,5 +1,6 @@
 package com.ruoyi.app.application.controller;
 
+import java.awt.geom.QuadCurve2D;
 import java.util.List;
 import java.util.Map;
 import javax.servlet.http.HttpServletResponse;
@@ -108,7 +109,7 @@
     }
 
     @PostMapping("/sendCheckCommandersPosition")
-    @ApiOperation("鍙戣捣鏌ョ湅鎸囨尌绔綅缃�")
+    //@ApiOperation("鍙戣捣鏌ョ湅鎸囨尌绔綅缃�")
     public AjaxResult sendCheckCommandersPosition(@RequestBody Map<String,Object> para) {
         String usersId = SecurityUtils.getUserId();
         try{
@@ -121,7 +122,7 @@
     }
 
     @PostMapping("/sendCheckSYCarsPosition")
-    @ApiOperation("鍙戣捣鏌ョ湅杞﹁締浣嶇疆")
+    //@ApiOperation("鍙戣捣鏌ョ湅杞﹁締浣嶇疆")
     public AjaxResult sendCheckSYCarsPosition(@RequestBody Map<String,Object> para) {
         String usersId = SecurityUtils.getUserId();
         try{
@@ -134,7 +135,7 @@
     }
 
     @GetMapping("/getCheckPosition")
-    @ApiOperation("鎸囨尌绔煡鐪嬩綅缃敵璇�")
+    //@ApiOperation("鎸囨尌绔煡鐪嬩綅缃敵璇�")
     public AjaxResult getCheckPosition() {
         String usersId = SecurityUtils.getUserId();
         try{
@@ -147,7 +148,7 @@
     }
 
     @PutMapping("/approvalCheckPosition")
-    @ApiOperation("鎸囨尌绔鎵圭敵璇�")
+    //@ApiOperation("鎸囨尌绔鎵圭敵璇�")
     public AjaxResult approvalCheckPosition(@RequestBody Map<String,String> para) {
         String commanderId = SecurityUtils.getUserId();
         try{
@@ -160,7 +161,7 @@
     }
 
     @GetMapping("/getCheckPositionTrue")
-    @ApiOperation("鎸囨尌绔煡鐪嬮�氳繃鐨勭敵璇�")
+    //@ApiOperation("鎸囨尌绔煡鐪嬮�氳繃鐨勭敵璇�")
     public AjaxResult getCheckPositionTrue() {
         String commanderId = SecurityUtils.getUserId();
         try{
@@ -173,7 +174,7 @@
     }
 
     @GetMapping("/getCheckPositionOwn")
-    @ApiOperation("鍗曞叺绔煡鐪嬪凡瀹℃壒鐨勭敵璇�")
+    //@ApiOperation("鍗曞叺绔煡鐪嬪凡瀹℃壒鐨勭敵璇�")
     public AjaxResult getCheckPositionOwn() {
         String soilderId = SecurityUtils.getUserId();
         try{
@@ -186,7 +187,7 @@
     }
 
     @PutMapping("/approvalCheckPositionOwn")
-    @ApiOperation("鍗曞叺绔鎵规洿鏀规煡鐪嬫爣璁�")
+    //@ApiOperation("鍗曞叺绔鎵规洿鏀规煡鐪嬫爣璁�")
     public AjaxResult approvalCheckPositionOwn(@RequestBody Map<String,String> para) {
         String soilderId = SecurityUtils.getUserId();
         try{
@@ -199,7 +200,7 @@
     }
 
     @GetMapping("/getSendPositionTrue")
-    @ApiOperation("鍗曞叺绔煡鐪嬮�氳繃鐨勭敵璇�")
+    //@ApiOperation("鍗曞叺绔煡鐪嬮�氳繃鐨勭敵璇�")
     public AjaxResult getSendPositionTrue() {
         String soilderId = SecurityUtils.getUserId();
         try{
@@ -210,4 +211,43 @@
             return AjaxResult.error();
         }
     }
+
+    @GetMapping("/getCheckPositionNo")
+    //@ApiOperation("PC绔煡鐪嬫湭瀹℃壒鐨勭敵璇�")
+    public AjaxResult getCheckPositionNo() {//
+        String commanderId = SecurityUtils.getUserId();
+        try{
+            List<Map<String,Object>> result = ardAppApplicationService.getCheckPositionNo(commanderId);
+            return AjaxResult.success(result);
+        }catch(Exception e){
+            e.printStackTrace();
+            return AjaxResult.error();
+        }
+    }
+
+    @PostMapping("/getSoilderAndCarPositionByCommanderIdNear")
+    //@ApiOperation("PC绔寚鎸ョ鏌ョ湅鍗曞叺绔強杞﹁締浣嶇疆")
+    public AjaxResult getSoilderAndCarPositionByCommanderIdNear(@RequestBody Map<String, Double> para) {
+        String commanderId = SecurityUtils.getUserId();
+        try{
+            Map<String,Map<String,List<Map<String,Object>>>> result = ardAppApplicationService.getSoilderAndCarPositionByCommanderId(commanderId,para);
+            return AjaxResult.success(result);
+        }catch(Exception e){
+            e.printStackTrace();
+            return AjaxResult.error();
+        }
+    }
+
+    @GetMapping("/getSendPositionALL")
+    //@ApiOperation("鍗曞叺绔煡鐪嬪彂璧风殑鍏ㄩ儴鐢宠")
+    public AjaxResult getSendPositionALL() {
+        String soilderId = SecurityUtils.getUserId();
+        try{
+            Map<String,List<Map<String,Object>>> result = ardAppApplicationService.getSendPositionALL(soilderId);
+            return AjaxResult.success(result);
+        }catch(Exception e){
+            e.printStackTrace();
+            return AjaxResult.error();
+        }
+    }
 }

--
Gitblit v1.9.3