Merge branch 'release/3.0' into dev/dev

# Conflicts:
#	src/main/java/com/ai/da/common/constant/CommonConstant.java
#	src/main/java/com/ai/da/common/security/filter/AuthenticationFilter.java
#	src/main/java/com/ai/da/controller/PortfolioController.java
#	src/main/java/com/ai/da/model/dto/QueryPortfolioPageDTO.java
#	src/main/java/com/ai/da/service/PortfolioService.java
#	src/main/java/com/ai/da/service/impl/PortfolioServiceImpl.java
#	src/main/resources/messages_en.properties
#	src/main/resources/messages_zh.properties

src/main/java/com/ai/da/mapper/primary/PortfolioMapper.java

@@ -3,6 +3,10 @@ package com.ai.da.mapper.primary;
 import com.ai.da.common.config.mybatis.plus.CommonMapper;
 import com.ai.da.mapper.primary.entity.Portfolio;
 
+import java.util.List;
+
 public interface PortfolioMapper extends CommonMapper<Portfolio> {
     Portfolio getByIdAll(Long originalPortfolioId);
+
+    List<Portfolio> getByTag(Long accountId, String tagName);
 }

src/main/java/com/ai/da/mapper/primary/PortfolioTagsMapper.java

@@ -0,0 +1,15 @@
+package com.ai.da.mapper.primary;
+
+import com.ai.da.common.config.mybatis.plus.CommonMapper;
+import com.ai.da.mapper.primary.entity.PortfolioTags;
+
+import java.time.LocalDateTime;
+
+public interface PortfolioTagsMapper extends CommonMapper<PortfolioTags> {
+
+    void deleteByPortfolioId(Long portfolioId);
+
+    // portfolioId与tagId建立唯一约束， 如果组合 portfolio_id 和 tag_id 已经存在，插入操作会被忽略。
+    void insertIgnore(Long portfolioId, Long tagId, LocalDateTime time);
+
+}

src/main/java/com/ai/da/mapper/primary/TagsMapper.java

@@ -0,0 +1,17 @@
+package com.ai.da.mapper.primary;
+
+import com.ai.da.common.config.mybatis.plus.CommonMapper;
+import com.ai.da.mapper.primary.entity.Tags;
+import com.ai.da.model.dto.TagsDTO;
+
+import java.util.List;
+import java.util.Map;
+
+
+public interface TagsMapper extends CommonMapper<Tags> {
+
+    List<Map<String, String>> getMatchingTags(String userInput);
+
+    List<TagsDTO> getTagByPortfolioId(Long portfolioId);
+
+}

src/main/java/com/ai/da/mapper/primary/entity/PortfolioTags.java

@@ -0,0 +1,14 @@
+package com.ai.da.mapper.primary.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+@EqualsAndHashCode(callSuper = true)
+@TableName("t_portfolio_tags")
+@Data
+public class PortfolioTags extends BaseEntity{
+    private Long portfolioId;
+
+    private Long tagId;
+}

src/main/java/com/ai/da/mapper/primary/entity/Tags.java

@@ -0,0 +1,13 @@
+package com.ai.da.mapper.primary.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+@EqualsAndHashCode(callSuper = true)
+@TableName("t_tags")
+@Data
+public class Tags extends BaseEntity{
+
+    private String tagName;
+}