From bf2f8eed673c71b28364e91223bd6fe86be3b07c Mon Sep 17 00:00:00 2001 From: zhangnaisong <2434969829@qq.com> Date: 星期六, 09 三月 2024 13:58:21 +0800 Subject: [PATCH] app申请去掉@ApiOperation修改提交 --- ard-work/src/main/java/com/ruoyi/app/application/controller/ArdAppApplicationController.java | 43 +++++++++++++++++++++++++++++++++++-------- 1 files changed, 35 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..abcbba2 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,30 @@ 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(); + } + } } -- Gitblit v1.9.3