Merge remote-tracking branch 'github/master-jdk17' into HEAD

YunaiV
2 parents 78976885 91f23dfe
Showing 4 changed files with 66 additions and 4 deletions
sql/tools/convertor.py
yudao-module-im/src/main/java/cn/iocoder/yudao/module/im/dal/mysql/message/ImChannelMessageMapper.java
yudao-module-im/src/test/java/cn/iocoder/yudao/module/im/dal/mysql/message/ImChannelMessageMapperTest.java
yudao-module-mall/yudao-module-product/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/value/ProductPropertyValuePageReqVO.java
@@ -412,7 +412,7 @@ class PostgreSQLConvertor(Convertor):
         type = type.lower()
-        if type == "varchar":
+        if type in ("varchar", "char"):
             return f"varchar({size})"
         if type in ("int", "int unsigned", "int unsigned zerofill"):
             return "int4"
@@ -426,13 +426,15 @@ class PostgreSQLConvertor(Convertor):
             return "date"
         if type == "json":
             return "jsonb"
+        if type == "time":
+            return "time"
         if type == "double":
             return "double precision"
         if type == "timestamp":
             return f"timestamp({size})" if size else "timestamp"
         if type == "bit":
             return "bool"
-        if type in ("text", "longtext"):
+        if type in ("text", "longtext", "mediumtext"):
             return "text"
         if type in ("blob", "mediumblob", "longblob"):
             return "bytea"
@@ -8,6 +8,7 @@ import cn.iocoder.yudao.module.im.controller.admin.manager.message.vo.channel.Im
 import cn.iocoder.yudao.module.im.dal.dataobject.message.ImChannelMessageDO;
 import org.apache.ibatis.annotations.Mapper;
+import java.util.Collections;
 import java.util.List;
 /**
@@ -32,7 +33,7 @@ public interface ImChannelMessageMapper extends BaseMapperX&lt;ImChannelMessageDO&gt; 
         return selectList(new LambdaQueryWrapperX<ImChannelMessageDO>()
                 .gt(ImChannelMessageDO::getId, minId)
                 .and(w -> w.isNull(ImChannelMessageDO::getReceiverUserIds)
-                        .or().eq(ImChannelMessageDO::getReceiverUserIds, "")
+                        .or().eq(ImChannelMessageDO::getReceiverUserIds, Collections.emptyList())
                         .or().apply(MyBatisUtils.findInSet("receiver_user_ids"), userId))
                 .orderByAsc(ImChannelMessageDO::getId)
                 .last("LIMIT " + size));
+package cn.iocoder.yudao.module.im.dal.mysql.message;
+
+import cn.iocoder.yudao.framework.test.core.ut.BaseDbUnitTest;
+import cn.iocoder.yudao.module.im.dal.dataobject.message.ImChannelMessageDO;
+import jakarta.annotation.Resource;
+import org.junit.jupiter.api.Test;
+import org.springframework.test.context.jdbc.Sql;
+
+import java.time.LocalDateTime;
+import java.util.List;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+@Sql(statements = "DELETE FROM im_channel_message", executionPhase = Sql.ExecutionPhase.AFTER_TEST_METHOD)
+public class ImChannelMessageMapperTest extends BaseDbUnitTest {
+
+    @Resource
+    private ImChannelMessageMapper mapper;
+
+    @Test
+    public void testSelectListByUserAndMinId_includesBroadcastAndMatchingRecipients() {
+        ImChannelMessageDO nullRecipients = insertMessage(null);
+        ImChannelMessageDO emptyRecipients = insertMessage(List.of());
+        ImChannelMessageDO matchingRecipients = insertMessage(List.of(1L, 2L));
+        insertMessage(List.of(2L, 11L)); // 用户 1 不应误命中用户 11
+        ImChannelMessageDO deleted = insertMessage(List.of(1L));
+        mapper.deleteById(deleted.getId());
+
+        List<ImChannelMessageDO> result = mapper.selectListByUserAndMinId(1L, 0L, 100);
+
+        assertEquals(List.of(nullRecipients.getId(), emptyRecipients.getId(), matchingRecipients.getId()),
+                result.stream().map(ImChannelMessageDO::getId).toList());
+    }
+
+    @Test
+    public void testSelectListByUserAndMinId_respectsCursorAndLimit() {
+        ImChannelMessageDO cursor = insertMessage(null);
+        ImChannelMessageDO next = insertMessage(List.of());
+        insertMessage(List.of(1L));
+
+        List<ImChannelMessageDO> result = mapper.selectListByUserAndMinId(1L, cursor.getId(), 1);
+
+        assertEquals(List.of(next.getId()), result.stream().map(ImChannelMessageDO::getId).toList());
+    }
+
+    private ImChannelMessageDO insertMessage(List<Long> receiverUserIds) {
+        ImChannelMessageDO message = ImChannelMessageDO.builder()
+                .channelId(10L)
+                .materialId(20L)
+                .type(1)
+                .content("{}")
+                .receiverUserIds(receiverUserIds)
+                .sendTime(LocalDateTime.now())
+                .build();
+        mapper.insert(message);
+        return message;
+    }
+
+}
@@ -13,7 +13,7 @@ import lombok.ToString;
 public class ProductPropertyValuePageReqVO extends PageParam {
     @Schema(description = "属性项的编号", example = "1024")
-    private String propertyId;
+    private Long propertyId;
     @Schema(description = "名称", example = "红色")
     private String name;