Administrator
2023-08-11 63edade94bb54e20e622098ce096a66e7cb641cf
ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdSyCarServiceImpl.java
@@ -14,6 +14,8 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.utils.uuid.IdUtils;
import com.ruoyi.sy.domain.ArdSyCarDay;
import com.ruoyi.sy.mapper.ArdSyCarDayMapper;
import com.ruoyi.utils.websocket.util.WebSocketUtils;
import com.ruoyi.device.hiksdk.config.MinioClientSingleton;
import com.ruoyi.storage.minio.utils.MinioUtils;
@@ -68,6 +70,9 @@
    @Resource
    private SYClient sYClient;
    @Resource
    private ArdSyCarDayMapper ardSyCarDayMapper;
    private Map<Integer,Map<String,String>> logInMap = new HashMap();
@@ -586,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();
@@ -634,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;
@@ -798,7 +809,7 @@
        }
    }
    @Override
    /*@Override
    public Results getExistTraceByCarIdAndMonth(String userId, String carId, String time) {
        SysConfig config = new SysConfig();
        config.setConfigKey("syCarPT");
@@ -820,6 +831,17 @@
                return Results.succeed(existTraceMap);
            }
        }
    }*/
    @Override
    public Results getExistTraceByCarIdAndMonth(String userId, String carId, String time) {
        List<ArdSyCarDay> result = ardSyCarDayMapper.selectArdSyCarDayByCarIdAndDay(carId,time + "%");
        List<String> list = new ArrayList();
        for(ArdSyCarDay ardSyCarDay : result){
//            list.add(ardSyCarDay.getDay().split("-")[2]);
            list.add(ardSyCarDay.getDay());
        }
        return Results.succeed(list);
    }
    public Map<String,Integer> getExistTraceByCarIdAndMonth(String url,String usersId,String password,String carId,String time){