feat: 企业推送消息接口

kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/PushApplicationServiceImpl.java

@@ -7,11 +7,15 @@ import cn.hutool.extra.servlet.ServletUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.cloud.kicc.common.core.api.R;
+import com.cloud.kicc.common.core.constant.SecurityConstants;
 import com.cloud.kicc.common.core.exception.CheckedException;
 import com.cloud.kicc.commonbiz.api.entity.*;
 import com.cloud.kicc.commonbiz.mapper.PushApplicationMapper;
 import com.cloud.kicc.commonbiz.service.*;
 import com.cloud.kicc.commonbiz.util.PushClientUtil;
+import com.cloud.kicc.system.api.entity.User;
+import com.cloud.kicc.system.api.feign.RemoteUserService;
 import lombok.RequiredArgsConstructor;
 import okhttp3.OkHttpClient;
 import org.springframework.stereotype.Service;
@@ -44,6 +48,7 @@ public class PushApplicationServiceImpl extends ServiceImpl<PushApplicationMappe
     private final IPushBlacklistService iPushBlacklistService;
     private final IPushChatMessageService iPushChatMessageService;
     private final IPushConcernFanTypeService iPushConcernFanTypeService;
+    private final RemoteUserService remoteUserService;
 
     @Override
     public void enterpriseMessageSend(PushChatMessage pushChatMessage) {
@@ -51,6 +56,13 @@ public class PushApplicationServiceImpl extends ServiceImpl<PushApplicationMappe
         if (StrUtil.isBlank(pushChatMessage.getUserId()) || 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("用户不存在");
+        }
+        pushChatMessage.setTenantId(result.getData().getTenantId());
+
         PushApplication pushApplication = baseMapper.selectOne(Wrappers.<PushApplication>lambdaQuery()
                 .eq(PushApplication::getMessageSecret, pushChatMessage.getMessageSecret())
                         .eq(PushApplication::getCreateById, pushChatMessage.getUserId())

kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/UserController.java

@@ -101,7 +101,10 @@ public class UserController {
     @GetMapping("getUser/{id:\\w+}")
     public R getUser(@PathVariable("id") String id) {
         User user = userService.getById(id);
-        return R.ok(user);
+        if (user == null) {
+            return R.error(String.format("用户信息%s为空,请检查当前多租户下是否有当前用户信息!", id));
+        }
+        return R.ok(userService.getUserAuthority(user));
     }
 
     @SysLog("用户新增")