查询在线范围内单兵及车辆和离线单兵及车修改提交

zhangnaisong

2024-02-22 d160214ce508d55dc64b3ea6656ac13c4fa7ecdc

 ard-work/src/main/java/com/ruoyi/app/application/service/impl/ArdAppApplicationServiceImpl.java

@@ -23,6 +23,7 @@
import com.ruoyi.utils.websocket.util.WebSocketUtils;
import org.apache.commons.codec.digest.DigestUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;

import com.ruoyi.common.utils.StringUtils;
@@ -71,6 +72,9 @@

    @Resource
    private SYClient sYClient;

    @Value("${minio.endpoint}")
    private String minioEndpoint;

    private Map<String,Thread> threadMap = new HashMap();

@@ -544,12 +548,16 @@
            //for(Map<String,Object> sycar : onlineSYCarPositionList){
            for(Map<String,Object> sycar : onlineSYCarPositionNearList){
                Map<String,Object> map = ardSyCarMapper.getArdSyCarAndDeptByCarId((String)sycar.get("carId"));
                String carModel = this.minioEndpoint + "/" + (String) map.get("carModel");
                map.put("carModel",carModel);
                sycar.putAll(map);
            }
            //筛选离线
            List<Map<String,Object>> offlineSYCarPositionList = SYCarPositionList.stream().filter(map -> ((String)map.get("stateCn")).startsWith("离线")).collect(Collectors.toList());
            for(Map<String,Object> sycar : offlineSYCarPositionList){
                Map<String,Object> map = ardSyCarMapper.getArdSyCarAndDeptByCarId((String)sycar.get("carId"));
                String carModel = this.minioEndpoint + "/" + (String) map.get("carModel");
                map.put("carModel",carModel);
                sycar.putAll(map);
            }
            Map<String,List<Map<String,Object>>> carMap = new HashMap();