三一车辆追踪修改提交

zhangnaisong

2024-02-01 ff93a75e1ede2f3a66de84efd822cfa94b0ac821

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

@@ -1,7 +1,6 @@
package com.ruoyi.sy.controller;

import java.io.UnsupportedEncodingException;
import java.net.URLEncoder;
import java.text.SimpleDateFormat;
import java.util.*;
import javax.annotation.PostConstruct;
@@ -14,7 +13,8 @@
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.domain.ArdSyCarVo;
import com.ruoyi.sy.param.ArdSyCarParam;
import com.ruoyi.sy.vo.ArdSyCarVo;
import com.ruoyi.sy.domain.ArdSyUser;
import com.ruoyi.sy.gps31.PositionContainer;
import com.ruoyi.sy.gps31.PushClientImplAlarm;
@@ -29,6 +29,7 @@
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.apache.commons.codec.digest.DigestUtils;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -39,12 +40,11 @@
import com.ruoyi.sy.domain.ArdSyCar;
import com.ruoyi.sy.service.IArdSyCarService;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.common.core.page.TableDataInfo;
import org.springframework.web.multipart.MultipartFile;

/**
 * 三一车辆Controller
 * 
 *
 * @author ard
 * @date 2023-06-26
 */
@@ -76,6 +76,9 @@

    private ArdSyCarController ardSyCarController;

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

    @PostConstruct
    public void init(){
        ardSyCarController = this;
@@ -85,7 +88,8 @@
        config.setConfigKey("syCarPT");
        List<SysConfig> sysConfigResult = sysConfigService.selectConfigList(config);
        String syURL = "";
        if(sysConfigResult.size() == 0){
        //if(sysConfigResult.size() == 0){
        if(!syCarEnabled){//三一车辆加入开关
            return;
        }else{
            syURL = sysConfigResult.get(0).getConfigValue();
@@ -109,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();
@@ -122,45 +126,12 @@
    @PreAuthorize("@ss.hasPermi('sy:syCar:list')")
    @GetMapping("/list")
    @ApiOperation("查询三一车辆列表")
    public AjaxResult list(ArdSyCar ardSyCar)
    public AjaxResult list(ArdSyCarParam ardSyCarParam)
    {
        if(ardSyCar.getPageNum()==null || ardSyCar.getPageNum() == 0){
            ardSyCar.setPageNum(1);
        }
        if(ardSyCar.getPageSize()==null || ardSyCar.getPageSize() == 0){
            ardSyCar.setPageSize(10);
        }
        PageHelper.startPage(ardSyCar.getPageNum(),ardSyCar.getPageSize());
        List<ArdSyCar> list = ardSyCarService.selectArdSyCarList(ardSyCar);
        PageHelper.startPage(ardSyCarParam.getPageNum(),ardSyCarParam.getPageSize());
        String userId = SecurityUtils.getUserId();
        Map<String,Object> result = ardSyCarService.getArdSyCarAll(userId);
        List<ArdSyCarVo> ardSyCarVoList = new ArrayList<>();
        if(((String)result.get("code")).equals("200")){
            List<Map<String,Object>> list1 = (List<Map<String, Object>>) result.get("data");
            for (int i = 0; i < list.size(); i++) {
                ArdSyCar ardSyCar1 = list.get(i);
                String carId = ardSyCar1.getCarId();
                for (int j = 0; j < list1.size(); j++) {
                    String carId31 = (String) list1.get(j).get("carId");
                    if(carId.equals(carId31)){
                        ArdSyCarVo ardSyCarVo = new ArdSyCarVo();
                        ardSyCarVo.setCarId(carId);
                        ardSyCarVo.setCarBrand(ardSyCar1.getCarBrand());
                        ardSyCarVo.setCarModel(ardSyCar1.getCarModel());
                        ardSyCarVo.setCarPicture(ardSyCar1.getCarPicture());
                        ardSyCarVo.setCarType(ardSyCar1.getCarType());
                        ardSyCarVo.setDeptId(ardSyCar1.getDeptId());
                        ardSyCarVo.setRemark(ardSyCar1.getRemark());
                        ardSyCarVo.setCarPlate((String) list1.get(j).get("carPlate"));
                        ardSyCarVoList.add(ardSyCarVo);
                        break;
                    }
                }
            }
            return AjaxResult.success(new PageInfo<>(ardSyCarVoList));
        }else {
            return AjaxResult.success(new PageInfo<>(list));
        }
        return ardSyCarService.ardSyCarList(ardSyCarParam,result);
    }

    /**
@@ -489,7 +460,7 @@
    @GetMapping("getThreeOne")
    @ApiOperation("获取三一视频地址")
    public AjaxResult getThreeOne() {
        return AjaxResult.success("获取地址成功！",sysConfigService.selectConfigByKey("threeOneVideo"));
        return AjaxResult.success("获取地址成功！",sysConfigService.getSYVideo());
    }

    @PreAuthorize("@ss.hasPermi('sy:syCar:getAlarmHPfmCountDetail')")
@@ -507,4 +478,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();
        }
    }

}