根据carId获取车辆及车辆用户调整

艾金辉

2023-07-22 90edbd96c576947debb7cdc7739c05a0c74b2748

根据carId获取车辆及车辆用户调整

 ard-work/src/main/java/com/ruoyi/client/ARDCarSYGPSClient.java

@@ -93,4 +93,80 @@
            return new HashMap();
        }         
    }

    //根据车队id获得下属全部车辆  --车辆列表
    public static Map<String,Object> getCarListByTeamId(String syURL,String teamId,String userId,String sessionId){
        OkHttpClient okHttpClient = new OkHttpClient();

        /*Request request = new Request.Builder()
                .url("http://106.14.186.44:9999/gps-web/api/get_car_list.jsp?teamId="+teamId+"&detail=true&userId="+userId+"&loginType=user&loginWay=interface&loginLang=zh_CN&appDevId=&appId=android&sessionId="+sessionId)
                .build();*/
        /*Request request = new Request.Builder()
                .url("http://116.182.15.14:9999/gps-web/api/get_car_list.jsp?teamId="+teamId+"&detail=true&userId="+userId+"&loginType=user&loginWay=interface&loginLang=zh_CN&appDevId=&appId=android&sessionId="+sessionId)
                .build();*/
        Request request = new Request.Builder()
                .url(syURL + "/gps-web/api/get_car_list.jsp?teamId="+teamId+"&detail=true&userId="+userId+"&loginType=user&loginWay=interface&loginLang=zh_CN&appDevId=&appId=android&sessionId="+sessionId)
                .build();

        Response response = null;
        try {
            response = okHttpClient.newCall(request).execute();
        } catch (IOException e1) {
            // TODO Auto-generated catch block
            e1.printStackTrace();
        }

        response.headers(); //响应头

        ResponseBody responseBody = response.body();

        try {
            String message = responseBody.string();// å“åº”体
            Map<String,Object> map = (Map<String, Object>) JSON.parse(message);
            //System.out.println(message);
            return map;
        } catch (IOException e) {
            // TODO Auto-generated catch block
            e.printStackTrace();
            return new HashMap();
        }
    }

    //根据车队id获得下属全部车辆  --车辆列表(车队下所有层级车辆)
    public static Map<String,Object> getCarListSubByTeamId(String syURL,String teamId,String userId,String sessionId){
        OkHttpClient okHttpClient = new OkHttpClient();

        /*Request request = new Request.Builder()
                .url("http://106.14.186.44:9999/gps-web/api/get_car_list_recur.jsp?teamId="+teamId+"&userId="+userId+"&loginType=user&loginWay=android&loginLang=zh_CN&appDevId=&sessionId="+sessionId)
                .build();*/
        /*Request request = new Request.Builder()
                .url("http://116.182.15.14:9999/gps-web/api/get_car_list_recur.jsp?teamId="+teamId+"&userId="+userId+"&loginType=user&loginWay=android&loginLang=zh_CN&appDevId=&sessionId="+sessionId)
                .build();*/
        Request request = new Request.Builder()
                .url(syURL + "/gps-web/api/get_car_list_recur.jsp?teamId="+teamId+"&userId="+userId+"&loginType=user&loginWay=android&loginLang=zh_CN&appDevId=&sessionId="+sessionId)
                .build();

        Response response = null;
        try {
            response = okHttpClient.newCall(request).execute();
        } catch (IOException e1) {
            // TODO Auto-generated catch block
            e1.printStackTrace();
        }

        response.headers(); //响应头

        ResponseBody responseBody = response.body();

        try {
            String message = responseBody.string();// å“åº”体
            Map<String,Object> map = (Map<String, Object>) JSON.parse(message);
            //System.out.println(message);
            return map;
        } catch (IOException e) {
            // TODO Auto-generated catch block
            e.printStackTrace();
            return new HashMap();
        }
    }
}

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

@@ -1,26 +1,22 @@
package com.ruoyi.sy.controller;

import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import javax.servlet.http.HttpServletRequest;
import java.text.Collator;
import java.util.*;
import javax.servlet.http.HttpServletResponse;

