指挥端查看app历史轨迹提交

zhangnaisong

2024-02-20 c3cace620c5bc6b0049bf0c677f729ea2c406203

指挥端查看app历史轨迹提交

 ard-work/src/main/java/com/ruoyi/app/position/appcontainer/AppContainer.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,19 @@
package com.ruoyi.app.position.appcontainer;

import com.ruoyi.app.position.domain.ArdAppPosition;

import java.util.HashMap;
import java.util.Map;

public class AppContainer {

    private static Map<String, ArdAppPosition> ardAppPositionMap = new HashMap();

    public static Map<String, ArdAppPosition> getArdAppPositionMap() {
        return ardAppPositionMap;
    }

    public static void setArdAppPositionMap(Map<String, ArdAppPosition> ardAppPositionMap) {
        ardAppPositionMap = ardAppPositionMap;
    }
}

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

@@ -251,67 +251,10 @@
        }
    }

    /*@PostMapping("/sendCheckCommandersPosition")
    @ApiOperation("发起查看指挥端位置")
    public AjaxResult sendCheckCommandersPosition(@RequestBody Map<String,Object> para) {
        String usersId = SecurityUtils.getUserId();
        try{
            ardAppPositionService.sendCheckCommandersPosition(usersId,para);
            return AjaxResult.success();
        }catch(Exception e){
            return AjaxResult.error();
        }
    }*/

    /*@PostMapping("/sendCheckSYCarsPosition")
    @ApiOperation("发起查看车辆位置")
    public AjaxResult sendCheckSYCarsPosition(@RequestBody Map<String,Object> para) {
        String usersId = SecurityUtils.getUserId();
        try{
            ardAppPositionService.sendCheckSYCarsPosition(usersId,para);
            return AjaxResult.success();
        }catch(Exception e){
            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();
        }
    }*/

    /*@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();
        }
    }*/
    @GetMapping("/getAPPSoilderByCommanderId")
    public AjaxResult getAPPSoilderByCommanderId() {
        String userId = SecurityUtils.getUserId();
        return success(ardAppPositionService.getAPPSoilderByCommanderId(userId));
    }

}

 ard-work/src/main/java/com/ruoyi/app/position/mapper/ArdAppPositionMapper.java

@@ -73,4 +73,6 @@
    public List<Map<String,Object>> getOnlineCommanderPosition(String soilderId);

    public List<ArdAppPosition> getAPPPositionByUserIdAndTime(@Param("userId") String userId,@Param("beginTime") String beginTime,@Param("endTime") String endTime);

    public ArdAppPosition getLastAPPPositionByUserId(String userId);
}

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

@@ -90,13 +90,6 @@

    public List<ArdAppPosition> getAPPPositionByUserIdAndTime(Map<String,String> para);

    //public void sendCheckCommandersPosition(String usersId,Map<String,Object> para);
    public List<Map<String,Object>> getAPPSoilderByCommanderId(String userId);

    //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);

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

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

@@ -1,11 +1,10 @@
package com.ruoyi.app.position.service.impl;

import com.alibaba.fastjson2.JSON;
import com.ruoyi.alarm.wall.domain.ArdAlarmWall;
import com.ruoyi.alarm.wall.mapper.ArdAlarmWallMapper;
import com.ruoyi.alarm.wall.service.IArdAlarmWallService;
import com.ruoyi.alarmpoints.wall.domain.ArdWall;
import com.ruoyi.alarmpoints.wall.mapper.ArdWallMapper;
import com.ruoyi.app.position.appcontainer.AppContainer;
import com.ruoyi.app.position.domain.ArdAppPosition;
import com.ruoyi.app.position.mapper.ArdAppPositionMapper;
import com.ruoyi.app.position.service.IArdAppPositionService;
@@ -15,16 +14,15 @@
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.uuid.IdUtils;
import com.ruoyi.scheduling.domian.SchedulingParam;
import com.ruoyi.system.mapper.SysDeptMapper;
import com.ruoyi.system.mapper.SysUserMapper;
import com.ruoyi.system.service.ISysUserService;
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;
import java.text.SimpleDateFormat;
import java.util.*;
import java.util.stream.Collectors;

