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

zhangnaisong

2024-01-22 b8e476ad3af5b9adc362061a2fc027e67f6254f7

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

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

@@ -249,4 +249,31 @@
            return AjaxResult.error();
        }
    }

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

    @GetMapping("/getCheckSYCarsPosition")
    @ApiOperation("指挥端查看车辆位置申请")
    public AjaxResult getCheckSYCarsPosition() {
        String usersId = SecurityUtils.getUserId();
        try{
            List<Map<String,Object>> result = ardAppPositionService.getCheckSYCarsPosition(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

@@ -89,4 +89,8 @@
    public void sendCheckCommandersPosition(String usersId,Map<String,Object> para);

    public void sendCheckSYCarsPosition(String usersId,Map<String,Object> para);

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

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

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

@@ -20,6 +20,7 @@
import com.ruoyi.utils.gis.GisUtil;
import com.ruoyi.utils.gis.Point;
import lombok.extern.slf4j.Slf4j;
import org.springframework.boot.autoconfigure.data.redis.RedisProperties;
import org.springframework.stereotype.Service;

import javax.annotation.Resource;
@@ -358,6 +359,8 @@
            value.put("reason",reason);
            value.put("state","0");
            value.put("begin","");
            value.put("commanderId",commanderId);
            value.put("soilderId",usersId);
            redisCache.setCacheObject(key, JSON.toJSONString(value));
        }
    }
@@ -367,13 +370,47 @@
        String reason = (String) para.get("reason");
        List<String> usersIdList = (List<String>) para.get("usersIdList");
        for(String commanderId : usersIdList){
            //设置key为checkCommanderPosition_指挥端主键/PC端主键_单兵端主键
            //设置key为checkSYCarsPosition_指挥端主键/PC端主键_单兵端主键
            String key = "checkSYCarsPosition_" + commanderId + "_" + usersId;
            Map<String,Object> value = new HashMap();
            value.put("reason",reason);
            value.put("state","0");
            value.put("begin","");
            value.put("commanderId",commanderId);
            value.put("soilderId",usersId);
            redisCache.setCacheObject(key, JSON.toJSONString(value));
        }
    }

    @Override
    public List<Map<String, Object>> getCheckCommandersPosition(String usersId) {
        String key = "checkCommanderPosition_" + usersId + "_";
        List<Object> keyValueList = redisCache.getListKey(key);
        List<Map<String, Object>> result = new ArrayList();
        for(Object o : keyValueList){
            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());
                result.add(map);
            }
        }
        return result;
    }

    @Override
    public List<Map<String, Object>> getCheckSYCarsPosition(String usersId) {
        String key = "checkSYCarsPosition_" + usersId + "_";
        List<Object> keyValueList = redisCache.getListKey(key);
        List<Map<String, Object>> result = new ArrayList();
        for(Object o : keyValueList){
            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());
                result.add(map);
            }
        }
        return result;
    }
}