From 7367cf50bcceb23194aa071b696f126935dfd069 Mon Sep 17 00:00:00 2001
From: zhangnaisong <2434969829@qq.com>
Date: 星期三, 31 一月 2024 09:19:35 +0800
Subject: [PATCH] 禁出电子围栏报警逻辑修改提交
---
ard-work/src/main/java/com/ruoyi/app/position/controller/ArdAppPositionController.java | 46 ++++++++++++++++++++++++++++++++++++----------
1 files changed, 36 insertions(+), 10 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 75b8e6a..7565542 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
@@ -226,7 +226,20 @@
return AjaxResult.success(result);
}
- @PostMapping("/sendCheckCommandersPosition")
+ @GetMapping("/getOnlineCommanderPosition")
+ @ApiOperation("鍗曞叺绔煡鐪嬪凡閫氳繃瀹℃壒鐨勫湪绾挎寚鎸ョ浣嶇疆")
+ public AjaxResult getOnlineCommanderPosition() {
+ String soilderId = SecurityUtils.getUserId();
+ try{
+ List<Map<String,Object>> result = ardAppPositionService.getOnlineCommanderPosition(soilderId);
+ return AjaxResult.success(result);
+ }catch(Exception e){
+ e.printStackTrace();
+ return AjaxResult.error();
+ }
+ }
+
+ /*@PostMapping("/sendCheckCommandersPosition")
@ApiOperation("鍙戣捣鏌ョ湅鎸囨尌绔綅缃�")
public AjaxResult sendCheckCommandersPosition(@RequestBody Map<String,Object> para) {
String usersId = SecurityUtils.getUserId();
@@ -236,9 +249,9 @@
}catch(Exception e){
return AjaxResult.error();
}
- }
+ }*/
- @PostMapping("/sendCheckSYCarsPosition")
+ /*@PostMapping("/sendCheckSYCarsPosition")
@ApiOperation("鍙戣捣鏌ョ湅杞﹁締浣嶇疆")
public AjaxResult sendCheckSYCarsPosition(@RequestBody Map<String,Object> para) {
String usersId = SecurityUtils.getUserId();
@@ -248,11 +261,11 @@
}catch(Exception e){
return AjaxResult.error();
}
- }
+ }*/
- @GetMapping("/getCheckCommandersPosition")
+ /*@GetMapping("/getCheckCommandersPosition")
@ApiOperation("鎸囨尌绔煡鐪嬫寚鎸ョ浣嶇疆鐢宠")
- public AjaxResult getCheckCommandersPosition() {
+ public AjaxResult getCheckCommandersPosition() {//寮冪敤
String usersId = SecurityUtils.getUserId();
try{
List<Map<String,Object>> result = ardAppPositionService.getCheckCommandersPosition(usersId);
@@ -261,11 +274,11 @@
e.printStackTrace();
return AjaxResult.error();
}
- }
+ }*/
- @GetMapping("/getCheckSYCarsPosition")
+ /*@GetMapping("/getCheckSYCarsPosition")
@ApiOperation("鎸囨尌绔煡鐪嬭溅杈嗕綅缃敵璇�")
- public AjaxResult getCheckSYCarsPosition() {
+ public AjaxResult getCheckSYCarsPosition() {//寮冪敤
String usersId = SecurityUtils.getUserId();
try{
List<Map<String,Object>> result = ardAppPositionService.getCheckSYCarsPosition(usersId);
@@ -274,6 +287,19 @@
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();
+ }
+ }*/
}
--
Gitblit v1.9.3