@@ -52,6 +50,8 @@
    IArdAlarmWallService ardAlarmWallService;
    @Resource
    private SysUserMapper sysUserMapper;
    @Resource
    private SysDeptMapper sysDeptMapper;

    Map<String, String> firstAlarmMap = new HashMap<>();//首次报警缓存key:用户id_围栏id value: æŠ¥è­¦id
    /**
@@ -98,7 +98,12 @@
        ardAppPosition.setId(IdUtils.simpleUUID());
        ardAppPosition.setCreateTime(DateUtils.getNowDate());
        ardAppPositionMapper.insertArdAppPosition(ardAppPosition);
        return DetectionWallAlarm(ardAppPosition);
        try{
            return DetectionWallAlarm(ardAppPosition);
        }finally {
            AppContainer.getArdAppPositionMap().put(ardAppPosition.getUserId(),ardAppPosition);//实时位置存入容器
        }

    }

    /**
@@ -487,111 +492,44 @@
        return result;
    }

    /*@Override
    public void sendCheckCommandersPosition(String usersId,Map<String, Object> para) {
        String reason = (String) para.get("reason");
        List<String> usersIdList = (List<String>) para.get("usersIdList");
        for(String commanderId : usersIdList){
            //设置key为checkCommanderPosition_指挥端主键_单兵端主键
            String key = "checkCommanderPosition_" + 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 void sendCheckSYCarsPosition(String usersId, Map<String, Object> para) {
        String reason = (String) para.get("reason");
        List<String> usersIdList = (List<String>) para.get("usersIdList");
        for(String commanderId : usersIdList){
            //设置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);
    @Override
    public List<Map<String,Object>> getAPPSoilderByCommanderId(String userId) {
        SysUser sysUser = sysUserMapper.selectUserById(userId);//获取系统用户
        List<Long> deptIdList = new ArrayList();
        deptIdList.add(sysUser.getDeptId());
        deptIdList = getOwnAndChildrenDeptIdList(deptIdList,new ArrayList());//递归查询下属部门主键
        List<SysUser> result = sysUserMapper.getOwnAndChildrenSoilderList(deptIdList);
        List<Map<String,Object>> resultList = new ArrayList();
        for(SysUser sysUserIn : result){
            Map<String,Object> map = new HashMap();
            map.put("userId",sysUserIn.getUserId());
            map.put("deptId",sysUserIn.getDeptId());
            map.put("userName",sysUserIn.getUserName());
            map.put("nickName",sysUserIn.getNickName());
            try{
                map.put("longitude",AppContainer.getArdAppPositionMap().get(sysUserIn.getUserId()).getLongitude());
                map.put("latitude",AppContainer.getArdAppPositionMap().get(sysUserIn.getUserId()).getLatitude());
                map.put("altitude",AppContainer.getArdAppPositionMap().get(sysUserIn.getUserId()).getAltitude());
            }catch(Exception e){
                ArdAppPosition ardAppPosition = ardAppPositionMapper.getLastAPPPositionByUserId(sysUserIn.getUserId());
                map.put("longitude",ardAppPosition.getLongitude());
                map.put("latitude",ardAppPosition.getLatitude());
                map.put("altitude",ardAppPosition.getAltitude());
            }
            resultList.add(map);
        }
        return result;
    }*/
        return resultList;
    }

    /*@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);
            }
    public List<Long> getOwnAndChildrenDeptIdList(List<Long> deptIdList,List<Long> deptIdListr){
        deptIdListr.addAll(deptIdList);
        List<Long> result = sysDeptMapper.getChildrenDeptIdList(deptIdList);
        if(result.size() != 0){
            deptIdListr.addAll(result);
            result = getOwnAndChildrenDeptIdList(result,deptIdListr);
        }
        return result;
    }*/
        deptIdListr = deptIdListr.stream().distinct().collect(Collectors.toList());
        return deptIdListr;
    }

    /*@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;
    }*/
}

 ard-work/src/main/resources/mapper/app/ArdAppPositionMapper.xml

@@ -103,4 +103,10 @@
        where aap.user_id = #{userId} and aap.create_time &gt;= #{beginTime}
        and aap.create_time &lt;= #{endTime} order by aap.create_time asc
    </select>

    <select id="getLastAPPPositionByUserId" parameterType="java.lang.String" resultMap="ArdAppPositionResult">
        select * from ard_app_position aap
        where aap.user_id = #{userId}
        order by aap.create_time desc limit 1 offset 0
    </select>
</mapper>

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java

@@ -266,9 +266,4 @@
        }
    }

    @GetMapping("/getAPPSoilderByCommanderId")
    public AjaxResult getAPPSoilderByCommanderId() {
        String userId = SecurityUtils.getUserId();
        return success(userService.getAPPSoilderByCommanderId(userId));
    }
}

 ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java

@@ -238,5 +238,4 @@

    List<SysUser> userByDept(Long deptId);

    List<SysUser> getAPPSoilderByCommanderId(String userId);
}

 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java

@@ -647,24 +647,4 @@
        return userMapper.selectList(queryWrapper);
    }

    @Override
    public List<SysUser> getAPPSoilderByCommanderId(String userId) {
        SysUser sysUser = userMapper.selectUserById(userId);//获取系统用户
        List<Long> deptIdList = new ArrayList();
        deptIdList.add(sysUser.getDeptId());
        deptIdList = getOwnAndChildrenDeptIdList(deptIdList,new ArrayList());//递归查询下属部门主键
        List<SysUser> result = userMapper.getOwnAndChildrenSoilderList(deptIdList);
        return result;
    }

    public List<Long> getOwnAndChildrenDeptIdList(List<Long> deptIdList,List<Long> deptIdListr){
        deptIdListr.addAll(deptIdList);
        List<Long> result = sysDeptMapper.getChildrenDeptIdList(deptIdList);
        if(result.size() != 0){
            deptIdListr.addAll(result);
            result = getOwnAndChildrenDeptIdList(result,deptIdListr);
        }
        deptIdListr = deptIdListr.stream().distinct().collect(Collectors.toList());
        return deptIdListr;
    }
}

 ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -353,6 +353,7 @@
        <foreach collection="deptIdList" item="deptId" open="(" close=")" separator=",">
            #{deptId}
        </foreach>
        and su.app_online_state = '1'
        order by su.dept_id asc
    </select>
</mapper>