teamId返回结构优化

Administrator

2023-07-26 9ab7ea8617a47e24abe48ab395ace2c4ecd4af62

 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或者当前及所属下级的所有deptId
@@ -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);
    }
}