车辆管理数量BUG

aijinhui

2023-12-28 af39365d9b0a2f4896470c505cf085776009ca97

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

@@ -623,10 +623,11 @@
        queryWrapper.in("dept_id", deptList);
        List<ArdSyCar> carList = ardSyCarMapper.selectList(queryWrapper);
        //对比把匹配到的数据添加到list中
        for (Map<String, String> m : list) {
            String carId = m.get("carId");
            for (int i = 0; i < carList.size(); i++) {
                ArdSyCar ardSyCar = carList.get(i);
        for (int i = 0; i < list.size(); i++) {
            String carId = list.get(i).get("carId");
            Boolean isCar = false;
            for (int j = 0; j < carList.size(); j++) {
                ArdSyCar ardSyCar = carList.get(j);
                if (carId.equals(ardSyCar.getCarId())) {
                    /*String url = "";
                    if (ardSyCar.getCarPicture() != null) {
@@ -634,12 +635,17 @@
                            url = ardSyCar.getCarPicture().split("sycar")[0];
                        }
                    }*/
                    m.put("carModel", this.minioEndpoint + "/" + ardSyCar.getCarModel());//zns
                    list.get(i).put("carModel", this.minioEndpoint + "/" + ardSyCar.getCarModel());//zns
                    //m.put("carModel",ardSyCar.getCarModel());
                    m.put("carTypeArd", ardSyCar.getCarType());
                    m.put("carBrand", ardSyCar.getCarBrand());
                    m.put("carPicture", ardSyCar.getCarPicture());
                    list.get(i).put("carTypeArd", ardSyCar.getCarType());
                    list.get(i).put("carBrand", ardSyCar.getCarBrand());
                    list.get(i).put("carPicture", ardSyCar.getCarPicture());
                    isCar = true;
                    break;
                }
            }
            if(!isCar){
                list.remove(list.get(i));
            }
        }
        return list;
@@ -783,13 +789,13 @@

    @Override
    public Map<String, Object> getCarGPSBycarId(String usersId, String carId, String syURL, ArdSyUser ardSyUser) {
        Map<String, String> result = logInMap.get(Integer.parseInt(usersId));
//        Map<String, String> result = logInMap.get(Integer.parseInt(usersId));
        //31用户名密码
        String username31 = ardSyUser.getUserId();
        String password31 = ardSyUser.getPassword();
        String passwordMd5 = DigestUtils.md5Hex(password31);
        Map<String, Object> result1 = sYClient.logIn(syURL, passwordMd5, username31);
        result = new HashMap();
        Map<String, String> result = new HashMap();
        result.put("userId", username31);
        result.put("sessionId", (String) result1.get("sessionId"));
        return sYClient.getCarNearPositionByCarId(syURL, carId, result.get("userId"), result.get("sessionId"));
@@ -1222,4 +1228,10 @@
        return ardSyCarMapper.selectList(queryWrapper);
    }

    @Override
    public Map<String, Object> getAlarmHPfmCountDetail(String sessionId, String usersId, String carId, String startTime, String endTime, String syURL) {
//        System.out.println("sessionId------"+sessionId+",usersId-----"+usersId+",carId-----"+carId+",startTime----"+startTime+",endTime----"+endTime+",syURL----"+syURL);
        return sYClient.getAlarmHPfmCountDetail(syURL,carId,sessionId,startTime,endTime);
    }

}