电磁锁分页bug修改提交

zhangnaisong

2024-07-06 06842b9c367083c3bf77b8b54a1e1a32b68a2e5e

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

@@ -320,7 +320,8 @@
    }

    @Override
    public List<Map<String, String>> getLockByCarPlate(String usersId, String carPlate) {
    public List<Map<String, Object>> getLockByCarPlate(String usersId, String carPlate) {
        List<ArdTankLock> ardTankLockList = ardTankLockMapper.getAll();
        ArdSyUser ardSyUser = ardSyUserMapper.userById(usersId);
        if(ardSyUser == null){
            return new ArrayList();
@@ -335,8 +336,8 @@
        String passwordMd5 = DigestUtils.md5Hex(ardSyUser.getPassword());
        Map<String, Object> LogInResult = sYClient.logIn(syURL, passwordMd5, ardSyUser.getUserId());
        String sessionId = (String) LogInResult.get("sessionId");
        List<ArdTankLock> ardTankLockList = ardTankLockMapper.getAll();
        List<Map<String,String>> result = new ArrayList();
        //List<ArdTankLock> ardTankLockList = ardTankLockMapper.getAll();
        List<Map<String,Object>> result = new ArrayList();
        if(!carPlate.equals("")){
            Map<String,Object> carMap = sYClient.getCarListByPlate(syURL,carPlate,ardSyUser.getUserId(),sessionId);//车牌号模糊搜索车辆
            List<Map<String,Object>> carList = new ArrayList();
@@ -351,7 +352,7 @@
            }
            for(ArdTankLock ardTankLock : ardTankLockList){
                if(carIdList.contains(ardTankLock.getCarId())){//返回的车辆包含数据库录入的车辆
                    Map<String,String> map = new HashMap();
                    Map<String,Object> map = new HashMap();
                    map.put("id",ardTankLock.getId());
                    map.put("lockNum",ardTankLock.getLockNum());
                    map.put("lockName",ardTankLock.getLockName());
@@ -378,7 +379,7 @@
            }
        }else{
            for(ArdTankLock ardTankLock : ardTankLockList){
                Map<String,String> map = new HashMap();
                Map<String,Object> map = new HashMap();
                map.put("id",ardTankLock.getId());
                map.put("lockNum",ardTankLock.getLockNum());
                map.put("lockName",ardTankLock.getLockName());