字典注释读取

Former-commit-id: 9fa280d7937c95c016e065d507687f745e8d9471

src/main/java/xyz/wbsite/dbtool/javafx/manger/ProjectManager.java

@@ -432,7 +432,7 @@ public class ProjectManager {
                     }
 
                     Dialog.stopPopup();
-                    Dialog.showSuccess("Api生成完毕.");
+                    Dialog.showSuccess("Doc生成完毕.");
                 }
             });
         }

src/main/java/xyz/wbsite/dbtool/javafx/manger/callable/DocCallable.java

@@ -3,6 +3,7 @@ package xyz.wbsite.dbtool.javafx.manger.callable;
 import xyz.wbsite.dbtool.javafx.manger.FreeMarkerManager;
 import xyz.wbsite.dbtool.javafx.manger.ManagerFactory;
 import xyz.wbsite.dbtool.javafx.po.Doc;
+import xyz.wbsite.dbtool.javafx.tool.DocRequestReader;
 import xyz.wbsite.dbtool.javafx.tool.RequestReader;
 import xyz.wbsite.dbtool.javafx.tool.ResponseReader;
 import xyz.wbsite.dbtool.javafx.tool.Tool;
@@ -40,37 +41,35 @@ public class DocCallable implements Callable {
         List<Doc> ajaxList = new ArrayList<>();
         List<Doc> apiList = new ArrayList<>();
         for (Doc doc : ajaxDocList) {
-            if ("ajax".equals(doc.getType())) {
-                ajaxList.add(doc);
-            }
-            if ("api".equals(doc.getType())) {
-                apiList.add(doc);
+            if (doc.isCheck()) {
+                if ("ajax".equals(doc.getType().toLowerCase())) {
+                    ajaxList.add(doc);
+                }
+                if ("api".equals(doc.getType().toLowerCase())) {
+                    apiList.add(doc);
+                }
             }
         }
         if (ajaxList.size() > 0) {
             File ajax = Tool.createPath(this.docFile, "ajax");
             for (Doc doc : ajaxList) {
-                if (doc.isCheck()) {
 
-                    RequestReader requestReader = new RequestReader(doc.getRequestFile());
+                DocRequestReader requestReader = new DocRequestReader(doc.getRequestFile());
 //                generateRequest(requestReader);
 
-                    ResponseReader responseReader = new ResponseReader(doc.getResponseFile());
+                ResponseReader responseReader = new ResponseReader(doc.getResponseFile());
 //                generateResponse(responseReader);
-                }
             }
         }
 
         if (apiList.size() > 0) {
             File api = Tool.createPath(this.docFile, "api");
             for (Doc doc : apiList) {
-                if (doc.isCheck()) {
-                    RequestReader requestReader = new RequestReader(doc.getRequestFile());
+                RequestReader requestReader = new RequestReader(doc.getRequestFile());
 //                generateRequest(requestReader);
 
-                    ResponseReader responseReader = new ResponseReader(doc.getResponseFile());
+                ResponseReader responseReader = new ResponseReader(doc.getResponseFile());
 //                generateResponse(responseReader);
-                }
             }
         }
 

src/main/java/xyz/wbsite/dbtool/javafx/tool/DocRequestReader.java

@@ -0,0 +1,47 @@
+package xyz.wbsite.dbtool.javafx.tool;
+
+import java.io.File;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+public class DocRequestReader extends RequestReader {
+    private Map<String, String> fieldDocMap;
+
+    public DocRequestReader(File javaClass) {
+        super(javaClass);
+    }
+
+    @Override
+    protected void read() {
+        super.read();
+        fieldDocMap = new HashMap<>();
+        String doc = null;
+        String field = null;
+        for (String s : getBody()) {
+            if (s.matches("\\s+/\\*(\\*)?(.*)(\\*/)?")) {
+                Pattern compile = Pattern.compile("\\s+/\\*(\\*)?(.*)(\\*/)?");
+                Matcher matcher = compile.matcher(s);
+                if (matcher.find()) {
+                    doc = matcher.group(2);
+                } else {
+                    doc = "";
+                }
+            }
+
+            if (s.matches("\\s+\\*\\s+(.*)")) {
+                Pattern compile = Pattern.compile("\\s+\\*\\s+(.*)");
+                Matcher matcher = compile.matcher(s);
+                if (matcher.find()) doc += matcher.group(1);
+            }
+
+            if (s.matches("\\s+private\\s.*\\s(.*);")) {
+                Pattern compile = Pattern.compile("\\s+private\\s.*\\s(.*);");
+                Matcher matcher = compile.matcher(s);
+                if (matcher.find()) field = matcher.group(1);
+                fieldDocMap.put(field, doc != null ? doc : "");
+            }
+        }
+    }
+}

src/main/java/xyz/wbsite/dbtool/javafx/tool/RequestReader.java

@@ -39,7 +39,7 @@ public class RequestReader {
         read();
     }
 
-    private void read() {
+    protected void read() {
         BufferedReader bufferedReader = null;
         try {
             bufferedReader = new BufferedReader(new InputStreamReader(new FileInputStream(javaClass), "utf-8"));

src/main/resources/modules/SpringBoot/java/module/req/createRequestClass.ftl

@@ -23,7 +23,7 @@ public class ${table.getCName()}CreateRequest extends BaseRequest {
 <#if !field.isSystem>
 
     /**
-     * ${field.fieldComment?default("")}
+     * ${field.fieldComment?default("")}.
      */
     <#if field.isMust && !field.fieldType?contains("String")>
     @NotNull(message = "[${field.getFName()}]${field.fieldComment?default("")}不能为NULL")

src/main/resources/modules/SpringBoot/java/module/req/deleteRequestClass.ftl

@@ -14,7 +14,7 @@ public class ${table.getCName()}DeleteRequest extends BaseUpdateRequest {
 <#if table.sys>
 
     /**
-     * 主键
+     * 主键.
      */
     @NotNull(message = "[id]主键不能为空")
     private long id;
@@ -30,7 +30,7 @@ public class ${table.getCName()}DeleteRequest extends BaseUpdateRequest {
     <#list table.fields as field>
 
     /**
-     * ${field.fieldComment?default("")}
+     * ${field.fieldComment?default("")}.
      */
     private ${field.fieldType.javaType()} ${field.getFName()};
     </#list>

src/main/resources/modules/SpringBoot/java/module/req/findRequestClass.ftl

@@ -20,7 +20,7 @@ public class ${table.getCName()}FindRequest extends BaseFindRequest {
 <#if field.isQuery>
 
     /**
-     * ${field.fieldComment?default("")}
+     * ${field.fieldComment?default("")}.
      */
     <#if field.fieldType?contains("Dict")>
     @Dict(name = "${field.getFieldName()}")

src/main/resources/modules/SpringBoot/java/module/req/getRequestClass.ftl

@@ -13,7 +13,7 @@ import javax.validation.constraints.NotNull;
 public class ${table.getCName()}GetRequest extends BaseRequest {
 
     /**
-     * 主键
+     * 主键.
      */
     @NotNull(message = "[id]主键不能为空")
     private long id;

src/main/resources/modules/SpringBoot/java/module/req/updateRequestClass.ftl

@@ -24,7 +24,7 @@ public class ${table.getCName()}UpdateRequest extends BaseUpdateRequest {
 <#if !field.isSystem || field.fieldName == 'ID'>
 
     /**
-     * ${field.fieldComment?default("")}
+     * ${field.fieldComment?default("")}.
      */
     <#if field.isMust && !field.fieldType?contains("String")>
     @NotNull(message = "[${field.getFName()}]${field.fieldComment?default("")}不能为NULL")