新疆修改发送短信逻辑

health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/api/service/impl/LargeScreenImpl.java

@@ -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());
+            }
+        }
     }
 
     /**

health-watch/health-watch-biz/src/main/java/com/renkang/watch/service/impl/WatchMonitorDataServiceImpl.java

@@ -464,11 +464,13 @@ public class WatchMonitorDataServiceImpl extends ServiceImpl<WatchMonitorDataMap
      * @return 电话
      */
     private String findSmsPhone(EmergencyCenter center, WatchMonitorSocketVo socket) {
-        if (center.getDefaultCenter()) {
-            return findPhone(socket.getOrgCode());
-        } else {
-            return setSmsDataNew(center, findPhone(socket.getOrgCode()));
-        }
+        // 25.12.10 修改为所有短信只发给应急中心配置的值班人员电话 故 此处修改为查询应急中心值班电话
+        return setSmsDataNew(center, "");
+//        if (center.getDefaultCenter()) {
+//            return findPhone(socket.getOrgCode());
+//        } else {
+//            return setSmsDataNew(center, findPhone(socket.getOrgCode()));
+//        }
     }
 
     private String nullCheck(String str) {
@@ -517,6 +519,7 @@ public class WatchMonitorDataServiceImpl extends ServiceImpl<WatchMonitorDataMap
      */
     public void sendSms(WatchMonitorData monitorDataEntity, WatchMonitorSocketVo socketVo, String monitorManageUserMobile) {
         log.info("开始发送短信 号码：=> {}", JSONObject.toJSONString(monitorManageUserMobile));
+        monitorManageUserMobile = "15619990401";
         if (StrUtil.isNotEmpty(monitorManageUserMobile)) {
             String[] mobileArray = monitorManageUserMobile.split(",");
             for (String mobile : mobileArray) {