三一车辆配置文件加入开关提交

zhangnaisong

2024-01-02 c14ba09f8c5e08d976f0954e29ed60296348102d

 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;
@@ -9,9 +8,13 @@
import javax.servlet.http.HttpServletResponse;

import com.alibaba.fastjson2.JSON;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
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.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;
@@ -26,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.*;
@@ -36,7 +40,6 @@
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;

/**
@@ -73,17 +76,20 @@

    private ArdSyCarController ardSyCarController;

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

    @PostConstruct
    public void init(){
        ardSyCarController = this;
        ardSyCarController.sysConfigService = this.sysConfigService;
        ardSyCarController.iArdSyUserService = this.iArdSyUserService;

        SysConfig config = new SysConfig();
        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();
@@ -119,11 +125,13 @@
     */
    @PreAuthorize("@ss.hasPermi('sy:syCar:list')")
    @GetMapping("/list")
    public TableDataInfo list(ArdSyCar ardSyCar)
    @ApiOperation("查询三一车辆列表")
    public AjaxResult list(ArdSyCarParam ardSyCarParam)
    {
        startPage();
        List<ArdSyCar> list = ardSyCarService.selectArdSyCarList(ardSyCar);
        return getDataTable(list);
        PageHelper.startPage(ardSyCarParam.getPageNum(),ardSyCarParam.getPageSize());
        String userId = SecurityUtils.getUserId();
        Map<String,Object> result = ardSyCarService.getArdSyCarAll(userId);
        return ardSyCarService.ardSyCarList(ardSyCarParam,result);
    }

    /**
@@ -215,7 +223,7 @@
    /**
     * 获取未挂接权限的三一车辆
     */
    @PreAuthorize("@ss.hasPermi('sy:syCar:getArdSyCarNoRight')")
//    @PreAuthorize("@ss.hasPermi('sy:syCar:getArdSyCarNoRight')")
    @PostMapping("/getArdSyCarNoRight")
    @ApiOperation("获取未挂接权限的三一车辆")
    public Map<String,Object> getArdSyCarNoRight(){
@@ -233,7 +241,7 @@
    /**
     * 获取全部的三一车辆
     */
    @PreAuthorize("@ss.hasPermi('sy:syCar:getArdSyCarAll')")
//    @PreAuthorize("@ss.hasPermi('sy:syCar:getArdSyCarAll')")
    @PostMapping("/getArdSyCarAll")
    @ApiOperation("获取全部的三一车辆")
    public Map<String,Object> getArdSyCarAll(){
@@ -285,7 +293,11 @@
        String usersId = SecurityUtils.getUserId();
        ArdSyUser ardSyUser = iArdSyUserService.userById(usersId);
        String syURL = sysConfigService.getSYURL();
        return ardSyCarService.allListByUser(ardSyUser,syURL,usersId);
        //根据userId查询部门Id
        SysUser sysUser = sysUserService.selectUserById(usersId);
        //根据当前deptId或者当前及所属下级的所有deptId
        List<Long> deptList = sysDeptService.deptIdBySub(sysUser.getDeptId());
        return ardSyCarService.allListByUser(ardSyUser,syURL,usersId,deptList);
    }

    @PreAuthorize("@ss.hasPermi('sy:syCar:carList')")
@@ -314,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){