midway-fatcms 0.0.17 → 0.0.18

package/dist/libs/crud-pro/services/CrudProDataTypeConvertService.d.ts

@@ -2,46 +2,11 @@ import { CrudProServiceBase } from './CrudProServiceBase';
 import { RequestModel } from '../models/RequestModel';
 import { RequestCfgModel } from '../models/RequestCfgModel';
 /**
- * 鏁版嵁绫诲瀷杞崲鏈嶅姟
- * 鏍规嵁琛ㄧ粨鏋勫瓧娈电被鍨嬶紝鑷姩杞崲鏁版嵁鏍煎紡锛岀‘淇濇暟鎹笌鏁版嵁搴撴柟瑷€鍏煎锛岄槻姝㈤殣寮忕被鍨嬭浆鎹㈠鑷寸储寮曞け鏁?
- *
- * 鎸夋暟鎹簱鍒嗙被锛?
- * - PostgreSQL 涓撴湁锛欰RRAY 鍒?鈫?PG 鏁扮粍瀛楅潰閲?
- * - 涓夊簱閫氱敤锛堝€肩被鍨嬮┍鍔級锛氬璞?鏁扮粍 鈫?JSON.stringify()锛岃鐩?json/jsonb/longtext瀛楯SON 绛夋墍鏈夊満鏅?
- * - 涓夊簱閫氱敤锛氭煡璇㈡潯浠剁被鍨嬪己杞紝闃叉绱㈠紩澶辨晥
+ * 数据类型转换服务
+ * data/condition 类型强转、PG ARRAY 字面量、对象/数组 JSON 序列化
  */
 declare class CrudProDataTypeConvertService extends CrudProServiceBase {
-    /**
-     * INSERT/UPDATE 鏃讹細鏍规嵁琛ㄧ粨鏋勫瓧娈电被鍨嬭嚜鍔ㄨ浆鎹?reqModel.data 涓殑鏁版嵁鏍煎紡
-     *
-     * 瀹炵幇姝ラ锛?
-     * 1. 鍒ゆ柇鎿嶄綔绫诲瀷鏄惁涓?INSERT/UPDATE锛屽惁鍒欒烦杩?
-     * 2. PostgreSQL锛氳幏鍙栬〃鍏冩暟鎹紝璇嗗埆 ARRAY 绫诲瀷瀛楁锛屽皢 JS 鏁扮粍杞负 PG 鏁扮粍瀛楅潰閲?
-     * 3. 涓夊簱閫氱敤锛氶亶鍘?data 涓墍鏈夊€硷紝灏嗗璞?鏁扮粍鑷姩 JSON.stringify()
-     *    涓嶄緷璧栧垪绫诲瀷鍒ゆ柇锛屽洜涓?longtext/varchar 绛夐潪 JSON 鍒椾篃鍙兘瀛?JSON 瀵硅薄
-     *
-     * @param reqModel 璇锋眰妯″瀷
-     * @param cfgModel 閰嶇疆妯″瀷
-     */
     convertDataTypeByTableMeta(reqModel: RequestModel, cfgModel: RequestCfgModel): Promise<void>;
-    /**
-     * SELECT/DELETE/UPDATE 鏃讹細鏍规嵁琛ㄧ粨鏋勫瓧娈电被鍨嬭嚜鍔ㄨ浆鎹?condition 涓殑鏁版嵁鏍煎紡
-     * 闃叉鏁版嵁搴撻殣寮忕被鍨嬭浆鎹㈠鑷寸储寮曞け鏁堬紙MySQL / PostgreSQL / SQL Server 涓夊簱閫氱敤锛?
-     *
-     * 瀹炵幇姝ラ锛?
-     * 1. 鍒ゆ柇鎿嶄綔绫诲瀷鏄惁涓烘煡璇?鍒犻櫎/鏇存柊锛堣繖浜涙搷浣滃寘鍚?WHERE 鏉′欢锛?
-     * 2. 鑾峰彇琛ㄥ厓鏁版嵁锛屾瀯寤哄瓧娈靛悕鈫掔被鍨嬫槧灏?
-     * 3. 閫掑綊閬嶅巻 condition锛堟敮鎸?$or/$and 宓屽锛夛紝鎸夊瓧娈电被鍨嬭浆鎹㈠€?
-     *
-     * 杞崲瑙勫垯锛堝弻鍚戜繚鎶わ紝浠呭鐞嗘渶甯稿缓绱㈠紩鐨勫垪绫诲瀷锛夛細
-     * - 鏁存暟鍒?int/bigint/smallint/tinyint/mediumint) + 瀛楃涓插€?鈫?number
-     * - 鏁存暟鍒?+ 甯冨皵鍊?鈫?0/1
-     * - 瀛楃涓插垪(varchar/char/text绛? + 鏁板瓧鍊?鈫?string
-     * - 瀛楃涓插垪 + 甯冨皵鍊?鈫?string
-     *
-     * @param reqModel 璇锋眰妯″瀷
-     * @param cfgModel 閰嶇疆妯″瀷
-     */
     convertConditionTypeByTableMeta(reqModel: RequestModel, cfgModel: RequestCfgModel): Promise<void>;
 }
 export { CrudProDataTypeConvertService };

package/dist/libs/crud-pro/services/CrudProDataTypeConvertService.js

@@ -3,14 +3,16 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.CrudProDataTypeConvertService = void 0;
 const CrudProServiceBase_1 = require("./CrudProServiceBase");
 const keys_1 = require("../models/keys");
