消息系统调整

gly-base-core/src/main/java/cn/com/taiji/core/model/comm/protocol/ias/message/HltSendShortResponse.java

@@ -1,10 +1,14 @@
 package cn.com.taiji.core.model.comm.protocol.ias.message;
 
 import cn.com.taiji.core.model.comm.protocol.ias.portal.AbstractPortalResponse;
+import lombok.Getter;
+import lombok.Setter;
 
 /***
  * 汇联通-短信消息发送
  */
+@Getter
+@Setter
 public class HltSendShortResponse extends AbstractPortalResponse {
-
+    private String sent;
 }

zhywpt-app-msgw/src/main/java/cn/com/taiji/msgw/manager/messageWaitSend/MessageWaitSendManagerImpl.java

@@ -8,6 +8,7 @@ import java.util.Map;
 import cn.com.taiji.common.pub.BeanTools;
 import cn.com.taiji.core.model.comm.protocol.ats.weiXin.WxMiniSendMessageResponse;
 import cn.com.taiji.core.model.comm.protocol.ats.weiXin.WxMpSendMessageResponse;
+import cn.com.taiji.core.model.comm.protocol.ias.message.HltSendShortResponse;
 import cn.com.taiji.msgw.model.HomeStatisticsModel;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -164,7 +165,14 @@ public class MessageWaitSendManagerImpl extends AbstractCommManager implements M
                 messageRequest.setTitle(title);
                 messageRequest.setMobile(sendDetails.getReceiverId());
                 messageRequest.setMessage(alarmMessage);
-                jsonPostRepeat(messageRequest);
+                HltSendShortResponse response = jsonPostRepeat(messageRequest);
+                if (response.getSent() == null){
+                    sendDetails.setSendResult(MessageResult.SEND);
+                    sendDetails.setDescription(null);
+                }else{
+                    sendDetails.setSendResult(MessageResult.FAIL);
+                    sendDetails.setDescription(response.getSent());
+                }
             }
             //五、《邮件》 端消息推送
             else if (MessageType.EMAIL.equals(messageType)) {

zhywpt-service-ias/src/main/java/cn/com/taiji/ias/manager/htl/HltSendShortManagerImpl.java

@@ -47,7 +47,6 @@ public class HltSendShortManagerImpl extends AbstractCommManager implements HltS
             logger.info("返回的response：{}", response.toJson());
         } catch (Exception e) {
             logger.error("", e);
-            throw GlyServiceError.RESPONSE_ERROR.toHandleException("汇联通短信发送失败！");
         } finally {
             logger.info("------- 汇联通-短信消息发送 END -------");
         }
@@ -64,13 +63,13 @@ public class HltSendShortManagerImpl extends AbstractCommManager implements HltS
     private static final String SMS_TYPE_CODE_V1 = "NOTIFY_SMS";//
     private static final String SMS_CHANNEL_CODE_V1 = "ETC_order_No";//
     public HltSendShortResponse sendShort(HltSendShortRequest request, String apiKey) {
-        send(request);
-        HltSendShortResponse response = new HltSendShortResponse();
+        HltSendShortResponse response = send(request);
         return response;
     }
 
-    private void send(HltSendShortRequest request) {
+    private HltSendShortResponse send(HltSendShortRequest request) {
         //线程池异步发送短信
+        HltSendShortResponse response = new HltSendShortResponse();
         threadPoolTools.execute(() -> {
             logger.info("********** 短信发送 START **********");
             //配置统一会员会员平台的参数
@@ -80,10 +79,11 @@ public class HltSendShortManagerImpl extends AbstractCommManager implements HltS
             try {
                 sendHltSmsV1(sendReq, request.getSmsKeyId());
             } catch (Exception e) {
-                throw new RuntimeException(e);
+                response.setSent("发送失败");
             }
             logger.info("********** 短信发送 END **********");
         });
+        return response;
     }