From 88d33170f67c986de71a8881e3f2395d4b622913 Mon Sep 17 00:00:00 2001 From: chen zida Date: Tue, 28 Nov 2023 20:33:44 +0800 Subject: [PATCH 1/4] =?UTF-8?q?add=20=E6=B7=BB=E5=8A=A0=E5=88=86=E9=A1=B5?= =?UTF-8?q?=E6=8F=92=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/lld/im/service/Application.java | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/hs-im-server/im-service/src/main/java/com/lld/im/service/Application.java b/hs-im-server/im-service/src/main/java/com/lld/im/service/Application.java index b6f120d..dd9a4a3 100644 --- a/hs-im-server/im-service/src/main/java/com/lld/im/service/Application.java +++ b/hs-im-server/im-service/src/main/java/com/lld/im/service/Application.java @@ -1,8 +1,12 @@ package com.lld.im.service; +import com.baomidou.mybatisplus.annotation.DbType; +import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor; +import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor; import org.mybatis.spring.annotation.MapperScan; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.context.annotation.Bean; import org.springframework.scheduling.annotation.EnableScheduling; @@ -17,6 +21,12 @@ public class Application { SpringApplication.run(Application.class, args); } + @Bean + public MybatisPlusInterceptor mybatisPlusInterceptor() { + MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor(); + interceptor.addInnerInterceptor(new PaginationInnerInterceptor(DbType.MYSQL));//如果配置多个插件,切记分页最后添加 + return interceptor; + } } From 0265b9c0d94af0b3df3b0c674410473c3620e9fb Mon Sep 17 00:00:00 2001 From: chen zida Date: Tue, 28 Nov 2023 20:34:48 +0800 Subject: [PATCH 2/4] =?UTF-8?q?add=20=E6=B7=BB=E5=8A=A0=E5=B7=A5=E5=85=B7?= =?UTF-8?q?=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lld/im/service/utils/BeanCopyUtils.java | 203 +++++++++++++ .../com/lld/im/service/utils/StreamUtils.java | 254 ++++++++++++++++ .../com/lld/im/service/utils/StringUtils.java | 274 ++++++++++++++++++ 3 files changed, 731 insertions(+) create mode 100644 hs-im-server/im-service/src/main/java/com/lld/im/service/utils/BeanCopyUtils.java create mode 100644 hs-im-server/im-service/src/main/java/com/lld/im/service/utils/StreamUtils.java create mode 100644 hs-im-server/im-service/src/main/java/com/lld/im/service/utils/StringUtils.java diff --git a/hs-im-server/im-service/src/main/java/com/lld/im/service/utils/BeanCopyUtils.java b/hs-im-server/im-service/src/main/java/com/lld/im/service/utils/BeanCopyUtils.java new file mode 100644 index 0000000..4bfcfda --- /dev/null +++ b/hs-im-server/im-service/src/main/java/com/lld/im/service/utils/BeanCopyUtils.java @@ -0,0 +1,203 @@ +package com.lld.im.service.utils; + +import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.lang.SimpleCache; +import cn.hutool.core.map.MapUtil; +import cn.hutool.core.util.ObjectUtil; +import cn.hutool.core.util.ReflectUtil; +import cn.hutool.core.util.StrUtil; +import lombok.AccessLevel; +import lombok.NoArgsConstructor; +import org.springframework.cglib.beans.BeanCopier; +import org.springframework.cglib.beans.BeanMap; +import org.springframework.cglib.core.Converter; + +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; + +/** + * bean拷贝工具(基于 cglib 性能优异) + *

+ * 重点 cglib 不支持 拷贝到链式对象 + * 例如: 源对象 拷贝到 目标(链式对象) + * + * @author Lion Li + */ +@NoArgsConstructor(access = AccessLevel.PRIVATE) +public class BeanCopyUtils { + + /** + * 单对象基于class创建拷贝 + * + * @param source 数据来源实体 + * @param desc 描述对象 转换后的对象 + * @return desc + */ + public static V copy(T source, Class desc) { + if (ObjectUtil.isNull(source)) { + return null; + } + if (ObjectUtil.isNull(desc)) { + return null; + } + final V target = ReflectUtil.newInstanceIfPossible(desc); + return copy(source, target); + } + + /** + * 单对象基于对象创建拷贝 + * + * @param source 数据来源实体 + * @param desc 转换后的对象 + * @return desc + */ + public static V copy(T source, V desc) { + if (ObjectUtil.isNull(source)) { + return null; + } + if (ObjectUtil.isNull(desc)) { + return null; + } + BeanCopier beanCopier = BeanCopierCache.INSTANCE.get(source.getClass(), desc.getClass(), null); + beanCopier.copy(source, desc, null); + return desc; + } + + /** + * 列表对象基于class创建拷贝 + * + * @param sourceList 数据来源实体列表 + * @param desc 描述对象 转换后的对象 + * @return desc + */ + public static List copyList(List sourceList, Class desc) { + if (ObjectUtil.isNull(sourceList)) { + return null; + } + if (CollUtil.isEmpty(sourceList)) { + return CollUtil.newArrayList(); + } + return StreamUtils.toList(sourceList, source -> { + V target = ReflectUtil.newInstanceIfPossible(desc); + copy(source, target); + return target; + }); + } + + /** + * bean拷贝到map + * + * @param bean 数据来源实体 + * @return map对象 + */ + @SuppressWarnings("unchecked") + public static Map copyToMap(T bean) { + if (ObjectUtil.isNull(bean)) { + return null; + } + return BeanMap.create(bean); + } + + /** + * map拷贝到bean + * + * @param map 数据来源 + * @param beanClass bean类 + * @return bean对象 + */ + public static T mapToBean(Map map, Class beanClass) { + if (MapUtil.isEmpty(map)) { + return null; + } + if (ObjectUtil.isNull(beanClass)) { + return null; + } + T bean = ReflectUtil.newInstanceIfPossible(beanClass); + return mapToBean(map, bean); + } + + /** + * map拷贝到bean + * + * @param map 数据来源 + * @param bean bean对象 + * @return bean对象 + */ + public static T mapToBean(Map map, T bean) { + if (MapUtil.isEmpty(map)) { + return null; + } + if (ObjectUtil.isNull(bean)) { + return null; + } + BeanMap.create(bean).putAll(map); + return bean; + } + + /** + * map拷贝到map + * + * @param map 数据来源 + * @param clazz 返回的对象类型 + * @return map对象 + */ + public static Map mapToMap(Map map, Class clazz) { + if (MapUtil.isEmpty(map)) { + return null; + } + if (ObjectUtil.isNull(clazz)) { + return null; + } + Map copyMap = new LinkedHashMap<>(map.size()); + map.forEach((k, v) -> copyMap.put(k, copy(v, clazz))); + return copyMap; + } + + /** + * BeanCopier属性缓存
+ * 缓存用于防止多次反射造成的性能问题 + * + * @author Looly + * @since 5.4.1 + */ + public enum BeanCopierCache { + /** + * BeanCopier属性缓存单例 + */ + INSTANCE; + + private final SimpleCache cache = new SimpleCache<>(); + + /** + * 获得类与转换器生成的key在{@link BeanCopier}的Map中对应的元素 + * + * @param srcClass 源Bean的类 + * @param targetClass 目标Bean的类 + * @param converter 转换器 + * @return Map中对应的BeanCopier + */ + public BeanCopier get(Class srcClass, Class targetClass, Converter converter) { + final String key = genKey(srcClass, targetClass, converter); + return cache.get(key, () -> BeanCopier.create(srcClass, targetClass, converter != null)); + } + + /** + * 获得类与转换器生成的key + * + * @param srcClass 源Bean的类 + * @param targetClass 目标Bean的类 + * @param converter 转换器 + * @return 属性名和Map映射的key + */ + private String genKey(Class srcClass, Class targetClass, Converter converter) { + final StringBuilder key = StrUtil.builder() + .append(srcClass.getName()).append('#').append(targetClass.getName()); + if (null != converter) { + key.append('#').append(converter.getClass().getName()); + } + return key.toString(); + } + } + +} diff --git a/hs-im-server/im-service/src/main/java/com/lld/im/service/utils/StreamUtils.java b/hs-im-server/im-service/src/main/java/com/lld/im/service/utils/StreamUtils.java new file mode 100644 index 0000000..c2eb3ef --- /dev/null +++ b/hs-im-server/im-service/src/main/java/com/lld/im/service/utils/StreamUtils.java @@ -0,0 +1,254 @@ +package com.lld.im.service.utils; + +import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.map.MapUtil; +import lombok.AccessLevel; +import lombok.NoArgsConstructor; + +import java.util.*; +import java.util.function.BiFunction; +import java.util.function.Function; +import java.util.function.Predicate; +import java.util.stream.Collectors; + +/** + * stream 流工具类 + * + * @author Lion Li + */ +@NoArgsConstructor(access = AccessLevel.PRIVATE) +public class StreamUtils { + + /** + * 将collection过滤 + * + * @param collection 需要转化的集合 + * @param function 过滤方法 + * @return 过滤后的list + */ + public static List filter(Collection collection, Predicate function) { + if (CollUtil.isEmpty(collection)) { + return CollUtil.newArrayList(); + } + // 注意此处不要使用 .toList() 新语法 因为返回的是不可变List 会导致序列化问题 + return collection.stream().filter(function).collect(Collectors.toList()); + } + + /** + * 将collection拼接 + * + * @param collection 需要转化的集合 + * @param function 拼接方法 + * @return 拼接后的list + */ + public static String join(Collection collection, Function function) { + return join(collection, function, StringUtils.SEPARATOR); + } + + /** + * 将collection拼接 + * + * @param collection 需要转化的集合 + * @param function 拼接方法 + * @param delimiter 拼接符 + * @return 拼接后的list + */ + public static String join(Collection collection, Function function, CharSequence delimiter) { + if (CollUtil.isEmpty(collection)) { + return StringUtils.EMPTY; + } + return collection.stream().map(function).filter(Objects::nonNull).collect(Collectors.joining(delimiter)); + } + + /** + * 将collection排序 + * + * @param collection 需要转化的集合 + * @param comparing 排序方法 + * @return 排序后的list + */ + public static List sorted(Collection collection, Comparator comparing) { + if (CollUtil.isEmpty(collection)) { + return CollUtil.newArrayList(); + } + // 注意此处不要使用 .toList() 新语法 因为返回的是不可变List 会导致序列化问题 + return collection.stream().filter(Objects::nonNull).sorted(comparing).collect(Collectors.toList()); + } + + /** + * 将collection转化为类型不变的map
+ * {@code Collection ----> Map} + * + * @param collection 需要转化的集合 + * @param key V类型转化为K类型的lambda方法 + * @param collection中的泛型 + * @param map中的key类型 + * @return 转化后的map + */ + public static Map toIdentityMap(Collection collection, Function key) { + if (CollUtil.isEmpty(collection)) { + return MapUtil.newHashMap(); + } + return collection.stream().filter(Objects::nonNull).collect(Collectors.toMap(key, Function.identity(), (l, r) -> l)); + } + + /** + * 将Collection转化为map(value类型与collection的泛型不同)
+ * {@code Collection -----> Map } + * + * @param collection 需要转化的集合 + * @param key E类型转化为K类型的lambda方法 + * @param value E类型转化为V类型的lambda方法 + * @param collection中的泛型 + * @param map中的key类型 + * @param map中的value类型 + * @return 转化后的map + */ + public static Map toMap(Collection collection, Function key, Function value) { + if (CollUtil.isEmpty(collection)) { + return MapUtil.newHashMap(); + } + return collection.stream().filter(Objects::nonNull).collect(Collectors.toMap(key, value, (l, r) -> l)); + } + + /** + * 将collection按照规则(比如有相同的班级id)分类成map
+ * {@code Collection -------> Map> } + * + * @param collection 需要分类的集合 + * @param key 分类的规则 + * @param collection中的泛型 + * @param map中的key类型 + * @return 分类后的map + */ + public static Map> groupByKey(Collection collection, Function key) { + if (CollUtil.isEmpty(collection)) { + return MapUtil.newHashMap(); + } + return collection + .stream().filter(Objects::nonNull) + .collect(Collectors.groupingBy(key, LinkedHashMap::new, Collectors.toList())); + } + + /** + * 将collection按照两个规则(比如有相同的年级id,班级id)分类成双层map
+ * {@code Collection ---> Map>> } + * + * @param collection 需要分类的集合 + * @param key1 第一个分类的规则 + * @param key2 第二个分类的规则 + * @param 集合元素类型 + * @param 第一个map中的key类型 + * @param 第二个map中的key类型 + * @return 分类后的map + */ + public static Map>> groupBy2Key(Collection collection, Function key1, Function key2) { + if (CollUtil.isEmpty(collection)) { + return MapUtil.newHashMap(); + } + return collection + .stream().filter(Objects::nonNull) + .collect(Collectors.groupingBy(key1, LinkedHashMap::new, Collectors.groupingBy(key2, LinkedHashMap::new, Collectors.toList()))); + } + + /** + * 将collection按照两个规则(比如有相同的年级id,班级id)分类成双层map
+ * {@code Collection ---> Map> } + * + * @param collection 需要分类的集合 + * @param key1 第一个分类的规则 + * @param key2 第二个分类的规则 + * @param 第一个map中的key类型 + * @param 第二个map中的key类型 + * @param collection中的泛型 + * @return 分类后的map + */ + public static Map> group2Map(Collection collection, Function key1, Function key2) { + if (CollUtil.isEmpty(collection) || key1 == null || key2 == null) { + return MapUtil.newHashMap(); + } + return collection + .stream().filter(Objects::nonNull) + .collect(Collectors.groupingBy(key1, LinkedHashMap::new, Collectors.toMap(key2, Function.identity(), (l, r) -> l))); + } + + /** + * 将collection转化为List集合，但是两者的泛型不同
+ * {@code Collection ------> List } + * + * @param collection 需要转化的集合 + * @param function collection中的泛型转化为list泛型的lambda表达式 + * @param collection中的泛型 + * @param List中的泛型 + * @return 转化后的list + */ + public static List toList(Collection collection, Function function) { + if (CollUtil.isEmpty(collection)) { + return CollUtil.newArrayList(); + } + return collection + .stream() + .map(function) + .filter(Objects::nonNull) + // 注意此处不要使用 .toList() 新语法 因为返回的是不可变List 会导致序列化问题 + .collect(Collectors.toList()); + } + + /** + * 将collection转化为Set集合，但是两者的泛型不同
+ * {@code Collection ------> Set } + * + * @param collection 需要转化的集合 + * @param function collection中的泛型转化为set泛型的lambda表达式 + * @param collection中的泛型 + * @param Set中的泛型 + * @return 转化后的Set + */ + public static Set toSet(Collection collection, Function function) { + if (CollUtil.isEmpty(collection) || function == null) { + return CollUtil.newHashSet(); + } + return collection + .stream() + .map(function) + .filter(Objects::nonNull) + .collect(Collectors.toSet()); + } + + + /** + * 合并两个相同key类型的map + * + * @param map1 第一个需要合并的 map + * @param map2 第二个需要合并的 map + * @param merge 合并的lambda，将key value1 value2合并成最终的类型,注意value可能为空的情况 + * @param map中的key类型 + * @param 第一个 map的value类型 + * @param 第二个 map的value类型 + * @param 最终map的value类型 + * @return 合并后的map + */ + public static Map merge(Map map1, Map map2, BiFunction merge) { + if (MapUtil.isEmpty(map1) && MapUtil.isEmpty(map2)) { + return MapUtil.newHashMap(); + } else if (MapUtil.isEmpty(map1)) { + map1 = MapUtil.newHashMap(); + } else if (MapUtil.isEmpty(map2)) { + map2 = MapUtil.newHashMap(); + } + Set key = new HashSet<>(); + key.addAll(map1.keySet()); + key.addAll(map2.keySet()); + Map map = new HashMap<>(); + for (K t : key) { + X x = map1.get(t); + Y y = map2.get(t); + V z = merge.apply(x, y); + if (z != null) { + map.put(t, z); + } + } + return map; + } + +} diff --git a/hs-im-server/im-service/src/main/java/com/lld/im/service/utils/StringUtils.java b/hs-im-server/im-service/src/main/java/com/lld/im/service/utils/StringUtils.java new file mode 100644 index 0000000..38ed95a --- /dev/null +++ b/hs-im-server/im-service/src/main/java/com/lld/im/service/utils/StringUtils.java @@ -0,0 +1,274 @@ +package com.lld.im.service.utils; + +import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.lang.Validator; +import cn.hutool.core.util.StrUtil; +import lombok.AccessLevel; +import lombok.NoArgsConstructor; +import org.springframework.util.AntPathMatcher; + +import java.util.ArrayList; +import java.util.HashSet; +import java.util.List; +import java.util.Set; + +/** + * 字符串工具类 + * + * @author Lion Li + */ +@NoArgsConstructor(access = AccessLevel.PRIVATE) +public class StringUtils extends org.apache.commons.lang3.StringUtils { + + public static final String SEPARATOR = ","; + + /** + * 获取参数不为空值 + * + * @param str defaultValue 要判断的value + * @return value 返回值 + */ + public static String blankToDefault(String str, String defaultValue) { + return StrUtil.blankToDefault(str, defaultValue); + } + + /** + * * 判断一个字符串是否为空串 + * + * @param str String + * @return true：为空 false：非空 + */ + public static boolean isEmpty(String str) { + return StrUtil.isEmpty(str); + } + + /** + * * 判断一个字符串是否为非空串 + * + * @param str String + * @return true：非空串 false：空串 + */ + public static boolean isNotEmpty(String str) { + return !isEmpty(str); + } + + /** + * 去空格 + */ + public static String trim(String str) { + return StrUtil.trim(str); + } + + /** + * 截取字符串 + * + * @param str 字符串 + * @param start 开始 + * @return 结果 + */ + public static String substring(final String str, int start) { + return substring(str, start, str.length()); + } + + /** + * 截取字符串 + * + * @param str 字符串 + * @param start 开始 + * @param end 结束 + * @return 结果 + */ + public static String substring(final String str, int start, int end) { + return StrUtil.sub(str, start, end); + } + + /** + * 格式化文本, {} 表示占位符
+ * 此方法只是简单将占位符 {} 按照顺序替换为参数
+ * 如果想输出 {} 使用 \\转义 { 即可，如果想输出 {} 之前的 \ 使用双转义符 \\\\ 即可
+ * 例：
+ * 通常使用：format("this is {} for {}", "a", "b") -> this is a for b
+ * 转义{}： format("this is \\{} for {}", "a", "b") -> this is {} for a
+ * 转义\： format("this is \\\\{} for {}", "a", "b") -> this is \a for b
+ * + * @param template 文本模板，被替换的部分用 {} 表示 + * @param params 参数值 + * @return 格式化后的文本 + */ + public static String format(String template, Object... params) { + return StrUtil.format(template, params); + } + + /** + * 是否为http(s)://开头 + * + * @param link 链接 + * @return 结果 + */ + public static boolean ishttp(String link) { + return Validator.isUrl(link); + } + + /** + * 字符串转set + * + * @param str 字符串 + * @param sep 分隔符 + * @return set集合 + */ + public static Set str2Set(String str, String sep) { + return new HashSet<>(str2List(str, sep, true, false)); + } + + /** + * 字符串转list + * + * @param str 字符串 + * @param sep 分隔符 + * @param filterBlank 过滤纯空白 + * @param trim 去掉首尾空白 + * @return list集合 + */ + public static List str2List(String str, String sep, boolean filterBlank, boolean trim) { + List list = new ArrayList<>(); + if (isEmpty(str)) { + return list; + } + + // 过滤空白字符串 + if (filterBlank && isBlank(str)) { + return list; + } + String[] split = str.split(sep); + for (String string : split) { + if (filterBlank && isBlank(string)) { + continue; + } + if (trim) { + string = trim(string); + } + list.add(string); + } + + return list; + } + + /** + * 查找指定字符串是否包含指定字符串列表中的任意一个字符串同时串忽略大小写 + * + * @param cs 指定字符串 + * @param searchCharSequences 需要检查的字符串数组 + * @return 是否包含任意一个字符串 + */ + public static boolean containsAnyIgnoreCase(CharSequence cs, CharSequence... searchCharSequences) { + return StrUtil.containsAnyIgnoreCase(cs, searchCharSequences); + } + + /** + * 驼峰转下划线命名 + */ + public static String toUnderScoreCase(String str) { + return StrUtil.toUnderlineCase(str); + } + + /** + * 是否包含字符串 + * + * @param str 验证字符串 + * @param strs 字符串组 + * @return 包含返回true + */ + public static boolean inStringIgnoreCase(String str, String... strs) { + return StrUtil.equalsAnyIgnoreCase(str, strs); + } + + /** + * 将下划线大写方式命名的字符串转换为驼峰式。如果转换前的下划线大写方式命名的字符串为空，则返回空字符串。 例如：HELLO_WORLD->HelloWorld + * + * @param name 转换前的下划线大写方式命名的字符串 + * @return 转换后的驼峰式命名的字符串 + */ + public static String convertToCamelCase(String name) { + return StrUtil.upperFirst(StrUtil.toCamelCase(name)); + } + + /** + * 驼峰式命名法 例如：user_name->userName + */ + public static String toCamelCase(String s) { + return StrUtil.toCamelCase(s); + } + + /** + * 查找指定字符串是否匹配指定字符串列表中的任意一个字符串 + * + * @param str 指定字符串 + * @param strs 需要检查的字符串数组 + * @return 是否匹配 + */ + public static boolean matches(String str, List strs) { + if (isEmpty(str) || CollUtil.isEmpty(strs)) { + return false; + } + for (String pattern : strs) { + if (isMatch(pattern, str)) { + return true; + } + } + return false; + } + + /** + * 判断url是否与规则配置: + * ? 表示单个字符; + * * 表示一层路径内的任意字符串，不可跨层级; + * ** 表示任意层路径; + * + * @param pattern 匹配规则 + * @param url 需要匹配的url + */ + public static boolean isMatch(String pattern, String url) { + AntPathMatcher matcher = new AntPathMatcher(); + return matcher.match(pattern, url); + } + + /** + * 数字左边补齐0，使之达到指定长度。注意，如果数字转换为字符串后，长度大于size，则只保留 最后size个字符。 + * + * @param num 数字对象 + * @param size 字符串指定长度 + * @return 返回数字的字符串格式，该字符串为指定长度。 + */ + public static String padl(final Number num, final int size) { + return padl(num.toString(), size, '0'); + } + + /** + * 字符串左补齐。如果原始字符串s长度大于size，则只保留最后size个字符。 + * + * @param s 原始字符串 + * @param size 字符串指定长度 + * @param c 用于补齐的字符 + * @return 返回指定长度的字符串，由原字符串左补齐或截取得到。 + */ + public static String padl(final String s, final int size, final char c) { + final StringBuilder sb = new StringBuilder(size); + if (s != null) { + final int len = s.length(); + if (s.length() <= size) { + for (int i = size - len; i > 0; i--) { + sb.append(c); + } + sb.append(s); + } else { + return s.substring(len - size, len); + } + } else { + for (int i = size; i > 0; i--) { + sb.append(c); + } + } + return sb.toString(); + } + +} From 60ed407afee04362d559cafa1515d8fa590ffa60 Mon Sep 17 00:00:00 2001 From: chen zida Date: Tue, 28 Nov 2023 20:36:28 +0800 Subject: [PATCH 3/4] =?UTF-8?q?add=20=E8=81=8A=E5=A4=A9=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lld/im/common/model/ChatHistoryReq.java | 24 ++++ .../message/controller/MessageController.java | 30 +++++ .../model/resp/ImMessageHistoryVo.java | 15 +++ .../message/service/MessageSyncService.java | 114 +++++++++++++++++- 4 files changed, 178 insertions(+), 5 deletions(-) create mode 100644 hs-im-server/im-common/src/main/java/com/lld/im/common/model/ChatHistoryReq.java create mode 100644 hs-im-server/im-service/src/main/java/com/lld/im/service/message/model/resp/ImMessageHistoryVo.java diff --git a/hs-im-server/im-common/src/main/java/com/lld/im/common/model/ChatHistoryReq.java b/hs-im-server/im-common/src/main/java/com/lld/im/common/model/ChatHistoryReq.java new file mode 100644 index 0000000..70d5b2a --- /dev/null +++ b/hs-im-server/im-common/src/main/java/com/lld/im/common/model/ChatHistoryReq.java @@ -0,0 +1,24 @@ +package com.lld.im.common.model; + +import lombok.Data; + +/** + * @author: Chackylee + * @description: + **/ +@Data +public class ChatHistoryReq extends RequestBase { + private static final long serialVersionUID = 1L; + + + private String operater; + + private String userId; + + + //单次拉取数量 + private Integer limit; + + //第几页 + private Integer offset; +} diff --git a/hs-im-server/im-service/src/main/java/com/lld/im/service/message/controller/MessageController.java b/hs-im-server/im-service/src/main/java/com/lld/im/service/message/controller/MessageController.java index b78a79a..4e7fb3b 100644 --- a/hs-im-server/im-service/src/main/java/com/lld/im/service/message/controller/MessageController.java +++ b/hs-im-server/im-service/src/main/java/com/lld/im/service/message/controller/MessageController.java @@ -1,9 +1,11 @@ package com.lld.im.service.message.controller; import com.lld.im.common.ResponseVO; +import com.lld.im.common.model.ChatHistoryReq; import com.lld.im.common.model.SyncReq; import com.lld.im.common.model.message.CheckSendMessageReq; import com.lld.im.service.message.model.req.SendMessageReq; +import com.lld.im.service.message.model.resp.ImMessageHistoryVo; import com.lld.im.service.message.service.MessageSyncService; import com.lld.im.service.message.service.P2PMessageService; import org.springframework.beans.factory.annotation.Autowired; @@ -12,6 +14,8 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import java.util.List; + /** * @description: * @author: lld @@ -46,7 +50,33 @@ public class MessageController { return messageSyncService.syncOfflineMessage(req); } + /** + * 获取会话列表 + * @param req + * @param appId + * @return + */ + @RequestMapping("/listMessage") + public ResponseVO listMessage(@RequestBody + @Validated SyncReq req, Integer appId) { + req.setAppId(appId); + List objects = messageSyncService.listSession(req); + return null; + } + /** + * 获取会话列表 + * @param req + * @param appId + * @return + */ + @RequestMapping("/chatHistory") + public ResponseVO chatHistory(@RequestBody + @Validated ChatHistoryReq chatHistoryReq, Integer appId) { + chatHistoryReq.setAppId(appId); + List imMessageHistoryVos = messageSyncService.chatHistory(chatHistoryReq); + return ResponseVO.successResponse(imMessageHistoryVos); + } diff --git a/hs-im-server/im-service/src/main/java/com/lld/im/service/message/model/resp/ImMessageHistoryVo.java b/hs-im-server/im-service/src/main/java/com/lld/im/service/message/model/resp/ImMessageHistoryVo.java new file mode 100644 index 0000000..c30664f --- /dev/null +++ b/hs-im-server/im-service/src/main/java/com/lld/im/service/message/model/resp/ImMessageHistoryVo.java @@ -0,0 +1,15 @@ +package com.lld.im.service.message.model.resp; + +import com.lld.im.service.message.dao.ImMessageHistoryEntity; +import lombok.Data; + +/** + * @author: Chackylee + * @description: + **/ +@Data +public class ImMessageHistoryVo extends ImMessageHistoryEntity { + + private String messageBody; + +} diff --git a/hs-im-server/im-service/src/main/java/com/lld/im/service/message/service/MessageSyncService.java b/hs-im-server/im-service/src/main/java/com/lld/im/service/message/service/MessageSyncService.java index 15c9691..cfcf2ce 100644 --- a/hs-im-server/im-service/src/main/java/com/lld/im/service/message/service/MessageSyncService.java +++ b/hs-im-server/im-service/src/main/java/com/lld/im/service/message/service/MessageSyncService.java @@ -1,11 +1,12 @@ package com.lld.im.service.message.service; import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.lld.im.codec.pack.message.MessageReadedPack; import com.lld.im.codec.pack.message.RecallMessageNotifyPack; -import com.lld.im.codec.proto.Message; import com.lld.im.common.ResponseVO; import com.lld.im.common.constant.Constants; import com.lld.im.common.enums.ConversationTypeEnum; @@ -14,6 +15,7 @@ import com.lld.im.common.enums.MessageErrorCode; import com.lld.im.common.enums.command.Command; import com.lld.im.common.enums.command.GroupEventCommand; import com.lld.im.common.enums.command.MessageCommand; +import com.lld.im.common.model.ChatHistoryReq; import com.lld.im.common.model.ClientInfo; import com.lld.im.common.model.SyncReq; import com.lld.im.common.model.SyncResp; @@ -24,12 +26,13 @@ import com.lld.im.common.model.message.RecallMessageContent; import com.lld.im.service.conversation.service.ConversationService; import com.lld.im.service.group.service.ImGroupMemberService; import com.lld.im.service.message.dao.ImMessageBodyEntity; +import com.lld.im.service.message.dao.ImMessageHistoryEntity; import com.lld.im.service.message.dao.mapper.ImMessageBodyMapper; +import com.lld.im.service.message.dao.mapper.ImMessageHistoryMapper; +import com.lld.im.service.message.model.resp.ImMessageHistoryVo; import com.lld.im.service.seq.RedisSeq; -import com.lld.im.service.utils.ConversationIdGenerate; -import com.lld.im.service.utils.GroupMessageProducer; -import com.lld.im.service.utils.MessageProducer; -import com.lld.im.service.utils.SnowflakeIdWorker; +import com.lld.im.service.utils.*; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.redis.core.DefaultTypedTuple; @@ -39,7 +42,9 @@ import org.springframework.stereotype.Service; import java.util.ArrayList; import java.util.List; +import java.util.Map; import java.util.Set; +import java.util.stream.Collectors; /** * @description: @@ -73,6 +78,8 @@ public class MessageSyncService { @Autowired GroupMessageProducer groupMessageProducer; + @Autowired + private ImMessageHistoryMapper imMessageHistoryMapper; public void receiveMark(MessageReciveAckContent messageReciveAckContent){ messageProducer.sendToUser(messageReciveAckContent.getToId(), @@ -156,6 +163,103 @@ public class MessageSyncService { return ResponseVO.successResponse(resp); } + public List listSession(SyncReq req){ + List listOfflineMessage = listOfflineMessage(req); + + List listReadMessage = listReadMessage(req); + Map collect = listReadMessage.stream().collect(Collectors.toMap(ImMessageHistoryEntity::getOwnerId, ImMessageHistoryEntity::getMessageKey)); + + return null; + } + + public List chatHistory(ChatHistoryReq chatHistoryReq){ + Page objectPage = new Page<>(chatHistoryReq.getOffset(),chatHistoryReq.getLimit()); + LambdaQueryWrapper and = new LambdaQueryWrapper().eq(ImMessageHistoryEntity::getOwnerId, chatHistoryReq.getOperater()) + .and(x -> x.eq(ImMessageHistoryEntity::getFromId, chatHistoryReq.getUserId()).or().eq(ImMessageHistoryEntity::getToId, chatHistoryReq.getUserId())) + .orderByDesc(ImMessageHistoryEntity::getMessageKey); + Page imMessageHistoryEntities = imMessageHistoryMapper.selectPage(objectPage,and); + List messageKeys = imMessageHistoryEntities.getRecords().stream().map(x -> x.getMessageKey()).collect(Collectors.toList()); + List imMessageBodyEntities = imMessageBodyMapper.selectList(new LambdaQueryWrapper().in(ImMessageBodyEntity::getMessageKey, messageKeys)); + Map collect = imMessageBodyEntities.stream().collect(Collectors.toMap(ImMessageBodyEntity::getMessageKey, x -> x)); + + List imMessageHistoryVos = BeanCopyUtils.copyList(imMessageHistoryEntities.getRecords(), ImMessageHistoryVo.class); + for (ImMessageHistoryVo imMessageHistoryVo : imMessageHistoryVos) { + ImMessageBodyEntity imMessageBodyEntity = collect.get(imMessageHistoryVo.getMessageKey()); + imMessageHistoryVo.setMessageBody(imMessageBodyEntity.getMessageBody()); + } + return imMessageHistoryVos; + } + + + /** + * 获取离线消息 + * @param req + * @return + */ + public List listOfflineMessage(SyncReq req) { + String key = req.getAppId() + ":" + Constants.RedisConstants.OfflineMessage + ":" + req.getOperater(); + //获取最大的seq + Long maxSeq = 0L; + ZSetOperations zSetOperations = redisTemplate.opsForZSet(); + Set set = zSetOperations.reverseRangeWithScores(key, 0, 0); + if(!CollectionUtils.isEmpty(set)){ + List list = new ArrayList(set); + DefaultTypedTuple o = (DefaultTypedTuple) list.get(0); + maxSeq = o.getScore().longValue(); + } + + List respList = new ArrayList<>(); + + Set querySet = zSetOperations.rangeByScoreWithScores(key, + req.getLastSequence(), maxSeq, 0, -1); + for (ZSetOperations.TypedTuple typedTuple : querySet) { + String value = typedTuple.getValue(); + OfflineMessageContent offlineMessageContent = JSONObject.parseObject(value, OfflineMessageContent.class); + respList.add(offlineMessageContent); + } + +// +// List imMessageBodyIds = new ArrayList<>(); +// Map toIdMap = respList.stream().collect(Collectors.toMap(OfflineMessageContent::getToId, x -> x)); +// Map> toIdMap2 = respList.stream(). +// collect(Collectors.groupingBy(x -> x.getFromId() + "-"+ x.getToId(),Collectors.maxBy(Comparator.comparingLong(OfflineMessageContent::getMessageKey)))); +// for (OfflineMessageContent offlineMessageContent : respList) { +// OfflineMessageContent messageKey1 = toIdMap.get(offlineMessageContent.getToId()); +// if (messageKey1 != null){ +// imMessageBodyIds.add(messageKey1.getMessageKey() > offlineMessageContent.getMessageKey() ? messageKey1 : offlineMessageContent); +// } +// } + + return respList; + } + + /** + * 获取已读消息 + * @param req + * @return + */ + public List listReadMessage(SyncReq req) { + List imMessageHistoryEntities = imMessageHistoryMapper.selectMessageByOwnId(req.getOperater()); + List imMessageBodyIds = new ArrayList<>(); + + Map fromIdMap = imMessageHistoryEntities.stream() + .filter(x -> !StringUtils.equals(x.getFromId(),req.getOperater())) + .collect(Collectors.toMap(ImMessageHistoryEntity::getFromId, ImMessageHistoryEntity::getMessageKey)); + Map toIdMap = imMessageHistoryEntities.stream() + .filter(x -> !StringUtils.equals(x.getToId(),req.getOperater())) + .collect(Collectors.toMap(ImMessageHistoryEntity::getToId, ImMessageHistoryEntity::getMessageKey)); + fromIdMap.forEach((key,value) -> { + toIdMap.merge(key,value,(x,y) -> { + if (value > y) return value; + return y; + }); + }); + + List imMessageBodyEntities = imMessageBodyMapper.selectList(new LambdaQueryWrapper().in(ImMessageBodyEntity::getMessageKey, imMessageBodyIds)); + + return null; + } + //修改历史消息的状态 //修改离线消息的状态 //ack给发送方 From ff9cf94214f52385897f0ff61a2930aa288b62fa Mon Sep 17 00:00:00 2001 From: chen zida Date: Tue, 28 Nov 2023 20:36:50 +0800 Subject: [PATCH 4/4] =?UTF-8?q?add=20pom=E4=BE=9D=E8=B5=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hs-im-server/im-service/pom.xml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/hs-im-server/im-service/pom.xml b/hs-im-server/im-service/pom.xml index 33a1f72..774ef0a 100644 --- a/hs-im-server/im-service/pom.xml +++ b/hs-im-server/im-service/pom.xml @@ -34,6 +34,10 @@ zkclient + + cn.hutool + hutool-all + org.springframework.boot