Merge remote-tracking branch 'origin/master'

艾金辉

2023-07-24 651186d7fce51274500b66d7ed8a53bedc6a1339

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

@@ -21,6 +21,7 @@
import com.ruoyi.system.domain.SysConfig;
import com.ruoyi.system.mapper.SysConfigMapper;
import com.ruoyi.system.mapper.SysUserMapper;
import com.ruoyi.utils.forest.SYClient;
import com.ruoyi.utils.httpclient.SYCarClient;
import com.ruoyi.utils.result.Constants;
import com.ruoyi.utils.result.Results;
@@ -61,6 +62,8 @@
    @Resource
    private SysUserMapper userMapper;

    @Resource
    private SYClient sYClient;

    /**
     * 查询三一车辆
@@ -161,9 +164,12 @@
                return result;
            }else{
                ArdSyUser ardSyUser = ardSyUserList.get(0);
                Map<String,Object> LogInResult = SYCarClient.logIn(syURL,ardSyUser.getUserId(), ardSyUser.getPassword());
                //Map<String,Object> LogInResult = SYCarClient.logIn(syURL,ardSyUser.getUserId(), ardSyUser.getPassword());
                String passwordMd5 = DigestUtils.md5Hex(ardSyUser.getPassword());
                Map<String,Object> LogInResult = sYClient.logIn(syURL,passwordMd5,ardSyUser.getUserId());
                String sessionId = (String) LogInResult.get("sessionId");
                Map<String,Object> carListMap = SYCarClient.getCarList(syURL,sessionId);
                //Map<String,Object> carListMap = SYCarClient.getCarList(syURL,sessionId);
                Map<String,Object> carListMap = sYClient.getCarList(syURL,sessionId);
                if(((String)carListMap.get("rspCode")).equals("1")){
                    List<Map<String,Object>> list = (List<Map<String,Object>>) carListMap.get("list");
                    ArdSyCar ardSyCar = new ArdSyCar();
@@ -213,25 +219,14 @@
                return result;
            }else{
                ArdSyUser ardSyUser = ardSyUserList.get(0);
                Map<String,Object> LogInResult = SYCarClient.logIn(syURL,ardSyUser.getUserId(), ardSyUser.getPassword());
                //Map<String,Object> LogInResult = SYCarClient.logIn(syURL,ardSyUser.getUserId(), ardSyUser.getPassword());
                String passwordMd5 = DigestUtils.md5Hex(ardSyUser.getPassword());
                Map<String,Object> LogInResult = sYClient.logIn(syURL,passwordMd5,ardSyUser.getUserId());
                String sessionId = (String) LogInResult.get("sessionId");
                Map<String,Object> carListMap = SYCarClient.getCarList(syURL,sessionId);
                //Map<String,Object> carListMap = SYCarClient.getCarList(syURL,sessionId);
                Map<String,Object> carListMap = sYClient.getCarList(syURL,sessionId);
                if(((String)carListMap.get("rspCode")).equals("1")){
                    List<Map<String,Object>> list = (List<Map<String,Object>>) carListMap.get("list");
                    /*ArdSyCar ardSyCar = new ArdSyCar();
                    List<ArdSyCar> ardSyCarList = ardSyCarMapper.selectArdSyCarList(ardSyCar);
                    List<String> carIdList = new ArrayList();
                    for(ArdSyCar innerArdSyCar : ardSyCarList){
                        carIdList.add(innerArdSyCar.getCarId());
                    }

                    List<Map<String,Object>> carList = list.stream().filter(new Predicate<Map<String,Object>>(){
                        @Override
                        public boolean test(Map<String,Object> map) {
                            return !carIdList.contains((String)map.get("carId"));
                        }
                    }).collect(Collectors.toList());
                    result.put("data",carList);*/
                    result.put("data",list);
                    result.put("code","200");
                    return result;
@@ -380,6 +375,14 @@
        }
    }

    @Override
    public void sendArdSyCarAlarmByCarId(String carId, Map<Integer,Object> data) {
        List<SysUser> result = userMapper.getSysUserByCarId(carId);
        for(SysUser sysUser : result){
            WebSocketUtils.sendMessage(ONLINE_USER_SESSIONS.get(sysUser.getUserId()), JSON.toJSONString(data));
        }
    }

    /**
     * 根据dept集合查询出所有对应的carId
     * @param deptList