31
aijinhui
2024-03-26 82f8f0065a27acf9f7e1558b04fa75ce68a7fa50
ard-work/src/main/java/com/ruoyi/sy/controller/ArdSyCarController.java
@@ -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){
@@ -369,7 +369,7 @@
        SysUser sysUser = sysUserService.selectUserById(usersId);
        Map<String, Map<String,Map<String,Object>>> deptPositionMap = PositionContainer.getDeptPositionMap();
        if(deptPositionMap.isEmpty()){
            return Results.succeed();
            return Results.error("31平台无车辆位置返回");
        }else {
//            return Results.succeed(deptPositionMap.get(sysUser.getDeptId().toString()).get(map.get("carId")));
            return Results.succeed(deptPositionMap.get(sysUser.getDeptId().toString()));