对接新版push系统

张志伟
1 parent 5e96fd92
Showing 6 changed files with 29 additions and 28 deletions
fw-valhalla-service/pom.xml
fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/LeaveNeedDoBizService.java
fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/cust/AbstractCustomerService.java
fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/cust/ContactBizService.java
fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/cust/CustomerChangeBizService.java
pom.xml
@@ -66,8 +66,8 @@
             <artifactId>fw-passport-sdk</artifactId>
         </dependency>
         <dependency>
-            <groupId>cn.fw.third</groupId>
-            <artifactId>fw-push-sdk</artifactId>
+            <groupId>cn.fw</groupId>
+            <artifactId>fw-hermes-sdk</artifactId>
         </dependency>
         <dependency>
             <groupId>cn.fw</groupId>
@@ -5,10 +5,9 @@ import cn.fw.common.data.mybatis.pagination.PageData;
 import cn.fw.common.page.AppPage;
 import cn.fw.common.web.auth.LoginAuthBean;
 import cn.fw.data.base.domain.common.Message;
-import cn.fw.third.push.sdk.api.ImSendMessage;
-import cn.fw.third.push.sdk.api.para.im.MsgPara;
+import cn.fw.hermes.sdk.api.ImSendMessage;
+import cn.fw.hermes.sdk.api.para.MsgParamCondition;
 import cn.fw.valhalla.common.constant.RoleCode;
-import cn.fw.valhalla.common.enums.AllocationTypeEnum;
 import cn.fw.valhalla.common.utils.DateUtil;
 import cn.fw.valhalla.domain.db.LeaveNeedDo;
 import cn.fw.valhalla.domain.db.customer.Customer;
