31车辆接口逻辑优化整合

艾金辉

2023-07-24 70e428a02ebd913af53c88bc18e794938312c537

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

@@ -2,26 +2,25 @@

import java.util.*;
import javax.annotation.PostConstruct;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.ruoyi.client.ARDCarGPSLogInClient;
import com.ruoyi.client.ARDCarSYGPSClient;
import com.ruoyi.common.core.domain.entity.SysDept;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.uuid.IdUtils;
import com.ruoyi.sy.domain.ArdSyUser;
import com.ruoyi.sy.gps31.PushClientImplAlarm;
import com.ruoyi.sy.gps31.PushClientImplPosition;
import com.ruoyi.sy.service.IArdSyUserService;
import com.ruoyi.system.domain.SysConfig;
import com.ruoyi.system.service.ISysConfigService;
import com.ruoyi.system.service.ISysDeptService;
import com.ruoyi.system.service.ISysUserService;
import com.ruoyi.utils.httpclient.SYCarClient;
import com.ruoyi.utils.forest.SYClient;
import com.ruoyi.utils.result.Results;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.apache.commons.codec.digest.DigestUtils;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -34,8 +33,6 @@
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.common.core.page.TableDataInfo;
import org.springframework.web.multipart.MultipartFile;

import static com.ruoyi.common.websocket.util.WebSocketUtils.ONLINE_USER_SESSIONS;

