|
|
@ -51,8 +51,6 @@ public class MessageServiceImpl implements MessageService { |
|
|
|
|
|
|
|
|
|
|
|
private final IStationClient stationClient; |
|
|
|
private final IStationClient stationClient; |
|
|
|
|
|
|
|
|
|
|
|
private final AlarmConfigService alarmConfigService; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/** |
|
|
|
/** |
|
|
|
* web/app消息推送 |
|
|
|
* web/app消息推送 |
|
|
|
* @param entity : 告警对象 |
|
|
|
* @param entity : 告警对象 |
|
|
@ -66,7 +64,7 @@ public class MessageServiceImpl implements MessageService { |
|
|
|
} |
|
|
|
} |
|
|
|
Long dept = stationByCode.getData().getRefDept(); |
|
|
|
Long dept = stationByCode.getData().getRefDept(); |
|
|
|
// 获取站点用户
|
|
|
|
// 获取站点用户
|
|
|
|
R<List<User>> result = userClient.userList(stationByCode.getData().getTenantId(),dept); |
|
|
|
R<List<User>> result = userClient.userListByDeptId(dept); |
|
|
|
if (!result.isSuccess() || CollectionUtil.isEmpty(result.getData())) { |
|
|
|
if (!result.isSuccess() || CollectionUtil.isEmpty(result.getData())) { |
|
|
|
log.error("WEB/APP消息发送失败:用户获取失败 : {}",entity); |
|
|
|
log.error("WEB/APP消息发送失败:用户获取失败 : {}",entity); |
|
|
|
return; |
|
|
|
return; |
|
|
@ -150,7 +148,7 @@ public class MessageServiceImpl implements MessageService { |
|
|
|
} |
|
|
|
} |
|
|
|
Long dept = station.getData().getCreateDept(); |
|
|
|
Long dept = station.getData().getCreateDept(); |
|
|
|
// 获取站点用户
|
|
|
|
// 获取站点用户
|
|
|
|
R<List<User>> result = userClient.userList(station.getData().getTenantId(),dept); |
|
|
|
R<List<User>> result = userClient.userListByDeptId(dept); |
|
|
|
if (!result.isSuccess() || CollectionUtil.isEmpty(result.getData())) { |
|
|
|
if (!result.isSuccess() || CollectionUtil.isEmpty(result.getData())) { |
|
|
|
log.error("微信消息发送失败:用户获取失败 : {}",entity); |
|
|
|
log.error("微信消息发送失败:用户获取失败 : {}",entity); |
|
|
|
return; |
|
|
|
return; |
|
|
|