@@ -358,9 +357,9 @@ public class LeaveNeedDoBizService {
         for (UserInfo info : list) {
             try {
                 String text = String.format("%s通过资源分配给你%s台保有客", user.getUserName(), info.getCount());
-                final MsgPara msgPara = MsgPara.getOfflineTxetPara(text, null, "保有客分配",
+                final MsgParamCondition msgPara = MsgParamCondition.getOfflineTxetPara(text, null, "保有客分配",
                         "保有客分配", null, info.getUserId()).build();
-                final Message<Integer> msg = imSendMessage.sendMsg(msgPara);
+                final Message<Boolean> msg = imSendMessage.synSendMsg(msgPara);
                 log.info("给[{}]推送im消息结果:[{}]", info, msg.getResult());
             } catch (Exception e) {
                 log.error("给[{}]推送im消息失败：]", info, e);
 package cn.fw.valhalla.service.bus.cust;
+import cn.fw.hermes.sdk.api.ImSendMessage;
 import cn.fw.oop.sdk.enums.BizTypeEnum;
-import cn.fw.third.push.sdk.api.ImSendMessage;
 import cn.fw.valhalla.common.utils.DateUtil;
 import cn.fw.valhalla.component.CustomerChangeProducer;
 import cn.fw.valhalla.domain.db.customer.Customer;
@@ -10,7 +10,6 @@ import cn.fw.valhalla.domain.db.customer.CustomerLoanInfo;
 import cn.fw.valhalla.domain.db.pool.StammkundePool;
 import cn.fw.valhalla.domain.dto.CustomerDetailDto;
 import cn.fw.valhalla.domain.dto.StammkundeDto;
-import cn.fw.valhalla.domain.enums.DefeatReasonEnum;
 import cn.fw.valhalla.domain.enums.StammkundeSourcesEnum;
 import cn.fw.valhalla.domain.enums.StammkundeStatusEnum;
 import cn.fw.valhalla.rpc.angel.InsurerRpcService;
@@ -3,10 +3,10 @@ package cn.fw.valhalla.service.bus.cust;
 import cn.fw.common.exception.BusinessException;
 import cn.fw.common.web.auth.PassportAuthBean;
 import cn.fw.data.base.domain.common.Message;
-import cn.fw.third.push.sdk.api.ImSendMessage;
-import cn.fw.third.push.sdk.api.para.im.BusinessType;
-import cn.fw.third.push.sdk.api.para.im.MessageBusinessType;
-import cn.fw.third.push.sdk.api.para.im.MsgPara;
+import cn.fw.hermes.sdk.api.ImSendMessage;
+import cn.fw.hermes.sdk.api.para.BusinessType;
+import cn.fw.hermes.sdk.api.para.MessageBusinessType;
+import cn.fw.hermes.sdk.api.para.MsgParamCondition;
 import cn.fw.valhalla.common.utils.MobileUtil;
 import cn.fw.valhalla.common.utils.StringUtils;
 import cn.fw.valhalla.domain.db.customer.Customer;
@@ -247,9 +247,10 @@ public class ContactBizService {
             Map<String, Object> ext = new HashMap<>(2);
             ext.put("type", MessageBusinessType.SENDER_NOTICE.getMsg());
             ext.put("data", data);
-            final MsgPara msgPara = MsgPara.getCustomMsg(text, "", ext,
-                    0, targetUserId, false).setBusinessType(BusinessType.INTERNAL_NOTIFICATION).build();
-            final Message<Integer> msg = imSendMessage.sendMsg(msgPara);
+            final MsgParamCondition msgPara = MsgParamCondition.getCustomMsg(text, "", ext, 0, targetUserId, false)
+                    .setBusinessType(BusinessType.INTERNAL_NOTIFICATION)
+                    .build();
+            final Message<Boolean> msg = imSendMessage.synSendMsg(msgPara);
             log.info("给[{}]推送im消息结果:[{}]", targetUserId, msg.getResult());
         } catch (Exception e) {
             e.printStackTrace();
@@ -4,11 +4,12 @@ import cn.fw.common.exception.BusinessException;
 import cn.fw.common.web.auth.LoginAuthBean;
 import cn.fw.common.web.auth.PassportAuthBean;
 import cn.fw.data.base.domain.common.Message;
+import cn.fw.hermes.sdk.api.para.BusinessType;
+import cn.fw.hermes.sdk.api.para.MessageBusinessType;
+import cn.fw.hermes.sdk.api.para.MsgPara;
+import cn.fw.hermes.sdk.api.para.MsgParamCondition;
 import cn.fw.passport.sdk.api.param.WxBCodeParam;
 import cn.fw.starter.redis.redis.RedisUtil;
-import cn.fw.third.push.sdk.api.para.im.BusinessType;
-import cn.fw.third.push.sdk.api.para.im.MessageBusinessType;
-import cn.fw.third.push.sdk.api.para.im.MsgPara;
 import cn.fw.valhalla.common.constant.RoleCode;
 import cn.fw.valhalla.common.utils.DateUtil;
 import cn.fw.valhalla.common.utils.MessageFormatUtil;
@@ -498,9 +499,10 @@ public class CustomerChangeBizService extends AbstractCustomerService {
             ext.put("type", MessageBusinessType.CUSTOMER_CHANGE_STATUS.getMsg());
             ext.put("done", done);
             ext.put("key", key);
-            final MsgPara msgPara = MsgPara.getCustomMsg(text, "", ext,
-                    0, targetUserId, false).setBusinessType(BusinessType.INTERNAL_NOTIFICATION).build();
-            final Message<Integer> msg = imSendMessage.sendMsg(msgPara);
+            final MsgParamCondition condition = MsgParamCondition.getCustomMsg(text, "", ext, 0, targetUserId, false)
+                    .setBusinessType(BusinessType.INTERNAL_NOTIFICATION)
+                    .build();
+            final Message<Boolean> msg = imSendMessage.synSendMsg(condition);
             log.info("给[{}]推送im消息结果:[{}]", targetUserId, msg.getResult());
         } catch (Exception e) {
             e.printStackTrace();
@@ -42,7 +42,6 @@
         <fw-erp-sdk.version>5.0.0</fw-erp-sdk.version>
         <fw-pstn-sdk.version>2.0.0</fw-pstn-sdk.version>
         <fw-card-sdk.version>1.0</fw-card-sdk.version>
-        <fw-push-sdk.version>2.1.6</fw-push-sdk.version>
         <fw-fastdfs-client.version>2.0</fw-fastdfs-client.version>
         <rocketmq-spring-boot-starter.version>2.1.0</rocketmq-spring-boot-starter.version>
         <fw-passport-sdk.version>2.2.0</fw-passport-sdk.version>
@@ -57,6 +56,7 @@
         <hutool.all>5.2.5</hutool.all>
         <fw.cas.sdk>2.1.6</fw.cas.sdk>
         <fw-ehr-sdk.version>1.0</fw-ehr-sdk.version>
+        <fw.hermes.sdk>1.0.0</fw.hermes.sdk>
         <geodesy>1.1.3</geodesy>
     </properties>
@@ -134,6 +134,11 @@
             </dependency>
             <dependency>
                 <groupId>cn.fw</groupId>
+                <artifactId>fw-hermes-sdk</artifactId>
+                <version>${fw.hermes.sdk}</version>
+            </dependency>
+            <dependency>
+                <groupId>cn.fw</groupId>
                 <artifactId>fw-fastdfs-client</artifactId>
                 <version>${fw-fastdfs-client.version}</version>
             </dependency>
@@ -168,11 +173,6 @@
                 <version>${fw-pstn-sdk.version}</version>
             </dependency>
             <dependency>
-                <groupId>cn.fw.third</groupId>
-                <artifactId>fw-push-sdk</artifactId>
-                <version>${fw-push-sdk.version}</version>
-            </dependency>
-            <dependency>
                 <groupId>cn.fw</groupId>
                 <artifactId>fw-passport-sdk</artifactId>
                 <version>${fw-passport-sdk.version}</version>