From d5adbaf063dd6509b6cf4ee582f1189be817eee8 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Tue, 22 Jun 2021 21:18:03 +0800
Subject: [PATCH] 聊天列表接口修改，合并代码
---
/dev/null | 127 ------------------------------------------
src/main/java/org/springblade/modules/chatrecords/controller/ChatRecordsController.java | 6 +-
2 files changed, 3 insertions(+), 130 deletions(-)
diff --git a/src/main/java/org/springblade/modules/chatrecords/controller/ChatRecordsController.java b/src/main/java/org/springblade/modules/chatrecords/controller/ChatRecordsController.java
index a5c986c..0c617a7 100644
--- a/src/main/java/org/springblade/modules/chatrecords/controller/ChatRecordsController.java
+++ b/src/main/java/org/springblade/modules/chatrecords/controller/ChatRecordsController.java
@@ -7,7 +7,7 @@
import org.springblade.modules.chatrecords.entity.ChatRecords;
import org.springblade.modules.chatrecords.service.ChatRecordsService;
import org.springblade.modules.system.entity.User;
-import org.springblade.modules.system.feign.IUserClient;
+import org.springblade.modules.system.service.IUserService;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
@@ -27,7 +27,7 @@
@RequestMapping("/chat-records")
public class ChatRecordsController {
- private final IUserClient iUserClient;
+ private final IUserService iUserService;
private final ChatRecordsService chatRecordsService;
@@ -44,7 +44,7 @@
crossDomain(response);
Map<String, Object> map = new HashMap<>(2);
//查询单聊人的信息
- List<User> user = Arrays.asList(iUserClient.userInfoById(chatRecords.getSenderId()).getData(), iUserClient.userInfoById(chatRecords.getRecipientId()).getData());
+ List<User> user = Arrays.asList(iUserService.getById(chatRecords.getSenderId()), iUserService.getById(chatRecords.getRecipientId()));
//查询单聊记录信息
if (null==query.getCurrent()){
map.put("chatRecordsIPage",chatRecordsService.selectChatlist(chatRecords));
diff --git a/src/main/java/org/springblade/modules/system/feign/IUserClient.java b/src/main/java/org/springblade/modules/system/feign/IUserClient.java
deleted file mode 100644
index 90809d3..0000000
--- a/src/main/java/org/springblade/modules/system/feign/IUserClient.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/*
- * Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * Redistributions of source code must retain the above copyright notice,
- * this list of conditions and the following disclaimer.
- * Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * Neither the name of the dreamlu.net developer nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * Author: Chill 庄骞 (smallchill@163.com)
- */
-package org.springblade.modules.system.feign;
-
-
-import org.springblade.core.launch.constant.AppConstant;
-import org.springblade.core.tool.api.R;
-import org.springblade.modules.system.entity.User;
-import org.springblade.modules.system.entity.UserInfo;
-import org.springblade.modules.system.entity.UserOauth;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestParam;
-
-/**
- * User Feign接口类
- *
- * @author Chill
- */
-@FeignClient(
- value = AppConstant.APPLICATION_USER_NAME
-)
-public interface IUserClient {
-
- String API_PREFIX = "/client";
- String USER_INFO = API_PREFIX + "/user-info";
- String USER_INFO_BY_TYPE = API_PREFIX + "/user-info-by-type";
- String USER_INFO_BY_ID = API_PREFIX + "/user-info-by-id";
- String USER_INFO_BY_ACCOUNT = API_PREFIX + "/user-info-by-account";
- String USER_AUTH_INFO = API_PREFIX + "/user-auth-info";
- String SAVE_USER = API_PREFIX + "/save-user";
- String REMOVE_USER = API_PREFIX + "/remove-user";
- String SELUSERBYCODE = API_PREFIX + "/selUserByCode";
-
- /**
- * 获取用户信息
- *
- * @param userId 用户id
- * @return
- */
- @GetMapping(USER_INFO_BY_ID)
- R<User> userInfoById(@RequestParam("userId") Long userId);
-
-
- /**
- * 根据账号获取用户信息
- *
- * @param tenantId 租户id
- * @param account 账号
- * @return
- */
- @GetMapping(USER_INFO_BY_ACCOUNT)
- R<User> userByAccount(@RequestParam("tenantId") String tenantId, @RequestParam("account") String account);
-
- /**
- * 获取用户信息
- *
- * @param tenantId 租户ID
- * @param account 账号
- * @return
- */
- @GetMapping(USER_INFO)
- R<UserInfo> userInfo(@RequestParam("tenantId") String tenantId, @RequestParam("account") String account);
-
- /**
- * 获取用户信息
- *
- * @param tenantId 租户ID
- * @param account 账号
- * @param userType 用户平台
- * @return
- */
- @GetMapping(USER_INFO_BY_TYPE)
- R<UserInfo> userInfo(@RequestParam("tenantId") String tenantId, @RequestParam("account") String account, @RequestParam("userType") String userType);
-
- /**
- * 获取第三方平台信息
- *
- * @param userOauth 第三方授权用户信息
- * @return UserInfo
- */
- @PostMapping(USER_AUTH_INFO)
- R<UserInfo> userAuthInfo(@RequestBody UserOauth userOauth);
-
- /**
- * 新建用户
- *
- * @param user 用户实体
- * @return
- */
- @PostMapping(SAVE_USER)
- R<Boolean> saveUser(@RequestBody User user);
-
- /**
- * 删除用户
- *
- * @param tenantIds 租户id集合
- * @return
- */
- @PostMapping(REMOVE_USER)
- R<Boolean> removeUser(@RequestParam("tenantIds") String tenantIds);
-
- /**
- * 根据用户编号查询用户新
- * @param code 用户编号
- * @return
- */
- @GetMapping(SELUSERBYCODE)
- User selUserByCode(@RequestParam("code") String code);
-
-}
--
Gitblit v1.9.3