Merge remote-tracking branch 'origin/main'

2024-01-24 15:50:37 +08:00
parent 458b035a7e 379b63275a
commit 4b54262edd
15 changed files with 311 additions and 125 deletions
@@ -137,6 +137,9 @@ func (autoCodeService *AutoCodeService) PreviewTemp(autoCode system.AutoCodeStru
 	for i := range autoCode.Fields {
 		if autoCode.Fields[i].FieldType == "time.Time" {
 			autoCode.HasTimer = true
+			if autoCode.Fields[i].FieldSearchType != "" {
+				autoCode.HasSearchTimer = true
+			}
 		}
 		if autoCode.Fields[i].Sort {
 			autoCode.NeedSort = true
@@ -158,6 +161,21 @@ func (autoCodeService *AutoCodeService) PreviewTemp(autoCode system.AutoCodeStru
 			autoCode.HasFile = true
 			autoCode.NeedJSON = true
 		}
+
+		if autoCode.GvaModel {
+			autoCode.PrimaryField = &system.Field{
+				FieldName:    "ID",
+				FieldType:    "uint",
+				FieldDesc:    "ID",
+				FieldJson:    "ID",
+				DataTypeLong: "20",
+				Comment:      "主键ID",
+				ColumnName:   "id",
+			}
+		}
+		if !autoCode.GvaModel && autoCode.PrimaryField == nil && autoCode.Fields[i].PrimaryKey {
+			autoCode.PrimaryField = autoCode.Fields[i]
+		}
 	}
 	dataList, _, needMkdir, err := autoCodeService.getNeedList(&autoCode)
 	if err != nil {
@@ -241,6 +259,9 @@ func (autoCodeService *AutoCodeService) CreateTemp(autoCode system.AutoCodeStruc
 	for i := range autoCode.Fields {
 		if autoCode.Fields[i].FieldType == "time.Time" {
 			autoCode.HasTimer = true
+			if autoCode.Fields[i].FieldSearchType != "" {
+				autoCode.HasSearchTimer = true
+			}
 		}
 		if autoCode.Fields[i].Sort {
 			autoCode.NeedSort = true
@@ -262,6 +283,20 @@ func (autoCodeService *AutoCodeService) CreateTemp(autoCode system.AutoCodeStruc
 			autoCode.NeedJSON = true
 			autoCode.HasFile = true
 		}
+		if autoCode.GvaModel {
+			autoCode.PrimaryField = &system.Field{
+				FieldName:    "ID",
+				FieldType:    "uint",
+				FieldDesc:    "ID",
+				FieldJson:    "ID",
+				DataTypeLong: "20",
+				Comment:      "主键ID",
+				ColumnName:   "id",
+			}
+		}
+		if !autoCode.GvaModel && autoCode.PrimaryField == nil && autoCode.Fields[i].PrimaryKey {
+			autoCode.PrimaryField = autoCode.Fields[i]
+		}
 	}
 	// 增加判断: 重复创建struct
 	if autoCode.AutoMoveFile && AutoCodeHistoryServiceApp.Repeat(autoCode.BusinessDB, autoCode.StructName, autoCode.Package) {
@@ -45,8 +45,30 @@ func (s *autoCodeMssql) GetTables(businessDB string, dbName string) (data []resp
 // Author [SliverHorn](https://github.com/SliverHorn)
 func (s *autoCodeMssql) GetColumn(businessDB string, tableName string, dbName string) (data []response.Column, err error) {
 	var entities []response.Column
-	sql := fmt.Sprintf(`select sc.name as column_name,st.name as data_type, sc.length as data_type_long
-	 from %s.DBO.syscolumns sc,systypes st where sc.xtype=st.xtype and st.usertype=0 and sc.id in (select id from %s.DBO.sysobjects where xtype='U' and name='%s');`, dbName, dbName, tableName)
+	sql := fmt.Sprintf(`
+SELECT 
+    sc.name AS column_name,
+    st.name AS data_type, 
+    sc.length AS data_type_long,
+    CASE 
+        WHEN pk.index_id IS NOT NULL THEN 1
+        ELSE 0
+    END AS primary_key
+FROM 
+    %s.DBO.syscolumns sc
+JOIN 
+    systypes st ON sc.xtype=st.xtype
+LEFT JOIN 
+    %s.DBO.sysobjects so ON so.name='%s' AND so.xtype='U'
+LEFT JOIN 
+    %s.DBO.sysindexes si ON si.id = so.id AND si.indid < 2
+LEFT JOIN 
+    %s.DBO.sysindexkeys sik ON sik.id = si.id AND sik.indid = si.indid AND sik.colid = sc.colid
+LEFT JOIN 
+    %s.DBO.syskeyconstraints pk ON pk.constid = sik.constid
+WHERE 
+    st.usertype=0 AND sc.id = so.id
+`, dbName, dbName, tableName, dbName, dbName, dbName)

 	if businessDB == "" {
 		err = global.GVA_DB.Raw(sql).Scan(&entities).Error
@@ -44,21 +44,32 @@ func (s *autoCodeMysql) GetTables(businessDB string, dbName string) (data []resp
 func (s *autoCodeMysql) GetColumn(businessDB string, tableName string, dbName string) (data []response.Column, err error) {
 	var entities []response.Column
 	sql := `
-	SELECT COLUMN_NAME        column_name,
-       DATA_TYPE          data_type,
-       CASE DATA_TYPE
-           WHEN 'longtext' THEN c.CHARACTER_MAXIMUM_LENGTH
-           WHEN 'varchar' THEN c.CHARACTER_MAXIMUM_LENGTH
-           WHEN 'double' THEN CONCAT_WS(',', c.NUMERIC_PRECISION, c.NUMERIC_SCALE)
-           WHEN 'decimal' THEN CONCAT_WS(',', c.NUMERIC_PRECISION, c.NUMERIC_SCALE)
-           WHEN 'int' THEN c.NUMERIC_PRECISION
-           WHEN 'bigint' THEN c.NUMERIC_PRECISION
-           ELSE '' END AS data_type_long,
-       COLUMN_COMMENT     column_comment
-	FROM INFORMATION_SCHEMA.COLUMNS c
-	WHERE table_name = ?
-	  AND table_schema = ?
-	`
+	SELECT 
+    c.COLUMN_NAME column_name,
+    c.DATA_TYPE data_type,
+    CASE c.DATA_TYPE
+        WHEN 'longtext' THEN c.CHARACTER_MAXIMUM_LENGTH
+        WHEN 'varchar' THEN c.CHARACTER_MAXIMUM_LENGTH
+        WHEN 'double' THEN CONCAT_WS(',', c.NUMERIC_PRECISION, c.NUMERIC_SCALE)
+        WHEN 'decimal' THEN CONCAT_WS(',', c.NUMERIC_PRECISION, c.NUMERIC_SCALE)
+        WHEN 'int' THEN c.NUMERIC_PRECISION
+        WHEN 'bigint' THEN c.NUMERIC_PRECISION
+        ELSE '' 
+    END AS data_type_long,
+    c.COLUMN_COMMENT column_comment,
+    CASE WHEN kcu.COLUMN_NAME IS NOT NULL THEN 1 ELSE 0 END AS primary_key
+FROM 
+    INFORMATION_SCHEMA.COLUMNS c
+LEFT JOIN 
+    INFORMATION_SCHEMA.KEY_COLUMN_USAGE kcu 
+ON 
+    c.TABLE_SCHEMA = kcu.TABLE_SCHEMA 
+    AND c.TABLE_NAME = kcu.TABLE_NAME 
+    AND c.COLUMN_NAME = kcu.COLUMN_NAME 
+    AND kcu.CONSTRAINT_NAME = 'PRIMARY'
+WHERE 
+    c.TABLE_NAME = ? 
+    AND c.TABLE_SCHEMA = ?;`
 	if businessDB == "" {
 		err = global.GVA_DB.Raw(sql, tableName, dbName).Scan(&entities).Error
 	} else {
@@ -36,16 +36,32 @@ func (s *autoCodeOracle) GetTables(businessDB string, dbName string) (data []res
 func (s *autoCodeOracle) GetColumn(businessDB string, tableName string, dbName string) (data []response.Column, err error) {
 	var entities []response.Column
 	sql := `
-		select lower(a.COLUMN_NAME) as "column_name",
-			   (CASE WHEN a.DATA_TYPE = 'NUMBER' AND a.DATA_SCALE=0 THEN 'int' else lower(a.DATA_TYPE) end)  as "data_type", 
-			   (CASE WHEN a.DATA_TYPE = 'NUMBER' THEN a.DATA_PRECISION else a.DATA_LENGTH end) as "data_type_long",
-			   b.COMMENTS as "column_comment"
-		from all_tab_columns a , all_col_comments b
-		 where a.OWNER = b.OWNER
-		 and a.TABLE_NAME = b.TABLE_NAME
-		 and a.COLUMN_NAME = b.COLUMN_NAME
-		and lower(a.table_name) = ?
-		 and lower(a.OWNER) = ?		 
+		SELECT
+    lower(a.COLUMN_NAME) as "column_name",
+    (CASE WHEN a.DATA_TYPE = 'NUMBER' AND a.DATA_SCALE=0 THEN 'int' else lower(a.DATA_TYPE) end)  as "data_type",
+    (CASE WHEN a.DATA_TYPE = 'NUMBER' THEN a.DATA_PRECISION else a.DATA_LENGTH end) as "data_type_long",
+    b.COMMENTS as "column_comment",
+    (CASE WHEN pk.COLUMN_NAME IS NOT NULL THEN 1 ELSE 0 END) as "primary_key"
+FROM
+    all_tab_columns a
+JOIN
+    all_col_comments b ON a.OWNER = b.OWNER AND a.TABLE_NAME = b.TABLE_NAME AND a.COLUMN_NAME = b.COLUMN_NAME
+LEFT JOIN
+    (
+        SELECT
+            acc.OWNER,
+            acc.TABLE_NAME,
+            acc.COLUMN_NAME
+        FROM
+            all_cons_columns acc
+        JOIN
+            all_constraints ac ON acc.OWNER = ac.OWNER AND acc.CONSTRAINT_NAME = ac.CONSTRAINT_NAME
+        WHERE
+            ac.CONSTRAINT_TYPE = 'P'
+    ) pk ON a.OWNER = pk.OWNER AND a.TABLE_NAME = pk.TABLE_NAME AND a.COLUMN_NAME = pk.COLUMN_NAME
+WHERE
+    lower(a.table_name) = ?
+    AND lower(a.OWNER) = ?;
 `

 	err = global.GVA_DBList[businessDB].Raw(sql, tableName, dbName).Scan(&entities).Error
@@ -46,53 +46,79 @@ func (a *autoCodePgsql) GetTables(businessDB string, dbName string) (data []resp
 func (a *autoCodePgsql) GetColumn(businessDB string, tableName string, dbName string) (data []response.Column, err error) {
 	// todo 数据获取不全, 待完善sql
 	sql := `
-		SELECT psc.COLUMN_NAME AS COLUMN_NAME,
- psc.udt_name AS data_type,
-CASE
-  psc.udt_name 
-  WHEN 'text' THEN
-   concat_ws ( '', '', psc.CHARACTER_MAXIMUM_LENGTH ) 
-  WHEN 'varchar' THEN
-   concat_ws ( '', '', psc.CHARACTER_MAXIMUM_LENGTH ) 
-  WHEN 'smallint' THEN
-   concat_ws ( ',', psc.NUMERIC_PRECISION, psc.NUMERIC_SCALE ) 
-  WHEN 'decimal' THEN
-   concat_ws ( ',', psc.NUMERIC_PRECISION, psc.NUMERIC_SCALE ) 
-  WHEN 'integer' THEN
-   concat_ws ( '', '', psc.NUMERIC_PRECISION ) 
-  WHEN 'int4' THEN
-   concat_ws ( '', '', psc.NUMERIC_PRECISION ) 
-  WHEN 'int8' THEN
-   concat_ws ( '', '', psc.NUMERIC_PRECISION ) 
-  WHEN 'bigint' THEN
-   concat_ws ( '', '', psc.NUMERIC_PRECISION ) 
-  WHEN 'timestamp' THEN
-   concat_ws ( '', '', psc.datetime_precision ) 
-  ELSE '' 
- END AS data_type_long,
- (
-   SELECT
-    pd.description 
-   FROM
-    pg_description pd 
-   WHERE
-    (pd.objoid,pd.objsubid) in (
-       SELECT pa.attrelid,pa.attnum
-       FROM
-        pg_attribute pa 
-      WHERE pa.attrelid = ( SELECT oid FROM pg_class pc WHERE 
-      pc.relname = psc.table_name
+SELECT 
+  psc.COLUMN_NAME AS COLUMN_NAME,
+  psc.udt_name AS data_type,
+  CASE
+    psc.udt_name 
+    WHEN 'text' THEN
+      concat_ws ( '', '', psc.CHARACTER_MAXIMUM_LENGTH ) 
+    WHEN 'varchar' THEN
+      concat_ws ( '', '', psc.CHARACTER_MAXIMUM_LENGTH ) 
+    WHEN 'smallint' THEN
+      concat_ws ( ',', psc.NUMERIC_PRECISION, psc.NUMERIC_SCALE ) 
+    WHEN 'decimal' THEN
+      concat_ws ( ',', psc.NUMERIC_PRECISION, psc.NUMERIC_SCALE ) 
+    WHEN 'integer' THEN
+      concat_ws ( '', '', psc.NUMERIC_PRECISION ) 
+    WHEN 'int4' THEN
+      concat_ws ( '', '', psc.NUMERIC_PRECISION ) 
+    WHEN 'int8' THEN
+      concat_ws ( '', '', psc.NUMERIC_PRECISION ) 
+    WHEN 'bigint' THEN
+      concat_ws ( '', '', psc.NUMERIC_PRECISION ) 
+    WHEN 'timestamp' THEN
+      concat_ws ( '', '', psc.datetime_precision ) 
+    ELSE '' 
+  END AS data_type_long,
+  (
+    SELECT
+      pd.description 
+    FROM
+      pg_description pd 
+    WHERE
+      (pd.objoid,pd.objsubid) in (
+        SELECT pa.attrelid,pa.attnum
+        FROM
+          pg_attribute pa 
+        WHERE pa.attrelid = ( SELECT oid FROM pg_class pc WHERE 
+        pc.relname = psc.table_name
+        ) 
+        and attname = psc.column_name
      ) 
-      and attname = psc.column_name
-    ) 
- ) AS column_comment 
+  ) AS column_comment,
+  (
+    SELECT
+      COUNT(*) 
+    FROM
+      pg_constraint 
+    WHERE
+      contype = 'p' 
+      AND conrelid = (
+        SELECT
+          oid 
+        FROM
+          pg_class 
+        WHERE
+          relname = psc.table_name
+      ) 
+      AND conkey::int[] @> ARRAY[(
+        SELECT
+          attnum 
+        FROM
+          pg_attribute 
+        WHERE
+          attrelid = conrelid 
+          AND attname = psc.column_name
+      )]
+  ) > 0 AS primary_key
 FROM
- INFORMATION_SCHEMA.COLUMNS psc 
+  INFORMATION_SCHEMA.COLUMNS psc 
 WHERE
- table_catalog = ?
- AND table_schema = 'public' 
- AND TABLE_NAME = ?;
-	`
+  table_catalog = ?
+  AND table_schema = 'public' 
+  AND TABLE_NAME = ?;
+`
 	var entities []response.Column
 	//sql = strings.ReplaceAll(sql, "@table_catalog", dbName)
 	//sql = strings.ReplaceAll(sql, "@table_name", tableName)
@@ -66,6 +66,7 @@ func (a *autoCodeSqlite) GetColumn(businessDB string, tableName string, dbName s
 	var columnInfos []struct {
 		Name string `gorm:"column:name"`
 		Type string `gorm:"column:type"`
+		Pk   int    `gorm:"column:pk"`
 	}
 	if businessDB == "" {
 		err = global.GVA_DB.Raw(sql).Scan(&columnInfos).Error
@@ -76,6 +77,7 @@ func (a *autoCodeSqlite) GetColumn(businessDB string, tableName string, dbName s
 		entities = append(entities, response.Column{
 			ColumnName: columnInfo.Name,
 			DataType:   columnInfo.Type,
+			PrimaryKey: columnInfo.Pk == 1,
 		})
 	}
 	return entities, err