From 052e1d5c47c4e536fde79074d53b0481c7d4f9b6 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 13 十月 2021 18:33:42 +0800
Subject: [PATCH] 自动化代码生成优化

---
 src/test/java/com/generater/GeneratorTest.java |   15 +++++++++++----
 1 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/test/java/com/generater/GeneratorTest.java b/src/test/java/com/generater/GeneratorTest.java
index 33d9472..b08f64b 100644
--- a/src/test/java/com/generater/GeneratorTest.java
+++ b/src/test/java/com/generater/GeneratorTest.java
@@ -3,11 +3,13 @@
 import org.springframework.data.annotation.Id;
 import org.yeshi.utils.FileUtil;
 import org.yeshi.utils.FreemarkerUtils;
-import org.yeshi.utils.generater.SpringComponentGenerater;
+import org.yeshi.utils.generater.GeneraterManager;
+import org.yeshi.utils.generater.GeneraterUtil;
 import org.yeshi.utils.generater.entity.ClassInfo;
 import org.yeshi.utils.generater.entity.admin.AdminGeneraterInfo;
 import org.yeshi.utils.generater.mybatis.Column;
 import org.yeshi.utils.generater.mybatis.Table;
+import org.yeshi.utils.generater.params.DaoGeneraterParams;
 import org.yeshi.utils.generater.vo.ExceptionVO;
 import org.yeshi.utils.generater.vo.dao.MongoDBDaoVO;
 import org.yeshi.utils.generater.vo.dao.MyBatisDBDaoVO;
@@ -47,7 +49,7 @@
         //
 //        boolean match = Pattern.matches("^(https://){1}.*(\\.m3u8)$", "https://n1.szjal.cn/20210805/qnDXhXBa/index.m3u8123");
 //        System.out.println(match);
-        generateMybatisDao();
+        generater();
     }
 
     private static void generateAdminPage() throws Exception {
@@ -69,7 +71,7 @@
 
         Map<String, InputStream> map = new HashMap<>();
         for (String st : template) {
-            map.put(st, SpringComponentGenerater.class.getClassLoader().getResourceAsStream("generater/" + st));
+            map.put(st, GeneraterUtil.class.getClassLoader().getResourceAsStream("generater/" + st));
         }
         String result = FreemarkerUtils.generateInputStream(new FormUpdateInfoVO.Builder().setAdminInfo(info).build(), "admin/update.ftl", map);
         FileUtil.saveAsFileByte(result.getBytes("UTF-8"), "C:\\Users\\Administrator\\Documents\\HBuilderProjects\\LayuiTest\\form.html");
@@ -81,7 +83,7 @@
         ClassInfo dao = new ClassInfo("TestDao", "com.test.dao.TestDao");
         ClassInfo query = new ClassInfo("TestQuery", "com.test.query.TestQuery");
         ClassInfo service = new ClassInfo("TestService", "com.test.service.TestService");
-        ServiceInfoVO serviceInfoVO = new ServiceInfoVO.Builder().setDao(dao).setEntity(Entity.class).setPackageName("com.test.service").setQuery(query).setService(service).build();
+        ServiceInfoVO serviceInfoVO = new ServiceInfoVO.Builder().setEntity(Entity.class).setPackageName("com.test.service").setQuery(query).setService(service).build();
         String result = FreemarkerUtils.generateInputStream(serviceInfoVO, GeneratorTest.class.getClassLoader().getResourceAsStream("generater\\service\\service.template"));
         System.out.println(result);
     }
@@ -144,6 +146,11 @@
         System.out.println(result);
     }
 
+    private static void generater() throws Exception {
+        GeneraterManager.getInstance().init("D:\\workspace\\server\\utils\\src\\test\\java", TestEntity.class);
+        GeneraterManager.getInstance().createWholeFunction(new DaoGeneraterParams("com.generater.temp.dao", null), null, null);
+    }
+
 
     @Table("tb_test")
     public static class Entity {

--
Gitblit v1.8.0