修改一键告警构建socket
This commit is contained in:
+2
-10
@@ -233,7 +233,7 @@ public class WatchMonitorDataServiceImpl extends ServiceImpl<WatchMonitorDataMap
|
|||||||
watchUserDataService.saveUserDataMain(monitorDataEntity.getWatchNo(), monitorDataEntity.getBindUserId(), monitorDataEntity.getDataDate());
|
watchUserDataService.saveUserDataMain(monitorDataEntity.getWatchNo(), monitorDataEntity.getBindUserId(), monitorDataEntity.getDataDate());
|
||||||
|
|
||||||
// 构建socket信息
|
// 构建socket信息
|
||||||
WatchMonitorSocketVo socketVo = createSocketVo(monitorDataEntity, data, userNew);
|
WatchMonitorSocketVo socketVo = createSocketVo(monitorDataEntity, userNew);
|
||||||
|
|
||||||
// 获取最近的医院
|
// 获取最近的医院
|
||||||
List<HospitalSocketVo> hospitalSocketVoList = getNearestHospitals(data);
|
List<HospitalSocketVo> hospitalSocketVoList = getNearestHospitals(data);
|
||||||
@@ -311,11 +311,10 @@ public class WatchMonitorDataServiceImpl extends ServiceImpl<WatchMonitorDataMap
|
|||||||
* 构建socket信息
|
* 构建socket信息
|
||||||
*
|
*
|
||||||
* @param monitorDataEntity 异常数据
|
* @param monitorDataEntity 异常数据
|
||||||
* @param data 异常信息
|
|
||||||
* @param userNew 用户信息
|
* @param userNew 用户信息
|
||||||
* @return socket信息
|
* @return socket信息
|
||||||
*/
|
*/
|
||||||
private WatchMonitorSocketVo createSocketVo(WatchMonitorData monitorDataEntity, WatchNotifyVo data, LoginUserNew userNew) {
|
private WatchMonitorSocketVo createSocketVo(WatchMonitorData monitorDataEntity, LoginUserNew userNew) {
|
||||||
log.info("开始构建socket信息 => {}", JSONObject.toJSONString(monitorDataEntity));
|
log.info("开始构建socket信息 => {}", JSONObject.toJSONString(monitorDataEntity));
|
||||||
WatchMonitorSocketVo socketVo = new WatchMonitorSocketVo();
|
WatchMonitorSocketVo socketVo = new WatchMonitorSocketVo();
|
||||||
BeanUtils.copyProperties(monitorDataEntity, socketVo);
|
BeanUtils.copyProperties(monitorDataEntity, socketVo);
|
||||||
@@ -330,13 +329,6 @@ public class WatchMonitorDataServiceImpl extends ServiceImpl<WatchMonitorDataMap
|
|||||||
if (null != userNew.getDepart()) {
|
if (null != userNew.getDepart()) {
|
||||||
socketVo.setOrgName(userNew.getDepart().getDepartName());
|
socketVo.setOrgName(userNew.getDepart().getDepartName());
|
||||||
}
|
}
|
||||||
if (null != data) {
|
|
||||||
socketVo.setAddress(data.getAddress());
|
|
||||||
socketVo.setGpsErrorMsg(data.getGpsErrorMsg());
|
|
||||||
socketVo.setWatchNo(data.getWatchNo());
|
|
||||||
socketVo.setLon(data.getLon());
|
|
||||||
socketVo.setLat(data.getLat());
|
|
||||||
}
|
|
||||||
|
|
||||||
// 重点标记用户
|
// 重点标记用户
|
||||||
WatchKeyUser watchKeyUser = keyUserMapper.selectOne(new LambdaQueryWrapper<WatchKeyUser>().in(WatchKeyUser::getUserId, userNew.getId()), false);
|
WatchKeyUser watchKeyUser = keyUserMapper.selectOne(new LambdaQueryWrapper<WatchKeyUser>().in(WatchKeyUser::getUserId, userNew.getId()), false);
|
||||||
|
|||||||
Reference in New Issue
Block a user