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

修改群内bug

Browse Source
This commit is contained in:
wanghao
2025-07-05 17:53:09 +08:00
parent 58f859bcac
commit 3bd73a6eb8
5 changed files with 39 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
health-watch/health-watch-biz/src/main/java/com/renkang/watch/service/impl/WatchDeviceServiceImpl.java
+2 -2
View File
@@ -325,8 +325,8 @@ public class WatchDeviceServiceImpl extends ServiceImpl<WatchDeviceMapper, Watch
LoginUser userById = sysBaseAPI.getUserById(dto.getBindUserId());
// 此处修改 只有是职工的是才赋值单位信息
if (dto.getIsEmployee()){
SysDepart secondDepart = sysCache.getDepartByOrgCode(GlobalUtils.getSecondDepartOrgCode(userById.getOrgCode()));
dto.setOrgCode(secondDepart.getOrgCode());
SysDepart inDepart = sysCache.getDepartByOrgCode(userById.getOrgCode());
dto.setOrgCode(inDepart.getOrgCode());
SysDepart thirdDepart = sysCache.getDepartByOrgCode(GlobalUtils.getThirdDepartOrgCode(userById.getOrgCode()));
dto.setDeptId(thirdDepart.getId());
}
health-watch/health-watch-biz/src/main/java/com/renkang/watch/service/impl/WatchMonitorDataServiceImpl.java
+8 -8
View File
@@ -351,14 +351,14 @@ public class WatchMonitorDataServiceImpl extends ServiceImpl<WatchMonitorDataMap
.orElse("未知"));
// 音频
StringBuilder sb = new StringBuilder();
sb.append("请注意，").append(departName).append("下的员工").append(userNew.getRealname());
if (socketVo.getEventType_dictText().equals("一键告警")) {
sb.append("触发一键告警");
} else {
sb.append(socketVo.getEventType_dictText()).append("，").append("值为").append(socketVo.getDataValue());
}
socketVo.setAudioUrl(speechUntil.generateVoice(sb.toString()));
// StringBuilder sb = new StringBuilder();
// sb.append("请注意，").append(departName).append("下的员工").append(userNew.getRealname());
// if (socketVo.getEventType_dictText().equals("一键告警")) {
// sb.append("触发一键告警");
// } else {
// sb.append(socketVo.getEventType_dictText()).append("，").append("值为").append(socketVo.getDataValue());
// }
// socketVo.setAudioUrl(speechUntil.generateVoice(sb.toString()));
log.info("构建socket信息完成 => {}", JSONObject.toJSONString(socketVo));
return socketVo;
}