Administrator
2023-07-26 314acd3a006638ac8a2d620a1703ab2045d05927
ard-work/src/main/java/com/ruoyi/sy/controller/ArdSyCarController.java
@@ -10,6 +10,7 @@
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.uuid.IdUtils;
import com.ruoyi.sy.domain.ArdSyUser;
import com.ruoyi.sy.gps31.PositionContainer;
import com.ruoyi.sy.gps31.PushClientImplAlarm;
import com.ruoyi.sy.gps31.PushClientImplPosition;
import com.ruoyi.sy.service.IArdSyUserService;
@@ -295,6 +296,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
@@ -326,9 +330,30 @@
    @PreAuthorize("@ss.hasPermi('sy:syCar:getArdSyUserByUsersId')")
    @PostMapping("getArdSyUserByUsersId")
    @ApiOperation("获取三一平台对应用户名密码")
    public Results getArdSyUserByUsersId(@RequestBody Map<String,String> map) {
    public Results getArdSyUserByUsersId() {
        String usersId = SecurityUtils.getUserId();
        ArdSyUser ardSyUser = iArdSyUserService.userById(usersId);
        return Results.succeed(ardSyUser);
        Map<String,Object> map = new HashMap<>();
        if(ardSyUser==null){
            return Results.succeed();
        }else {
            map.put("userId",ardSyUser.getUserId());
        }
        return Results.succeed(map);
    }
    @PreAuthorize("@ss.hasPermi('sy:syCar:getSDKCarBycarId')")
    @PostMapping("getSDKCarBycarId")
    @ApiOperation("获取车辆位置")
    public Results getSDKCarBycarId(@RequestBody Map<String,String> map){
        String usersId = SecurityUtils.getUserId();
        //根据userId查询部门Id
        SysUser sysUser = sysUserService.selectUserById(usersId);
        Map<String, Map<String,Map<String,Object>>> deptPositionMap = PositionContainer.getDeptPositionMap();
        if(deptPositionMap.isEmpty()){
            return Results.succeed();
        }else {
            return Results.succeed(deptPositionMap.get(sysUser.getDeptId().toString()).get(map.get("carId")));
        }
    }
}