From ba6c02d49a28f2d3aa43b5d11e37e5977a90e70e Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期二, 19 十二月 2023 14:15:06 +0800
Subject: [PATCH] #

---
 zy-asrs-framework/src/main/java/com/zy/asrs/framework/generators/CoolGenerator.java |   41 +++++++++++++++--------------------------
 1 files changed, 15 insertions(+), 26 deletions(-)

diff --git a/zy-asrs-framework/src/main/java/com/zy/asrs/framework/generators/CoolGenerator.java b/zy-asrs-framework/src/main/java/com/zy/asrs/framework/generators/CoolGenerator.java
index e131455..9273d4a 100644
--- a/zy-asrs-framework/src/main/java/com/zy/asrs/framework/generators/CoolGenerator.java
+++ b/zy-asrs-framework/src/main/java/com/zy/asrs/framework/generators/CoolGenerator.java
@@ -49,10 +49,11 @@
     public boolean entity = true;
     public boolean xml = true;
     public boolean html = true;
-    public boolean htmlDetail = false;
     public boolean js = true;
     public boolean sql = true;
     public SqlOsType sqlOsType;
+    public String backendPrefixPath;
+    public String frontendPrefixPath;
 
     private List<Column> columns = new ArrayList<>();
     private String fullEntityName;
@@ -82,48 +83,49 @@
             switch (template){
                 case "Controller":
                     pass = controller;
-                    directory = JAVA_DIR + packagePath.replace(".", "/")+"/"+templatePath+"/";
+                    directory = backendPrefixPath + JAVA_DIR + packagePath.replace(".", "/")+"/"+templatePath+"/";
                     fileName = fullEntityName+template+".java";
                     break;
                 case "Service":
                     pass = service;
-                    directory = JAVA_DIR + packagePath.replace(".", "/")+"/"+templatePath+"/";
+                    directory = backendPrefixPath + JAVA_DIR + packagePath.replace(".", "/")+"/"+templatePath+"/";
                     fileName = fullEntityName+template+".java";
                     break;
                 case "ServiceImpl":
                     pass = service;
-                    directory = JAVA_DIR + packagePath.replace(".", "/")+"/"+templatePath+"/";
+                    directory = backendPrefixPath + JAVA_DIR + packagePath.replace(".", "/")+"/"+templatePath+"/";
                     fileName = fullEntityName+template+".java";
                     break;
                 case "Mapper":
                     pass = mapper;
-                    directory = JAVA_DIR + packagePath.replace(".", "/")+"/"+templatePath+"/";
+                    directory = backendPrefixPath + JAVA_DIR + packagePath.replace(".", "/")+"/"+templatePath+"/";
                     fileName = fullEntityName+template+".java";
                     break;
                 case "Entity":
                     pass = entity;
-                    directory = JAVA_DIR + packagePath.replace(".", "/")+"/"+templatePath+"/";
+                    directory = backendPrefixPath + JAVA_DIR + packagePath.replace(".", "/")+"/"+templatePath+"/";
                     fileName = fullEntityName+".java";
                     break;
                 case "Xml":
                     pass = xml;
-                    directory = XML_DIR;
+                    directory = backendPrefixPath + XML_DIR;
                     fileName = fullEntityName+"Mapper.xml";
+                    break;
+                case "Sql":
+                    pass = sql;
+                    directory = backendPrefixPath + JAVA_DIR;
+                    fileName = simpleEntityName+".sql";
                     break;
                 case "Html":
                     pass = html;
-                    directory = HTML_DIR + "/views/" + simpleEntityName + "/";
+                    directory = frontendPrefixPath + HTML_DIR + "/views/" + simpleEntityName + "/";
                     fileName = simpleEntityName+".html";
                     break;
                 case "Js":
                     pass = js;
-                    directory = HTML_DIR + "/static/js/" + simpleEntityName + "/";
+                    directory = frontendPrefixPath + HTML_DIR + "/static/js/" + simpleEntityName + "/";
                     fileName = simpleEntityName+".js";
                     break;
-                case "Sql":
-                    pass = sql;
-                    directory = JAVA_DIR;
-                    fileName = simpleEntityName+".sql";
                 default:
                     break;
             }
@@ -411,19 +413,6 @@
                 entityIm.append("import com.core.common.SpringUtils;\n")
                         .append("import ").append(SYSTEM_MODEL.contains(column.getForeignKey())?systemPackagePath:packagePath).append(".service.").append(column.getForeignKey()).append("Service;\n")
                         .append("import ").append(SYSTEM_MODEL.contains(column.getForeignKey())?systemPackagePath:packagePath).append(".entity.").append(column.getForeignKey()).append(";\n");
-            }
-
-            // 鍛藉悕杞崲娉ㄨВ
-            if (!column.getName().equals(column.getHumpName())){
-                if (setTableField){
-                    entityIm.append("import com.baomidou.mybatisplus.annotations.TableField;").append("\n");
-                    setTableField = false;
-                }
-                sb.append("    ")
-                        .append("@TableField(\"")
-                        .append(column.getName())
-                        .append("\")")
-                        .append("\n");
             }
 
             if ("Date".equals(column.getType())){

--
Gitblit v1.9.1