zhangnaisong
2023-07-21 976c901225ab892868cd6c6c041c73420628ce57
查询全部三一车辆提交
已修改3个文件
76 ■■■■■ 文件已修改
ard-work/src/main/java/com/ruoyi/sy/controller/ArdSyCarController.java 18 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ard-work/src/main/java/com/ruoyi/sy/service/IArdSyCarService.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdSyCarServiceImpl.java 53 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ard-work/src/main/java/com/ruoyi/sy/controller/ArdSyCarController.java
@@ -161,6 +161,24 @@
    }
    /**
     * 获取全部的三一车辆
     */
    @PreAuthorize("@ss.hasPermi('sy:syCar:getArdSyCarAll')")
    @PostMapping("/getArdSyCarAll")
    @ApiOperation("获取全部的三一车辆")
    public Map<String,Object> getArdSyCarAll(){
        String userId = SecurityUtils.getUserId();
        Map<String,Object> result = ardSyCarService.getArdSyCarAll(userId);
        if(((String)result.get("code")).equals("500")){
            return error((String) result.get("data"));
        }else if(((String)result.get("code")).equals("200")){
            return success(result.get("data"));
        }else{
            return error("");
        }
    }
    /**
     * 获取全部车辆模型
     */
    @PreAuthorize("@ss.hasPermi('sy:syCar:getAllCarModel')")
ard-work/src/main/java/com/ruoyi/sy/service/IArdSyCarService.java
@@ -68,6 +68,11 @@
    public Map<String,Object> getArdSyCarNoRight(String userId);
    /**
     * 获取未挂接权限的三一车辆
     */
    public Map<String,Object> getArdSyCarAll(String userId);
    /**
     * 获取全部车辆模型
     */
    public List<Map<String,String>> getAllCarModel();
ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdSyCarServiceImpl.java
@@ -180,6 +180,59 @@
    }
    @Override
    public Map<String, Object> getArdSyCarAll(String userId) {
        SysConfig config = new SysConfig();
        config.setConfigKey("syCarPT");
        List<SysConfig> sysConfigResult = sysConfigMapper.selectConfigList(config);
        String syURL = "";
        Map<String,Object> result = new HashMap();
        if(sysConfigResult.size() == 0){
            result.put("data","三一车辆url没有录入");
            result.put("code","500");
            return result;
        }else{
            syURL = sysConfigResult.get(0).getConfigValue();
            ArdSyUser ardSyUserPara = new ArdSyUser();
            ardSyUserPara.setSysUserId(userId);
            List<ArdSyUser> ardSyUserList = ardSyUserMapper.selectArdSyUserList(ardSyUserPara);
            if(ardSyUserList.size() == 0){
                result.put("data","用户未挂接三一车辆");
                result.put("code","500");
                return result;
            }else{
                ArdSyUser ardSyUser = ardSyUserList.get(0);
                Map<String,Object> LogInResult = SYCarClient.logIn(syURL,ardSyUser.getUserId(), ardSyUser.getPassword());
                String sessionId = (String) LogInResult.get("sessionId");
                Map<String,Object> carListMap = SYCarClient.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;
                }else{
                    result.put("data","三一车辆平台出错");
                    result.put("code","500");
                    return result;
                }
            }
        }
    }
    @Override
    public List<Map<String,String>> getAllCarModel() {
        boolean exsit = MinioUtils.exitsBucket("sycar");
        if (exsit) {