Merge remote-tracking branch 'origin/master'

aijinhui

2024-02-23 0abccf5e570dce53a802bca4ce25118dd900692c

 ard-work/src/main/java/com/ruoyi/app/application/controller/ArdAppApplicationController.java

@@ -1,5 +1,6 @@
package com.ruoyi.app.application.controller;

import java.awt.geom.QuadCurve2D;
import java.util.List;
import java.util.Map;
import javax.servlet.http.HttpServletResponse;
@@ -197,4 +198,43 @@
            return AjaxResult.error();
        }
    }

    @GetMapping("/getSendPositionTrue")
    @ApiOperation("单兵端查看通过的申请")
    public AjaxResult getSendPositionTrue() {
        String soilderId = SecurityUtils.getUserId();
        try{
            Map<String,List<Map<String,Object>>> result = ardAppApplicationService.getSendPositionTrue(soilderId);
            return AjaxResult.success(result);
        }catch(Exception e){
            e.printStackTrace();
            return AjaxResult.error();
        }
    }

    @GetMapping("/getCheckPositionNo")
    @ApiOperation("PC端查看未审批的申请")
    public AjaxResult getCheckPositionNo() {//
        String commanderId = SecurityUtils.getUserId();
        try{
            List<Map<String,Object>> result = ardAppApplicationService.getCheckPositionNo(commanderId);
            return AjaxResult.success(result);
        }catch(Exception e){
            e.printStackTrace();
            return AjaxResult.error();
        }
    }

    @GetMapping("/getSoilderAndCarPositionByCommanderIdNear")
    @ApiOperation("PC端指挥端查看单兵端及车辆位置")
    public AjaxResult getSoilderAndCarPositionByCommanderIdNear(@RequestBody Map<String, Double> para) {
        String commanderId = SecurityUtils.getUserId();
        try{
            Map<String,Map<String,List<Map<String,Object>>>> result = ardAppApplicationService.getSoilderAndCarPositionByCommanderId(commanderId,para);
            return AjaxResult.success(result);
        }catch(Exception e){
            e.printStackTrace();
            return AjaxResult.error();
        }
    }
}