车辆管理数量

aijinhui

2023-12-28 7f5fbf4ef6832a6ef27387d8ce973522feec2094

车辆管理数量

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

@@ -285,7 +285,11 @@
        String usersId = SecurityUtils.getUserId();
        ArdSyUser ardSyUser = iArdSyUserService.userById(usersId);
        String syURL = sysConfigService.getSYURL();
        return ardSyCarService.allListByUser(ardSyUser,syURL,usersId);
        //根据userId查询部门Id
        SysUser sysUser = sysUserService.selectUserById(usersId);
        //根据当前deptId或者当前及所属下级的所有deptId
        List<Long> deptList = sysDeptService.deptIdBySub(sysUser.getDeptId());
        return ardSyCarService.allListByUser(ardSyUser,syURL,usersId,deptList);
    }

    @PreAuthorize("@ss.hasPermi('sy:syCar:carList')")

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

@@ -111,7 +111,7 @@
     * @param usersId
     * @return
     */
    Map<String,Object> allListByUser(ArdSyUser ardSyUser, String syURL,String usersId);
    Map<String,Object> allListByUser(ArdSyUser ardSyUser, String syURL,String usersId, List<Long> deptList);

    List<Map<String,String>> getCarList(ArdSyUser ardSyUser, String syURL,String usersId,String teamId);


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

@@ -483,7 +483,7 @@
     * @return
     */
    @Override
    public Map<String, Object> allListByUser(ArdSyUser ardSyUser, String syURL, String usersId) {
    public Map<String, Object> allListByUser(ArdSyUser ardSyUser, String syURL, String usersId, List<Long> deptList) {
        Map<String, Object> result0 = new HashMap();
        //判断关联表是否有数据
        if (ardSyUser != null) {
@@ -504,10 +504,29 @@
                map.put("list", new ArrayList());
                return map;
            }
            QueryWrapper<ArdSyCar> queryWrapper = new QueryWrapper<>();
            queryWrapper.in("dept_id", deptList);
            List<ArdSyCar> carListTable = ardSyCarMapper.selectList(queryWrapper);
            int online = 0;
            for (Map<String, Object> map : (List<Map<String, Object>>) result0.get("list")) {
                Map<String, Object> resultMap = sYClient.getTeamCarList(syURL, (String) map.get("teamId"), result.get("sessionId"));
                List<Map<String, Object>> carList = (List<Map<String, Object>>) resultMap.get("carList");
                if(carList.size()>0){
                    for (int i = 0; i < carList.size(); i++) {
                        String carId = (String) carList.get(i).get("carId");
                        Boolean isCar = false;
                        for (int j = 0; j < carListTable.size(); j++) {
                            ArdSyCar ardSyCar = carListTable.get(j);
                            if (carId.equals(ardSyCar.getCarId())) {
                                isCar = true;
                                break;
                            }
                        }
                        if(!isCar){
                            carList.remove(carList.get(i));
                        }
                    }
                }
                for (Map<String, Object> m : carList) {
                    if (((String) m.get("stateCn")).contains("在线")) {
                        online = online + 1;
@@ -515,11 +534,12 @@
                        continue;
                    }
                }
                for (Map<String, Object> m : (List<Map<String, Object>>) result0.get("list")) {
                    if (((String) m.get("teamId")).equals(((String) map.get("teamId")))) {
                        map.put("count", Integer.parseInt((String) m.get("carNum")));
                    }
                }
//                for (Map<String, Object> m : (List<Map<String, Object>>) result0.get("list")) {
//                    if (((String) m.get("teamId")).equals(((String) map.get("teamId")))) {
//                        map.put("count", Integer.parseInt((String) m.get("carNum")));
//                    }
//                }
                map.put("count", carList.size());
                map.put("online", online);
                online = 0;
            }