禁出电子围栏报警逻辑bug修改提交

zhangnaisong

2024-01-31 2d10f00422f1c501f2cffec29fef1c6a8eba3a55

禁出电子围栏报警逻辑bug修改提交

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

@@ -338,7 +338,7 @@
        List<ArdWall> ardWallsNoIn = new ArrayList();//禁入电子围栏
        List<ArdWall> ardWallsNoOut = new ArrayList();//禁出电子围栏
        ardWallsNoIn = ardWalls.stream().filter(ardWall -> ardWall.getType().equals("1")).collect(Collectors.toList());
        ardWallsNoOut = ardWalls.stream().filter(ardWall -> ardWall.getType().equals("0")).collect(Collectors.toList());
        ardWallsNoOut = ardWalls.stream().filter(ardWall -> ardWall.getType().equals("2")).collect(Collectors.toList());
        //当前用户的位置
        Point userPoint = new Point(ardAppPosition.getLongitude(), ardAppPosition.getLatitude());
        if(ardWallsNoIn.size() > 0){//判断禁入
@@ -408,23 +408,13 @@
                    noOutFlag = true;
                } else {
                    noOutFlag = false;
                    break;
                }
            }
        }
        if(noOutFlag){//全部禁出电子围栏都出去了
            for(ArdWall wall : ardWallsNoOut){
                String wallId = wall.getId();//围栏ID
                //String wallPoi = wall.getWallPoi();//围栏坐标集合
                //处理多边形的每个点的经纬度
                /*String[] parts = wallPoi.split(",");
                List<Point> pointList = new ArrayList<>();
                for (int i = 0; i < parts.length; i += 3) {
                    Point point = new Point();
                    point.setLongitude(Double.valueOf(parts[i]));
                    point.setLatitude(Double.valueOf(parts[i + 1]));
                    pointList.add(point);
                }
                boolean inPolygon = GisUtil.isInPolygon(userPoint, pointList);*///判断是否在围栏内
                //创建围栏报警实体对象
                ArdAlarmWall ardAlarmWall = new ArdAlarmWall();
                ardAlarmWall.setWallId(wall.getId());
@@ -436,27 +426,22 @@
                ardAlarmWall.setLatitude(ardAppPosition.getLatitude());
                ardAlarmWall.setAltitude(ardAppPosition.getAltitude());
                String key = userId + "_" + wallId;//最后一次报警缓存key
                //if (!inPolygon) {
                    //禁出围栏则若在围栏外,获取首次走出围栏报警ID
                    String lastAlarmId = firstAlarmMap.get(key);
                    //判断当前用户是否首次在围栏外
                    if (lastAlarmId == null) {
                        String uuid = IdUtils.simpleUUID();
                        //当前用户首次出围栏生成报警
                        ardAlarmWall.setId(uuid);
                        ardAlarmWallService.insertArdAlarmWall(ardAlarmWall);
                        //记录首次报警id
                        firstAlarmMap.put(key, uuid);
                    } else {
                        //用户已经在围栏外更新报警
                        ardAlarmWall.setId(lastAlarmId);
                        ardAlarmWallService.updateArdAlarmWall(ardAlarmWall);
                    }
                    ardAlarmWalls.add(ardAlarmWall);
                /*} else {
                    //移除首次报警缓存
                    firstAlarmMap.remove(key);
                }*/
                //禁出围栏则若在围栏外,获取首次走出围栏报警ID
                String lastAlarmId = firstAlarmMap.get(key);
                //判断当前用户是否首次在围栏外
                if (lastAlarmId == null) {
                    String uuid = IdUtils.simpleUUID();
                    //当前用户首次出围栏生成报警
                    ardAlarmWall.setId(uuid);
                    ardAlarmWallService.insertArdAlarmWall(ardAlarmWall);
                    //记录首次报警id
                    firstAlarmMap.put(key, uuid);
                } else {
                    //用户已经在围栏外更新报警
                    ardAlarmWall.setId(lastAlarmId);
                    ardAlarmWallService.updateArdAlarmWall(ardAlarmWall);
                }
                ardAlarmWalls.add(ardAlarmWall);
            }
        }else{
            for(ArdWall wall : ardWallsNoOut){