From 47e3087067abd35e6337c011f96d2338c0bb1aae Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 25 七月 2024 13:39:31 +0800
Subject: [PATCH] 优化自动化代码
---
src/main/java/org/yeshi/utils/generater/GeneraterManagerV2.java | 25 +++++++++++++++----------
1 files changed, 15 insertions(+), 10 deletions(-)
diff --git a/src/main/java/org/yeshi/utils/generater/GeneraterManagerV2.java b/src/main/java/org/yeshi/utils/generater/GeneraterManagerV2.java
index 99af5a4..2f70d3b 100644
--- a/src/main/java/org/yeshi/utils/generater/GeneraterManagerV2.java
+++ b/src/main/java/org/yeshi/utils/generater/GeneraterManagerV2.java
@@ -101,21 +101,24 @@
}
- public void createAdminVO() throws Exception {
- if (StringUtil.isNullOrEmpty(config.getService().getAdminVOPackage())) {
- throw new Exception("灏氭湭閰嶇疆AdminVO");
+ public AdminVOVO createAdminVO() throws Exception {
+ if (StringUtil.isNullOrEmpty(config.getAdmin().getController().getAdminVOPackage())) {
+ return null;
}
- String name = NameUtil.getDefaultExceptionName(config.getEntity());
- String path = getDirPath(config.getService().getAdminVOPackage());
+ String name = NameUtil.getDefaultAdminVOName(config.getEntity());
+ String path = getDirPath(config.getAdmin().getController().getAdminVOPackage());
try {
- AdminVOVO vo = new AdminVOVO.Builder().setEntity(config.getEntity()).setPackageName(config.getService().getAdminVOPackage()).build();
+ AdminVOVO vo = new AdminVOVO.Builder().setEntity(config.getEntity()).setPackageName(config.getAdmin().getController().getAdminVOPackage()).build();
String result = GeneraterUtil.createAdminVO(vo);
//淇濆瓨
saveFile(result, new File(path, name + ".java").getAbsolutePath());
+ return vo;
} catch (Exception e) {
e.printStackTrace();
}
+
+ return null;
}
@@ -247,9 +250,6 @@
}
}
- if (config.getService().getAdminVOPackage() != null) {
- createAdminVO();
- }
QueryVO queryVO = createQuery(config.getService().getQueryPackage());
@@ -315,13 +315,18 @@
query = new ClassInfo(queryName, config.getService().getQueryPackage() + "." + queryName);
}
+ AdminVOVO adminVOVO = null;
+ if (config.getAdmin().getController().getAdminVOPackage() != null) {
+ adminVOVO = createAdminVO();
+ }
+
String path = getDirPath(config.getAdmin().getController().getPkg());
AdminGeneraterInfo generaterInfo = new AdminGeneraterInfo.Builder().setEntityClass(config.getEntity()).setAdminData(config.getAdmin()).build();
- AdminControllerInfoVO vo = new AdminControllerInfoVO.Builder().setAdminInfo(generaterInfo).setPackageName(generaterInfo.getControllerData().getPkg()).setQueryVO(query).setService(service).build();
+ AdminControllerInfoVO vo = new AdminControllerInfoVO.Builder().setAdminVO(adminVOVO == null ? null : new ClassInfo(adminVOVO.getName(), adminVOVO.getPackageName() + "." + adminVOVO.getName())).setAdminInfo(generaterInfo).setPackageName(generaterInfo.getControllerData().getPkg()).setQueryVO(query).setService(service).build();
String controllerName = vo.getControllerName();
//鐢熸垚controller
String result = GeneraterUtil.createAdminController(vo);
--
Gitblit v1.8.0