From df7cbd4d9b23b44c8aca4c32d85551dd0706b7f0 Mon Sep 17 00:00:00 2001 From: ‘liusuyi’ <1951119284@qq.com> Date: 星期二, 22 八月 2023 10:56:21 +0800 Subject: [PATCH] 优化 --- ard-work/src/main/java/com/ruoyi/app/position/service/impl/ArdAppPositionServiceImpl.java | 122 ++++++++++++++++++++++++++++++++++++++++ 1 files changed, 121 insertions(+), 1 deletions(-) diff --git a/ard-work/src/main/java/com/ruoyi/app/position/service/impl/ArdAppPositionServiceImpl.java b/ard-work/src/main/java/com/ruoyi/app/position/service/impl/ArdAppPositionServiceImpl.java index 18e068d..3a88178 100644 --- a/ard-work/src/main/java/com/ruoyi/app/position/service/impl/ArdAppPositionServiceImpl.java +++ b/ard-work/src/main/java/com/ruoyi/app/position/service/impl/ArdAppPositionServiceImpl.java @@ -3,12 +3,28 @@ import com.ruoyi.app.position.domain.ArdAppPosition; import com.ruoyi.app.position.mapper.ArdAppPositionMapper; import com.ruoyi.app.position.service.IArdAppPositionService; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.core.domain.entity.SysUser; import com.ruoyi.common.utils.DateUtils; +import com.ruoyi.common.utils.SecurityUtils; +import com.ruoyi.common.utils.StringUtils; +import com.ruoyi.common.utils.spring.SpringUtils; import com.ruoyi.common.utils.uuid.IdUtils; +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; +import javax.annotation.PostConstruct; import javax.annotation.Resource; +import java.awt.geom.Point2D; +import java.util.ArrayList; +import java.util.HashMap; import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; /** @@ -18,9 +34,12 @@ * @date 2023-07-18 */ @Service +@Slf4j public class ArdAppPositionServiceImpl implements IArdAppPositionService { @Resource private ArdAppPositionMapper ardAppPositionMapper; + @Resource + private ISysUserService iSysUserService; /** * 鏌ヨapp浣嶇疆 @@ -32,6 +51,7 @@ public ArdAppPosition selectArdAppPositionById(String id) { return ardAppPositionMapper.selectArdAppPositionById(id); } + /** * 鎸夌敤鎴穒d鏌ヨ鏈�鍚庣殑浣嶇疆淇℃伅 * @@ -39,9 +59,10 @@ * @return app浣嶇疆 */ @Override - public ArdAppPosition selectLastArdAppPositionByUserId(String userId){ + public ArdAppPosition selectLastArdAppPositionByUserId(String userId) { return ardAppPositionMapper.selectLastArdAppPositionByUserId(userId); } + /** * 鏌ヨapp浣嶇疆鍒楄〃 * @@ -99,5 +120,104 @@ return ardAppPositionMapper.deleteArdAppPositionById(id); } + /** + * 鑾峰彇灏佹帶鍦堝唴鎵�鏈夊湪绾縜pp鐢ㄦ埛 + * 鍒樿嫃涔� + * 2023/8/17 13:56:36 + */ + @Override + public List<SysUser> getNearAppUsers(SchedulingParam param) { + List<SysUser> filteredList = new ArrayList<>(); + try { + Long deptId = SecurityUtils.getLoginUser().getUser().getDeptId(); + Double longitude = param.getLongitude(); + Double latitude = param.getLatitude(); + if (longitude == null && latitude == null) { + log.debug("鍘熺偣鍧愭爣涓虹┖"); + return null; + } + Integer radius = param.getSealingRadius(); + if (radius == null) { + log.debug("鍗婂緞璺濈涓虹┖"); + return null; + } + + SysUser user = new SysUser(); + user.setDeptId(deptId); + List<SysUser> appUserList = iSysUserService.selectAllAppUserList(user); + //杩囨护鍦ㄧ嚎 + List<SysUser> onLineList = appUserList.stream() + .filter(sysUser -> (sysUser.getAppOnlineState().equals("1"))) + .collect(Collectors.toList()); + //杩囨护鑼冨洿 + for (SysUser sysUser : onLineList) { + ArdAppPosition ardAppPosition = ardAppPositionMapper.selectLastArdAppPositionByUserId(sysUser.getUserId()); + if (ardAppPosition != null) { + Double lon = ardAppPosition.getLongitude(); + Double lat = ardAppPosition.getLatitude(); + if (longitude == null || latitude == null) { + continue; + } + double distance = GisTool.getDistance(new double[]{longitude, latitude}, new double[]{lon, lat}); + if (distance <= radius) { + Map<String, Object> params = new HashMap<>(); + params.put("longitude", lon); + params.put("latitude", lat); + sysUser.setParams(params); + filteredList.add(sysUser); // 灏嗘弧瓒虫潯浠剁殑鐢ㄦ埛娣诲姞鍒扮瓫閫夊垪琛ㄤ腑 + } + } + } + } catch (Exception ex) { + log.error("鑾峰彇灏佹帶鍦堝唴鎵�鏈夊湪绾縜pp鐢ㄦ埛寮傚父" + ex.getMessage()); + } + return filteredList; + } + /** + * 鑾峰彇灏佹帶鍦堝唴鎵�鏈夊湪绾縜pp鐢ㄦ埛(澶氳竟褰�) + * 鍒樿嫃涔� + * 2023/8/17 13:56:36 + */ + @Override + public List<SysUser> getNearAppUsersWithPolygon(SchedulingParam param) { + List<SysUser> filteredList = new ArrayList<>(); + try { + Long deptId = SecurityUtils.getLoginUser().getUser().getDeptId(); + List<Point> partitionLocation = param.getPartitionLocation(); + + SysUser user = new SysUser(); + user.setDeptId(deptId); + List<SysUser> appUserList = iSysUserService.selectAllAppUserList(user); + //杩囨护鍦ㄧ嚎 + List<SysUser> onLineList = appUserList.stream() + .filter(sysUser -> (sysUser.getAppOnlineState().equals("1"))) + .collect(Collectors.toList()); + //杩囨护鑼冨洿 + for (SysUser sysUser : onLineList) { + ArdAppPosition ardAppPosition = ardAppPositionMapper.selectLastArdAppPositionByUserId(sysUser.getUserId()); + if (ardAppPosition != null) { + Double lon = ardAppPosition.getLongitude(); + Double lat = ardAppPosition.getLatitude(); + if (lon == null || lat == null) { + continue; + } + Point point2D=new Point(); + point2D.setLongitude(lon); + point2D.setLatitude(lat); + boolean inPolygon = GisTool.isInPolygon(point2D, partitionLocation); + if (inPolygon) { + Map<String, Object> params = new HashMap<>(); + params.put("longitude", lon); + params.put("latitude", lat); + sysUser.setParams(params); + filteredList.add(sysUser); // 灏嗘弧瓒虫潯浠剁殑鐢ㄦ埛娣诲姞鍒扮瓫閫夊垪琛ㄤ腑 + } + } + } + } catch (Exception ex) { + log.error("鑾峰彇灏佹帶鍦堝唴鎵�鏈夊湪绾縜pp鐢ㄦ埛寮傚父" + ex.getMessage()); + } + return filteredList; + } } -- Gitblit v1.9.3