修复sdk请求用户为null的bug

‘liusuyi’

2023-08-22 7a880de423619dc266a60dc643794ba626f7131f

修复sdk请求用户为null的bug

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

@@ -13,6 +13,7 @@
import com.ruoyi.scheduling.domian.SchedulingParam;
import com.ruoyi.system.service.ISysUserService;
import com.ruoyi.utils.tools.GisTool;
import com.ruoyi.utils.tools.Point;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;

@@ -183,7 +184,7 @@
        List<SysUser> filteredList = new ArrayList<>();
        try {
            Long deptId = SecurityUtils.getLoginUser().getUser().getDeptId();
            List<Point2D> partitionLocation = param.getPartitionLocation();
            List<Point> partitionLocation = param.getPartitionLocation();

            SysUser user = new SysUser();
            user.setDeptId(deptId);
@@ -201,7 +202,7 @@
                    if (lon == null || lat == null) {
                        continue;
                    }
                    Point2D point2D=new Point2D.Double(lon,lat);
                    Point point2D=new Point(lon,lat);
                    boolean inPolygon = GisTool.isInPolygon(point2D, partitionLocation);
                    if (inPolygon) {
                        Map<String, Object> params = new HashMap<>();

 ard-work/src/main/java/com/ruoyi/device/camera/service/impl/ArdCamerasServiceImpl.java

@@ -26,6 +26,7 @@
import com.ruoyi.common.annotation.DataScope;
import com.ruoyi.system.mapper.SysDeptMapper;
import com.ruoyi.utils.tools.GisTool;
import com.ruoyi.utils.tools.Point;
import com.sun.org.apache.bcel.internal.generic.NEW;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
@@ -357,7 +358,7 @@
    public List<ArdCameras> getNearCamerasWithPolygon(SchedulingParam param) {
        try {
            Long deptId=SecurityUtils.getLoginUser().getUser().getDeptId();
            List<Point2D> partitionLocation = param.getPartitionLocation();
            List<Point> partitionLocation = param.getPartitionLocation();
            if(partitionLocation==null)
            {
                log.debug("多边形坐标集合为空");
@@ -374,7 +375,7 @@
                    continue;
                }
                /*判断坐标是否在多边形范围内*/
                Point2D camPosition=new Point2D.Double(camera.getLongitude(), camera.getLatitude());
                Point camPosition=new Point(camera.getLongitude(), camera.getLatitude());
                boolean inPolygon = GisTool.isInPolygon(camPosition, partitionLocation);
                if (inPolygon) {
                    /*获取通道列表*/

 ard-work/src/main/java/com/ruoyi/device/hiksdk/controller/SdkController.java

@@ -83,6 +83,7 @@
    @Log(title = "在线状态", businessType = BusinessType.CONTROL)
    public @ResponseBody
    AjaxResult getOnlineState(@RequestBody CameraCmd cmd) {
        cmd.setOperator(SecurityUtils.getUserId());
        return toAjax(sdk.isOnLine(cmd));
    }

@@ -104,6 +105,7 @@
    @Log(title = "调用预置点", businessType = BusinessType.CONTROL)
    public @ResponseBody
    AjaxResult gotoPreset(@RequestBody CameraCmd cmd) {
        cmd.setOperator(SecurityUtils.getUserId());
        return toAjax(sdk.gotoPreset(cmd));
    }

@@ -113,6 +115,7 @@
    @Log(title = "设置预置点", businessType = BusinessType.CONTROL)
    public @ResponseBody
    AjaxResult setPreset(@RequestBody CameraCmd cmd) {
        cmd.setOperator(SecurityUtils.getUserId());
        return toAjax(sdk.setPreset(cmd));
    }

@@ -122,6 +125,7 @@
    @Log(title = "获取聚焦值", businessType = BusinessType.CONTROL)
    public @ResponseBody
    AjaxResult getFocusPos(@RequestBody CameraCmd cmd) {
        cmd.setOperator(SecurityUtils.getUserId());
        Map<String, Object> Map = sdk.getFocusPos(cmd);
        return AjaxResult.success("获取聚焦值", Map);
    }
@@ -132,6 +136,7 @@
    @Log(title = "设置聚焦值", businessType = BusinessType.CONTROL)
    public @ResponseBody
    AjaxResult setFocusPos(@RequestBody CameraCmd cmd) {
        cmd.setOperator(SecurityUtils.getUserId());
        return toAjax(sdk.setFocusPos(cmd));
    }

@@ -141,6 +146,7 @@
    @Log(title = "获取PTZ", businessType = BusinessType.CONTROL)
    public @ResponseBody
    AjaxResult GetPTZ(@RequestBody CameraCmd cmd) {
        cmd.setOperator(SecurityUtils.getUserId());
        Map<String, Object> ptzMap = sdk.getPtz(cmd);
        return AjaxResult.success("获取ptz", ptzMap);
    }
@@ -151,6 +157,7 @@
    @ApiOperationSupport(includeParameters = {"cmd.cameraId", "cmd.channelNum"})
    public @ResponseBody
    AjaxResult GetPTZScope(@RequestBody CameraCmd cmd) {
        cmd.setOperator(SecurityUtils.getUserId());
        Map<String, Object> ptzMap = sdk.getPtzScope(cmd);
        return AjaxResult.success("获取ptz范围", ptzMap);
    }
@@ -171,6 +178,7 @@
    @ApiOperationSupport(includeParameters = {"cmd.cameraId", "cmd.channelNum", "cmd.targetPosition"})
    public @ResponseBody
    AjaxResult setTargetPosition(@RequestBody CameraCmd cmd) {
        cmd.setOperator(SecurityUtils.getUserId());
        return toAjax(sdk.guideTargetPosition(cmd));
    }

@@ -181,6 +189,7 @@
    @ApiOperationSupport(includeParameters = {"cmd.cameraId", "cmd.channelNum"})
    public @ResponseBody
    AjaxResult SetZeroPTZ(@RequestBody CameraCmd cmd) {
        cmd.setOperator(SecurityUtils.getUserId());
        return toAjax(sdk.setZeroPtz(cmd));
    }

@@ -210,6 +219,7 @@
    @Log(title = "获取云台锁定信息", businessType = BusinessType.CONTROL)
    public @ResponseBody
    AjaxResult getPTZLockInfo(@RequestBody CameraCmd cmd) {
        cmd.setOperator(SecurityUtils.getUserId());
        int byWorkMode = sdk.getPTZLockInfo(cmd);
        if (byWorkMode == 0) {
            return AjaxResult.success("云台锁定状态：解锁");
@@ -226,6 +236,7 @@
    @ApiOperationSupport(includeParameters = {"cmd.cameraId", "cmd.channelNum", "cmd.enable"})
    public @ResponseBody
    AjaxResult defogcfg(@RequestBody CameraCmd cmd) {
        cmd.setOperator(SecurityUtils.getUserId());
        return toAjax(sdk.controlDefogcfg(cmd));
    }

@@ -235,6 +246,7 @@
    @ApiOperationSupport(includeParameters = {"cmd.cameraId", "cmd.channelNum", "cmd.enable"})
    public @ResponseBody
    AjaxResult infrarecfg(@RequestBody CameraCmd cmd) {
        cmd.setOperator(SecurityUtils.getUserId());
        return toAjax(sdk.controlInfrarecfg(cmd));
    }

@@ -244,6 +256,7 @@
    @ApiOperationSupport(includeParameters = {"cmd.cameraId", "cmd.channelNum", "cmd.enable"})
    public @ResponseBody
    AjaxResult enableFocusMode(@RequestBody CameraCmd cmd) {
        cmd.setOperator(SecurityUtils.getUserId());
        return toAjax(sdk.controlFocusMode(cmd));
    }

@@ -251,6 +264,7 @@
    @PostMapping("/getFocusMode")
    public @ResponseBody
    AjaxResult getFocusMode(@RequestBody CameraCmd cmd) {
        cmd.setOperator(SecurityUtils.getUserId());
        String focusMode = sdk.getFocusMode(cmd);
        return AjaxResult.success(focusMode);
    }
@@ -261,6 +275,7 @@
    @ApiOperationSupport(includeParameters = {"cmd.cameraId", "cmd.channelNum", "cmd.enable"})
    public @ResponseBody
    AjaxResult HeateRpwron(@RequestBody CameraCmd cmd) {
        cmd.setOperator(SecurityUtils.getUserId());
        return toAjax(sdk.controlPTHeateRpwron(cmd));
    }

@@ -271,12 +286,14 @@
    @ApiOperationSupport(includeParameters = {"cmd.cameraId", "cmd.channelNum", "cmd.enable"})
    public @ResponseBody
    AjaxResult CameraDeicing(@RequestBody CameraCmd cmd) {
        cmd.setOperator(SecurityUtils.getUserId());
        return toAjax(sdk.controlCameraDeicing(cmd));
    }

    @PostMapping("/captureJPEGPicture")
    public @ResponseBody
    AjaxResult captureJPEGPicture(@RequestBody CameraCmd cmd) {
        cmd.setOperator(SecurityUtils.getUserId());
        String base64Str = sdk.captureJPEGPicture(cmd);
        return toAjaxString(base64Str, "相机抓图");
    }
@@ -287,6 +304,7 @@
    @ApiOperationSupport(includeParameters = {"cmd.cameraId", "cmd.channelNum"})
    public @ResponseBody
    AjaxResult picCutCate(@RequestBody CameraCmd cmd) {
        cmd.setOperator(SecurityUtils.getUserId());
        String path = sdk.picCutCate(cmd);
        return toAjaxString(path, "相机抓图");
    }
@@ -297,6 +315,7 @@
    @ApiOperationSupport(includeParameters = {"cmd.cameraId", "cmd.channelNum", "cmd.enable"})
    public @ResponseBody
    AjaxResult record(@RequestBody CameraCmd cmd) {
        cmd.setOperator(SecurityUtils.getUserId());
        String path = sdk.record(cmd);
        return toAjaxString(path, "手动录像");
    }

 ard-work/src/main/java/com/ruoyi/scheduling/controller/SchedulingController.java

@@ -51,9 +51,9 @@

        return AjaxResult.success(nearMap);
    }
    @GetMapping("/getPolygonVehiPersonCam")
    @PostMapping("/getPolygonVehiPersonCam")
    @ApiOperation("获取附近的车人相机(多边形)")
    AjaxResult getPolygonVehiPersonCam(SchedulingParam param) {
    AjaxResult getPolygonVehiPersonCam(@RequestBody SchedulingParam param) {
        Map<String, Object> nearMap = new HashMap<>();
        List<Map<String, Object>> Cars = iArdSyCarService.getNearCarWithPolygon(param);
        nearMap.put("car", Cars);

 ard-work/src/main/java/com/ruoyi/scheduling/domian/SchedulingParam.java

@@ -1,8 +1,8 @@
package com.ruoyi.scheduling.domian;

import com.ruoyi.utils.tools.Point;
import lombok.Data;

import java.awt.geom.Point2D;
import java.util.List;

/**
@@ -20,5 +20,5 @@
    Double longitude;
    Double latitude;
    //多边形坐标集合
    List<Point2D> partitionLocation;
    List<Point> partitionLocation;
}

 ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdSyCarServiceImpl.java

@@ -6,6 +6,7 @@
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.*;
import java.util.List;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.function.Predicate;
@@ -17,6 +18,7 @@
import com.ruoyi.common.core.redis.RedisCache;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.uuid.IdUtils;
import com.ruoyi.utils.tools.Point;
import com.ruoyi.scheduling.domian.SchedulingParam;
import com.ruoyi.sy.domain.ArdSyCarDay;
import com.ruoyi.sy.mapper.ArdSyCarDayMapper;
@@ -1099,7 +1101,7 @@
    public List<Map<String, Object>> getNearCarWithPolygon(SchedulingParam param) {
        List<Map<String, Object>> filteredList = new ArrayList<>();
        try {
            List<Point2D> partitionLocation = param.getPartitionLocation();
            List<Point> partitionLocation = param.getPartitionLocation();
            if (partitionLocation == null) {
                log.debug("多边形坐标集合为空");
                return null;
@@ -1141,8 +1143,8 @@
                List<Map<String, Object>> carGPSMap = (List<Map<String, Object>>) carGPSTrack.get("list");
                Double lng = Double.valueOf((String) carGPSMap.get(0).get("lng"));
                Double lat = Double.valueOf((String) carGPSMap.get(0).get("lat"));
                Point2D point2D = new Point2D.Double(lng, lat);
                boolean inPolygon = GisTool.isInPolygon(point2D, partitionLocation);
                Point point = new Point(lng, lat);
                boolean inPolygon = GisTool.isInPolygon(point, partitionLocation);
                if (inPolygon) {
                    carMap.put("longitude", lng);
                    carMap.put("latitude", lat);

 ard-work/src/main/java/com/ruoyi/utils/tools/GisTool.java

@@ -36,14 +36,14 @@

    public static void main(String[] args) {
        // è¢«æ£€æµ‹çš„经纬度点
        Point2D point2D= new Point2D.Double(126.649261,45.687377);
        Point point= new Point(126.649261,45.687377);
        // å•†ä¸šåŒºåŸŸï¼ˆç™¾åº¦å¤šè¾¹å½¢åŒºåŸŸç»çº¬åº¦é›†åˆï¼‰
        List<Point2D> partitionLocation = new ArrayList<>();
        partitionLocation.add(new Point2D.Double(126.64459,45.688548));
        partitionLocation.add(new Point2D.Double(126.653376,45.68938));
        partitionLocation.add(new Point2D.Double(126.645776,45.685048));
        partitionLocation.add(new Point2D.Double(126.654184,45.685778));
        System.out.println(isInPolygon(point2D,partitionLocation));
        List<Point> partitionLocation = new ArrayList<>();
        partitionLocation.add(new Point(126.64459,45.688548));
        partitionLocation.add(new Point(126.653376,45.68938));
        partitionLocation.add(new Point(126.645776,45.685048));
        partitionLocation.add(new Point(126.654184,45.685778));
        System.out.println(isInPolygon(point,partitionLocation));
    }

    /**
@@ -52,17 +52,17 @@
     * @param partitionLocation åŒºåŸŸé¡¶ç‚¹
     * @return
     */
    public static boolean isInPolygon(Point2D orderLocation,List<Point2D> partitionLocation){
    public static boolean isInPolygon(Point orderLocation,List<Point> partitionLocation){

        double p_x =orderLocation.getX();
        double p_y =orderLocation.getY();
        double p_x =orderLocation.getLongitude();
        double p_y =orderLocation.getLatitude();
        Point2D.Double point = new Point2D.Double(p_x, p_y);

        List<Point2D.Double> pointList= new ArrayList<Point2D.Double>();

        for (Point2D points : partitionLocation){
            double polygonPoint_x=points.getX();
            double polygonPoint_y=points.getY();
        for (Point points : partitionLocation){
            double polygonPoint_x=points.getLongitude();
            double polygonPoint_y=points.getLatitude();
            Point2D.Double polygonPoint = new Point2D.Double(polygonPoint_x,polygonPoint_y);
            pointList.add(polygonPoint);
        }

 ard-work/src/main/java/com/ruoyi/utils/tools/Point.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,23 @@
package com.ruoyi.utils.tools;

import lombok.AllArgsConstructor;
import lombok.Data;

/**
 * @Description:
 * @ClassName: Point
 * @Author: åˆ˜è‹ä¹‰
 * @Date: 2023å¹´08月22日9:56:58
 * @Version: 1.0
 **/
@Data
public class Point{
    private static final long serialVersionUID = 1L;
    private Double longitude;
    private Double latitude;

    public Point(Double x, Double y) {
        this.longitude = x;
        this.latitude = y;
    }
}

 ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/SdkOperateAspect.java

@@ -100,6 +100,10 @@
                    } else {
                        /*当前控制者为普通用户*/
                        SysUser sysUser = sysUserService.selectUserById(currentOperator);
                        if(StringUtils.isNull(sysUser))
                        {
                            return false;
                        }
                        currentLevel = Integer.valueOf(sysUser.getCameraPriority());
                    }
                    Integer operatorLevel = 0;//获取申请者的优先级