import com.alibaba.fastjson2.JSON;
import com.ruoyi.client.ARDCarGPSLogInClient;
import com.ruoyi.client.ARDCarSYGPSClient;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.uuid.IdUtils;
import com.ruoyi.sy.domain.ArdSyUser;
import com.ruoyi.sy.service.IArdSyUserService;
import com.ruoyi.sy.service.SysParaService;
import com.ruoyi.system.domain.SysConfig;
import com.ruoyi.system.service.ISysConfigService;
import com.ruoyi.utils.httpclient.SYCarClient;
import com.ruoyi.utils.result.Results;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.bytedeco.javacv.CanvasFrame;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -32,8 +28,6 @@
import com.ruoyi.sy.service.IArdSyCarService;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.common.core.page.TableDataInfo;
import org.springframework.web.context.request.RequestContextHolder;
import org.springframework.web.context.request.ServletRequestAttributes;
import org.springframework.web.multipart.MultipartFile;

/**
@@ -55,11 +49,10 @@

    private Map<Integer,Map<String,String>> logInMap = new HashMap();

    @Autowired
    private SysParaService sysParaService;

    @Autowired
    private IArdSyUserService iArdSyUserService;


    /**
     * æŸ¥è¯¢ä¸‰ä¸€è½¦è¾†åˆ—表
@@ -237,7 +230,7 @@
            String password31 = ardSyUser.getPassword();
            //查询地址
            Map<String, String> result = logInMap.get(Integer.parseInt(usersId));
            String syURL = sysParaService.getSYURL();
            String syURL = sysConfigService.getSYURL();
            Map<String, Object> result1 = ARDCarGPSLogInClient.loginIn(syURL,username31, password31);
            result = new HashMap();
            result.put("userId", username31);
@@ -275,6 +268,100 @@
        return result0;
    }

    @PreAuthorize("@ss.hasPermi('sy:syCar:carList')")
    @PostMapping("carList")
    @ApiOperation("根据teamId获取车辆列表")
    public Results getCarList(@RequestBody Map<String,String> map){
        String usersId = SecurityUtils.getUserId();
        Map<String, String> result = logInMap.get(Integer.parseInt(usersId));
        String teamId = map.get("teamId");
        String syURL = sysConfigService.getSYURL();
        ArdSyUser ardSyUser = iArdSyUserService.userById(usersId);
        //判断关联表是否有数据
        if(ardSyUser!=null) {
            //31用户名密码
            String username31 = ardSyUser.getUserId();
            String password31 = ardSyUser.getPassword();
            Map<String, Object> userMap = ARDCarGPSLogInClient.loginIn(syURL,username31, password31);
            result = new HashMap();
            result.put("userId", username31);
            result.put("sessionId", (String) userMap.get("sessionId"));
        }
        //查询该teamId下的车辆数据
        Map<String,Object> carList31 = new HashMap();
        try {
            carList31 = ARDCarSYGPSClient.getCarListByTeamId(syURL,teamId, result.get("userId"),result.get("sessionId"));
        } catch (Exception e) {
            Map<String,Object> m = iArdSyUserService.selectArdSyUserByUsersId(Integer.parseInt(usersId));
            if(m == null){
                Results.error("当前登录用户未挂接车辆权限");
            }
            Map<String,Object> map0 = ARDCarGPSLogInClient.loginIn(syURL,(String) m.get("userId"), (String) m.get("password"));
            carList31 = ARDCarSYGPSClient.getCarListByTeamId(syURL,teamId, (String) m.get("userId"),(String) map0.get("sessionId"));
        }
        //拿到车辆数据
        List<Map<String,String>> list = (List) carList31.get("list");
        List<String> carIdList = new ArrayList();
        //所有carId
        for(Map<String,String> m : list){
            carIdList.add(m.get("carId"));
        }
        if(carIdList.size() == 0){
            Map<String,Object> map0 = new HashMap();
            map0.put("list", new ArrayList());
            map0.put("rspCode", "1");
            return Results.succeed();
        }
        //添加车辆属性
        for(Map<String,String> m : list){
            switch (m.get("state")) {
                case "1":
                    m.put("carState", "离线-从未报定位");break;
                case "2":
                    m.put("carState", "离线-欠费");break;
                case "3":
                    m.put("carState", "离线");break;
                case "4":
                    m.put("carState", "离线-报警");break;
                case "5":
                    m.put("carState", "在线-从未报定位");break;
                case "6":
                    m.put("carState", "在线-欠费");break;
                case "7":
                    m.put("carState", "在线-行驶");break;
                case "8":
                    m.put("carState", "在线-行驶-报警");break;
                case "9":
                    m.put("carState", "在线-停车-ACC关");break;
                case "10":
                    m.put("carState", "在线-停车-ACC开");break;
                case "11":
                    m.put("carState", "在线-停车-ACC关-报警");break;
                case "12":
                    m.put("carState", "在线-停车-ACC开-报警");break;
                case "13":
                    m.put("carState", "在线-无效定位");break;
                default:
                    break;
            }
        }
//        for(Map<String,String> m : list0){
//            for(Map<String,String> ma : list1){
//                if(m.get("carId").equals(ma.get("carId"))){
//                    m.put("stateCn", ma.get("carState"));
//                }
//            }
//        }
//        Collections.sort((List)result0.get("list"),new Comparator<Map<String, Object>>() {
//            @Override
//            public int compare(Map<String, Object> o1, Map<String, Object> o2) {
//                Comparator<Object> com = Collator.getInstance(java.util.Locale.CHINA);
//                return com.compare(o2.get("stateCn"), o1.get("stateCn"));
//            }
//        });
        return Results.succeed(list);
    }

    @PreAuthorize("@ss.hasPermi('sy:syCar:carListById')")
    @GetMapping("/carListById/{id}")
    @ApiOperation("根据车辆ID获取车辆列表")

 ard-work/src/main/java/com/ruoyi/sy/domain/SysPara.java

ÎļþÒÑɾ³ý

 ard-work/src/main/java/com/ruoyi/sy/domain/SysParaExample.java

ÎļþÒÑɾ³ý

 ard-work/src/main/java/com/ruoyi/sy/mapper/ArdSyCarMapper.java

@@ -2,6 +2,7 @@

import java.util.List;
import com.ruoyi.sy.domain.ArdSyCar;
import org.apache.ibatis.annotations.Param;

/**
 * ä¸‰ä¸€è½¦è¾†Mapper接口
@@ -67,9 +68,11 @@
     */
    public List<ArdSyCar> selectArdSyCarByIds(String[] ids);

