Merge remote-tracking branch 'origin/master'

Administrator

2023-08-10 44f2a0a32c096bdb05d4cc0ac162cdc1eb14c3ed

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

@@ -591,8 +591,12 @@
    @Override
    public Results getCarGPSTrack(Map<String,String> map,String syURL, ArdSyUser ardSyUser){
        String carId = map.get("carId");
        String startTime = map.get("startTime").replace(" ", "").replace("-", "").replace(":", "");
        String endTime = map.get("endTime").replace(" ", "").replace("-", "").replace(":", "");
        //String startTime = map.get("startTime").replace(" ", "").replace("-", "").replace(":", "");
        //String endTime = map.get("endTime").replace(" ", "").replace("-", "").replace(":", "");
        String time = map.get("time");
        time = time.replace("-", "");
        String startTime = time + "000000";
        String endTime = time +"235959";
        String maxSpeed = map.get("maxSpeed");
        //31用户名密码
        String username31 = ardSyUser.getUserId();
@@ -639,8 +643,10 @@
        String[] sgnTypes = {"近光灯信号","远光灯信号","右转向灯信号","左转向灯信号","制动信号","倒档信号","雾灯信号","示廓灯","喇叭信号","空调状态",
                "空挡信号","缓速器工作","ABS 工作","加热器工作","离合器状态","保留","保留","保留","保留","保留","保留","保留","保留","保留","保留","保留",
                "保留","保留","保留","保留","保留","保留"};
        Integer sttsHex = Integer.parseInt(stts, 16);
        String sttsBin = Integer.toBinaryString(sttsHex);
        //Integer sttsHex = Integer.parseInt(stts, 16);
        Long sttsHex = Long.parseLong(stts, 16);
        //String sttsBin = Integer.toBinaryString(sttsHex);
        String sttsBin = Long.toBinaryString(sttsHex);
        if(sttsBin.length() < 32){
            while(sttsBin.length() < 32){
                sttsBin = "0" + sttsBin;