雷达查询加入自定义权限修改提交

zhangnaisong

2024-07-19 55bfebcee6b804faaa65d41105d4333a4117aab5

 ard-work/src/main/java/com/ruoyi/sy/controller/ArdSyCarController.java

@@ -13,7 +13,9 @@
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.uuid.IdUtils;
import com.ruoyi.sy.gps31.PushClientImplSerialPort;
import com.ruoyi.sy.param.ArdSyCarParam;
import com.ruoyi.sy.service.IArdTankAbnormalParkAlarmService;
import com.ruoyi.sy.vo.ArdSyCarVo;
import com.ruoyi.sy.domain.ArdSyUser;
import com.ruoyi.sy.gps31.PositionContainer;
@@ -71,6 +73,9 @@
    @Autowired
    private ISysDeptService sysDeptService;

    @Autowired
    private IArdTankAbnormalParkAlarmService ardTankAbnormalParkAlarmService;

    @Resource
    private SYClient sYClient;

@@ -78,6 +83,12 @@

    @Value("${syCar.enabled}")
    private Boolean syCarEnabled;

    @Value("${syCar.userId}")
    private String userId;

    @Value("${syCar.password}")
    private String password;

    @PostConstruct
    public void init(){
@@ -101,7 +112,8 @@
        {
            return;
        }
        PushClientImplPosition pushClientImplPosition = new PushClientImplPosition(ip,ardSyUserList.get(0).getUserId(),ardSyUserList.get(0).getPassword());
        //PushClientImplPosition pushClientImplPosition = new PushClientImplPosition(ip,ardSyUserList.get(0).getUserId(),ardSyUserList.get(0).getPassword());
        PushClientImplPosition pushClientImplPosition = new PushClientImplPosition(ip,userId,password);
        Thread pushClientImplPositionThread = new Thread(pushClientImplPosition);
        pushClientImplPositionThread.start();

@@ -113,11 +125,19 @@
                ardSyCarService.sendArdSyCarPosition();
            }
        };
        carPositionTimer.scheduleAtFixedRate(carPositionTask,date,3*1000);//启用
        //车辆实时位置线程
        PushClientImplAlarm pushClientImplAlarm = new PushClientImplAlarm(ip,ardSyUserList.get(0).getUserId(),ardSyUserList.get(0).getPassword());
        //carPositionTimer.scheduleAtFixedRate(carPositionTask,date,3*1000);//弃用
        //车辆实时报警线程
        //PushClientImplAlarm pushClientImplAlarm = new PushClientImplAlarm(ip,ardSyUserList.get(0).getUserId(),ardSyUserList.get(0).getPassword());
        PushClientImplAlarm pushClientImplAlarm = new PushClientImplAlarm(ip,userId,password);
        Thread pushClientImplAlarmThread = new Thread(pushClientImplAlarm);
        pushClientImplAlarmThread.start();

        PushClientImplSerialPort pushClientImplSerialPort = new PushClientImplSerialPort(ip,userId,password);
        Thread pushClientImplSerialPortThread = new Thread(pushClientImplSerialPort);
        pushClientImplSerialPortThread.start();

        //删除结束时间为null的记录
        int result = ardTankAbnormalParkAlarmService.deleteArdTankAbnormalParkAlarmByEndTime();
    }

    /**
@@ -188,7 +208,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 +346,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 +389,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()));
@@ -478,4 +498,17 @@
        return AjaxResult.success(mapDetail);
    }

    @GetMapping("/getOnlineSYCarPosition")
    @ApiOperation("单兵端查看已通过审批的在线三一车辆位置")
    public AjaxResult getOnlineSYCarPosition() {
        String soilderId = SecurityUtils.getUserId();
        try{
            Map<String,Object> result = ardSyCarService.getOnlineSYCarPosition(soilderId);
            return AjaxResult.success(result);
        }catch(Exception e){
            e.printStackTrace();
            return AjaxResult.error();
        }
    }

}