/**
 * 三一车辆Controller
@@ -66,6 +63,8 @@
    @Autowired
    private ISysDeptService sysDeptService;

    @Resource
    private SYClient sYClient;

    private ArdSyCarController ardSyCarController;

@@ -100,6 +99,11 @@
            }
        };
        carPositionTimer.scheduleAtFixedRate(carPositionTask,date,3*1000);//启用

        //车辆实时位置线程
        PushClientImplAlarm pushClientImplAlarm = new PushClientImplAlarm(ip,ardSyUserList.get(0).getUserId(),ardSyUserList.get(0).getPassword());
        Thread pushClientImplAlarmThread = new Thread(pushClientImplAlarm);
        pushClientImplAlarmThread.start();
    }

    /**
@@ -193,7 +197,9 @@
            return error("三一车辆url没有录入");
        }else{
            syURL = sysConfigResult.get(0).getConfigValue();
            Map<String,Object> result = SYCarClient.logIn(syURL,userId, password);
            //Map<String,Object> result = SYCarClient.logIn(syURL,userId, password);
            String passwordMd5 = DigestUtils.md5Hex(password);
            Map<String,Object> result = sYClient.logIn(syURL,passwordMd5,userId);
            return success(result);
        }
    }
@@ -270,50 +276,8 @@
    public Map<String,Object> allListByUser(){
        String usersId = SecurityUtils.getUserId();
        ArdSyUser ardSyUser = iArdSyUserService.userById(usersId);
        Map<String,Object> result0 = new HashMap();
        //判断关联表是否有数据
        if(ardSyUser!=null){
            //31用户名密码
            String username31 = ardSyUser.getUserId();
            String password31 = ardSyUser.getPassword();
            //查询地址
            Map<String, String> result = logInMap.get(Integer.parseInt(usersId));
            String syURL = sysConfigService.getSYURL();
            Map<String, Object> result1 = ARDCarGPSLogInClient.loginIn(syURL,username31, password31);
            result = new HashMap();
            result.put("userId", username31);
            result.put("sessionId", (String) result1.get("sessionId"));
            try {
                result0 = ARDCarSYGPSClient.getCarGPSTeamList(syURL,result.get("userId"),result.get("sessionId"));//
            } catch (Exception e) {
                Map<String,Object> map = new HashMap();
                map.put("rspCode", 0);
                map.put("list", new ArrayList());
                return map;
            }
            int online = 0;
            for(Map<String,Object> map : (List<Map<String,Object>>) result0.get("list")){
                Map<String,Object> resultMap = (Map<String, Object>) ARDCarSYGPSClient.getCarListByTeamId(syURL,(String)map.get("teamId"),result.get("sessionId"));
                List<Map<String,Object>> carList = (List<Map<String, Object>>) resultMap.get("carList");
                for(Map<String,Object> m : carList){
                    if(((String) m.get("stateCn")).contains("在线")){
                        online = online + 1;
                    }else{
                        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")));
                    }
                }
                map.put("online", online);
                online = 0;
            }
        }else {
            result0.put("列表为空！","无关联账号！");
        }
        return result0;
        String syURL = sysConfigService.getSYURL();
        return ardSyCarService.allListByUser(ardSyUser,syURL,usersId);
    }

    @PreAuthorize("@ss.hasPermi('sy:syCar:carList')")
@@ -321,111 +285,22 @@
    @ApiOperation("根据teamId获取车辆列表")
    public Results getCarList(@RequestBody Map<String,String> map){
        String usersId = SecurityUtils.getUserId();
        Map<String, String> result = logInMap.get(Integer.parseInt(usersId));
        String teamId = map.get("teamId");
        String syURL = sysConfigService.getSYURL();
        ArdSyUser ardSyUser = iArdSyUserService.userById(usersId);
        String syURL = sysConfigService.getSYURL();
        String teamId = map.get("teamId");
        //判断关联表是否有数据
        if(ardSyUser!=null) {
            //31用户名密码
            String username31 = ardSyUser.getUserId();
            String password31 = ardSyUser.getPassword();
            Map<String, Object> userMap = ARDCarGPSLogInClient.loginIn(syURL,username31, password31);
            result = new HashMap();
            result.put("userId", username31);
            result.put("sessionId", (String) userMap.get("sessionId"));
            //查询出31的车辆数据
            List<Map<String,String>> list = ardSyCarService.getCarList(ardSyUser,syURL,usersId,teamId);
            //根据userId查询部门Id
            SysUser sysUser = sysUserService.selectUserById(usersId);
            //根据当前deptId或者当前及所属下级的所有deptId
            List<Long> deptList = sysDeptService.deptIdBySub(sysUser.getDeptId());
            //根据dept集合查询出所有对应的车辆列表并赋值
            return Results.succeed(ardSyCarService.carIdByDeptList(deptList,list));
        }else {
            return Results.error("列表为空！无关联账号！");
        }
        //查询该teamId下的车辆数据
        Map<String,Object> carList31 = new HashMap();
        try {
            carList31 = ARDCarSYGPSClient.getCarListByTeamId(syURL,teamId, result.get("userId"),result.get("sessionId"));
        } catch (Exception e) {
            Map<String,Object> m = iArdSyUserService.selectArdSyUserByUsersId(Integer.parseInt(usersId));
            if(m == null){
                Results.error("当前登录用户未挂接车辆权限");
            }
            Map<String,Object> map0 = ARDCarGPSLogInClient.loginIn(syURL,(String) m.get("userId"), (String) m.get("password"));
            carList31 = ARDCarSYGPSClient.getCarListByTeamId(syURL,teamId, (String) m.get("userId"),(String) map0.get("sessionId"));
        }
        //拿到车辆数据
        List<Map<String,String>> 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,Object> map0 = new HashMap();
            map0.put("list", new ArrayList());
            map0.put("rspCode", "1");
            return Results.succeed();
        }
        //添加车辆属性
        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;
            }
        }
        //根据userId查询部门Id
        SysUser sysUser = sysUserService.selectUserById(usersId);
        Long deptId = sysUser.getDeptId();
        //根据当前deptId或者当前及所属下级的所有deptId
        List<Long> deptList = sysDeptService.deptIdBySub(deptId);
        //根据dept集合查询出所有对应的车辆列表
        List<ArdSyCar> carList = ardSyCarService.carIdByDeptList(deptList);
        //对比把匹配到的数据添加到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);
                if(carId.equals(ardSyCar.getCarId())){
                    m.put("carModel",ardSyCar.getCarModel());
                    m.put("carTypeArd",ardSyCar.getCarType());
                    m.put("carBrand",ardSyCar.getCarBrand());
                    m.put("carPicture",ardSyCar.getCarPicture());
                }
            }
//            for(Map<String,String> ma :){
//                if(m.get("carId").equals(ma.get("carId"))){
//                    m.put("stateCn", ma.get("carState"));
//                }
//            }
        }
//        Collections.sort((List)result0.get("list"),new Comparator<Map<String, Object>>() {
//            @Override
//            public int compare(Map<String, Object> o1, Map<String, Object> o2) {
//                Comparator<Object> com = Collator.getInstance(java.util.Locale.CHINA);
//                return com.compare(o2.get("stateCn"), o1.get("stateCn"));
//            }
//        });
        return Results.succeed(list);
    }

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