修改日志

zd-api/zd-base-api/src/main/java/com/zd/base/api/feign/fallback/RemoteMessageFallbackFactory.java

@@ -53,7 +53,7 @@ public class RemoteMessageFallbackFactory implements FallbackFactory<RemoteMessa
 
             @Override
             public ResultData getUrlScheme(Long id) {
-                return ResultData.fail("获取UrlScheme失败:" + throwable.getMessage());
+                return ResultData.fail("获取UrlScheme失败！请检查公众号配置！");
             }
         };
     }

zd-modules/zd-algorithm/src/main/java/com/zd/alg/alarm/controller/AlarmController.java

@@ -171,17 +171,21 @@ public class AlarmController extends BaseController {
     private void sendSMS(AlarmEntrty alarmEntrty) {
         List<UserPhoneInfo> userPhoneInfoList = alarmEntrty.getUserPhoneInfo();
         LinkedHashMap<String, List<UserPhoneInfo>> userPhoneInfoMap = Optional.ofNullable(userPhoneInfoList).orElseGet(Collections::emptyList).stream().collect(Collectors.groupingBy(UserPhoneInfo::getPhone, LinkedHashMap::new, Collectors.toList()));
-        String text = alarmEntrty.getText() + smsRedirect;
+        StringBuffer textURL = new StringBuffer();
+        textURL.append(alarmEntrty.getText());
         for (String phone : alarmEntrty.getTo()) {
-            ResultData urlScheme = remoteMessageService.getUrlScheme(alarmEntrty.getLogId());
-            if (urlScheme.getCode() != HttpStatus.SUCCESS) {
-                log.error("获取urlScheme失败！");
+            try {
+                ResultData urlScheme = remoteMessageService.getUrlScheme(alarmEntrty.getLogId());
+                if (urlScheme.getCode() != HttpStatus.SUCCESS) {
+                    log.error("获取urlScheme失败！");
+                }
+                textURL.append(smsRedirect).append("?id=").append(alarmEntrty.getLogId()).append("&urlScheme=").append(urlScheme.getData());
+            } catch (Exception e) {
+                log.error("获取urlScheme异常！请检查配置（nacos链接配置，小程序参数配置）！");
             }
-            String newTest = "";
-            newTest = text + "?id=" + alarmEntrty.getLogId() + "&urlScheme=" + urlScheme.getData();
-            alarmEntrty.setText(newTest);
+            alarmEntrty.setText(textURL.toString());
             alarmEntrty.setTo(new String[]{phone});
-            log.info("发送给用户===>>>{},短信内容===>>>{}",phone,newTest);
+            log.info("发送给用户===>>>{},短信内容===>>>{}",phone,textURL);
             //发送短信
             Map map = alarmUtil.sendPost(alarmEntrty);
             String data = (String) map.get("Reply");

zd-modules/zd-base/src/main/java/com/zd/base/message/controller/WechatMsgController.java

@@ -140,10 +140,6 @@ public class WechatMsgController {
     @ApiOperation(value = "获取UrlScheme")
     @ApiImplicitParam(name = "id",value = "传入id",required = false)
     public ResultData getUrlScheme(@RequestParam(value = "id",required = false)  Long id) {
-        String urlScheme = sendService.getUrlScheme(id);
-        if(StringUtils.isNotBlank(urlScheme)){
-            return ResultData.success(urlScheme);
-        }
-        return ResultData.fail("");
+        return ResultData.success(sendService.getUrlScheme(id));
     }
 }

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

@@ -317,6 +317,7 @@ public class WechatMsgSendServiceImpl implements IWechatMsgSendService {
             }
         } catch (Exception e) {
             log.error("获取UrlScheme异常！==>>{}",e);
+            return "";
         }
         return "";
     }

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

@@ -103,7 +103,7 @@ public class LabMessageContentServiceImpl implements ILabMessageContentService {
 
     private final String smsFormat = "{}: {}，发生风险预案,{}";
     private final String smsFormatString = "【实验室安全智能】{}发生{}{}";
-    private final String smsFormatString2 = "【实验室安全系统】{}-{}数值异常，请立即核实处理：";
+    private final String smsFormatString2 = "【实验室安全系统】{}-{}数值异常，请立即核实处理！";
 
     /**
      * 查询消息发布