From f5e2aee7cfaba671e18bcd933ec71a428683f9d7 Mon Sep 17 00:00:00 2001
From: wangxiang <1827945911@qq.com>
Date: Wed, 29 Mar 2023 13:53:00 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20=E9=87=8D=E6=9E=84=E6=8E=A8?=
 =?UTF-8?q?=E9=80=81=E8=AE=B0=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cloud/kicc/commonbiz/api/entity/PushChatMessage.java    | 6 +++---
 .../commonbiz/controller/PushChatMessageController.java     | 2 +-
 .../commonbiz/service/impl/PushApplicationServiceImpl.java  | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/PushChatMessage.java b/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/PushChatMessage.java
index 2dcdf51a..104cc732 100644
--- a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/PushChatMessage.java
+++ b/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/PushChatMessage.java
@@ -33,9 +33,6 @@ public class PushChatMessage extends CommonEntity {
     @ApiModelProperty("推送方用户id")
     private String userId;
 
-    @ApiModelProperty("推送用户id")
-    private String pushUserId;
-
     @ApiModelProperty("消息类型")
     private String type;
 
@@ -72,6 +69,9 @@ public class PushChatMessage extends CommonEntity {
     @ApiModelProperty("收到通知是否发出声音")
     private String playSound;
 
+    @ApiModelProperty("文字转语音")
+    private String playToText;
+
     @ApiModelProperty("在线铃声")
     private String onlineRingtone;
 
diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/PushChatMessageController.java b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/PushChatMessageController.java
index b81c5356..aa51e4bd 100644
--- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/PushChatMessageController.java
+++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/PushChatMessageController.java
@@ -39,7 +39,7 @@ public class PushChatMessageController {
                 .eq(StrUtil.isNotBlank(pushChatMessage.getStatus()), PushChatMessage::getStatus, pushChatMessage.getStatus())
                 .like(StrUtil.isNotBlank(pushChatMessage.getTitle()), PushChatMessage::getTitle, pushChatMessage.getTitle())
                 .eq(PushChatMessage::getUserId, pushChatMessage.getUserId())
-                .eq(StrUtil.isNotBlank(pushChatMessage.getPushUserId()), PushChatMessage::getPushUserId, pushChatMessage.getPushUserId());
+                .eq(StrUtil.isNotBlank(pushChatMessage.getAlias()), PushChatMessage::getAlias, pushChatMessage.getAlias());
     }
 
     @GetMapping("/list")
diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/PushApplicationServiceImpl.java b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/PushApplicationServiceImpl.java
index f5a5efc2..1bad7e2b 100644
--- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/PushApplicationServiceImpl.java
+++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/PushApplicationServiceImpl.java
@@ -56,9 +56,9 @@ public class PushApplicationServiceImpl extends ServiceImpl<PushApplicationMappe
     @Override
     public void messageSend(PushChatMessage pushChatMessage) {
 
-        if (StrUtil.isBlank(pushChatMessage.getPushUserId()) || StrUtil.isBlank(pushChatMessage.getMessageSecret())) {
+        /*if (StrUtil.isBlank(pushChatMessage.getPushUserId()) || StrUtil.isBlank(pushChatMessage.getMessageSecret())) {
             throw new CheckedException("当前发送方用户ID与推送应用密钥必填!");
-        }
+        }*/
         R<User> result = remoteUserService.selectByUserId(pushChatMessage.getPushTypeId(), SecurityConstants.FROM_IN);
         if (result == null || result.getData() == null) {
             throw new CheckedException("用户不存在");