diff --git a/build.gradle b/build.gradle index 1a82cd1..926b81c 100644 --- a/build.gradle +++ b/build.gradle @@ -51,7 +51,7 @@ uploadArchives { authentication(userName: NEXUS_USERNAME, password: NEXUS_PASSWORD) } pom.project { - version '1.2.10' + version '1.2.11' artifactId ARTIFACT_Id groupId GROUP_ID packaging TYPE diff --git a/build/classes/java/main/com/taover/codegenerate/bazhuayun/GenerateCode.class b/build/classes/java/main/com/taover/codegenerate/bazhuayun/GenerateCode.class index ec465b4..b69a06e 100644 Binary files a/build/classes/java/main/com/taover/codegenerate/bazhuayun/GenerateCode.class and b/build/classes/java/main/com/taover/codegenerate/bazhuayun/GenerateCode.class differ diff --git a/src/main/java/com/taover/codegenerate/bazhuayun/GenerateCode.java b/src/main/java/com/taover/codegenerate/bazhuayun/GenerateCode.java index 571df25..24ec81c 100644 --- a/src/main/java/com/taover/codegenerate/bazhuayun/GenerateCode.java +++ b/src/main/java/com/taover/codegenerate/bazhuayun/GenerateCode.java @@ -21,7 +21,7 @@ import freemarker.template.Template; public class GenerateCode { public static void main(String args[]){ try { - generateEntity("com.taover.wxorder", "ecs_shippings_regions", "D:"+File.separator+"dblist", "127.0.0.1", "3306", "tylife", "lexi365", "tylife"); + generateEntity("com.taover.wxorder", "ecs_shippings_regions", "D:"+File.separator+"dblist", "127.0.0.1", "3306", "tylife", "lexi365", "tylife", false); } catch (Exception e) { e.printStackTrace(); } @@ -63,19 +63,20 @@ public class GenerateCode { continue; } + boolean isCover = false; ApiModel apiModel = new ApiModel(dbName, tableNameCurr, columnsInTable, "1.0.0", basePackage); //generateDto(srcPath, apiModel); - generateEntity(srcPath, apiModel); - generateManageController(srcPath, apiModel); - generateV1Controller(srcPath, apiModel); - generateRepository(srcPath, apiModel); - generateService(srcPath, apiModel); - //generateVo(srcPath, apiModel); + generateEntity(srcPath, apiModel, isCover); + generateManageController(srcPath, apiModel, isCover); + generateV1Controller(srcPath, apiModel, isCover); + generateRepository(srcPath, apiModel, isCover); + generateService(srcPath, apiModel, isCover); + generateVo(srcPath, apiModel, isCover); } System.out.println("处理完成"); } - public static void generateDto(String basePackage, String tableNameStr, String srcPath, String host, String port, String user, String password, String dbName) throws Exception{ + public static void generateCoverWhenFileExists(String basePackage, String tableNameStr, String srcPath, String host, String port, String user, String password, String dbName) throws Exception{ //取数据库连接 Connection conn = getConnection(host, port, user, password, dbName); //初始化要生成的表列表 @@ -97,12 +98,19 @@ public class GenerateCode { } ApiModel apiModel = new ApiModel(dbName, tableNameCurr, columnsInTable, "1.0.0", basePackage); - generateDto(srcPath, apiModel); + boolean isCover = true; + //generateDto(srcPath, apiModel); + generateEntity(srcPath, apiModel, isCover); + generateManageController(srcPath, apiModel, isCover); + generateV1Controller(srcPath, apiModel, isCover); + generateRepository(srcPath, apiModel, isCover); + generateService(srcPath, apiModel, isCover); + generateVo(srcPath, apiModel, isCover); } System.out.println("处理完成"); } - public static void generateEntity(String basePackage, String tableNameStr, String srcPath, String host, String port, String user, String password, String dbName) throws Exception{ + public static void generateDto(String basePackage, String tableNameStr, String srcPath, String host, String port, String user, String password, String dbName, boolean isCover) throws Exception{ //取数据库连接 Connection conn = getConnection(host, port, user, password, dbName); //初始化要生成的表列表 @@ -124,12 +132,12 @@ public class GenerateCode { } ApiModel apiModel = new ApiModel(dbName, tableNameCurr, columnsInTable, "1.0.0", basePackage); - generateEntity(srcPath, apiModel); + generateDto(srcPath, apiModel, isCover); } System.out.println("处理完成"); } - public static void generateControllerManage(String basePackage, String tableNameStr, String srcPath, String host, String port, String user, String password, String dbName) throws Exception{ + public static void generateEntity(String basePackage, String tableNameStr, String srcPath, String host, String port, String user, String password, String dbName, boolean isCover) throws Exception{ //取数据库连接 Connection conn = getConnection(host, port, user, password, dbName); //初始化要生成的表列表 @@ -151,12 +159,12 @@ public class GenerateCode { } ApiModel apiModel = new ApiModel(dbName, tableNameCurr, columnsInTable, "1.0.0", basePackage); - generateManageController(srcPath, apiModel); + generateEntity(srcPath, apiModel, isCover); } System.out.println("处理完成"); } - public static void generateControllerV1(String basePackage, String tableNameStr, String srcPath, String host, String port, String user, String password, String dbName) throws Exception{ + public static void generateControllerManage(String basePackage, String tableNameStr, String srcPath, String host, String port, String user, String password, String dbName, boolean isCover) throws Exception{ //取数据库连接 Connection conn = getConnection(host, port, user, password, dbName); //初始化要生成的表列表 @@ -178,12 +186,12 @@ public class GenerateCode { } ApiModel apiModel = new ApiModel(dbName, tableNameCurr, columnsInTable, "1.0.0", basePackage); - generateV1Controller(srcPath, apiModel); + generateManageController(srcPath, apiModel, isCover); } System.out.println("处理完成"); } - public static void generateRepository(String basePackage, String tableNameStr, String srcPath, String host, String port, String user, String password, String dbName) throws Exception{ + public static void generateControllerV1(String basePackage, String tableNameStr, String srcPath, String host, String port, String user, String password, String dbName, boolean isCover) throws Exception{ //取数据库连接 Connection conn = getConnection(host, port, user, password, dbName); //初始化要生成的表列表 @@ -205,12 +213,12 @@ public class GenerateCode { } ApiModel apiModel = new ApiModel(dbName, tableNameCurr, columnsInTable, "1.0.0", basePackage); - generateRepository(srcPath, apiModel); + generateV1Controller(srcPath, apiModel, isCover); } System.out.println("处理完成"); } - public static void generateService(String basePackage, String tableNameStr, String srcPath, String host, String port, String user, String password, String dbName) throws Exception{ + public static void generateRepository(String basePackage, String tableNameStr, String srcPath, String host, String port, String user, String password, String dbName, boolean isCover) throws Exception{ //取数据库连接 Connection conn = getConnection(host, port, user, password, dbName); //初始化要生成的表列表 @@ -232,12 +240,12 @@ public class GenerateCode { } ApiModel apiModel = new ApiModel(dbName, tableNameCurr, columnsInTable, "1.0.0", basePackage); - generateService(srcPath, apiModel); + generateRepository(srcPath, apiModel, isCover); } System.out.println("处理完成"); } - public static void generateVo(String basePackage, String tableNameStr, String srcPath, String host, String port, String user, String password, String dbName) throws Exception{ + public static void generateService(String basePackage, String tableNameStr, String srcPath, String host, String port, String user, String password, String dbName, boolean isCover) throws Exception{ //取数据库连接 Connection conn = getConnection(host, port, user, password, dbName); //初始化要生成的表列表 @@ -259,7 +267,34 @@ public class GenerateCode { } ApiModel apiModel = new ApiModel(dbName, tableNameCurr, columnsInTable, "1.0.0", basePackage); - generateVo(srcPath, apiModel); + generateService(srcPath, apiModel, isCover); + } + System.out.println("处理完成"); + } + + public static void generateVo(String basePackage, String tableNameStr, String srcPath, String host, String port, String user, String password, String dbName, boolean isCover) throws Exception{ + //取数据库连接 + Connection conn = getConnection(host, port, user, password, dbName); + //初始化要生成的表列表 + List tableNameList = getListTableName(tableNameStr, dbName, conn); + for (int i = 0; i < tableNameList.size(); i++) { + + String tableNameCurr = (String) tableNameList.get(i); + + //取得表中所有列 + Vector columnsInTable = MysqlTableColumn.GetTableInfo(conn, dbName, tableNameCurr, "%", "mysql"); + if (columnsInTable == null || columnsInTable.size() == 0) { + System.out.println(tableNameCurr + " : 生成失败,得不到表中列明"); + continue; + } + MysqlTableColumn pkcolum = MysqlTableColumn.getPKColum(columnsInTable); + if (pkcolum == null) { + System.out.println(tableNameCurr + " : 生成失败,未设置主键"); + continue; + } + + ApiModel apiModel = new ApiModel(dbName, tableNameCurr, columnsInTable, "1.0.0", basePackage); + generateVo(srcPath, apiModel, isCover); } System.out.println("处理完成"); } @@ -300,48 +335,48 @@ public class GenerateCode { return out.toString(); } - private static void generateDto(String srcPath, ApiModel apiModel) throws Exception{ + private static void generateDto(String srcPath, ApiModel apiModel, boolean isCover) throws Exception{ String modelPath = apiModel.getBasePackage().replace(".", File.separator); String filePath = srcPath+File.separator+modelPath+File.separator+"bean"+File.separator+"dto"; - Tools.createFile(filePath, apiModel.getDtoClassSimpleName()+".java", renderByTemplate("DtoTemplate.ftl", apiModel), false); + Tools.createFile(filePath, apiModel.getDtoClassSimpleName()+".java", renderByTemplate("DtoTemplate.ftl", apiModel), isCover); } - private static void generateEntity(String srcPath, ApiModel apiModel) throws Exception{ + private static void generateEntity(String srcPath, ApiModel apiModel, boolean isCover) throws Exception{ String modelPath = apiModel.getBasePackage().replace(".", File.separator); String filePath = srcPath+File.separator+modelPath+File.separator+"bean"+File.separator+"entity"; - Tools.createFile(filePath, apiModel.getEntityClassSimpleName()+".java", renderByTemplate("EntityTemplate.ftl", apiModel), false); + Tools.createFile(filePath, apiModel.getEntityClassSimpleName()+".java", renderByTemplate("EntityTemplate.ftl", apiModel), isCover); } - private static void generateManageController(String srcPath, ApiModel apiModel) throws Exception{ + private static void generateManageController(String srcPath, ApiModel apiModel, boolean isCover) throws Exception{ String modelPath = apiModel.getBasePackage().replace(".", File.separator); String filePath = srcPath+File.separator+modelPath+File.separator+"controller"+File.separator+"manage"; - Tools.createFile(filePath, apiModel.getControllerClassName()+".java", renderByTemplate("ManageControllerTemplate.ftl", apiModel), false); + Tools.createFile(filePath, apiModel.getControllerClassName()+".java", renderByTemplate("ManageControllerTemplate.ftl", apiModel), isCover); } - private static void generateV1Controller(String srcPath, ApiModel apiModel) throws Exception{ + private static void generateV1Controller(String srcPath, ApiModel apiModel, boolean isCover) throws Exception{ String modelPath = apiModel.getBasePackage().replace(".", File.separator); String filePath = srcPath+File.separator+modelPath+File.separator+"controller"+File.separator+"v1"; - Tools.createFile(filePath, apiModel.getControllerClassName()+".java", renderByTemplate("V1ControllerTemplate.ftl", apiModel), false); + Tools.createFile(filePath, apiModel.getControllerClassName()+".java", renderByTemplate("V1ControllerTemplate.ftl", apiModel), isCover); } - private static void generateRepository(String srcPath, ApiModel apiModel) throws Exception{ + private static void generateRepository(String srcPath, ApiModel apiModel, boolean isCover) throws Exception{ String modelPath = apiModel.getBasePackage().replace(".", File.separator); String filePath = srcPath+File.separator+modelPath+File.separator+"repository"; - Tools.createFile(filePath, apiModel.getRepositoryClassSimpleName()+".java", renderByTemplate("RepositoryTemplate.ftl", apiModel), false); + Tools.createFile(filePath, apiModel.getRepositoryClassSimpleName()+".java", renderByTemplate("RepositoryTemplate.ftl", apiModel), isCover); } - private static void generateService(String srcPath, ApiModel apiModel) throws Exception{ + private static void generateService(String srcPath, ApiModel apiModel, boolean isCover) throws Exception{ String modelPath = apiModel.getBasePackage().replace(".", File.separator); String filePath = srcPath+File.separator+modelPath+File.separator+"service"; - Tools.createFile(filePath, apiModel.getServiceClassSimpleName()+".java", renderByTemplate("ServiceTemplate.ftl", apiModel), false); + Tools.createFile(filePath, apiModel.getServiceClassSimpleName()+".java", renderByTemplate("ServiceTemplate.ftl", apiModel), isCover); String fileImplPath = srcPath+File.separator+modelPath+File.separator+"service"+File.separator+"impl"; - Tools.createFile(fileImplPath, apiModel.getServiceImplClassSimpleName()+".java", renderByTemplate("ServiceImplTemplate.ftl", apiModel), false); + Tools.createFile(fileImplPath, apiModel.getServiceImplClassSimpleName()+".java", renderByTemplate("ServiceImplTemplate.ftl", apiModel), isCover); } - private static void generateVo(String srcPath, ApiModel apiModel) throws Exception{ + private static void generateVo(String srcPath, ApiModel apiModel, boolean isCover) throws Exception{ String modelPath = apiModel.getBasePackage().replace(".", File.separator); String filePath = srcPath+File.separator+modelPath+File.separator+"bean"+File.separator+"vo"; - Tools.createFile(filePath, apiModel.getVoClassSimpleName()+".java", renderByTemplate("VoTemplate.ftl", apiModel), false); + Tools.createFile(filePath, apiModel.getVoClassSimpleName()+".java", renderByTemplate("VoTemplate.ftl", apiModel), isCover); } } -- libgit2 0.21.2