From c05fa8a85061355577aba11107932bb85df3517c Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期六, 17 二月 2024 15:30:19 +0800
Subject: [PATCH] #

---
 zy-asrs-framework/src/main/java/com/zy/asrs/framework/generators/BetterGenerator.java |   31 ++++++++++++++++++++++++++++++-
 1 files changed, 30 insertions(+), 1 deletions(-)

diff --git a/zy-asrs-framework/src/main/java/com/zy/asrs/framework/generators/BetterGenerator.java b/zy-asrs-framework/src/main/java/com/zy/asrs/framework/generators/BetterGenerator.java
index ee3c5d2..ede2c73 100644
--- a/zy-asrs-framework/src/main/java/com/zy/asrs/framework/generators/BetterGenerator.java
+++ b/zy-asrs-framework/src/main/java/com/zy/asrs/framework/generators/BetterGenerator.java
@@ -41,6 +41,7 @@
     public String username;
     public String password;
     public String table;
+    public String tableName;
     public String packagePath;
     public boolean controller = true;
     public boolean service = true;
@@ -71,6 +72,7 @@
     private String systemPackage;
     private String itemName;
     private String tableColumns;
+    private String formEditColumns;
 
     public void build() throws Exception {
         init();
@@ -163,6 +165,7 @@
         }
         itemName = packagePathSplit[packagePathSplit.length - 1];
         tableColumns = createTableColumns();
+        formEditColumns = createFormEditColumns();
     }
 
     private String readFile(String template){
@@ -190,6 +193,7 @@
         if(!writerFile.exists()){
             content=content.
                     replaceAll("@\\{TABLENAME}", table)
+                    .replaceAll("@\\{TABLEDESC}", tableName)
                     .replaceAll("@\\{ENTITYIMPORT}", entityImport)
                     .replaceAll("@\\{ENTITYCONTENT}", entityContent)
                     .replaceAll("@\\{ENTITYNAME}", fullEntityName)
@@ -212,6 +216,7 @@
                     .replaceAll("@\\{UPCASEMARJORCOLUMN}", GeneratorUtils.firstCharConvert(primaryKeyColumn, false))
                     .replaceAll("@\\{SYSTEMPACKAGE}",systemPackage)
                     .replaceAll("@\\{TABLECOLUMNS}", tableColumns)
+                    .replaceAll("@\\{FORMEDITCOLUMNS}", formEditColumns)
             ;
             writerFile.createNewFile();
             BufferedWriter writer=new BufferedWriter(new FileWriter(writerFile));
@@ -227,7 +232,13 @@
     private void gainDbInfo() throws Exception {
         Connection conn;
         if (null == this.sqlOsType) {
-            throw new RuntimeException("璇锋寚瀹氭暟鎹簱绫诲瀷锛�");
+            throw new RuntimeException("璇烽�夋嫨sqlOsType锛�");
+        }
+        if (null == this.table) {
+            throw new RuntimeException("璇疯緭鍏able锛�");
+        }
+        if (null == this.tableName) {
+            throw new RuntimeException("璇疯緭鍏ableName锛�");
         }
         switch (this.sqlOsType) {
             case MYSQL:
@@ -840,7 +851,25 @@
     /************************************** Edit鍔ㄦ�佸瓧娈� ********************************************/
     /**********************************************************************************************/
 
+    private String createFormEditColumns() {
+        StringBuilder sb = new StringBuilder();
+        int times = 0;
+        for (Column column : columns) {
+            if (column.isPrimaryKey()
+                    || column.getHumpName().equals("deleted")
+                    || column.getHumpName().equals("hostId")
+            ) {
+                continue;
+            }
 
+            if (times%2 == 0) {
+
+            }
+
+            times++;
+        }
+        return sb.toString();
+    }
 
 
 

--
Gitblit v1.9.1