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/position/controller/ArdAppPositionController.java | 65 +++++---------------------------
1 files changed, 10 insertions(+), 55 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/app/position/controller/ArdAppPositionController.java b/ard-work/src/main/java/com/ruoyi/app/position/controller/ArdAppPositionController.java
index 7565542..7bd5258 100644
--- a/ard-work/src/main/java/com/ruoyi/app/position/controller/ArdAppPositionController.java
+++ b/ard-work/src/main/java/com/ruoyi/app/position/controller/ArdAppPositionController.java
@@ -239,67 +239,22 @@
}
}
- /*@PostMapping("/sendCheckCommandersPosition")
- @ApiOperation("鍙戣捣鏌ョ湅鎸囨尌绔綅缃�")
- public AjaxResult sendCheckCommandersPosition(@RequestBody Map<String,Object> para) {
- String usersId = SecurityUtils.getUserId();
+ @GetMapping("/getAPPPositionByUserIdAndTime")
+ @ApiOperation("鏌ョ湅APP鍘嗗彶浣嶇疆")
+ public AjaxResult getAPPPositionByUserIdAndTime(@RequestBody Map<String,String> para) {
try{
- ardAppPositionService.sendCheckCommandersPosition(usersId,para);
- return AjaxResult.success();
- }catch(Exception e){
- return AjaxResult.error();
- }
- }*/
-
- /*@PostMapping("/sendCheckSYCarsPosition")
- @ApiOperation("鍙戣捣鏌ョ湅杞﹁締浣嶇疆")
- public AjaxResult sendCheckSYCarsPosition(@RequestBody Map<String,Object> para) {
- String usersId = SecurityUtils.getUserId();
- try{
- ardAppPositionService.sendCheckSYCarsPosition(usersId,para);
- return AjaxResult.success();
- }catch(Exception e){
- return AjaxResult.error();
- }
- }*/
-
- /*@GetMapping("/getCheckCommandersPosition")
- @ApiOperation("鎸囨尌绔煡鐪嬫寚鎸ョ浣嶇疆鐢宠")
- public AjaxResult getCheckCommandersPosition() {//寮冪敤
- String usersId = SecurityUtils.getUserId();
- try{
- List<Map<String,Object>> result = ardAppPositionService.getCheckCommandersPosition(usersId);
+ List<ArdAppPosition> result = ardAppPositionService.getAPPPositionByUserIdAndTime(para);
return AjaxResult.success(result);
}catch(Exception e){
e.printStackTrace();
return AjaxResult.error();
}
- }*/
+ }
- /*@GetMapping("/getCheckSYCarsPosition")
- @ApiOperation("鎸囨尌绔煡鐪嬭溅杈嗕綅缃敵璇�")
- public AjaxResult getCheckSYCarsPosition() {//寮冪敤
- String usersId = SecurityUtils.getUserId();
- try{
- List<Map<String,Object>> result = ardAppPositionService.getCheckSYCarsPosition(usersId);
- return AjaxResult.success(result);
- }catch(Exception e){
- e.printStackTrace();
- return AjaxResult.error();
- }
- }*/
-
- /*@GetMapping("/getCheckPosition")
- @ApiOperation("鎸囨尌绔煡鐪嬩綅缃敵璇�")
- public AjaxResult getCheckPosition() {
- String usersId = SecurityUtils.getUserId();
- try{
- Map<String,List<Map<String,Object>>> result = ardAppPositionService.getCheckPosition(usersId);
- return AjaxResult.success(result);
- }catch(Exception e){
- e.printStackTrace();
- return AjaxResult.error();
- }
- }*/
+ @GetMapping("/getOnlineAPPSoilderByCommanderId")
+ public AjaxResult getOnlineAPPSoilderByCommanderId() {
+ String userId = SecurityUtils.getUserId();
+ return success(ardAppPositionService.getOnlineAPPSoilderByCommanderId(userId));
+ }
}
--
Gitblit v1.9.3