From 9ab7ea8617a47e24abe48ab395ace2c4ecd4af62 Mon Sep 17 00:00:00 2001
From: Administrator <1144154118@qq.com>
Date: 星期三, 26 七月 2023 09:42:07 +0800
Subject: [PATCH] teamId返回结构优化
---
ard-work/src/main/java/com/ruoyi/sy/controller/ArdSyCarController.java | 27 ++++++++++++++++++++++++++-
1 files changed, 26 insertions(+), 1 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 045accc..725981e 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
@@ -3,6 +3,7 @@
import java.util.*;
import javax.annotation.PostConstruct;
import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import com.ruoyi.common.core.domain.entity.SysUser;
@@ -32,6 +33,8 @@
import com.ruoyi.sy.service.IArdSyCarService;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.common.core.page.TableDataInfo;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
import org.springframework.web.multipart.MultipartFile;
/**
@@ -292,6 +295,9 @@
if(ardSyUser!=null) {
//鏌ヨ鍑�31鐨勮溅杈嗘暟鎹�
List<Map<String,String>> list = ardSyCarService.getCarList(ardSyUser,syURL,usersId,teamId);
+ if(list.isEmpty()){
+ return Results.succeed(new ArrayList());
+ }
//鏍规嵁userId鏌ヨ閮ㄩ棬Id
SysUser sysUser = sysUserService.selectUserById(usersId);
//鏍规嵁褰撳墠deptId鎴栬�呭綋鍓嶅強鎵�灞炰笅绾х殑鎵�鏈塪eptId
@@ -304,9 +310,28 @@
}
@PreAuthorize("@ss.hasPermi('sy:syCar:carListById')")
- @GetMapping("/carListById/{id}")
+ @PostMapping("/carListById/{id}")
@ApiOperation("鏍规嵁杞﹁締ID鑾峰彇杞﹁締鍒楄〃")
public Results carListById(@PathVariable String id){
return ardSyCarService.carListById(id);
}
+
+ @PreAuthorize("@ss.hasPermi('sy:syCar:getCarGPSHistory')")
+ @PostMapping("getCarGPSHistory")
+ @ApiOperation("鏍规嵁杞﹁締ID鑾峰彇鍘嗗彶杞ㄨ抗")
+ public Results getCarGPSTrack(@RequestBody Map<String,String> map) {
+ String usersId = SecurityUtils.getUserId();
+ ArdSyUser ardSyUser = iArdSyUserService.userById(usersId);
+ String syURL = sysConfigService.getSYURL();
+ return ardSyCarService.getCarGPSTrack(map,syURL, ardSyUser);
+ }
+
+ @PreAuthorize("@ss.hasPermi('sy:syCar:getArdSyUserByUsersId')")
+ @PostMapping("getArdSyUserByUsersId")
+ @ApiOperation("鑾峰彇涓変竴骞冲彴瀵瑰簲鐢ㄦ埛鍚嶅瘑鐮�")
+ public Results getArdSyUserByUsersId(@RequestBody Map<String,String> map) {
+ String usersId = SecurityUtils.getUserId();
+ ArdSyUser ardSyUser = iArdSyUserService.userById(usersId);
+ return Results.succeed(ardSyUser);
+ }
}
--
Gitblit v1.9.3