Merge remote-tracking branch 'origin/master'

Administrator

2023-08-23 f97d74f9f851ef70048fab599d7bc54d7932afc7

 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;

@@ -145,9 +146,10 @@
            SysUser user = new SysUser();
            user.setDeptId(deptId);
            List<SysUser> appUserList = iSysUserService.selectAllAppUserList(user);
            //过滤在线
            //过滤在线和单兵端
            List<SysUser> onLineList = appUserList.stream()
                    .filter(sysUser -> (sysUser.getAppOnlineState().equals("1")))
                    .filter(sysUser -> (sysUser.getAppUserType().equals("1")))
                    .collect(Collectors.toList());
            //过滤范围
            for (SysUser sysUser : onLineList) {
@@ -183,7 +185,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);
@@ -191,6 +193,7 @@
            //过滤在线
            List<SysUser> onLineList = appUserList.stream()
                    .filter(sysUser -> (sysUser.getAppOnlineState().equals("1")))
                    .filter(sysUser -> (sysUser.getAppUserType().equals("1")))
                    .collect(Collectors.toList());
            //过滤范围
            for (SysUser sysUser : onLineList) {
@@ -201,7 +204,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<>();