teamId返回结构优化

Administrator

2023-07-26 9ab7ea8617a47e24abe48ab395ace2c4ecd4af62

teamId返回结构优化

 ard-work/src/main/java/com/ruoyi/sy/controller/ArdSyCarController.java

@@ -295,6 +295,9 @@
        if(ardSyUser!=null) {
            //查询出31的车辆数据
            List<Map<String,String>> list = ardSyCarService.getCarList(ardSyUser,syURL,usersId,teamId);
            if(list.isEmpty()){
                return Results.succeed(new ArrayList());
            }
            //根据userId查询部门Id
            SysUser sysUser = sysUserService.selectUserById(usersId);
            //根据当前deptId或者当前及所属下级的所有deptId

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

@@ -455,49 +455,53 @@
        carList31 = sYClient.getCarList1(syURL,teamId, result.get("userId"),result.get("sessionId"));
        //拿到车辆数据
        list= (List) carList31.get("list");
        List<String> carIdList = new ArrayList();
        //所有carId
        for(Map<String,String> m : list){
            carIdList.add(m.get("carId"));
        }
        if(carIdList.size() == 0){
            Map<String,String> map0 = new HashMap();
            map0.put("list", "{}");
            map0.put("rspCode", "1");
            list.add(map0);
        if(list.isEmpty()){
            return list;
        }
        //添加车辆属性
        for(Map<String,String> m : list){
            switch (m.get("state")) {
                case "1":
                    m.put("carState", "离线-从未报定位");break;
                case "2":
                    m.put("carState", "离线-欠费");break;
                case "3":
                    m.put("carState", "离线");break;
                case "4":
                    m.put("carState", "离线-报警");break;
                case "5":
                    m.put("carState", "在线-从未报定位");break;
                case "6":
                    m.put("carState", "在线-欠费");break;
                case "7":
                    m.put("carState", "在线-行驶");break;
                case "8":
                    m.put("carState", "在线-行驶-报警");break;
                case "9":
                    m.put("carState", "在线-停车-ACC关");break;
                case "10":
                    m.put("carState", "在线-停车-ACC开");break;
                case "11":
                    m.put("carState", "在线-停车-ACC关-报警");break;
                case "12":
                    m.put("carState", "在线-停车-ACC开-报警");break;
                case "13":
                    m.put("carState", "在线-无效定位");break;
                default:
                    break;
        }else {
            List<String> carIdList = new ArrayList();
            //所有carId
            for(Map<String,String> m : list){
                carIdList.add(m.get("carId"));
            }
            if(carIdList.size() == 0){
                Map<String,String> map0 = new HashMap();
                map0.put("list", "{}");
                map0.put("rspCode", "1");
                list.add(map0);
                return list;
            }
            //添加车辆属性
            for(Map<String,String> m : list){
                switch (m.get("state")) {
                    case "1":
                        m.put("carState", "离线-从未报定位");break;
                    case "2":
                        m.put("carState", "离线-欠费");break;
                    case "3":
                        m.put("carState", "离线");break;
                    case "4":
                        m.put("carState", "离线-报警");break;
                    case "5":
                        m.put("carState", "在线-从未报定位");break;
                    case "6":
                        m.put("carState", "在线-欠费");break;
                    case "7":
                        m.put("carState", "在线-行驶");break;
                    case "8":
                        m.put("carState", "在线-行驶-报警");break;
                    case "9":
                        m.put("carState", "在线-停车-ACC关");break;
                    case "10":
                        m.put("carState", "在线-停车-ACC开");break;
                    case "11":
                        m.put("carState", "在线-停车-ACC关-报警");break;
                    case "12":
                        m.put("carState", "在线-停车-ACC开-报警");break;
                    case "13":
                        m.put("carState", "在线-无效定位");break;
                    default:
                        break;
                }
            }
        }
        return list;