1、Api生成BUG

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

@@ -105,6 +105,12 @@ public class ApiCallable implements Callable {
                 try {
                     //region 生成request
                     JavaClassReader javaClassReader = new JavaClassReader(api.getReq());
+                    for (int i = 0; i < javaClassReader.getImportList().size(); i++) {
+                        String s = javaClassReader.getImportList().get(i);
+                        if (s.contains(".api.entity.")) {
+                            javaClassReader.getImportList().set(i, s.replaceAll("\\.api\\.entity\\.", ".entity."));
+                        }
+                    }
 
                     Method method = new Method();
                     method.setStringMethod(api.getMethod());
@@ -142,6 +148,12 @@ public class ApiCallable implements Callable {
                 try {
                     //region 生成response
                     JavaClassReader javaClassReader = new JavaClassReader(api.getRsp());
+                    for (int i = 0; i < javaClassReader.getImportList().size(); i++) {
+                        String import_ = javaClassReader.getImportList().get(i);
+                        if (import_.contains(".api.entity.")) {
+                            javaClassReader.getImportList().set(i, import_.replaceAll("\\.api\\.entity\\.", ".entity."));
+                        }
+                    }
 
                     {
                         HashMap<String, Object> ctx = new HashMap<String, Object>();
@@ -173,6 +185,12 @@ public class ApiCallable implements Callable {
                             continue;
                         }
                         JavaClassReader javaClassReader = new JavaClassReader(f);
+                        for (int i = 0; i < javaClassReader.getImportList().size(); i++) {
+                            String import_ = javaClassReader.getImportList().get(i);
+                            if (import_.contains(".api.entity.")) {
+                                javaClassReader.getImportList().set(i, import_.replaceAll("\\.api\\.entity\\.", ".entity."));
+                            }
+                        }
 
                         Method method = new Method();
                         method.setStringMethod(api.getMethod());
@@ -209,6 +227,12 @@ public class ApiCallable implements Callable {
                             System.err.println("文件" + f.getAbsolutePath() + "不存在");
                         }
                         JavaClassReader javaClassReader = new JavaClassReader(f);
+                        for (int i = 0; i < javaClassReader.getImportList().size(); i++) {
+                            String import_ = javaClassReader.getImportList().get(i);
+                            if (import_.contains(".api.entity.")) {
+                                javaClassReader.getImportList().set(i, import_.replaceAll("\\.api\\.entity\\.", ".entity."));
+                            }
+                        }
 
                         {
                             HashMap<String, Object> ctx = new HashMap<String, Object>();
@@ -242,6 +266,12 @@ public class ApiCallable implements Callable {
                             continue;
                         }
                         JavaClassReader javaClassReader = new JavaClassReader(f);
+                        for (int i = 0; i < javaClassReader.getImportList().size(); i++) {
+                            String import_ = javaClassReader.getImportList().get(i);
+                            if (import_.contains(".api.entity.")) {
+                                javaClassReader.getImportList().set(i, import_.replaceAll("\\.api\\.entity\\.", ".entity."));
+                            }
+                        }
 
                         {
                             HashMap<String, Object> ctx = new HashMap<String, Object>();

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

@@ -101,8 +101,6 @@ public class JavaClassReader {
                             findOrSearchflag = "1";
                         } else if (fatherName.contains("SearchRequest")) {
                             findOrSearchflag = "2";
-                        } else {
-                            findOrSearchflag = "0";
                         }
                     }
                 }

src/main/resources/modules/Java_api/ApiFindRequest.ftl

@@ -7,7 +7,7 @@ package ${domain};
  * @version 0.0.1
  * @since 2017-01-01
  */
-public abstract class ApiFindRequest<T> implements ApiRequest {
+public abstract class ApiFindRequest {
 
     private long pageNumber = 1L;
     private long pageSize = 10L;

src/main/resources/modules/Java_api/ApiSearchRequest.ftl

@@ -7,7 +7,7 @@ package ${domain};
  * @version 0.0.1
  * @since 2017-01-01
  */
-public abstract class ApiSearchRequest<T> extends ApiFindRequest<T> {
+public abstract class ApiSearchRequest {
 
     /**
     * 关键字

src/main/resources/modules/Java_api/module/entity/entity.ftl

@@ -1,4 +1,4 @@
-package ${domain}.${module}.entity;
+package ${domain}.entity;
 
 <#list importList as i>
 ${i}

src/main/resources/modules/Java_api/module/request/request.ftl

@@ -6,9 +6,8 @@ ${i}
 </#if>
 </#list>
 import ${domain}.response.${className}Response;
-<#if findOrSearchflag == '0'>
 import ${domain}.ApiRequest;
-<#elseif findOrSearchflag=='1'>
+<#if findOrSearchflag=='1'>
 import ${domain}.ApiFindRequest;
 <#elseif findOrSearchflag=='2'>
 import ${domain}.ApiSearchRequest;
@@ -17,7 +16,7 @@ import ${domain}.ApiSearchRequest;
 <#list annotation as i>
 ${i}
 </#list>
-public class ${className}Request <#if findOrSearchflag == '0'>implements ApiRequest<#elseif findOrSearchflag=='1'>extends ApiFindRequest<#elseif findOrSearchflag=='2'>extends ApiSearchRequest</#if><${className}Response> {
+public class ${className}Request <#if findOrSearchflag=='1'>extends ApiFindRequest<#elseif findOrSearchflag=='2'>extends ApiSearchRequest</#if> implements ApiRequest<${className}Response> {
 
 <#list body as i>
 <#if !i?contains("@")>