From 0abccf5e570dce53a802bca4ce25118dd900692c Mon Sep 17 00:00:00 2001 From: aijinhui <aijinhui> Date: 星期五, 23 二月 2024 14:07:21 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- ard-work/src/main/java/com/ruoyi/app/application/controller/ArdAppApplicationController.java | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 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 72120d3..4a3ee50 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; @@ -223,4 +224,17 @@ return AjaxResult.error(); } } + + @GetMapping("/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(); + } + } } -- Gitblit v1.9.3