From e0b60c697bf7a12ca7698c1de4974606f2bf4ca1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=84=E6=B5=B7?= <10402852@qq.com>
Date: Thu, 10 Oct 2024 09:15:31 +0800
Subject: [PATCH] 'commit'

---
 .../java/com/dsideal/Tools/GenerateCode.java  | 36 ++++++++++++++++---
 .../java/com/dsideal/Tools/生成思路.txt   | 10 ++++++
 .../main/java/com/dsideal/Utils/dsKit.java    |  8 +++++
 .../base/{Model => Bean}/TSysLoginperson.java |  2 +-
 .../src/main/resources/application.properties |  2 +-
 dsUtils/target/classes/application.properties |  2 +-
 6 files changed, 53 insertions(+), 7 deletions(-)
 create mode 100644 dsUtils/src/main/java/com/dsideal/Tools/生成思路.txt
 rename dsUtils/src/main/java/com/dsideal/base/{Model => Bean}/TSysLoginperson.java (99%)

diff --git a/dsUtils/src/main/java/com/dsideal/Tools/GenerateCode.java b/dsUtils/src/main/java/com/dsideal/Tools/GenerateCode.java
index c940f377..c23e89e7 100644
--- a/dsUtils/src/main/java/com/dsideal/Tools/GenerateCode.java
+++ b/dsUtils/src/main/java/com/dsideal/Tools/GenerateCode.java
@@ -1,8 +1,10 @@
 package com.dsideal.Tools;
 
 import cn.hutool.core.io.FileUtil;
+import cn.hutool.json.JSONObject;
 import com.dsideal.Utils.dsKit;
 import com.jfinal.kit.PropKit;
+import com.jfinal.kit.StrKit;
 import com.jfinal.plugin.activerecord.ActiveRecordPlugin;
 import com.jfinal.plugin.hikaricp.HikariCpPlugin;
 
@@ -50,9 +52,13 @@ public class GenerateCode {
      * @return
      * @throws Exception
      */
-    public static void getStructure(Connection conn, String table) throws Exception {
-        StringBuilder sb = new StringBuilder();
+    public static JSONObject getStructure(Connection conn, String table) throws Exception {
+        //表结构的描述JSON对象
+        JSONObject jo = new JSONObject();
+        //字段，不包含主键
+        Map<String, String> map = new LinkedHashMap<>();
 
+        StringBuilder sb = new StringBuilder();
         //表注释
         String comment = "";
         Statement stmt = conn.createStatement();
@@ -93,7 +99,13 @@ public class GenerateCode {
             }
             Type = Type.toUpperCase();
 
-//            System.out.println(rs.getString("Key"));//是不是主键 PRI是主键
+            //记录主键
+            if (rs.getString("Key").equals("PRI")) {
+                jo.put("key", Field);
+            } else {//否则记录到map中
+                map.put(Field, dataTypeMap.get(Type));
+            }
+
             sb.append("    // " + rs.getString("Comment") + "\n");
             sb.append("    @Getter\n");
             sb.append("    @Setter\n");
@@ -118,6 +130,8 @@ public class GenerateCode {
         //关闭连接
         rs.close();
         stmt.close();
+        jo.put("fields", map);
+        return jo;
     }
 
     /**
@@ -178,8 +192,14 @@ public class GenerateCode {
         String tableNames = "";
         //表描述
         for (String table : tables) {
-            getStructure(conn, table);
+            JSONObject jo = getStructure(conn, table);
             tableNames += table + ",";
+
+            if (StrKit.isBlank(jo.getStr("key"))) {
+                dsKit.print("表" + table + "没有主键，请检查！");
+            }
+            //生成代码
+            autoCode(jo);
         }
         //去掉最后的逗号
         tableNames = tableNames.substring(0, tableNames.length() - 1);
@@ -191,4 +211,12 @@ public class GenerateCode {
 
         System.out.println(dsKit.getCurrentTimeStr() + "      恭喜，表" + tableNames + "代码已成功生成！");
     }
+
+    /**
+     * 功能：生成代码
+     * @param jo
+     */
+    public void autoCode(JSONObject jo){
+        
+    }
 }
diff --git a/dsUtils/src/main/java/com/dsideal/Tools/生成思路.txt b/dsUtils/src/main/java/com/dsideal/Tools/生成思路.txt
new file mode 100644
index 00000000..4255a320
--- /dev/null
+++ b/dsUtils/src/main/java/com/dsideal/Tools/生成思路.txt
@@ -0,0 +1,10 @@
+1、增加
+(1) Controller
+(2) Model
+2、删除
+
+3、修改
+
+4、单条查询
+
+5、列表查询带分页
\ No newline at end of file
diff --git a/dsUtils/src/main/java/com/dsideal/Utils/dsKit.java b/dsUtils/src/main/java/com/dsideal/Utils/dsKit.java
index 833dff43..e7c923d5 100644
--- a/dsUtils/src/main/java/com/dsideal/Utils/dsKit.java
+++ b/dsUtils/src/main/java/com/dsideal/Utils/dsKit.java
@@ -11,6 +11,14 @@ public class dsKit {
         return DateUtil.formatDateTime(DateUtil.date());
     }
 
+    /**
+     * 功能：输出消息，并且附带当前时间
+     * @param msg
+     */
+    public static void print(String msg){
+        System.out.println(getCurrentTimeStr()+"    "+msg);
+    }
+
     /**
      * 功能：首字母转大写
      *
diff --git a/dsUtils/src/main/java/com/dsideal/base/Model/TSysLoginperson.java b/dsUtils/src/main/java/com/dsideal/base/Bean/TSysLoginperson.java
similarity index 99%
rename from dsUtils/src/main/java/com/dsideal/base/Model/TSysLoginperson.java
rename to dsUtils/src/main/java/com/dsideal/base/Bean/TSysLoginperson.java
index b5f943f3..a1829e95 100644
--- a/dsUtils/src/main/java/com/dsideal/base/Model/TSysLoginperson.java
+++ b/dsUtils/src/main/java/com/dsideal/base/Bean/TSysLoginperson.java
@@ -1,4 +1,4 @@
-package com.dsideal.base.Model;
+package com.dsideal.base.Bean;
 
 import lombok.Setter;
 import lombok.Getter;
diff --git a/dsUtils/src/main/resources/application.properties b/dsUtils/src/main/resources/application.properties
index ff945c7b..ab9baf8f 100644
--- a/dsUtils/src/main/resources/application.properties
+++ b/dsUtils/src/main/resources/application.properties
@@ -8,7 +8,7 @@ jdbcUrl=jdbc:mysql://10.10.14.210:22066/yltcharge?useUnicode=true&characterEncod
 beanPath=D:/dsWork/dsProject/dsUtils/src/main/java
 
 # ??bean???
-beanPackage=com.dsideal.base.Model
+beanPackage=com.dsideal.base.Bean
 
 # ???????
 tableName=t_sys_loginperson
diff --git a/dsUtils/target/classes/application.properties b/dsUtils/target/classes/application.properties
index ff945c7b..ab9baf8f 100644
--- a/dsUtils/target/classes/application.properties
+++ b/dsUtils/target/classes/application.properties
@@ -8,7 +8,7 @@ jdbcUrl=jdbc:mysql://10.10.14.210:22066/yltcharge?useUnicode=true&characterEncod
 beanPath=D:/dsWork/dsProject/dsUtils/src/main/java
 
 # ??bean???
-beanPackage=com.dsideal.base.Model
+beanPackage=com.dsideal.base.Bean
 
 # ???????
 tableName=t_sys_loginperson