app指挥端查看指挥端位置及车辆位置审批加入nickName提交

zhangnaisong

2024-01-23 b5bb69ff301470233bf193959f1a1c4553aaf86b

app指挥端查看指挥端位置及车辆位置审批加入nickName提交

 ard-work/src/main/java/com/ruoyi/app/position/controller/ArdAppPositionController.java

@@ -252,7 +252,7 @@

    @GetMapping("/getCheckCommandersPosition")
    @ApiOperation("指挥端查看指挥端位置申请")
    public AjaxResult getCheckCommandersPosition() {
    public AjaxResult getCheckCommandersPosition() {//弃用
        String usersId = SecurityUtils.getUserId();
        try{
            List<Map<String,Object>> result = ardAppPositionService.getCheckCommandersPosition(usersId);
@@ -265,7 +265,7 @@

    @GetMapping("/getCheckSYCarsPosition")
    @ApiOperation("指挥端查看车辆位置申请")
    public AjaxResult getCheckSYCarsPosition() {
    public AjaxResult getCheckSYCarsPosition() {//弃用
        String usersId = SecurityUtils.getUserId();
        try{
            List<Map<String,Object>> result = ardAppPositionService.getCheckSYCarsPosition(usersId);
@@ -276,4 +276,17 @@
        }
    }

    @GetMapping("/getCheckPosition")
    @ApiOperation("指挥端查看位置申请")
    public AjaxResult getCheckPosition() {
        String usersId = SecurityUtils.getUserId();
        try{
            Map<String,List<Map<String,Object>>> result = ardAppPositionService.getCheckPosition(usersId);
            return AjaxResult.success(result);
        }catch(Exception e){
            e.printStackTrace();
            return AjaxResult.error();
        }
    }

}

 ard-work/src/main/java/com/ruoyi/app/position/service/IArdAppPositionService.java

@@ -93,4 +93,6 @@
    public List<Map<String,Object>> getCheckCommandersPosition(String usersId);

    public List<Map<String,Object>> getCheckSYCarsPosition(String usersId);

    public Map<String,List<Map<String,Object>>> getCheckPosition(String usersId);
}

 ard-work/src/main/java/com/ruoyi/app/position/service/impl/ArdAppPositionServiceImpl.java

@@ -413,4 +413,46 @@
        }
        return result;
    }

    @Override
    public Map<String, List<Map<String, Object>>> getCheckPosition(String usersId) {
        Map<String, List<Map<String, Object>>> result = new HashMap();
        //查看指挥端位置申请
        String keyCommanderPosition = "checkCommanderPosition_" + usersId + "_";
        List<Object> keyValueCommanderPositionList = redisCache.getListKey(keyCommanderPosition);
        List<Map<String, Object>> resultCommanderPosition = new ArrayList();
        for(Object o : keyValueCommanderPositionList){
            Map<String,Object> map = JSON.parseObject((String) o);
            if(((String)map.get("state")).equals("0")){//state为0就是未审批
                SysUser sysUser = sysUserMapper.selectUserById((String) map.get("soilderId"));
                map.put("userName",sysUser.getUserName());
                if(sysUser.getNickName() != null){
                    map.put("nickName",sysUser.getNickName());
                }else{
                    map.put("nickName",sysUser.getNickName());
                }
                resultCommanderPosition.add(map);
            }
        }
        //查看车辆位置申请
        String keySYCarsPosition = "checkSYCarsPosition_" + usersId + "_";
        List<Object> keyValueSYCarsPositionList = redisCache.getListKey(keySYCarsPosition);
        List<Map<String, Object>> resultSYCarsPosition = new ArrayList();
        for(Object o : keyValueSYCarsPositionList){
            Map<String,Object> map = JSON.parseObject((String) o);
            if(((String)map.get("state")).equals("0")){//state为0就是未审批
                SysUser sysUser = sysUserMapper.selectUserById((String) map.get("soilderId"));
                map.put("userName",sysUser.getUserName());
                if(sysUser.getNickName() != null){
                    map.put("nickName",sysUser.getNickName());
                }else{
                    map.put("nickName",sysUser.getNickName());
                }
                resultSYCarsPosition.add(map);
            }
        }
        result.put("commander",resultCommanderPosition);
        result.put("SYCars",resultSYCarsPosition);
        return result;
    }
}