|
|
@ -107,13 +107,13 @@ public class ApiCallable implements Callable {
|
|
|
|
|
|
|
|
|
|
|
|
for (File file : files) {
|
|
|
|
for (File file : files) {
|
|
|
|
EntityReader entReader = new EntityReader(file);
|
|
|
|
EntityReader entReader = new EntityReader(file);
|
|
|
|
if (Package.equals(entReader.getPackageName())) {
|
|
|
|
if (Package.equals(entReader.getModuleName())) {
|
|
|
|
HashMap<String, Object> ctx = new HashMap<String, Object>();
|
|
|
|
HashMap<String, Object> ctx = new HashMap<String, Object>();
|
|
|
|
ctx.put("package", "package " + entReader.getDomainName() + "." + entReader.getModuleName() + "." + "req;");
|
|
|
|
ctx.put("package", "package " + entReader.getDomainName() + "." + entReader.getModuleName() + "." + "req;");
|
|
|
|
ctx.put("domain", entReader.getDomainName());
|
|
|
|
ctx.put("domain", entReader.getDomainName());
|
|
|
|
ctx.put("module", entReader.getModuleName());
|
|
|
|
ctx.put("module", entReader.getModuleName());
|
|
|
|
ctx.put("importList", entReader.getImportList());
|
|
|
|
ctx.put("importList", entReader.getImportList());
|
|
|
|
ctx.put("annotation", entReader.getAnnotationList());
|
|
|
|
ctx.put("annotation", entReader.getNotesList());
|
|
|
|
ctx.put("className", entReader.getClassName().replaceAll("Entity", ""));
|
|
|
|
ctx.put("className", entReader.getClassName().replaceAll("Entity", ""));
|
|
|
|
ctx.put("body", entReader.getBody());
|
|
|
|
ctx.put("body", entReader.getBody());
|
|
|
|
ctx.put("tool", tool);
|
|
|
|
ctx.put("tool", tool);
|
|
|
@ -126,43 +126,41 @@ public class ApiCallable implements Callable {
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
List<String> reqNames = new ArrayList<>();
|
|
|
|
for (String reqName : requestReader.getDeptReqList()) {
|
|
|
|
|
|
|
|
List<File> files = Tool.find(this.module, reqName + ".java");
|
|
|
|
for (String s : requestReader.getDeptReqList()) {
|
|
|
|
|
|
|
|
Pattern compile = Pattern.compile("(.*\\.req)\\.(.*)");
|
|
|
|
for (File file : files) {
|
|
|
|
Matcher matcher = compile.matcher(s);
|
|
|
|
RequestReader reqReader = new RequestReader(file);
|
|
|
|
|
|
|
|
if (requestReader.getModuleName().equals(reqReader.getModuleName())) {
|
|
|
|
if (matcher.find()) {
|
|
|
|
boolean isTempReq = true;
|
|
|
|
String Package = matcher.group(1);
|
|
|
|
for (Api api1 : apiList) {
|
|
|
|
String EntName = matcher.group(2);
|
|
|
|
if (api1.isCheck() && api1.getRequest().equals(reqName) && api1.getModule().equals(api.getModule())) {
|
|
|
|
reqNames.add(EntName);
|
|
|
|
isTempReq = false;
|
|
|
|
|
|
|
|
}
|
|
|
|
List<File> files = Tool.find(this.module, EntName + ".java");
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
for (File file : files) {
|
|
|
|
if (isTempReq){
|
|
|
|
RequestReader reqReader = new RequestReader(file);
|
|
|
|
|
|
|
|
if (Package.equals(reqReader.getPackageName())) {
|
|
|
|
|
|
|
|
HashMap<String, Object> ctx = new HashMap<String, Object>();
|
|
|
|
HashMap<String, Object> ctx = new HashMap<String, Object>();
|
|
|
|
ctx.put("package", "package " + requestReader.getDomainName() + "." + requestReader.getModuleName() + "." + "req;");
|
|
|
|
ctx.put("package", "package " + reqReader.getDomainName() + "." + reqReader.getModuleName() + "." + "req;");
|
|
|
|
ctx.put("domain", requestReader.getDomainName());
|
|
|
|
ctx.put("domain", reqReader.getDomainName());
|
|
|
|
ctx.put("module", requestReader.getModuleName());
|
|
|
|
ctx.put("module", reqReader.getModuleName());
|
|
|
|
ctx.put("target", api.getTarget());
|
|
|
|
ctx.put("target", api.getTarget());
|
|
|
|
ctx.put("method", api.getMethod());
|
|
|
|
ctx.put("method", api.getMethod());
|
|
|
|
ctx.put("importList", requestReader.getImportList());
|
|
|
|
ctx.put("isTempReq", isTempReq);
|
|
|
|
|
|
|
|
ctx.put("importList", reqReader.getImportList());
|
|
|
|
ctx.put("entNames", entNames);
|
|
|
|
ctx.put("entNames", entNames);
|
|
|
|
ctx.put("annotation", requestReader.getAnnotationList());
|
|
|
|
ctx.put("annotation", reqReader.getNotesList());
|
|
|
|
ctx.put("className", requestReader.getClassName().replaceAll("Request", ""));
|
|
|
|
ctx.put("className", reqReader.getClassName().replaceAll("Request", ""));
|
|
|
|
ctx.put("body", requestReader.getBody());
|
|
|
|
ctx.put("body", reqReader.getBody());
|
|
|
|
ctx.put("tool", tool);
|
|
|
|
ctx.put("tool", tool);
|
|
|
|
ctx.put("hasList", requestReader.isHasList());
|
|
|
|
ctx.put("hasList", reqReader.isHasList());
|
|
|
|
ctx.put("findOrSearchflag", requestReader.getFindOrSearchflag());
|
|
|
|
ctx.put("findOrSearchflag", reqReader.getFindOrSearchflag());
|
|
|
|
File reqfile = new File(apiRequest.getAbsolutePath(), api.getRequestFile().getName());
|
|
|
|
File reqfile = new File(apiRequest.getAbsolutePath(), reqName + ".java");
|
|
|
|
|
|
|
|
|
|
|
|
freeMarkerManager.outputTemp(reqfile, "Java_api/module/req/request.java", ctx);
|
|
|
|
freeMarkerManager.outputTemp(reqfile, "Java_api/module/req/request.java", ctx);
|
|
|
|
System.out.println("生成文件" + reqfile.getName() + "成功");
|
|
|
|
System.out.println("生成文件" + reqfile.getName() + "成功");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
@ -173,10 +171,10 @@ public class ApiCallable implements Callable {
|
|
|
|
ctx.put("module", requestReader.getModuleName());
|
|
|
|
ctx.put("module", requestReader.getModuleName());
|
|
|
|
ctx.put("target", api.getTarget());
|
|
|
|
ctx.put("target", api.getTarget());
|
|
|
|
ctx.put("method", api.getMethod());
|
|
|
|
ctx.put("method", api.getMethod());
|
|
|
|
|
|
|
|
ctx.put("isTempReq", false);
|
|
|
|
ctx.put("importList", requestReader.getImportList());
|
|
|
|
ctx.put("importList", requestReader.getImportList());
|
|
|
|
ctx.put("entNames", entNames);
|
|
|
|
ctx.put("entNames", entNames);
|
|
|
|
ctx.put("reqNames", reqNames);
|
|
|
|
ctx.put("annotation", requestReader.getNotesList());
|
|
|
|
ctx.put("annotation", requestReader.getAnnotationList());
|
|
|
|
|
|
|
|
ctx.put("className", requestReader.getClassName().replaceAll("Request", ""));
|
|
|
|
ctx.put("className", requestReader.getClassName().replaceAll("Request", ""));
|
|
|
|
ctx.put("body", requestReader.getBody());
|
|
|
|
ctx.put("body", requestReader.getBody());
|
|
|
|
ctx.put("tool", tool);
|
|
|
|
ctx.put("tool", tool);
|
|
|
@ -217,13 +215,13 @@ public class ApiCallable implements Callable {
|
|
|
|
|
|
|
|
|
|
|
|
for (File file : files) {
|
|
|
|
for (File file : files) {
|
|
|
|
EntityReader entReader = new EntityReader(file);
|
|
|
|
EntityReader entReader = new EntityReader(file);
|
|
|
|
if (Package.equals(entReader.getPackageName())) {
|
|
|
|
if (Package.equals(entReader.getModuleName())) {
|
|
|
|
HashMap<String, Object> ctx = new HashMap<String, Object>();
|
|
|
|
HashMap<String, Object> ctx = new HashMap<String, Object>();
|
|
|
|
ctx.put("package", "package " + entReader.getDomainName() + "." + entReader.getModuleName() + "." + "request;");
|
|
|
|
ctx.put("package", "package " + entReader.getDomainName() + "." + entReader.getModuleName() + "." + "request;");
|
|
|
|
ctx.put("domain", entReader.getDomainName());
|
|
|
|
ctx.put("domain", entReader.getDomainName());
|
|
|
|
ctx.put("module", entReader.getModuleName());
|
|
|
|
ctx.put("module", entReader.getModuleName());
|
|
|
|
ctx.put("importList", entReader.getImportList());
|
|
|
|
ctx.put("importList", entReader.getImportList());
|
|
|
|
ctx.put("annotation", entReader.getAnnotationList());
|
|
|
|
ctx.put("annotation", entReader.getNotesList());
|
|
|
|
ctx.put("className", entReader.getClassName().replaceAll("Entity", ""));
|
|
|
|
ctx.put("className", entReader.getClassName().replaceAll("Entity", ""));
|
|
|
|
ctx.put("body", entReader.getBody());
|
|
|
|
ctx.put("body", entReader.getBody());
|
|
|
|
ctx.put("tool", tool);
|
|
|
|
ctx.put("tool", tool);
|
|
|
@ -243,7 +241,7 @@ public class ApiCallable implements Callable {
|
|
|
|
ctx.put("module", responseReader.getModuleName());
|
|
|
|
ctx.put("module", responseReader.getModuleName());
|
|
|
|
ctx.put("importList", responseReader.getImportList());
|
|
|
|
ctx.put("importList", responseReader.getImportList());
|
|
|
|
ctx.put("entNames", entNames);
|
|
|
|
ctx.put("entNames", entNames);
|
|
|
|
ctx.put("annotation", responseReader.getAnnotationList());
|
|
|
|
ctx.put("annotation", responseReader.getNotesList());
|
|
|
|
ctx.put("className", responseReader.getClassName().replaceAll("Response", ""));
|
|
|
|
ctx.put("className", responseReader.getClassName().replaceAll("Response", ""));
|
|
|
|
ctx.put("body", responseReader.getBody());
|
|
|
|
ctx.put("body", responseReader.getBody());
|
|
|
|
ctx.put("tool", tool);
|
|
|
|
ctx.put("tool", tool);
|
|
|
@ -255,15 +253,12 @@ public class ApiCallable implements Callable {
|
|
|
|
System.out.println("生成文件" + api.getResponseFile().getName() + "成功");
|
|
|
|
System.out.println("生成文件" + api.getResponseFile().getName() + "成功");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
//endregion
|
|
|
|
//endregion
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
} catch (IOException e) {
|
|
|
|
} catch (IOException e) {
|
|
|
|
e.printStackTrace();
|
|
|
|
e.printStackTrace();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
{
|
|
|
|
{
|
|
|
|
System.out.println("生成模块:Pom");
|
|
|
|
System.out.println("生成模块:Pom");
|
|
|
|
HashMap<String, Object> ctx = new HashMap<String, Object>();
|
|
|
|
HashMap<String, Object> ctx = new HashMap<String, Object>();
|
|
|
|