From 01dd9c8e4c755a7272205425b0d81316fa3b503c Mon Sep 17 00:00:00 2001
From: zhangnaisong <2434969829@qq.com>
Date: 星期五, 28 七月 2023 17:31:29 +0800
Subject: [PATCH] 三一车辆追踪优化提交
---
ard-work/src/main/java/com/ruoyi/sy/controller/ArdSyCarController.java | 32 +++++++++++++++++++++++++++-----
1 files changed, 27 insertions(+), 5 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 94486e7..2cd4eef 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
@@ -342,10 +342,10 @@
return Results.succeed(map);
}
- @PreAuthorize("@ss.hasPermi('sy:syCar:getSDKCarBycarId')")
- @PostMapping("getSDKCarBycarId")
- @ApiOperation("鑾峰彇杞﹁締浣嶇疆")
- public Results getSDKCarBycarId(@RequestBody Map<String,String> map){
+ @PreAuthorize("@ss.hasPermi('sy:syCar:getSDKCarPositionByRight')")
+ @PostMapping("getSDKCarPositionByRight")
+ @ApiOperation("鑾峰彇閮ㄩ棬鏉冮檺涓嬫墍鏈夎溅杈嗕綅缃�")
+ public Results getSDKCarPositionByRight(){
String usersId = SecurityUtils.getUserId();
//鏍规嵁userId鏌ヨ閮ㄩ棬Id
SysUser sysUser = sysUserService.selectUserById(usersId);
@@ -353,7 +353,29 @@
if(deptPositionMap.isEmpty()){
return Results.succeed();
}else {
- return Results.succeed(deptPositionMap.get(sysUser.getDeptId().toString()).get(map.get("carId")));
+// return Results.succeed(deptPositionMap.get(sysUser.getDeptId().toString()).get(map.get("carId")));
+ return Results.succeed(deptPositionMap.get(sysUser.getDeptId().toString()));
}
}
+
+ @PreAuthorize("@ss.hasPermi('sy:syCar:getCarNearPositionByCarId')")
+ @PostMapping("getCarNearPositionByCarId")
+ @ApiOperation("鑾峰彇鍗曚釜杞﹁締浣嶇疆")
+ public Results getCarNearPositionByCarId(@RequestBody Map<String,String> map){
+ String usersId = SecurityUtils.getUserId();
+ ArdSyUser ardSyUser = iArdSyUserService.userById(usersId);
+ String carId = map.get("carId");
+ String syURL = sysConfigService.getSYURL();
+ return ardSyCarService.getCarGPSBycarId(usersId,carId,syURL,ardSyUser);
+ }
+
+ @PreAuthorize("@ss.hasPermi('sy:syCar:chaseCarByCarId')")
+ @PostMapping("chaseCarByCarId")
+ @ApiOperation("鏍规嵁杞﹁締涓婚敭杩借釜杞﹁締")
+ public Results chaseCarByCarId(@RequestBody Map<String,String> map){
+ String usersId = SecurityUtils.getUserId();
+ String carId = map.get("carId");
+ String cycle = map.get("cycle");
+ return ardSyCarService.chaseCarByCarId(usersId,carId,cycle);
+ }
}
--
Gitblit v1.9.3