renkang/xj-platform
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

大屏修改推送

Browse Source
This commit is contained in:
wanghao
2025-12-25 14:16:45 +08:00
parent 6381d7ab9c
commit 9f583d8850
2 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/api/service/impl/LargeScreenImpl.java
+14 -14
View File
@@ -249,22 +249,22 @@ public class LargeScreenImpl {
}
this.setDepartmentInfo(socket, sysUser.getOrgCode());
// 获取所有资源
List<TblBaseHospitalVo> allList = tblAmbulanceGpsService.getAllList(String.valueOf(center.getLatitude()), String.valueOf(center.getLongitude()), null, null);
// List<TblBaseHospitalVo> allList = tblAmbulanceGpsService.getAllList(String.valueOf(center.getLatitude()), String.valueOf(center.getLongitude()), null, null);
socket.setLon(longitude);
socket.setLat(latitude);
List<TblBaseHospitalVo> hospitalSocketVoList = new ArrayList<>();
if (CollUtil.isNotEmpty(allList)) {
List<TblBaseHospitalVo> threeNearestHospitals = findThreeNearestHospitals(allList, socket.getLon(), socket.getLat());
threeNearestHospitals.forEach(item -> {
TblBaseHospitalVo hospitalSocketVo = new TblBaseHospitalVo();
hospitalSocketVo.setName(item.getName());
hospitalSocketVo.setLon(item.getLon());
hospitalSocketVo.setLat(item.getLat());
hospitalSocketVo.setDistance(item.getDistance());
hospitalSocketVoList.add(hospitalSocketVo);
});
}
socket.setHospitalList(hospitalSocketVoList);
// List<TblBaseHospitalVo> hospitalSocketVoList = new ArrayList<>();
// if (CollUtil.isNotEmpty(allList)) {
// List<TblBaseHospitalVo> threeNearestHospitals = findThreeNearestHospitals(allList, socket.getLon(), socket.getLat());
// threeNearestHospitals.forEach(item -> {
// TblBaseHospitalVo hospitalSocketVo = new TblBaseHospitalVo();
// hospitalSocketVo.setName(item.getName());
// hospitalSocketVo.setLon(item.getLon());
// hospitalSocketVo.setLat(item.getLat());
// hospitalSocketVo.setDistance(item.getDistance());
// hospitalSocketVoList.add(hospitalSocketVo);
// });
// }
// socket.setHospitalList(hospitalSocketVoList);
}
private void setQimoPushMsg(EmergencySocket socket, LoginUserNew sysUser, TblUserHelp userHelp) {
health-watch/health-watch-biz/src/main/java/com/renkang/watch/service/impl/WatchMonitorDataServiceImpl.java
+2 -2
View File
@@ -248,8 +248,8 @@ public class WatchMonitorDataServiceImpl extends ServiceImpl<WatchMonitorDataMap
WatchMonitorSocketVo socketVo = createSocketVo(monitorDataEntity, userNew);
// 获取最近的医院
List<HospitalSocketVo> hospitalSocketVoList = getNearestHospitals(data);
socketVo.setHospitalList(hospitalSocketVoList);
// List<HospitalSocketVo> hospitalSocketVoList = getNearestHospitals(data);
// socketVo.setHospitalList(hospitalSocketVoList);
// 20250427 新增需求 非当日数据 不推
if (!DateUtil.isSameDay(DateUtil.beginOfDay(new Date()), socketVo.getWarnTime())) {