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-10 13:56:11 +08:00
parent f73a09e91c
commit fe5ca6619c
2 changed files with 25 additions and 15 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
+17 -10
View File
@@ -205,7 +205,7 @@ public class LargeScreenImpl {
if (type == 1){
String noticeContent = String.format("[%s] %s (%s-%s)", StrUtil.isEmpty(socket.getQueue()) ? center.getCenterName() : socket.getQueue(),
socket.getRealName(), socket.getDepartName(), socket.getDepartName());
socket.getRealName(), socket.getOrgName(), socket.getDepartName());
Map<String, String> data = new HashMap<>(2);
data.put("noticeContent", noticeContent);
data.put("mobile", socket.getPhone());
@@ -436,15 +436,22 @@ public class LargeScreenImpl {
* @param orgCode 部门编码
*/
private void setDepartmentInfo(EmergencySocket socket, String orgCode) {
SysDepart secondDepart = sysCache.getDepartByOrgCode(GlobalUtils.getSecondDepartOrgCode(orgCode));
Optional<SysDepart> optionalSecondDepart = Optional.ofNullable(secondDepart);
socket.setDepartCode(optionalSecondDepart.map(SysDepart::getOrgCode).orElse(""));
socket.setDepartName(optionalSecondDepart.map(SysDepart::getDepartName).orElse(""));
SysDepart thirdDepart = sysCache.getDepartByOrgCode(GlobalUtils.getThirdDepartOrgCode(orgCode));
Optional<SysDepart> optionalThirdDepart = Optional.ofNullable(thirdDepart);
socket.setOrgCode(optionalThirdDepart.map(SysDepart::getOrgCode).orElse(""));
socket.setOrgName(optionalThirdDepart.map(SysDepart::getDepartName).orElse(""));
if(orgCode.length()>=6){
// 获取二级单位名称
SysDepart secondDepart = sysCache.getDepartByOrgCode(GlobalUtils.getSecondDepartOrgCode(orgCode));
if (secondDepart != null) {
socket.setOrgCode(secondDepart.getOrgCode());
socket.setOrgName(secondDepart.getDepartName());
}
}
if (orgCode.length()>6){
// 获取三级部门名称
SysDepart thirdDepart = sysCache.getDepartByOrgCode(GlobalUtils.getThirdDepartOrgCode(orgCode));
if (thirdDepart != null) {
socket.setDepartCode(thirdDepart.getOrgCode());
socket.setDepartName(thirdDepart.getDepartName());
}
}
}
/**