-// ============ 甯搁噺瀹氫箟 ============
-/** 棰勭紪璇戞鍒欙細鏁存暟绫诲瀷锛圡ySQL/PostgreSQL/SQL Server锛?*/
+// ============ 常量定义 ============
+/** 整数类型正则（MySQL/PostgreSQL/SQL Server） */
 const REGEX_INTEGER_TYPE = /^(int|int2|int4|int8|bigint|smallint|smallserial|tinyint|mediumint|integer|serial|bigserial)/;
-/** 棰勭紪璇戞鍒欙細BIGINT绫诲瀷锛圡ySQL/PostgreSQL/SQL Server锛?*/
+/** BIGINT 类型正则 */
 const REGEX_BIGINT_TYPE = /^(bigint|int8|bigserial)/;
-/** 棰勭紪璇戞鍒欙細瀛楃涓茬被鍨嬶紙MySQL/PostgreSQL/SQL Server锛?*/
+/** 字符串类型正则（MySQL/PostgreSQL/SQL Server） */
 const REGEX_STRING_TYPE = /^(varchar|char|text|longtext|mediumtext|tinytext|nvarchar|nchar|ntext|character varying|character)/;
-/** 鍖呭惈 WHERE 鏉′欢鐨勬搷浣滅被鍨嬮泦鍚堬紙鏌ヨ/鍒犻櫎/鏇存柊锛?*/
+/** PG / MySQL 原生 boolean 列名 */
+const REGEX_NATIVE_BOOLEAN_TYPE = /^(boolean|bool)$/;
+/** 含 WHERE 条件的操作类型（查询/删除/更新） */
 const CONDITION_TYPES = new Set([
     keys_1.KeysOfSimpleSQL.SIMPLE_QUERY,
     keys_1.KeysOfSimpleSQL.SIMPLE_QUERY_ONE,
@@ -20,7 +22,7 @@ const CONDITION_TYPES = new Set([
     keys_1.KeysOfSimpleSQL.SIMPLE_DELETE,
     keys_1.KeysOfSimpleSQL.SIMPLE_UPDATE,
 ]);
-/** INSERT/UPDATE 鎿嶄綔绫诲瀷闆嗗悎 */
+/** INSERT/UPDATE 操作类型 */
 const INSERT_OR_UPDATE_TYPES = new Set([
     keys_1.KeysOfSimpleSQL.SIMPLE_INSERT,
     keys_1.KeysOfSimpleSQL.SIMPLE_UPDATE,
@@ -28,34 +30,50 @@ const INSERT_OR_UPDATE_TYPES = new Set([
     keys_1.KeysOfSimpleSQL.SIMPLE_INSERT_OR_UPDATE,
     keys_1.KeysOfSimpleSQL.SIMPLE_BATCH_INSERT,
 ]);
-// ============ 鍏叡宸ュ叿鍑芥暟 ============
-/** 鍒ゆ柇瀛楁绫诲瀷鏄惁涓烘暣鏁扮被鍨嬶紙瑕嗙洊 MySQL/PostgreSQL/SQL Server锛?*/
+// ============ 工具函数 ============
 function isIntegerType(type) {
     return REGEX_INTEGER_TYPE.test(type);
 }
-/** 鍒ゆ柇瀛楁绫诲瀷鏄惁涓?BIGINT 绫诲瀷锛圝S Number 绮惧害涓嶅锛宑ondition 鍊间笉杞崲锛?*/
+/** BIGINT 列不转 number，避免 JS 精度丢失 */
 function isBigintType(type) {
     return REGEX_BIGINT_TYPE.test(type);
 }
-/** 鍒ゆ柇瀛楁绫诲瀷鏄惁涓哄瓧绗︿覆绫诲瀷锛堣鐩?MySQL/PostgreSQL/SQL Server锛?*/
 function isStringType(type) {
     return REGEX_STRING_TYPE.test(type);
 }
-/** 鍒ゆ柇 sqlSimpleName 鏄惁涓哄寘鍚?WHERE 鏉′欢鐨勬搷浣滅被鍨嬶紙鏌ヨ/鍒犻櫎/鏇存柊锛?*/
+/** 驱动原生支持 JS boolean 绑定的列：PG boolean；SQL Server bit（MySQL tinyint(1) 仍转 0/1） */
+function shouldKeepBooleanValue(type, sqlDbType) {
+    const t = type.toLowerCase().trim();
+    if (sqlDbType === keys_1.SqlDbType.postgres && REGEX_NATIVE_BOOLEAN_TYPE.test(t)) {
+        return true;
+    }
+    if (sqlDbType === keys_1.SqlDbType.sqlserver && t === 'bit') {
+        return true;
+    }
+    return false;
+}
+/** MySQL 布尔列（boolean/bool/tinyint(1)），底层存 0/1，需转 number */
+function isMysqlBooleanColumn(type) {
+    const t = type.toLowerCase().trim();
+    return REGEX_NATIVE_BOOLEAN_TYPE.test(t) || /^tinyint\s*\(\s*1\s*\)/.test(t);
+}
+/** 需转为 number 的整型列（含 MySQL boolean/bool/tinyint(1)）；排除 BIGINT，避免 JS 精度丢失 */
+function isIntegerLikeColumn(type, sqlDbType) {
+    if (isIntegerType(type) && !isBigintType(type)) {
+        return true;
+    }
+    return sqlDbType === keys_1.SqlDbType.mysql && isMysqlBooleanColumn(type);
+}
 function isConditionType(sqlSimpleName) {
     return !!sqlSimpleName && CONDITION_TYPES.has(sqlSimpleName);
 }
-/** 鍒ゆ柇鍊兼槸鍚︿负鍩烘湰绫诲瀷锛坰tring | number | boolean锛?*/
 function isBasicType(value) {
     return typeof value === 'string' || typeof value === 'number' || typeof value === 'boolean';
 }
-/** 鍒ゆ柇 sqlSimpleName 鏄惁涓?INSERT/UPDATE 绫诲瀷 */
 function isInsertOrUpdateType(sqlSimpleName) {
     return !!sqlSimpleName && INSERT_OR_UPDATE_TYPES.has(sqlSimpleName);
 }
-/**
- * 鑾峰彇琛ㄥ厓鏁版嵁锛岃幏鍙栧け璐ユ椂杈撳嚭 warn 鏃ュ織骞惰繑鍥?null
- */
+/** 获取表元数据，失败时 warn 并返回 null */
 async function getTableMetaOrWarn(serviceHub, logger, cfgModel, actionName) {
     const query = {
         sqlTable: cfgModel.sqlTable,
@@ -65,33 +83,66 @@ async function getTableMetaOrWarn(serviceHub, logger, cfgModel, actionName) {
     };
     const tableMeta = await serviceHub.getTableMeta(query);
     if (!tableMeta || !tableMeta.columnDetails || tableMeta.columnDetails.length === 0) {
-        logger.warn('CrudProDataTypeConvertService: 鏃犳硶鑾峰彇琛ㄧ粨鏋勪俊鎭紝璺宠繃' + actionName, cfgModel.sqlTable);
+        logger.warn('CrudProDataTypeConvertService: 无法获取表结构信息，跳过' + actionName, cfgModel.sqlTable);
         return null;
     }
     return tableMeta;
 }
-// ============ Data 杞崲澶勭悊鍣?============
+function buildColumnTypeMap(tableMeta) {
+    const typeMap = new Map();
+    for (const col of tableMeta.columnDetails) {
+        typeMap.set(col.name, ('' + col.type).toLowerCase());
+    }
+    return typeMap;
+}
 /**
- * INSERT/UPDATE 鏁版嵁杞崲澶勭悊鍣?
- * 璐熻矗 data 鐨勭被鍨嬭浆鎹細PG ARRAY 瀛楅潰閲忋€佸璞?鏁扮粍 JSON 搴忓垪鍖?
+ * 按字段类型转换单个值：
+ * PG boolean / SS bit 保持 boolean；整数列（含 MySQL tinyint(1)）boolean→0/1；字符串列 number/boolean→string
  */
+function convertBasicValueByFieldType(value, fieldType, sqlDbType) {
+    if (value === null || value === undefined) {
+        return value;
+    }
+    const valueType = typeof value;
+    // PG boolean / SS bit：驱动原生支持 boolean 绑定
+    if (valueType === 'boolean' && shouldKeepBooleanValue(fieldType, sqlDbType)) {
+        return value;
+    }
+    // 非 BIGINT 整型列（含 MySQL boolean/bool/tinyint(1)）：string→number；boolean→0/1
+    // BIGINT 不在此转换，由驱动参数化在 DB 端匹配，避免雪花 ID 等精度丢失
+    if (isIntegerLikeColumn(fieldType, sqlDbType)) {
+        if (valueType === 'string') {
+            const num = Number(value);
+            if (!isNaN(num) && Number.isInteger(num)) {
+                // 超 MAX_SAFE_INTEGER 保持 string，避免精度丢失
+                if (num > Number.MAX_SAFE_INTEGER || num < -Number.MAX_SAFE_INTEGER) {
+                    return value;
+                }
+                return num;
+            }
+        }
+        if (valueType === 'boolean') {
+            return value ? 1 : 0;
+        }
+    }
+    if (isStringType(fieldType)) {
+        if (valueType === 'number') {
+            return '' + value;
+        }
+        if (valueType === 'boolean') {
+            return value ? 'true' : 'false';
+        }
+    }
+    return value;
+}
+// ============ Data 转换 ============
+/** INSERT/UPDATE 数据转换：类型强转、PG ARRAY 字面量、对象/数组 JSON 序列化 */
 class DataConvertHandler {
     constructor(serviceHub, logger) {
         this.serviceHub = serviceHub;
         this.logger = logger;
     }
-    /**
-     * INSERT/UPDATE 鏃讹細鏍规嵁琛ㄧ粨鏋勫瓧娈电被鍨嬭嚜鍔ㄨ浆鎹?reqModel.data 涓殑鏁版嵁鏍煎紡
-     *
-     * 瀹炵幇姝ラ锛?
-     * 1. 鍒ゆ柇鎿嶄綔绫诲瀷鏄惁涓?INSERT/UPDATE锛屽惁鍒欒烦杩?
-     * 2. PostgreSQL锛氳幏鍙栬〃鍏冩暟鎹紝璇嗗埆 ARRAY 绫诲瀷瀛楁锛屽皢 JS 鏁扮粍杞负 PG 鏁扮粍瀛楅潰閲?
-     * 3. 涓夊簱閫氱敤锛氶亶鍘?data 涓墍鏈夊€硷紝灏嗗璞?鏁扮粍鑷姩 JSON.stringify()
-     *    涓嶄緷璧栧垪绫诲瀷鍒ゆ柇锛屽洜涓?longtext/varchar 绛夐潪 JSON 鍒椾篃鍙兘瀛?JSON 瀵硅薄
-     *
-     * @param reqModel 璇锋眰妯″瀷
-     * @param cfgModel 閰嶇疆妯″瀷
-     */
+    /** 按表字段类型转换 reqModel.data */
     async convertDataTypeByTableMeta(reqModel, cfgModel) {
         if (!isInsertOrUpdateType(cfgModel.sqlSimpleName)) {
             return;
@@ -101,10 +152,19 @@ class DataConvertHandler {
         }
         const data = reqModel.data;
         const isBatch = Array.isArray(data);
-        // ---- PostgreSQL 涓撴湁锛欰RRAY 绫诲瀷杞崲锛堥渶瑕佽〃鍏冩暟鎹瘑鍒?ARRAY 鍒楋級 ----
-        if (cfgModel.sqlDbType === keys_1.SqlDbType.postgres) {
-            const tableMeta = await getTableMetaOrWarn(this.serviceHub, this.logger, cfgModel, 'PG ARRAY杞崲');
-            if (tableMeta) {
+        const tableMeta = await getTableMetaOrWarn(this.serviceHub, this.logger, cfgModel, 'data类型转换');
+        if (tableMeta) {
+            const typeMap = buildColumnTypeMap(tableMeta);
+            // 按列类型强转基础值（boolean 等适配实际 DB 字段）
+            if (isBatch) {
+                for (const row of data)
+                    this.convertDataFieldsByType(row, typeMap, cfgModel.sqlDbType);
+            }
+            else {
+                this.convertDataFieldsByType(data, typeMap, cfgModel.sqlDbType);
+            }
+            // PostgreSQL：ARRAY 列 JS 数组 → PG 数组字面量
+            if (cfgModel.sqlDbType === keys_1.SqlDbType.postgres) {
                 const arrayFieldSet = new Set();
                 for (const col of tableMeta.columnDetails) {
                     if (('' + col.type).toLowerCase() === 'array') {
@@ -122,9 +182,7 @@ class DataConvertHandler {
                 }
             }
         }
-        // ---- 涓夊簱閫氱敤锛氬璞?鏁扮粍鍊艰嚜鍔?JSON 搴忓垪鍖?----
-        // 涓嶄緷璧栧垪绫诲瀷鍒ゆ柇锛歭ongtext/varchar 瀛?JSON銆丮ySQL json銆丳G jsonb 绛夊満鏅粺涓€瑕嗙洊
-        // PG ARRAY 鍒楃殑鍊煎凡鍦ㄤ笂闈㈡楠よ浆涓哄瓧绗︿覆锛屾澶勪笉浼氳搴忓垪鍖?
+        // 三库通用：对象/数组 → JSON.stringify（不依赖列类型）
         if (isBatch) {
             for (const row of data)
                 this.serializeObjectValues(row);
@@ -133,13 +191,27 @@ class DataConvertHandler {
             this.serializeObjectValues(data);
         }
     }
-    // ---- PostgreSQL 涓撴湁锛欰RRAY 鍒楄浆鎹?----
-    /**
-     * 閬嶅巻鏁版嵁瀵硅薄涓殑 PG ARRAY 绫诲瀷瀛楁锛屽皢 JS 鏁扮粍杞负 PG 鏁扮粍瀛楅潰閲忔牸寮?
-     *
-     * 杞崲娴佺▼锛欽S 鏁扮粍 鈫?tryParseArray() 鈫?toPgArrayLiteral() 鈫?PG 鏁扮粍瀛楅潰閲?
-     * 渚嬶細[1, 2, 3] 鈫?'{1,2,3}'锛孾"a", "b"] 鈫?'{"a","b"}'
-     */
+    /** 按表字段类型转换 data 中的基础类型值 */
+    convertDataFieldsByType(dataObj, typeMap, sqlDbType) {
+        for (const key of Object.keys(dataObj)) {
+            const value = dataObj[key];
+            if (value === null || value === undefined) {
+                continue;
+            }
+            // $sqlFunc 表达式由 SqlFuncUtils 在 SQL 生成阶段处理
+            if (typeof value === 'object' && typeof value['$sqlFunc'] === 'string') {
+                continue;
+            }
+            const fieldType = typeMap.get(key);
+            if (!fieldType) {
+                continue;
+            }
+            if (isBasicType(value)) {
+                dataObj[key] = convertBasicValueByFieldType(value, fieldType, sqlDbType);
+            }
+        }
+    }
+    /** JS 数组 → PG 数组字面量，如 [1,2,3] → '{1,2,3}' */
     convertPgArrayFields(dataObj, arrayFieldSet) {
         const keys = Object.keys(dataObj);
         for (const key of keys) {
@@ -153,10 +225,7 @@ class DataConvertHandler {
             }
         }
     }
-    /**
-     * 灏濊瘯灏嗗€艰В鏋愪负鏁扮粍
-     * 鏀寔锛氭暟缁勫璞°€丣SON 鏁扮粍瀛楃涓诧紙濡?'["a","b"]'锛?
-     */
+    /** 解析为数组，支持数组对象和 JSON 数组字符串 */
     tryParseArray(value) {
         if (value === null || value === undefined) {
             return null;
@@ -177,16 +246,7 @@ class DataConvertHandler {
         }
         return null;
     }
-    /**
-     * 灏?JS 鏁扮粍杞负 PostgreSQL 鏁扮粍瀛楅潰閲忔牸寮?
-     *
-     * PG 鏁扮粍瀛楅潰閲忚鍒欙細
-     * - 瀛楃涓诧細鍙屽紩鍙峰寘瑁癸紝鍐呴儴 " 杞箟涓?\"锛孿 杞箟涓?\\   渚嬶細{"hello","world"}
-     * - 鏁板瓧锛氫笉鍔犲紩鍙?                                                   渚嬶細{1,2,3}
-     * - 甯冨皵锛氳浆涓?t/f 涓嶅姞寮曞彿                                           渚嬶細{t,f}
-     * - null/undefined锛氳緭鍑?NULL 涓嶅姞寮曞彿                                渚嬶細{1,NULL,3}
-     * - 绌烘暟缁勶細杈撳嚭 {}
-     */
+    /** JS 数组 → PG 数组字面量格式 */
     toPgArrayLiteral(arr) {
         if (arr.length === 0) {
             return '{}';
@@ -194,7 +254,7 @@ class DataConvertHandler {
         const items = arr.map(v => this.toPgArrayItem(v));
         return '{' + items.join(',') + '}';
     }
-    /** 灏嗗崟涓?JS 鍊艰浆涓?PG 鏁扮粍鍏冪礌鐨勫瓧闈㈤噺琛ㄧず */
+    /** 单个值 → PG 数组元素字面量 */
     toPgArrayItem(value) {
         if (value === null || value === undefined) {
             return 'NULL';
@@ -205,27 +265,12 @@ class DataConvertHandler {
         if (typeof value === 'boolean') {
             return value ? 't' : 'f';
         }
-        // 瀛楃涓插強鍏跺畠绫诲瀷锛氳浆涔夊悗鐢ㄥ弻寮曞彿鍖呰９
         const escaped = ('' + value)
             .replace(/\\/g, '\\\\')
             .replace(/"/g, '\\"');
         return '"' + escaped + '"';
     }
-    // ---- 涓夊簱閫氱敤锛氬璞?鏁扮粍鍊艰嚜鍔?JSON 搴忓垪鍖?----
-    /**
-     * 閬嶅巻鏁版嵁瀵硅薄涓殑鎵€鏈夊€硷紝灏嗗璞?鏁扮粍鑷姩搴忓垪鍖栦负 JSON 瀛楃涓?
-     *
-     * 涓嶄緷璧栧垪绫诲瀷鍒ゆ柇锛屽師鍥狅細
-     * - longtext/varchar 鍒椾篃鍙兘瀛?JSON 瀵硅薄锛屾寜鍒楃被鍨嬭繃婊や細婕忔帀
-     * - 鍙鍊兼槸瀵硅薄鎴栨暟缁勶紝椹卞姩閮芥棤娉曠洿鎺ュ鐞嗭紙.toString() 杈撳嚭 [object Object]锛夛紝
-     *   鍞竴鍚堢悊鐨勬搷浣滃氨鏄?JSON.stringify()
-     *
-     * 杞崲瑙勫垯锛?
-     * - 瀵硅薄锛坱ypeof === 'object' 涓旈潪 null銆侀潪 Date銆侀潪 Buffer锛夆啋 JSON.stringify()
-     * - 鏁扮粍锛圥G ARRAY 鍒楃殑鍊煎凡鍦ㄥ墠闈㈡楠よ浆涓哄瓧绗︿覆锛屾澶勯亣鍒扮殑閮芥槸闇€瑕佸簭鍒楀寲鐨勬櫘閫氭暟缁勶級鈫?JSON.stringify()
-     * - 宸茬粡鏄瓧绗︿覆鐨勫€间笉閲嶅搴忓垪鍖栵紙璋冪敤鏂瑰彲鑳藉凡鎵嬪姩 JSON.stringify()锛?
-     * - null / undefined / Date / Buffer 涓嶅鐞?
-     */
+    /** 对象/数组 → JSON 字符串，跳过 $sqlFunc、Date、Buffer */
     serializeObjectValues(dataObj) {
         const keys = Object.keys(dataObj);
         for (const key of keys) {
@@ -233,55 +278,31 @@ class DataConvertHandler {
             if (value === null || value === undefined) {
                 continue;
             }
-            // 宸茬粡鏄瓧绗︿覆锛岃鏄庤皟鐢ㄦ柟宸叉墜鍔?JSON.stringify()锛屼笉閲嶅搴忓垪鍖?
             if (typeof value === 'string') {
                 continue;
             }
-            // 璺宠繃 $sqlFunc 琛ㄨ揪寮忓璞★紙INC/DEC/MUL/NOW 绛夛級锛屼笉鍋?JSON.stringify
-            // 杩欑被瀵硅薄灏嗗湪 SQL 鐢熸垚闃舵鐢?SqlFuncUtils 瑙ｆ瀽涓?SQL 鐗囨
+            // $sqlFunc 表达式由 SqlFuncUtils 在 SQL 生成阶段处理
             if (typeof value === 'object' && typeof value['$sqlFunc'] === 'string') {
                 continue;
             }
-            // 鏁扮粍锛歅G ARRAY 鍒楀凡鍦ㄥ墠搴忔楠よ浆涓?PG 鏁扮粍瀛楅潰閲忓瓧绗︿覆锛屾澶勯亣鍒扮殑鍧囦负闇€搴忓垪鍖栫殑鏅€氭暟缁?
             if (Array.isArray(value)) {
                 dataObj[key] = JSON.stringify(value);
                 continue;
             }
-            // 绾璞★紙闈?Date銆侀潪 Buffer锛夆啋 搴忓垪鍖?
             if (typeof value === 'object' && !(value instanceof Date) && !Buffer.isBuffer(value)) {
                 dataObj[key] = JSON.stringify(value);
             }
         }
     }
 }
-// ============ Condition 杞崲澶勭悊鍣?============
-/**
- * SELECT/DELETE/UPDATE 鏉′欢杞崲澶勭悊鍣?
- * 璐熻矗 condition 鐨勭被鍨嬪己杞紝闃叉闅愬紡绫诲瀷杞崲瀵艰嚧绱㈠紩澶辨晥
- */
+// ============ Condition 转换 ============
+/** 查询/删除/更新条件类型强转，防止隐式转换导致索引失效 */
 class ConditionConvertHandler {
     constructor(serviceHub, logger) {
         this.serviceHub = serviceHub;
         this.logger = logger;
     }
-    /**
-     * SELECT/DELETE/UPDATE 鏃讹細鏍规嵁琛ㄧ粨鏋勫瓧娈电被鍨嬭嚜鍔ㄨ浆鎹?condition 涓殑鏁版嵁鏍煎紡
-     * 闃叉鏁版嵁搴撻殣寮忕被鍨嬭浆鎹㈠鑷寸储寮曞け鏁堬紙MySQL / PostgreSQL / SQL Server 涓夊簱閫氱敤锛?
-     *
-     * 瀹炵幇姝ラ锛?
-     * 1. 鍒ゆ柇鎿嶄綔绫诲瀷鏄惁涓烘煡璇?鍒犻櫎/鏇存柊锛堣繖浜涙搷浣滃寘鍚?WHERE 鏉′欢锛?
-     * 2. 鑾峰彇琛ㄥ厓鏁版嵁锛屾瀯寤哄瓧娈靛悕鈫掔被鍨嬫槧灏?
-     * 3. 閫掑綊閬嶅巻 condition锛堟敮鎸?$or/$and 宓屽锛夛紝鎸夊瓧娈电被鍨嬭浆鎹㈠€?
-     *
-     * 杞崲瑙勫垯锛堝弻鍚戜繚鎶わ紝浠呭鐞嗘渶甯稿缓绱㈠紩鐨勫垪绫诲瀷锛夛細
-     * - 鏁存暟鍒?int/bigint/smallint/tinyint/mediumint) + 瀛楃涓插€?鈫?number
-     * - 鏁存暟鍒?+ 甯冨皵鍊?鈫?0/1
-     * - 瀛楃涓插垪(varchar/char/text绛? + 鏁板瓧鍊?鈫?string
-     * - 瀛楃涓插垪 + 甯冨皵鍊?鈫?string
-     *
-     * @param reqModel 璇锋眰妯″瀷
-     * @param cfgModel 閰嶇疆妯″瀷
-     */
+    /** 按表字段类型转换 reqModel.condition */
     async convertConditionTypeByTableMeta(reqModel, cfgModel) {
         if (!isConditionType(cfgModel.sqlSimpleName)) {
             return;
@@ -289,33 +310,20 @@ class ConditionConvertHandler {
         if (!reqModel.condition || Object.keys(reqModel.condition).length === 0) {
             return;
         }
-        const tableMeta = await getTableMetaOrWarn(this.serviceHub, this.logger, cfgModel, '鏉′欢绫诲瀷杞崲');
+        const tableMeta = await getTableMetaOrWarn(this.serviceHub, this.logger, cfgModel, '条件类型转换');
         if (!tableMeta) {
             return;
         }
-        // 鏋勫缓瀛楁鍚嶁啋绫诲瀷鏄犲皠锛堝叏灏忓啓渚夸簬鍖归厤锛?
-        const typeMap = new Map();
-        for (const col of tableMeta.columnDetails) {
-            typeMap.set(col.name, ('' + col.type).toLowerCase());
-        }
+        const typeMap = buildColumnTypeMap(tableMeta);
         this.convertConditionFields(reqModel.condition, typeMap, cfgModel.sqlDbType);
     }
-    /**
-     * 閫掑綊閬嶅巻 condition锛屽姣忎釜瀛楁鍊煎仛绫诲瀷杞崲
-     *
-     * 瀹炵幇姝ラ锛?
-     * 1. 閬嶅巻 condition 鐨勬瘡涓?key
-     * 2. 鑻?key 涓?$or/$and 閫昏緫鎿嶄綔绗︼紝閫掑綊澶勭悊瀛愭潯浠舵暟缁?
-     * 3. 鑻?key 涓哄瓧娈靛悕涓斿€间负鍩烘湰绫诲瀷锛岀洿鎺ヨ浆鎹?
-     * 4. 鑻?key 涓哄瓧娈靛悕涓斿€间负姣旇緝鎿嶄綔绗﹀璞?$gt/$in绛?锛岄亶鍘嗘搷浣滅閫愬€艰浆鎹?
-     */
+    /** 递归遍历 condition，支持 $or/$and 嵌套 */
     convertConditionFields(condition, typeMap, sqlDbType) {
         if (!condition || typeof condition !== 'object') {
             return;
         }
         for (const key of Object.keys(condition)) {
             const value = condition[key];
-            // $or / $and 閫昏緫鎿嶄綔绗︼細閫掑綊澶勭悊姣忎釜瀛愭潯浠?
             if (key === keys_1.KeysOfConditions.$OR || key === keys_1.KeysOfConditions.$AND) {
                 if (Array.isArray(value)) {
                     for (const subCondition of value) {
@@ -324,132 +332,48 @@ class ConditionConvertHandler {
                 }
                 continue;
             }
-            // 濡傛灉 key 鏄瘮杈冩搷浣滅锛堝嚭鐜板湪鍐呭眰锛夛紝璺宠繃
             if (keys_1.KeysOfConditions.COMPARE_KEYS.has(key)) {
                 continue;
             }
-            // key 鏄瓧娈靛悕
             const fieldType = typeMap.get(key);
             if (!fieldType) {
-                continue; // condition 涓紩鐢ㄧ殑瀛楁涓嶅湪琛ㄧ粨鏋勪腑锛屼笉鍋氳浆鎹?
+                continue;
             }
             if (isBasicType(value)) {
-                // 绠€鍗曠瓑鍊兼潯浠讹細{ age: "18" } 鈫?{ age: 18 }
-                condition[key] = this.convertValueByType(value, fieldType, sqlDbType);
+                condition[key] = convertBasicValueByFieldType(value, fieldType, sqlDbType);
             }
             else if (typeof value === 'object' && value !== null && !Array.isArray(value)) {
-                // 姣旇緝鎿嶄綔绗︽潯浠讹細{ age: { "$gt": "18", "$lt": "30" } }
                 for (const opKey of Object.keys(value)) {
                     if (keys_1.KeysOfConditions.COMPARE_KEYS.has(opKey)) {
                         const opValue = value[opKey];
                         if (opKey === keys_1.KeysOfConditions.$IN || opKey === keys_1.KeysOfConditions.$NIN) {
-                            // $in/$nin 鐨勫€兼槸鏁扮粍锛岄€愪釜杞崲
                             if (Array.isArray(opValue)) {
-                                value[opKey] = opValue.map(v => this.convertValueByType(v, fieldType, sqlDbType));
+                                value[opKey] = opValue.map(v => convertBasicValueByFieldType(v, fieldType, sqlDbType));
                             }
                         }
                         else if (opKey === keys_1.KeysOfConditions.$RANGE) {
-                            // $range 鐨勫€兼槸 [min, max]
                             if (Array.isArray(opValue)) {
-                                value[opKey] = opValue.map(v => this.convertValueByType(v, fieldType, sqlDbType));
+                                value[opKey] = opValue.map(v => convertBasicValueByFieldType(v, fieldType, sqlDbType));
                             }
                         }
                         else {
-                            value[opKey] = this.convertValueByType(opValue, fieldType, sqlDbType);
+                            value[opKey] = convertBasicValueByFieldType(opValue, fieldType, sqlDbType);
                         }
                     }
                 }
             }
         }
     }
-    /**
-     * 鏍规嵁瀛楁绫诲瀷杞崲鍗曚釜鍊硷紝闃叉闅愬紡绫诲瀷杞崲瀵艰嚧绱㈠紩澶辨晥
-     *
-     * 杞崲瑙勫垯锛堝弻鍚戜繚鎶わ級锛?
-     * - 鏁存暟鍒?+ 瀛楃涓插€?鈫?number锛圵HERE int_col = '123' 绱㈠紩澶辨晥锛?
-     * - 鏁存暟鍒?+ 甯冨皵鍊?鈫?0/1
-     * - 瀛楃涓插垪 + 鏁板瓧鍊?鈫?string锛圵HERE varchar_col = 123 绱㈠紩澶辨晥锛?
-     * - 瀛楃涓插垪 + 甯冨皵鍊?鈫?string
-     */
-    convertValueByType(value, fieldType, sqlDbType) {
-        if (value === null || value === undefined) {
-            return value;
-        }
-        const valueType = typeof value;
-        // 鏁存暟鍒楋細string 鈫?number, boolean 鈫?0/1
-        // BIGINT 绫诲瀷涓嶈浆鎹紙isBigintType 鎺掗櫎锛夛紝鐢遍┍鍔ㄥ弬鏁板寲鏌ヨ鍦?DB 鏈嶅姟绔鐞嗙被鍨嬪尮閰嶏紝
-        // 閬垮厤 JS Number 绮惧害涓㈠け锛堥洩鑺盜D绾?2^41~2^63锛?
-        // 闈?BIGINT 鏁存暟鍒楃殑瀹夊叏缃戯細鑻ュ€兼剰澶栬秴杩?MAX_SAFE_INTEGER锛屼篃淇濇寔 string
-        if (isIntegerType(fieldType) && !isBigintType(fieldType)) {
-            if (valueType === 'string') {
-                const num = Number(value);
-                if (!isNaN(num) && Number.isInteger(num)) {
-                    if (num > Number.MAX_SAFE_INTEGER || num < -Number.MAX_SAFE_INTEGER) {
-                        return value; // 瓒呭畨鍏ㄦ暣鏁拌寖鍥达紝淇濇寔 string 閬垮厤绮惧害涓㈠け
-                    }
-                    return num;
-                }
-            }
-            if (valueType === 'boolean') {
-                return value ? 1 : 0;
-            }
-        }
-        // 瀛楃涓插垪锛歯umber 鈫?string, boolean 鈫?string
-        if (isStringType(fieldType)) {
-            if (valueType === 'number') {
-                return '' + value;
-            }
-            if (valueType === 'boolean') {
-                return value ? 'true' : 'false';
-            }
-        }
-        return value;
-    }
 }
-// ============ 鍏叡鍏ュ彛 ============
+// ============ 入口 ============
 /**
- * 鏁版嵁绫诲瀷杞崲鏈嶅姟
- * 鏍规嵁琛ㄧ粨鏋勫瓧娈电被鍨嬶紝鑷姩杞崲鏁版嵁鏍煎紡锛岀‘淇濇暟鎹笌鏁版嵁搴撴柟瑷€鍏煎锛岄槻姝㈤殣寮忕被鍨嬭浆鎹㈠鑷寸储寮曞け鏁?
- *
- * 鎸夋暟鎹簱鍒嗙被锛?
- * - PostgreSQL 涓撴湁锛欰RRAY 鍒?鈫?PG 鏁扮粍瀛楅潰閲?
- * - 涓夊簱閫氱敤锛堝€肩被鍨嬮┍鍔級锛氬璞?鏁扮粍 鈫?JSON.stringify()锛岃鐩?json/jsonb/longtext瀛楯SON 绛夋墍鏈夊満鏅?
- * - 涓夊簱閫氱敤锛氭煡璇㈡潯浠剁被鍨嬪己杞紝闃叉绱㈠紩澶辨晥
+ * 数据类型转换服务
+ * data/condition 类型强转、PG ARRAY 字面量、对象/数组 JSON 序列化
  */
 class CrudProDataTypeConvertService extends CrudProServiceBase_1.CrudProServiceBase {
-    /**
-     * INSERT/UPDATE 鏃讹細鏍规嵁琛ㄧ粨鏋勫瓧娈电被鍨嬭嚜鍔ㄨ浆鎹?reqModel.data 涓殑鏁版嵁鏍煎紡
-     *
-     * 瀹炵幇姝ラ锛?
-     * 1. 鍒ゆ柇鎿嶄綔绫诲瀷鏄惁涓?INSERT/UPDATE锛屽惁鍒欒烦杩?
-     * 2. PostgreSQL锛氳幏鍙栬〃鍏冩暟鎹紝璇嗗埆 ARRAY 绫诲瀷瀛楁锛屽皢 JS 鏁扮粍杞负 PG 鏁扮粍瀛楅潰閲?
-     * 3. 涓夊簱閫氱敤锛氶亶鍘?data 涓墍鏈夊€硷紝灏嗗璞?鏁扮粍鑷姩 JSON.stringify()
-     *    涓嶄緷璧栧垪绫诲瀷鍒ゆ柇锛屽洜涓?longtext/varchar 绛夐潪 JSON 鍒椾篃鍙兘瀛?JSON 瀵硅薄
-     *
-     * @param reqModel 璇锋眰妯″瀷
-     * @param cfgModel 閰嶇疆妯″瀷
-     */
     async convertDataTypeByTableMeta(reqModel, cfgModel) {
         return new DataConvertHandler(this.serviceHub, this.logger).convertDataTypeByTableMeta(reqModel, cfgModel);
     }
-    /**
-     * SELECT/DELETE/UPDATE 鏃讹細鏍规嵁琛ㄧ粨鏋勫瓧娈电被鍨嬭嚜鍔ㄨ浆鎹?condition 涓殑鏁版嵁鏍煎紡
-     * 闃叉鏁版嵁搴撻殣寮忕被鍨嬭浆鎹㈠鑷寸储寮曞け鏁堬紙MySQL / PostgreSQL / SQL Server 涓夊簱閫氱敤锛?
-     *
-     * 瀹炵幇姝ラ锛?
-     * 1. 鍒ゆ柇鎿嶄綔绫诲瀷鏄惁涓烘煡璇?鍒犻櫎/鏇存柊锛堣繖浜涙搷浣滃寘鍚?WHERE 鏉′欢锛?
-     * 2. 鑾峰彇琛ㄥ厓鏁版嵁锛屾瀯寤哄瓧娈靛悕鈫掔被鍨嬫槧灏?
-     * 3. 閫掑綊閬嶅巻 condition锛堟敮鎸?$or/$and 宓屽锛夛紝鎸夊瓧娈电被鍨嬭浆鎹㈠€?
-     *
-     * 杞崲瑙勫垯锛堝弻鍚戜繚鎶わ紝浠呭鐞嗘渶甯稿缓绱㈠紩鐨勫垪绫诲瀷锛夛細
-     * - 鏁存暟鍒?int/bigint/smallint/tinyint/mediumint) + 瀛楃涓插€?鈫?number
-     * - 鏁存暟鍒?+ 甯冨皵鍊?鈫?0/1
-     * - 瀛楃涓插垪(varchar/char/text绛? + 鏁板瓧鍊?鈫?string
-     * - 瀛楃涓插垪 + 甯冨皵鍊?鈫?string
-     *
-     * @param reqModel 璇锋眰妯″瀷
-     * @param cfgModel 閰嶇疆妯″瀷
-     */
     async convertConditionTypeByTableMeta(reqModel, cfgModel) {
         return new ConditionConvertHandler(this.serviceHub, this.logger).convertConditionTypeByTableMeta(reqModel, cfgModel);
     }

package/dist/libs/crud-pro/utils/MixinUtils.d.ts

@@ -1,20 +1,4 @@
-/**
- * 生成雪花ID（64位整数，JS 中以 string 返回）
- * 结构：1位符号 + 41位时间戳(ms) + 10位机器ID + 12位序列号
- * - 时间戳：相对于 2024-01-01 00:00:00 的毫秒偏移，可用约 69 年
- * - 机器ID：0-1023，优先取参数 > 环境变量 SNOWFLAKE_MACHINE_ID > process.pid 低10位
- * - 序列号：0-4095，同一毫秒内自增
- *
- * @param machineId 机器ID（0-1023），不传则依次从环境变量 SNOWFLAKE_MACHINE_ID、process.pid 获取
- * @returns 雪花ID字符串
- */
-declare function generateSnowflakeId(machineId?: number): string;
-/**
- * 生成 UUID v4 字符串（纯随机，无外部依赖）
- * 格式：xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx，其中 y 为 8/9/a/b 之一
- * @returns 符合 RFC 4122 v4 规范的 UUID 字符串
- */
-declare function uuid(): string;
+import { generateSnowflakeId, uuid, generateSnowflakeIdExt } from './idgene';
 declare const MixinUtils: {
     isNil(obj: any): boolean;
     isNotNil(obj: any): boolean;
@@ -68,5 +52,6 @@ declare const MixinUtils: {
      * @returns 雪花ID字符串
      */
     generateSnowflakeId: typeof generateSnowflakeId;
+    generateSnowflakeIdExt: typeof generateSnowflakeIdExt;
 };
 export { MixinUtils };