From 0771b90c0e49714e1682dc133d1bebafb545dd5a Mon Sep 17 00:00:00 2001
From: zhangnaisong <2434969829@qq.com>
Date: 星期六, 02 三月 2024 19:45:12 +0800
Subject: [PATCH] app无人机航线管理提交
---
ard-work/src/main/java/com/ruoyi/sy/controller/ArdSyCarController.java | 25 +++++++++++++++++++------
1 files changed, 19 insertions(+), 6 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/sy/controller/ArdSyCarController.java b/ard-work/src/main/java/com/ruoyi/sy/controller/ArdSyCarController.java
index c9cb84e..2df19c5 100644
--- a/ard-work/src/main/java/com/ruoyi/sy/controller/ArdSyCarController.java
+++ b/ard-work/src/main/java/com/ruoyi/sy/controller/ArdSyCarController.java
@@ -44,7 +44,7 @@
/**
* 涓変竴杞﹁締Controller
- *
+ *
* @author ard
* @date 2023-06-26
*/
@@ -113,8 +113,8 @@
ardSyCarService.sendArdSyCarPosition();
}
};
- carPositionTimer.scheduleAtFixedRate(carPositionTask,date,3*1000);//鍚敤
- //杞﹁締瀹炴椂浣嶇疆绾跨▼
+ //carPositionTimer.scheduleAtFixedRate(carPositionTask,date,3*1000);//寮冪敤
+ //杞﹁締瀹炴椂鎶ヨ绾跨▼
PushClientImplAlarm pushClientImplAlarm = new PushClientImplAlarm(ip,ardSyUserList.get(0).getUserId(),ardSyUserList.get(0).getPassword());
Thread pushClientImplAlarmThread = new Thread(pushClientImplAlarm);
pushClientImplAlarmThread.start();
@@ -188,7 +188,7 @@
*/
@PreAuthorize("@ss.hasPermi('sy:syCar:remove')")
@Log(title = "涓変竴杞﹁締", businessType = BusinessType.DELETE)
- @DeleteMapping("/{ids}")
+ @DeleteMapping("/{ids}")
@ApiOperation("鍒犻櫎涓変竴杞﹁締")
public AjaxResult remove(@PathVariable String[] ids)
{
@@ -326,7 +326,7 @@
}
}
-// @PreAuthorize("@ss.hasPermi('sy:syCar:carListById')")
+ // @PreAuthorize("@ss.hasPermi('sy:syCar:carListById')")
@PostMapping("/carListById/{id}")
@ApiOperation("鏍规嵁杞﹁締ID鑾峰彇杞﹁締鍒楄〃")
public Results carListById(@PathVariable String id){
@@ -460,7 +460,7 @@
@GetMapping("getThreeOne")
@ApiOperation("鑾峰彇涓変竴瑙嗛鍦板潃")
public AjaxResult getThreeOne() {
- return AjaxResult.success("鑾峰彇鍦板潃鎴愬姛锛�",sysConfigService.selectConfigByKey("threeOneVideo"));
+ return AjaxResult.success("鑾峰彇鍦板潃鎴愬姛锛�",sysConfigService.getSYVideo());
}
@PreAuthorize("@ss.hasPermi('sy:syCar:getAlarmHPfmCountDetail')")
@@ -478,4 +478,17 @@
return AjaxResult.success(mapDetail);
}
+ @GetMapping("/getOnlineSYCarPosition")
+ @ApiOperation("鍗曞叺绔煡鐪嬪凡閫氳繃瀹℃壒鐨勫湪绾夸笁涓�杞﹁締浣嶇疆")
+ public AjaxResult getOnlineSYCarPosition() {
+ String soilderId = SecurityUtils.getUserId();
+ try{
+ Map<String,Object> result = ardSyCarService.getOnlineSYCarPosition(soilderId);
+ return AjaxResult.success(result);
+ }catch(Exception e){
+ e.printStackTrace();
+ return AjaxResult.error();
+ }
+ }
+
}
--
Gitblit v1.9.3