//    List<ArdSyCar> getArdSyCarWithRightByCarIdList(@Param("carIdList")List<String> carIdList);

    /**
     * æ ¹æ®è½¦è¾†ID查询车辆列表
     * @param carId
     * @param id
     * @return
     */
    List<ArdSyCar> carListById(String id);

 ard-work/src/main/java/com/ruoyi/sy/mapper/SysParaMapper.java

ÎļþÒÑɾ³ý

 ard-work/src/main/java/com/ruoyi/sy/service/IArdSyCarService.java

@@ -83,5 +83,7 @@
     */
    public String uploadCarPicture(String id, MultipartFile carPicture);

//    List<ArdSyCar> getArdSyCarWithRightByCarIdList(List<String> carIdList);
    Results carListById(String id);

}

 ard-work/src/main/java/com/ruoyi/sy/service/SysParaService.java

ÎļþÒÑɾ³ý

 ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdSyCarServiceImpl.java

@@ -327,6 +327,12 @@
        }
    }

//    @Override
//    public List<ArdSyCar> getArdSyCarWithRightByCarIdList(List<String> carIdList) {
//        List<ArdSyCar> result = ardSyCarMapper.getArdSyCarWithRightByCarIdList(carIdList);
//        return result;
//    }

    @Override
    public Results carListById(String id) {
        try {

 ard-work/src/main/java/com/ruoyi/sy/service/impl/SysParaServiceImpl.java

ÎļþÒÑɾ³ý

 ard-work/src/main/java/com/ruoyi/utils/result/Constants.java

@@ -5,9 +5,9 @@
 * è¿”回状态码
 */
public interface Constants {
    String CODE_200 = "200";    // æˆåŠŸ
    String CODE_400 = "400";    // å‚数错误
    String CODE_500 = "500";    // ç³»ç»Ÿé”™è¯¯
    String CODE_401 = "401";    // æƒé™ä¸è¶³
    Integer CODE_200 = 200;    // æˆåŠŸ
    Integer CODE_400 = 400;    // å‚数错误
    Integer CODE_500 = 500;    // ç³»ç»Ÿé”™è¯¯
    Integer CODE_401 = 401;    // æƒé™ä¸è¶³
}


 ard-work/src/main/java/com/ruoyi/utils/result/Results.java

@@ -12,7 +12,7 @@
@AllArgsConstructor
@NoArgsConstructor
public class Results {
    private String code;
    private Integer code;
    private String msg;
    private Object data;


 ard-work/src/main/resources/mapper/sy/ArdSyCarMapper.xml

@@ -102,6 +102,7 @@
        </foreach>
    </select>


    <select id="carListById" parameterType="String" resultMap="ArdSyCarResult">
        select * from ard_sy_car where id = #{id}
    </select>

 ard-work/src/main/resources/mapper/sy/SysParaMapper.xml

ÎļþÒÑɾ³ý

 ruoyi-admin/src/main/resources/application-druid.yml

@@ -2,10 +2,10 @@
spring:
    datasource:
        type: com.alibaba.druid.pool.DruidDataSource
        driverClassName: org.postgresql.Driver
        druid:
            # ä¸»åº“数据源
            master:
                driverClassName: org.postgresql.Driver
                url: jdbc:postgresql://111.40.46.199:15432/ry-vue?stringtype=unspecified
                username: postgres
                password: Yykj.2021
@@ -16,9 +16,16 @@
            slave:
                # ä»Žæ•°æ®æºå¼€å…³/默认关闭
                enabled: true
                driverClassName: org.postgresql.Driver
                url: jdbc:postgresql://112.98.126.2:35432/ard732
                username: postgres
                password: Yykj.2017
            slave2012:
                enabled: true
                driverClassName: com.microsoft.sqlserver.jdbc.SQLServerDriver
                url: jdbc:sqlserver://59.110.226.79:1433;DatabaseName=gps2012
                username: car
                password: gps2017
            # åˆå§‹è¿žæŽ¥æ•°
            initialSize: 5
            # æœ€å°è¿žæŽ¥æ± æ•°é‡

 ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysConfigMapper.java

@@ -73,4 +73,11 @@
     * @return ç»“æžœ
     */
    public int deleteConfigByIds(Long[] configIds);

    /**
     * ä¸‰ä¸€è½¦è¾†åœ°å€
     * @param sysType
     * @return
     */
    List<SysConfig> selectByType(String sysType);
}

 ruoyi-system/src/main/java/com/ruoyi/system/service/ISysConfigService.java

@@ -87,4 +87,10 @@
     */
    public String checkConfigKeyUnique(SysConfig config);

    /**
     * ä¸‰ä¸€è½¦è¾†åœ°å€
     * @return
     */
    String getSYURL();

}

 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java

@@ -230,4 +230,15 @@
    {
        return CacheConstants.SYS_CONFIG_KEY + configKey;
    }

    @Override
    public String getSYURL() {
        List<SysConfig> result = configMapper.selectByType("syCarPT");
        if(result.size() > 0){
            String SYURL = result.get(0).getConfigValue();
            return SYURL;
        }else{
            return "";
        }
    }
}

 ruoyi-system/src/main/resources/mapper/system/SysConfigMapper.xml

@@ -113,5 +113,9 @@
            #{configId}
        </foreach>
    </delete>

    <select id="selectByType" parameterType="String" resultMap="SysConfigResult">
        select * from sys_config where config_key = #{sysType}
    </select>
    
</mapper>