Merge pull request 'v1.0.40' (#52) from dev into master

Reviewed-on: #52

pom.xml

@@ -11,7 +11,7 @@
 
 	<groupId>com.imyeyu.timiserverapi</groupId>
 	<artifactId>TimiServerAPI</artifactId>
-	<version>1.0.39</version>
+	<version>1.0.40</version>
 	<packaging>jar</packaging>
 	<name>TimiServerAPI</name>
 	<description>imyeyu.com API</description>

src/main/java/com/imyeyu/api/modules/common/controller/ArticleController.java

@@ -39,6 +39,7 @@ public class ArticleController {
 	/// @return 文章分页
 	@JsonView(ResponseView.Public.class)
 	@RequestRateLimit
+	@RequireCorePermission(CorePermissionCode.ARTICLE_READ)
 	@PostMapping("/list")
 	public PageResult<Article> list(@RequestBody Page<Article> page) {
 		return service.page(page);
@@ -50,7 +51,7 @@ public class ArticleController {
 	/// @return 文章详情
 	@JsonView(ResponseView.Public.class)
 	@RequestRateLimit
-	@PostMapping("/detail")
+	@RequestMapping("/detail")
 	public Article detail(@RequestParam String id) {
 		Article article = service.get(id);
 		article.setAttachmentList(attachmentService.listByBizId(Attachment.BizType.ARTICLE, article.getId()));

src/main/java/com/imyeyu/api/modules/gao/entity/GaoCustomer.java

@@ -6,7 +6,6 @@ import com.imyeyu.api.modules.common.entity.Attachment;
 import com.imyeyu.api.modules.common.entity.TagApply;
 import com.imyeyu.api.modules.user.bean.Gender;
 import com.imyeyu.api.modules.user.entity.User;
-import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.imyeyu.java.TimiJava;
 import com.imyeyu.spring.annotation.table.Column;
 import com.imyeyu.spring.annotation.table.Transient;
@@ -62,15 +61,12 @@ public class GaoCustomer extends UUIDEntity {
 	private String name;
 
 	@Column("name_pinyin_full")
-	@JsonIgnore
 	private String namePinyinFull;
 
 	@Column("name_pinyin_initial")
-	@JsonIgnore
 	private String namePinyinInitial;
 
 	@Column("name_pinyin_mixed")
-	@JsonIgnore
 	private String namePinyinMixed;
 
 	/// 性别

src/main/java/com/imyeyu/api/modules/gao/entity/GaoProduct.java

@@ -1,6 +1,8 @@
 package com.imyeyu.api.modules.gao.entity;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.imyeyu.api.modules.common.entity.Attachment;
+import com.imyeyu.spring.annotation.table.Column;
 import com.imyeyu.spring.annotation.table.Transient;
 import com.imyeyu.spring.entity.UUIDEntity;
 import lombok.Data;
@@ -61,6 +63,18 @@ public class GaoProduct extends UUIDEntity {
 	/// 产品名称
 	private String name;
 
+	@Column("name_pinyin_full")
+	@JsonIgnore
+	private String namePinyinFull;
+
+	@Column("name_pinyin_initial")
+	@JsonIgnore
+	private String namePinyinInitial;
+
+	@Column("name_pinyin_mixed")
+	@JsonIgnore
+	private String namePinyinMixed;
+
 	/// 产品类型
 	private ProductType productType;
 

src/main/java/com/imyeyu/api/modules/gao/service/implement/GaoProductServiceImplement.java

@@ -17,6 +17,7 @@ import com.imyeyu.api.modules.gao.vo.GaoProductPage;
 import com.imyeyu.api.modules.system.audit.AuditOperation;
 import com.imyeyu.api.modules.system.audit.OperationAudit;
 import com.imyeyu.api.modules.user.service.UserLoginService;
+import com.imyeyu.api.util.PinyinUtil;
 import com.imyeyu.java.TimiJava;
 import com.imyeyu.java.bean.timi.TimiCode;
 import com.imyeyu.java.bean.timi.TimiException;
@@ -166,6 +167,7 @@ public class GaoProductServiceImplement extends AbstractEntityService<GaoProduct
 		TimiException.required(product.getStoreId(), "not found product.storeId");
 		product.setCode(requiredText(product.getCode(), "产品编码不能为空"));
 		product.setName(requiredText(product.getName(), "产品名称不能为空"));
+		fillPinyin(product);
 		product.setProductType(TimiJava.defaultIfNull(product.getProductType(), GaoProduct.ProductType.GOODS));
 		product.setStockEnabled(TimiJava.defaultIfNull(product.getStockEnabled(), product.getProductType() != GaoProduct.ProductType.SERVICE));
 		TimiException.requiredTrue(product.getProductType() != GaoProduct.ProductType.SERVICE || !product.getStockEnabled(), "SERVICE 产品不能启用库存");
@@ -261,4 +263,14 @@ public class GaoProductServiceImplement extends AbstractEntityService<GaoProduct
 		TimiException.requiredTrue(!result.isEmpty(), message);
 		return result;
 	}
+
+	/// 填充产品名称拼音搜索字段
+	///
+	/// @param product 产品
+	private void fillPinyin(GaoProduct product) {
+		String name = product.getName();
+		product.setNamePinyinFull(PinyinUtil.full(name));
+		product.setNamePinyinInitial(PinyinUtil.initial(name));
+		product.setNamePinyinMixed(PinyinUtil.mixed(name));
+	}
 }

src/main/java/com/imyeyu/api/modules/gao/vo/GaoProductPage.java

@@ -30,6 +30,6 @@ public class GaoProductPage extends BasePage {
 	/// 产品类型
 	private GaoProduct.ProductType productType;
 
-	/// 名称或编码关键词
+	/// 名称、拼音或编码关键词
 	private String keyword;
 }

src/main/java/com/imyeyu/api/modules/gao/vo/GaoProductStockPage.java

@@ -18,6 +18,6 @@ public class GaoProductStockPage extends BasePage {
 	/// 产品 ID
 	private String productId;
 
-	/// 产品或 SKU 名称、编码、规格摘要关键词
+	/// 产品或 SKU 名称、拼音、编码、规格摘要关键词
 	private String keyword;
 }

src/main/java/com/imyeyu/api/modules/gao/vo/GaoProductStockRecordPage.java

@@ -19,7 +19,7 @@ public class GaoProductStockRecordPage extends BasePage {
 	/// 产品 ID
 	private String productId;
 
-	/// 产品名称或编码关键词
+	/// 产品名称、拼音或编码关键词
 	private String keyword;
 
 	/// 来源业务类型

src/main/java/com/imyeyu/api/modules/system/controller/SettingController.java

@@ -1,19 +0,0 @@
-package com.imyeyu.api.modules.system.controller;
-
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-/**
- *
- *
- * @author 夜雨
- * @since 2026-04-23 16:31
- */
-@Slf4j
-@RequiredArgsConstructor
-@RequestMapping("/system/setting")
-public class SettingController {
-
-
-}

src/main/java/db/migration/timiserver/V78__backfill_gao_product_pinyin_search.java

@@ -0,0 +1,55 @@
+package db.migration.timiserver;
+
+import com.imyeyu.api.util.PinyinUtil;
+import org.flywaydb.core.api.migration.BaseJavaMigration;
+import org.flywaydb.core.api.migration.Context;
+
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+
+/// 回填 GAO 产品名称拼音搜索字段
+///
+/// @author Codex
+/// @since 2026-09-10
+public class V78__backfill_gao_product_pinyin_search extends BaseJavaMigration {
+
+	private static final int BATCH_SIZE = 500;
+
+	@Override
+	public void migrate(Context context) throws Exception {
+		Connection connection = context.getConnection();
+		try (
+			PreparedStatement select = connection.prepareStatement("""
+				SELECT `id`, `name`
+				FROM `gao_product`
+				WHERE `name` IS NOT NULL
+					AND (`name_pinyin_full` IS NULL OR `name_pinyin_initial` IS NULL OR `name_pinyin_mixed` IS NULL)
+				""");
+			PreparedStatement update = connection.prepareStatement("""
+				UPDATE `gao_product`
+				SET `name_pinyin_full` = ?, `name_pinyin_initial` = ?, `name_pinyin_mixed` = ?
+				WHERE `id` = ?
+				""")) {
+			try (ResultSet resultSet = select.executeQuery()) {
+				int batchSize = 0;
+				while (resultSet.next()) {
+					String name = resultSet.getString("name");
+					update.setString(1, PinyinUtil.full(name));
+					update.setString(2, PinyinUtil.initial(name));
+					update.setString(3, PinyinUtil.mixed(name));
+					update.setString(4, resultSet.getString("id"));
+					update.addBatch();
+					batchSize++;
+					if (batchSize >= BATCH_SIZE) {
+						update.executeBatch();
+						batchSize = 0;
+					}
+				}
+				if (0 < batchSize) {
+					update.executeBatch();
+				}
+			}
+		}
+	}
+}

src/main/resources/db/migration/timiserver/V77__add_gao_product_pinyin_search_columns.sql

@@ -0,0 +1,7 @@
+ALTER TABLE `gao_product`
+	ADD COLUMN `name_pinyin_full` VARCHAR(768) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL COMMENT '产品名称全拼' AFTER `name`,
+	ADD COLUMN `name_pinyin_initial` VARCHAR(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL COMMENT '产品名称拼音首字母' AFTER `name_pinyin_full`,
+	ADD COLUMN `name_pinyin_mixed` VARCHAR(768) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL COMMENT '产品名称混合拼音' AFTER `name_pinyin_initial`,
+	ADD KEY `idx_gao_product_store_name_pinyin_full` (`store_id`, `deleted_at`, `name_pinyin_full`(128)),
+	ADD KEY `idx_gao_product_store_name_pinyin_initial` (`store_id`, `deleted_at`, `name_pinyin_initial`),
+	ADD KEY `idx_gao_product_store_name_pinyin_mixed` (`store_id`, `deleted_at`, `name_pinyin_mixed`(128));

src/main/resources/mapper/timi-server/gao/GaoProductMapper.xml

@@ -13,7 +13,7 @@
 			</choose>
 			<if test="status != null">AND `status` = #{status}</if>
 			<if test="productType != null">AND `product_type` = #{productType}</if>
-			<if test="keyword != null and keyword.trim() != ''">AND (`code` LIKE CONCAT('%', #{keyword}, '%') OR `name` LIKE CONCAT('%', #{keyword}, '%'))</if>
+			<if test="keyword != null and keyword.trim() != ''">AND (`code` LIKE CONCAT('%', #{keyword}, '%') OR `name` LIKE CONCAT('%', #{keyword}, '%') OR `name_pinyin_full` LIKE CONCAT(#{keyword}, '%') OR `name_pinyin_initial` LIKE CONCAT(#{keyword}, '%') OR `name_pinyin_mixed` LIKE CONCAT(#{keyword}, '%'))</if>
 	</select>
 	<select id="selectByQuery" resultType="com.imyeyu.api.modules.gao.entity.GaoProduct">
 		SELECT * FROM `gao_product`
@@ -27,7 +27,7 @@
 			</choose>
 			<if test="status != null">AND `status` = #{status}</if>
 			<if test="productType != null">AND `product_type` = #{productType}</if>
-			<if test="keyword != null and keyword.trim() != ''">AND (`code` LIKE CONCAT('%', #{keyword}, '%') OR `name` LIKE CONCAT('%', #{keyword}, '%'))</if>
+			<if test="keyword != null and keyword.trim() != ''">AND (`code` LIKE CONCAT('%', #{keyword}, '%') OR `name` LIKE CONCAT('%', #{keyword}, '%') OR `name_pinyin_full` LIKE CONCAT(#{keyword}, '%') OR `name_pinyin_initial` LIKE CONCAT(#{keyword}, '%') OR `name_pinyin_mixed` LIKE CONCAT(#{keyword}, '%'))</if>
 		ORDER BY `sort`, `name`, `code`, `created_at` DESC
 		LIMIT #{offset}, #{limit}
 	</select>

src/main/resources/mapper/timi-server/gao/GaoProductStockMapper.xml

@@ -23,7 +23,7 @@
 			AND k.`stock_enabled` = 1 AND k.`status` = 'ACTIVE'
 			<if test="storeId != null and storeId != ''">AND p.`store_id` = #{storeId}</if>
 			<if test="productId != null and productId != ''">AND k.`product_id` = #{productId}</if>
-			<if test="keyword != null and keyword.trim() != ''">AND (p.`code` LIKE CONCAT('%', #{keyword}, '%') OR p.`name` LIKE CONCAT('%', #{keyword}, '%') OR k.`code` LIKE CONCAT('%', #{keyword}, '%') OR k.`name` LIKE CONCAT('%', #{keyword}, '%') OR k.`spec_summary` LIKE CONCAT('%', #{keyword}, '%') OR k.`barcode` LIKE CONCAT('%', #{keyword}, '%'))</if>
+			<if test="keyword != null and keyword.trim() != ''">AND (p.`code` LIKE CONCAT('%', #{keyword}, '%') OR p.`name` LIKE CONCAT('%', #{keyword}, '%') OR p.`name_pinyin_full` LIKE CONCAT(#{keyword}, '%') OR p.`name_pinyin_initial` LIKE CONCAT(#{keyword}, '%') OR p.`name_pinyin_mixed` LIKE CONCAT(#{keyword}, '%') OR k.`code` LIKE CONCAT('%', #{keyword}, '%') OR k.`name` LIKE CONCAT('%', #{keyword}, '%') OR k.`spec_summary` LIKE CONCAT('%', #{keyword}, '%') OR k.`barcode` LIKE CONCAT('%', #{keyword}, '%'))</if>
 	</select>
 	<select id="selectByQuery" resultType="com.imyeyu.api.modules.gao.entity.GaoProductStock">
 		SELECT s.`id`,
@@ -45,7 +45,7 @@
 			AND k.`stock_enabled` = 1 AND k.`status` = 'ACTIVE'
 			<if test="storeId != null and storeId != ''">AND p.`store_id` = #{storeId}</if>
 			<if test="productId != null and productId != ''">AND k.`product_id` = #{productId}</if>
-			<if test="keyword != null and keyword.trim() != ''">AND (p.`code` LIKE CONCAT('%', #{keyword}, '%') OR p.`name` LIKE CONCAT('%', #{keyword}, '%') OR k.`code` LIKE CONCAT('%', #{keyword}, '%') OR k.`name` LIKE CONCAT('%', #{keyword}, '%') OR k.`spec_summary` LIKE CONCAT('%', #{keyword}, '%') OR k.`barcode` LIKE CONCAT('%', #{keyword}, '%'))</if>
+			<if test="keyword != null and keyword.trim() != ''">AND (p.`code` LIKE CONCAT('%', #{keyword}, '%') OR p.`name` LIKE CONCAT('%', #{keyword}, '%') OR p.`name_pinyin_full` LIKE CONCAT(#{keyword}, '%') OR p.`name_pinyin_initial` LIKE CONCAT(#{keyword}, '%') OR p.`name_pinyin_mixed` LIKE CONCAT(#{keyword}, '%') OR k.`code` LIKE CONCAT('%', #{keyword}, '%') OR k.`name` LIKE CONCAT('%', #{keyword}, '%') OR k.`spec_summary` LIKE CONCAT('%', #{keyword}, '%') OR k.`barcode` LIKE CONCAT('%', #{keyword}, '%'))</if>
 		ORDER BY p.`sort`, p.`name`, p.`code`, k.`sort`, k.`name`, k.`code`
 		LIMIT #{offset}, #{limit}
 	</select>
@@ -57,7 +57,7 @@
 			AND p.`stock_enabled` = 1
 			AND k.`stock_enabled` = 1 AND k.`status` = 'ACTIVE'
 			<if test="storeId != null and storeId != ''">AND p.`store_id` = #{storeId}</if>
-			<if test="keyword != null and keyword.trim() != ''">AND (p.`code` LIKE CONCAT('%', #{keyword}, '%') OR p.`name` LIKE CONCAT('%', #{keyword}, '%'))</if>
+			<if test="keyword != null and keyword.trim() != ''">AND (p.`code` LIKE CONCAT('%', #{keyword}, '%') OR p.`name` LIKE CONCAT('%', #{keyword}, '%') OR p.`name_pinyin_full` LIKE CONCAT(#{keyword}, '%') OR p.`name_pinyin_initial` LIKE CONCAT(#{keyword}, '%') OR p.`name_pinyin_mixed` LIKE CONCAT(#{keyword}, '%'))</if>
 	</select>
 	<select id="selectProductByQuery" resultType="com.imyeyu.api.modules.gao.vo.GaoProductStockProductView">
 		SELECT p.`id` AS `product_id`,
@@ -79,7 +79,7 @@
 			AND p.`stock_enabled` = 1
 			AND k.`stock_enabled` = 1 AND k.`status` = 'ACTIVE'
 			<if test="storeId != null and storeId != ''">AND p.`store_id` = #{storeId}</if>
-			<if test="keyword != null and keyword.trim() != ''">AND (p.`code` LIKE CONCAT('%', #{keyword}, '%') OR p.`name` LIKE CONCAT('%', #{keyword}, '%'))</if>
+			<if test="keyword != null and keyword.trim() != ''">AND (p.`code` LIKE CONCAT('%', #{keyword}, '%') OR p.`name` LIKE CONCAT('%', #{keyword}, '%') OR p.`name_pinyin_full` LIKE CONCAT(#{keyword}, '%') OR p.`name_pinyin_initial` LIKE CONCAT(#{keyword}, '%') OR p.`name_pinyin_mixed` LIKE CONCAT(#{keyword}, '%'))</if>
 		GROUP BY p.`id`, p.`code`, p.`name`, p.`product_type`, p.`sort`
 		ORDER BY p.`sort`, p.`name`, p.`code`
 		LIMIT #{offset}, #{limit}

src/main/resources/mapper/timi-server/gao/GaoProductStockRecordMapper.xml

@@ -31,7 +31,7 @@
 		1 = 1
 		<if test="storeId != null and storeId != ''">AND r.`store_id` = #{storeId}</if>
 		<if test="productId != null and productId != ''">AND k.`product_id` = #{productId}</if>
-		<if test="keyword != null and keyword.trim() != ''">AND (r.`product_name_snapshot` LIKE CONCAT('%', #{keyword}, '%') OR p.`name` LIKE CONCAT('%', #{keyword}, '%') OR p.`code` LIKE CONCAT('%', #{keyword}, '%'))</if>
+		<if test="keyword != null and keyword.trim() != ''">AND (r.`product_name_snapshot` LIKE CONCAT('%', #{keyword}, '%') OR p.`name` LIKE CONCAT('%', #{keyword}, '%') OR p.`name_pinyin_full` LIKE CONCAT(#{keyword}, '%') OR p.`name_pinyin_initial` LIKE CONCAT(#{keyword}, '%') OR p.`name_pinyin_mixed` LIKE CONCAT(#{keyword}, '%') OR p.`code` LIKE CONCAT('%', #{keyword}, '%'))</if>
 		<if test="bizType != null">AND r.`biz_type` = #{bizType}</if>
 		<if test="bizId != null and bizId != ''">AND r.`biz_id` = #{bizId}</if>
 		<if test="operationType != null">AND r.`operation_type` = #{operationType}</if>