Bladeren bron

更新消息推送的地址配置

xucaiqin 2 jaren geleden
bovenliggende
commit
5d514b092f

+ 24 - 0
sckw-modules/sckw-payment/src/main/java/com/sckw/payment/model/JumpUrl.java

@@ -0,0 +1,24 @@
+package com.sckw.payment.model;
+
+import lombok.Getter;
+import lombok.Setter;
+
+
+/**
+ * @author xucaiqin
+ * @date 2023-09-06 18:58:51
+ */
+@Getter
+@Setter
+public class JumpUrl {
+    /**
+     * pc端跳转地址
+     */
+    private String pc;
+    /**
+     * app端跳转地址
+     */
+    private String app;
+
+
+}

+ 13 - 1
sckw-modules/sckw-payment/src/main/java/com/sckw/payment/model/JumpUrlConfig.java

@@ -8,6 +8,7 @@ import org.springframework.stereotype.Component;
 
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Objects;
 
 
 /**
@@ -23,7 +24,18 @@ public class JumpUrlConfig {
     /**
      * 销售收款对账
      */
-    private Map<String, String> url = new HashMap<>();
+    private Map<String, JumpUrl> url = new HashMap<>();
+
+    public Map<String, String> getMapUrl(String key) {
+        JumpUrl jumpUrl = url.get(key);
+        if (Objects.nonNull(jumpUrl)) {
+            return new HashMap<>() {{
+                put("pc", jumpUrl.getPc());
+                put("app", jumpUrl.getApp());
+            }};
+        }
+        return new HashMap<>();
+    }
 
 
 }

+ 4 - 4
sckw-modules/sckw-payment/src/main/java/com/sckw/payment/service/MessageSender.java

@@ -49,7 +49,7 @@ public class MessageSender {
      */
     public void sendCreate(Long createBy, Map<String, Object> map, UserInfo user, MessageEnum messageEnum) {
         AsyncPool.addTask(() -> {
-            SckwMessage sckwMessage = new SckwMessage(messageEnum).setMsgUrl(jumpUrlConfig.getUrl().get(JumpEnum.getByEnum(messageEnum))).setParams(map).setUserInfos(Collections.singletonList(user)).setCreateBy(createBy);
+            SckwMessage sckwMessage = new SckwMessage(messageEnum).setMsgUrls(jumpUrlConfig.getMapUrl(JumpEnum.getByEnum(messageEnum))).setParams(map).setUserInfos(Collections.singletonList(user)).setCreateBy(createBy);
             log.info("推送创建人:{}", JSONObject.toJSONString(sckwMessage));
             streamBridge.send("sckw-message", JSON.toJSONString(sckwMessage));
         });
@@ -66,7 +66,7 @@ public class MessageSender {
         AsyncPool.addTask(() -> {
             EntCacheResDto entCacheResDto = remoteSystemService.queryEntCacheById(entId);
             if (Objects.nonNull(entCacheResDto)) {
-                SckwMessage sckwMessage = new SckwMessage(messageEnum).setMsgUrl(jumpUrlConfig.getUrl().get(JumpEnum.getByEnum(messageEnum))).setParams(map).setUserInfos(Collections.singletonList(new UserInfo(entCacheResDto.getContactsId(), entCacheResDto.getId()))).setCreateBy(createBy);
+                SckwMessage sckwMessage = new SckwMessage(messageEnum).setMsgUrls(jumpUrlConfig.getMapUrl(JumpEnum.getByEnum(messageEnum))).setParams(map).setUserInfos(Collections.singletonList(new UserInfo(entCacheResDto.getContactsId(), entCacheResDto.getId()))).setCreateBy(createBy);
                 log.info("推送系统管理员:{}", JSONObject.toJSONString(sckwMessage));
                 streamBridge.send("sckw-message", JSON.toJSONString(sckwMessage));
             }
@@ -88,7 +88,7 @@ public class MessageSender {
             if (Objects.nonNull(kwpLedgerTradeTrack)) {
                 UserCacheResDto userCacheResDto = remoteSystemService.queryUserCacheById(kwpLedgerTradeTrack.getCreateBy());
                 EntCacheResDto entCacheResDto = Objects.nonNull(userCacheResDto) ? (Objects.nonNull(userCacheResDto.getEntInfo()) ? userCacheResDto.getEntInfo() : new EntCacheResDto()) : new EntCacheResDto();
-                SckwMessage sckwMessage = new SckwMessage(messageEnum).setMsgUrl(jumpUrlConfig.getUrl().get(JumpEnum.getByEnum(messageEnum))).setParams(map).setUserInfos(Collections.singletonList(new UserInfo(kwpLedgerTradeTrack.getCreateBy(), entCacheResDto.getId()))).setCreateBy(createBy);
+                SckwMessage sckwMessage = new SckwMessage(messageEnum).setMsgUrls(jumpUrlConfig.getMapUrl(JumpEnum.getByEnum(messageEnum))).setParams(map).setUserInfos(Collections.singletonList(new UserInfo(kwpLedgerTradeTrack.getCreateBy(), entCacheResDto.getId()))).setCreateBy(createBy);
                 log.info("推送变更人:{}", JSONObject.toJSONString(sckwMessage));
                 streamBridge.send("sckw-message", JSON.toJSONString(sckwMessage));
             }
@@ -110,7 +110,7 @@ public class MessageSender {
                 UserCacheResDto userCacheResDto = remoteSystemService.queryUserCacheById(kwpLedgerLogisticsTrack.getCreateBy());
                 EntCacheResDto entCacheResDto = Objects.nonNull(userCacheResDto) ? (Objects.nonNull(userCacheResDto.getEntInfo()) ? userCacheResDto.getEntInfo() : new EntCacheResDto()) : new EntCacheResDto();
                 SckwMessage sckwMessage = new SckwMessage(messageEnum)
-                        .setMsgUrl(jumpUrlConfig.getUrl().get(JumpEnum.getByEnum(messageEnum)))
+                        .setMsgUrls(jumpUrlConfig.getMapUrl(JumpEnum.getByEnum(messageEnum)))
                         .setParams(map).setUserInfos(Collections.singletonList(new UserInfo(kwpLedgerLogisticsTrack.getCreateBy(), entCacheResDto.getId()))).setCreateBy(createBy);
                 log.info("推送变更人:{}", JSONObject.toJSONString(sckwMessage));
                 streamBridge.send("sckw-message", JSON.toJSONString(sckwMessage));