Selaa lähdekoodia

预案人员查询调整,

hanzhiwei 2 vuotta sitten
vanhempi
commit
0132fa6800

+ 3 - 1
zd-modules/zd-base/src/main/java/com/zd/base/message/service/impl/WechatMsgSendServiceImpl.java

@@ -297,8 +297,10 @@ public class WechatMsgSendServiceImpl implements IWechatMsgSendService {
         body.put("jump_wxa", jumpWxa);
         body.put("jump_wxa", jumpWxa);
         body.put("expire_type", "1");
         body.put("expire_type", "1");
         body.put("expire_interval", "30");
         body.put("expire_interval", "30");
+        log.info("获取UrlScheme url===>>>{}",url);
+        log.info("请求参数===>>>{}",JSON.toJSONString(body));
         String respData = HttpUtil.post(url,JSON.toJSONString(body));
         String respData = HttpUtil.post(url,JSON.toJSONString(body));
-        log.info("UrlScheme 返回参数=====》{}", respData);
+        log.info("UrlScheme 返回参数===>>>{}", respData);
         JSONObject json = JSON.parseObject(respData);
         JSONObject json = JSON.parseObject(respData);
         if (json.getInteger("errcode") == 0) {
         if (json.getInteger("errcode") == 0) {
             String openlink = json.getString("openlink");
             String openlink = json.getString("openlink");

+ 7 - 2
zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/service/impl/LabMessageContentServiceImpl.java

@@ -111,6 +111,9 @@ public class LabMessageContentServiceImpl implements ILabMessageContentService {
     @Autowired
     @Autowired
     private RemoteMessageService remoteMessageService;
     private RemoteMessageService remoteMessageService;
 
 
+    @Autowired
+    private ILabSubjectService labSubjectService;
+
     private final String callType = "1";
     private final String callType = "1";
 
 
     private final String smsType = "2";
     private final String smsType = "2";
@@ -303,7 +306,9 @@ public class LabMessageContentServiceImpl implements ILabMessageContentService {
 //            logger.error("获取实验室内部短信发送人出错");
 //            logger.error("获取实验室内部短信发送人出错");
 //        }
 //        }
         //获取人员电话信息
         //获取人员电话信息
-        List<UserPhoneInfo> userPhoneInfoList = getUserPhoneInfos(subject);
+//        List<UserPhoneInfo> userPhoneInfoList = getUserPhoneInfos(subject);
+        //获取人员电话信息
+        List<UserPhoneInfo> userPhoneInfos = labSubjectService.selectAdminAndSafeAdminById(subject.getId());
         String[] strings = Stream.of(new String[]{subject.getAdminPhone(), subject.getSafeUserPhone()})
         String[] strings = Stream.of(new String[]{subject.getAdminPhone(), subject.getSafeUserPhone()})
                 .filter(a -> StrUtil.isNotBlank(a))
                 .filter(a -> StrUtil.isNotBlank(a))
                 .collect(Collectors.joining(","))
                 .collect(Collectors.joining(","))
@@ -322,7 +327,7 @@ public class LabMessageContentServiceImpl implements ILabMessageContentService {
                 }else if(alarms.contains(smsType)) {
                 }else if(alarms.contains(smsType)) {
                     alarmEntrty = new AlarmEntrty(Routes.NoticePush, strings, SendTypes.SMS.toString(),format);
                     alarmEntrty = new AlarmEntrty(Routes.NoticePush, strings, SendTypes.SMS.toString(),format);
                 }
                 }
-                alarmEntrty.setUserPhoneInfo(userPhoneInfoList);
+                alarmEntrty.setUserPhoneInfo(userPhoneInfos);
                 alarmEntrty.setLogId(logId);
                 alarmEntrty.setLogId(logId);
                 remoteAlarmService.send(alarmEntrty);
                 remoteAlarmService.send(alarmEntrty);
 //                MessageBody messageBody = new MessageBody();
 //                MessageBody messageBody = new MessageBody();