From de0c727e90a079a8a59a63608596b7e009f1b068 Mon Sep 17 00:00:00 2001
From: jiali_zhuang <18060852373@163.com>
Date: Sat, 28 Apr 2018 16:25:26 +0800
Subject: [PATCH] =?UTF-8?q?gen=20=E6=B7=BB=E5=8A=A0=E8=87=AA=E5=8A=A8?=
 =?UTF-8?q?=E6=8F=92=E5=85=A5=E5=8A=9F=E8=83=BD=E4=BF=A1=E6=81=AF=E5=88=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../core/service/CoreCodeGenService.java      | 34 ++++++++++++-------
 .../admin/core/web/CoreCodeGenController.java |  2 ++
 2 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/admin-core/src/main/java/com/ibeetl/admin/core/service/CoreCodeGenService.java b/admin-core/src/main/java/com/ibeetl/admin/core/service/CoreCodeGenService.java
index 817b418d..415d9fcd 100644
--- a/admin-core/src/main/java/com/ibeetl/admin/core/service/CoreCodeGenService.java
+++ b/admin-core/src/main/java/com/ibeetl/admin/core/service/CoreCodeGenService.java
@@ -1,9 +1,10 @@
 package com.ibeetl.admin.core.service;
 
-import org.beetl.core.Configuration;
-import org.beetl.core.GroupTemplate;
-import org.beetl.core.Template;
-import org.beetl.core.resource.ClasspathResourceLoader;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.Set;
+
 import org.beetl.sql.core.JavaType;
 import org.beetl.sql.core.NameConversion;
 import org.beetl.sql.core.SQLManager;
@@ -11,20 +12,13 @@ import org.beetl.sql.core.db.ClassDesc;
 import org.beetl.sql.core.db.ColDesc;
 import org.beetl.sql.core.db.MetadataManager;
 import org.beetl.sql.core.db.TableDesc;
-import org.beetl.sql.ext.gen.GenConfig;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import com.ibeetl.admin.core.entity.CoreFunction;
 import com.ibeetl.admin.core.gen.model.Attribute;
 import com.ibeetl.admin.core.gen.model.Entity;
 
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.PrintStream;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Set;
-
 /**
  * 代码生成，用于根据表或者视图生成entity，mapper，service，conroller
  * 未来可以生成swagger api，界面
@@ -107,6 +101,22 @@ public class CoreCodeGenService {
 		return e;
 	}
 	
+	public boolean insertFunction(Entity data,String urlBase){
+		CoreFunction cf = new CoreFunction();
+		cf.setAccessUrl("/"+urlBase+"/"+data.getCode()+"/index.do");
+		Object o = sqlManager.templateOne(cf);
+		
+		if(o == null){
+			cf.setName(data.getDisplayName());
+			cf.setCode(data.getTableName().replace("_", "."));
+			cf.setCreateTime(new Date());
+			cf.setParentId(0L);
+			cf.setType("FN0");
+			sqlManager.insert(cf);
+		}
+		return true;
+	}
+	
 	//根据类名提供一个变量名
 	private String getEntityCode(String s) {
 		//找到最后一个大写字母，以此为变量名
diff --git a/admin-core/src/main/java/com/ibeetl/admin/core/web/CoreCodeGenController.java b/admin-core/src/main/java/com/ibeetl/admin/core/web/CoreCodeGenController.java
index 58448726..cd1f3fc5 100644
--- a/admin-core/src/main/java/com/ibeetl/admin/core/web/CoreCodeGenController.java
+++ b/admin-core/src/main/java/com/ibeetl/admin/core/web/CoreCodeGenController.java
@@ -208,6 +208,8 @@ public class CoreCodeGenController {
 
 		MdGen mdGen = new MdGen();
 		mdGen.make(target, entity);
+		
+		codeGenService.insertFunction(data.entity,data.urlBase);
 		return JsonResult.success();
 
 	}
-- 
Gitee